From 6672378ae21335e20de01f9071f0cf41dab180df Mon Sep 17 00:00:00 2001
From: Javi Esses <javiesses@hotmail.com>
Date: Thu, 28 May 2020 11:23:07 -0300
Subject: [PATCH] Fix typo and improved code readability

---
 old-ui/app/components/ens-input.js | 13 +++++++++----
 old-ui/app/util.js                 |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/old-ui/app/components/ens-input.js b/old-ui/app/components/ens-input.js
index d639f68d3..e5f285ff0 100644
--- a/old-ui/app/components/ens-input.js
+++ b/old-ui/app/components/ens-input.js
@@ -86,7 +86,7 @@ EnsInput.prototype.render = function () {
 EnsInput.prototype.componentDidMount = function () {
   const network = this.props.network
   const networkHasEnsSupport = getNetworkEnsSupport(network)
-  const rnsRegistry = getNetworkRnsSupport(network)
+  const networkHasRnsSupport = getNetworkRnsSupport(network)
 
   this.setState({ ensResolution: ZERO_ADDRESS })
 
@@ -94,9 +94,10 @@ EnsInput.prototype.componentDidMount = function () {
     const provider = global.ethereumProvider
     this.ens = new ENS({ provider, network })
     this.checkName = debounce(this.lookupEnsName.bind(this, 'ENS'), 200)
-  } else if (rnsRegistry) {
+  } else if (networkHasRnsSupport) {
+    const registryAddress = getRnsRegistryAddress(network);
     const provider = global.ethereumProvider
-    this.ens = new ENS({ provider, network, registryAddress: rnsRegistry })
+    this.ens = new ENS({ provider, network, registryAddress })
     this.checkName = debounce(this.lookupEnsName.bind(this, 'RNS'), 200)
   }
 }
@@ -132,7 +133,7 @@ EnsInput.prototype.lookupEnsName = function (nameService) {
       && reason.message === 'ENS name not defined.'
     ) {
       setStateObj.hoverText = `${nameService} name not found`
-      setStateObj.toError = `${nameService.toLowerCase}NameNotFound`
+      setStateObj.toError = `${nameService.toLowerCase()}NameNotFound`
       setStateObj.ensFailure = false
     } else {
       log.error(reason)
@@ -214,6 +215,10 @@ function getNetworkEnsSupport (network) {
 }
 
 function getNetworkRnsSupport (network) {
+  return (network == RSK_CODE || network == RSK_TESTNET_CODE);
+}
+
+function getRnsRegistryAddress (network) {
   if (network == RSK_CODE) {
     return RNSRegistryData.address.rskMainnet;
   }
diff --git a/old-ui/app/util.js b/old-ui/app/util.js
index 7cc97250d..9514262f5 100644
--- a/old-ui/app/util.js
+++ b/old-ui/app/util.js
@@ -141,7 +141,7 @@ function isValidENSAddress (address) {
 }
 
 function isValidRNSAddress (address) {
-  return address.match(/([a-z0-9])+\.(rsk)/)
+  return address.match(/^[a-z0-9]+\.rsk$/)
 }
 
 function isInvalidChecksumAddress (address, network) {