Show used gas and fee instead of limit

oasisprotocol · Aug 15, 2023 · 73ca008 · 73ca008
1 parent 21c3374
commit 73ca008
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.changelog/800.fix.md b/.changelog/800.fix.md
@@ -0,0 +1 @@
+Show used gas and fee instead of limit
diff --git a/src/app/components/Transactions/index.tsx b/src/app/components/Transactions/index.tsx
@@ -188,7 +188,7 @@ export const Transactions: FC<TransactionsProps> = ({
             },
             {
               align: TableCellAlign.Right,
-              content: <RoundedBalance value={transaction.fee} ticker={transaction.ticker} />,
+              content: <RoundedBalance value={transaction.charged_fee} ticker={transaction.ticker} />,
               key: 'fee_amount',
             },
             {

diff --git a/src/app/pages/TransactionDetailPage/index.tsx b/src/app/pages/TransactionDetailPage/index.tsx
@@ -323,9 +323,15 @@ export const TransactionDetailView: FC<{
 
           <dt>{t('common.txnFee')}</dt>
           <dd>
-            {t('common.valueInToken', { ...getPreciseNumberFormat(transaction.fee), ticker: tickerName })}
+            {t('common.valueInToken', {
+              ...getPreciseNumberFormat(transaction.charged_fee),
+              ticker: tickerName,
+            })}
           </dd>
 
+          <dt>{t('common.gasUsed')}</dt>
+          <dd>{transaction.gas_used.toLocaleString()}</dd>
+
           <dt>{t('common.gasLimit')}</dt>
           <dd>{transaction.gas_limit.toLocaleString()}</dd>
 

diff --git a/src/oasis-nexus/api.ts b/src/oasis-nexus/api.ts
@@ -151,7 +151,8 @@ export const useGetRuntimeTransactions: typeof generated.useGetRuntimeTransactio
               return {
                 ...tx,
                 eth_hash: tx.eth_hash ? `0x${tx.eth_hash}` : undefined,
-                fee: tx.fee ? fromBaseUnits(tx.fee, paraTimesConfig[runtime].decimals) : undefined,
+                fee: fromBaseUnits(tx.fee, paraTimesConfig[runtime].decimals),
+                charged_fee: fromBaseUnits(tx.charged_fee, paraTimesConfig[runtime].decimals),
                 amount: tx.amount ? fromBaseUnits(tx.amount, paraTimesConfig[runtime].decimals) : undefined,
                 layer: runtime,
                 network,
@@ -222,7 +223,8 @@ export const useGetRuntimeTransactionsTxHash: typeof generated.useGetRuntimeTran
               return {
                 ...tx,
                 eth_hash: tx.eth_hash ? `0x${tx.eth_hash}` : undefined,
-                fee: tx.fee ? fromBaseUnits(tx.fee, paraTimesConfig[runtime].decimals) : undefined,
+                fee: fromBaseUnits(tx.fee, paraTimesConfig[runtime].decimals),
+                charged_fee: fromBaseUnits(tx.charged_fee, paraTimesConfig[runtime].decimals),
                 amount: tx.amount ? fromBaseUnits(tx.amount, paraTimesConfig[runtime].decimals) : undefined,
                 layer: runtime,
                 network,