diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-04-05 05:19:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 05:19:38 +0800 |
| commit | e1b1da9113e6d2d7adf0096bbfbbc4a807c07613 (patch) | |
| tree | ff576431ca8363fc6a4099ccbf72cc20bbefa007 | |
| parent | 2e70610423000abf74e95c36342f1eec74bc606f (diff) | |
| parent | 632a0db89b0f5f1563b9e0f3f36ea9ddcf2a6cb3 (diff) | |
| download | tangerine-wallet-browser-e1b1da9113e6d2d7adf0096bbfbbc4a807c07613.tar.gz tangerine-wallet-browser-e1b1da9113e6d2d7adf0096bbfbbc4a807c07613.tar.zst tangerine-wallet-browser-e1b1da9113e6d2d7adf0096bbfbbc4a807c07613.zip | |
Merge pull request #3878 from MetaMask/hot-fix-for-new-ui
Hot fix for new ui
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | ui/app/components/pending-tx/confirm-send-ether.js | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 95aebf37d..2efd01147 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- new ui: fix the confirm transaction screen + ## 4.5.2 Wed Apr 04 2018 - Fix overly strict validation where transactions were rejected with hex encoded "chainId" diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js index d007e6661..7bf20bced 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -237,6 +237,7 @@ ConfirmSendEther.prototype.getData = function () { const { identities } = this.props const txMeta = this.gatherTxMeta() const txParams = txMeta.txParams || {} + const account = identities ? identities[txParams.from] || {} : {} const { FIAT: gasFeeInFIAT, ETH: gasFeeInETH, gasFeeInHex } = this.getGasFee() const { FIAT: amountInFIAT, ETH: amountInETH } = this.getAmount() @@ -252,7 +253,7 @@ ConfirmSendEther.prototype.getData = function () { return { from: { address: txParams.from, - name: identities[txParams.from].name, + name: account.name, }, to: { address: txParams.to, |