diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-21 09:26:18 +0800 |
---|---|---|
committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-21 09:26:18 +0800 |
commit | 8f3b762461ada222f82089e686a61183dd167428 (patch) | |
tree | 1efbdbc2f91c7b7468dda469de53e0cccf8e9ac4 /ui/app/components/pending-tx | |
parent | 5eb3cf43bfab3728dde151bc84439993b1a93184 (diff) | |
download | tangerine-wallet-browser-8f3b762461ada222f82089e686a61183dd167428.tar tangerine-wallet-browser-8f3b762461ada222f82089e686a61183dd167428.tar.gz tangerine-wallet-browser-8f3b762461ada222f82089e686a61183dd167428.tar.bz2 tangerine-wallet-browser-8f3b762461ada222f82089e686a61183dd167428.tar.lz tangerine-wallet-browser-8f3b762461ada222f82089e686a61183dd167428.tar.xz tangerine-wallet-browser-8f3b762461ada222f82089e686a61183dd167428.tar.zst tangerine-wallet-browser-8f3b762461ada222f82089e686a61183dd167428.zip |
Fix Conversions bugs; Fiat value bugs
Diffstat (limited to 'ui/app/components/pending-tx')
-rw-r--r-- | ui/app/components/pending-tx/confirm-deploy-contract.js | 4 | ||||
-rw-r--r-- | ui/app/components/pending-tx/confirm-send-ether.js | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ui/app/components/pending-tx/confirm-deploy-contract.js b/ui/app/components/pending-tx/confirm-deploy-contract.js index d19cec755..a0ba94045 100644 --- a/ui/app/components/pending-tx/confirm-deploy-contract.js +++ b/ui/app/components/pending-tx/confirm-deploy-contract.js @@ -195,14 +195,16 @@ ConfirmDeployContract.prototype.getGasFee = function () { eth: Number(ETH), } } + ConfirmDeployContract.prototype.renderGasFee = function () { + const { currentCurrency } = this.props const { fiat: fiatGas, eth: ethGas } = this.getGasFee() return ( h('section.flex-row.flex-center.confirm-screen-row', [ h('span.confirm-screen-label.confirm-screen-section-column', [ 'Gas Fee' ]), h('div.confirm-screen-section-column', [ - h('div.confirm-screen-row-info', `${fiatGas} FIAT`), + h('div.confirm-screen-row-info', `${fiatGas} ${currentCurrency.toUpperCase()}`), h( 'div.confirm-screen-row-detail', diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js index 51c36ba42..7162c7122 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -241,7 +241,7 @@ ConfirmSendEther.prototype.render = function () { // `You're sending to Recipient ...${toAddress.slice(toAddress.length - 4)}`, // ]), - h('h3.flex-center.confirm-screen-send-amount', [`$${amountInFIAT}`]), + h('h3.flex-center.confirm-screen-send-amount', [`${amountInFIAT}`]), h('h3.flex-center.confirm-screen-send-amount-currency', [ currentCurrency.toUpperCase() ]), h('div.flex-center.confirm-memo-wrapper', [ h('h3.confirm-screen-send-memo', [ memo ? `"${memo}"` : '' ]), |