From 3de1873126fa4241b2b149ac35ce7eb4da506ee2 Mon Sep 17 00:00:00 2001 From: frankiebee Date: Wed, 4 Apr 2018 13:56:39 -0700 Subject: [PATCH 1/2] hot-fix new-ui - default to an object if identities is undefined --- ui/app/components/pending-tx/confirm-send-ether.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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, From 632a0db89b0f5f1563b9e0f3f36ea9ddcf2a6cb3 Mon Sep 17 00:00:00 2001 From: frankiebee Date: Wed, 4 Apr 2018 13:58:35 -0700 Subject: [PATCH 2/2] add to CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) 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"