poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix manual merging conflicts

This commit is contained in:
Victor Baranov 2020-06-12 10:35:06 +03:00
parent 383812e649
commit 266241ddfb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
old-ui/app/components/ens-input.js
View File

@ -101,7 +101,7 @@ class EnsInput extends Component {
this.ens = new ENS({ provider, network })
this.checkName = debounce(this.lookupEnsName.bind(this, 'ENS'), 200)
} else if (networkHasRnsSupport) {
const registryAddress = getRnsRegistryAddress(network);
const registryAddress = getRnsRegistryAddress(network)
const provider = global.ethereumProvider
this.ens = new ENS({ provider, network, registryAddress })
this.checkName = debounce(this.lookupEnsName.bind(this, 'RNS'), 200)
@ -135,9 +135,9 @@ class EnsInput extends Component {
toError: null,
}
if (
(isValidENSAddress(recipient) || isValidRNSAddress(recipient))
&& reason.message === 'ENS name not defined.'
)
(isValidENSAddress(recipient) || isValidRNSAddress(recipient)) &&
reason.message === 'ENS name not defined.'
) {
setStateObj.hoverText = '${nameService} name not found'
setStateObj.toError = `${nameService.toLowerCase()}NameNotFound`
setStateObj.ensFailure = false
@ -236,5 +236,5 @@ function getRnsRegistryAddress (network) {
return
}
module.exports = EnsInput