{
- if (!config.UI.views.tx.additionalFields?.fee_per_gas || !gasUsed) {
+ if (!config.UI.views.tx.additionalFields?.fee_per_gas || !gasUsed || txFee === null) {
return null;
}
diff --git a/ui/txs/TxAdditionalInfoContent.tsx b/ui/txs/TxAdditionalInfoContent.tsx
index b9e2ed66f9..e16a768439 100644
--- a/ui/txs/TxAdditionalInfoContent.tsx
+++ b/ui/txs/TxAdditionalInfoContent.tsx
@@ -33,20 +33,24 @@ const TxAdditionalInfoContent = ({ tx }: { tx: Transaction }) => {
Additional info
{ !config.UI.views.tx.hiddenFields?.tx_fee && (
- Transaction fee
- { tx.stability_fee ? (
-
- ) : (
-
-
-
+ { (tx.stability_fee !== undefined || tx.fee.value !== null) && (
+ <>
+ Transaction fee
+ { tx.stability_fee ? (
+
+ ) : (
+
+
+
+ ) }
+ >
) }
) }
diff --git a/ui/txs/TxsListItem.tsx b/ui/txs/TxsListItem.tsx
index 4d1b72eb69..13f5319e8d 100644
--- a/ui/txs/TxsListItem.tsx
+++ b/ui/txs/TxsListItem.tsx
@@ -134,14 +134,18 @@ const TxsListItem = ({ tx, isLoading, showBlockInfo, currentAddress, enableTimeI
) }
{ !config.UI.views.tx.hiddenFields?.tx_fee && (
- Fee
- { tx.stability_fee ? (
-
- ) : (
-
- { getValueWithUnit(tx.fee.value).toFormat() }
- { config.UI.views.tx.hiddenFields?.fee_currency ? '' : ` ${ config.chain.currency.symbol }` }
-
+ { (tx.stability_fee !== undefined || tx.fee.value !== null) && (
+ <>
+ Fee
+ { tx.stability_fee ? (
+
+ ) : (
+
+ { getValueWithUnit(tx.fee.value || 0).toFormat() }
+ { config.UI.views.tx.hiddenFields?.fee_currency ? '' : ` ${ config.chain.currency.symbol }` }
+
+ ) }
+ >
) }
) }
diff --git a/ui/txs/TxsTableItem.tsx b/ui/txs/TxsTableItem.tsx
index 42443476ef..46d720f3a1 100644
--- a/ui/txs/TxsTableItem.tsx
+++ b/ui/txs/TxsTableItem.tsx
@@ -164,10 +164,11 @@ const TxsTableItem = ({ tx, showBlockInfo, currentAddress, enableTimeIncrement,
) }
{ !config.UI.views.tx.hiddenFields?.tx_fee && (
+ { /* eslint-disable-next-line no-nested-ternary */ }
{ tx.stability_fee ? (
) : (
-
+ tx.fee.value ? : '-'
) }
|
) }