Merge pull request #1554 from oasisprotocol/mz/swapCol

Swap fee and amount columns in txs tables
oasisprotocol · Sep 25, 2024 · b45547a · b45547a
2 parents 807a10c + 58d3454
commit b45547a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.changelog/1554.bugfix.md b/.changelog/1554.bugfix.md
@@ -0,0 +1 @@
+Swap fee and amount columns in txs tables
diff --git a/src/app/components/Transactions/RuntimeTransactions.tsx b/src/app/components/Transactions/RuntimeTransactions.tsx
@@ -63,8 +63,8 @@ export const RuntimeTransactions: FC<TransactionsProps> = ({
           { key: 'type', content: t('common.type') },
           { key: 'from', content: t('common.from'), width: '150px' },
           { key: 'to', content: t('common.to'), width: '150px' },
-          { key: 'txnFee', content: t('common.fee'), align: TableCellAlign.Right, width: '250px' },
           { key: 'value', align: TableCellAlign.Right, content: t('common.amount'), width: '250px' },
+          { key: 'txnFee', content: t('common.fee'), align: TableCellAlign.Right, width: '250px' },
         ]
       : []),
   ]
@@ -146,13 +146,13 @@ export const RuntimeTransactions: FC<TransactionsProps> = ({
               },
               {
                 align: TableCellAlign.Right,
-                content: <RoundedBalance value={transaction.charged_fee} ticker={transaction.fee_symbol} />,
-                key: 'fee_amount',
+                content: <RoundedBalance value={transaction.amount} ticker={transaction.amount_symbol} />,
+                key: 'value',
               },
               {
                 align: TableCellAlign.Right,
-                content: <RoundedBalance value={transaction.amount} ticker={transaction.amount_symbol} />,
-                key: 'value',
+                content: <RoundedBalance value={transaction.charged_fee} ticker={transaction.fee_symbol} />,
+                key: 'fee_amount',
               },
             ]
           : []),