From 266241ddfb2f52523d2fd41726a9131d719aa863 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 12 Jun 2020 10:35:06 +0300
Subject: [PATCH] Fix manual merging conflicts

---
 old-ui/app/components/ens-input.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/old-ui/app/components/ens-input.js b/old-ui/app/components/ens-input.js
index 024d2db58..327d201ca 100644
--- a/old-ui/app/components/ens-input.js
+++ b/old-ui/app/components/ens-input.js
@@ -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