aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@gmail.com>2018-04-05 09:21:35 +0800
committerAlexander Tseung <alextsg@gmail.com>2018-04-05 09:21:35 +0800
commit5b2ace3b802f6e120cd72a4d633299aa78b5cae8 (patch)
treefb61667ad8a2d77a2c54c5c3274740cc52e73293 /ui/app
parent037d6e66248d2fc13a9d97a52ce667afe1aa2ae8 (diff)
parent1153120fe84e9d4cde47a7e416028be0fec3c61c (diff)
downloadtangerine-wallet-browser-5b2ace3b802f6e120cd72a4d633299aa78b5cae8.tar
tangerine-wallet-browser-5b2ace3b802f6e120cd72a4d633299aa78b5cae8.tar.gz
tangerine-wallet-browser-5b2ace3b802f6e120cd72a4d633299aa78b5cae8.tar.bz2
tangerine-wallet-browser-5b2ace3b802f6e120cd72a4d633299aa78b5cae8.tar.lz
tangerine-wallet-browser-5b2ace3b802f6e120cd72a4d633299aa78b5cae8.tar.xz
tangerine-wallet-browser-5b2ace3b802f6e120cd72a4d633299aa78b5cae8.tar.zst
tangerine-wallet-browser-5b2ace3b802f6e120cd72a4d633299aa78b5cae8.zip
Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/components/ens-input.js4
-rw-r--r--ui/app/components/pending-tx/confirm-send-ether.js3
2 files changed, 4 insertions, 3 deletions
diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js
index 1f3946817..feb0a7037 100644
--- a/ui/app/components/ens-input.js
+++ b/ui/app/components/ens-input.js
@@ -32,10 +32,10 @@ EnsInput.prototype.render = function () {
const network = this.props.network
const networkHasEnsSupport = getNetworkEnsSupport(network)
- if (!networkHasEnsSupport) return
-
props.onChange(recipient)
+ if (!networkHasEnsSupport) return
+
if (recipient.match(ensRE) === null) {
return this.setState({
loadingEns: false,
diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js
index 4e2f763fc..afd459415 100644
--- a/ui/app/components/pending-tx/confirm-send-ether.js
+++ b/ui/app/components/pending-tx/confirm-send-ether.js
@@ -242,6 +242,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()
@@ -257,7 +258,7 @@ ConfirmSendEther.prototype.getData = function () {
return {
from: {
address: txParams.from,
- name: identities[txParams.from].name,
+ name: account.name,
},
to: {
address: txParams.to,