1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

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

Hot fix for new ui
This commit is contained in:
kumavis 2018-04-04 14:19:38 -07:00 committed by GitHub
commit e1b1da9113
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -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"

View File

@ -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,