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

Hot fix for new ui
feature/default_network_editable
kumavis 7 years ago committed by GitHub
commit e1b1da9113
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      CHANGELOG.md
  2. 3
      ui/app/components/pending-tx/confirm-send-ether.js

@ -2,6 +2,8 @@
## Current Master ## Current Master
- new ui: fix the confirm transaction screen
## 4.5.2 Wed Apr 04 2018 ## 4.5.2 Wed Apr 04 2018
- Fix overly strict validation where transactions were rejected with hex encoded "chainId" - Fix overly strict validation where transactions were rejected with hex encoded "chainId"

@ -237,6 +237,7 @@ ConfirmSendEther.prototype.getData = function () {
const { identities } = this.props const { identities } = this.props
const txMeta = this.gatherTxMeta() const txMeta = this.gatherTxMeta()
const txParams = txMeta.txParams || {} const txParams = txMeta.txParams || {}
const account = identities ? identities[txParams.from] || {} : {}
const { FIAT: gasFeeInFIAT, ETH: gasFeeInETH, gasFeeInHex } = this.getGasFee() const { FIAT: gasFeeInFIAT, ETH: gasFeeInETH, gasFeeInHex } = this.getGasFee()
const { FIAT: amountInFIAT, ETH: amountInETH } = this.getAmount() const { FIAT: amountInFIAT, ETH: amountInETH } = this.getAmount()
@ -252,7 +253,7 @@ ConfirmSendEther.prototype.getData = function () {
return { return {
from: { from: {
address: txParams.from, address: txParams.from,
name: identities[txParams.from].name, name: account.name,
}, },
to: { to: {
address: txParams.to, address: txParams.to,

Loading…
Cancel
Save