From 5682ff35bca097a8bfad83370f28d29ce9e77f38 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 1 Nov 2022 10:44:29 +0100
Subject: [PATCH] fixing proxy error

---
 apps/remix-ide-e2e/src/tests/proxy.test.ts           |  7 +++++--
 .../run-tab/src/lib/components/contractGUI.tsx       | 12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/proxy.test.ts b/apps/remix-ide-e2e/src/tests/proxy.test.ts
index 29e611b155..11f85a4a8e 100644
--- a/apps/remix-ide-e2e/src/tests/proxy.test.ts
+++ b/apps/remix-ide-e2e/src/tests/proxy.test.ts
@@ -70,12 +70,13 @@ module.exports = {
     browser
       .openFile('myTokenV1.sol')
       .clickLaunchIcon('solidity')
-      .pause(2000)
+      .pause(5000)
       .click('[data-id="compilerContainerCompileBtn"]')
       .waitForElementPresent('select[id="compiledContracts"] option[value=MyToken]', 60000)
       .clickLaunchIcon('udapp')
       .click('select.udapp_contractNames')
       .click('select.udapp_contractNames option[value=MyToken]')
+      .pause(5000)
       .waitForElementPresent('[data-id="contractGUIDeployWithProxyLabel"]')
       .click('[data-id="contractGUIDeployWithProxyLabel"]')
       .createContract('')
@@ -105,7 +106,8 @@ module.exports = {
           done()
         })
       })
-  },
+  },//*[@id="runTabView"]/div/div[2]/div[3]/div[1]/div/div[1]/div[4]/div/div[1]/input
+  // #runTabView > div > div.udapp_container > div:nth-child(3) > div.udapp_deployDropdown > div > div.udapp_contractProperty > div.pl-4.flex-column.d-flex > div > div:nth-child(1) > input
 
   'Should deploy proxy with initialize parameters #group1': function (browser: NightwatchBrowser) {
     browser
@@ -121,6 +123,7 @@ 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')
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 7a14fb3a2a..e33cf07386 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -425,7 +425,7 @@ export function ContractGUI (props: ContractGUIProps) {
       </div>
       {props.deployOption && (props.deployOption || []).length > 0 ? (
         <>
-          <div className="d-flex justify-content-between">
+          <div className="d-flex justify-content-between mt-3">
             <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
               <input
                 id="deployWithProxy"
@@ -436,9 +436,9 @@ export function ContractGUI (props: ContractGUIProps) {
                 checked={deployState.deploy}
               />
               <CustomTooltip
-                tooltipText="An ERC1967 proxy contract will be deployed along with the selected implementation contract."
-                placement={"right"}
-                tooltipClasses="text-nowrap"
+                tooltipText={<span>An ERC1967 proxy and the selected contract will be deployed.</span>}
+                placement={"right-end"}
+                tooltipClasses="text-wrap"
                 tooltipId="deployWithProxyTooltip"
               >
                 <label
@@ -488,7 +488,7 @@ export function ContractGUI (props: ContractGUIProps) {
                         tooltipText={inp.name}
                         tooltipClasses="text-wrap"
                         tooltipId="initializeFieldsTooltip"
-                        placement="right"
+                        placement="top-start"
                       >
                         <input
                           ref={(el) => {
@@ -519,7 +519,7 @@ export function ContractGUI (props: ContractGUIProps) {
                 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="right"
+                placement="top-start"
               >
                 <label
                   htmlFor="upgradeImplementation"