Merge pull request #3718 from LiskHQ/3713-remove-amount-from-blocks

Remove amount field from the blocks row component - Partially resolves #3713
LiskHQ · Jul 27, 2021 · a019eae · a019eae
2 parents 4834770 + 849bbfa
commit a019eae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/src/components/screens/monitor/blocks/blockRow.js b/src/components/screens/monitor/blocks/blockRow.js
@@ -11,20 +11,17 @@ const BlockRow = ({ data, className }) => (
     className={`${grid.row} ${className} ${styles.tableRow}`}
     to={`${routes.block.path}?id=${data.id}`}
   >
-    <span className={grid['col-xs-2']}>
+    <span className={grid['col-xs-3']}>
       {data.height}
     </span>
     <span className={grid['col-xs-3']}>
       <DateTimeFromTimestamp time={data.timestamp * 1000} token="BTC" />
     </span>
-    <span className={grid['col-xs-2']}>
-      {data.numberOfTransactions}
-    </span>
-    <span className={grid['col-xs-2']}>
+    <span className={grid['col-xs-3']}>
       {data.generatorUsername}
     </span>
     <span className={grid['col-xs-2']}>
-      <LiskAmount val={data.totalAmount} token="LSK" />
+      {data.numberOfTransactions}
     </span>
     <span className={grid['col-xs-1']}>
       <LiskAmount val={data.totalForged} token="LSK" />

diff --git a/src/components/screens/monitor/blocks/tableHeader.js b/src/components/screens/monitor/blocks/tableHeader.js
@@ -3,7 +3,7 @@ import grid from 'flexboxgrid/dist/flexboxgrid.css';
 export default (changeSort, t) => ([
   {
     title: t('Height'),
-    classList: `${grid['col-xs-2']}`,
+    classList: `${grid['col-xs-3']}`,
     sort: {
       fn: changeSort,
       key: 'height',
@@ -13,16 +13,12 @@ export default (changeSort, t) => ([
     title: t('Date'),
     classList: `${grid['col-xs-3']}`,
   },
-  {
-    title: t('Transactions'),
-    classList: `${grid['col-xs-2']}`,
-  },
   {
     title: t('Generated by'),
-    classList: `${grid['col-xs-2']}`,
+    classList: `${grid['col-xs-3']}`,
   },
   {
-    title: t('Amount'),
+    title: t('Transactions'),
     classList: `${grid['col-xs-2']}`,
   },
   {

diff --git a/src/components/screens/monitor/delegates/delegatesTable/dataColumns.js b/src/components/screens/monitor/delegates/delegatesTable/dataColumns.js
@@ -143,7 +143,7 @@ const getDelegateStatus = (key, totalVotesReceived) => {
     return [key, delegateStatus[key]];
   }
   if (totalVotesReceived < 1e11) {
-    return [key, delegateStatus.nonEligible];
+    return ['nonEligible', delegateStatus.nonEligible];
   }
 
   return [key, delegateStatus[key]];