Fix manual merging conflicts
This commit is contained in:
parent
383812e649
commit
266241ddfb
|
@ -101,7 +101,7 @@ class EnsInput extends Component {
|
||||||
this.ens = new ENS({ provider, network })
|
this.ens = new ENS({ provider, network })
|
||||||
this.checkName = debounce(this.lookupEnsName.bind(this, 'ENS'), 200)
|
this.checkName = debounce(this.lookupEnsName.bind(this, 'ENS'), 200)
|
||||||
} else if (networkHasRnsSupport) {
|
} else if (networkHasRnsSupport) {
|
||||||
const registryAddress = getRnsRegistryAddress(network);
|
const registryAddress = getRnsRegistryAddress(network)
|
||||||
const provider = global.ethereumProvider
|
const provider = global.ethereumProvider
|
||||||
this.ens = new ENS({ provider, network, registryAddress })
|
this.ens = new ENS({ provider, network, registryAddress })
|
||||||
this.checkName = debounce(this.lookupEnsName.bind(this, 'RNS'), 200)
|
this.checkName = debounce(this.lookupEnsName.bind(this, 'RNS'), 200)
|
||||||
|
@ -135,9 +135,9 @@ class EnsInput extends Component {
|
||||||
toError: null,
|
toError: null,
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
(isValidENSAddress(recipient) || isValidRNSAddress(recipient))
|
(isValidENSAddress(recipient) || isValidRNSAddress(recipient)) &&
|
||||||
&& reason.message === 'ENS name not defined.'
|
reason.message === 'ENS name not defined.'
|
||||||
)
|
) {
|
||||||
setStateObj.hoverText = '${nameService} name not found'
|
setStateObj.hoverText = '${nameService} name not found'
|
||||||
setStateObj.toError = `${nameService.toLowerCase()}NameNotFound`
|
setStateObj.toError = `${nameService.toLowerCase()}NameNotFound`
|
||||||
setStateObj.ensFailure = false
|
setStateObj.ensFailure = false
|
||||||
|
@ -236,5 +236,5 @@ function getRnsRegistryAddress (network) {
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = EnsInput
|
module.exports = EnsInput
|
||||||
|
|
Loading…
Reference in New Issue