From e797eb09b462af425c6cdaadc89fecbf578ddda9 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 1 Nov 2022 14:44:05 +0100
Subject: [PATCH] fix failing proxy e2e

---
 apps/remix-ide-e2e/src/tests/proxy.test.ts    | 11 ++++++-----
 .../src/lib/components/contractGUI.tsx        | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/proxy.test.ts b/apps/remix-ide-e2e/src/tests/proxy.test.ts
index 11f85a4a8e..ef587929e4 100644
--- a/apps/remix-ide-e2e/src/tests/proxy.test.ts
+++ b/apps/remix-ide-e2e/src/tests/proxy.test.ts
@@ -123,11 +123,12 @@ module.exports = {
       .click('select.udapp_contractNames option[value=MyInitializedToken]')
       .waitForElementPresent('[data-id="contractGUIDeployWithProxyLabel"]')
       .click('[data-id="contractGUIDeployWithProxyLabel"]')
-      .pause(5000)
-      .waitForElementPresent('input[title="tokenName"]')
-      .waitForElementPresent('input[title="tokenSymbol"]')
-      .setValue('input[title="tokenName"]', 'Remix')
-      .setValue('input[title="tokenSymbol"]', "R")
+      .useXpath()
+      .waitForElementPresent('//*[@id="runTabView"]/div/div[2]/div[3]/div[1]/div/div[1]/div[4]/div/div[1]/input')
+      .waitForElementPresent('//*[@id="runTabView"]/div/div[2]/div[3]/div[1]/div/div[1]/div[4]/div/div[2]/input')
+      .setValue('//*[@id="runTabView"]/div/div[2]/div[3]/div[1]/div/div[1]/div[4]/div/div[1]/input', 'Remix')
+      .setValue('//*[@id="runTabView"]/div/div[2]/div[3]/div[1]/div/div[1]/div[4]/div/div[2]/input', "R")
+      .useCss()
       .createContract('')
       .waitForElementContainsText('[data-id="udappNotifyModalDialogModalTitle-react"]', 'Deploy Implementation & Proxy (ERC1967)')
       .waitForElementVisible('[data-id="udappNotify-modal-footer-ok-react"]')
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 0b72cba6ca..42015b36fb 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -435,20 +435,21 @@ export function ContractGUI (props: ContractGUIProps) {
                 onChange={(e) => handleDeployProxySelect(e.target.checked)}
                 checked={deployState.deploy}
               />
-              <CustomTooltip
+              {/* <CustomTooltip
                 tooltipText={<span>An ERC1967 proxy contract<br/> will be deployed along<br/> with the selected <br/>implementation contract.</span>}
                 placement={"bottom-start"}
                 tooltipClasses="text-wrap"
                 tooltipId="deployWithProxyTooltip"
-              >
+              > */}
                 <label
+                  // title="An ERC1967 proxy contract will be deployed along with the selected implementation contract"
                   htmlFor="deployWithProxy"
                   data-id="contractGUIDeployWithProxyLabel"
                   className="m-0 form-check-label w-100 custom-control-label udapp_checkboxAlign"
                 >
                   Deploy with Proxy
                 </label>
-              </CustomTooltip>
+              {/* </CustomTooltip> */}
             </div>
             <div>
               {props.initializerOptions &&
@@ -484,12 +485,12 @@ export function ContractGUI (props: ContractGUIProps) {
                         {" "}
                         {inp.name}:{" "}
                       </label>
-                      <CustomTooltip
+                      {/* <CustomTooltip
                         tooltipText={inp.name}
                         tooltipClasses="text-wrap"
                         tooltipId="initializeFieldsTooltip"
                         placement="top-start"
-                      >
+                      > */}
                         <input
                           ref={(el) => {
                             initializeFields.current[index] = el;
@@ -498,7 +499,7 @@ export function ContractGUI (props: ContractGUIProps) {
                           className="form-control udapp_input"
                           placeholder={inp.type}
                         />
-                      </CustomTooltip>
+                      {/* </CustomTooltip> */}
                     </div>
                   );
                 })}
@@ -515,12 +516,12 @@ export function ContractGUI (props: ContractGUIProps) {
                 onChange={(e) => handleUpgradeImpSelect(e.target.checked)}
                 checked={deployState.upgrade}
               />
-              <CustomTooltip
+              {/* <CustomTooltip
                 tooltipText="The implementation contract will be deployed and then the proxy contract will be updated with new implementation's address."
                 tooltipClasses="text-wrap"
                 tooltipId="upgradeImplementationTooltip"
                 placement="top-start"
-              >
+              > */}
                 <label
                   htmlFor="upgradeImplementation"
                   data-id="contractGUIUpgradeImplementationLabel"
@@ -528,7 +529,7 @@ export function ContractGUI (props: ContractGUIProps) {
                 >
                   Upgrade with Proxy
                 </label>
-              </CustomTooltip>
+              {/* </CustomTooltip> */}
             </div>
             <span onClick={handleToggleUpgradeImp}>
               <i