Merge branch 'develop' into vb-send-all
This commit is contained in:
commit
383812e649
|
@ -7,11 +7,11 @@ import log from 'loglevel'
|
||||||
|
|
||||||
const h = require('react-hyperscript')
|
const h = require('react-hyperscript')
|
||||||
const networkMap = require('ethjs-ens/lib/network-map.json')
|
const networkMap = require('ethjs-ens/lib/network-map.json')
|
||||||
const RNSRegistryData = require('@rsksmart/rns-registry/RNSRegistryData.json');
|
const RNSRegistryData = require('@rsksmart/rns-registry/RNSRegistryData.json')
|
||||||
const ensRE = /.+\..+$/
|
const ensRE = /.+\..+$/
|
||||||
const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
|
const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
|
||||||
const { isValidENSAddress, isValidRNSAddress } = require('../util')
|
const { isValidENSAddress, isValidRNSAddress } = require('../util')
|
||||||
const {
|
const {
|
||||||
RSK_CODE,
|
RSK_CODE,
|
||||||
RSK_TESTNET_CODE,
|
RSK_TESTNET_CODE,
|
||||||
} = require('../../../app/scripts/controllers/network/enums')
|
} = require('../../../app/scripts/controllers/network/enums')
|
||||||
|
@ -222,19 +222,19 @@ function getNetworkEnsSupport (network) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getNetworkRnsSupport (network) {
|
function getNetworkRnsSupport (network) {
|
||||||
return (network == RSK_CODE || network == RSK_TESTNET_CODE);
|
return (network === RSK_CODE || network === RSK_TESTNET_CODE)
|
||||||
}
|
}
|
||||||
|
|
||||||
function getRnsRegistryAddress (network) {
|
function getRnsRegistryAddress (network) {
|
||||||
if (network == RSK_CODE) {
|
if (network === RSK_CODE) {
|
||||||
return RNSRegistryData.address.rskMainnet;
|
return RNSRegistryData.address.rskMainnet
|
||||||
}
|
}
|
||||||
|
|
||||||
if (network == RSK_TESTNET_CODE) {
|
if (network === RSK_TESTNET_CODE) {
|
||||||
return RNSRegistryData.address.rskTestnet;
|
return RNSRegistryData.address.rskTestnet
|
||||||
};
|
};
|
||||||
|
|
||||||
return;
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = EnsInput
|
module.exports = EnsInput
|
||||||
|
|
Loading…
Reference in New Issue