aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-06-14 05:31:58 +0800
committerGitHub <noreply@github.com>2017-06-14 05:31:58 +0800
commit141e66171b05b803a06e68208bed073906a4616d (patch)
tree163d397ca2f75e7096f3c1e82275ce2f2a3d35bb
parentdd7e11d196cdc6b05439f9d49862ea20af9eefce (diff)
parent790712e6fd4b76017e11de08ccfa474c9a7e4a6f (diff)
downloadtangerine-wallet-browser-141e66171b05b803a06e68208bed073906a4616d.tar
tangerine-wallet-browser-141e66171b05b803a06e68208bed073906a4616d.tar.gz
tangerine-wallet-browser-141e66171b05b803a06e68208bed073906a4616d.tar.bz2
tangerine-wallet-browser-141e66171b05b803a06e68208bed073906a4616d.tar.lz
tangerine-wallet-browser-141e66171b05b803a06e68208bed073906a4616d.tar.xz
tangerine-wallet-browser-141e66171b05b803a06e68208bed073906a4616d.tar.zst
tangerine-wallet-browser-141e66171b05b803a06e68208bed073906a4616d.zip
Merge pull request #1600 from MetaMask/i1554-ensSymFix
ENS symbol renders on proper networks
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/components/ens-input.js22
2 files changed, 8 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 167a34828..8afa1eec4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
- The default network on installation is now MainNet
- Fix currency API URL from cryptonator.
- Update gasLimit params with every new block seen.
+- Fix ENS resolver symbol UI.
## 3.7.7 2017-6-8
diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js
index 43bb7ab22..16c50db84 100644
--- a/ui/app/components/ens-input.js
+++ b/ui/app/components/ens-input.js
@@ -7,6 +7,7 @@ const copyToClipboard = require('copy-to-clipboard')
const ENS = require('ethjs-ens')
const networkMap = require('ethjs-ens/lib/network-map.json')
const ensRE = /.+\.eth$/
+const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
module.exports = EnsInput
@@ -21,7 +22,6 @@ EnsInput.prototype.render = function () {
const opts = extend(props, {
list: 'addresses',
onChange: () => {
- this.setState({ ensResolution: '0x0000000000000000000000000000000000000000' })
const network = this.props.network
const networkHasEnsSupport = getNetworkEnsSupport(network)
if (!networkHasEnsSupport) return
@@ -73,6 +73,7 @@ EnsInput.prototype.render = function () {
EnsInput.prototype.componentDidMount = function () {
const network = this.props.network
const networkHasEnsSupport = getNetworkEnsSupport(network)
+ this.setState({ ensResolution: ZERO_ADDRESS })
if (networkHasEnsSupport) {
const provider = global.ethereumProvider
@@ -85,18 +86,10 @@ EnsInput.prototype.lookupEnsName = function () {
const recipient = document.querySelector('input[name="address"]').value
const { ensResolution } = this.state
- if (!this.ens) {
- return this.setState({
- loadingEns: false,
- ensFailure: true,
- hoverText: 'ENS is not supported on your current network.',
- })
- }
-
log.info(`ENS attempting to resolve name: ${recipient}`)
this.ens.lookup(recipient.trim())
.then((address) => {
- if (address === '0x0000000000000000000000000000000000000000') throw new Error('No address has been set for this name.')
+ if (address === ZERO_ADDRESS) throw new Error('No address has been set for this name.')
if (address !== ensResolution) {
this.setState({
loadingEns: false,
@@ -111,7 +104,7 @@ EnsInput.prototype.lookupEnsName = function () {
log.error(reason)
return this.setState({
loadingEns: false,
- ensResolution: '0x0000000000000000000000000000000000000000',
+ ensResolution: ZERO_ADDRESS,
ensFailure: true,
hoverText: reason.message,
})
@@ -124,7 +117,7 @@ EnsInput.prototype.componentDidUpdate = function (prevProps, prevState) {
// If an address is sent without a nickname, meaning not from ENS or from
// the user's own accounts, a default of a one-space string is used.
const nickname = state.nickname || ' '
- if (ensResolution && this.props.onChange &&
+ if (prevState && ensResolution && this.props.onChange &&
ensResolution !== prevState.ensResolution) {
this.props.onChange(ensResolution, nickname)
}
@@ -143,7 +136,7 @@ EnsInput.prototype.ensIcon = function (recipient) {
}
EnsInput.prototype.ensIconContents = function (recipient) {
- const { loadingEns, ensFailure, ensResolution } = this.state || {}
+ const { loadingEns, ensFailure, ensResolution } = this.state || { ensResolution: ZERO_ADDRESS}
if (loadingEns) {
return h('img', {
@@ -160,7 +153,7 @@ EnsInput.prototype.ensIconContents = function (recipient) {
return h('i.fa.fa-warning.fa-lg.warning')
}
- if (ensResolution) {
+ if (ensResolution && (ensResolution !== ZERO_ADDRESS)) {
return h('i.fa.fa-check-circle.fa-lg.cursor-pointer', {
style: { color: 'green' },
onClick: (event) => {
@@ -175,4 +168,3 @@ EnsInput.prototype.ensIconContents = function (recipient) {
function getNetworkEnsSupport (network) {
return Boolean(networkMap[network])
}
-