Merge pull request #3878 from MetaMask/hot-fix-for-new-ui

Hot fix for new ui
MetaMask · Apr 4, 2018 · e1b1da9 · e1b1da9
2 parents 2e70610 + 632a0db
commit e1b1da9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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,