From 6dc1640311bab6dc89d76ca6f9d04289b08aa4f9 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 4 Nov 2022 12:40:39 +0100
Subject: [PATCH] fix bad overwrite of proxy feature

---
 .../src/lib/components/contractGUI.tsx        | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
index 5950d685a4..652ffcd861 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -557,30 +557,11 @@ export function ContractGUI (props: ContractGUIProps) {
                   <label className="mt-2 text-left d-block">
                     Proxy Address :
                   </label>
-                  <CustomTooltip
-                    tooltipText="Enter previously deployed proxy address on the selected network"
-                    placement="left"
-                    tooltipId="ERC1967AddressInputTooltip"
-                    tooltipClasses="text-nowrap"
-                  >
-                    <input
-                      style={{ height: 32 }}
-                      className="form-control udapp_input"
-                      data-id="ERC1967AddressInput"
-                      placeholder="proxy address"
-                      onChange={handleSetProxyAddress}
-                    />
-                  </CustomTooltip>
-                </div>
-               : (
-                <span
-                  className="text-capitalize"
-                  data-id="lastDeployedERC1967Address"
-                  style={{ fontSize: ".8em" }}
-                >
-                  {proxyAddress || "No proxy address available"}
-                </span>
-              )}
+                  <input style={{ height: 32 }} className="form-control udapp_input" data-id="ERC1967AddressInput" placeholder='proxy address' title='Enter previously deployed proxy address on the selected network' onChange={handleSetProxyAddress} onBlur={() => validateProxyAddress(proxyAddress) } />
+                  { proxyAddressError && <span className='text-lowercase' data-id="errorMsgProxyAddress" style={{ fontSize: '.8em' }}>{ proxyAddressError }</span> }
+                </div> :
+                <span className='text-capitalize' data-id="lastDeployedERC1967Address" style={{ fontSize: '.8em' }}>{ proxyAddress || proxyAddressError }</span>
+              }
             </div>
           </div>
         </>