diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index d84e28438..0d6867c03 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -2451,6 +2451,15 @@ "transactionFee": { "message": "Transaction Fee" }, + "transactionHistoryBaseFee": { + "message": "Base fee (GWEI)" + }, + "transactionHistoryEffectiveGasPrice": { + "message": "Effective gas price" + }, + "transactionHistoryPriorityFee": { + "message": "Priority fee (GWEI)" + }, "transactionResubmitted": { "message": "Transaction resubmitted with gas fee increased to $1 at $2" }, diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown.component.js b/ui/components/app/transaction-breakdown/transaction-breakdown.component.js index cba7803c9..0daf6add0 100644 --- a/ui/components/app/transaction-breakdown/transaction-breakdown.component.js +++ b/ui/components/app/transaction-breakdown/transaction-breakdown.component.js @@ -23,6 +23,9 @@ export default class TransactionBreakdown extends PureComponent { gasPrice: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), gasUsed: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), totalInHex: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), + baseFee: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), + priorityFee: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), + effectiveGasPrice: PropTypes.number, }; static defaultProps = { @@ -42,6 +45,9 @@ export default class TransactionBreakdown extends PureComponent { totalInHex, gasUsed, isTokenApprove, + baseFee, + priorityFee, + effectiveGasPrice, } = this.props; return (
@@ -85,35 +91,83 @@ export default class TransactionBreakdown extends PureComponent { /> )} - - {typeof gasPrice === 'undefined' ? ( - '?' - ) : ( - + {typeof baseFee === 'undefined' ? ( + '?' + ) : ( + + )} + + )} + {process.env.SHOW_EIP_1559_UI && ( + + {typeof priorityFee === 'undefined' ? ( + '?' + ) : ( + + )} + + )} + {!process.env.SHOW_EIP_1559_UI && ( + + {typeof gasPrice === 'undefined' ? ( + '?' + ) : ( + + )} + + )} + + + {showFiat && ( + )} -
+ + {showFiat && ( - {showFiat && ( - - )} -
+ )}
);