diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js index 143e274cd..a0efe56f9 100644 --- a/test/e2e/metamask-ui.spec.js +++ b/test/e2e/metamask-ui.spec.js @@ -1190,7 +1190,7 @@ describe('MetaMask', function () { await driver.wait(until.stalenessOf(gasModal)) const gasFeeInEth = await findElement(driver, By.css('.confirm-approve-content__transaction-details-content__secondary-fee')) - assert.equal(await gasFeeInEth.getText(), '0.0006') + assert.equal(await gasFeeInEth.getText(), '0.0006 ETH') }) it('edits the permission', async () => { diff --git a/ui/app/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/app/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js index 9f11fbb2f..38644541d 100644 --- a/ui/app/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js +++ b/ui/app/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js @@ -5,6 +5,7 @@ import Identicon from '../../../components/ui/identicon' import { addressSummary, } from '../../../helpers/utils/util' +import { formatCurrency } from '../../../helpers/utils/confirm-tx.util' export default class ConfirmApproveContent extends Component { static contextTypes = { @@ -26,6 +27,7 @@ export default class ConfirmApproveContent extends Component { tokenBalance: PropTypes.string, data: PropTypes.string, toAddress: PropTypes.string, + currentCurrency: PropTypes.string, fiatTransactionTotal: PropTypes.string, ethTransactionTotal: PropTypes.string, } @@ -68,6 +70,7 @@ export default class ConfirmApproveContent extends Component { renderTransactionDetailsContent () { const { t } = this.context const { + currentCurrency, ethTransactionTotal, fiatTransactionTotal, } = this.props @@ -78,10 +81,10 @@ export default class ConfirmApproveContent extends Component {
- { fiatTransactionTotal } + { formatCurrency(fiatTransactionTotal, currentCurrency) }
- { ethTransactionTotal } + { `${ethTransactionTotal} ETH` }
diff --git a/ui/app/pages/confirm-approve/confirm-approve.component.js b/ui/app/pages/confirm-approve/confirm-approve.component.js index be1eb1969..e8c44cd4f 100644 --- a/ui/app/pages/confirm-approve/confirm-approve.component.js +++ b/ui/app/pages/confirm-approve/confirm-approve.component.js @@ -62,6 +62,7 @@ export default class ConfirmApprove extends Component { data, decimals, txData, + currentCurrency, ethTransactionTotal, fiatTransactionTotal, ...restProps @@ -95,6 +96,7 @@ export default class ConfirmApprove extends Component { showEditApprovalPermissionModal={showEditApprovalPermissionModal} data={data} toAddress={toAddress} + currentCurrency={currentCurrency} ethTransactionTotal={ethTransactionTotal} fiatTransactionTotal={fiatTransactionTotal} />}