From 5c795e4c491836bd059d97233a379425b86dcfd2 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 21 Jun 2022 12:06:11 +0200
Subject: [PATCH 01/49] show verified icon for plugins

---
 libs/remix-ui/panel/src/lib/plugins/panel-header.tsx         | 5 ++++-
 .../plugin-manager/src/lib/components/ActivePluginCard.tsx   | 3 +++
 .../plugin-manager/src/lib/components/InactivePluginCard.tsx | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
index 6cb3ed8116..a2e56f803c 100644
--- a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
+++ b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
@@ -20,7 +20,10 @@ const RemixUIPanelHeader = (props: RemixPanelProps) => {
 
   return (
     <header className='swapitHeader'><h6 data-id='sidePanelSwapitTitle'>{plugin?.profile.displayName || plugin?.profile.name}</h6>
-      {plugin?.profile.documentation ? (<a href={plugin.profile.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>) : ''}
+      <div className="flex flex-row">
+        {plugin?.profile.verified ? (<i aria-hidden="true" className="text-success fas fa-check" title="Verified by Remix"></i>) : '' }
+        {plugin?.profile.documentation ? (<a href={plugin.profile.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>) : ''}
+      </div>
     </header>)
 }
 
diff --git a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
index 593c6a2edd..86b8f87dfb 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
@@ -19,6 +19,9 @@ function ActivePluginCard ({
           <h6 className="remixui_displayName plugin-name">
             <div>
               { profile.displayName || profile.name }
+              { profile.verified &&
+                <i aria-hidden="true" className="px-1 text-success fas fa-check" title="Verified by Remix"></i>
+              }
               { profile.documentation &&
                 <a href={profile.documentation} className="px-1" title="link to documentation" target="_blank" rel="noreferrer">
                   <i aria-hidden="true" className="fas fa-book"/>
diff --git a/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx b/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
index 8c4d72d20c..73b4316276 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
@@ -22,6 +22,9 @@ function InactivePluginCard ({
           <h6 className="remixui_displayName plugin-name">
             <div>
               { profile.displayName || profile.name }
+              { profile.verified &&
+                <i aria-hidden="true" className="px-1 text-success fas fa-check" title="Verified by Remix"></i>
+              }
               { profile.documentation &&
                 <a href={profile.documentation} className="px-1" title="link to documentation" target="_blank" rel="noreferrer">
                   <i aria-hidden="true" className="fas fa-book"/>

From 9db8ef70dfb07989192aca0f4d83b053d08ca45a Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Wed, 29 Jun 2022 12:20:52 +0200
Subject: [PATCH 02/49] improving UI for Plugin details/info section

---
 .../panel/src/lib/plugins/panel-header.tsx    | 41 +++++++++++++++++--
 libs/remix-ui/panel/src/lib/plugins/panel.css |  1 -
 .../src/lib/components/ActivePluginCard.tsx   |  4 +-
 .../src/lib/components/InactivePluginCard.tsx |  2 +-
 .../workspace/src/lib/remix-ui-workspace.tsx  |  2 +-
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
index a2e56f803c..9e249aa295 100644
--- a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
+++ b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
@@ -8,6 +8,7 @@ export interface RemixPanelProps {
   }
 const RemixUIPanelHeader = (props: RemixPanelProps) => {
   const [plugin, setPlugin] = useState<PluginRecord>()
+  const [toggleExpander, setToggleExpander] = useState<boolean>(false)
 
   useEffect(() => {
     if (props.plugins) {
@@ -18,11 +19,43 @@ const RemixUIPanelHeader = (props: RemixPanelProps) => {
     }
   }, [props])
 
+  const toggleClass = () => {
+    setToggleExpander(!toggleExpander)
+  }
+
   return (
-    <header className='swapitHeader'><h6 data-id='sidePanelSwapitTitle'>{plugin?.profile.displayName || plugin?.profile.name}</h6>
-      <div className="flex flex-row">
-        {plugin?.profile.verified ? (<i aria-hidden="true" className="text-success fas fa-check" title="Verified by Remix"></i>) : '' }
-        {plugin?.profile.documentation ? (<a href={plugin.profile.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>) : ''}
+    <header className='d-flex flex-column'>
+      <div className="swapitHeader px-3 pt-3 pb-0 d-flex flex-row">
+        <h6 data-id='sidePanelSwapitTitle'>{plugin?.profile.displayName || plugin?.profile.name}</h6>
+        <div className="d-flex flex-row">
+          <div className="d-flex flex-row">
+            {plugin?.profile?.maintainedBy?.toLowerCase() === "remix" && (<i aria-hidden="true" className="text-success fas fa-check" title="Maintained by Remix"></i>)}
+            {plugin?.profile.documentation && (<a href={plugin.profile.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>) }
+          </div>
+          <div className="swapitHeaderInfoSection d-flex justify-content-between" data-id='swapitHeaderInfoSectionId' onClick={toggleClass} title="Plugin info">
+            <i className={`px-2 ml-2 mt-1 ${!toggleExpander ? 'fas fa-angle-right' : 'fas fa-angle-down bg-light'}`} aria-hidden="true"></i>
+          </div>
+        </div>
+      </div>
+      <div className={`bg-light p-3 pt-1 border-bottom flex-column ${toggleExpander ? "d-flex" : "d-none"}`}>
+        {plugin?.profile.author && <span className="d-flex flex-row align-items-center">
+          <label className="mb-0 pr-2">Author:</label>
+          <span> plugin.profile.author </span>
+        </span>}
+        {plugin?.profile.maintainedBy && <span className="d-flex flex-row align-items-center">
+          <label className="mb-0 pr-2">Maintained by:</label>
+          <span> plugin.profile.maintainedBy</span>
+        </span>}
+        {plugin?.profile.documentation && <span className="d-flex flex-row align-items-center">
+          <label className="mb-0 pr-2">Documentation:</label>
+          <span>
+            <a href={plugin.profile.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>
+          </span>
+        </span>}
+        {plugin?.profile.description && <span className="d-flex flex-row align-items-center">
+          <label className="mb-0 pr-2">Description:</label>
+          <span> plugin?.profile.description</span>
+        </span>}
       </div>
     </header>)
 }
diff --git a/libs/remix-ui/panel/src/lib/plugins/panel.css b/libs/remix-ui/panel/src/lib/plugins/panel.css
index 8356d6ef15..b9988e19af 100644
--- a/libs/remix-ui/panel/src/lib/plugins/panel.css
+++ b/libs/remix-ui/panel/src/lib/plugins/panel.css
@@ -22,7 +22,6 @@
 .swapitHeader {
     display: flex;
     align-items: center;
-    padding: 16px 24px 15px;
     justify-content: space-between;
     text-transform: uppercase;
 }
diff --git a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
index 86b8f87dfb..6a9b604907 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
@@ -19,8 +19,8 @@ function ActivePluginCard ({
           <h6 className="remixui_displayName plugin-name">
             <div>
               { profile.displayName || profile.name }
-              { profile.verified &&
-                <i aria-hidden="true" className="px-1 text-success fas fa-check" title="Verified by Remix"></i>
+              { profile.maintainedBy.toLowerCase() == "remix" &&
+                <i aria-hidden="true" className="px-1 text-success fas fa-check" title="Maintained by Remix"></i>
               }
               { profile.documentation &&
                 <a href={profile.documentation} className="px-1" title="link to documentation" target="_blank" rel="noreferrer">
diff --git a/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx b/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
index 73b4316276..018b8ed432 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
@@ -22,7 +22,7 @@ function InactivePluginCard ({
           <h6 className="remixui_displayName plugin-name">
             <div>
               { profile.displayName || profile.name }
-              { profile.verified &&
+              { profile.maintainedBy.toLowerCase() == "remix" &&
                 <i aria-hidden="true" className="px-1 text-success fas fa-check" title="Verified by Remix"></i>
               }
               { profile.documentation &&
diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index 98a80306bd..06a24ca19b 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -155,7 +155,7 @@ export function Workspace () {
         <div>
           <header>
             <div className="mb-2">
-              <label className="form-check-label" htmlFor="workspacesSelect">
+              <label className="pl-1 form-check-label" htmlFor="workspacesSelect">
                 Workspaces
               </label>
               <span className="remixui_menu">

From 6b642ee177f7288445a29630d66a9197d1d8a0d4 Mon Sep 17 00:00:00 2001
From: Bruce Xu <95468177+brucexu-eth@users.noreply.github.com>
Date: Sat, 9 Jul 2022 13:09:49 +1200
Subject: [PATCH 03/49] Update Nx CLI links

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 06fd3fbe16..84cc44a09b 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ Note: It contains the latest supported version of Solidity available at the time
     "npm": "^6.14.15"
   }
 ```
-* Install [Nx CLI](https://nx.dev/react/cli/overview) globally to enable running **nx executable commands**.
+* Install [Nx CLI](https://nx.dev/using-nx/nx-cli) globally to enable running **nx executable commands**.
 ```bash
 yarn global add @nrwl/cli
 ```
@@ -127,7 +127,7 @@ curl https://raw.githubusercontent.com/ethereum/remix-project/master/docker-comp
 
 ### Troubleshooting
 
-If you have trouble building the project, make sure that you have the correct version of `node`, `npm` and `nvm`. Also ensure [Nx CLI](https://nx.dev/react/cli/overview) is installed globally.
+If you have trouble building the project, make sure that you have the correct version of `node`, `npm` and `nvm`. Also ensure [Nx CLI](https://nx.dev/using-nx/nx-cli) is installed globally.
 
 Run:
 

From 0d89ca6d84c6f8de0ced71411699685c99466cf6 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 11 Jul 2022 11:10:30 +0200
Subject: [PATCH 04/49] update plugin

---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 54a2b7c8aa..d83a9464e5 100644
--- a/package.json
+++ b/package.json
@@ -153,13 +153,13 @@
     "@ethersphere/bee-js": "^3.2.0",
     "@isomorphic-git/lightning-fs": "^4.4.1",
     "@monaco-editor/react": "^4.3.1",
-    "@remixproject/engine": "^0.3.28",
-    "@remixproject/engine-web": "^0.3.28",
-    "@remixproject/plugin": "^0.3.28",
-    "@remixproject/plugin-api": "^0.3.28",
-    "@remixproject/plugin-utils": "^0.3.28",
-    "@remixproject/plugin-webview": "^0.3.28",
-    "@remixproject/plugin-ws": "^0.3.28",
+    "@remixproject/engine": "^0.3.31",
+    "@remixproject/engine-web": "^0.3.31",
+    "@remixproject/plugin": "^0.3.31",
+    "@remixproject/plugin-api": "^0.3.31",
+    "@remixproject/plugin-utils": "^0.3.31",
+    "@remixproject/plugin-webview": "^0.3.31",
+    "@remixproject/plugin-ws": "^0.3.31",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.2",
     "axios": ">=0.26.0",

From f4eff3c5c917172cb127cb27351fc3a348206f8a Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 11 Jul 2022 11:17:59 +0200
Subject: [PATCH 05/49] lock

---
 yarn.lock | 84 +++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 220d2abac5..6bac163214 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3749,63 +3749,63 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.2.tgz#0798c03351f0dea1a5a4cabddf26a55a7cbee590"
   integrity sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==
 
-"@remixproject/engine-web@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/engine-web/-/engine-web-0.3.28.tgz#9a47c979a89764cb96d3f5da0d6802d1ca875c94"
-  integrity sha512-JTwTuonW+pI7WsSsgGHAzPynGjIdG34VnPrspR9XKBQO4+NX7m3lbNIMUUviyrbqIoGiGtgYd/ry98uLpTHr4g==
+"@remixproject/engine-web@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/engine-web/-/engine-web-0.3.31.tgz#42ee5c5d874ef9646090342ca8b430e3fe1046e8"
+  integrity sha512-GYeUB4Y0NaVc23mSmVByhx6pCvjzfz8iBbJCwaUB3q61uyRQ1wMM0P/47qqwZMukPi7x4bFUpN41C6rKq7ECug==
   dependencies:
-    "@remixproject/engine" "0.3.28"
-    "@remixproject/plugin-api" "0.3.28"
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/engine" "0.3.31"
+    "@remixproject/plugin-api" "0.3.31"
+    "@remixproject/plugin-utils" "0.3.31"
 
-"@remixproject/engine@0.3.28", "@remixproject/engine@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.28.tgz#3656ee029d3cbc22f8ad95bd925176a75057a475"
-  integrity sha512-27SHaCrG3KrPfMa1MYud4tE9xUIJKITEUsql99fhN7x12lOmgGZFjiqIG/WWjCMmT7OMG3vtLayiZrsYkzHCVw==
+"@remixproject/engine@0.3.31", "@remixproject/engine@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.31.tgz#6dcc209dbd993646430335c9454ce1a739d1a45f"
+  integrity sha512-5VTl9bkeU3fd3IUV8wy7kXHMd3RfnUsf6dlmORM9Np1oMZ9nhdhUsyJO/qXyrvR1PbyJIxPz/qM4+W5MGvOrnQ==
   dependencies:
-    "@remixproject/plugin-api" "0.3.28"
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/plugin-api" "0.3.31"
+    "@remixproject/plugin-utils" "0.3.31"
 
-"@remixproject/plugin-api@0.3.28", "@remixproject/plugin-api@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.28.tgz#660f068681bc1780284768e4ce1b4f70ea4ba859"
-  integrity sha512-tOzVFR504037weEkNHQGZsk+Ebxcu/xnBsVCkJaQaBMb+H/i6YevKQmoR1aGcH+JfQxc8eS8LGC65MaV8zmcWg==
+"@remixproject/plugin-api@0.3.31", "@remixproject/plugin-api@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.31.tgz#86e7c458c58ff200bd927fd3d642877f4b5a0013"
+  integrity sha512-LOJRHxORNp7zW8k7//DQz5aZ7eqB7TwhYXrvzqvaryDTvtvJGWrlTHg81hzALynaxZKEWneohxjUxKvGp/eA4g==
   dependencies:
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/plugin-utils" "0.3.31"
 
-"@remixproject/plugin-utils@0.3.28", "@remixproject/plugin-utils@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.28.tgz#eefd3b603f223cf6fba9b914ef3c9a62bd8435b6"
-  integrity sha512-5CayTgMqRiOguanTy6kpuRgCmjEFLUu2K4Rs7Zmt+GOzHucmwkDxYQO+3hFv0Jz/M/6yC5wkKYTx8vfPLLdEBQ==
+"@remixproject/plugin-utils@0.3.31", "@remixproject/plugin-utils@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.31.tgz#80771e00c1a1b776432abb17b1f4b2e25600d4f6"
+  integrity sha512-OOAjoSd+ErBMrcNQEh80NU3BjJ9fHXuftRfy5Ul9aGXN3b1LJSNVvfrG+FxX6lpyaAK5JBj+aB9pgFozgb2wlw==
   dependencies:
     tslib "2.0.1"
 
-"@remixproject/plugin-webview@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-webview/-/plugin-webview-0.3.28.tgz#ce03ad0801e0fd1e5bce59565b77b6698ad07596"
-  integrity sha512-DodSkN0vMSo2DEEoBOWyKxC/ElvBA826vhX+JVGXA8HGS45aavplZIN967hsc+SdzjV1UZfSNKEHttLGwM1BIw==
+"@remixproject/plugin-webview@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-webview/-/plugin-webview-0.3.31.tgz#e5cce7d0089439b35aee4ab2a724add1e5d36b40"
+  integrity sha512-8yoKwIkRi9S+rqvFShNt01FfXX0H/Fijn7UkWFWJ/V6ULcw2cw9ViCz8cYZLhNUpxqezyu/LKDQL9g1TbJJoYw==
   dependencies:
-    "@remixproject/plugin" "0.3.28"
-    "@remixproject/plugin-api" "0.3.28"
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/plugin" "0.3.31"
+    "@remixproject/plugin-api" "0.3.31"
+    "@remixproject/plugin-utils" "0.3.31"
     axios "^0.21.1"
 
-"@remixproject/plugin-ws@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-ws/-/plugin-ws-0.3.28.tgz#4f6022b1c8ef6356299c545f6164bce48aac60fe"
-  integrity sha512-i3He9t4qvcBQxzshFx66D6drqLlySmV7Cb+NeYtMOYlWxQSJtUakp/Px1Tl3IDFQXDfpXxvDvYhn2w0AWPBOqw==
+"@remixproject/plugin-ws@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-ws/-/plugin-ws-0.3.31.tgz#a2bb415cc32a5b036b9b3759520088b8ceaa0d5a"
+  integrity sha512-Z4G6vkGxxCP+ibGNHAvNaFjYE4hbsazOEL50pMnda6LZNci9akMSiI/1MIZscVSMU8l2sYOoNUsWvLfLkIkYKQ==
   dependencies:
-    "@remixproject/plugin" "0.3.28"
-    "@remixproject/plugin-api" "0.3.28"
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/plugin" "0.3.31"
+    "@remixproject/plugin-api" "0.3.31"
+    "@remixproject/plugin-utils" "0.3.31"
 
-"@remixproject/plugin@0.3.28", "@remixproject/plugin@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.28.tgz#3e40de6d0441e6b47ca17c904e57562cb285a4d3"
-  integrity sha512-sw+cow3GKAcEacXLvdJwtHHIphPty4KRMZ6tcQHdtx/iCKTMNdw2hribKPnvTO+6mXE+4oAKCrFqeTdVp/rd1w==
+"@remixproject/plugin@0.3.31", "@remixproject/plugin@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.31.tgz#b6c6b58d2c7964e37024eeca4819c70ece1f3953"
+  integrity sha512-9ntMU9CzStloahm/wXt4V8n64ERgJzY5nG0bzQfjnI12knrdTmUo+LC42M2xaTBDDP9CzMPdqClg7XhhRLzohA==
   dependencies:
-    "@remixproject/plugin-api" "0.3.28"
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/plugin-api" "0.3.31"
+    "@remixproject/plugin-utils" "0.3.31"
     events "3.2.0"
 
 "@restart/context@^2.1.4":

From 125e35e595afb3fbccc5d6f3cadd57ee66c74a0d Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Mon, 11 Jul 2022 17:12:18 +0530
Subject: [PATCH 06/49] 404.html added

---
 apps/remix-ide/src/404.html | 10 ++++++++++
 workspace.json              |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 apps/remix-ide/src/404.html

diff --git a/apps/remix-ide/src/404.html b/apps/remix-ide/src/404.html
new file mode 100644
index 0000000000..908c62ad8e
--- /dev/null
+++ b/apps/remix-ide/src/404.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test Remix</title>
+  </head>
+  <body></body>
+  <script>
+    window.location.href = '/address/#' + window.location.pathname.replace('/address', '')
+  </script>
+</html>
\ No newline at end of file
diff --git a/workspace.json b/workspace.json
index 02a11c683b..b1ec5f63d5 100644
--- a/workspace.json
+++ b/workspace.json
@@ -18,6 +18,7 @@
             "assets": [
               "apps/remix-ide/src/assets",
               "apps/remix-ide/src/index.html",
+              "apps/remix-ide/src/404.html",
               "apps/remix-ide/src/favicon.ico"
             ],
             "styles": [],

From 33941218860bf075f2bca70f2384c7bdce1c8111 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Mon, 11 Jul 2022 17:12:46 +0530
Subject: [PATCH 07/49] query params updated

---
 libs/remix-lib/src/query-params.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/remix-lib/src/query-params.ts b/libs/remix-lib/src/query-params.ts
index 7e89b226ff..41374be3bf 100644
--- a/libs/remix-lib/src/query-params.ts
+++ b/libs/remix-lib/src/query-params.ts
@@ -17,7 +17,9 @@ export class QueryParams  {
   }
 
   get () {
-    const qs = window.location.hash.substr(1)
+    let qs 
+    if (window.location.hash.startsWith('#/#')) qs = window.location.hash.substr(3)
+    else qs = window.location.hash.substr(1)
 
     if (window.location.search.length > 0) {
       // use legacy query params instead of hash

From 4f2170c9fd69210f39314d7bacca9ec13f7a2de0 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Mon, 11 Jul 2022 17:15:01 +0530
Subject: [PATCH 08/49] 404 updated

---
 apps/remix-ide/src/404.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide/src/404.html b/apps/remix-ide/src/404.html
index 908c62ad8e..f0cefda8bb 100644
--- a/apps/remix-ide/src/404.html
+++ b/apps/remix-ide/src/404.html
@@ -1,10 +1,15 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Test Remix</title>
+    <title></title>
   </head>
   <body></body>
   <script>
-    window.location.href = '/address/#' + window.location.pathname.replace('/address', '')
+    let route = window.location.pathname
+    if (route.startsWith('/address/0x') && route.length === 51) {
+      window.location.href = '/#/#address=' + route.replace('/address/', '')
+    } else if (route.endsWith('.sol')) {
+      window.location.href = '/#/#url=https://github.com' + route 
+    } else window.location.href = '/' 
   </script>
 </html>
\ No newline at end of file

From 454fc54af43d1ed3eb440b335301fdb5544b4f2f Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Mon, 11 Jul 2022 17:19:17 +0530
Subject: [PATCH 09/49] access address as query param

---
 .../workspace/src/lib/actions/index.ts        | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/libs/remix-ui/workspace/src/lib/actions/index.ts b/libs/remix-ui/workspace/src/lib/actions/index.ts
index b684fdc05a..a5b4491c94 100644
--- a/libs/remix-ui/workspace/src/lib/actions/index.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/index.ts
@@ -21,7 +21,8 @@ let plugin, dispatch: React.Dispatch<any>
 export type UrlParametersType = {
   gist: string,
   code: string,
-  url: string
+  url: string,
+  address: string
 }
 
 const basicWorkspaceInit = async (workspaces: { name: string; isGitRepo: boolean; }[], workspaceProvider) => {
@@ -63,10 +64,9 @@ export const initWorkspace = (filePanelPlugin) => async (reducerDispatch: React.
       dispatch(setCurrentWorkspace({ name: 'code-sample', isGitRepo: false }))
       const filePath = await loadWorkspacePreset('code-template')
       plugin.on('editor', 'editorMounted', async () => await plugin.fileManager.openFile(filePath))
-    } else if (window.location.pathname && window.location.pathname !== '/') {
-      let route = window.location.pathname
-      if (route.startsWith('/address/0x') && route.length === 51) {
-        const contractAddress = route.split('/')[2]
+    } else if (params.address) {
+      if (params.address.startsWith('0x') && params.address.length === 42) {
+        const contractAddress = params.address
         plugin.call('notification', 'toast', `Looking for contract(s) verified on different networks of Etherscan for contract address ${contractAddress} .....`)
         let data
         let count = 0
@@ -109,23 +109,6 @@ export const initWorkspace = (filePanelPlugin) => async (reducerDispatch: React.
         } catch (error) {
           await basicWorkspaceInit(workspaces, workspaceProvider)
         }
-      } else if (route.endsWith('.sol')) {
-        if (route.includes('blob')) route = route.replace('/blob', '')
-        let response: AxiosResponse
-        try {
-          response = await axios.get(`https://raw.githubusercontent.com${route}`)
-        } catch (error) {
-          plugin.call('notification', 'toast', `cound not find ${route} on GitHub`)
-          await basicWorkspaceInit(workspaces, workspaceProvider)
-        }
-        if (response && response.status === 200) {
-          const content = response.data
-          await createWorkspaceTemplate('github-code-sample', 'code-template')
-          plugin.setWorkspace({ name: 'github-code-sample', isLocalhost: false })
-          dispatch(setCurrentWorkspace({ name: 'github-code-sample', isGitRepo: false }))
-          await workspaceProvider.set(route, content)
-          plugin.on('editor', 'editorMounted', async () => await plugin.fileManager.openFile(route))
-        } else await basicWorkspaceInit(workspaces, workspaceProvider)
       } else await basicWorkspaceInit(workspaces, workspaceProvider)
     } else if (localStorage.getItem("currentWorkspace")) {
       const index = workspaces.findIndex(element => element.name == localStorage.getItem("currentWorkspace"))

From 2c6ce58d02be594a763d94116f8ec4ea979d5351 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Mon, 11 Jul 2022 17:21:52 +0530
Subject: [PATCH 10/49] add 404.html in source

---
 .circleci/config.yml                                | 6 +++---
 apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh | 2 +-
 apps/remix-ide/ci/deploy_from_travis_remix-beta.sh  | 2 +-
 apps/remix-ide/ci/deploy_from_travis_remix-live.sh  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8bcbed1fca..988b8940ea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -323,7 +323,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/raw-loader*.js dist/apps/remix-ide/assets dist/apps/remix-ide/main*.js dist/apps/remix-ide/polyfills*.js dist/apps/remix-ide/favicon.ico dist/apps/remix-ide/vendors~app*.js dist/apps/remix-ide/app*.js"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/404.html dist/apps/remix-ide/raw-loader*.js dist/apps/remix-ide/assets dist/apps/remix-ide/main*.js dist/apps/remix-ide/polyfills*.js dist/apps/remix-ide/favicon.ico dist/apps/remix-ide/vendors~app*.js dist/apps/remix-ide/app*.js"
     working_directory: ~/remix-project
 
     steps:
@@ -352,7 +352,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/raw-loader*.js dist/apps/remix-ide/assets dist/apps/remix-ide/main*.js dist/apps/remix-ide/polyfills*.js dist/apps/remix-ide/favicon.ico dist/apps/remix-ide/vendors~app*.js dist/apps/remix-ide/app*.js"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/404.html dist/apps/remix-ide/raw-loader*.js dist/apps/remix-ide/assets dist/apps/remix-ide/main*.js dist/apps/remix-ide/polyfills*.js dist/apps/remix-ide/favicon.ico dist/apps/remix-ide/vendors~app*.js dist/apps/remix-ide/app*.js"
     working_directory: ~/remix-project
 
     steps:
@@ -380,7 +380,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/raw-loader*.js dist/apps/remix-ide/assets dist/apps/remix-ide/main*.js dist/apps/remix-ide/polyfills*.js dist/apps/remix-ide/favicon.ico dist/apps/remix-ide/vendors~app*.js dist/apps/remix-ide/app*.js"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/404.html dist/apps/remix-ide/raw-loader*.js dist/apps/remix-ide/assets dist/apps/remix-ide/main*.js dist/apps/remix-ide/polyfills*.js dist/apps/remix-ide/favicon.ico dist/apps/remix-ide/vendors~app*.js dist/apps/remix-ide/app*.js"
     working_directory: ~/remix-project
 
     steps:
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
index 19860c9c1c..9ea9fa20ee 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
@@ -14,7 +14,7 @@ echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
 cp -r $FILES_TO_PACKAGE "./"
 rm -rf dist
 ls
-FILES_TO_DEPLOY="assets index.html main*.js polyfills*.js favicon.ico vendors~app*.js app*.js raw-loader*.js"
+FILES_TO_DEPLOY="assets index.html 404.html main*.js polyfills*.js favicon.ico vendors~app*.js app*.js raw-loader*.js"
 # ZIP the whole directory
 zip -r remix-$SHA.zip $FILES_TO_DEPLOY
 # -f is needed because "build" is part of .gitignore
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
index 441a127410..9eb72f1d4d 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
@@ -14,7 +14,7 @@ echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
 cp -r $FILES_TO_PACKAGE "./"
 rm -rf dist
 ls
-FILES_TO_DEPLOY="assets index.html main*.js polyfills*.js favicon.ico vendors~app*.js app*.js raw-loader*.js"
+FILES_TO_DEPLOY="assets index.html 404.html main*.js polyfills*.js favicon.ico vendors~app*.js app*.js raw-loader*.js"
 # ZIP the whole directory
 zip -r remix-$SHA.zip $FILES_TO_DEPLOY
 # -f is needed because "build" is part of .gitignore
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
index 3460d25fa2..9a82fbb26a 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
@@ -14,7 +14,7 @@ echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
 cp -r $FILES_TO_PACKAGE "./"
 rm -rf dist
 ls
-FILES_TO_DEPLOY="assets index.html main*.js polyfills*.js vendors~app*.js app*.js raw-loader*.js"
+FILES_TO_DEPLOY="assets index.html 404.html main*.js polyfills*.js vendors~app*.js app*.js raw-loader*.js"
 # ZIP the whole directory
 zip -r remix-$SHA.zip $FILES_TO_DEPLOY
 # -f is needed because "build" is part of .gitignore

From 10be0cf74aae21db93da7e73f68dc2b5f63e5d8e Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Mon, 11 Jul 2022 17:24:30 +0530
Subject: [PATCH 11/49] remove one hash

---
 apps/remix-ide/src/404.html        | 4 ++--
 libs/remix-lib/src/query-params.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide/src/404.html b/apps/remix-ide/src/404.html
index f0cefda8bb..28214dc776 100644
--- a/apps/remix-ide/src/404.html
+++ b/apps/remix-ide/src/404.html
@@ -7,9 +7,9 @@
   <script>
     let route = window.location.pathname
     if (route.startsWith('/address/0x') && route.length === 51) {
-      window.location.href = '/#/#address=' + route.replace('/address/', '')
+      window.location.href = '/#/address=' + route.replace('/address/', '')
     } else if (route.endsWith('.sol')) {
-      window.location.href = '/#/#url=https://github.com' + route 
+      window.location.href = '/#/url=https://github.com' + route 
     } else window.location.href = '/' 
   </script>
 </html>
\ No newline at end of file
diff --git a/libs/remix-lib/src/query-params.ts b/libs/remix-lib/src/query-params.ts
index 41374be3bf..be3d2a876f 100644
--- a/libs/remix-lib/src/query-params.ts
+++ b/libs/remix-lib/src/query-params.ts
@@ -18,7 +18,7 @@ export class QueryParams  {
 
   get () {
     let qs 
-    if (window.location.hash.startsWith('#/#')) qs = window.location.hash.substr(3)
+    if (window.location.hash.startsWith('#/')) qs = window.location.hash.substr(2)
     else qs = window.location.hash.substr(1)
 
     if (window.location.search.length > 0) {

From a3a16f0e4197785c56378249783008a8818a3833 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Mon, 11 Jul 2022 17:29:46 +0530
Subject: [PATCH 12/49] remove slash

---
 apps/remix-ide/src/404.html        | 4 ++--
 libs/remix-lib/src/query-params.ts | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/remix-ide/src/404.html b/apps/remix-ide/src/404.html
index 28214dc776..28268a1ab1 100644
--- a/apps/remix-ide/src/404.html
+++ b/apps/remix-ide/src/404.html
@@ -7,9 +7,9 @@
   <script>
     let route = window.location.pathname
     if (route.startsWith('/address/0x') && route.length === 51) {
-      window.location.href = '/#/address=' + route.replace('/address/', '')
+      window.location.href = '/#address=' + route.replace('/address/', '')
     } else if (route.endsWith('.sol')) {
-      window.location.href = '/#/url=https://github.com' + route 
+      window.location.href = '/#url=https://github.com' + route 
     } else window.location.href = '/' 
   </script>
 </html>
\ No newline at end of file
diff --git a/libs/remix-lib/src/query-params.ts b/libs/remix-lib/src/query-params.ts
index be3d2a876f..7e89b226ff 100644
--- a/libs/remix-lib/src/query-params.ts
+++ b/libs/remix-lib/src/query-params.ts
@@ -17,9 +17,7 @@ export class QueryParams  {
   }
 
   get () {
-    let qs 
-    if (window.location.hash.startsWith('#/')) qs = window.location.hash.substr(2)
-    else qs = window.location.hash.substr(1)
+    const qs = window.location.hash.substr(1)
 
     if (window.location.search.length > 0) {
       // use legacy query params instead of hash

From 590792ca8cb2d116a5517a3a011bb7b1fd6ffbd4 Mon Sep 17 00:00:00 2001
From: Aniket <30843294+Aniket-Engg@users.noreply.github.com>
Date: Mon, 11 Jul 2022 17:34:59 +0530
Subject: [PATCH 13/49] linting fix

---
 libs/remix-ui/workspace/src/lib/actions/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libs/remix-ui/workspace/src/lib/actions/index.ts b/libs/remix-ui/workspace/src/lib/actions/index.ts
index a5b4491c94..953a75ba88 100644
--- a/libs/remix-ui/workspace/src/lib/actions/index.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/index.ts
@@ -8,7 +8,6 @@ import { createWorkspaceTemplate, getWorkspaces, loadWorkspacePreset, setPlugin
 import { QueryParams } from '@remix-project/remix-lib'
 import { fetchContractFromEtherscan } from '@remix-project/core-plugin' // eslint-disable-line
 import JSZip from 'jszip'
-import axios, { AxiosResponse } from 'axios'
 
 export * from './events'
 export * from './workspace'

From c78fd5442eb75b097bf74b909f5dfaec4882eaef Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 11 Jul 2022 14:47:05 +0200
Subject: [PATCH 14/49] fix undefined

---
 libs/remix-ui/panel/src/lib/plugins/panel-header.tsx   | 10 +++++-----
 .../src/lib/components/ActivePluginCard.tsx            |  2 +-
 .../src/lib/components/InactivePluginCard.tsx          |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
index 9e249aa295..8c19d32fdf 100644
--- a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
+++ b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
@@ -38,21 +38,21 @@ const RemixUIPanelHeader = (props: RemixPanelProps) => {
         </div>
       </div>
       <div className={`bg-light p-3 pt-1 border-bottom flex-column ${toggleExpander ? "d-flex" : "d-none"}`}>
-        {plugin?.profile.author && <span className="d-flex flex-row align-items-center">
+        {plugin?.profile?.author && <span className="d-flex flex-row align-items-center">
           <label className="mb-0 pr-2">Author:</label>
           <span> plugin.profile.author </span>
         </span>}
-        {plugin?.profile.maintainedBy && <span className="d-flex flex-row align-items-center">
+        {plugin?.profile?.maintainedBy && <span className="d-flex flex-row align-items-center">
           <label className="mb-0 pr-2">Maintained by:</label>
           <span> plugin.profile.maintainedBy</span>
         </span>}
-        {plugin?.profile.documentation && <span className="d-flex flex-row align-items-center">
+        {plugin?.profile?.documentation && <span className="d-flex flex-row align-items-center">
           <label className="mb-0 pr-2">Documentation:</label>
           <span>
-            <a href={plugin.profile.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>
+            <a href={plugin.profile?.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>
           </span>
         </span>}
-        {plugin?.profile.description && <span className="d-flex flex-row align-items-center">
+        {plugin?.profile?.description && <span className="d-flex flex-row align-items-center">
           <label className="mb-0 pr-2">Description:</label>
           <span> plugin?.profile.description</span>
         </span>}
diff --git a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
index 6a9b604907..47e35a55db 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
@@ -19,7 +19,7 @@ function ActivePluginCard ({
           <h6 className="remixui_displayName plugin-name">
             <div>
               { profile.displayName || profile.name }
-              { profile.maintainedBy.toLowerCase() == "remix" &&
+              { profile?.maintainedBy?.toLowerCase() == "remix" &&
                 <i aria-hidden="true" className="px-1 text-success fas fa-check" title="Maintained by Remix"></i>
               }
               { profile.documentation &&
diff --git a/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx b/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
index 018b8ed432..35272cb5d3 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
@@ -22,7 +22,7 @@ function InactivePluginCard ({
           <h6 className="remixui_displayName plugin-name">
             <div>
               { profile.displayName || profile.name }
-              { profile.maintainedBy.toLowerCase() == "remix" &&
+              { profile?.maintainedBy?.toLowerCase() == "remix" &&
                 <i aria-hidden="true" className="px-1 text-success fas fa-check" title="Verified by Remix"></i>
               }
               { profile.documentation &&

From 374d15117974ae4de8355daddfe09b1670dbcc71 Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Fri, 8 Jul 2022 14:45:51 +0100
Subject: [PATCH 15/49] Hide dgit icon if connected to localhost

---
 libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index de5bff2fb6..307bb7b64c 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -259,7 +259,7 @@ export function Workspace () {
                   </span>
                 </span>
                 <Dropdown id="workspacesSelect" data-id="workspacesSelect">
-                  <Dropdown.Toggle as={CustomToggle} id="dropdown-custom-components" className="btn btn-light btn-block w-100 d-inline-block border border-dark form-control" icon={selectedWorkspace && selectedWorkspace.isGitRepo ? 'far fa-code-branch' : null}>
+                  <Dropdown.Toggle as={CustomToggle} id="dropdown-custom-components" className="btn btn-light btn-block w-100 d-inline-block border border-dark form-control" icon={selectedWorkspace && selectedWorkspace.isGitRepo && !(currentWorkspace === LOCALHOST) ? 'far fa-code-branch' : null}>
                     { selectedWorkspace ? selectedWorkspace.name : currentWorkspace === LOCALHOST ? 'localhost' : NO_WORKSPACE }
                   </Dropdown.Toggle>
 

From 5ea0bc5082e2d0e8eb533456437d332c830c362e Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 11 Jul 2022 11:06:40 +0200
Subject: [PATCH 16/49] flaky test

---
 .circleci/config.yml                          | 2 +-
 apps/remix-ide-e2e/src/tests/recorder.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 988b8940ea..5449860cc0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ version: 2.1
 parameters:
   run_flaky_tests:
     type: boolean
-    default: false
+    default: true
 orbs:
   browser-tools: circleci/browser-tools@1.2.3
 jobs:
diff --git a/apps/remix-ide-e2e/src/tests/recorder.test.ts b/apps/remix-ide-e2e/src/tests/recorder.test.ts
index 7e8748b737..1a9e2d1924 100644
--- a/apps/remix-ide-e2e/src/tests/recorder.test.ts
+++ b/apps/remix-ide-e2e/src/tests/recorder.test.ts
@@ -64,7 +64,7 @@ module.exports = {
       })
   },
 
-  'Record more than one contract': function (browser: NightwatchBrowser) {
+  'Record more than one contract #flaky': function (browser: NightwatchBrowser) {
     // deploy 2 contracts (2 different ABIs), save the record, reexecute and test one of the function.
     browser
       .click('*[data-id="deployAndRunClearInstances"]')

From c57330f6184cdf66354b73090156a1add3dc6cd5 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 11 Jul 2022 11:26:24 +0200
Subject: [PATCH 17/49] group tests

---
 apps/remix-ide-e2e/src/tests/recorder.test.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/recorder.test.ts b/apps/remix-ide-e2e/src/tests/recorder.test.ts
index 1a9e2d1924..e33b3a9400 100644
--- a/apps/remix-ide-e2e/src/tests/recorder.test.ts
+++ b/apps/remix-ide-e2e/src/tests/recorder.test.ts
@@ -3,6 +3,7 @@ import { NightwatchBrowser } from 'nightwatch'
 import init from '../helpers/init'
 
 module.exports = {
+  '@disabled': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
     init(browser, done)
   },
@@ -11,7 +12,7 @@ module.exports = {
     return sources
   },
 
-  'Run Scenario': function (browser: NightwatchBrowser) {
+  'Run Scenario #group1': function (browser: NightwatchBrowser) {
     let addressRef
     browser.addFile('scenario.json', { content: records })
       .pause(5000)
@@ -36,7 +37,7 @@ module.exports = {
       .click('*[data-id="deployAndRunClearInstances"]')
 
     },
-    'Save scenario': function (browser: NightwatchBrowser) {
+    'Save scenario #group1': function (browser: NightwatchBrowser) {
       browser.testContracts('testRecorder.sol', sources[0]['testRecorder.sol'], ['testRecorder'])
       .clickLaunchIcon('udapp')
       .createContract(['12'])
@@ -64,7 +65,7 @@ module.exports = {
       })
   },
 
-  'Record more than one contract #flaky': function (browser: NightwatchBrowser) {
+  'Record more than one contract #group1 #flaky': function (browser: NightwatchBrowser) {
     // deploy 2 contracts (2 different ABIs), save the record, reexecute and test one of the function.
     browser
       .click('*[data-id="deployAndRunClearInstances"]')
@@ -98,7 +99,7 @@ module.exports = {
       
   },
 
-  'Run with live "mode"': function (browser: NightwatchBrowser) {
+  'Run with live "mode" #group1': function (browser: NightwatchBrowser) {
     let addressRef: string
     browser.addFile('scenario_live_mode.json', { content: JSON.stringify(liveModeScenario, null, '\t') })
       .addFile('scenario_live_mode_storage.sol', { content: testStorageForLiveMode })

From 032e8df4a8ebe7648709f83b97446e216b2b2e48 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 11 Jul 2022 12:02:22 +0200
Subject: [PATCH 18/49] fix e2e flaky test

---
 apps/remix-ide-e2e/src/commands/clickFunction.ts | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/remix-ide-e2e/src/commands/clickFunction.ts b/apps/remix-ide-e2e/src/commands/clickFunction.ts
index e84be6a0d0..e19426db6a 100644
--- a/apps/remix-ide-e2e/src/commands/clickFunction.ts
+++ b/apps/remix-ide-e2e/src/commands/clickFunction.ts
@@ -4,16 +4,8 @@ import EventEmitter from 'events'
 class ClickFunction extends EventEmitter {
   command (this: NightwatchBrowser, fnFullName: string, expectedInput?: NightwatchClickFunctionExpectedInput): NightwatchBrowser {
     this.api.waitForElementPresent('.instance button[title="' + fnFullName + '"]')
-      .perform(function (client, done) {
-        client.execute(function () {
-          document.querySelector('#runTabView').scrollTop = document.querySelector('#runTabView').scrollHeight
-        }, [], function () {
-          if (expectedInput) {
-            client.setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, _ => _)
-          }
-          done()
-        })
-      })
+      .scrollInto('#runTabView input[title="' + expectedInput.types + '"]')
+      .setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, _ => _)
       .scrollAndClick('.instance button[title="' + fnFullName + '"]')
       .pause(2000)
       .perform(() => {

From 718c7467eef8ed0b3210001e4a7c6222f48a9c0d Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 11 Jul 2022 12:08:39 +0200
Subject: [PATCH 19/49] fix flaky test

---
 apps/remix-ide-e2e/src/commands/clickFunction.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide-e2e/src/commands/clickFunction.ts b/apps/remix-ide-e2e/src/commands/clickFunction.ts
index e19426db6a..6e3f888cc3 100644
--- a/apps/remix-ide-e2e/src/commands/clickFunction.ts
+++ b/apps/remix-ide-e2e/src/commands/clickFunction.ts
@@ -4,8 +4,18 @@ import EventEmitter from 'events'
 class ClickFunction extends EventEmitter {
   command (this: NightwatchBrowser, fnFullName: string, expectedInput?: NightwatchClickFunctionExpectedInput): NightwatchBrowser {
     this.api.waitForElementPresent('.instance button[title="' + fnFullName + '"]')
-      .scrollInto('#runTabView input[title="' + expectedInput.types + '"]')
-      .setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, _ => _)
+      .perform(function (client, done) {
+        client.execute(function () {
+          document.querySelector('#runTabView').scrollTop = document.querySelector('#runTabView').scrollHeight
+        }, [], function () {
+          if (expectedInput) {
+            client
+            .scrollInto('#runTabView input[title="' + expectedInput.types + '"]')
+            .setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, _ => _)
+          }
+          done()
+        })
+      })
       .scrollAndClick('.instance button[title="' + fnFullName + '"]')
       .pause(2000)
       .perform(() => {

From e37669425f9cdd2f2daa8f098464a84c6cfa2a5a Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 11 Jul 2022 12:33:26 +0200
Subject: [PATCH 20/49] fix e2e test

---
 apps/remix-ide-e2e/src/commands/clickFunction.ts | 4 +---
 apps/remix-ide-e2e/src/tests/recorder.test.ts    | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide-e2e/src/commands/clickFunction.ts b/apps/remix-ide-e2e/src/commands/clickFunction.ts
index 6e3f888cc3..e84be6a0d0 100644
--- a/apps/remix-ide-e2e/src/commands/clickFunction.ts
+++ b/apps/remix-ide-e2e/src/commands/clickFunction.ts
@@ -9,9 +9,7 @@ class ClickFunction extends EventEmitter {
           document.querySelector('#runTabView').scrollTop = document.querySelector('#runTabView').scrollHeight
         }, [], function () {
           if (expectedInput) {
-            client
-            .scrollInto('#runTabView input[title="' + expectedInput.types + '"]')
-            .setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, _ => _)
+            client.setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, _ => _)
           }
           done()
         })
diff --git a/apps/remix-ide-e2e/src/tests/recorder.test.ts b/apps/remix-ide-e2e/src/tests/recorder.test.ts
index e33b3a9400..b043f72a14 100644
--- a/apps/remix-ide-e2e/src/tests/recorder.test.ts
+++ b/apps/remix-ide-e2e/src/tests/recorder.test.ts
@@ -85,6 +85,7 @@ module.exports = {
 
         modalOk.click()
       })
+      .pause(1000)
       .click('*[data-id="deployAndRunClearInstances"]') // clear udapp
       .click('*[data-id="terminalClearConsole"]') // clear terminal
       .click('[data-id="runtransaction"]')

From 83c7da276e5159a22424fd07aae49434ea76de70 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 11 Jul 2022 15:03:16 +0200
Subject: [PATCH 21/49] run all tests

---
 .circleci/config.yml                          | 2 +-
 apps/remix-ide-e2e/src/tests/recorder.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5449860cc0..988b8940ea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ version: 2.1
 parameters:
   run_flaky_tests:
     type: boolean
-    default: true
+    default: false
 orbs:
   browser-tools: circleci/browser-tools@1.2.3
 jobs:
diff --git a/apps/remix-ide-e2e/src/tests/recorder.test.ts b/apps/remix-ide-e2e/src/tests/recorder.test.ts
index b043f72a14..7f69cd5dff 100644
--- a/apps/remix-ide-e2e/src/tests/recorder.test.ts
+++ b/apps/remix-ide-e2e/src/tests/recorder.test.ts
@@ -65,7 +65,7 @@ module.exports = {
       })
   },
 
-  'Record more than one contract #group1 #flaky': function (browser: NightwatchBrowser) {
+  'Record more than one contract #group1': function (browser: NightwatchBrowser) {
     // deploy 2 contracts (2 different ABIs), save the record, reexecute and test one of the function.
     browser
       .click('*[data-id="deployAndRunClearInstances"]')

From 20034e5325160e7ba36a7e842cfe3f3e09313fee Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 11 Jul 2022 10:09:37 +0200
Subject: [PATCH 22/49] update package

---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 54a2b7c8aa..8e3a2b9f21 100644
--- a/package.json
+++ b/package.json
@@ -153,13 +153,13 @@
     "@ethersphere/bee-js": "^3.2.0",
     "@isomorphic-git/lightning-fs": "^4.4.1",
     "@monaco-editor/react": "^4.3.1",
-    "@remixproject/engine": "^0.3.28",
-    "@remixproject/engine-web": "^0.3.28",
-    "@remixproject/plugin": "^0.3.28",
-    "@remixproject/plugin-api": "^0.3.28",
-    "@remixproject/plugin-utils": "^0.3.28",
-    "@remixproject/plugin-webview": "^0.3.28",
-    "@remixproject/plugin-ws": "^0.3.28",
+    "@remixproject/engine": "^0.3.30",
+    "@remixproject/engine-web": "^0.3.30",
+    "@remixproject/plugin": "^0.3.30",
+    "@remixproject/plugin-api": "^0.3.30",
+    "@remixproject/plugin-utils": "^0.3.30",
+    "@remixproject/plugin-webview": "^0.3.30",
+    "@remixproject/plugin-ws": "^0.3.30",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.2",
     "axios": ">=0.26.0",

From 13b1670e4c129ff604273295be6d311b94568174 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 11 Jul 2022 10:24:54 +0200
Subject: [PATCH 23/49] lock file

---
 yarn.lock | 84 +++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 220d2abac5..44ac34f0ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3749,63 +3749,63 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.2.tgz#0798c03351f0dea1a5a4cabddf26a55a7cbee590"
   integrity sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==
 
-"@remixproject/engine-web@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/engine-web/-/engine-web-0.3.28.tgz#9a47c979a89764cb96d3f5da0d6802d1ca875c94"
-  integrity sha512-JTwTuonW+pI7WsSsgGHAzPynGjIdG34VnPrspR9XKBQO4+NX7m3lbNIMUUviyrbqIoGiGtgYd/ry98uLpTHr4g==
+"@remixproject/engine-web@^0.3.30":
+  version "0.3.30"
+  resolved "https://registry.yarnpkg.com/@remixproject/engine-web/-/engine-web-0.3.30.tgz#55721b30ff86bf026fd529afc7b57acecc9f517a"
+  integrity sha512-8+3BxgghAInrndxkHvTEF6wemHeCdlMJ47CcsXHf/WHsI1E8BbJscZHj+EdEbyc+N6SXUf36qVyIyj7Ko19S/A==
   dependencies:
-    "@remixproject/engine" "0.3.28"
-    "@remixproject/plugin-api" "0.3.28"
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/engine" "0.3.30"
+    "@remixproject/plugin-api" "0.3.30"
+    "@remixproject/plugin-utils" "0.3.30"
 
-"@remixproject/engine@0.3.28", "@remixproject/engine@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.28.tgz#3656ee029d3cbc22f8ad95bd925176a75057a475"
-  integrity sha512-27SHaCrG3KrPfMa1MYud4tE9xUIJKITEUsql99fhN7x12lOmgGZFjiqIG/WWjCMmT7OMG3vtLayiZrsYkzHCVw==
+"@remixproject/engine@0.3.30", "@remixproject/engine@^0.3.30":
+  version "0.3.30"
+  resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.30.tgz#ff5fe7695d0301c4171094bd881d006a89026515"
+  integrity sha512-yG7BbDCzQ87Fv/IqajODOiAXF7eoWsMN2/9tg/qsQuFoebqFFEpta7CHG2wAEx3i39AsYAIHshlhLdHnYKjcxQ==
   dependencies:
-    "@remixproject/plugin-api" "0.3.28"
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/plugin-api" "0.3.30"
+    "@remixproject/plugin-utils" "0.3.30"
 
-"@remixproject/plugin-api@0.3.28", "@remixproject/plugin-api@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.28.tgz#660f068681bc1780284768e4ce1b4f70ea4ba859"
-  integrity sha512-tOzVFR504037weEkNHQGZsk+Ebxcu/xnBsVCkJaQaBMb+H/i6YevKQmoR1aGcH+JfQxc8eS8LGC65MaV8zmcWg==
+"@remixproject/plugin-api@0.3.30", "@remixproject/plugin-api@^0.3.30":
+  version "0.3.30"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.30.tgz#6f45b39dbff5ab8d0dfd594b439fc6cf29c39ac1"
+  integrity sha512-J5rzQbGEe+5M8FresIoyj/S2HKA5WyjVM/DsED+tWpEmqnzcjARQdvijNVmRstFkcCDvCQ5PDMU+/Qoaj6/Hiw==
   dependencies:
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/plugin-utils" "0.3.30"
 
-"@remixproject/plugin-utils@0.3.28", "@remixproject/plugin-utils@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.28.tgz#eefd3b603f223cf6fba9b914ef3c9a62bd8435b6"
-  integrity sha512-5CayTgMqRiOguanTy6kpuRgCmjEFLUu2K4Rs7Zmt+GOzHucmwkDxYQO+3hFv0Jz/M/6yC5wkKYTx8vfPLLdEBQ==
+"@remixproject/plugin-utils@0.3.30", "@remixproject/plugin-utils@^0.3.30":
+  version "0.3.30"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.30.tgz#b723cd59a98d0fa624f9483edd8c53086b44e514"
+  integrity sha512-jsL9DUKi3pi5D3R7415Zflf72l2wT3POQLRXNJV5rcnpsBhH1SedSpyjPuWSObTbpQsXw9xfnZqjwbIi7UNltA==
   dependencies:
     tslib "2.0.1"
 
-"@remixproject/plugin-webview@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-webview/-/plugin-webview-0.3.28.tgz#ce03ad0801e0fd1e5bce59565b77b6698ad07596"
-  integrity sha512-DodSkN0vMSo2DEEoBOWyKxC/ElvBA826vhX+JVGXA8HGS45aavplZIN967hsc+SdzjV1UZfSNKEHttLGwM1BIw==
+"@remixproject/plugin-webview@^0.3.30":
+  version "0.3.30"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-webview/-/plugin-webview-0.3.30.tgz#6c49c08838114886aac2bf328fa82b70afac2885"
+  integrity sha512-8Z2O7BjIZkq/ug1d/NiqcjFwR+TP/GPMdh03RNf+Mta0z+B6sXE4WdoCXImTeUJOdufIO3eFw0+JVLu2iwU25w==
   dependencies:
-    "@remixproject/plugin" "0.3.28"
-    "@remixproject/plugin-api" "0.3.28"
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/plugin" "0.3.30"
+    "@remixproject/plugin-api" "0.3.30"
+    "@remixproject/plugin-utils" "0.3.30"
     axios "^0.21.1"
 
-"@remixproject/plugin-ws@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-ws/-/plugin-ws-0.3.28.tgz#4f6022b1c8ef6356299c545f6164bce48aac60fe"
-  integrity sha512-i3He9t4qvcBQxzshFx66D6drqLlySmV7Cb+NeYtMOYlWxQSJtUakp/Px1Tl3IDFQXDfpXxvDvYhn2w0AWPBOqw==
+"@remixproject/plugin-ws@^0.3.30":
+  version "0.3.30"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-ws/-/plugin-ws-0.3.30.tgz#ed9f5011ea2ee0fec2d595b2e333f50500354c66"
+  integrity sha512-lWk/PiRXX5zcN7ddOhnVN4Mbd3NqSuw4on2a4pc2SslM73wtmambvmGxhphEOuNsTykZ66LmMhCGBMxpsvhdoA==
   dependencies:
-    "@remixproject/plugin" "0.3.28"
-    "@remixproject/plugin-api" "0.3.28"
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/plugin" "0.3.30"
+    "@remixproject/plugin-api" "0.3.30"
+    "@remixproject/plugin-utils" "0.3.30"
 
-"@remixproject/plugin@0.3.28", "@remixproject/plugin@^0.3.28":
-  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.28.tgz#3e40de6d0441e6b47ca17c904e57562cb285a4d3"
-  integrity sha512-sw+cow3GKAcEacXLvdJwtHHIphPty4KRMZ6tcQHdtx/iCKTMNdw2hribKPnvTO+6mXE+4oAKCrFqeTdVp/rd1w==
+"@remixproject/plugin@0.3.30", "@remixproject/plugin@^0.3.30":
+  version "0.3.30"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.30.tgz#abfcf2c39aed3d611536fc0ccde783b07d1eaa8c"
+  integrity sha512-cdLRpa+I3rI9JHZXJzU+Gd1gpD4zNJZX/vwi3DQz0LZvwRYw+DgcxddAx+bRMS2jFIQS+Vz8jIhCOSsRfKdYcg==
   dependencies:
-    "@remixproject/plugin-api" "0.3.28"
-    "@remixproject/plugin-utils" "0.3.28"
+    "@remixproject/plugin-api" "0.3.30"
+    "@remixproject/plugin-utils" "0.3.30"
     events "3.2.0"
 
 "@restart/context@^2.1.4":

From 4977bd653fb53c43dddc4523471ce5cabff38b5a Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 11 Jul 2022 10:59:50 +0200
Subject: [PATCH 24/49] update plugin to fix FE test

---
 package.json | 14 ++++-----
 yarn.lock    | 84 ++++++++++++++++++++++++++--------------------------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index 8e3a2b9f21..d83a9464e5 100644
--- a/package.json
+++ b/package.json
@@ -153,13 +153,13 @@
     "@ethersphere/bee-js": "^3.2.0",
     "@isomorphic-git/lightning-fs": "^4.4.1",
     "@monaco-editor/react": "^4.3.1",
-    "@remixproject/engine": "^0.3.30",
-    "@remixproject/engine-web": "^0.3.30",
-    "@remixproject/plugin": "^0.3.30",
-    "@remixproject/plugin-api": "^0.3.30",
-    "@remixproject/plugin-utils": "^0.3.30",
-    "@remixproject/plugin-webview": "^0.3.30",
-    "@remixproject/plugin-ws": "^0.3.30",
+    "@remixproject/engine": "^0.3.31",
+    "@remixproject/engine-web": "^0.3.31",
+    "@remixproject/plugin": "^0.3.31",
+    "@remixproject/plugin-api": "^0.3.31",
+    "@remixproject/plugin-utils": "^0.3.31",
+    "@remixproject/plugin-webview": "^0.3.31",
+    "@remixproject/plugin-ws": "^0.3.31",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.2",
     "axios": ">=0.26.0",
diff --git a/yarn.lock b/yarn.lock
index 44ac34f0ac..6bac163214 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3749,63 +3749,63 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.2.tgz#0798c03351f0dea1a5a4cabddf26a55a7cbee590"
   integrity sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==
 
-"@remixproject/engine-web@^0.3.30":
-  version "0.3.30"
-  resolved "https://registry.yarnpkg.com/@remixproject/engine-web/-/engine-web-0.3.30.tgz#55721b30ff86bf026fd529afc7b57acecc9f517a"
-  integrity sha512-8+3BxgghAInrndxkHvTEF6wemHeCdlMJ47CcsXHf/WHsI1E8BbJscZHj+EdEbyc+N6SXUf36qVyIyj7Ko19S/A==
+"@remixproject/engine-web@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/engine-web/-/engine-web-0.3.31.tgz#42ee5c5d874ef9646090342ca8b430e3fe1046e8"
+  integrity sha512-GYeUB4Y0NaVc23mSmVByhx6pCvjzfz8iBbJCwaUB3q61uyRQ1wMM0P/47qqwZMukPi7x4bFUpN41C6rKq7ECug==
   dependencies:
-    "@remixproject/engine" "0.3.30"
-    "@remixproject/plugin-api" "0.3.30"
-    "@remixproject/plugin-utils" "0.3.30"
+    "@remixproject/engine" "0.3.31"
+    "@remixproject/plugin-api" "0.3.31"
+    "@remixproject/plugin-utils" "0.3.31"
 
-"@remixproject/engine@0.3.30", "@remixproject/engine@^0.3.30":
-  version "0.3.30"
-  resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.30.tgz#ff5fe7695d0301c4171094bd881d006a89026515"
-  integrity sha512-yG7BbDCzQ87Fv/IqajODOiAXF7eoWsMN2/9tg/qsQuFoebqFFEpta7CHG2wAEx3i39AsYAIHshlhLdHnYKjcxQ==
+"@remixproject/engine@0.3.31", "@remixproject/engine@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.31.tgz#6dcc209dbd993646430335c9454ce1a739d1a45f"
+  integrity sha512-5VTl9bkeU3fd3IUV8wy7kXHMd3RfnUsf6dlmORM9Np1oMZ9nhdhUsyJO/qXyrvR1PbyJIxPz/qM4+W5MGvOrnQ==
   dependencies:
-    "@remixproject/plugin-api" "0.3.30"
-    "@remixproject/plugin-utils" "0.3.30"
+    "@remixproject/plugin-api" "0.3.31"
+    "@remixproject/plugin-utils" "0.3.31"
 
-"@remixproject/plugin-api@0.3.30", "@remixproject/plugin-api@^0.3.30":
-  version "0.3.30"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.30.tgz#6f45b39dbff5ab8d0dfd594b439fc6cf29c39ac1"
-  integrity sha512-J5rzQbGEe+5M8FresIoyj/S2HKA5WyjVM/DsED+tWpEmqnzcjARQdvijNVmRstFkcCDvCQ5PDMU+/Qoaj6/Hiw==
+"@remixproject/plugin-api@0.3.31", "@remixproject/plugin-api@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.31.tgz#86e7c458c58ff200bd927fd3d642877f4b5a0013"
+  integrity sha512-LOJRHxORNp7zW8k7//DQz5aZ7eqB7TwhYXrvzqvaryDTvtvJGWrlTHg81hzALynaxZKEWneohxjUxKvGp/eA4g==
   dependencies:
-    "@remixproject/plugin-utils" "0.3.30"
+    "@remixproject/plugin-utils" "0.3.31"
 
-"@remixproject/plugin-utils@0.3.30", "@remixproject/plugin-utils@^0.3.30":
-  version "0.3.30"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.30.tgz#b723cd59a98d0fa624f9483edd8c53086b44e514"
-  integrity sha512-jsL9DUKi3pi5D3R7415Zflf72l2wT3POQLRXNJV5rcnpsBhH1SedSpyjPuWSObTbpQsXw9xfnZqjwbIi7UNltA==
+"@remixproject/plugin-utils@0.3.31", "@remixproject/plugin-utils@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.31.tgz#80771e00c1a1b776432abb17b1f4b2e25600d4f6"
+  integrity sha512-OOAjoSd+ErBMrcNQEh80NU3BjJ9fHXuftRfy5Ul9aGXN3b1LJSNVvfrG+FxX6lpyaAK5JBj+aB9pgFozgb2wlw==
   dependencies:
     tslib "2.0.1"
 
-"@remixproject/plugin-webview@^0.3.30":
-  version "0.3.30"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-webview/-/plugin-webview-0.3.30.tgz#6c49c08838114886aac2bf328fa82b70afac2885"
-  integrity sha512-8Z2O7BjIZkq/ug1d/NiqcjFwR+TP/GPMdh03RNf+Mta0z+B6sXE4WdoCXImTeUJOdufIO3eFw0+JVLu2iwU25w==
+"@remixproject/plugin-webview@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-webview/-/plugin-webview-0.3.31.tgz#e5cce7d0089439b35aee4ab2a724add1e5d36b40"
+  integrity sha512-8yoKwIkRi9S+rqvFShNt01FfXX0H/Fijn7UkWFWJ/V6ULcw2cw9ViCz8cYZLhNUpxqezyu/LKDQL9g1TbJJoYw==
   dependencies:
-    "@remixproject/plugin" "0.3.30"
-    "@remixproject/plugin-api" "0.3.30"
-    "@remixproject/plugin-utils" "0.3.30"
+    "@remixproject/plugin" "0.3.31"
+    "@remixproject/plugin-api" "0.3.31"
+    "@remixproject/plugin-utils" "0.3.31"
     axios "^0.21.1"
 
-"@remixproject/plugin-ws@^0.3.30":
-  version "0.3.30"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin-ws/-/plugin-ws-0.3.30.tgz#ed9f5011ea2ee0fec2d595b2e333f50500354c66"
-  integrity sha512-lWk/PiRXX5zcN7ddOhnVN4Mbd3NqSuw4on2a4pc2SslM73wtmambvmGxhphEOuNsTykZ66LmMhCGBMxpsvhdoA==
+"@remixproject/plugin-ws@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin-ws/-/plugin-ws-0.3.31.tgz#a2bb415cc32a5b036b9b3759520088b8ceaa0d5a"
+  integrity sha512-Z4G6vkGxxCP+ibGNHAvNaFjYE4hbsazOEL50pMnda6LZNci9akMSiI/1MIZscVSMU8l2sYOoNUsWvLfLkIkYKQ==
   dependencies:
-    "@remixproject/plugin" "0.3.30"
-    "@remixproject/plugin-api" "0.3.30"
-    "@remixproject/plugin-utils" "0.3.30"
+    "@remixproject/plugin" "0.3.31"
+    "@remixproject/plugin-api" "0.3.31"
+    "@remixproject/plugin-utils" "0.3.31"
 
-"@remixproject/plugin@0.3.30", "@remixproject/plugin@^0.3.30":
-  version "0.3.30"
-  resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.30.tgz#abfcf2c39aed3d611536fc0ccde783b07d1eaa8c"
-  integrity sha512-cdLRpa+I3rI9JHZXJzU+Gd1gpD4zNJZX/vwi3DQz0LZvwRYw+DgcxddAx+bRMS2jFIQS+Vz8jIhCOSsRfKdYcg==
+"@remixproject/plugin@0.3.31", "@remixproject/plugin@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.31.tgz#b6c6b58d2c7964e37024eeca4819c70ece1f3953"
+  integrity sha512-9ntMU9CzStloahm/wXt4V8n64ERgJzY5nG0bzQfjnI12knrdTmUo+LC42M2xaTBDDP9CzMPdqClg7XhhRLzohA==
   dependencies:
-    "@remixproject/plugin-api" "0.3.30"
-    "@remixproject/plugin-utils" "0.3.30"
+    "@remixproject/plugin-api" "0.3.31"
+    "@remixproject/plugin-utils" "0.3.31"
     events "3.2.0"
 
 "@restart/context@^2.1.4":

From d547038c86c848361dcf0c3edb360374bdc62d77 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 11 Jul 2022 15:30:58 +0200
Subject: [PATCH 25/49] fix items

---
 .../panel/src/lib/plugins/panel-header.tsx    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
index 8c19d32fdf..ec92786c48 100644
--- a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
+++ b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
@@ -4,8 +4,8 @@ import { PluginRecord } from '../types'
 import './panel.css'
 
 export interface RemixPanelProps {
-    plugins: Record<string, PluginRecord>;
-  }
+  plugins: Record<string, PluginRecord>;
+}
 const RemixUIPanelHeader = (props: RemixPanelProps) => {
   const [plugin, setPlugin] = useState<PluginRecord>()
   const [toggleExpander, setToggleExpander] = useState<boolean>(false)
@@ -30,7 +30,7 @@ const RemixUIPanelHeader = (props: RemixPanelProps) => {
         <div className="d-flex flex-row">
           <div className="d-flex flex-row">
             {plugin?.profile?.maintainedBy?.toLowerCase() === "remix" && (<i aria-hidden="true" className="text-success fas fa-check" title="Maintained by Remix"></i>)}
-            {plugin?.profile.documentation && (<a href={plugin.profile.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>) }
+            {plugin?.profile.documentation && (<a href={plugin.profile.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>)}
           </div>
           <div className="swapitHeaderInfoSection d-flex justify-content-between" data-id='swapitHeaderInfoSectionId' onClick={toggleClass} title="Plugin info">
             <i className={`px-2 ml-2 mt-1 ${!toggleExpander ? 'fas fa-angle-right' : 'fas fa-angle-down bg-light'}`} aria-hidden="true"></i>
@@ -40,21 +40,25 @@ const RemixUIPanelHeader = (props: RemixPanelProps) => {
       <div className={`bg-light p-3 pt-1 border-bottom flex-column ${toggleExpander ? "d-flex" : "d-none"}`}>
         {plugin?.profile?.author && <span className="d-flex flex-row align-items-center">
           <label className="mb-0 pr-2">Author:</label>
-          <span> plugin.profile.author </span>
+          <span>{plugin?.profile?.author}</span>
         </span>}
         {plugin?.profile?.maintainedBy && <span className="d-flex flex-row align-items-center">
           <label className="mb-0 pr-2">Maintained by:</label>
-          <span> plugin.profile.maintainedBy</span>
+          <span>{plugin?.profile?.maintainedBy}</span>
         </span>}
         {plugin?.profile?.documentation && <span className="d-flex flex-row align-items-center">
           <label className="mb-0 pr-2">Documentation:</label>
           <span>
-            <a href={plugin.profile?.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>
+            <a href={plugin?.profile?.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>
           </span>
         </span>}
-        {plugin?.profile?.description && <span className="d-flex flex-row align-items-center">
+        {plugin?.profile?.description && <span className="d-flex flex-row align-items-baseline">
           <label className="mb-0 pr-2">Description:</label>
-          <span> plugin?.profile.description</span>
+          <div>{plugin?.profile?.description}</div>
+        </span>}
+        {plugin?.profile?.repo && <span className="d-flex flex-row align-items-center">
+          <a href={plugin?.profile?.repo} target="_blank" rel="noreferrer">          
+          Make an issue</a>
         </span>}
       </div>
     </header>)

From d0cda848476103fa7b0d68390691bbbd3ca667b2 Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Wed, 6 Jul 2022 12:08:55 +0100
Subject: [PATCH 26/49] Implement upgrade using address input

---
 apps/remix-ide/src/blockchain/blockchain.js   |  19 +
 .../src/lib/constants/uups.ts                 |  14 +
 .../src/lib/openzeppelin-proxy.ts             |  29 +-
 .../run-tab/src/lib/actions/deploy.ts         |   7 +-
 .../run-tab/src/lib/actions/events.ts         |   2 +-
 .../src/lib/components/contractGUI.tsx        | 334 ++++++++++--------
 .../run-tab/src/lib/reducers/runTab.ts        |   2 +-
 libs/remix-ui/run-tab/src/lib/types/index.ts  |   2 +-
 8 files changed, 261 insertions(+), 148 deletions(-)

diff --git a/apps/remix-ide/src/blockchain/blockchain.js b/apps/remix-ide/src/blockchain/blockchain.js
index 3d6e885cec..515819b22d 100644
--- a/apps/remix-ide/src/blockchain/blockchain.js
+++ b/apps/remix-ide/src/blockchain/blockchain.js
@@ -179,6 +179,25 @@ export class Blockchain extends Plugin {
     this.runTx(args, confirmationCb, continueCb, promptCb, finalCb)
   }
 
+  async upgradeProxy(proxyAddress, data, newImplementationContractObject) {
+    const args = { useCall: false, data, to: proxyAddress }
+    const confirmationCb = (network, tx, gasEstimation, continueTxExecution, cancelCb) => {
+      // continue using original authorization given by user
+      continueTxExecution(null)
+    }
+    const continueCb = (error, continueTxExecution, cancelCb) => { continueTxExecution() }
+    const promptCb = (okCb, cancelCb) => { okCb() }
+    const finalCb = (error, txResult, address, returnValue) => {
+      if (error) {
+        const log = logBuilder(error)
+
+        return this.call('terminal', 'logHtml', log)
+      }
+      return this.call('udapp', 'resolveContractAndAddInstance', newImplementationContractObject, proxyAddress)
+    }
+    this.runTx(args, confirmationCb, continueCb, promptCb, finalCb)
+  }
+
   async getEncodedFunctionHex (args, funABI) {
     return new Promise((resolve, reject) => {
       txFormat.encodeFunctionCall(args, funABI, (error, data) => {
diff --git a/libs/remix-core-plugin/src/lib/constants/uups.ts b/libs/remix-core-plugin/src/lib/constants/uups.ts
index 2fb521a999..977d3769a8 100644
--- a/libs/remix-core-plugin/src/lib/constants/uups.ts
+++ b/libs/remix-core-plugin/src/lib/constants/uups.ts
@@ -88,4 +88,18 @@ export const UUPSfunAbi = {
   type: "constructor",
   outputs: [],
   stateMutability: "payable"
+}
+
+export const UUPSupgradeAbi = {
+    "inputs": [
+        {
+            "internalType": "address",
+            "name": "newImplementation",
+            "type": "address"
+        }
+    ],
+    "name": "upgradeTo",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
 }
\ No newline at end of file
diff --git a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
index 2de757f4d2..9f9e8780d5 100644
--- a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
+++ b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
@@ -1,12 +1,12 @@
 import { Plugin } from '@remixproject/engine';
 import { ContractABI, ContractAST, DeployOption } from '../types/contract';
-import { UUPS, UUPSABI, UUPSBytecode, UUPSfunAbi } from './constants/uups';
+import { UUPS, UUPSABI, UUPSBytecode, UUPSfunAbi, UUPSupgradeAbi } from './constants/uups';
 
 const proxyProfile = {
   name: 'openzeppelin-proxy',
   displayName: 'openzeppelin-proxy',
   description: 'openzeppelin-proxy',
-  methods: ['isConcerned', 'execute', 'getDeployOptions']
+  methods: ['isConcerned', 'executeUUPSProxy', 'executeUUPSContractUpgrade', 'getDeployOptions', 'getUpgradeOptions']
 };
 export class OpenZeppelinProxy extends Plugin {
   blockchain: any
@@ -47,7 +47,7 @@ export class OpenZeppelinProxy extends Plugin {
     return inputs
   }
 
-  async execute(implAddress: string, args: string | string [] = '', initializeABI, implementationContractObject): Promise<void> {
+  async executeUUPSProxy(implAddress: string, args: string | string [] = '', initializeABI, implementationContractObject): Promise<void> {
     // deploy the proxy, or use an existing one
     if (!initializeABI) throw new Error('Cannot deploy proxy: Missing initialize ABI')
     args = args === '' ? [] : args
@@ -56,6 +56,13 @@ export class OpenZeppelinProxy extends Plugin {
     if (this.kind === 'UUPS') this.deployUUPSProxy(implAddress, _data, implementationContractObject)
   }
 
+  async executeUUPSContractUpgrade (proxyAddress: string, newImplAddress: string, newImplementationContractObject): Promise<void> {
+    if (!newImplAddress) throw new Error('Cannot upgrade: Missing implementation address')
+    if (!proxyAddress) throw new Error('Cannot upgrade: Missing proxy address')
+
+    if (this.kind === 'UUPS') this.upgradeUUPSProxy(proxyAddress, newImplAddress, newImplementationContractObject)
+  }
+
   async deployUUPSProxy (implAddress: string, _data: string, implementationContractObject): Promise<void> {
     const args = [implAddress, _data]
     const constructorData = await this.blockchain.getEncodedParams(args, UUPSfunAbi)
@@ -74,4 +81,20 @@ export class OpenZeppelinProxy extends Plugin {
     implementationContractObject.name = proxyName
     this.blockchain.deployProxy(data, implementationContractObject)
   }
+
+  async upgradeUUPSProxy (proxyAddress: string, newImplAddress: string, newImplementationContractObject): Promise<void> {
+    const fnData = await this.blockchain.getEncodedFunctionHex([newImplAddress], UUPSupgradeAbi)
+    const proxyName = 'ERC1967Proxy'
+    const data = {
+      contractABI: UUPSABI,
+      contractName: proxyName,
+      funAbi: UUPSupgradeAbi,
+      funArgs: [newImplAddress],
+      linkReferences: {},
+      dataHex: fnData.replace('0x', '')
+    }
+    // re-use implementation contract's ABI for UI display in udapp and change name to proxy name.
+    newImplementationContractObject.name = proxyName
+    this.blockchain.upgradeProxy(proxyAddress, data, newImplementationContractObject)    
+  }
 }
diff --git a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
index ce7f5f9567..25847a562b 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
@@ -135,6 +135,7 @@ export const createInstance = async (
   args,
   deployMode: DeployMode[]) => {
   const isProxyDeployment = (deployMode || []).find(mode => mode === 'Deploy with Proxy')
+  const isContractUpgrade = (deployMode || []).find(mode => mode === 'Upgrade Contract')
   const statusCb = (msg: string) => {
     const log = logBuilder(msg)
 
@@ -160,7 +161,9 @@ export const createInstance = async (
     if (isProxyDeployment) {
       const initABI = contractObject.abi.find(abi => abi.name === 'initialize')
 
-      plugin.call('openzeppelin-proxy', 'execute', addressToString(address), args, initABI, contractObject)
+      plugin.call('openzeppelin-proxy', 'executeUUPSProxy', addressToString(address), args, initABI, contractObject)
+    } else if (isContractUpgrade) {
+      plugin.call('openzeppelin-proxy', 'executeUUPSContractUpgrade', args, addressToString(address), contractObject)
     }
   }
 
@@ -192,7 +195,7 @@ export const createInstance = async (
       return terminalLogger(plugin, log)
     }))
   }
-  deployContract(plugin, selectedContract, !isProxyDeployment ? args : '', contractMetadata, compilerContracts, {
+  deployContract(plugin, selectedContract, !isProxyDeployment && !isContractUpgrade ? args : '', contractMetadata, compilerContracts, {
     continueCb: (error, continueTxExecution, cancelCb) => {
       continueHandler(dispatch, gasEstimationPrompt, error, continueTxExecution, cancelCb)
     },
diff --git a/libs/remix-ui/run-tab/src/lib/actions/events.ts b/libs/remix-ui/run-tab/src/lib/actions/events.ts
index f8d74dc359..dde29290e9 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/events.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/events.ts
@@ -108,7 +108,7 @@ const broadcastCompilationResult = async (plugin: RunTab, dispatch: React.Dispat
   if (isUpgradeable) {
     const options = await plugin.call('openzeppelin-proxy', 'getDeployOptions', data.contracts[file])
   
-    dispatch(setDeployOptions({ options: [{ title: 'Deploy with Proxy', active: false }], initializeOptions: options }))
+    dispatch(setDeployOptions({ options: [{ title: 'Deploy with Proxy', active: false }, { title: 'Upgrade Contract', active: false }], initializeOptions: options }))
   }
   else dispatch(setDeployOptions({} as any))
   dispatch(fetchContractListSuccess({ [file]: contracts }))
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 f8af09cbd1..8a55cbb830 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -3,8 +3,7 @@ import React, { useEffect, useRef, useState } from 'react'
 import * as remixLib from '@remix-project/remix-lib'
 import { ContractGUIProps } from '../types'
 import { CopyToClipboard } from '@remix-ui/clipboard'
-import { MultiDeployInput } from './multiDeployInput'
-import { DeployInput } from './deployInput'
+import { shortenAddress } from '@remix-ui/helper'
 
 const txFormat = remixLib.execution.txFormat
 export function ContractGUI (props: ContractGUIProps) {
@@ -15,20 +14,15 @@ export function ContractGUI (props: ContractGUIProps) {
     title: string,
     content: string,
     classList: string,
-    dataId: string,
-    widthClass: string
-  }>({ title: '', content: '', classList: '', dataId: '', widthClass: '' })
-  const [selectedDeployIndex, setSelectedDeployIndex] = useState<number>(null)
-  const [showOptions, setShowOptions] = useState<boolean>(false)
-  const [hasArgs, setHasArgs] = useState<boolean>(false)
-  const [isMultiField, setIsMultiField] = useState<boolean>(false)
-  const [deployInputs, setDeployInputs] = useState<{
-    internalType?: string,
-    name: string,
-    type: string
-  }[]>([])
-  const [deployPlaceholder, setDeployPlaceholder] = useState<string>('')
+    dataId: string
+  }>({ title: '', content: '', classList: '', dataId: '' })
+  const [toggleDeployProxy, setToggleDeployProxy] = useState<boolean>(false)
+  const [toggleUpgradeImp, setToggleUpgradeImp] = useState<boolean>(false)
+  const [deployState, setDeployState] = useState<{ deploy: boolean, upgrade: boolean }>({ deploy: false, upgrade: false })
+  const [useLastProxy, setUseLastProxy] = useState<boolean>(false)
+  const [proxyAddress, setProxyAddress] = useState<string>('')
   const multiFields = useRef<Array<HTMLInputElement | null>>([])
+  const initializeFields = useRef<Array<HTMLInputElement | null>>([])
   const basicInputRef = useRef<HTMLInputElement>()
 
   useEffect(() => {
@@ -41,7 +35,7 @@ export function ContractGUI (props: ContractGUIProps) {
     }
     setBasicInput('')
     // we have the reset the fields before reseting the previous references.
-    if (basicInputRef.current) basicInputRef.current.value = ''
+    basicInputRef.current.value = ''
     multiFields.current.filter((el) => el !== null && el !== undefined).forEach((el) => el.value = '')
     multiFields.current = []
   }, [props.title, props.funcABI])
@@ -53,8 +47,7 @@ export function ContractGUI (props: ContractGUIProps) {
         title: title + ' - call',
         content: 'call',
         classList: 'btn-info',
-        dataId: title + ' - call',
-        widthClass: props.widthClass
+        dataId: title + ' - call'
       })
     } else if (props.funcABI.stateMutability === 'payable' || props.funcABI.payable) {
     //   // transact. stateMutability = payable
@@ -62,8 +55,7 @@ export function ContractGUI (props: ContractGUIProps) {
         title: title + ' - transact (payable)',
         content: 'transact',
         classList: 'btn-danger',
-        dataId: title + ' - transact (payable)',
-        widthClass: props.widthClass
+        dataId: title + ' - transact (payable)'
       })
     } else {
     //   // transact. stateMutability = nonpayable
@@ -71,59 +63,13 @@ export function ContractGUI (props: ContractGUIProps) {
         title: title + ' - transact (not payable)',
         content: 'transact',
         classList: 'btn-warning',
-        dataId: title + ' - transact (not payable)',
-        widthClass: props.widthClass
+        dataId: title + ' - transact (not payable)'
       })
     }
   }, [props.lookupOnly, props.funcABI, title])
 
-  useEffect(() => {
-    if (props.deployOption && props.deployOption[selectedDeployIndex]) {
-      if (props.deployOption[selectedDeployIndex].title === 'Deploy with Proxy') {
-        if (props.initializerOptions) {
-          setDeployInputs(props.initializerOptions.inputs.inputs)
-          setDeployPlaceholder(props.initializerOptions.initializeInputs)
-          setHasArgs(true)
-          if (props.initializerOptions.inputs.inputs.length > 1) setIsMultiField(true)
-          else setIsMultiField(false)
-        } else {
-          setDeployInputs([])
-          setDeployPlaceholder('')
-          setHasArgs(false)
-          setIsMultiField(false)
-        }
-      } else {
-        if (props.funcABI) {
-          setDeployInputs(props.funcABI.inputs)
-          setDeployPlaceholder(props.inputs)
-          setHasArgs(true)
-          if (props.funcABI.inputs.length > 1) setIsMultiField(true)
-          else setIsMultiField(false)
-        } else {
-          setDeployInputs([])
-          setDeployPlaceholder('')
-          setHasArgs(false)
-          setIsMultiField(false)
-        }
-      }
-    } else {
-      if (props.funcABI) {
-        setDeployInputs(props.funcABI.inputs)
-        setDeployPlaceholder(props.inputs)
-        setHasArgs(true)
-        if (props.funcABI.inputs.length > 1) setIsMultiField(true)
-        else setIsMultiField(false)
-      } else {
-        setDeployInputs([])
-        setDeployPlaceholder('')
-        setHasArgs(false)
-        setIsMultiField(false)
-      }
-    }
-  }, [selectedDeployIndex, props.funcABI, props.initializerOptions])
-
-  const getContentOnCTC = (fields: HTMLInputElement[]) => {
-    const multiString = getMultiValsString(fields)
+  const getContentOnCTC = () => {
+    const multiString = getMultiValsString(multiFields.current)
     // copy-to-clipboard icon is only visible for method requiring input params
     if (!multiString) {
       return 'cannot encode empty arguments'
@@ -191,8 +137,7 @@ export function ContractGUI (props: ContractGUIProps) {
     if (inputString) {
       inputString = inputString.replace(/(^|,\s+|,)(\d+)(\s+,|,|$)/g, '$1"$2"$3') // replace non quoted number by quoted number
       inputString = inputString.replace(/(^|,\s+|,)(0[xX][0-9a-fA-F]+)(\s+,|,|$)/g, '$1"$2"$3') // replace non quoted hex string by quoted hex string
-      inputString = JSON.stringify([inputString])
-      const inputJSON = JSON.parse(inputString)
+      const inputJSON = JSON.parse('[' + inputString + ']')
       const multiInputs = multiFields.current
 
       for (let k = 0; k < multiInputs.length; k++) {
@@ -204,9 +149,15 @@ export function ContractGUI (props: ContractGUIProps) {
   }
 
   const handleActionClick = () => {
-    const deployMode = selectedDeployIndex !== null ? [props.deployOption[selectedDeployIndex].title] : []
+    if (deployState.deploy) {
+      const proxyInitializeString = getMultiValsString(initializeFields.current)
 
-    props.clickCallBack(props.funcABI.inputs, basicInput, deployMode)
+      props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
+    } else if (deployState.upgrade) {
+      props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade Contract'])
+    } else {
+      props.clickCallBack(props.funcABI.inputs, basicInput)
+    }
   }
 
   const handleBasicInput = (e) => {
@@ -215,90 +166,193 @@ export function ContractGUI (props: ContractGUIProps) {
     setBasicInput(value)
   }
 
-  const handleMultiValsSubmit = (fields: HTMLInputElement[]) => {
-    const valsString = getMultiValsString(fields)
-    const deployMode = selectedDeployIndex !== null ? [props.deployOption[selectedDeployIndex].title] : []
+  const handleExpandMultiClick = () => {
+    const valsString = getMultiValsString(multiFields.current)
 
     if (valsString) {
-      props.clickCallBack(props.funcABI.inputs, valsString, deployMode)
+      props.clickCallBack(props.funcABI.inputs, valsString)
     } else {
-      props.clickCallBack(props.funcABI.inputs, '', deployMode)
+      props.clickCallBack(props.funcABI.inputs, '')
     }
   }
 
-  const setSelectedDeploy = (index: number) => {
-    setSelectedDeployIndex(index !== selectedDeployIndex ? index : null)
-    if (basicInputRef.current) basicInputRef.current.value = ''
-    setBasicInput('')
+  const handleToggleDeployProxy = () => {
+    setToggleDeployProxy(!toggleDeployProxy)
+  }
+
+  const handleDeployProxySelect = (e) => {
+    const value = e.target.checked
+
+    if (value) setToggleUpgradeImp(false)
+    setToggleDeployProxy(value)
+    setDeployState({ upgrade: false, deploy: value })
+  }
+
+  const handleToggleUpgradeImp = () => {
+    setToggleUpgradeImp(!toggleUpgradeImp)
   }
 
-  const toggleOptions = () => {
-    setShowOptions(!showOptions)
+  const handleUpgradeImpSelect = (e) => {
+    const value = e.target.checked
+
+    setToggleUpgradeImp(value)
+    if (value) setToggleDeployProxy(false)
+    setDeployState({ deploy: false, upgrade: value })
+  }
+
+  const handleUseLastProxySelect = (e) => {
+    const value = e.target.checked
+
+    setUseLastProxy(value)
+    setProxyAddress('')
+  }
+
+  const handleSetProxyAddress = (e) => {
+    const value = e.target.value
+
+    setProxyAddress(value)
   }
 
   return (
-    <div className={`udapp_contractProperty ${hasArgs ? 'udapp_hasArgs' : ''}`}>
-    {
-      props.isDeploy ? !isMultiField ? 
-      <DeployInput 
-        buttonOptions={buttonOptions}
-        funcABI={props.initializerOptions ? props.initializerOptions.inputs : props.funcABI}
-        inputs={deployPlaceholder}
-        handleBasicInput={handleBasicInput}
-        basicInputRef={basicInputRef}
-        selectedIndex={selectedDeployIndex}
-        setSelectedIndex={setSelectedDeploy}
-        handleActionClick={handleActionClick}
-        deployOptions={props.deployOption}
-      /> : <MultiDeployInput
-        buttonOptions={buttonOptions}
-        selectedIndex={selectedDeployIndex}
-        setSelectedIndex={setSelectedDeploy}
-        handleMultiValsSubmit={handleMultiValsSubmit}
-        inputs={deployInputs}
-        getMultiValsString={getMultiValsString}
-        deployOptions={props.deployOption}
-      /> :
-      <>
-        <div className="udapp_contractActionsContainerSingle pt-2" style={{ display: toggleContainer ? 'none' : 'flex' }}>
-          <button onClick={handleActionClick} title={buttonOptions.title} className={`udapp_instanceButton ${props.widthClass} btn btn-sm ${buttonOptions.classList}`} data-id={buttonOptions.dataId}>{title}</button>
-          <input
-            className="form-control"
-            data-id={props.funcABI.type === 'fallback' || props.funcABI.type === 'receive' ? `'(${props.funcABI.type}')` : 'multiParamManagerBasicInputField'}
-            placeholder={props.inputs}
-            title={props.funcABI.type === 'fallback' || props.funcABI.type === 'receive' ? `'(${props.funcABI.type}')` : props.inputs}
-            onChange={handleBasicInput}
-            ref={basicInputRef}
-            style={{ visibility: !((props.funcABI.inputs && props.funcABI.inputs.length > 0) || (props.funcABI.type === 'fallback') || (props.funcABI.type === 'receive')) ? 'hidden' : 'visible' }} />
-          <i
-            className="fas fa-angle-down udapp_methCaret"
-            onClick={switchMethodViewOn}
-            title={title}
-            style={{ visibility: !(props.funcABI.inputs && props.funcABI.inputs.length > 0) ? 'hidden' : 'visible' }}></i>
+    <div className={`udapp_contractProperty ${(props.funcABI.inputs && props.funcABI.inputs.length > 0) || (props.funcABI.type === 'fallback') || (props.funcABI.type === 'receive') ? 'udapp_hasArgs' : ''}`}>
+      <div className="udapp_contractActionsContainerSingle pt-2" style={{ display: toggleContainer ? 'none' : 'flex' }}>
+        <button onClick={handleActionClick} title={buttonOptions.title} className={`udapp_instanceButton ${props.widthClass} btn btn-sm ${buttonOptions.classList}`} data-id={buttonOptions.dataId}>{title}</button>
+        <input
+          className="form-control"
+          data-id={props.funcABI.type === 'fallback' || props.funcABI.type === 'receive' ? `'(${props.funcABI.type}')` : 'multiParamManagerBasicInputField'}
+          placeholder={props.inputs}
+          title={props.funcABI.type === 'fallback' || props.funcABI.type === 'receive' ? `'(${props.funcABI.type}')` : props.inputs}
+          onChange={handleBasicInput}
+          ref={basicInputRef}
+          style={{ visibility: !((props.funcABI.inputs && props.funcABI.inputs.length > 0) || (props.funcABI.type === 'fallback') || (props.funcABI.type === 'receive')) ? 'hidden' : 'visible' }} />
+        <i
+          className="fas fa-angle-down udapp_methCaret"
+          onClick={switchMethodViewOn}
+          title={title}
+          style={{ visibility: !(props.funcABI.inputs && props.funcABI.inputs.length > 0) ? 'hidden' : 'visible' }}></i>
+      </div>
+      <div className="udapp_contractActionsContainerMulti" style={{ display: toggleContainer ? 'flex' : 'none' }}>
+        <div className="udapp_contractActionsContainerMultiInner text-dark">
+          <div onClick={switchMethodViewOff} className="udapp_multiHeader">
+            <div className="udapp_multiTitle run-instance-multi-title">{title}</div>
+            <i className='fas fa-angle-up udapp_methCaret'></i>
+          </div>
+          <div>
+            {props.funcABI.inputs.map((inp, index) => {
+              return (
+                <div className="udapp_multiArg" key={index}>
+                  <label htmlFor={inp.name}> {inp.name}: </label>
+                  <input ref={el => { multiFields.current[index] = el }} className="form-control" placeholder={inp.type} title={inp.name} data-id={`multiParamManagerInput${inp.name}`} />
+                </div>)
+            })}
+          </div>
+          <div className="udapp_group udapp_multiArg">
+            <CopyToClipboard tip='Encode values of input fields & copy to clipboard' icon='fa-clipboard' direction={'bottom'} getContent={getContentOnCTC} />
+            <button onClick={handleExpandMultiClick} title={buttonOptions.title} data-id={buttonOptions.dataId} className={`udapp_instanceButton ${buttonOptions.classList}`}>{ buttonOptions.content }</button>
+          </div>
         </div>
-        <div className="udapp_contractActionsContainerMulti" style={{ display: toggleContainer ? 'flex' : 'none' }}>
-          <div className="udapp_contractActionsContainerMultiInner text-dark">
-            <div onClick={switchMethodViewOff} className="udapp_multiHeader">
-              <div className="udapp_multiTitle run-instance-multi-title">{title}</div>
-              <i className='fas fa-angle-up udapp_methCaret'></i>
+      </div>
+      { props.deployOption && (props.deployOption || []).length > 0 ?
+        <>
+          <div className='d-flex justify-content-between'>
+            <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
+              <input
+                id="deployWithProxy"
+                data-id="contractGUIDeployWithProxy"
+                className="form-check-input custom-control-input"
+                type="checkbox"
+                onChange={handleDeployProxySelect}
+                checked={deployState.deploy}
+              />
+              <label
+                htmlFor="deployWithProxy"
+                data-id="contractGUIDeployWithProxyLabel"
+                className="m-0 form-check-label custom-control-label udapp_checkboxAlign"
+                title="An ERC1967 proxy contract will be deployed along with the selected implementation contract."
+              >
+                Deploy With Proxy
+              </label>
             </div>
             <div>
-              {props.funcABI.inputs.map((inp, index) => {
-                return (
-                  <div className="udapp_multiArg" key={index}>
-                    <label htmlFor={inp.name}> {inp.name}: </label>
-                    <input ref={el => { multiFields.current[index] = el }} className="form-control" placeholder={inp.type} title={inp.name} data-id={`multiParamManagerInput${inp.name}`} />
-                  </div>)
-              })}
+              {
+                props.initializerOptions && props.initializerOptions.initializeInputs ? 
+                <span onClick={handleToggleDeployProxy}>
+                  <i className={!toggleDeployProxy ? 'fas fa-angle-right pt-2' : 'fas fa-angle-down'} aria-hidden="true"></i>
+                </span> : null
+              }
             </div>
-            <div className="udapp_group udapp_multiArg">
-              <CopyToClipboard tip='Encode values of input fields & copy to clipboard' icon='fa-clipboard' direction={'bottom'} getContent={() => getContentOnCTC(multiFields.current)} />
-              <button onClick={() => handleMultiValsSubmit(multiFields.current)} title={buttonOptions.title} data-id={buttonOptions.dataId} className={`udapp_instanceButton ${buttonOptions.classList}`}>{ buttonOptions.content }</button>
+          </div>
+            {
+              props.initializerOptions && props.initializerOptions.initializeInputs ?
+                <div className={`pl-4 flex-column ${toggleDeployProxy ? "d-flex" : "d-none"}`}>
+                  <div className={`flex-column 'd-flex'}`}>{
+                    props.initializerOptions.inputs.inputs.map((inp, index) => {
+                      return (
+                        <div className="mb-2" key={index}>
+                          <label className='mt-2 text-left d-block' htmlFor={inp.name}> {inp.name}: </label>
+                          <input ref={el => { initializeFields.current[index] = el }} style={{ height: 32 }} className="form-control udapp_input" placeholder={inp.type} title={inp.name} />
+                        </div>
+                      )})
+                    }
+                  </div>
+                </div> : null
+            }
+          <div className='d-flex justify-content-between'>
+            <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
+              <input
+                id="upgradeImplementation"
+                data-id="contractGUIUpgradeImplementation"
+                className="form-check-input custom-control-input"
+                type="checkbox"
+                onChange={handleUpgradeImpSelect}
+                checked={deployState.upgrade}
+              />
+              <label
+                htmlFor="upgradeImplementation"
+                data-id="contractGUIUpgradeImplementationLabel"
+                className="m-0 form-check-label custom-control-label udapp_checkboxAlign"
+                title="The implemetation address will be updated to a new address in the proxy contract."
+              >
+                Upgrade Contract
+              </label>
             </div>
+            <span onClick={handleToggleUpgradeImp}>
+              <i className={!toggleUpgradeImp ? 'fas fa-angle-right pt-2' : 'fas fa-angle-down'} aria-hidden="true"></i>
+            </span>
           </div>
-        </div>
-      </>
-    }
+          <div className={`pl-4 flex-column ${toggleUpgradeImp ? "d-flex" : "d-none"}`}>
+            <div className={`flex-column 'd-flex'}`}>
+              <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
+                <input
+                  id="proxyAddress"
+                  data-id="contractGUIProxyAddress"
+                  className="form-check-input custom-control-input"
+                  type="checkbox"
+                  onChange={handleUseLastProxySelect}
+                  checked={useLastProxy}
+                />
+                <label
+                  htmlFor="proxyAddress"
+                  data-id="contractGUIProxyAddressLabel"
+                  className="m-0 form-check-label custom-control-label udapp_checkboxAlign"
+                  title="Select this option to use the last deployed ERC1967 contract on the current network."
+                  style={{ fontSize: 12 }}
+                >
+                  Use last deployed ERC1967 contract
+                </label>
+              </div>
+              {
+                !useLastProxy ? 
+                <div className="mb-2">
+                  <label className='mt-2 text-left d-block'>Proxy Address: </label>
+                  <input style={{ height: 32 }} className="form-control udapp_input" placeholder='proxy address' title='Enter previously deployed proxy address on the selected network' onChange={handleSetProxyAddress} />
+                </div> :
+                <span className='text-capitalize'>{ shortenAddress(proxyAddress) || 'No proxy address available' }</span>
+              }
+            </div>
+          </div>
+        </> : null
+      }
     </div>
   )
 }
diff --git a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
index 2a0ff1c855..aadf532380 100644
--- a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
+++ b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
@@ -1,6 +1,6 @@
 import { CompilerAbstract } from '@remix-project/remix-solidity-ts'
 import { ContractData } from '@remix-project/core-plugin'
-import { DeployMode, DeployOption, DeployOptions } from '../types'
+import { DeployMode, DeployOptions } from '../types'
 import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_TX_FEE_CONTENT } from '../constants'
 import Web3 from 'web3'
 
diff --git a/libs/remix-ui/run-tab/src/lib/types/index.ts b/libs/remix-ui/run-tab/src/lib/types/index.ts
index c304d8815f..0137294bda 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -219,7 +219,7 @@ export interface Modal {
   cancelFn: () => void
 }
 
-export type DeployMode = 'Deploy with Proxy' | 'Upgrade Proxy'
+export type DeployMode = 'Deploy with Proxy' | 'Upgrade Contract'
 
 export type DeployOption = {
   initializeInputs: string,

From 00f14b61e8f69471eb2e1a693cfe5a99f90acddf Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Thu, 7 Jul 2022 16:11:37 +0100
Subject: [PATCH 27/49] Use last deployed proxy address

---
 apps/remix-ide/src/blockchain/blockchain.js     |  4 ++++
 libs/remix-ui/run-tab/src/lib/actions/events.ts |  6 ++++--
 .../remix-ui/run-tab/src/lib/actions/payload.ts |  9 ++++++++-
 .../src/lib/components/contractDropdownUI.tsx   |  1 +
 .../run-tab/src/lib/components/contractGUI.tsx  |  5 +++--
 .../remix-ui/run-tab/src/lib/constants/index.ts |  3 ++-
 .../remix-ui/run-tab/src/lib/reducers/runTab.ts | 17 ++++++++++++++++-
 libs/remix-ui/run-tab/src/lib/types/index.ts    |  4 +++-
 8 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/apps/remix-ide/src/blockchain/blockchain.js b/apps/remix-ide/src/blockchain/blockchain.js
index 515819b22d..346d8ded69 100644
--- a/apps/remix-ide/src/blockchain/blockchain.js
+++ b/apps/remix-ide/src/blockchain/blockchain.js
@@ -161,7 +161,9 @@ export class Blockchain extends Plugin {
 
   async runProxyTx (proxyData, implementationContractObject) {
     const args = { useCall: false, data: proxyData }
+    let networkInfo
     const confirmationCb = (network, tx, gasEstimation, continueTxExecution, cancelCb) => {
+      networkInfo = network
       // continue using original authorization given by user
       continueTxExecution(null)
     }
@@ -173,6 +175,8 @@ export class Blockchain extends Plugin {
   
         return this.call('terminal', 'logHtml', log)
       }
+      if (networkInfo.name === 'VM') this.config.set('vm/proxy', address)
+      else this.config.set(`${networkInfo.name}/${networkInfo.currentFork}/${networkInfo.id}/proxy`, address)
       return this.call('udapp', 'resolveContractAndAddInstance', implementationContractObject, address)
     }
 
diff --git a/libs/remix-ui/run-tab/src/lib/actions/events.ts b/libs/remix-ui/run-tab/src/lib/actions/events.ts
index dde29290e9..13eacd809d 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/events.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/events.ts
@@ -2,7 +2,7 @@ import { envChangeNotification } from "@remix-ui/helper"
 import { RunTab } from "../types/run-tab"
 import { setExecutionContext, setFinalContext, updateAccountBalances } from "./account"
 import { addExternalProvider, addInstance, removeExternalProvider, setNetworkNameFromProvider } from "./actions"
-import { clearAllInstances, clearRecorderCount, fetchContractListSuccess, resetUdapp, setCurrentContract, setCurrentFile, setDeployOptions, setLoadType, setRecorderCount, setSendValue } from "./payload"
+import { clearAllInstances, clearRecorderCount, fetchContractListSuccess, resetUdapp, setCurrentContract, setCurrentFile, setDeployOptions, setLoadType, setProxyEnvAddress, setRecorderCount, setSendValue } from "./payload"
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 import * as ethJSUtil from 'ethereumjs-util'
 import Web3 from 'web3'
@@ -24,7 +24,7 @@ export const setupEvents = (plugin: RunTab, dispatch: React.Dispatch<any>) => {
 
   plugin.blockchain.event.register('networkStatus', ({ error, network }) => {
     if (error) {
-      const netUI = 'can\'t detect network '
+      const netUI = 'can\'t detect network'
       setNetworkNameFromProvider(dispatch, netUI)
 
       return
@@ -33,6 +33,8 @@ export const setupEvents = (plugin: RunTab, dispatch: React.Dispatch<any>) => {
     const netUI = (networkProvider() !== 'vm') ? `${network.name} (${network.id || '-'}) network` : 'VM'
 
     setNetworkNameFromProvider(dispatch, netUI)
+    if (network.name === 'VM') dispatch(setProxyEnvAddress(plugin.config.get('vm/proxy')))
+    else dispatch(setProxyEnvAddress(plugin.config.get(`${network.name}/${network.currentFork}/${network.id}/proxy`)))
   })
 
   plugin.blockchain.event.register('addProvider', provider => addExternalProvider(dispatch, provider))
diff --git a/libs/remix-ui/run-tab/src/lib/actions/payload.ts b/libs/remix-ui/run-tab/src/lib/actions/payload.ts
index 64545368b6..f48461a459 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/payload.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/payload.ts
@@ -1,6 +1,6 @@
 import { ContractList } from '../reducers/runTab'
 import { ContractData } from '@remix-project/core-plugin'
-import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_TX_FEE_CONTENT } from '../constants'
+import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_PROXY_ENV_ADDRESS, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_TX_FEE_CONTENT } from '../constants'
 import { DeployMode, DeployOptions } from '../types'
 
 export const fetchAccountsListRequest = () => {
@@ -307,3 +307,10 @@ export const setCurrentContract = (contractName: string) => {
     type: SET_CURRENT_CONTRACT
   }
 }
+
+export const setProxyEnvAddress = (key: string) => {
+  return {
+    payload: key,
+    type: SET_PROXY_ENV_ADDRESS
+  }
+}
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
index b61563ef5b..fc8196aea0 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -240,6 +240,7 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
                 widthClass='w-50'
                 evmBC={loadedContractData.bytecodeObject}
                 lookupOnly={false}
+                savedProxyAddress={deployOptions.proxyKey}
               />
               <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
                 <input
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 8a55cbb830..b6b4d206fc 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -202,9 +202,10 @@ export function ContractGUI (props: ContractGUIProps) {
 
   const handleUseLastProxySelect = (e) => {
     const value = e.target.checked
+    const address = props.savedProxyAddress
 
     setUseLastProxy(value)
-    setProxyAddress('')
+    setProxyAddress(address || '')
   }
 
   const handleSetProxyAddress = (e) => {
@@ -347,7 +348,7 @@ export function ContractGUI (props: ContractGUIProps) {
                   <label className='mt-2 text-left d-block'>Proxy Address: </label>
                   <input style={{ height: 32 }} className="form-control udapp_input" placeholder='proxy address' title='Enter previously deployed proxy address on the selected network' onChange={handleSetProxyAddress} />
                 </div> :
-                <span className='text-capitalize'>{ shortenAddress(proxyAddress) || 'No proxy address available' }</span>
+                <span className='text-capitalize'>{ proxyAddress ? shortenAddress(proxyAddress) : 'No proxy address available' }</span>
               }
             </div>
           </div>
diff --git a/libs/remix-ui/run-tab/src/lib/constants/index.ts b/libs/remix-ui/run-tab/src/lib/constants/index.ts
index ae8af3c708..91dd777b3b 100644
--- a/libs/remix-ui/run-tab/src/lib/constants/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/constants/index.ts
@@ -44,4 +44,5 @@ export const RESET_STATE = 'RESET_STATE'
 export const ADD_DEPLOY_OPTION = 'ADD_DEPLOY_OPTION'
 export const REMOVE_DEPLOY_OPTION = 'REMOVE_DEPLOY_OPTION'
 export const SET_DEPLOY_OPTIONS = 'SET_DEPLOY_OPTIONS'
-export const SET_CURRENT_CONTRACT = 'SET_CURRENT_CONTRACT'
\ No newline at end of file
+export const SET_CURRENT_CONTRACT = 'SET_CURRENT_CONTRACT'
+export const SET_PROXY_ENV_ADDRESS = 'SET_PROXY_ENV_ADDRESS'
diff --git a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
index aadf532380..fd690e7f64 100644
--- a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
+++ b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
@@ -1,7 +1,7 @@
 import { CompilerAbstract } from '@remix-project/remix-solidity-ts'
 import { ContractData } from '@remix-project/core-plugin'
 import { DeployMode, DeployOptions } from '../types'
-import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_TX_FEE_CONTENT } from '../constants'
+import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_TX_FEE_CONTENT, SET_PROXY_ENV_ADDRESS } from '../constants'
 import Web3 from 'web3'
 
 declare const window: any
@@ -723,6 +723,21 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
       }
     }
 
+    case SET_PROXY_ENV_ADDRESS: {
+      const payload: string = action.payload
+
+      return {
+        ...state,
+        contracts: {
+          ...state.contracts,
+          deployOptions: {
+            ...state.contracts.deployOptions,
+            proxyKey: payload
+          }
+        }
+      }
+    }
+
     default:
       return state
   }
diff --git a/libs/remix-ui/run-tab/src/lib/types/index.ts b/libs/remix-ui/run-tab/src/lib/types/index.ts
index 0137294bda..27b5085833 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -242,6 +242,7 @@ export interface DeployOptions {
     [key: string]: DeployOption
   },
   options: { title: DeployMode, active: boolean }[],
+  proxyKey?: string
 }
 
 export interface ContractGUIProps {
@@ -255,7 +256,8 @@ export interface ContractGUIProps {
   disabled?: boolean,
   isDeploy?: boolean,
   deployOption?: { title: DeployMode, active: boolean }[],
-  initializerOptions?: DeployOption
+  initializerOptions?: DeployOption,
+  savedProxyAddress?: string
 }
 export interface MainnetProps {
   network: Network,

From 7f89e1be69d9bc939194e2aca78d6e1307daf084 Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Fri, 8 Jul 2022 14:26:16 +0100
Subject: [PATCH 28/49] Add upgrade modal and update deploy options based on
 currentFile

---
 apps/remix-ide/src/blockchain/blockchain.js   | 24 ++++++++++++--
 .../src/lib/openzeppelin-proxy.ts             | 13 ++++----
 libs/remix-core-plugin/src/types/contract.ts  | 32 +++++++++++--------
 .../helper/src/lib/helper-components.tsx      |  6 ++++
 .../run-tab/src/lib/actions/deploy.ts         |  2 +-
 .../run-tab/src/lib/actions/events.ts         |  9 +++---
 .../run-tab/src/lib/actions/payload.ts        |  8 ++---
 .../src/lib/components/contractDropdownUI.tsx |  9 +++---
 .../src/lib/components/contractGUI.tsx        | 12 ++++---
 .../run-tab/src/lib/reducers/runTab.ts        | 30 +++++++----------
 libs/remix-ui/run-tab/src/lib/types/index.ts  | 10 +++---
 11 files changed, 90 insertions(+), 65 deletions(-)

diff --git a/apps/remix-ide/src/blockchain/blockchain.js b/apps/remix-ide/src/blockchain/blockchain.js
index 346d8ded69..fef939a3d4 100644
--- a/apps/remix-ide/src/blockchain/blockchain.js
+++ b/apps/remix-ide/src/blockchain/blockchain.js
@@ -11,8 +11,7 @@ import InjectedProvider from './providers/injected.js'
 import NodeProvider from './providers/node.js'
 import { execution, EventManager, helpers } from '@remix-project/remix-lib'
 import { etherScanLink } from './helper'
-import { logBuilder, confirmProxyMsg } from "@remix-ui/helper"
-import { cancelProxyMsg } from '@remix-ui/helper'
+import { logBuilder, cancelUpgradeMsg, cancelProxyMsg } from "@remix-ui/helper"
 const { txFormat, txExecution, typeConversion, txListener: Txlistener, TxRunner, TxRunnerWeb3, txHelper } = execution
 const { txResultHelper: resultToRemixTx } = helpers
 const packageJson = require('../../../../package.json')
@@ -183,7 +182,26 @@ export class Blockchain extends Plugin {
     this.runTx(args, confirmationCb, continueCb, promptCb, finalCb)
   }
 
-  async upgradeProxy(proxyAddress, data, newImplementationContractObject) {
+  async upgradeProxy(proxyAddress, newImplAddress, data, newImplementationContractObject) {
+    const upgradeModal = {
+      id: 'confirmProxyDeployment',
+      title: 'ERC1967',
+      message: `Confirm you want to upgrade your contract to new implementation ${newImplAddress}.`,
+      modalType: 'modal',
+      okLabel: 'OK',
+      cancelLabel: 'Cancel',
+      okFn: () => {
+        this.runUpgradeTx(proxyAddress, data, newImplementationContractObject)
+      },
+      cancelFn: () => {
+        this.call('notification', 'toast', cancelUpgradeMsg())
+      },
+      hideFn: () => null
+    }
+    this.call('notification', 'modal', upgradeModal)
+  }
+
+  async runUpgradeTx (proxyAddress, data, newImplementationContractObject) {
     const args = { useCall: false, data, to: proxyAddress }
     const confirmationCb = (network, tx, gasEstimation, continueTxExecution, cancelCb) => {
       // continue using original authorization given by user
diff --git a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
index 9f9e8780d5..af0c7bebaa 100644
--- a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
+++ b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
@@ -1,12 +1,12 @@
 import { Plugin } from '@remixproject/engine';
-import { ContractABI, ContractAST, DeployOption } from '../types/contract';
+import { ContractABI, ContractAST, DeployOptions } from '../types/contract';
 import { UUPS, UUPSABI, UUPSBytecode, UUPSfunAbi, UUPSupgradeAbi } from './constants/uups';
 
 const proxyProfile = {
   name: 'openzeppelin-proxy',
   displayName: 'openzeppelin-proxy',
   description: 'openzeppelin-proxy',
-  methods: ['isConcerned', 'executeUUPSProxy', 'executeUUPSContractUpgrade', 'getDeployOptions', 'getUpgradeOptions']
+  methods: ['isConcerned', 'executeUUPSProxy', 'executeUUPSContractUpgrade', 'getProxyOptions', 'getUpgradeOptions']
 };
 export class OpenZeppelinProxy extends Plugin {
   blockchain: any
@@ -28,7 +28,7 @@ export class OpenZeppelinProxy extends Plugin {
     return false
   }
 
-  async getDeployOptions (contracts: ContractABI): Promise<{ [name: string]: DeployOption }> {
+  async getProxyOptions (contracts: ContractABI): Promise<{ [name: string]: DeployOptions }> {
     const inputs = {}
 
     if (this.kind === 'UUPS') {
@@ -36,8 +36,9 @@ export class OpenZeppelinProxy extends Plugin {
         const abi = contracts[name].abi
         const initializeInput = abi.find(node => node.name === 'initialize')
 
-        if (initializeInput) {
-          inputs[name] = {
+        inputs[name] = {
+          options: [{ title: 'Deploy with Proxy', active: false }, { title: 'Upgrade Contract', active: false }],
+          initializeOptions: {
             inputs: initializeInput,
             initializeInputs: this.blockchain.getInputs(initializeInput)
           }
@@ -95,6 +96,6 @@ export class OpenZeppelinProxy extends Plugin {
     }
     // re-use implementation contract's ABI for UI display in udapp and change name to proxy name.
     newImplementationContractObject.name = proxyName
-    this.blockchain.upgradeProxy(proxyAddress, data, newImplementationContractObject)    
+    this.blockchain.upgradeProxy(proxyAddress, newImplAddress, data, newImplementationContractObject)
   }
 }
diff --git a/libs/remix-core-plugin/src/types/contract.ts b/libs/remix-core-plugin/src/types/contract.ts
index 92c32653b5..bd0c9075d0 100644
--- a/libs/remix-core-plugin/src/types/contract.ts
+++ b/libs/remix-core-plugin/src/types/contract.ts
@@ -136,19 +136,25 @@ export interface ContractABI {
     };
 }
 
+export type DeployMode = 'Deploy with Proxy' | 'Upgrade Contract'
+
 export type DeployOption = {
-    initializeInputs: string,
+  initializeInputs: string,
+  inputs: {
     inputs: {
-      inputs: {
-        internalType?: string,
-        name: string,
-        type: string
-      }[],
-      name: "initialize",
-      outputs?: any[],
-      stateMutability: string,
-      type: string,
-      payable?: boolean,
-      constant?: any
-    }
+      internalType?: string,
+      name: string,
+      type: string
+    }[],
+    name: "initialize",
+    outputs?: any[],
+    stateMutability: string,
+    type: string,
+    payable?: boolean,
+    constant?: any
   }
+}
+export interface DeployOptions {
+  initializeOptions: DeployOption,
+  options: { title: DeployMode, active: boolean }[]
+}
diff --git a/libs/remix-ui/helper/src/lib/helper-components.tsx b/libs/remix-ui/helper/src/lib/helper-components.tsx
index 206fbec926..aa2928f691 100644
--- a/libs/remix-ui/helper/src/lib/helper-components.tsx
+++ b/libs/remix-ui/helper/src/lib/helper-components.tsx
@@ -89,3 +89,9 @@ export const cancelProxyMsg = () => (
     <b>Proxy deployment cancelled.</b>
   </div>
 )
+
+export const cancelUpgradeMsg = () => (
+  <div>
+    <b>Upgrade with proxy cancelled.</b>
+  </div>
+)
diff --git a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
index 25847a562b..b43065468b 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
@@ -179,7 +179,7 @@ export const createInstance = async (
 
   if (selectedContract.isOverSizeLimit()) {
     return dispatch(displayNotification('Contract code size over limit', isOverSizePrompt(), 'Force Send', 'Cancel', () => {
-      deployContract(plugin, selectedContract, !isProxyDeployment ? args : '', contractMetadata, compilerContracts, {
+      deployContract(plugin, selectedContract, !isProxyDeployment && !isContractUpgrade ? args : '', contractMetadata, compilerContracts, {
         continueCb: (error, continueTxExecution, cancelCb) => {
           continueHandler(dispatch, gasEstimationPrompt, error, continueTxExecution, cancelCb)
         },
diff --git a/libs/remix-ui/run-tab/src/lib/actions/events.ts b/libs/remix-ui/run-tab/src/lib/actions/events.ts
index 13eacd809d..447da599fc 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/events.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/events.ts
@@ -2,7 +2,7 @@ import { envChangeNotification } from "@remix-ui/helper"
 import { RunTab } from "../types/run-tab"
 import { setExecutionContext, setFinalContext, updateAccountBalances } from "./account"
 import { addExternalProvider, addInstance, removeExternalProvider, setNetworkNameFromProvider } from "./actions"
-import { clearAllInstances, clearRecorderCount, fetchContractListSuccess, resetUdapp, setCurrentContract, setCurrentFile, setDeployOptions, setLoadType, setProxyEnvAddress, setRecorderCount, setSendValue } from "./payload"
+import { addDeployOption, clearAllInstances, clearRecorderCount, fetchContractListSuccess, resetUdapp, setCurrentContract, setCurrentFile, setLoadType, setProxyEnvAddress, setRecorderCount, setSendValue } from "./payload"
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 import * as ethJSUtil from 'ethereumjs-util'
 import Web3 from 'web3'
@@ -108,11 +108,12 @@ const broadcastCompilationResult = async (plugin: RunTab, dispatch: React.Dispat
   const isUpgradeable = await plugin.call('openzeppelin-proxy', 'isConcerned', data.sources[file] ? data.sources[file].ast : {})
 
   if (isUpgradeable) {
-    const options = await plugin.call('openzeppelin-proxy', 'getDeployOptions', data.contracts[file])
+    const options = await plugin.call('openzeppelin-proxy', 'getProxyOptions', data.contracts[file])
   
-    dispatch(setDeployOptions({ options: [{ title: 'Deploy with Proxy', active: false }, { title: 'Upgrade Contract', active: false }], initializeOptions: options }))
+    dispatch(addDeployOption({ [file]: options }))
+  } else {
+    dispatch(addDeployOption({ [file]: {} }))
   }
-  else dispatch(setDeployOptions({} as any))
   dispatch(fetchContractListSuccess({ [file]: contracts }))
   dispatch(setCurrentFile(file))
   // TODO: set current contract
diff --git a/libs/remix-ui/run-tab/src/lib/actions/payload.ts b/libs/remix-ui/run-tab/src/lib/actions/payload.ts
index f48461a459..bb0fc91a41 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/payload.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/payload.ts
@@ -280,21 +280,21 @@ export const resetUdapp = () => {
   }
 }
 
-export const addDeployOption = (deployOption: DeployOptions) => {
+export const addDeployOption = (deployOption: { [file: string]: { [name: string]: DeployOptions } }) => {
   return {
     payload: deployOption,
     type: ADD_DEPLOY_OPTION
   }
 }
 
-export const removeDeployOption = (title: DeployMode) => {
+export const removeDeployOption = (file: string) => {
   return {
-    payload: title,
+    payload: file,
     type: REMOVE_DEPLOY_OPTION
   }
 }
 
-export const setDeployOptions = (deployOptions: DeployOptions) => {
+export const setDeployOptions = (deployOptions: { [file: string]: { [name: string]: DeployOptions } }) => {
   return {
     payload: deployOptions,
     type: SET_DEPLOY_OPTIONS
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
index fc8196aea0..da13ce63d6 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -27,7 +27,7 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
   const [constructorInterface, setConstructorInterface] = useState<FuncABI>(null)
   const [constructorInputs, setConstructorInputs] = useState(null)
   const contractsRef = useRef<HTMLSelectElement>(null)
-  const { contractList, loadType, currentFile, currentContract, compilationCount, deployOptions } = props.contracts
+  const { contractList, loadType, currentFile, currentContract, compilationCount, deployOptions, proxyKey } = props.contracts
 
   useEffect(() => {
     enableAtAddress(false)
@@ -155,6 +155,7 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
     if (selectedContract.bytecodeObject.length === 0) {
       return props.modal('Alert', 'This contract may be abstract, it may not implement an abstract parent\'s methods completely or it may not invoke an inherited contract\'s constructor correctly.', 'OK', () => {})
     }
+    if ((selectedContract.name !== currentContract) && (selectedContract.name === 'ERC1967Proxy')) selectedContract.name = currentContract
     props.createInstance(loadedContractData, props.gasEstimationPrompt, props.passphrasePrompt, props.publishToStorage, props.mainnetPrompt, isOverSizePrompt, args, deployMode)
   }
 
@@ -232,15 +233,15 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
               <ContractGUI
                 title='Deploy'
                 isDeploy={true}
-                deployOption={deployOptions.options}
-                initializerOptions={deployOptions.initializeOptions ? deployOptions.initializeOptions[currentContract] : null}
+                deployOption={deployOptions[currentFile] && deployOptions[currentFile][currentContract] ? deployOptions[currentFile][currentContract].options : null}
+                initializerOptions={deployOptions[currentFile] && deployOptions[currentFile][currentContract] ? deployOptions[currentFile][currentContract].initializeOptions : null}
                 funcABI={constructorInterface}
                 clickCallBack={clickCallback}
                 inputs={constructorInputs}
                 widthClass='w-50'
                 evmBC={loadedContractData.bytecodeObject}
                 lookupOnly={false}
-                savedProxyAddress={deployOptions.proxyKey}
+                savedProxyAddress={proxyKey}
               />
               <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
                 <input
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 b6b4d206fc..52a2af56cf 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -3,7 +3,6 @@ import React, { useEffect, useRef, useState } from 'react'
 import * as remixLib from '@remix-project/remix-lib'
 import { ContractGUIProps } from '../types'
 import { CopyToClipboard } from '@remix-ui/clipboard'
-import { shortenAddress } from '@remix-ui/helper'
 
 const txFormat = remixLib.execution.txFormat
 export function ContractGUI (props: ContractGUIProps) {
@@ -196,7 +195,10 @@ export function ContractGUI (props: ContractGUIProps) {
     const value = e.target.checked
 
     setToggleUpgradeImp(value)
-    if (value) setToggleDeployProxy(false)
+    if (value) {
+      setToggleDeployProxy(false)
+      if (useLastProxy) setProxyAddress(props.savedProxyAddress)
+    }
     setDeployState({ deploy: false, upgrade: value })
   }
 
@@ -314,7 +316,7 @@ export function ContractGUI (props: ContractGUIProps) {
                 className="m-0 form-check-label custom-control-label udapp_checkboxAlign"
                 title="The implemetation address will be updated to a new address in the proxy contract."
               >
-                Upgrade Contract
+                Upgrade With Proxy
               </label>
             </div>
             <span onClick={handleToggleUpgradeImp}>
@@ -343,12 +345,12 @@ export function ContractGUI (props: ContractGUIProps) {
                 </label>
               </div>
               {
-                !useLastProxy ? 
+                !useLastProxy ?
                 <div className="mb-2">
                   <label className='mt-2 text-left d-block'>Proxy Address: </label>
                   <input style={{ height: 32 }} className="form-control udapp_input" placeholder='proxy address' title='Enter previously deployed proxy address on the selected network' onChange={handleSetProxyAddress} />
                 </div> :
-                <span className='text-capitalize'>{ proxyAddress ? shortenAddress(proxyAddress) : 'No proxy address available' }</span>
+                <span className='text-capitalize' style={{ fontSize: '.8em' }}>{ proxyAddress || 'No proxy address available' }</span>
               }
             </div>
           </div>
diff --git a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
index fd690e7f64..5299b748ab 100644
--- a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
+++ b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
@@ -1,8 +1,7 @@
 import { CompilerAbstract } from '@remix-project/remix-solidity-ts'
 import { ContractData } from '@remix-project/core-plugin'
-import { DeployMode, DeployOptions } from '../types'
-import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_TX_FEE_CONTENT, SET_PROXY_ENV_ADDRESS } from '../constants'
-import Web3 from 'web3'
+import { DeployOptions } from '../types'
+import { ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_TX_FEE_CONTENT, SET_PROXY_ENV_ADDRESS, ADD_DEPLOY_OPTION, REMOVE_DEPLOY_OPTION } from '../constants'
 
 declare const window: any
 interface Action {
@@ -67,7 +66,8 @@ export interface RunTabState {
         compiler: CompilerAbstract
       }[]
     },
-    deployOptions: DeployOptions
+    deployOptions: { [file: string]: { [name: string]: DeployOptions } },
+    proxyKey: string,
     loadType: 'abi' | 'sol' | 'other'
     currentFile: string,
     currentContract: string,
@@ -155,6 +155,7 @@ export const runTabInitialState: RunTabState = {
   contracts: {
     contractList: {},
     deployOptions: {} as any,
+    proxyKey: '',
     loadType: 'other',
     currentFile: '',
     currentContract: '',
@@ -680,39 +681,33 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
     }
 
     case ADD_DEPLOY_OPTION: {
-      const payload: { title: DeployMode, active: boolean } = action.payload
+      const payload: { [file: string]: { [name: string]: DeployOptions } } = action.payload
 
       return {
         ...state,
         contracts: {
           ...state.contracts,
-          deployOptions: { 
-            ...state.contracts.deployOptions,
-            options: [...state.contracts.deployOptions.options, payload]
-          }
+          deployOptions: {...state.contracts.deployOptions, ...payload }
         }
       }
     }
 
     case REMOVE_DEPLOY_OPTION: {
       const payload: string = action.payload
-      const options = state.contracts.deployOptions.options.filter(val => val.title !== payload)
+      const options = state.contracts.deployOptions
 
-      
+      delete options[payload]
       return {
         ...state,
         contracts: {
           ...state.contracts,
-          deployOptions: {
-            ...state.contracts.deployOptions,
-            options
-          }
+          deployOptions: options
         }
       }
     }
 
     case SET_DEPLOY_OPTIONS: {
-      const payload: DeployOptions = action.payload
+      const payload: { [file: string]: { [name: string]: DeployOptions } } = action.payload
 
       return {
         ...state,
@@ -730,10 +725,7 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
         ...state,
         contracts: {
           ...state.contracts,
-          deployOptions: {
-            ...state.contracts.deployOptions,
             proxyKey: payload
-          }
         }
       }
     }
diff --git a/libs/remix-ui/run-tab/src/lib/types/index.ts b/libs/remix-ui/run-tab/src/lib/types/index.ts
index 27b5085833..0595ef69dc 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -128,7 +128,8 @@ export interface ContractDropdownProps {
   exEnvironment: string,
   contracts: {
     contractList: ContractList,
-    deployOptions: DeployOptions,
+    deployOptions: { [file: string]: { [name: string]: DeployOptions } },
+    proxyKey: string,
     loadType: 'abi' | 'sol' | 'other',
     currentFile: string,
     currentContract: string,
@@ -238,11 +239,8 @@ export type DeployOption = {
   }
 }
 export interface DeployOptions {
-  initializeOptions: {
-    [key: string]: DeployOption
-  },
-  options: { title: DeployMode, active: boolean }[],
-  proxyKey?: string
+  initializeOptions: DeployOption,
+  options: { title: DeployMode, active: boolean }[]
 }
 
 export interface ContractGUIProps {

From c1a7e712056b34627e25f9af6c852c638ba54a3d Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Fri, 8 Jul 2022 14:38:30 +0100
Subject: [PATCH 29/49] Revert previous e2e changes because of old UI

---
 .../remix-ide-e2e/src/commands/createContract.ts | 16 ++++------------
 apps/remix-ide-e2e/src/tests/debugger.test.ts    | 10 +++++-----
 .../src/tests/libraryDeployment.test.ts          |  8 ++++----
 apps/remix-ide-e2e/src/tests/recorder.test.ts    |  6 +++---
 .../src/tests/signingMessage.test.ts             |  2 +-
 .../src/tests/specialFunctions.test.ts           | 12 ++++++------
 apps/remix-ide-e2e/src/tests/terminal.test.ts    |  2 +-
 .../src/tests/transactionExecution.test.ts       |  4 ++--
 apps/remix-ide-e2e/src/types/index.d.ts          |  2 +-
 9 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/apps/remix-ide-e2e/src/commands/createContract.ts b/apps/remix-ide-e2e/src/commands/createContract.ts
index 44ff4780c7..015a4f2012 100644
--- a/apps/remix-ide-e2e/src/commands/createContract.ts
+++ b/apps/remix-ide-e2e/src/commands/createContract.ts
@@ -2,7 +2,7 @@ import { NightwatchBrowser } from 'nightwatch'
 import EventEmitter from 'events'
 
 class CreateContract extends EventEmitter {
-  command (this: NightwatchBrowser, inputParams: string[]): NightwatchBrowser {
+  command (this: NightwatchBrowser, inputParams: string): NightwatchBrowser {
     this.api.perform((done) => {
       createContract(this.api, inputParams, () => {
         done()
@@ -13,19 +13,11 @@ class CreateContract extends EventEmitter {
   }
 }
 
-function createContract (browser: NightwatchBrowser, inputParams: string[], callback: VoidFunction) {
-  if (inputParams.length === 1) {
-    browser.setValue('.udapp_contractActionsContainerSingle > input', inputParams[0], function () {
+function createContract (browser: NightwatchBrowser, inputParams: string, callback: VoidFunction) {
+  if (inputParams) {
+    browser.setValue('.udapp_contractActionsContainerSingle > input', inputParams, function () {
       browser.click('.udapp_contractActionsContainerSingle > button').pause(500).perform(function () { callback() })
     })
-  } else if (inputParams.length > 1) {
-    browser.perform((done) => {
-      for (let i = 0; i < inputParams.length; i++) {
-        browser.setValue(`div.udapp_multiArg:nth-child(${i + 1}) > input`, inputParams[i])
-      }
-      done()
-    })
-    .click('div.udapp_multiArg > button').pause(500).perform(function () { callback() })
   } else {
     browser
       .click('.udapp_contractActionsContainerSingle > button')
diff --git a/apps/remix-ide-e2e/src/tests/debugger.test.ts b/apps/remix-ide-e2e/src/tests/debugger.test.ts
index 19aa196b60..c3541d2163 100644
--- a/apps/remix-ide-e2e/src/tests/debugger.test.ts
+++ b/apps/remix-ide-e2e/src/tests/debugger.test.ts
@@ -86,7 +86,7 @@ module.exports = {
       .clickLaunchIcon('udapp')
       .waitForElementPresent('*[title="Deploy - transact (not payable)"]', 35000)
       .selectContract('ERC20')
-      .createContract(["tokenName", "symbol"])
+      .createContract('"tokenName", "symbol"')
       .debugTransaction(0)
       .pause(2000)
       .waitForElementVisible('#stepdetail')
@@ -115,7 +115,7 @@ module.exports = {
       .testContracts('withABIEncoderV2.sol', sources[2]['withABIEncoderV2.sol'], ['test'])
       .clickLaunchIcon('udapp')
       .selectContract('test')
-      .createContract([])
+      .createContract('')
       .clearConsole()
       .clickInstance(0)
       .clickFunction('test1 - transact (not payable)', { types: 'bytes userData', values: '0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4' })
@@ -148,7 +148,7 @@ module.exports = {
       .testContracts('locals.sol', sources[3]['locals.sol'], ['testLocals'])
       .clickLaunchIcon('udapp')
       .waitForElementPresent('*[title="Deploy - transact (not payable)"]', 40000)
-      .createContract([])
+      .createContract('')
       .pause(2000)
       .clearConsole()
       .clickInstance(0)
@@ -173,7 +173,7 @@ module.exports = {
       .pause(2000)
       .testContracts('withGeneratedSources.sol', sources[4]['withGeneratedSources.sol'], ['A'])
       .clickLaunchIcon('udapp')
-      .createContract([])
+      .createContract('')
       .clearConsole()
       .clickInstance(0)
       .clickFunction('f - transact (not payable)', { types: 'uint256[] ', values: '[]' })
@@ -235,7 +235,7 @@ module.exports = {
       .testContracts('reverted.sol', sources[6]['reverted.sol'], ['A', 'B', 'C'])
       .clickLaunchIcon('udapp')
       .selectContract('A')
-      .createContract([])
+      .createContract('')
       .pause(500)
       .clickInstance(0)
       .clickFunction('callA - transact (not payable)')
diff --git a/apps/remix-ide-e2e/src/tests/libraryDeployment.test.ts b/apps/remix-ide-e2e/src/tests/libraryDeployment.test.ts
index 276e9136d5..4b3c4528c4 100644
--- a/apps/remix-ide-e2e/src/tests/libraryDeployment.test.ts
+++ b/apps/remix-ide-e2e/src/tests/libraryDeployment.test.ts
@@ -22,7 +22,7 @@ module.exports = {
     browser.verifyContracts(['test'])
       .clickLaunchIcon('udapp')
       .selectContract('test')
-      .createContract([])
+      .createContract('')
       .getAddressAtPosition(0, (address) => {
         console.log('testAutoDeployLib ' + address)
         addressRef = address
@@ -46,7 +46,7 @@ module.exports = {
       .verifyContracts(['test'])
       .clickLaunchIcon('udapp')
       .selectContract('lib') // deploy lib
-      .createContract([])
+      .createContract('')
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
           console.log(address)
@@ -74,7 +74,7 @@ function checkDeployShouldFail (browser: NightwatchBrowser, callback: VoidFuncti
     .openFile('Untitled5.sol')
     .clickLaunchIcon('udapp')
     .selectContract('test') // deploy lib
-    .createContract([])
+    .createContract('')
     .pause(2000)
     .getText('div[class^="terminal"]', (value) => {
       console.log('value: ', value)
@@ -98,7 +98,7 @@ function checkDeployShouldSucceed (browser: NightwatchBrowser, address: string,
     .openFile('Untitled5.sol')
     .clickLaunchIcon('udapp')
     .selectContract('test') // deploy lib
-    .createContract([])
+    .createContract('')
     .getAddressAtPosition(1, (address) => {
       addressRef = address
     })
diff --git a/apps/remix-ide-e2e/src/tests/recorder.test.ts b/apps/remix-ide-e2e/src/tests/recorder.test.ts
index 7f69cd5dff..0f896a179e 100644
--- a/apps/remix-ide-e2e/src/tests/recorder.test.ts
+++ b/apps/remix-ide-e2e/src/tests/recorder.test.ts
@@ -40,7 +40,7 @@ module.exports = {
     'Save scenario #group1': function (browser: NightwatchBrowser) {
       browser.testContracts('testRecorder.sol', sources[0]['testRecorder.sol'], ['testRecorder'])
       .clickLaunchIcon('udapp')
-      .createContract(['12'])
+      .createContract('12')
       .clickInstance(0)
       .clickFunction('set - transact (not payable)', { types: 'uint256 _p', values: '34' })
       .click('.savetransaction')
@@ -73,11 +73,11 @@ module.exports = {
       .clickLaunchIcon('udapp')
       .selectContract('t1est')
       .pause(1000)
-      .createContract([])
+      .createContract('')
       .clickInstance(0)
       .selectContract('t2est')
       .pause(1000)
-      .createContract([])
+      .createContract('')
       .click('.savetransaction')
       .waitForElementVisible('[data-id="udappNotify-modal-footer-ok-react"]')
       .execute(function () {
diff --git a/apps/remix-ide-e2e/src/tests/signingMessage.test.ts b/apps/remix-ide-e2e/src/tests/signingMessage.test.ts
index 177dac88a0..913851fa38 100644
--- a/apps/remix-ide-e2e/src/tests/signingMessage.test.ts
+++ b/apps/remix-ide-e2e/src/tests/signingMessage.test.ts
@@ -33,7 +33,7 @@ module.exports = {
       .clickLaunchIcon('udapp')
       .pause(5000)
       .selectContract('ECVerify')
-      .createContract([])
+      .createContract('')
       .clickInstance(0)
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
diff --git a/apps/remix-ide-e2e/src/tests/specialFunctions.test.ts b/apps/remix-ide-e2e/src/tests/specialFunctions.test.ts
index 48137e3b8b..bcdc3c4977 100644
--- a/apps/remix-ide-e2e/src/tests/specialFunctions.test.ts
+++ b/apps/remix-ide-e2e/src/tests/specialFunctions.test.ts
@@ -24,7 +24,7 @@ module.exports = {
       .clickLaunchIcon('udapp')
       .selectAccount('0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c') // this account will be used for this test suite
       .selectContract('CheckSpecials')
-      .createContract([]) // deploy
+      .createContract('') // deploy
       .clickInstance(0)
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
@@ -92,7 +92,7 @@ module.exports = {
       .testContracts('receiveOnly.sol', sources[1]['receiveOnly.sol'], ['CheckSpecials'])
       .clickLaunchIcon('udapp')
       .selectContract('CheckSpecials')
-      .createContract([])
+      .createContract('')
       .clickInstance(0)
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
@@ -122,7 +122,7 @@ module.exports = {
       .testContracts('fallbackOnlyPayable.sol', sources[2]['fallbackOnlyPayable.sol'], ['CheckSpecials'])
       .clickLaunchIcon('udapp')
       .selectContract('CheckSpecials')
-      .createContract([])
+      .createContract('')
       .clickInstance(0)
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
@@ -153,7 +153,7 @@ module.exports = {
       .testContracts('fallbackOnlyNotPayable.sol', sources[3]['fallbackOnlyNotPayable.sol'], ['CheckSpecials'])
       .clickLaunchIcon('udapp')
       .selectContract('CheckSpecials')
-      .createContract([])
+      .createContract('')
       .clickInstance(0)
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
@@ -174,7 +174,7 @@ module.exports = {
       .clearValue('#value')
       .setValue('#value', '0')
       .pause(2000)
-      .createContract([])
+      .createContract('')
       .pause(1000)
       .clickInstance(0).pause(1000)
       .perform((done) => {
@@ -208,7 +208,7 @@ module.exports = {
       .waitForElementVisible('#value')
       .clearValue('#value')
       .setValue('#value', '0').pause(2000)
-      .createContract([])
+      .createContract('')
       .clickInstance(0)
       .pause(1000)
       .perform((done) => {
diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts
index b958b7d42d..7cc5268933 100644
--- a/apps/remix-ide-e2e/src/tests/terminal.test.ts
+++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts
@@ -172,7 +172,7 @@ module.exports = {
       .clickLaunchIcon('udapp')
       .click('*[data-id="deployAndRunClearInstances"]')
       .selectContract('OwnerTest')
-      .createContract([])
+      .createContract('')
       .pause(1000)
       .journalChildIncludes('constructor', { shouldHaveOnlyOneOccurence: true })
       .pause(5000)
diff --git a/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts b/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts
index 842da3b3c7..635218881f 100644
--- a/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts
+++ b/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts
@@ -202,10 +202,10 @@ module.exports = {
       .addFile('Storage.sol', sources[6]['Storage.sol'])
       .addFile('Owner.sol', sources[6]['Owner.sol'])
       .clickLaunchIcon('udapp')
-      .createContract(['42', '24'])
+      .createContract('42, 24')
       .openFile('Storage.sol')
       .clickLaunchIcon('udapp')
-      .createContract(['102']) // this creation will fail if the component hasn't been properly reset.
+      .createContract('102') // this creation will fail if the component hasn't been properly reset.
       .clickInstance(1)
       .clickFunction('store - transact (not payable)', { types: 'uint256 num', values: '24' })
       .testFunction('last', // we check if the contract is actually reachable.
diff --git a/apps/remix-ide-e2e/src/types/index.d.ts b/apps/remix-ide-e2e/src/types/index.d.ts
index 9ba94f470b..c45c1d4d3d 100644
--- a/apps/remix-ide-e2e/src/types/index.d.ts
+++ b/apps/remix-ide-e2e/src/types/index.d.ts
@@ -34,7 +34,7 @@ declare module 'nightwatch' {
         getModalBody(callback: (value: string, cb: VoidFunction) => void): NightwatchBrowser,
         modalFooterCancelClick(id?: string): NightwatchBrowser,
         selectContract(contractName: string): NightwatchBrowser,
-        createContract(inputParams: string[]): NightwatchBrowser,
+        createContract(inputParams: string): NightwatchBrowser,
         getAddressAtPosition(index: number, cb: (pos: string) => void): NightwatchBrowser,
         testConstantFunction(address: string, fnFullName: string, expectedInput: NightwatchTestConstantFunctionExpectedInput | null, expectedOutput: string): NightwatchBrowser,
         getEditorValue(callback: (content: string) => void): NightwatchBrowser,

From bab493b06965f189300be51c184f25fc2dec55c9 Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Sat, 9 Jul 2022 11:42:04 +0100
Subject: [PATCH 30/49] Add matomo tracking

---
 apps/remix-ide/src/blockchain/blockchain.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/remix-ide/src/blockchain/blockchain.js b/apps/remix-ide/src/blockchain/blockchain.js
index fef939a3d4..08d4b8f3bd 100644
--- a/apps/remix-ide/src/blockchain/blockchain.js
+++ b/apps/remix-ide/src/blockchain/blockchain.js
@@ -149,9 +149,11 @@ export class Blockchain extends Plugin {
       cancelLabel: 'Cancel',
       okFn: () => {
         this.runProxyTx(proxyData, implementationContractObject)
+        _paq.push(['trackEvent', 'blockchain', 'Deploy With Proxy', 'modal ok confirmation'])
       },
       cancelFn: () => {
         this.call('notification', 'toast', cancelProxyMsg())
+        _paq.push(['trackEvent', 'blockchain', 'Deploy With Proxy', 'cancel proxy deployment'])
       },
       hideFn: () => null
     }
@@ -172,10 +174,12 @@ export class Blockchain extends Plugin {
       if (error) {
         const log = logBuilder(error)
   
+        _paq.push(['trackEvent', 'blockchain', 'Deploy With Proxy', 'Proxy deployment failed: ' + error])
         return this.call('terminal', 'logHtml', log)
       }
       if (networkInfo.name === 'VM') this.config.set('vm/proxy', address)
       else this.config.set(`${networkInfo.name}/${networkInfo.currentFork}/${networkInfo.id}/proxy`, address)
+      _paq.push(['trackEvent', 'blockchain', 'Deploy With Proxy', 'Proxy deployment successful'])
       return this.call('udapp', 'resolveContractAndAddInstance', implementationContractObject, address)
     }
 
@@ -192,9 +196,11 @@ export class Blockchain extends Plugin {
       cancelLabel: 'Cancel',
       okFn: () => {
         this.runUpgradeTx(proxyAddress, data, newImplementationContractObject)
+        _paq.push(['trackEvent', 'blockchain', 'Upgrade With Proxy', 'proxy upgrade confirmation click'])
       },
       cancelFn: () => {
         this.call('notification', 'toast', cancelUpgradeMsg())
+        _paq.push(['trackEvent', 'blockchain', 'Upgrade With Proxy', 'proxy upgrade cancel click'])
       },
       hideFn: () => null
     }
@@ -213,8 +219,10 @@ export class Blockchain extends Plugin {
       if (error) {
         const log = logBuilder(error)
 
+        _paq.push(['trackEvent', 'blockchain', 'Upgrade With Proxy', 'Upgrade failed'])
         return this.call('terminal', 'logHtml', log)
       }
+      _paq.push(['trackEvent', 'blockchain', 'Upgrade With Proxy', 'Upgrade Successful'])
       return this.call('udapp', 'resolveContractAndAddInstance', newImplementationContractObject, proxyAddress)
     }
     this.runTx(args, confirmationCb, continueCb, promptCb, finalCb)

From 97753e53c7c6bef0fad697b9a07500042508e3d6 Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Mon, 11 Jul 2022 10:02:32 +0100
Subject: [PATCH 31/49] Get initialize inputs if abi is available

---
 libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
index af0c7bebaa..d8ba856272 100644
--- a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
+++ b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
@@ -40,7 +40,7 @@ export class OpenZeppelinProxy extends Plugin {
           options: [{ title: 'Deploy with Proxy', active: false }, { title: 'Upgrade Contract', active: false }],
           initializeOptions: {
             inputs: initializeInput,
-            initializeInputs: this.blockchain.getInputs(initializeInput)
+            initializeInputs: initializeInput ? this.blockchain.getInputs(initializeInput) : null
           }
         }
       })

From e7968c72118888c2b5fc03ef3e44409b941ab403 Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Mon, 11 Jul 2022 10:06:42 +0100
Subject: [PATCH 32/49] Renamed upgrade title

---
 libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts     | 2 +-
 libs/remix-core-plugin/src/types/contract.ts             | 2 +-
 libs/remix-ui/run-tab/src/lib/actions/deploy.ts          | 2 +-
 libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx | 2 +-
 libs/remix-ui/run-tab/src/lib/types/index.ts             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
index d8ba856272..55abe4e443 100644
--- a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
+++ b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
@@ -37,7 +37,7 @@ export class OpenZeppelinProxy extends Plugin {
         const initializeInput = abi.find(node => node.name === 'initialize')
 
         inputs[name] = {
-          options: [{ title: 'Deploy with Proxy', active: false }, { title: 'Upgrade Contract', active: false }],
+          options: [{ title: 'Deploy with Proxy', active: false }, { title: 'Upgrade with Proxy', active: false }],
           initializeOptions: {
             inputs: initializeInput,
             initializeInputs: initializeInput ? this.blockchain.getInputs(initializeInput) : null
diff --git a/libs/remix-core-plugin/src/types/contract.ts b/libs/remix-core-plugin/src/types/contract.ts
index bd0c9075d0..b6d2aa513a 100644
--- a/libs/remix-core-plugin/src/types/contract.ts
+++ b/libs/remix-core-plugin/src/types/contract.ts
@@ -136,7 +136,7 @@ export interface ContractABI {
     };
 }
 
-export type DeployMode = 'Deploy with Proxy' | 'Upgrade Contract'
+export type DeployMode = 'Deploy with Proxy' | 'Upgrade with Proxy'
 
 export type DeployOption = {
   initializeInputs: string,
diff --git a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
index b43065468b..440d805664 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
@@ -135,7 +135,7 @@ export const createInstance = async (
   args,
   deployMode: DeployMode[]) => {
   const isProxyDeployment = (deployMode || []).find(mode => mode === 'Deploy with Proxy')
-  const isContractUpgrade = (deployMode || []).find(mode => mode === 'Upgrade Contract')
+  const isContractUpgrade = (deployMode || []).find(mode => mode === 'Upgrade with Proxy')
   const statusCb = (msg: string) => {
     const log = logBuilder(msg)
 
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 52a2af56cf..4eb661a6a8 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -153,7 +153,7 @@ export function ContractGUI (props: ContractGUIProps) {
 
       props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
     } else if (deployState.upgrade) {
-      props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade Contract'])
+      props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
     } else {
       props.clickCallBack(props.funcABI.inputs, basicInput)
     }
diff --git a/libs/remix-ui/run-tab/src/lib/types/index.ts b/libs/remix-ui/run-tab/src/lib/types/index.ts
index 0595ef69dc..dfb526d59d 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -220,7 +220,7 @@ export interface Modal {
   cancelFn: () => void
 }
 
-export type DeployMode = 'Deploy with Proxy' | 'Upgrade Contract'
+export type DeployMode = 'Deploy with Proxy' | 'Upgrade with Proxy'
 
 export type DeployOption = {
   initializeInputs: string,

From b522b2a85395ac1b4561a3fcb2645307707a70f8 Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Mon, 11 Jul 2022 13:12:23 +0100
Subject: [PATCH 33/49] Track inherited contracts using exported symbols

---
 .../src/lib/openzeppelin-proxy.ts             |  34 ++--
 libs/remix-core-plugin/src/types/contract.ts  | 185 ++++++++++--------
 .../run-tab/src/lib/actions/events.ts         |   5 +-
 3 files changed, 130 insertions(+), 94 deletions(-)

diff --git a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
index 55abe4e443..bf3302f625 100644
--- a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
+++ b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
@@ -1,6 +1,6 @@
-import { Plugin } from '@remixproject/engine';
-import { ContractABI, ContractAST, DeployOptions } from '../types/contract';
-import { UUPS, UUPSABI, UUPSBytecode, UUPSfunAbi, UUPSupgradeAbi } from './constants/uups';
+import { Plugin } from '@remixproject/engine'
+import { ContractABI, ContractAST, ContractSources, DeployOptions } from '../types/contract'
+import { UUPS, UUPSABI, UUPSBytecode, UUPSfunAbi, UUPSupgradeAbi } from './constants/uups'
 
 const proxyProfile = {
   name: 'openzeppelin-proxy',
@@ -28,20 +28,30 @@ export class OpenZeppelinProxy extends Plugin {
     return false
   }
 
-  async getProxyOptions (contracts: ContractABI): Promise<{ [name: string]: DeployOptions }> {
+  async getProxyOptions (data: ContractSources, file: string): Promise<{ [name: string]: DeployOptions }> {
+    const contracts = data.contracts[file]
+    const ast = data.sources[file].ast
     const inputs = {}
 
     if (this.kind === 'UUPS') {
       Object.keys(contracts).map(name => {
-        const abi = contracts[name].abi
-        const initializeInput = abi.find(node => node.name === 'initialize')
+        if (ast) {
+          const UUPSSymbol = ast.exportedSymbols['UUPSUpgradeable'] ? ast.exportedSymbols['UUPSUpgradeable'][0] : null
 
-        inputs[name] = {
-          options: [{ title: 'Deploy with Proxy', active: false }, { title: 'Upgrade with Proxy', active: false }],
-          initializeOptions: {
-            inputs: initializeInput,
-            initializeInputs: initializeInput ? this.blockchain.getInputs(initializeInput) : null
-          }
+          ast.absolutePath === file && ast.nodes.map((node) => {
+            if (node.name === name && node.linearizedBaseContracts.includes(UUPSSymbol)) {
+              const abi = contracts[name].abi
+              const initializeInput = abi.find(node => node.name === 'initialize')
+      
+              inputs[name] = {
+                options: [{ title: 'Deploy with Proxy', active: false }, { title: 'Upgrade with Proxy', active: false }],
+                initializeOptions: {
+                  inputs: initializeInput,
+                  initializeInputs: initializeInput ? this.blockchain.getInputs(initializeInput) : null
+                }
+              }
+            }
+          })
         }
       })
     }
diff --git a/libs/remix-core-plugin/src/types/contract.ts b/libs/remix-core-plugin/src/types/contract.ts
index b6d2aa513a..a327539a60 100644
--- a/libs/remix-core-plugin/src/types/contract.ts
+++ b/libs/remix-core-plugin/src/types/contract.ts
@@ -54,86 +54,40 @@ export interface ContractAST {
     }[]
 }
 
-export interface ContractABI {
-    [key: string]: {
-        abi: ({
-            inputs: never[];
-            stateMutability: string;
-            type: string;
-            anonymous?: undefined;
-            name?: undefined;
-            outputs?: undefined;
-        } | {
-            anonymous: boolean;
-            inputs: {
-                indexed: boolean;
-                internalType: string;
-                name: string;
-                type: string;
-            }[];
-            name: string;
-            type: string;
-            stateMutability?: undefined;
-            outputs?: undefined;
-        } | {
-            inputs: {
-                internalType: string;
-                name: string;
-                type: string;
-            }[];
-            name: string;
-            outputs: {
-                internalType: string;
-                name: string;
-                type: string;
-            }[];
-            stateMutability: string;
-            type: string;
-            anonymous?: undefined;
-        })[];
-        devdoc: {
-            kind: string;
-            methods: {
-                [key: string]: {
-                    [key: string]: string
-                }
-            };
-            version: number;
-        };
-        evm: any
-        metadata: string;
-        storageLayout: {
-            storage: {
-                astId: number;
-                contract: string;
-                label: string;
-                offset: number;
-                slot: string;
-                type: string;
-            }[];
-            types: {
-                [key: string]: {
-                    base: string;
-                    encoding: string;
-                    label: string;
-                    numberOfBytes: string;
-                    members?: {
-                        astId: number;
-                        contract: string;
-                        label: string;
-                        offset: number;
-                        slot: string;
-                        type: string;
-                    }[];
-                };
-            };
-        };
-        userdoc: {
-            kind: string;
-            methods: any;
-            version: number;
-        };
-    };
+export type ContractABI = {
+    inputs: [];
+    stateMutability: string;
+    type: string;
+    anonymous?: undefined;
+    name?: string;
+    outputs?: undefined;
+} | {
+    anonymous: boolean;
+    inputs: {
+        indexed: boolean;
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    type: string;
+    stateMutability?: undefined;
+    outputs?: undefined;
+} | {
+    inputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    outputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    stateMutability: string;
+    type: string;
+    anonymous?: undefined;
 }
 
 export type DeployMode = 'Deploy with Proxy' | 'Upgrade with Proxy'
@@ -158,3 +112,74 @@ export interface DeployOptions {
   initializeOptions: DeployOption,
   options: { title: DeployMode, active: boolean }[]
 }
+
+export interface ContractSources {
+    contracts: {
+      [path: string]: {
+        [contractName: string]: {
+          abi: ContractABI[],
+            devdoc: {
+                kind: string
+                methods: {
+                    [key: string]: {
+                        [key: string]: string
+                    }
+                };
+                version: number
+            }
+            evm: any
+            metadata: string
+            storageLayout: {
+                storage: {
+                    astId: number
+                    contract: string
+                    label: string
+                    offset: number
+                    slot: string
+                    type: string
+                }[]
+                types: {
+                    [key: string]: {
+                        base: string
+                        encoding: string
+                        label: string
+                        numberOfBytes: string
+                        members?: {
+                            astId: number
+                            contract: string
+                            label: string
+                            offset: number
+                            slot: string
+                            type: string
+                        }[]
+                    }
+                }
+            }
+                userdoc: {
+                    kind: string
+                    methods: any
+                    version: number
+                }
+            }
+        }
+    },
+    error: {
+      component: string,
+      errorCode: string,
+      formattedMessage: string,
+      message: string,
+      severity: string,
+      sourceLocation: {
+        end: number,
+        file: string,
+        start: number
+      },
+      type: string
+    }[],
+    sources: {
+      [path: string]: {
+        ast: ContractAST,
+        id: number
+      }
+    }
+  }
diff --git a/libs/remix-ui/run-tab/src/lib/actions/events.ts b/libs/remix-ui/run-tab/src/lib/actions/events.ts
index 447da599fc..0156ef8432 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/events.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/events.ts
@@ -6,6 +6,7 @@ import { addDeployOption, clearAllInstances, clearRecorderCount, fetchContractLi
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 import * as ethJSUtil from 'ethereumjs-util'
 import Web3 from 'web3'
+import { ContractSources } from "../types"
 
 export const setupEvents = (plugin: RunTab, dispatch: React.Dispatch<any>) => {
   plugin.blockchain.events.on('newTransaction', (tx, receipt) => {
@@ -92,7 +93,7 @@ export const setupEvents = (plugin: RunTab, dispatch: React.Dispatch<any>) => {
   })
 }
 
-const broadcastCompilationResult = async (plugin: RunTab, dispatch: React.Dispatch<any>, file, source, languageVersion, data, input?) => {
+const broadcastCompilationResult = async (plugin: RunTab, dispatch: React.Dispatch<any>, file, source, languageVersion, data: ContractSources, input?) => {
   // TODO check whether the tab is configured
   const compiler = new CompilerAbstract(languageVersion, data, source, input)
 
@@ -108,7 +109,7 @@ const broadcastCompilationResult = async (plugin: RunTab, dispatch: React.Dispat
   const isUpgradeable = await plugin.call('openzeppelin-proxy', 'isConcerned', data.sources[file] ? data.sources[file].ast : {})
 
   if (isUpgradeable) {
-    const options = await plugin.call('openzeppelin-proxy', 'getProxyOptions', data.contracts[file])
+    const options = await plugin.call('openzeppelin-proxy', 'getProxyOptions', data, file)
   
     dispatch(addDeployOption({ [file]: options }))
   } else {

From f1125494ce26b71db0aba0e08df5b9be8d3f675f Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Mon, 11 Jul 2022 14:05:08 +0100
Subject: [PATCH 34/49] Added pre-deployment modal

---
 libs/remix-ui/helper/src/lib/helper-components.tsx   | 12 ++++++++++++
 libs/remix-ui/run-tab/src/lib/actions/events.ts      |  3 +--
 .../src/lib/components/contractDropdownUI.tsx        | 12 +++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/libs/remix-ui/helper/src/lib/helper-components.tsx b/libs/remix-ui/helper/src/lib/helper-components.tsx
index aa2928f691..8dc4e95a16 100644
--- a/libs/remix-ui/helper/src/lib/helper-components.tsx
+++ b/libs/remix-ui/helper/src/lib/helper-components.tsx
@@ -95,3 +95,15 @@ export const cancelUpgradeMsg = () => (
     <b>Upgrade with proxy cancelled.</b>
   </div>
 )
+
+export const deployWithProxyMsg = () => (
+  <div>
+    NOTE: Deploy With Proxy will initiate two (2) transactions. The first is for the deployment of your implementation contract and the second will be a deployment of an ERC1967 proxy contract.
+  </div>
+)
+
+export const upgradeWithProxyMsg = () => (
+  <div>
+    NOTE: Upgrade With Proxy will initiate two (2) transactions. The first is for the deployment of your implementation contract and the second will intiate a call to the upgradeTo function in your proxy contract.
+  </div>
+)
diff --git a/libs/remix-ui/run-tab/src/lib/actions/events.ts b/libs/remix-ui/run-tab/src/lib/actions/events.ts
index 0156ef8432..4355f4e87e 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/events.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/events.ts
@@ -6,7 +6,6 @@ import { addDeployOption, clearAllInstances, clearRecorderCount, fetchContractLi
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 import * as ethJSUtil from 'ethereumjs-util'
 import Web3 from 'web3'
-import { ContractSources } from "../types"
 
 export const setupEvents = (plugin: RunTab, dispatch: React.Dispatch<any>) => {
   plugin.blockchain.events.on('newTransaction', (tx, receipt) => {
@@ -93,7 +92,7 @@ export const setupEvents = (plugin: RunTab, dispatch: React.Dispatch<any>) => {
   })
 }
 
-const broadcastCompilationResult = async (plugin: RunTab, dispatch: React.Dispatch<any>, file, source, languageVersion, data: ContractSources, input?) => {
+const broadcastCompilationResult = async (plugin: RunTab, dispatch: React.Dispatch<any>, file, source, languageVersion, data, input?) => {
   // TODO check whether the tab is configured
   const compiler = new CompilerAbstract(languageVersion, data, source, input)
 
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
index da13ce63d6..556491bc2c 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -4,6 +4,7 @@ import { ContractDropdownProps, DeployMode } from '../types'
 import { ContractData, FuncABI } from '@remix-project/core-plugin'
 import * as ethJSUtil from 'ethereumjs-util'
 import { ContractGUI } from './contractGUI'
+import { deployWithProxyMsg, upgradeWithProxyMsg } from '@remix-ui/helper'
 
 export function ContractDropdownUI (props: ContractDropdownProps) {
   const [abiLabel, setAbiLabel] = useState<{
@@ -156,7 +157,16 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
       return props.modal('Alert', 'This contract may be abstract, it may not implement an abstract parent\'s methods completely or it may not invoke an inherited contract\'s constructor correctly.', 'OK', () => {})
     }
     if ((selectedContract.name !== currentContract) && (selectedContract.name === 'ERC1967Proxy')) selectedContract.name = currentContract
-    props.createInstance(loadedContractData, props.gasEstimationPrompt, props.passphrasePrompt, props.publishToStorage, props.mainnetPrompt, isOverSizePrompt, args, deployMode)
+    const isProxyDeployment = (deployMode || []).find(mode => mode === 'Deploy with Proxy')
+    const isContractUpgrade = (deployMode || []).find(mode => mode === 'Upgrade with Proxy')
+  
+    if (isProxyDeployment || isContractUpgrade) {
+      props.modal('ERC1967', isProxyDeployment ? deployWithProxyMsg() : upgradeWithProxyMsg(), 'Proceed', () => {
+        props.createInstance(loadedContractData, props.gasEstimationPrompt, props.passphrasePrompt, props.publishToStorage, props.mainnetPrompt, isOverSizePrompt, args, deployMode)
+      }, 'Cancel', () => {})
+    } else {
+      props.createInstance(loadedContractData, props.gasEstimationPrompt, props.passphrasePrompt, props.publishToStorage, props.mainnetPrompt, isOverSizePrompt, args, deployMode)
+    }
   }
 
   const atAddressChanged = (event) => {

From f68938ac0fbf02fddbbee8e7648441172f94d196 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Mon, 11 Jul 2022 17:22:48 +0200
Subject: [PATCH 35/49] final cleanup

---
 libs/remix-ui/panel/src/lib/plugins/panel-header.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
index ec92786c48..b76a17859b 100644
--- a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
+++ b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx
@@ -33,18 +33,18 @@ const RemixUIPanelHeader = (props: RemixPanelProps) => {
             {plugin?.profile.documentation && (<a href={plugin.profile.documentation} className="titleInfo mb-2" title="link to documentation" target="_blank" rel="noreferrer"><i aria-hidden="true" className="fas fa-book"></i></a>)}
           </div>
           <div className="swapitHeaderInfoSection d-flex justify-content-between" data-id='swapitHeaderInfoSectionId' onClick={toggleClass} title="Plugin info">
-            <i className={`px-2 ml-2 mt-1 ${!toggleExpander ? 'fas fa-angle-right' : 'fas fa-angle-down bg-light'}`} aria-hidden="true"></i>
+            <i className={`px-2 ml-2 pt-1 ${!toggleExpander ? 'fas fa-angle-right' : 'fas fa-angle-down bg-light'}`} aria-hidden="true"></i>
           </div>
         </div>
       </div>
       <div className={`bg-light p-3 pt-1 border-bottom flex-column ${toggleExpander ? "d-flex" : "d-none"}`}>
         {plugin?.profile?.author && <span className="d-flex flex-row align-items-center">
           <label className="mb-0 pr-2">Author:</label>
-          <span>{plugin?.profile?.author}</span>
+          <span> { plugin?.profile.author } </span>
         </span>}
         {plugin?.profile?.maintainedBy && <span className="d-flex flex-row align-items-center">
           <label className="mb-0 pr-2">Maintained by:</label>
-          <span>{plugin?.profile?.maintainedBy}</span>
+          <span> { plugin?.profile.maintainedBy } </span>
         </span>}
         {plugin?.profile?.documentation && <span className="d-flex flex-row align-items-center">
           <label className="mb-0 pr-2">Documentation:</label>
@@ -54,7 +54,7 @@ const RemixUIPanelHeader = (props: RemixPanelProps) => {
         </span>}
         {plugin?.profile?.description && <span className="d-flex flex-row align-items-baseline">
           <label className="mb-0 pr-2">Description:</label>
-          <div>{plugin?.profile?.description}</div>
+          <span> { plugin?.profile.description } </span>
         </span>}
         {plugin?.profile?.repo && <span className="d-flex flex-row align-items-center">
           <a href={plugin?.profile?.repo} target="_blank" rel="noreferrer">          

From 4e93487124fc6ef9abdadd7643c49c14bec02422 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Tue, 12 Jul 2022 13:10:50 +0530
Subject: [PATCH 36/49] bump remixd version

---
 libs/remixd/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remixd/package.json b/libs/remixd/package.json
index cfa23896f4..1f7c392a36 100644
--- a/libs/remixd/package.json
+++ b/libs/remixd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remixd",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "remix server: allow accessing file system from remix.ethereum.org and start a dev environment (see help section)",
   "main": "index.js",
   "types": "./index.d.ts",

From 9e884169eb7a750cb9f428f7754f8e843bb6d5f7 Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Tue, 12 Jul 2022 16:28:03 +0100
Subject: [PATCH 37/49] Hide dropdown when interacting with file-explorer

---
 .../remix-ui/workspace/src/lib/remix-ui-workspace.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index 6b4128abc9..29da7103ba 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -12,6 +12,7 @@ export function Workspace () {
   const NO_WORKSPACE = ' - none - '
   const [currentWorkspace, setCurrentWorkspace] = useState<string>(NO_WORKSPACE)
   const [selectedWorkspace, setSelectedWorkspace] = useState<{ name: string, isGitRepo: boolean}>(null)
+  const [showDropdown, setShowDropdown] = useState<boolean>(false)
   const global = useContext(FileSystemContext)
   const workspaceRenameInput = useRef()
   const workspaceCreateInput = useRef()
@@ -149,6 +150,10 @@ export function Workspace () {
     }
   }
 
+  const toggleDropdown = (isOpen: boolean) => {
+    setShowDropdown(isOpen)
+  }
+
   const createModalMessage = () => {
     return (
       <>
@@ -258,12 +263,12 @@ export function Workspace () {
                     title='Clone Git Repository'>
                   </span>
                 </span>
-                <Dropdown id="workspacesSelect" data-id="workspacesSelect">
+                <Dropdown id="workspacesSelect" data-id="workspacesSelect" onToggle={toggleDropdown} show={showDropdown}>
                   <Dropdown.Toggle as={CustomToggle} id="dropdown-custom-components" className="btn btn-light btn-block w-100 d-inline-block border border-dark form-control" icon={selectedWorkspace && selectedWorkspace.isGitRepo && !(currentWorkspace === LOCALHOST) ? 'far fa-code-branch' : null}>
                     { selectedWorkspace ? selectedWorkspace.name : currentWorkspace === LOCALHOST ? 'localhost' : NO_WORKSPACE }
                   </Dropdown.Toggle>
 
-                  <Dropdown.Menu as={CustomMenu} className='w-100 custom-dropdown-items' data-id="custom-dropdown-items" >
+                  <Dropdown.Menu as={CustomMenu} className='w-100 custom-dropdown-items' data-id="custom-dropdown-items">
                     {
                       global.fs.browser.workspaces.map(({ name, isGitRepo }, index) => (
                         <Dropdown.Item
@@ -290,7 +295,7 @@ export function Workspace () {
             </div>
           </header>
         </div>
-        <div className='h-100 remixui_fileExplorerTree'>
+        <div className='h-100 remixui_fileExplorerTree' onFocus={() => { toggleDropdown(false) }}>
           <div className='h-100'>
             { global.fs.browser.isRequestingWorkspace || global.fs.browser.isRequestingCloning ? <div className="text-center py-5"><i className="fas fa-spinner fa-pulse fa-2x"></i></div>
               : <div className='pl-2 remixui_treeview' data-id='filePanelFileExplorerTree'>

From 29c6608d20cc2aa3f0d33872d079684b48c19281 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Tue, 12 Jul 2022 19:56:26 +0530
Subject: [PATCH 38/49] update ABI too for live mode

---
 apps/remix-ide/src/app/tabs/runTab/model/recorder.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/remix-ide/src/app/tabs/runTab/model/recorder.js b/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
index caa758b180..0852d40096 100644
--- a/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
+++ b/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
@@ -207,6 +207,9 @@ class Recorder extends Plugin {
         // resolve the bytecode using the contract name, this ensure getting the last compiled one.
         const data = await this.call('compilerArtefacts', 'getArtefactsByContractName', tx.record.contractName)
         tx.record.bytecode = data.artefact.evm.bytecode.object
+        const updatedABIKeccak = ethutil.bufferToHex(ethutil.keccakFromString(JSON.stringify(data.artefact.abi)))
+        abis[updatedABIKeccak] = data.artefact.abi
+        tx.record.abi = updatedABIKeccak
       }
       var record = this.resolveAddress(tx.record, accounts, options)
       var abi = abis[tx.record.abi]

From 44a9e12711820a7b009ade6d30f9b707e39fdb32 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Wed, 13 Jul 2022 13:35:43 +0530
Subject: [PATCH 39/49] e2e fix

---
 apps/remix-ide-e2e/src/tests/recorder.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/recorder.test.ts b/apps/remix-ide-e2e/src/tests/recorder.test.ts
index 0f896a179e..3cdea544c3 100644
--- a/apps/remix-ide-e2e/src/tests/recorder.test.ts
+++ b/apps/remix-ide-e2e/src/tests/recorder.test.ts
@@ -118,7 +118,7 @@ module.exports = {
       })
       .clickFunction('retrieve - call')
       .perform((done) => {
-        browser.verifyCallReturnValue(addressRef, ['', '0:uint256: 350'])
+        browser.verifyCallReturnValue(addressRef, ['0:uint256: 350'])
           .perform(() => done())
       })
       // change the init state and recompile the same contract.
@@ -138,7 +138,7 @@ module.exports = {
       })
       .clickFunction('retrieve - call')
       .perform((done) => {
-        browser.verifyCallReturnValue(addressRef, ['', '0:uint256: 300'])
+        browser.verifyCallReturnValue(addressRef, ['0:uint256: 300'])
           .perform(() => done())
       })
       .end()

From eb1d72afe13774b02cc9efcb5ad73de719a5c7e0 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Wed, 13 Jul 2022 13:41:23 +0530
Subject: [PATCH 40/49] removed from plugin manager

---
 apps/remix-ide/src/remixAppManager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
index fbe147a67b..159f704e1d 100644
--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -8,7 +8,8 @@ const requiredModules = [ // services + layout views + system views
   'manager', 'config', 'compilerArtefacts', 'compilerMetadata', 'contextualListener', 'editor', 'offsetToLineColumnConverter', 'network', 'theme',
   'fileManager', 'contentImport', 'blockchain', 'web3Provider', 'scriptRunner', 'fetchAndCompile', 'mainPanel', 'hiddenPanel', 'sidePanel', 'menuicons',
   'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider', 'solidity', 'solidity-logic', 'gistHandler', 'layout',
-  'notification', 'permissionhandler', 'walkthrough', 'storage', 'restorebackupzip', 'link-libraries', 'deploy-libraries', 'openzeppelin-proxy', 'hardhat-provider', 'compileAndRun', 'search']
+  'notification', 'permissionhandler', 'walkthrough', 'storage', 'restorebackupzip', 'link-libraries', 'deploy-libraries', 'openzeppelin-proxy', 
+  'hardhat-provider', 'compileAndRun', 'search', 'recorder']
 
 const dependentModules = ['git', 'hardhat', 'truffle', 'slither'] // module which shouldn't be manually activated (e.g git is activated by remixd)
 

From 7e96d7abb65a804c2d7803b44ce86122278085c0 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Wed, 13 Jul 2022 14:42:19 +0530
Subject: [PATCH 41/49] run button disable for non json files

---
 .../run-tab/src/lib/components/recorderCardUI.tsx      | 10 ++++++++--
 libs/remix-ui/run-tab/src/lib/run-tab.tsx              |  6 ++++--
 libs/remix-ui/run-tab/src/lib/types/index.ts           |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
index 51413c2c82..82198f5c8f 100644
--- a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
@@ -1,11 +1,12 @@
 // eslint-disable-next-line no-use-before-define
-import React, {useRef, useState} from 'react'
+import React, {useRef, useState, useEffect} from 'react'
 import { RecorderProps } from '../types'
 import { OverlayTrigger, Tooltip } from 'react-bootstrap' // eslint-disable-line
 
 export function RecorderUI (props: RecorderProps) {
   const inputLive = useRef<HTMLInputElement>()
   const [toggleExpander, setToggleExpander] = useState<boolean>(false)
+  const [enableRunButton, setEnableRunButton] = useState<boolean>(true)
   const triggerRecordButton = () => {
     props.storeScenario(props.scenarioPrompt)
   }
@@ -15,6 +16,11 @@ export function RecorderUI (props: RecorderProps) {
     props.runCurrentScenario(liveMode, props.gasEstimationPrompt, props.passphrasePrompt, props.mainnetPrompt)
   }
 
+  useEffect(() => {
+    if (props.currentFile.endsWith('.json')) setEnableRunButton(false)
+    else setEnableRunButton(true)
+  }, [props.currentFile])
+
   const toggleClass = () => {
     setToggleExpander(!toggleExpander)
   }
@@ -60,7 +66,7 @@ export function RecorderUI (props: RecorderProps) {
           </span>
           </Tooltip>
         }>
-          <button className="btn btn-sm btn-info runtransaction udapp_runTxs" data-id="runtransaction" onClick={handleClickRunButton}>Run</button>
+          <button className="btn btn-sm btn-info runtransaction udapp_runTxs" data-id="runtransaction" disabled={enableRunButton} onClick={handleClickRunButton}>Run</button>
         </OverlayTrigger>
         </div>        
       </div>
diff --git a/libs/remix-ui/run-tab/src/lib/run-tab.tsx b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
index f8715ac16e..128d315201 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -56,10 +56,11 @@ export function RunTabUI (props: RunTabProps) {
     storage: null,
     contract: null
   })
-  runTabInitialState.selectExEnv = props.plugin.blockchain.getProvider()
+  runTabInitialState.selectExEnv = plugin.blockchain.getProvider()
   runTabInitialState.selectExEnv = runTabInitialState.selectExEnv === 'vm' ? 'vm-london' : runTabInitialState.selectExEnv
   const [runTab, dispatch] = useReducer(runTabReducer, runTabInitialState)
   const REACT_API = { runTab }
+  const currentfile = plugin.config.get('currentFile')
 
   useEffect(() => {
     initRunTab(plugin)(dispatch)
@@ -249,6 +250,7 @@ export function RunTabUI (props: RunTabProps) {
             runCurrentScenario={runScenario}
             scenarioPrompt={scenarioPrompt}
             count={runTab.recorder.transactionCount}
+            currentFile={currentfile}
           />
           <InstanceContainerUI
             instances={runTab.instances}
@@ -266,7 +268,7 @@ export function RunTabUI (props: RunTabProps) {
       </div>
       <ModalDialog id='udappNotify' { ...focusModal } handleHide={ handleHideModal } />
       <Toaster message={focusToaster} handleHide={handleToaster} />
-      <PublishToStorage id='udapp' api={props.plugin} resetStorage={resetStorage} storage={publishData.storage} contract={publishData.contract} />
+      <PublishToStorage id='udapp' api={plugin} resetStorage={resetStorage} storage={publishData.storage} contract={publishData.contract} />
     </Fragment>
   )
 }
diff --git a/libs/remix-ui/run-tab/src/lib/types/index.ts b/libs/remix-ui/run-tab/src/lib/types/index.ts
index dfb526d59d..d27eb1f580 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -173,6 +173,7 @@ export interface RecorderProps {
   passphrasePrompt: (msg: string) => JSX.Element,
   scenarioPrompt: (msg: string, defaultValue: string) => JSX.Element,
   count: number
+  currentFile: string
 }
 
 export interface InstanceContainerProps {

From d4df6204c247da8c49ea50ed26960cf21ee7e5ed Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Wed, 13 Jul 2022 15:20:13 +0530
Subject: [PATCH 42/49] show title when Run button disabled

---
 libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
index 82198f5c8f..2ce2102e5c 100644
--- a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
@@ -66,7 +66,7 @@ export function RecorderUI (props: RecorderProps) {
           </span>
           </Tooltip>
         }>
-          <button className="btn btn-sm btn-info runtransaction udapp_runTxs" data-id="runtransaction" disabled={enableRunButton} onClick={handleClickRunButton}>Run</button>
+          <button className="btn btn-sm btn-info runtransaction udapp_runTxs" data-id="runtransaction" title={enableRunButton ? 'No scenario file selected' : ''} disabled={enableRunButton} onClick={handleClickRunButton}>Run</button>
         </OverlayTrigger>
         </div>        
       </div>

From 88c8a525c5aa02539363329bc20abfa7c76fad64 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Wed, 13 Jul 2022 15:27:33 +0530
Subject: [PATCH 43/49] save button update

---
 libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
index 2ce2102e5c..5ff62dd92d 100644
--- a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
@@ -54,15 +54,15 @@ export function RecorderUI (props: RecorderProps) {
         <div className="mb-1 mt-1 udapp_transactionActions">
         <OverlayTrigger placement={'right'} overlay={
           <Tooltip className="text-nowrap" id="tooltip-save-recorder">
-            <span>Save {props.count} transaction(s) as scenario file.
+            <span>Save {props.count} transaction{props.count === 1 ? '' : 's'} as scenario file
           </span>
           </Tooltip>
         }>
-          <button className="btn btn-sm btn-info savetransaction udapp_recorder" onClick={triggerRecordButton}>Save</button>
+          <button className="btn btn-sm btn-info savetransaction udapp_recorder" title={props.count === 0 ? 'No transactions to save' : ''} disabled={props.count === 0 ? true: false} onClick={triggerRecordButton}>Save</button>
         </OverlayTrigger>
         <OverlayTrigger placement={'right'} overlay={
           <Tooltip className="text-nowrap" id="tooltip-run-recorder">
-            <span>Run transaction(s) from the current scenario file.
+            <span>Run transaction(s) from the current scenario file
           </span>
           </Tooltip>
         }>

From 88617586b721296c9ee5af9ee5452c02f2da35d6 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Wed, 13 Jul 2022 15:36:28 +0530
Subject: [PATCH 44/49] show error for non scenario json file

---
 apps/remix-ide/src/app/tabs/runTab/model/recorder.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/runTab/model/recorder.js b/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
index 0852d40096..0815799b6b 100644
--- a/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
+++ b/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
@@ -204,7 +204,7 @@ class Recorder extends Plugin {
     logCallBack(`Running ${records.length} transaction(s)${liveMsg} ...`)
     async.eachOfSeries(records, async (tx, index, cb) => {
       if (liveMode && tx.record.type === 'constructor') {
-        // resolve the bytecode using the contract name, this ensure getting the last compiled one.
+        // resolve the bytecode and ABI using the contract name, this ensure getting the last compiled one.
         const data = await this.call('compilerArtefacts', 'getArtefactsByContractName', tx.record.contractName)
         tx.record.bytecode = data.artefact.evm.bytecode.object
         const updatedABIKeccak = ethutil.bufferToHex(ethutil.keccakFromString(JSON.stringify(data.artefact.abi)))
@@ -315,11 +315,11 @@ class Recorder extends Plugin {
       abis = json.abis || {}
       linkReferences = json.linkReferences || {}
     } catch (e) {
-      return cb('Invalid Scenario File. Please try again')
+      return cb('Invalid scenario file. Please try again')
     }
 
     if (!txArray.length) {
-      return
+      return cb('No transactions found in scenario file')
     }
 
     this.run(txArray, accounts, options, abis, linkReferences, confirmationCb, continueCb, promptCb, alertCb, logCallBack, liveMode, (abi, address, contractName) => {

From 4bf2cfc09598724bd2b32d3bb19af282892e6b59 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Wed, 13 Jul 2022 15:49:24 +0530
Subject: [PATCH 45/49] live mode renamed

---
 apps/remix-ide/src/app/tabs/runTab/model/recorder.js        | 2 +-
 libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/runTab/model/recorder.js b/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
index 0815799b6b..ea41368448 100644
--- a/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
+++ b/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
@@ -200,7 +200,7 @@ class Recorder extends Plugin {
     */
   run (records, accounts, options, abis, linkReferences, confirmationCb, continueCb, promptCb, alertCb, logCallBack, liveMode, newContractFn) {
     this.setListen(false)
-    const liveMsg = liveMode ? ' in live mode' : ''
+    const liveMsg = liveMode ? ' with updated contracts' : ''
     logCallBack(`Running ${records.length} transaction(s)${liveMsg} ...`)
     async.eachOfSeries(records, async (tx, index, cb) => {
       if (liveMode && tx.record.type === 'constructor') {
diff --git a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
index 5ff62dd92d..d6aac08529 100644
--- a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
@@ -49,7 +49,7 @@ export function RecorderUI (props: RecorderProps) {
       <div className={`flex-column ${toggleExpander ? "d-flex" : "d-none"}`}>
         <div className="mb-1 mt-1 fmt-2 custom-control custom-checkbox mb-1">
           <input ref={inputLive} type="checkbox" id="livemode-recorder" className="custom-control-input custom-select" name="input-livemode"/>
-          <label className="form-check-label custom-control-label" data-id="runtabLivemodeInput" htmlFor="livemode-recorder">Use live mode (Run transactions against latest compiled contracts).</label>
+          <label className="form-check-label custom-control-label" title="If contracts are updated after recording transactions, checking this box will run recorded transactions with latest copy of compiled contracts" data-id="runtabLivemodeInput" htmlFor="livemode-recorder">Use latest compiled copy of contracts</label>
         </div>     
         <div className="mb-1 mt-1 udapp_transactionActions">
         <OverlayTrigger placement={'right'} overlay={

From 9a6c3d580679dd998afa78eb9616b9950b9b11ec Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Thu, 14 Jul 2022 12:28:35 +0530
Subject: [PATCH 46/49] text updates as suggested

---
 .../run-tab/src/lib/components/recorderCardUI.tsx  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
index d6aac08529..48e8fa04f0 100644
--- a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
@@ -49,21 +49,25 @@ export function RecorderUI (props: RecorderProps) {
       <div className={`flex-column ${toggleExpander ? "d-flex" : "d-none"}`}>
         <div className="mb-1 mt-1 fmt-2 custom-control custom-checkbox mb-1">
           <input ref={inputLive} type="checkbox" id="livemode-recorder" className="custom-control-input custom-select" name="input-livemode"/>
-          <label className="form-check-label custom-control-label" title="If contracts are updated after recording transactions, checking this box will run recorded transactions with latest copy of compiled contracts" data-id="runtabLivemodeInput" htmlFor="livemode-recorder">Use latest compiled copy of contracts</label>
+          <OverlayTrigger placement={'right'} overlay={
+            <Tooltip className="text-nowrap" id="tooltip-livemode-recorder">
+              <span>If contracts are updated after recording transactions, checking this box<br/>will run recorded transactions with the latest copy of the compiled contracts</span>
+            </Tooltip>
+          }>
+          <label className="form-check-label custom-control-label" data-id="runtabLivemodeInput" htmlFor="livemode-recorder">Run transactions using the latest compilation result</label>
+          </OverlayTrigger>
         </div>     
         <div className="mb-1 mt-1 udapp_transactionActions">
         <OverlayTrigger placement={'right'} overlay={
           <Tooltip className="text-nowrap" id="tooltip-save-recorder">
-            <span>Save {props.count} transaction{props.count === 1 ? '' : 's'} as scenario file
-          </span>
+            <span>Save {props.count} transaction{props.count === 1 ? '' : 's'} as scenario file</span>
           </Tooltip>
         }>
           <button className="btn btn-sm btn-info savetransaction udapp_recorder" title={props.count === 0 ? 'No transactions to save' : ''} disabled={props.count === 0 ? true: false} onClick={triggerRecordButton}>Save</button>
         </OverlayTrigger>
         <OverlayTrigger placement={'right'} overlay={
           <Tooltip className="text-nowrap" id="tooltip-run-recorder">
-            <span>Run transaction(s) from the current scenario file
-          </span>
+            <span>Run transaction(s) from the current scenario file</span>
           </Tooltip>
         }>
           <button className="btn btn-sm btn-info runtransaction udapp_runTxs" data-id="runtransaction" title={enableRunButton ? 'No scenario file selected' : ''} disabled={enableRunButton} onClick={handleClickRunButton}>Run</button>

From dcf315890268099159f4e3ff7c7d6d4f1f002445 Mon Sep 17 00:00:00 2001
From: ryestew <rob@stupay.com>
Date: Tue, 12 Jul 2022 09:06:40 -0400
Subject: [PATCH 47/49] update modal of proxy functionality

---
 apps/remix-ide/src/blockchain/blockchain.js          |  8 ++++----
 libs/remix-ui/helper/src/lib/helper-components.tsx   | 12 ++++++++++--
 .../src/lib/components/contractDropdownUI.tsx        |  8 ++++++--
 .../run-tab/src/lib/components/contractGUI.tsx       |  6 +++---
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/apps/remix-ide/src/blockchain/blockchain.js b/apps/remix-ide/src/blockchain/blockchain.js
index 08d4b8f3bd..47ece52eb2 100644
--- a/apps/remix-ide/src/blockchain/blockchain.js
+++ b/apps/remix-ide/src/blockchain/blockchain.js
@@ -141,9 +141,9 @@ export class Blockchain extends Plugin {
   async deployProxy (proxyData, implementationContractObject) {
     const proxyModal = {
       id: 'confirmProxyDeployment',
-      title: 'ERC1967',
+      title: 'Confirm Deploy Proxy (ERC1967)',
       message: `Confirm you want to deploy an ERC1967 proxy contract that is connected to your implementation.           
-      For more info on ERC1967, see https://docs.openzeppelin.com/contracts/4.x/api/proxy#ERC1967Proxy`,
+      For more info on ERC1967, see: https://docs.openzeppelin.com/contracts/4.x/api/proxy#ERC1967Proxy`,
       modalType: 'modal',
       okLabel: 'OK',
       cancelLabel: 'Cancel',
@@ -189,8 +189,8 @@ export class Blockchain extends Plugin {
   async upgradeProxy(proxyAddress, newImplAddress, data, newImplementationContractObject) {
     const upgradeModal = {
       id: 'confirmProxyDeployment',
-      title: 'ERC1967',
-      message: `Confirm you want to upgrade your contract to new implementation ${newImplAddress}.`,
+      title: 'Confirm Update Proxy (ERC1967)',
+      message: `Confirm you want to update your proxy contract with the new implementation contract's address:  ${newImplAddress}.`,
       modalType: 'modal',
       okLabel: 'OK',
       cancelLabel: 'Cancel',
diff --git a/libs/remix-ui/helper/src/lib/helper-components.tsx b/libs/remix-ui/helper/src/lib/helper-components.tsx
index 8dc4e95a16..fc1cf49e88 100644
--- a/libs/remix-ui/helper/src/lib/helper-components.tsx
+++ b/libs/remix-ui/helper/src/lib/helper-components.tsx
@@ -98,12 +98,20 @@ export const cancelUpgradeMsg = () => (
 
 export const deployWithProxyMsg = () => (
   <div>
-    NOTE: Deploy With Proxy will initiate two (2) transactions. The first is for the deployment of your implementation contract and the second will be a deployment of an ERC1967 proxy contract.
+   <b>Deploy with Proxy</b> will initiate two (2) transactions:
+    <ol className="pl-3">
+      <li>Deploying the implementation contract</li>
+      <li>Deploying an ERC1967 proxy contract</li>
+    </ol>
   </div>
 )
 
 export const upgradeWithProxyMsg = () => (
   <div>
-    NOTE: Upgrade With Proxy will initiate two (2) transactions. The first is for the deployment of your implementation contract and the second will intiate a call to the upgradeTo function in your proxy contract.
+    <b>Upgrade with Proxy</b> will initiate two (2) transactions:
+    <ol className="pl-3">
+      <li>Deploying the new implementation contract</li>
+      <li>Updating the proxy contract with the address of the new implementation contract</li>
+    </ol>
   </div>
 )
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
index 556491bc2c..a224c94242 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -160,8 +160,12 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
     const isProxyDeployment = (deployMode || []).find(mode => mode === 'Deploy with Proxy')
     const isContractUpgrade = (deployMode || []).find(mode => mode === 'Upgrade with Proxy')
   
-    if (isProxyDeployment || isContractUpgrade) {
-      props.modal('ERC1967', isProxyDeployment ? deployWithProxyMsg() : upgradeWithProxyMsg(), 'Proceed', () => {
+    if (isProxyDeployment) {
+      props.modal('Deploy Implementation & Proxy (ERC1967)', deployWithProxyMsg(), 'Proceed', () => {
+        props.createInstance(loadedContractData, props.gasEstimationPrompt, props.passphrasePrompt, props.publishToStorage, props.mainnetPrompt, isOverSizePrompt, args, deployMode)
+      }, 'Cancel', () => {})
+    } else if (isContractUpgrade) {
+      props.modal('Deploy Implementation & Update Proxy', upgradeWithProxyMsg(), 'Proceed', () => {
         props.createInstance(loadedContractData, props.gasEstimationPrompt, props.passphrasePrompt, props.publishToStorage, props.mainnetPrompt, isOverSizePrompt, args, deployMode)
       }, 'Cancel', () => {})
     } else {
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 4eb661a6a8..a5352c02fb 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -273,7 +273,7 @@ export function ContractGUI (props: ContractGUIProps) {
                 className="m-0 form-check-label custom-control-label udapp_checkboxAlign"
                 title="An ERC1967 proxy contract will be deployed along with the selected implementation contract."
               >
-                Deploy With Proxy
+                Deploy with Proxy
               </label>
             </div>
             <div>
@@ -314,9 +314,9 @@ export function ContractGUI (props: ContractGUIProps) {
                 htmlFor="upgradeImplementation"
                 data-id="contractGUIUpgradeImplementationLabel"
                 className="m-0 form-check-label custom-control-label udapp_checkboxAlign"
-                title="The implemetation address will be updated to a new address in the proxy contract."
+                title="The implementation contract will be deployed and then the proxy contract will be updated with new implementation's address."
               >
-                Upgrade With Proxy
+                Upgrade with Proxy
               </label>
             </div>
             <span onClick={handleToggleUpgradeImp}>

From 91fc753f47b46eac6426c1346abf63c2314b6c41 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Wed, 13 Jul 2022 18:55:29 +0530
Subject: [PATCH 48/49] added description for all plugins

---
 apps/remix-ide/src/app/components/hidden-panel.tsx           | 2 +-
 apps/remix-ide/src/app/components/main-panel.tsx             | 2 +-
 apps/remix-ide/src/app/components/side-panel.tsx             | 2 +-
 apps/remix-ide/src/app/components/vertical-icons.tsx         | 2 +-
 apps/remix-ide/src/app/files/dgitProvider.js                 | 2 +-
 apps/remix-ide/src/app/panels/file-panel.js                  | 2 +-
 apps/remix-ide/src/app/panels/terminal.js                    | 2 +-
 apps/remix-ide/src/app/plugins/permission-handler-plugin.tsx | 2 +-
 apps/remix-ide/src/app/tabs/compile-and-run.ts               | 2 +-
 apps/remix-ide/src/app/tabs/external-http-provider.tsx       | 2 +-
 apps/remix-ide/src/app/tabs/foundry-provider.tsx             | 2 +-
 apps/remix-ide/src/app/tabs/ganache-provider.tsx             | 2 +-
 apps/remix-ide/src/app/tabs/runTab/model/recorder.js         | 2 +-
 apps/remix-ide/src/app/tabs/search.tsx                       | 2 +-
 apps/remix-ide/src/app/tabs/test-tab.js                      | 2 +-
 apps/remix-ide/src/app/udapp/run-tab.js                      | 2 +-
 apps/remix-ide/src/app/ui/landing-page/landing-page.js       | 2 +-
 apps/remix-ide/src/walkthroughService.js                     | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/remix-ide/src/app/components/hidden-panel.tsx b/apps/remix-ide/src/app/components/hidden-panel.tsx
index 31c7a0cb0b..6aa78a4052 100644
--- a/apps/remix-ide/src/app/components/hidden-panel.tsx
+++ b/apps/remix-ide/src/app/components/hidden-panel.tsx
@@ -8,7 +8,7 @@ import { PluginViewWrapper } from '@remix-ui/helper'
 const profile = {
   name: 'hiddenPanel',
   displayName: 'Hidden Panel',
-  description: '',
+  description: 'Remix IDE hidden panel',
   version: packageJson.version,
   methods: ['addView', 'removeView']
 }
diff --git a/apps/remix-ide/src/app/components/main-panel.tsx b/apps/remix-ide/src/app/components/main-panel.tsx
index 615e03690d..d6dee613fd 100644
--- a/apps/remix-ide/src/app/components/main-panel.tsx
+++ b/apps/remix-ide/src/app/components/main-panel.tsx
@@ -7,7 +7,7 @@ import { PluginViewWrapper } from '@remix-ui/helper'
 const profile = {
   name: 'mainPanel',
   displayName: 'Main Panel',
-  description: '',
+  description: 'Remix IDE main panel',
   version: packageJson.version,
   methods: ['addView', 'removeView', 'showContent']
 }
diff --git a/apps/remix-ide/src/app/components/side-panel.tsx b/apps/remix-ide/src/app/components/side-panel.tsx
index bf82defe55..54e56dd210 100644
--- a/apps/remix-ide/src/app/components/side-panel.tsx
+++ b/apps/remix-ide/src/app/components/side-panel.tsx
@@ -10,7 +10,7 @@ import { PluginViewWrapper } from '@remix-ui/helper'
 const sidePanel = {
   name: 'sidePanel',
   displayName: 'Side Panel',
-  description: '',
+  description: 'Remix IDE side panel',
   version: packageJson.version,
   methods: ['addView', 'removeView']
 }
diff --git a/apps/remix-ide/src/app/components/vertical-icons.tsx b/apps/remix-ide/src/app/components/vertical-icons.tsx
index d8fe5706f8..24d5b93b2b 100644
--- a/apps/remix-ide/src/app/components/vertical-icons.tsx
+++ b/apps/remix-ide/src/app/components/vertical-icons.tsx
@@ -10,7 +10,7 @@ import { PluginViewWrapper } from '@remix-ui/helper'
 const profile = {
   name: 'menuicons',
   displayName: 'Vertical Icons',
-  description: '',
+  description: 'Remix IDE vertical icons',
   version: packageJson.version,
   methods: ['select', 'unlinkContent', 'linkContent'],
   events: ['toggleContent', 'showContent']
diff --git a/apps/remix-ide/src/app/files/dgitProvider.js b/apps/remix-ide/src/app/files/dgitProvider.js
index 8b5ce925c5..aa5b98dfa1 100644
--- a/apps/remix-ide/src/app/files/dgitProvider.js
+++ b/apps/remix-ide/src/app/files/dgitProvider.js
@@ -18,7 +18,7 @@ const axios = require('axios')
 const profile = {
   name: 'dGitProvider',
   displayName: 'Decentralized git',
-  description: '',
+  description: 'Decentralized git provider',
   icon: 'assets/img/fileManager.webp',
   version: '0.0.1',
   methods: ['init', 'localStorageUsed', 'addremote', 'delremote', 'remotes', 'fetch', 'clone', 'export', 'import', 'status', 'log', 'commit', 'add', 'remove', 'rm', 'lsfiles', 'readblob', 'resolveref', 'branches', 'branch', 'checkout', 'currentbranch', 'push', 'pin', 'pull', 'pinList', 'unPin', 'setIpfsConfig', 'zip', 'setItem', 'getItem'],
diff --git a/apps/remix-ide/src/app/panels/file-panel.js b/apps/remix-ide/src/app/panels/file-panel.js
index a0d4e5dff3..983a54af70 100644
--- a/apps/remix-ide/src/app/panels/file-panel.js
+++ b/apps/remix-ide/src/app/panels/file-panel.js
@@ -33,7 +33,7 @@ const profile = {
   methods: ['createNewFile', 'uploadFile', 'getCurrentWorkspace', 'getWorkspaces', 'createWorkspace', 'setWorkspace', 'registerContextMenuItem', 'renameWorkspace', 'deleteWorkspace'],
   events: ['setWorkspace', 'workspaceRenamed', 'workspaceDeleted', 'workspaceCreated'],
   icon: 'assets/img/fileManager.webp',
-  description: ' - ',
+  description: 'Remix IDE file explorer',
   kind: 'fileexplorer',
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/file_explorer.html',
diff --git a/apps/remix-ide/src/app/panels/terminal.js b/apps/remix-ide/src/app/panels/terminal.js
index 6eaa65f6e9..bd89f2d7ce 100644
--- a/apps/remix-ide/src/app/panels/terminal.js
+++ b/apps/remix-ide/src/app/panels/terminal.js
@@ -20,7 +20,7 @@ const profile = {
   name: 'terminal',
   methods: ['log', 'logHtml'],
   events: [],
-  description: ' - ',
+  description: 'Remix IDE terminal',
   version: packageJson.version
 }
 
diff --git a/apps/remix-ide/src/app/plugins/permission-handler-plugin.tsx b/apps/remix-ide/src/app/plugins/permission-handler-plugin.tsx
index 29f7535066..3bec429d25 100644
--- a/apps/remix-ide/src/app/plugins/permission-handler-plugin.tsx
+++ b/apps/remix-ide/src/app/plugins/permission-handler-plugin.tsx
@@ -7,7 +7,7 @@ import { Profile } from '@remixproject/plugin-utils'
 const profile = {
     name: 'permissionhandler',
     displayName: 'permissionhandler',
-    description: 'permissionhandler',
+    description: 'Plugin to handle permissions',
     methods: ['askPermission']
 }
 
diff --git a/apps/remix-ide/src/app/tabs/compile-and-run.ts b/apps/remix-ide/src/app/tabs/compile-and-run.ts
index d5b298e966..e90d9f5844 100644
--- a/apps/remix-ide/src/app/tabs/compile-and-run.ts
+++ b/apps/remix-ide/src/app/tabs/compile-and-run.ts
@@ -10,7 +10,7 @@ const _paq = window._paq = window._paq || []
 export const profile = {
   name: 'compileAndRun',
   displayName: 'Compile and Run',
-  description: 'after each compilation, run the script defined in Natspec.',
+  description: 'After each compilation, run the script defined in Natspec.',
   methods: ['runScriptAfterCompilation'],
   version: packageJson.version,
   kind: 'none'
diff --git a/apps/remix-ide/src/app/tabs/external-http-provider.tsx b/apps/remix-ide/src/app/tabs/external-http-provider.tsx
index 71c7c249c0..9483989843 100644
--- a/apps/remix-ide/src/app/tabs/external-http-provider.tsx
+++ b/apps/remix-ide/src/app/tabs/external-http-provider.tsx
@@ -6,7 +6,7 @@ const profile = {
   name: 'basic-http-provider',
   displayName: 'External Http Provider',
   kind: 'provider',
-  description: '',
+  description: 'External Http Provider',
   methods: ['sendAsync'],
   version: packageJson.version
 }
diff --git a/apps/remix-ide/src/app/tabs/foundry-provider.tsx b/apps/remix-ide/src/app/tabs/foundry-provider.tsx
index 47e899865a..3c1fbb6256 100644
--- a/apps/remix-ide/src/app/tabs/foundry-provider.tsx
+++ b/apps/remix-ide/src/app/tabs/foundry-provider.tsx
@@ -10,7 +10,7 @@ const profile = {
   name: 'foundry-provider',
   displayName: 'Foundry Provider',
   kind: 'provider',
-  description: 'Anvil',
+  description: 'Foundry Anvil provider',
   methods: ['sendAsync'],
   version: packageJson.version
 }
diff --git a/apps/remix-ide/src/app/tabs/ganache-provider.tsx b/apps/remix-ide/src/app/tabs/ganache-provider.tsx
index 002e31a3a2..97adac1574 100644
--- a/apps/remix-ide/src/app/tabs/ganache-provider.tsx
+++ b/apps/remix-ide/src/app/tabs/ganache-provider.tsx
@@ -10,7 +10,7 @@ const profile = {
   name: 'ganache-provider',
   displayName: 'Ganache Provider',
   kind: 'provider',
-  description: 'Ganache',
+  description: 'Truffle Ganache provider',
   methods: ['sendAsync'],
   version: packageJson.version
 }
diff --git a/apps/remix-ide/src/app/tabs/runTab/model/recorder.js b/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
index ea41368448..244d61690f 100644
--- a/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
+++ b/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
@@ -13,7 +13,7 @@ const _paq = window._paq = window._paq || []  //eslint-disable-line
 const profile = {
   name: 'recorder',
   displayName: 'Recorder',
-  description: '',
+  description: 'Records transactions to save and run',
   version: packageJson.version,
   methods: [  ]
 }
diff --git a/apps/remix-ide/src/app/tabs/search.tsx b/apps/remix-ide/src/app/tabs/search.tsx
index 29e6c6abe7..3e0df1a893 100644
--- a/apps/remix-ide/src/app/tabs/search.tsx
+++ b/apps/remix-ide/src/app/tabs/search.tsx
@@ -8,7 +8,7 @@ const profile = {
     methods: [''],
     events: [],
     icon: 'assets/img/search_icon.webp',
-    description: '',
+    description: 'Find and replace in file explorer',
     kind: '',
     location: 'sidePanel',
     documentation: '',
diff --git a/apps/remix-ide/src/app/tabs/test-tab.js b/apps/remix-ide/src/app/tabs/test-tab.js
index 960e2a93ce..3c6e1a4b4c 100644
--- a/apps/remix-ide/src/app/tabs/test-tab.js
+++ b/apps/remix-ide/src/app/tabs/test-tab.js
@@ -16,7 +16,7 @@ const profile = {
   methods: ['testFromPath', 'testFromSource', 'setTestFolderPath', 'getTestlibs', 'createTestLibs'],
   events: [],
   icon: 'assets/img/unitTesting.webp',
-  description: 'Fast tool to generate unit tests for your contracts',
+  description: 'Write and run unit tests for your contracts in Solidity',
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/unittesting.html'
 }
diff --git a/apps/remix-ide/src/app/udapp/run-tab.js b/apps/remix-ide/src/app/udapp/run-tab.js
index c9912ecb4c..02087b671f 100644
--- a/apps/remix-ide/src/app/udapp/run-tab.js
+++ b/apps/remix-ide/src/app/udapp/run-tab.js
@@ -12,7 +12,7 @@ const profile = {
   name: 'udapp',
   displayName: 'Deploy & run transactions',
   icon: 'assets/img/deployAndRun.webp',
-  description: 'execute and save transactions',
+  description: 'Execute, save and replay transactions',
   kind: 'udapp',
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/run.html',
diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
index 2f8819fc5f..978c4fdb1c 100644
--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -9,7 +9,7 @@ const profile = {
   displayName: 'Home',
   methods: [],
   events: [],
-  description: ' - ',
+  description: 'Remix home tab ',
   icon: 'assets/img/remixLogo.webp',
   location: 'mainPanel',
   version: packageJson.version
diff --git a/apps/remix-ide/src/walkthroughService.js b/apps/remix-ide/src/walkthroughService.js
index 8f088c443c..d0d466555f 100644
--- a/apps/remix-ide/src/walkthroughService.js
+++ b/apps/remix-ide/src/walkthroughService.js
@@ -5,7 +5,7 @@ const introJs = require('intro.js')
 const profile = {
   name: 'walkthrough',
   displayName: 'Walkthrough',
-  description: '',
+  description: 'Remix walkthrough for beginner',
   version: packageJson.version,
   methods: ['start']
 }

From 1a9977badcfd4d9e006fb2f011a6f86a0a1b215f Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Wed, 13 Jul 2022 19:07:50 +0530
Subject: [PATCH 49/49] add maintainedBy to show green badge

---
 apps/remix-ide/src/app/panels/file-panel.js | 3 ++-
 apps/remix-ide/src/app/tabs/analysis-tab.js | 3 ++-
 apps/remix-ide/src/app/tabs/compile-tab.js  | 1 +
 apps/remix-ide/src/app/tabs/debugger-tab.js | 3 ++-
 apps/remix-ide/src/app/tabs/search.tsx      | 3 ++-
 apps/remix-ide/src/app/tabs/test-tab.js     | 3 ++-
 apps/remix-ide/src/app/udapp/run-tab.js     | 1 +
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/remix-ide/src/app/panels/file-panel.js b/apps/remix-ide/src/app/panels/file-panel.js
index 983a54af70..ba45ff806b 100644
--- a/apps/remix-ide/src/app/panels/file-panel.js
+++ b/apps/remix-ide/src/app/panels/file-panel.js
@@ -37,7 +37,8 @@ const profile = {
   kind: 'fileexplorer',
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/file_explorer.html',
-  version: packageJson.version
+  version: packageJson.version,
+  maintainedBy: 'Remix'
 }
 module.exports = class Filepanel extends ViewPlugin {
   constructor (appManager) {
diff --git a/apps/remix-ide/src/app/tabs/analysis-tab.js b/apps/remix-ide/src/app/tabs/analysis-tab.js
index f17b0da52b..21c123c9bf 100644
--- a/apps/remix-ide/src/app/tabs/analysis-tab.js
+++ b/apps/remix-ide/src/app/tabs/analysis-tab.js
@@ -18,7 +18,8 @@ const profile = {
   kind: 'analysis',
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/static_analysis.html',
-  version: packageJson.version
+  version: packageJson.version,
+  maintainedBy: 'Remix'
 }
 
 class AnalysisTab extends ViewPlugin {
diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 23a53846f7..5ba54ed30f 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -19,6 +19,7 @@ const profile = {
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/solidity_editor.html',
   version: packageJson.version,
+  maintainedBy: 'Remix',
   methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile', 'getCompilerState']
 }
 
diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js
index 63debf4553..a06db0c508 100644
--- a/apps/remix-ide/src/app/tabs/debugger-tab.js
+++ b/apps/remix-ide/src/app/tabs/debugger-tab.js
@@ -17,7 +17,8 @@ const profile = {
   kind: 'debugging',
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/debugger.html',
-  version: packageJson.version
+  version: packageJson.version,
+  maintainedBy: 'Remix'
 }
 
 export class DebuggerTab extends DebuggerApiMixin(ViewPlugin) {
diff --git a/apps/remix-ide/src/app/tabs/search.tsx b/apps/remix-ide/src/app/tabs/search.tsx
index 3e0df1a893..f9a00045cc 100644
--- a/apps/remix-ide/src/app/tabs/search.tsx
+++ b/apps/remix-ide/src/app/tabs/search.tsx
@@ -12,7 +12,8 @@ const profile = {
     kind: '',
     location: 'sidePanel',
     documentation: '',
-    version: packageJson.version
+    version: packageJson.version,
+    maintainedBy: 'Remix'
   }
 
 export class SearchPlugin extends ViewPlugin {
diff --git a/apps/remix-ide/src/app/tabs/test-tab.js b/apps/remix-ide/src/app/tabs/test-tab.js
index 3c6e1a4b4c..b5c9518d23 100644
--- a/apps/remix-ide/src/app/tabs/test-tab.js
+++ b/apps/remix-ide/src/app/tabs/test-tab.js
@@ -18,7 +18,8 @@ const profile = {
   icon: 'assets/img/unitTesting.webp',
   description: 'Write and run unit tests for your contracts in Solidity',
   location: 'sidePanel',
-  documentation: 'https://remix-ide.readthedocs.io/en/latest/unittesting.html'
+  documentation: 'https://remix-ide.readthedocs.io/en/latest/unittesting.html',
+  maintainedBy: 'Remix'
 }
 
 module.exports = class TestTab extends ViewPlugin {
diff --git a/apps/remix-ide/src/app/udapp/run-tab.js b/apps/remix-ide/src/app/udapp/run-tab.js
index 02087b671f..c12e67ae87 100644
--- a/apps/remix-ide/src/app/udapp/run-tab.js
+++ b/apps/remix-ide/src/app/udapp/run-tab.js
@@ -17,6 +17,7 @@ const profile = {
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/run.html',
   version: packageJson.version,
+  maintainedBy: 'Remix',
   permission: true,
   events: ['newTransaction'],
   methods: ['createVMAccount', 'sendTransaction', 'getAccounts', 'pendingTransactionsCount', 'getSettings', 'setEnvironmentMode', 'clearAllInstances', 'addInstance', 'resolveContractAndAddInstance']