From 9c25775b69ab505f61397f7490188b8ac766749b Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Thu, 22 Oct 2020 10:08:54 -0500
Subject: [PATCH] Prevent conflicting values when network change and QR code in
 same render

---
 .../send/send-content/add-recipient/ens-input.component.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/app/pages/send/send-content/add-recipient/ens-input.component.js b/ui/app/pages/send/send-content/add-recipient/ens-input.component.js
index 0ed9833a4..5c02e2654 100644
--- a/ui/app/pages/send/send-content/add-recipient/ens-input.component.js
+++ b/ui/app/pages/send/send-content/add-recipient/ens-input.component.js
@@ -66,14 +66,17 @@ export default class EnsInput extends Component {
     let newValue
 
     // Set the value of our input based on QR code provided by parent
-    if (input !== value && prevProps.value !== value) {
+    const newProvidedValue = input !== value && prevProps.value !== value
+    if (newProvidedValue) {
       newValue = value
     }
 
     if (prevProps.network !== network) {
       const provider = global.ethereumProvider
       this.ens = new ENS({ provider, network })
-      newValue = input
+      if (!newProvidedValue) {
+        newValue = input
+      }
     }
 
     if (newValue !== undefined) {