From f5d6fa0ca383fdad9cde9ac68911652bbb045a05 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 29 Oct 2024 10:20:52 +0100
Subject: [PATCH 01/27] matomo updates

---
 apps/remix-ide/src/app/components/preload.tsx                 | 4 ++--
 .../plugin-manager/src/lib/components/ActivePluginCard.tsx    | 3 +++
 .../plugin-manager/src/lib/components/InactivePluginCard.tsx  | 3 +++
 libs/remix-ui/settings/src/lib/remix-ui-settings.tsx          | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide/src/app/components/preload.tsx b/apps/remix-ide/src/app/components/preload.tsx
index 18e7665e0a..2a05a283e5 100644
--- a/apps/remix-ide/src/app/components/preload.tsx
+++ b/apps/remix-ide/src/app/components/preload.tsx
@@ -10,7 +10,7 @@ import './styles/preload.css'
 import isElectron from 'is-electron'
 const _paq = (window._paq = window._paq || [])
 
-_paq.push(['trackEvent', 'Preload', 'start'])
+_paq.push(['trackEvent', 'App', 'Preload', 'start'])
 
 export const Preload = (props: any) => {
   const [tip, setTip] = useState<string>('')
@@ -40,7 +40,7 @@ export const Preload = (props: any) => {
         })
       })
       .catch((err) => {
-        _paq.push(['trackEvent', 'Preload', 'error', err && err.message])
+        _paq.push(['trackEvent', 'App', 'PreloadError', err && err.message])
         console.error('Error loading Remix:', err)
         setError(true)
       })
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 6241150a2e..36ee6b743c 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
@@ -3,6 +3,8 @@ import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import '../remix-ui-plugin-manager.css'
 import { CustomTooltip } from '@remix-ui/helper'
+const _paq = (window._paq = window._paq || [])
+
 interface PluginCardProps {
   profile: any
   buttonText: string
@@ -85,6 +87,7 @@ function ActivePluginCard({ profile, buttonText, deactivatePlugin }: PluginCardP
               >
                 <button
                   onClick={() => {
+                    _paq.push(['trackEvent', 'pluginManager', 'deactivateBtn', 'deactivate btn ' +  profile.name])
                     deactivatePlugin(profile.name)
                   }}
                   className="btn btn-secondary btn-sm"
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 10e7f519b0..98355b1abf 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
@@ -5,6 +5,8 @@ import { FormattedMessage, useIntl } from 'react-intl'
 import '../remix-ui-plugin-manager.css'
 import { CustomTooltip } from '@remix-ui/helper'
 import { onLineContext } from '@remix-ui/app'
+const _paq = (window._paq = window._paq || [])
+
 interface PluginCardProps {
   profile: any
   buttonText: string
@@ -103,6 +105,7 @@ function InactivePluginCard({ profile, buttonText, activatePlugin }: PluginCardP
                 {!canBeActivated ? <button className="btn btn-secondary btn-sm">{intl.formatMessage({ id: 'pluginManager.UnavailableOffline' })}</button> : (
                   <button
                     onClick={() => {
+                      _paq.push(['trackEvent', 'pluginManager', 'activateBtn', 'activate btn' +  profile.name])
                       activatePlugin(profile.name)
                     }}
                     className="btn btn-success btn-sm"
diff --git a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
index bc43591eb3..1f123ab874 100644
--- a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
+++ b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
@@ -473,7 +473,7 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
           <span
             data-id="remix_ai_docs"
             id="remix_ai_docs"
-            className="btn pl-2 pr-0 py-0 d-inline ai-docs"
+            className="btn pl-2 pr-0 py-0 d-inline ai-docs text-dark"
             role='link'
             onClick={()=>{
               window.open("https://remix-ide.readthedocs.io/en/latest/ai.html")

From 25a692d3d4ce77f9f6495ec7e99e0ec56d312196 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 09:28:56 +0100
Subject: [PATCH 02/27] fix ci

---
 apps/remix-ide-e2e/src/tests/matomo.test.ts                     | 2 +-
 .../plugin-manager/src/lib/components/ActivePluginCard.tsx      | 2 +-
 .../plugin-manager/src/lib/components/InactivePluginCard.tsx    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/matomo.test.ts b/apps/remix-ide-e2e/src/tests/matomo.test.ts
index 74db9e8253..52d26f0fad 100644
--- a/apps/remix-ide-e2e/src/tests/matomo.test.ts
+++ b/apps/remix-ide-e2e/src/tests/matomo.test.ts
@@ -439,7 +439,7 @@ module.exports = {
                 return (window as any)._paq
             }, [], (res) => {
                 const expectedEvents = [
-                    ["trackEvent", "Preload", "start"],
+                    ["trackEvent", "App", "Preload", "start"],
                     ["trackEvent", "Storage", "activate", "indexedDB"],
                     ["trackEvent", "App", "load"],
                 ];
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 36ee6b743c..a83e177312 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
@@ -87,7 +87,7 @@ function ActivePluginCard({ profile, buttonText, deactivatePlugin }: PluginCardP
               >
                 <button
                   onClick={() => {
-                    _paq.push(['trackEvent', 'pluginManager', 'deactivateBtn', 'deactivate btn ' +  profile.name])
+                    _paq.push(['trackEvent', 'pluginManager', 'deactivateBtn', 'deactivate btn ' + profile.name])
                     deactivatePlugin(profile.name)
                   }}
                   className="btn btn-secondary btn-sm"
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 98355b1abf..992205d28c 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
@@ -105,7 +105,7 @@ function InactivePluginCard({ profile, buttonText, activatePlugin }: PluginCardP
                 {!canBeActivated ? <button className="btn btn-secondary btn-sm">{intl.formatMessage({ id: 'pluginManager.UnavailableOffline' })}</button> : (
                   <button
                     onClick={() => {
-                      _paq.push(['trackEvent', 'pluginManager', 'activateBtn', 'activate btn' +  profile.name])
+                      _paq.push(['trackEvent', 'pluginManager', 'activateBtn', 'activate btn' + profile.name])
                       activatePlugin(profile.name)
                     }}
                     className="btn btn-success btn-sm"

From 257065f094bbecba9e5874e94a505109d65872b4 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 22 Oct 2024 13:48:00 +0100
Subject: [PATCH 03/27] evp chain map

---
 .../run-tab/src/lib/actions/evmmap.ts         | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 libs/remix-ui/run-tab/src/lib/actions/evmmap.ts

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
new file mode 100644
index 0000000000..05c672e283
--- /dev/null
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -0,0 +1,132 @@
+type ChainInfo = {
+  id: number;
+  name: string;
+};
+
+type HardFork =
+  | 'berlin'
+  | 'byzantium'
+  | 'cancun'
+  | 'constantinople'
+  | 'homestead'
+  | 'istanbul'
+  | 'london'
+  | 'paris'
+  | 'petersburg'
+  | 'shanghai'
+  | 'spuriousDragon'
+  | 'tangarineWhistle';
+
+const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
+  ['berlin', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 11155111, name: "Sepolia" }
+    ]
+  }],
+  ['byzantium', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" }
+    ]
+  }],
+  ['cancun', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 11155111, name: "Sepolia" },
+    ]
+  }],
+  ['constantinople', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 11155111, name: "Sepolia" }
+    ]
+  }],
+  ['homestead', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 11155111, name: "Sepolia" }
+    ]
+  }],
+  ['istanbul', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 11155111, name: "Sepolia" }
+    ]
+  }],
+  ['london', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 10, name: "Optimism" },
+      { id: 25, name: "Cronos Mainnet" },
+      { id: 30, name: "Rootstock Mainnet" },
+      { id: 56, name: "BNB Smart Chain Mainnet" },
+      { id: 100, name: "Gnosis Chain" },
+      { id: 137, name: "Polygon Mainnet" },
+      { id: 250, name: "Fantom Opera" },
+      { id: 1280, name: "HALO Mainnet" },
+      { id: 42161, name: "Arbitrum One" },
+      { id: 42220, name: "Celo Mainnet" }
+    ]
+  }],
+  ['paris', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 10, name: "Optimism" },
+      { id: 30, name: "Rootstock Mainnet" },
+      { id: 56, name: "BNB Smart Chain Mainnet" },
+      { id: 100, name: "Gnosis Chain" },
+      { id: 137, name: "Polygon Mainnet" },
+      { id: 300, name: "zkSync Sepolia Testnet" },
+      { id: 302, name: "zkSync Era Testnet" },
+      { id: 314, name: "Filecoin - Mainnet" },
+      { id: 324, name: "zkSync Mainnet" },
+      { id: 369, name: "PulseChain" },
+      { id: 388, name: "HALO Mainnet" },
+      { id: 1101, name: "Polygon zkEVM" },
+      { id: 1284, name: "Moonbeam" },
+      { id: 2000, name: "Dogechain Mainnet" },
+      { id: 42220, name: "Celo Mainnet" },
+      { id: 42161, name: "Arbitrum One" },
+      { id: 42170, name: "Arbitrum Nova" },
+      { id: 44787, name: "Celo Alfajores Testnet" },
+      { id: 59144, name: "Linea Mainnet" },
+      { id: 59141, name: "Linea Testnet" },
+      { id: 11155111, name: "Sepolia" },
+      { id: 11155420, name: "Optimism Sepolia Testnet" },
+      { id: 1666600000, name: "Harmony Mainnet Shard 0" }
+    ]
+  }],
+  ['petersburg', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 11155111, name: "Sepolia" }
+    ]
+  }],
+  ['shanghai', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 11155111, name: "Sepolia" }
+    ]
+  }],
+  ['spuriousDragon', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" }
+    ]
+  }],
+  ['tangarineWhistle', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" }
+    ]
+  }]
+]);
+
+export default evmMap

From b775d9d52b8b8acda7d238ab3cc9ade83af2616d Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 23 Oct 2024 09:50:48 +0100
Subject: [PATCH 04/27] add utility functions

---
 .../remix-ui/run-tab/src/lib/actions/evmmap.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
index 05c672e283..8e98f4b81b 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -17,7 +17,7 @@ type HardFork =
   | 'spuriousDragon'
   | 'tangarineWhistle';
 
-const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
+export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
   ['berlin', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
@@ -127,6 +127,18 @@ const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 1, name: "Ethereum Mainnet" }
     ]
   }]
-]);
+])
 
-export default evmMap
+export function getCompatibleChains(fork: HardFork): ChainInfo[] {
+  const forkData = evmMap.get(fork);
+  return forkData ? forkData.chainId : [];
+}
+
+export function isChainCompatible(fork: HardFork, chainId: number): boolean {
+  const compatibleChains = getCompatibleChains(fork);
+  return compatibleChains.some(chain => chain.id === chainId);
+}
+
+export function isChainCompatibleWithAnyFork(chainId: number, forks: HardFork[]): boolean {
+  return forks.some(fork => isChainCompatible(fork, chainId));
+}

From 028b1f5dbbb81eae444bf425ab1e81523103cdfb Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 23 Oct 2024 11:15:39 +0100
Subject: [PATCH 05/27] order map chronologically

---
 .../run-tab/src/lib/actions/evmmap.ts         | 119 +++++++++---------
 1 file changed, 59 insertions(+), 60 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
index 8e98f4b81b..4b726454c8 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -1,79 +1,37 @@
-type ChainInfo = {
-  id: number;
-  name: string;
-};
+export type ChainInfo = {
+  id: number
+  name: string
+}
 
-type HardFork =
-  | 'berlin'
-  | 'byzantium'
+export type HardFork =
   | 'cancun'
-  | 'constantinople'
-  | 'homestead'
-  | 'istanbul'
-  | 'london'
+  | 'shanghai'
   | 'paris'
+  | 'london'
+  | 'berlin'
+  | 'istanbul'
   | 'petersburg'
-  | 'shanghai'
+  | 'constantinople'
+  | 'byzantium'
   | 'spuriousDragon'
-  | 'tangarineWhistle';
+  | 'tangerineWhistle'
+  | 'homestead'
 
 export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
-  ['berlin', {
-    chainId: [
-      { id: 1, name: "Ethereum Mainnet" },
-      { id: 5, name: "Goerli" },
-      { id: 11155111, name: "Sepolia" }
-    ]
-  }],
-  ['byzantium', {
-    chainId: [
-      { id: 1, name: "Ethereum Mainnet" }
-    ]
-  }],
   ['cancun', {
-    chainId: [
-      { id: 1, name: "Ethereum Mainnet" },
-      { id: 5, name: "Goerli" },
-      { id: 11155111, name: "Sepolia" },
-    ]
-  }],
-  ['constantinople', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
     ]
   }],
-  ['homestead', {
-    chainId: [
-      { id: 1, name: "Ethereum Mainnet" },
-      { id: 5, name: "Goerli" },
-      { id: 11155111, name: "Sepolia" }
-    ]
-  }],
-  ['istanbul', {
+  ['shanghai', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
     ]
   }],
-  ['london', {
-    chainId: [
-      { id: 1, name: "Ethereum Mainnet" },
-      { id: 5, name: "Goerli" },
-      { id: 10, name: "Optimism" },
-      { id: 25, name: "Cronos Mainnet" },
-      { id: 30, name: "Rootstock Mainnet" },
-      { id: 56, name: "BNB Smart Chain Mainnet" },
-      { id: 100, name: "Gnosis Chain" },
-      { id: 137, name: "Polygon Mainnet" },
-      { id: 250, name: "Fantom Opera" },
-      { id: 1280, name: "HALO Mainnet" },
-      { id: 42161, name: "Arbitrum One" },
-      { id: 42220, name: "Celo Mainnet" }
-    ]
-  }],
   ['paris', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
@@ -83,10 +41,10 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 56, name: "BNB Smart Chain Mainnet" },
       { id: 100, name: "Gnosis Chain" },
       { id: 137, name: "Polygon Mainnet" },
-      { id: 300, name: "zkSync Sepolia Testnet" },
+      { id: 300, name: "zkSync Era Mainnet" },
       { id: 302, name: "zkSync Era Testnet" },
       { id: 314, name: "Filecoin - Mainnet" },
-      { id: 324, name: "zkSync Mainnet" },
+      { id: 324, name: "zkSync Era Mainnet" },
       { id: 369, name: "PulseChain" },
       { id: 388, name: "HALO Mainnet" },
       { id: 1101, name: "Polygon zkEVM" },
@@ -103,6 +61,35 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
     ]
   }],
+  ['london', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 10, name: "Optimism" },
+      { id: 25, name: "Cronos Mainnet" },
+      { id: 30, name: "Rootstock Mainnet" },
+      { id: 56, name: "BNB Smart Chain Mainnet" },
+      { id: 137, name: "Polygon Mainnet" },
+      { id: 250, name: "Fantom Opera" },
+      { id: 1280, name: "HALO Mainnet" },
+      { id: 42161, name: "Arbitrum One" },
+      { id: 42220, name: "Celo Mainnet" }
+    ]
+  }],
+  ['berlin', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 11155111, name: "Sepolia" }
+    ]
+  }],
+  ['istanbul', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 11155111, name: "Sepolia" }
+    ]
+  }],
   ['petersburg', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
@@ -110,22 +97,34 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 11155111, name: "Sepolia" }
     ]
   }],
-  ['shanghai', {
+  ['constantinople', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
     ]
   }],
+  ['byzantium', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" }
+    ]
+  }],
   ['spuriousDragon', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
     ]
   }],
-  ['tangarineWhistle', {
+  ['tangerineWhistle', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
     ]
+  }],
+  ['homestead', {
+    chainId: [
+      { id: 1, name: "Ethereum Mainnet" },
+      { id: 5, name: "Goerli" },
+      { id: 11155111, name: "Sepolia" }
+    ]
   }]
 ])
 

From 312fecd5ea1fc83b1d0b31e051e3e74ea9af5837 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 29 Oct 2024 12:59:40 +0100
Subject: [PATCH 06/27] update map

---
 .../run-tab/src/lib/actions/evmmap.ts         | 75 ++++++++++++++++++-
 1 file changed, 73 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
index 4b726454c8..7943d7c9f3 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -22,6 +22,19 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
+      { id: 10, name: "Optimism" },
+      { id: 56, name: "BNB Smart Chain Mainnet" },
+      { id: 100, name: "Gnosis Chain" },
+      { id: 137, name: "Polygon Mainnet" },
+      { id: 250, name: "Fantom Opera" },
+      { id: 300, name: "zkSync Era Mainnet" },
+      { id: 42161, name: "Arbitrum One" },
+      { id: 42170, name: "Arbitrum Nova" },
+      { id: 43114, name: "Avalanche C-Chain" },
+      { id: 59144, name: "Linea Mainnet" },
+      { id: 59141, name: "Linea Testnet" },
+      { id: 421614, name: "Arbitrum Sepolia" },
+      { id: 534352, name: "Scroll" },
       { id: 11155111, name: "Sepolia" }
     ]
   }],
@@ -29,7 +42,33 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
-      { id: 11155111, name: "Sepolia" }
+      { id: 10, name: "Optimism" },
+      { id: 30, name: "Rootstock Mainnet" },
+      { id: 56, name: "BNB Smart Chain Mainnet" },
+      { id: 100, name: "Gnosis Chain" },
+      { id: 137, name: "Polygon Mainnet" },
+      { id: 250, name: "Fantom Opera" },
+      { id: 300, name: "zkSync Era Mainnet" },
+      { id: 302, name: "zkSync Era Testnet" },
+      { id: 314, name: "Filecoin - Mainnet" },
+      { id: 324, name: "zkSync Era Mainnet" },
+      { id: 369, name: "PulseChain" },
+      { id: 388, name: "HALO Mainnet" },
+      { id: 1101, name: "Polygon zkEVM" },
+      { id: 1088, name: "Metis Andromeda Mainnet" },
+      { id: 1284, name: "Moonbeam" },
+      { id: 2000, name: "Dogechain Mainnet" },
+      { id: 42220, name: "Celo Mainnet" },
+      { id: 42161, name: "Arbitrum One" },
+      { id: 42170, name: "Arbitrum Nova" },
+      { id: 44787, name: "Celo Alfajores Testnet" },
+      { id: 59144, name: "Linea Mainnet" },
+      { id: 59141, name: "Linea Testnet" },
+      { id: 59902, name: "Metis Sepolia Testnet" },
+      { id: 421614, name: "Arbitrum Sepolia" },
+      { id: 11155111, name: "Sepolia" },
+      { id: 11155420, name: "Optimism Sepolia Testnet" },
+      { id: 1666600000, name: "Harmony Mainnet Shard 0" }
     ]
   }],
   ['paris', {
@@ -41,12 +80,14 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 56, name: "BNB Smart Chain Mainnet" },
       { id: 100, name: "Gnosis Chain" },
       { id: 137, name: "Polygon Mainnet" },
+      { id: 250, name: "Fantom Opera" },
       { id: 300, name: "zkSync Era Mainnet" },
       { id: 302, name: "zkSync Era Testnet" },
       { id: 314, name: "Filecoin - Mainnet" },
       { id: 324, name: "zkSync Era Mainnet" },
       { id: 369, name: "PulseChain" },
       { id: 388, name: "HALO Mainnet" },
+      { id: 1088, name: "Metis Andromeda Mainnet" },
       { id: 1101, name: "Polygon zkEVM" },
       { id: 1284, name: "Moonbeam" },
       { id: 2000, name: "Dogechain Mainnet" },
@@ -56,6 +97,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 44787, name: "Celo Alfajores Testnet" },
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
+      { id: 59902, name: "Metis Sepolia Testnet" },
+      { id: 421614, name: "Arbitrum Sepolia" },
       { id: 11155111, name: "Sepolia" },
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
@@ -73,13 +116,29 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 250, name: "Fantom Opera" },
       { id: 1280, name: "HALO Mainnet" },
       { id: 42161, name: "Arbitrum One" },
-      { id: 42220, name: "Celo Mainnet" }
+      { id: 42170, name: "Arbitrum Nova" },
+      { id: 42220, name: "Celo Mainnet" },
+      { id: 59144, name: "Linea Mainnet" },
+      { id: 59141, name: "Linea Testnet" },
+      { id: 11155111, name: "Sepolia" },
     ]
   }],
   ['berlin', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
+      { id: 10, name: "Optimism" },
+      { id: 25, name: "Cronos Mainnet" },
+      { id: 30, name: "Rootstock Mainnet" },
+      { id: 56, name: "BNB Smart Chain Mainnet" },
+      { id: 137, name: "Polygon Mainnet" },
+      { id: 250, name: "Fantom Opera" },
+      { id: 1280, name: "HALO Mainnet" },
+      { id: 42161, name: "Arbitrum One" },
+      { id: 42170, name: "Arbitrum Nova" },
+      { id: 42220, name: "Celo Mainnet" },
+      { id: 59144, name: "Linea Mainnet" },
+      { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" }
     ]
   }],
@@ -87,6 +146,18 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
+      { id: 10, name: "Optimism" },
+      { id: 25, name: "Cronos Mainnet" },
+      { id: 30, name: "Rootstock Mainnet" },
+      { id: 56, name: "BNB Smart Chain Mainnet" },
+      { id: 137, name: "Polygon Mainnet" },
+      { id: 250, name: "Fantom Opera" },
+      { id: 1280, name: "HALO Mainnet" },
+      { id: 42161, name: "Arbitrum One" },
+      { id: 42170, name: "Arbitrum Nova" },
+      { id: 42220, name: "Celo Mainnet" },
+      { id: 59144, name: "Linea Mainnet" },
+      { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" }
     ]
   }],

From 287ace852f969ee66d555f25c5a0001798484e9f Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 30 Oct 2024 13:02:40 +0100
Subject: [PATCH 07/27] modal

---
 .../run-tab/src/lib/actions/evmmap.ts         | 19 ++++--
 .../src/lib/components/contractDropdownUI.tsx |  1 +
 .../src/lib/components/contractGUI.tsx        | 13 ++++
 .../src/lib/components/environment.tsx        |  2 +-
 .../lib/components/instanceContainerUI.tsx    |  1 +
 .../run-tab/src/lib/components/settingsUI.tsx |  2 +-
 .../src/lib/components/universalDappUI.tsx    |  1 +
 libs/remix-ui/run-tab/src/lib/run-tab.tsx     | 63 +++++++++++++++++++
 libs/remix-ui/run-tab/src/lib/types/index.ts  |  6 ++
 9 files changed, 100 insertions(+), 8 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
index 7943d7c9f3..a219fc9173 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -1,5 +1,5 @@
 export type ChainInfo = {
-  id: number
+  id: number | string
   name: string
 }
 
@@ -200,15 +200,22 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
 ])
 
 export function getCompatibleChains(fork: HardFork): ChainInfo[] {
-  const forkData = evmMap.get(fork);
-  return forkData ? forkData.chainId : [];
+  const forkData = evmMap.get(fork)
+  return forkData ? forkData.chainId : []
 }
 
 export function isChainCompatible(fork: HardFork, chainId: number): boolean {
-  const compatibleChains = getCompatibleChains(fork);
-  return compatibleChains.some(chain => chain.id === chainId);
+  const compatibleChains = getCompatibleChains(fork)
+  return compatibleChains.some(chain => chain.id === chainId)
 }
 
 export function isChainCompatibleWithAnyFork(chainId: number, forks: HardFork[]): boolean {
-  return forks.some(fork => isChainCompatible(fork, chainId));
+  return forks.some(fork => isChainCompatible(fork, chainId))
+}
+
+export function getCompatibleChain(fork: HardFork, chainId: number): ChainInfo | undefined {
+  const compatibleChains = getCompatibleChains(fork)
+  console.log('fork in getCompatibleChain', fork)
+  console.log('compatibleChains', compatibleChains)
+  return compatibleChains.find(chain => chain.id === chainId)
 }
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 7ccc8ce55b..a462ffe40c 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -462,6 +462,7 @@ export function ContractDropdownUI(props: ContractDropdownProps) {
             <div>
               <ContractGUI
                 title={intl.formatMessage({ id: 'udapp.deploy' })}
+                getCompilerDetails={props.getCompilerDetails}
                 isDeploy={true}
                 deployOption={deployOptions[currentFile] && deployOptions[currentFile][currentContract] ? deployOptions[currentFile][currentContract].options : null}
                 initializerOptions={
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 88efe555c3..dbdbad5bbc 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -6,6 +6,7 @@ import { ContractGUIProps } from '../types'
 import { CopyToClipboard } from '@remix-ui/clipboard'
 import { CustomTooltip, ProxyAddressToggle, ProxyDropdownMenu, shortenDate, shortenProxyAddress, unavailableProxyLayoutMsg, upgradeReportMsg } from '@remix-ui/helper'
 import { Dropdown } from 'react-bootstrap'
+import { getCompatibleChains, isChainCompatible, isChainCompatibleWithAnyFork } from '../actions/evmmap'
 
 const txFormat = remixLib.execution.txFormat
 const txHelper = remixLib.execution.txHelper
@@ -171,8 +172,20 @@ export function ContractGUI(props: ContractGUIProps) {
     }
   }
 
+  const checkUrlLocationForEvmVersion = async () => {
+    // if the evmVersion is not provided in the url, we use the default value
+    // and the default would be the latest evmFork, which is now cancun.
+    // checking both url and compiler details
+    const url = window.location.href
+    const regVersion = url.match(/evmVersion=([a-zA-Z]+)/)?.[1]
+    const fetched = await props.getCompilerDetails()
+    return { regVersion, fetched }
+  }
+
   const handleActionClick = async () => {
     props.getVersion()
+    const { regVersion, fetched } = await checkUrlLocationForEvmVersion()
+    console.log('checkUrlLocationForEvmVersion', { regVersion, fetched })
     if (deployState.deploy) {
       const proxyInitializeString = getMultiValsString(initializeFields.current)
       props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
diff --git a/libs/remix-ui/run-tab/src/lib/components/environment.tsx b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
index 1cb2a91918..55149a8e9d 100644
--- a/libs/remix-ui/run-tab/src/lib/components/environment.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line no-use-before-define
-import React from 'react'
+import React, { useEffect } from 'react'
 import { FormattedMessage } from 'react-intl'
 import { EnvironmentProps, Provider } from '../types'
 import { Dropdown } from 'react-bootstrap'
diff --git a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
index 37253056f7..f1ef7ae6b8 100644
--- a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
@@ -62,6 +62,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
                 editInstance={props.editInstance}
                 solcVersion={props.solcVersion}
                 getVersion={props.getVersion}
+                getCompilerDetails={props.getCompilerDetails}
               />
             )
           })}
diff --git a/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx b/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
index f9e09246f9..295e3f966d 100644
--- a/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
@@ -12,7 +12,7 @@ export function SettingsUI(props: SettingsProps) {
 
   return (
     <div className="udapp_settings">
-      <EnvironmentUI selectedEnv={props.selectExEnv} providers={props.providers} setExecutionContext={props.setExecutionContext} />
+      <EnvironmentUI runTabPlugin={props.runTabPlugin} selectedEnv={props.selectExEnv} providers={props.providers} setExecutionContext={props.setExecutionContext} />
       <NetworkUI networkName={props.networkName} />
       <AccountUI
         addFile={props.addFile}
diff --git a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
index 601147f5d1..b4700a4b1c 100644
--- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
@@ -326,6 +326,7 @@ export function UniversalDappUI(props: UdappProps) {
                 <div key={index}>
                   <ContractGUI
                     getVersion={props.getVersion}
+                    getCompilerDetails={props.getCompilerDetails}
                     funcABI={funcABI}
                     clickCallBack={(valArray: {name: string; type: string}[], inputsValues: string) => {
                       runTransaction(lookupOnly, funcABI, valArray, inputsValues, index)
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 c4cd395055..5778da720b 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -56,6 +56,7 @@ import { PassphrasePrompt } from './components/passphrase'
 import { MainnetPrompt } from './components/mainnet'
 import { ScenarioPrompt } from './components/scenario'
 import { setIpfsCheckedState, setRemixDActivated } from './actions/payload'
+import { getCompatibleChain, getCompatibleChains, HardFork, isChainCompatible, isChainCompatibleWithAnyFork } from './actions/evmmap'
 
 export function RunTabUI(props: RunTabProps) {
   const { plugin } = props
@@ -85,6 +86,7 @@ export function RunTabUI(props: RunTabProps) {
   const REACT_API = { runTab }
   const currentfile = plugin.config.get('currentFile')
   const [solcVersion, setSolcVersion] = useState<{version: string, canReceive: boolean}>({ version: '', canReceive: true })
+  const [chainEvmCompat, setChainEvmCompat] = useState()
 
   const getVersion = () => {
     let version = '0.8.25'
@@ -102,6 +104,64 @@ export function RunTabUI(props: RunTabProps) {
     }
   }
 
+  const getCompilerDetails = async () => await checkEvmChainCompatibility()
+
+  const returnCompatibleChain = async (evmVersion: HardFork, targetChainId: number) => {
+    return getCompatibleChain(evmVersion ?? 'cancun', targetChainId)
+  }
+
+  const checkEvmChainCompatibilityOkFunction = async (targetChainId: number, fetchDetails: any, currentFile: string) => {
+    () => {
+      const compatibleChain = returnCompatibleChain(fetchDetails.evmVersion, targetChainId)
+      console.log('compatibleChain', compatibleChain)
+      plugin.call('manager', 'activatePlugin', 'environmentExplorer')
+      plugin.call('tabs', 'focus', 'environmentExplorer')
+      plugin.call('environmentExplorer', 'setChain', compatibleChain)
+      plugin.call('environmentExplorer', 'setEvmVersion', 'paris')
+      plugin.call('solidity', 'compile', currentFile)
+    }
+  }
+
+  const checkEvmChainCompatibilityCancelFunction = async (targetChainId: number, fetchDetails: any, currentFile: string) => {
+    () => {
+      plugin.call('manager', 'activatePlugin', 'environmentExplorer')
+      plugin.call('tabs', 'focus', 'environmentExplorer')
+      plugin.call('environmentExplorer', 'setChain', targetChainId)
+      plugin.call('environmentExplorer', 'setEvmVersion', fetchDetails.evmVersion)
+      plugin.call('solidity', 'compile', currentFile)
+    }
+  }
+
+  const checkEvmChainCompatibility = async () => {
+    const isVm = await plugin.call('blockchain', 'getProvider') // vms are exempt from this treatment
+    const fetchDetails = await plugin.call('solidity', 'getCompilerQueryParameters') //compiler details including evmVersion
+    console.log('isVm', isVm)
+    if (!isVm.startsWith('vm')) {
+      const targetChainId = runTab.chainId ? parseInt(runTab.chainId) : runTab.chainId
+      console.log('targetChainId', runTab.chainId)
+
+      const IsCompatible = isChainCompatible(fetchDetails.evmVersion ?? 'cancun', targetChainId)
+      console.log('evmVersion matches everywhere', fetchDetails.evmVersion)
+      console.log('compiler stuff', fetchDetails)
+      console.log('chain is compatible', IsCompatible)
+      const currentFile = await plugin.call('fileManager', 'getCurrentFile')
+      if (!IsCompatible) {
+        console.log('chain is undefined')
+        //show modal
+        plugin.call('notification', 'modal', {
+          id: 'evm-incompatible',
+          title: 'Incompatible EVM - ChainId Detected',
+          message: `The selected chain is not compatible with the selected compiler version. Please select a one of the two options below.`,
+          modalType: 'modal',
+          okLabel: 'Switch EVM and Recompile',
+          cancelLabel: 'Do not Switch EVM',
+          okFn: checkEvmChainCompatibilityOkFunction,
+          cancelFn: checkEvmChainCompatibilityCancelFunction
+        })
+      }
+    }
+  }
+
   useEffect(() => {
     if (!props.initialState) {
       initRunTab(plugin, true)(dispatch)
@@ -294,6 +354,7 @@ export function RunTabUI(props: RunTabProps) {
             gasLimit={runTab.gasLimit}
             setGasFee={setGasFeeAmount}
             providers={runTab.providers}
+            runTabPlugin={plugin}
             setExecutionContext={setExecutionEnvironment}
             createNewBlockchainAccount={createNewAddress}
             setPassphrase={setPassphraseModal}
@@ -331,6 +392,7 @@ export function RunTabUI(props: RunTabProps) {
             solCompilerVersion={solcVersion}
             setCompilerVersion={setSolcVersion}
             getCompilerVersion={getVersion}
+            getCompilerDetails={getCompilerDetails}
           />
           <RecorderUI
             plugin={plugin}
@@ -345,6 +407,7 @@ export function RunTabUI(props: RunTabProps) {
           />
           <InstanceContainerUI
             plugin={plugin}
+            getCompilerDetails={getCompilerDetails}
             instances={runTab.instances}
             clearInstances={removeInstances}
             unpinInstance={unpinPinnedInstance}
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 35229e6e31..b7edc0c64c 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -123,6 +123,7 @@ export interface RunTabState {
 }
 
 export interface SettingsProps {
+  runTabPlugin: RunTab,
   selectExEnv: string,
   accounts: {
     loadedAccounts: Record<string, any>,
@@ -158,6 +159,7 @@ export interface SettingsProps {
 }
 
 export interface EnvironmentProps {
+  runTabPlugin: RunTab,
   selectedEnv: string,
   providers: {
     providerList: Provider[],
@@ -228,6 +230,7 @@ export type MainnetPrompt = (
   ) => JSX.Element
 
 export interface ContractDropdownProps {
+  getCompilerDetails: () => Promise<any>
   selectedAccount: string,
   exEnvironment: string,
   contracts: {
@@ -292,6 +295,7 @@ export interface RecorderProps {
 }
 
 export interface InstanceContainerProps {
+  getCompilerDetails: () => Promise<any>
   instances: {
     instanceList: {
       contractData?: ContractData,
@@ -373,6 +377,7 @@ export interface DeployOptions {
 }
 
 export interface ContractGUIProps {
+  getCompilerDetails: () => Promise<any>
   title?: string,
   funcABI: FuncABI,
   inputs: string,
@@ -412,6 +417,7 @@ export interface MainnetProps {
 }
 
 export interface UdappProps {
+  getCompilerDetails: () => Promise<any>
   instance: {
     contractData?: ContractData,
     address: string,

From 9e3329153f8cb530d63e2d41296b54476b39c7fe Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Thu, 31 Oct 2024 01:19:36 +0100
Subject: [PATCH 08/27] fix error message

---
 libs/remix-lib/src/execution/txRunnerWeb3.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts
index b2c46feff4..6a7126dc5c 100644
--- a/libs/remix-lib/src/execution/txRunnerWeb3.ts
+++ b/libs/remix-lib/src/execution/txRunnerWeb3.ts
@@ -166,7 +166,7 @@ export class TxRunnerWeb3 {
         .catch(err => {
           if (err && err.error && err.error.indexOf('Invalid JSON RPC response') !== -1) {
             // // @todo(#378) this should be removed when https://github.com/WalletConnect/walletconnect-monorepo/issues/334 is fixed
-            callback(new Error('Gas estimation failed because of an unknown internal error. This may indicated that the transaction will fail.'))
+            callback(new Error('Gas estimation failed because of an unknown internal error. This indicates that the transaction could fail.'))
             return
           }
           err = network.name === 'VM' ? null : err // just send the tx if "VM"

From 078700b67fef149c4882e8ea7b24e023d91b7925 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Thu, 31 Oct 2024 01:20:06 +0100
Subject: [PATCH 09/27] add min compiler version to map

---
 .../run-tab/src/lib/actions/evmmap.ts         | 42 ++++++++++++-------
 libs/remix-ui/run-tab/src/lib/run-tab.tsx     | 40 ++++++++++--------
 2 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
index a219fc9173..caac70a01e 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -17,7 +17,7 @@ export type HardFork =
   | 'tangerineWhistle'
   | 'homestead'
 
-export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
+export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: string }> = new Map([
   ['cancun', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
@@ -36,7 +36,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 421614, name: "Arbitrum Sepolia" },
       { id: 534352, name: "Scroll" },
       { id: 11155111, name: "Sepolia" }
-    ]
+    ],
+    minCompilerVersion: "0.8.24"
   }],
   ['shanghai', {
     chainId: [
@@ -58,10 +59,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 1088, name: "Metis Andromeda Mainnet" },
       { id: 1284, name: "Moonbeam" },
       { id: 2000, name: "Dogechain Mainnet" },
-      { id: 42220, name: "Celo Mainnet" },
       { id: 42161, name: "Arbitrum One" },
       { id: 42170, name: "Arbitrum Nova" },
-      { id: 44787, name: "Celo Alfajores Testnet" },
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
       { id: 59902, name: "Metis Sepolia Testnet" },
@@ -69,7 +68,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 11155111, name: "Sepolia" },
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
-    ]
+    ],
+    minCompilerVersion: "0.8.20"
   }],
   ['paris', {
     chainId: [
@@ -102,7 +102,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 11155111, name: "Sepolia" },
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
-    ]
+    ],
+    minCompilerVersion: "0.8.18"
   }],
   ['london', {
     chainId: [
@@ -121,7 +122,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" },
-    ]
+    ],
+    minCompilerVersion: "0.8.7"
   }],
   ['berlin', {
     chainId: [
@@ -140,7 +142,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" }
-    ]
+    ],
+    minCompilerVersion: "0.8.5"
   }],
   ['istanbul', {
     chainId: [
@@ -159,44 +162,51 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[] }> = new Map([
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" }
-    ]
+    ],
+    minCompilerVersion: "0.5.14"
   }],
   ['petersburg', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
-    ]
+    ],
+    minCompilerVersion: "0.5.5"
   }],
   ['constantinople', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
-    ]
+    ],
+    minCompilerVersion: "0.5.5"
   }],
   ['byzantium', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
-    ]
+    ],
+    minCompilerVersion: "0.4.21"
   }],
   ['spuriousDragon', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
-    ]
+    ],
+    minCompilerVersion: "0.4.9"
   }],
   ['tangerineWhistle', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
-    ]
+    ],
+    minCompilerVersion: "0.4.0"
   }],
   ['homestead', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
-    ]
-  }]
+    ],
+    minCompilerVersion: "0.1.2"
+  }],
 ])
 
 export function getCompatibleChains(fork: HardFork): ChainInfo[] {
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 5778da720b..b82f5b4028 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -110,25 +110,24 @@ export function RunTabUI(props: RunTabProps) {
     return getCompatibleChain(evmVersion ?? 'cancun', targetChainId)
   }
 
-  const checkEvmChainCompatibilityOkFunction = async (targetChainId: number, fetchDetails: any, currentFile: string) => {
-    () => {
-      const compatibleChain = returnCompatibleChain(fetchDetails.evmVersion, targetChainId)
-      console.log('compatibleChain', compatibleChain)
-      plugin.call('manager', 'activatePlugin', 'environmentExplorer')
-      plugin.call('tabs', 'focus', 'environmentExplorer')
-      plugin.call('environmentExplorer', 'setChain', compatibleChain)
-      plugin.call('environmentExplorer', 'setEvmVersion', 'paris')
-      plugin.call('solidity', 'compile', currentFile)
+  const checkEvmChainCompatibilityOkFunction = async (targetChainId: number, fetchDetails: any) => {
+    const compilerParams = {
+      evmVersion: 'paris',
+      optimize: false,
+      language: 'Solidity',
+      runs: 200,
+      version: '0.8.27+commit.40a35a09'
     }
+    await plugin.call('solidity', 'setCompilerConfig', compilerParams)
+    const compilerState = await plugin.call('solidity', 'getCompilerState')
+    console.log('compilerState', compilerState)
+    const currentFile = await plugin.call('fileManager', 'getCurrentFile')
+    await plugin.call('solidity', 'compile', currentFile)
   }
 
   const checkEvmChainCompatibilityCancelFunction = async (targetChainId: number, fetchDetails: any, currentFile: string) => {
     () => {
-      plugin.call('manager', 'activatePlugin', 'environmentExplorer')
-      plugin.call('tabs', 'focus', 'environmentExplorer')
-      plugin.call('environmentExplorer', 'setChain', targetChainId)
-      plugin.call('environmentExplorer', 'setEvmVersion', fetchDetails.evmVersion)
-      plugin.call('solidity', 'compile', currentFile)
+      console.log('cancel')
     }
   }
 
@@ -149,12 +148,19 @@ export function RunTabUI(props: RunTabProps) {
         console.log('chain is undefined')
         //show modal
         plugin.call('notification', 'modal', {
-          id: 'evm-incompatible',
+          id: 'evm-chainId-incompatible',
           title: 'Incompatible EVM - ChainId Detected',
-          message: `The selected chain is not compatible with the selected compiler version. Please select a one of the two options below.`,
+          message: <div className="px-3">
+            <p>The selected chain is not compatible with the selected EVM version. Please select a one of the options below.</p>
+            <ul className="px-3">
+              <li>Have Remix switch to a compatible EVM version for this chain and recompile the contract.</li>
+              <li>Cancel to keep the current EVM version.</li>
+            </ul>
+            <p>To manually change the EVM version, go to the Advanced Configurations section of the Solidity compiler.</p>
+          </div>,
           modalType: 'modal',
           okLabel: 'Switch EVM and Recompile',
-          cancelLabel: 'Do not Switch EVM',
+          cancelLabel: 'Cancel',
           okFn: checkEvmChainCompatibilityOkFunction,
           cancelFn: checkEvmChainCompatibilityCancelFunction
         })

From 91850e4699ebdcab71eddf5454141758442fb12f Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Thu, 31 Oct 2024 01:33:36 +0100
Subject: [PATCH 10/27] add commit hex

---
 .../run-tab/src/lib/actions/evmmap.ts         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
index caac70a01e..e27df17cdb 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -37,7 +37,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 534352, name: "Scroll" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.8.24"
+    minCompilerVersion: "0.8.24+commit.e11b9ed9"
   }],
   ['shanghai', {
     chainId: [
@@ -69,7 +69,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
     ],
-    minCompilerVersion: "0.8.20"
+    minCompilerVersion: "0.8.20+commit.a1b79de6"
   }],
   ['paris', {
     chainId: [
@@ -103,7 +103,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
     ],
-    minCompilerVersion: "0.8.18"
+    minCompilerVersion: "0.8.18+commit.87f61d96"
   }],
   ['london', {
     chainId: [
@@ -123,7 +123,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" },
     ],
-    minCompilerVersion: "0.8.7"
+    minCompilerVersion: "0.8.7+commit.e28d00a7"
   }],
   ['berlin', {
     chainId: [
@@ -143,7 +143,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.8.5"
+    minCompilerVersion: "0.8.5+commit.a4f2e591"
   }],
   ['istanbul', {
     chainId: [
@@ -163,7 +163,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.5.14"
+    minCompilerVersion: "0.5.14+commit.01f1aaa4"
   }],
   ['petersburg', {
     chainId: [
@@ -171,7 +171,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.5.5"
+    minCompilerVersion: "0.5.5+commit.47a71e8f"
   }],
   ['constantinople', {
     chainId: [
@@ -179,25 +179,25 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.5.5"
+    minCompilerVersion: "0.5.5+commit.47a71e8f"
   }],
   ['byzantium', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
     ],
-    minCompilerVersion: "0.4.21"
+    minCompilerVersion: "0.4.21+commit.dfe3193c"
   }],
   ['spuriousDragon', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
     ],
-    minCompilerVersion: "0.4.9"
+    minCompilerVersion: "0.4.9+commit.364da425"
   }],
   ['tangerineWhistle', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
     ],
-    minCompilerVersion: "0.4.0"
+    minCompilerVersion: "0.4.0+commit.acd334c9"
   }],
   ['homestead', {
     chainId: [
@@ -205,7 +205,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.1.2"
+    minCompilerVersion: "0.1.2+commit.d0d36e3"
   }],
 ])
 

From db26b53327267bc6495813c0a4432c6cab064ff7 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Thu, 31 Oct 2024 19:28:44 +0100
Subject: [PATCH 11/27] add evmCheck

---
 .../run-tab/src/lib/actions/evmmap.ts         | 66 ++++++++++++++-----
 .../src/lib/components/contractGUI.tsx        | 13 +---
 .../src/lib/components/environment.tsx        | 13 ++++
 .../run-tab/src/lib/components/settingsUI.tsx |  9 ++-
 libs/remix-ui/run-tab/src/lib/run-tab.tsx     | 44 +++++--------
 libs/remix-ui/run-tab/src/lib/types/index.ts  |  2 +
 6 files changed, 89 insertions(+), 58 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
index e27df17cdb..672de51b5f 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -3,6 +3,12 @@ export type ChainInfo = {
   name: string
 }
 
+export type ChainCompatibleInfo = {
+  chain: ChainInfo
+  minCompilerVersion: string
+  evmVersion: HardFork
+}
+
 export type HardFork =
   | 'cancun'
   | 'shanghai'
@@ -37,7 +43,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 534352, name: "Scroll" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.8.24+commit.e11b9ed9"
+    minCompilerVersion: "0.8.24+commit.e11b9ed9",
+    evmVersion: 'cancun'
   }],
   ['shanghai', {
     chainId: [
@@ -65,11 +72,13 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59141, name: "Linea Testnet" },
       { id: 59902, name: "Metis Sepolia Testnet" },
       { id: 421614, name: "Arbitrum Sepolia" },
+      { id: 534352, name: "Scroll" },
       { id: 11155111, name: "Sepolia" },
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
     ],
-    minCompilerVersion: "0.8.20+commit.a1b79de6"
+    minCompilerVersion: "0.8.20+commit.a1b79de6",
+    evmVersion: 'shanghai'
   }],
   ['paris', {
     chainId: [
@@ -99,11 +108,13 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59141, name: "Linea Testnet" },
       { id: 59902, name: "Metis Sepolia Testnet" },
       { id: 421614, name: "Arbitrum Sepolia" },
+      { id: 534352, name: "Scroll" },
       { id: 11155111, name: "Sepolia" },
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
     ],
-    minCompilerVersion: "0.8.18+commit.87f61d96"
+    minCompilerVersion: "0.8.18+commit.87f61d96",
+    evmVersion: 'paris'
   }],
   ['london', {
     chainId: [
@@ -123,7 +134,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" },
     ],
-    minCompilerVersion: "0.8.7+commit.e28d00a7"
+    minCompilerVersion: "0.8.7+commit.e28d00a7",
+    evmVersion: 'london'
   }],
   ['berlin', {
     chainId: [
@@ -143,7 +155,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.8.5+commit.a4f2e591"
+    minCompilerVersion: "0.8.5+commit.a4f2e591",
+    evmVersion: 'berlin'
   }],
   ['istanbul', {
     chainId: [
@@ -163,7 +176,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59141, name: "Linea Testnet" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.5.14+commit.01f1aaa4"
+    minCompilerVersion: "0.5.14+commit.01f1aaa4",
+    evmVersion: 'istanbul'
   }],
   ['petersburg', {
     chainId: [
@@ -171,7 +185,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.5.5+commit.47a71e8f"
+    minCompilerVersion: "0.5.5+commit.47a71e8f",
+    evmVersion: 'petersburg'
   }],
   ['constantinople', {
     chainId: [
@@ -179,25 +194,29 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.5.5+commit.47a71e8f"
+    minCompilerVersion: "0.5.5+commit.47a71e8f",
+    evmVersion: 'constantinople'
   }],
   ['byzantium', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
     ],
-    minCompilerVersion: "0.4.21+commit.dfe3193c"
+    minCompilerVersion: "0.4.21+commit.dfe3193c",
+    evmVersion: 'byzantium'
   }],
   ['spuriousDragon', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
     ],
-    minCompilerVersion: "0.4.9+commit.364da425"
+    minCompilerVersion: "0.4.9+commit.364da425",
+    evmVersion: 'spuriousDragon'
   }],
   ['tangerineWhistle', {
     chainId: [
       { id: 1, name: "Ethereum Mainnet" }
     ],
-    minCompilerVersion: "0.4.0+commit.acd334c9"
+    minCompilerVersion: "0.4.0+commit.acd334c9",
+    evmVersion: 'tangerineWhistle'
   }],
   ['homestead', {
     chainId: [
@@ -205,7 +224,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 5, name: "Goerli" },
       { id: 11155111, name: "Sepolia" }
     ],
-    minCompilerVersion: "0.1.2+commit.d0d36e3"
+    minCompilerVersion: "0.1.2+commit.d0d36e3",
+    evmVersion: 'homestead'
   }],
 ])
 
@@ -223,9 +243,21 @@ export function isChainCompatibleWithAnyFork(chainId: number, forks: HardFork[])
   return forks.some(fork => isChainCompatible(fork, chainId))
 }
 
-export function getCompatibleChain(fork: HardFork, chainId: number): ChainInfo | undefined {
-  const compatibleChains = getCompatibleChains(fork)
-  console.log('fork in getCompatibleChain', fork)
-  console.log('compatibleChains', compatibleChains)
-  return compatibleChains.find(chain => chain.id === chainId)
+export function getCompatibleChain(
+  fork: HardFork,
+  chainId: number
+): ChainCompatibleInfo | undefined {
+  const forkData = evmMap.get(fork)
+  if (!forkData) return undefined
+
+  const compatibleChain = forkData.chainId.find(chain => chain.id === chainId)
+  if (compatibleChain) {
+    return {
+      chain: compatibleChain,
+      minCompilerVersion: forkData.minCompilerVersion,
+      evmVersion: fork
+    }
+  }
+
+  return undefined;
 }
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 dbdbad5bbc..eed0eacf8b 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -172,20 +172,9 @@ export function ContractGUI(props: ContractGUIProps) {
     }
   }
 
-  const checkUrlLocationForEvmVersion = async () => {
-    // if the evmVersion is not provided in the url, we use the default value
-    // and the default would be the latest evmFork, which is now cancun.
-    // checking both url and compiler details
-    const url = window.location.href
-    const regVersion = url.match(/evmVersion=([a-zA-Z]+)/)?.[1]
-    const fetched = await props.getCompilerDetails()
-    return { regVersion, fetched }
-  }
-
   const handleActionClick = async () => {
     props.getVersion()
-    const { regVersion, fetched } = await checkUrlLocationForEvmVersion()
-    console.log('checkUrlLocationForEvmVersion', { regVersion, fetched })
+    await props.getCompilerDetails()
     if (deployState.deploy) {
       const proxyInitializeString = getMultiValsString(initializeFields.current)
       props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
diff --git a/libs/remix-ui/run-tab/src/lib/components/environment.tsx b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
index 55149a8e9d..f5d3530f63 100644
--- a/libs/remix-ui/run-tab/src/lib/components/environment.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
@@ -11,6 +11,16 @@ export function EnvironmentUI(props: EnvironmentProps) {
   Object.entries(props.providers.providerList.filter((provider) => { return provider.isInjected }))
   Object.entries(props.providers.providerList.filter((provider) => { return !(provider.isVM || provider.isInjected) }))
 
+  const EvaluateSelectionForCorrectness = async () => {
+    // if the evmVersion is not provided in the url, we use the default value
+    // and the default would be the latest evmFork, which is now cancun.
+    // checking both url and compiler details
+    const url = window.location.href
+    const regVersion = url.match(/evmVersion=([a-zA-Z]+)/)?.[1]
+    const fetched = await props.checkSelectionCorrectness()
+    return { regVersion, fetched }
+  }
+
   const handleChangeExEnv = (env: string) => {
     const provider = props.providers.providerList.find((exEnv) => exEnv.name === env)
     const context = provider.name
@@ -69,6 +79,9 @@ export function EnvironmentUI(props: EnvironmentProps) {
                 onClick={() => {
                   handleChangeExEnv(name)
                 }}
+                onSelect={() => {
+                  EvaluateSelectionForCorrectness()
+                }}
                 data-id={`dropdown-item-${name}`}
               >
                 <span className="">
diff --git a/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx b/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
index 295e3f966d..f7894042bd 100644
--- a/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line no-use-before-define
-import React from 'react'
+import React, { useEffect } from 'react'
 import { SettingsProps } from '../types'
 import { EnvironmentUI } from './environment'
 import { NetworkUI } from './network'
@@ -10,9 +10,14 @@ import { ValueUI } from './value'
 export function SettingsUI(props: SettingsProps) {
   //   this._deps.config.events.on('settings/personal-mode_changed', this.onPersonalChange.bind(this))
 
+  useEffect(() => {
+    // listen for chainId change on window.ethereum and call EvaluateEnvironmentSelection
+    // (window as any).ethereum?.on('chainChanged', console.log('metamask did something')) //props.EvaluateEnvironmentSelection)
+  }, [])
+
   return (
     <div className="udapp_settings">
-      <EnvironmentUI runTabPlugin={props.runTabPlugin} selectedEnv={props.selectExEnv} providers={props.providers} setExecutionContext={props.setExecutionContext} />
+      <EnvironmentUI runTabPlugin={props.runTabPlugin} selectedEnv={props.selectExEnv} providers={props.providers} setExecutionContext={props.setExecutionContext} checkSelectionCorrectness={props.EvaluateEnvironmentSelection} />
       <NetworkUI networkName={props.networkName} />
       <AccountUI
         addFile={props.addFile}
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 b82f5b4028..d23cc3367b 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -56,7 +56,7 @@ import { PassphrasePrompt } from './components/passphrase'
 import { MainnetPrompt } from './components/mainnet'
 import { ScenarioPrompt } from './components/scenario'
 import { setIpfsCheckedState, setRemixDActivated } from './actions/payload'
-import { getCompatibleChain, getCompatibleChains, HardFork, isChainCompatible, isChainCompatibleWithAnyFork } from './actions/evmmap'
+import { ChainCompatibleInfo, getCompatibleChain, getCompatibleChains, HardFork, isChainCompatible, isChainCompatibleWithAnyFork } from './actions/evmmap'
 
 export function RunTabUI(props: RunTabProps) {
   const { plugin } = props
@@ -107,45 +107,34 @@ export function RunTabUI(props: RunTabProps) {
   const getCompilerDetails = async () => await checkEvmChainCompatibility()
 
   const returnCompatibleChain = async (evmVersion: HardFork, targetChainId: number) => {
-    return getCompatibleChain(evmVersion ?? 'cancun', targetChainId)
+    return getCompatibleChain(evmVersion ?? 'paris', targetChainId) // using paris evm as a default fallback version
   }
 
-  const checkEvmChainCompatibilityOkFunction = async (targetChainId: number, fetchDetails: any) => {
+  const checkEvmChainCompatibilityOkFunction = async (fetchDetails: ChainCompatibleInfo) => {
     const compilerParams = {
-      evmVersion: 'paris',
+      evmVersion: fetchDetails.evmVersion,
       optimize: false,
       language: 'Solidity',
-      runs: 200,
-      version: '0.8.27+commit.40a35a09'
+      runs: '200',
+      version: fetchDetails.minCompilerVersion
     }
     await plugin.call('solidity', 'setCompilerConfig', compilerParams)
-    const compilerState = await plugin.call('solidity', 'getCompilerState')
-    console.log('compilerState', compilerState)
     const currentFile = await plugin.call('fileManager', 'getCurrentFile')
     await plugin.call('solidity', 'compile', currentFile)
   }
 
-  const checkEvmChainCompatibilityCancelFunction = async (targetChainId: number, fetchDetails: any, currentFile: string) => {
-    () => {
-      console.log('cancel')
-    }
-  }
-
   const checkEvmChainCompatibility = async () => {
-    const isVm = await plugin.call('blockchain', 'getProvider') // vms are exempt from this treatment
-    const fetchDetails = await plugin.call('solidity', 'getCompilerQueryParameters') //compiler details including evmVersion
-    console.log('isVm', isVm)
-    if (!isVm.startsWith('vm')) {
+    const isVm = await plugin.call('blockchain', 'getProvider')
+    const fetchDetails = await plugin.call('solidity', 'getCompilerQueryParameters')
+    const compilerState = await plugin.call('solidity', 'getCompilerState')
+    console.log('compilerState', compilerState)
+    console.log('runTab', runTab)
+    if (!isVm.startsWith('vm') && compilerState.target !== null) { //vms are exempt from this treatment & if no contract file is open, don't do anything
       const targetChainId = runTab.chainId ? parseInt(runTab.chainId) : runTab.chainId
-      console.log('targetChainId', runTab.chainId)
-
       const IsCompatible = isChainCompatible(fetchDetails.evmVersion ?? 'cancun', targetChainId)
-      console.log('evmVersion matches everywhere', fetchDetails.evmVersion)
-      console.log('compiler stuff', fetchDetails)
-      console.log('chain is compatible', IsCompatible)
-      const currentFile = await plugin.call('fileManager', 'getCurrentFile')
       if (!IsCompatible) {
-        console.log('chain is undefined')
+        const chain = await returnCompatibleChain(fetchDetails.evmVersion, targetChainId)
+        console.log('chain obtained', { chain, targetChainId, fetchDetails })
         //show modal
         plugin.call('notification', 'modal', {
           id: 'evm-chainId-incompatible',
@@ -161,8 +150,8 @@ export function RunTabUI(props: RunTabProps) {
           modalType: 'modal',
           okLabel: 'Switch EVM and Recompile',
           cancelLabel: 'Cancel',
-          okFn: checkEvmChainCompatibilityOkFunction,
-          cancelFn: checkEvmChainCompatibilityCancelFunction
+          okFn: () => checkEvmChainCompatibilityOkFunction(chain),
+          cancelFn: () => {}
         })
       }
     }
@@ -351,6 +340,7 @@ export function RunTabUI(props: RunTabProps) {
             networkName={runTab.networkName}
             personalMode={runTab.personalMode}
             selectExEnv={runTab.selectExEnv}
+            EvaluateEnvironmentSelection={checkEvmChainCompatibility}
             accounts={runTab.accounts}
             setAccount={setAccountAddress}
             setUnit={setUnitValue}
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 b7edc0c64c..e95b6de359 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -125,6 +125,7 @@ export interface RunTabState {
 export interface SettingsProps {
   runTabPlugin: RunTab,
   selectExEnv: string,
+  EvaluateEnvironmentSelection: any
   accounts: {
     loadedAccounts: Record<string, any>,
     selectedAccount: string,
@@ -159,6 +160,7 @@ export interface SettingsProps {
 }
 
 export interface EnvironmentProps {
+  checkSelectionCorrectness: any
   runTabPlugin: RunTab,
   selectedEnv: string,
   providers: {

From 6b79df94c4cc23319583ad64230d4f378b7d1b65 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 1 Nov 2024 11:59:49 +0100
Subject: [PATCH 12/27] fix function

---
 .../run-tab/src/lib/components/environment.tsx   | 16 ++--------------
 libs/remix-ui/run-tab/src/lib/run-tab.tsx        |  6 ++----
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/environment.tsx b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
index f5d3530f63..5abaf34d8c 100644
--- a/libs/remix-ui/run-tab/src/lib/components/environment.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
@@ -11,16 +11,6 @@ export function EnvironmentUI(props: EnvironmentProps) {
   Object.entries(props.providers.providerList.filter((provider) => { return provider.isInjected }))
   Object.entries(props.providers.providerList.filter((provider) => { return !(provider.isVM || provider.isInjected) }))
 
-  const EvaluateSelectionForCorrectness = async () => {
-    // if the evmVersion is not provided in the url, we use the default value
-    // and the default would be the latest evmFork, which is now cancun.
-    // checking both url and compiler details
-    const url = window.location.href
-    const regVersion = url.match(/evmVersion=([a-zA-Z]+)/)?.[1]
-    const fetched = await props.checkSelectionCorrectness()
-    return { regVersion, fetched }
-  }
-
   const handleChangeExEnv = (env: string) => {
     const provider = props.providers.providerList.find((exEnv) => exEnv.name === env)
     const context = provider.name
@@ -76,12 +66,10 @@ export function EnvironmentUI(props: EnvironmentProps) {
             { (props.providers.providerList.filter((provider) => { return provider.isInjected })).map(({ name, displayName }) => (
               <Dropdown.Item
                 key={name}
-                onClick={() => {
+                onClick={async () => {
+                  await props.checkSelectionCorrectness()
                   handleChangeExEnv(name)
                 }}
-                onSelect={() => {
-                  EvaluateSelectionForCorrectness()
-                }}
                 data-id={`dropdown-item-${name}`}
               >
                 <span className="">
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 d23cc3367b..f8d5d122bf 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -124,12 +124,10 @@ export function RunTabUI(props: RunTabProps) {
   }
 
   const checkEvmChainCompatibility = async () => {
-    const isVm = await plugin.call('blockchain', 'getProvider')
     const fetchDetails = await plugin.call('solidity', 'getCompilerQueryParameters')
     const compilerState = await plugin.call('solidity', 'getCompilerState')
-    console.log('compilerState', compilerState)
-    console.log('runTab', runTab)
-    if (!isVm.startsWith('vm') && compilerState.target !== null) { //vms are exempt from this treatment & if no contract file is open, don't do anything
+    // if no contract file is open, don't do anything
+    if (compilerState.target !== null) {
       const targetChainId = runTab.chainId ? parseInt(runTab.chainId) : runTab.chainId
       const IsCompatible = isChainCompatible(fetchDetails.evmVersion ?? 'cancun', targetChainId)
       if (!IsCompatible) {

From 342d1f6d49cb6b73884a2bdc612d488f8000e7e6 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 1 Nov 2024 14:45:30 +0100
Subject: [PATCH 13/27] remove redundant state. Revert error message

---
 libs/remix-lib/src/execution/txRunnerWeb3.ts | 2 +-
 libs/remix-ui/run-tab/src/lib/run-tab.tsx    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts
index 6a7126dc5c..b2c46feff4 100644
--- a/libs/remix-lib/src/execution/txRunnerWeb3.ts
+++ b/libs/remix-lib/src/execution/txRunnerWeb3.ts
@@ -166,7 +166,7 @@ export class TxRunnerWeb3 {
         .catch(err => {
           if (err && err.error && err.error.indexOf('Invalid JSON RPC response') !== -1) {
             // // @todo(#378) this should be removed when https://github.com/WalletConnect/walletconnect-monorepo/issues/334 is fixed
-            callback(new Error('Gas estimation failed because of an unknown internal error. This indicates that the transaction could fail.'))
+            callback(new Error('Gas estimation failed because of an unknown internal error. This may indicated that the transaction will fail.'))
             return
           }
           err = network.name === 'VM' ? null : err // just send the tx if "VM"
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 f8d5d122bf..2e87d1cbf6 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -86,7 +86,6 @@ export function RunTabUI(props: RunTabProps) {
   const REACT_API = { runTab }
   const currentfile = plugin.config.get('currentFile')
   const [solcVersion, setSolcVersion] = useState<{version: string, canReceive: boolean}>({ version: '', canReceive: true })
-  const [chainEvmCompat, setChainEvmCompat] = useState()
 
   const getVersion = () => {
     let version = '0.8.25'

From 7fd373e03d4b61c4a89c018bbfd4f1fb3ea10c3d Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 1 Nov 2024 22:32:30 +0100
Subject: [PATCH 14/27] fix e2e failing

---
 .../run-tab/src/lib/actions/evmmap.ts         | 45 ++++++++-----
 .../src/lib/components/contractDropdownUI.tsx |  1 +
 .../src/lib/components/contractGUI.tsx        |  1 +
 .../src/lib/components/environment.tsx        |  1 -
 .../src/lib/components/universalDappUI.tsx    |  1 +
 libs/remix-ui/run-tab/src/lib/run-tab.tsx     | 64 +++++++++++--------
 libs/remix-ui/run-tab/src/lib/types/index.ts  |  2 +
 7 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
index 672de51b5f..00d5242fe1 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -41,7 +41,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59141, name: "Linea Testnet" },
       { id: 421614, name: "Arbitrum Sepolia" },
       { id: 534352, name: "Scroll" },
-      { id: 11155111, name: "Sepolia" }
+      // { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.8.24+commit.e11b9ed9",
     evmVersion: 'cancun'
@@ -73,7 +73,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59902, name: "Metis Sepolia Testnet" },
       { id: 421614, name: "Arbitrum Sepolia" },
       { id: 534352, name: "Scroll" },
-      { id: 11155111, name: "Sepolia" },
+      // { id: 11155111, name: "Sepolia" },
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
     ],
@@ -109,7 +109,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59902, name: "Metis Sepolia Testnet" },
       { id: 421614, name: "Arbitrum Sepolia" },
       { id: 534352, name: "Scroll" },
-      { id: 11155111, name: "Sepolia" },
+      // { id: 11155111, name: "Sepolia" },
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
     ],
@@ -132,7 +132,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 42220, name: "Celo Mainnet" },
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
-      { id: 11155111, name: "Sepolia" },
+      // { id: 11155111, name: "Sepolia" },
     ],
     minCompilerVersion: "0.8.7+commit.e28d00a7",
     evmVersion: 'london'
@@ -153,7 +153,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 42220, name: "Celo Mainnet" },
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
-      { id: 11155111, name: "Sepolia" }
+      // { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.8.5+commit.a4f2e591",
     evmVersion: 'berlin'
@@ -174,7 +174,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 42220, name: "Celo Mainnet" },
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
-      { id: 11155111, name: "Sepolia" }
+      // { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.5.14+commit.01f1aaa4",
     evmVersion: 'istanbul'
@@ -183,7 +183,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
-      { id: 11155111, name: "Sepolia" }
+      // { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.5.5+commit.47a71e8f",
     evmVersion: 'petersburg'
@@ -192,7 +192,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
-      { id: 11155111, name: "Sepolia" }
+      // { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.5.5+commit.47a71e8f",
     evmVersion: 'constantinople'
@@ -222,7 +222,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
-      { id: 11155111, name: "Sepolia" }
+      // { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.1.2+commit.d0d36e3",
     evmVersion: 'homestead'
@@ -247,15 +247,26 @@ export function getCompatibleChain(
   fork: HardFork,
   chainId: number
 ): ChainCompatibleInfo | undefined {
-  const forkData = evmMap.get(fork)
-  if (!forkData) return undefined
+  // const forkData = evmMap.get(fork)
+  // if (!forkData) return undefined
+
+  // const compatibleChain = forkData.chainId.find(chain => chain.id === chainId)
+  // if (compatibleChain) {
+  //   return {
+  //     chain: compatibleChain,
+  //     minCompilerVersion: forkData.minCompilerVersion,
+  //     evmVersion: fork
+  //   }
+  // }
 
-  const compatibleChain = forkData.chainId.find(chain => chain.id === chainId)
-  if (compatibleChain) {
-    return {
-      chain: compatibleChain,
-      minCompilerVersion: forkData.minCompilerVersion,
-      evmVersion: fork
+  for (const [forkKey, forkData] of evmMap) {
+    const compatibleChain = forkData.chainId.find(chain => chain.id === chainId)
+    if (compatibleChain) {
+      return {
+        chain: compatibleChain,
+        minCompilerVersion: forkData.minCompilerVersion,
+        evmVersion: forkKey
+      }
     }
   }
 
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 a462ffe40c..3e00a401d4 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -482,6 +482,7 @@ export function ContractDropdownUI(props: ContractDropdownProps) {
                 solcVersion={props.solCompilerVersion}
                 setSolcVersion={props.setCompilerVersion}
                 getVersion={props.getCompilerVersion}
+                evmCheckComplete={props.evmCheckComplete}
               />
               <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 eed0eacf8b..09219fb465 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -175,6 +175,7 @@ export function ContractGUI(props: ContractGUIProps) {
   const handleActionClick = async () => {
     props.getVersion()
     await props.getCompilerDetails()
+    if (props.evmCheckComplete === false) return
     if (deployState.deploy) {
       const proxyInitializeString = getMultiValsString(initializeFields.current)
       props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
diff --git a/libs/remix-ui/run-tab/src/lib/components/environment.tsx b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
index 5abaf34d8c..a0428c42a1 100644
--- a/libs/remix-ui/run-tab/src/lib/components/environment.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
@@ -67,7 +67,6 @@ export function EnvironmentUI(props: EnvironmentProps) {
               <Dropdown.Item
                 key={name}
                 onClick={async () => {
-                  await props.checkSelectionCorrectness()
                   handleChangeExEnv(name)
                 }}
                 data-id={`dropdown-item-${name}`}
diff --git a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
index b4700a4b1c..321e4e29ae 100644
--- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
@@ -327,6 +327,7 @@ export function UniversalDappUI(props: UdappProps) {
                   <ContractGUI
                     getVersion={props.getVersion}
                     getCompilerDetails={props.getCompilerDetails}
+                    evmCheckComplete={false}
                     funcABI={funcABI}
                     clickCallBack={(valArray: {name: string; type: string}[], inputsValues: string) => {
                       runTransaction(lookupOnly, funcABI, valArray, inputsValues, index)
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 2e87d1cbf6..1a687fa329 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line no-use-before-define
-import React, { Fragment, useEffect, useReducer, useState } from 'react'
+import React, { Fragment, useCallback, useEffect, useReducer, useState } from 'react'
 import semver from 'semver'
 import { FormattedMessage } from 'react-intl'
 import { ModalDialog } from '@remix-ui/modal-dialog'
@@ -86,6 +86,7 @@ export function RunTabUI(props: RunTabProps) {
   const REACT_API = { runTab }
   const currentfile = plugin.config.get('currentFile')
   const [solcVersion, setSolcVersion] = useState<{version: string, canReceive: boolean}>({ version: '', canReceive: true })
+  const [evmCheckComplete, setEvmCheckComplete] = useState(false)
 
   const getVersion = () => {
     let version = '0.8.25'
@@ -106,7 +107,9 @@ export function RunTabUI(props: RunTabProps) {
   const getCompilerDetails = async () => await checkEvmChainCompatibility()
 
   const returnCompatibleChain = async (evmVersion: HardFork, targetChainId: number) => {
-    return getCompatibleChain(evmVersion ?? 'paris', targetChainId) // using paris evm as a default fallback version
+    const result = getCompatibleChain(evmVersion ?? 'paris', targetChainId) // using paris evm as a default fallback version
+    console.log('result', result)
+    return result
   }
 
   const checkEvmChainCompatibilityOkFunction = async (fetchDetails: ChainCompatibleInfo) => {
@@ -125,31 +128,41 @@ export function RunTabUI(props: RunTabProps) {
   const checkEvmChainCompatibility = async () => {
     const fetchDetails = await plugin.call('solidity', 'getCompilerQueryParameters')
     const compilerState = await plugin.call('solidity', 'getCompilerState')
+
     // if no contract file is open, don't do anything
-    if (compilerState.target !== null) {
-      const targetChainId = runTab.chainId ? parseInt(runTab.chainId) : runTab.chainId
-      const IsCompatible = isChainCompatible(fetchDetails.evmVersion ?? 'cancun', targetChainId)
-      if (!IsCompatible) {
-        const chain = await returnCompatibleChain(fetchDetails.evmVersion, targetChainId)
-        console.log('chain obtained', { chain, targetChainId, fetchDetails })
+    if (compilerState.target !== null && !runTab.networkName.toLowerCase().includes('vm')) {
+      const targetChainId = runTab.chainId
+      const ideDefault = fetchDetails && fetchDetails.evmVersion !== null ? fetchDetails.evmVersion : 'cancun'
+      console.log(ideDefault)
+      const IsCompatible = isChainCompatible(ideDefault, targetChainId)
+      const chain = await returnCompatibleChain(ideDefault, targetChainId)
+      if (chain === undefined) {
+        //show modal
+        await plugin.call('notification', 'alert', { id: 'evm-chainId-error', message: 'No compatible chain found for the selected EVM version.', title: 'Error' })
+        return
+      } else {
+        setEvmCheckComplete(true)
+        console.log('check the things', { chain, fetchDetails, compilerState, targetChainId, runTab })
+        if (!IsCompatible) {
         //show modal
-        plugin.call('notification', 'modal', {
-          id: 'evm-chainId-incompatible',
-          title: 'Incompatible EVM - ChainId Detected',
-          message: <div className="px-3">
-            <p>The selected chain is not compatible with the selected EVM version. Please select a one of the options below.</p>
-            <ul className="px-3">
-              <li>Have Remix switch to a compatible EVM version for this chain and recompile the contract.</li>
-              <li>Cancel to keep the current EVM version.</li>
-            </ul>
-            <p>To manually change the EVM version, go to the Advanced Configurations section of the Solidity compiler.</p>
-          </div>,
-          modalType: 'modal',
-          okLabel: 'Switch EVM and Recompile',
-          cancelLabel: 'Cancel',
-          okFn: () => checkEvmChainCompatibilityOkFunction(chain),
-          cancelFn: () => {}
-        })
+          plugin.call('notification', 'modal', {
+            id: 'evm-chainId-incompatible',
+            title: 'Incompatible EVM - ChainId Detected',
+            message: <div className="px-3">
+              <p>The selected chain is not compatible with the selected EVM version. Please select a one of the options below.</p>
+              <ul className="px-3">
+                <li>Have Remix switch to a compatible EVM version for this chain and recompile the contract.</li>
+                <li>Cancel to keep the current EVM version.</li>
+              </ul>
+              <p>To manually change the EVM version, go to the Advanced Configurations section of the Solidity compiler.</p>
+            </div>,
+            modalType: 'modal',
+            okLabel: 'Switch EVM and Recompile',
+            cancelLabel: 'Cancel',
+            okFn: () => checkEvmChainCompatibilityOkFunction(chain),
+            cancelFn: () => {}
+          })
+        }
       }
     }
   }
@@ -386,6 +399,7 @@ export function RunTabUI(props: RunTabProps) {
             setCompilerVersion={setSolcVersion}
             getCompilerVersion={getVersion}
             getCompilerDetails={getCompilerDetails}
+            evmCheckComplete={evmCheckComplete}
           />
           <RecorderUI
             plugin={plugin}
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 e95b6de359..7c17aebb60 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -233,6 +233,7 @@ export type MainnetPrompt = (
 
 export interface ContractDropdownProps {
   getCompilerDetails: () => Promise<any>
+  evmCheckComplete: boolean,
   selectedAccount: string,
   exEnvironment: string,
   contracts: {
@@ -380,6 +381,7 @@ export interface DeployOptions {
 
 export interface ContractGUIProps {
   getCompilerDetails: () => Promise<any>
+  evmCheckComplete: boolean,
   title?: string,
   funcABI: FuncABI,
   inputs: string,

From d45b9f45340a508226c5635e01bf4b0777a30bbc Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 1 Nov 2024 22:33:07 +0100
Subject: [PATCH 15/27] clean console.log

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

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 1a687fa329..5d1d1ef9c3 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -108,7 +108,6 @@ export function RunTabUI(props: RunTabProps) {
 
   const returnCompatibleChain = async (evmVersion: HardFork, targetChainId: number) => {
     const result = getCompatibleChain(evmVersion ?? 'paris', targetChainId) // using paris evm as a default fallback version
-    console.log('result', result)
     return result
   }
 
@@ -133,7 +132,6 @@ export function RunTabUI(props: RunTabProps) {
     if (compilerState.target !== null && !runTab.networkName.toLowerCase().includes('vm')) {
       const targetChainId = runTab.chainId
       const ideDefault = fetchDetails && fetchDetails.evmVersion !== null ? fetchDetails.evmVersion : 'cancun'
-      console.log(ideDefault)
       const IsCompatible = isChainCompatible(ideDefault, targetChainId)
       const chain = await returnCompatibleChain(ideDefault, targetChainId)
       if (chain === undefined) {
@@ -142,7 +140,6 @@ export function RunTabUI(props: RunTabProps) {
         return
       } else {
         setEvmCheckComplete(true)
-        console.log('check the things', { chain, fetchDetails, compilerState, targetChainId, runTab })
         if (!IsCompatible) {
         //show modal
           plugin.call('notification', 'modal', {

From fc20cf9117764ae73c73adedb6317cac22c53692 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Sat, 2 Nov 2024 00:02:43 +0100
Subject: [PATCH 16/27] fix props. fix vm environments

---
 .../run-tab/src/lib/components/contractDropdownUI.tsx       | 2 ++
 libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx    | 2 +-
 .../run-tab/src/lib/components/instanceContainerUI.tsx      | 1 +
 libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx     | 5 -----
 .../remix-ui/run-tab/src/lib/components/universalDappUI.tsx | 2 ++
 libs/remix-ui/run-tab/src/lib/run-tab.tsx                   | 3 +++
 libs/remix-ui/run-tab/src/lib/types/index.ts                | 6 ++++++
 7 files changed, 15 insertions(+), 6 deletions(-)

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 3e00a401d4..5945e0e126 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -483,6 +483,8 @@ export function ContractDropdownUI(props: ContractDropdownProps) {
                 setSolcVersion={props.setCompilerVersion}
                 getVersion={props.getCompilerVersion}
                 evmCheckComplete={props.evmCheckComplete}
+                plugin={props.plugin}
+                runTabState={props.runTabState}
               />
               <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 09219fb465..8e2e0330a9 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -175,7 +175,7 @@ export function ContractGUI(props: ContractGUIProps) {
   const handleActionClick = async () => {
     props.getVersion()
     await props.getCompilerDetails()
-    if (props.evmCheckComplete === false) return
+    if (props.evmCheckComplete === false && !props.runTabState.selectExEnv.toLowerCase().includes('vm-')) return
     if (deployState.deploy) {
       const proxyInitializeString = getMultiValsString(initializeFields.current)
       props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
diff --git a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
index f1ef7ae6b8..f562330ce6 100644
--- a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
@@ -63,6 +63,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
                 solcVersion={props.solcVersion}
                 getVersion={props.getVersion}
                 getCompilerDetails={props.getCompilerDetails}
+                runTabState={props.runTabState}
               />
             )
           })}
diff --git a/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx b/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
index f7894042bd..12a7da58dd 100644
--- a/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
@@ -10,11 +10,6 @@ import { ValueUI } from './value'
 export function SettingsUI(props: SettingsProps) {
   //   this._deps.config.events.on('settings/personal-mode_changed', this.onPersonalChange.bind(this))
 
-  useEffect(() => {
-    // listen for chainId change on window.ethereum and call EvaluateEnvironmentSelection
-    // (window as any).ethereum?.on('chainChanged', console.log('metamask did something')) //props.EvaluateEnvironmentSelection)
-  }, [])
-
   return (
     <div className="udapp_settings">
       <EnvironmentUI runTabPlugin={props.runTabPlugin} selectedEnv={props.selectExEnv} providers={props.providers} setExecutionContext={props.setExecutionContext} checkSelectionCorrectness={props.EvaluateEnvironmentSelection} />
diff --git a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
index 321e4e29ae..18ed81d463 100644
--- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
@@ -328,6 +328,8 @@ export function UniversalDappUI(props: UdappProps) {
                     getVersion={props.getVersion}
                     getCompilerDetails={props.getCompilerDetails}
                     evmCheckComplete={false}
+                    plugin={props.plugin}
+                    runTabState={props.runTabState}
                     funcABI={funcABI}
                     clickCallBack={(valArray: {name: string; type: string}[], inputsValues: string) => {
                       runTransaction(lookupOnly, funcABI, valArray, inputsValues, index)
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 5d1d1ef9c3..f8bf41c447 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -397,6 +397,8 @@ export function RunTabUI(props: RunTabProps) {
             getCompilerVersion={getVersion}
             getCompilerDetails={getCompilerDetails}
             evmCheckComplete={evmCheckComplete}
+            plugin={plugin}
+            runTabState={runTab}
           />
           <RecorderUI
             plugin={plugin}
@@ -412,6 +414,7 @@ export function RunTabUI(props: RunTabProps) {
           <InstanceContainerUI
             plugin={plugin}
             getCompilerDetails={getCompilerDetails}
+            runTabState={runTab}
             instances={runTab.instances}
             clearInstances={removeInstances}
             unpinInstance={unpinPinnedInstance}
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 7c17aebb60..2be96aed4a 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -234,6 +234,8 @@ export type MainnetPrompt = (
 export interface ContractDropdownProps {
   getCompilerDetails: () => Promise<any>
   evmCheckComplete: boolean,
+  plugin: RunTab,
+  runTabState: RunTabState
   selectedAccount: string,
   exEnvironment: string,
   contracts: {
@@ -299,6 +301,7 @@ export interface RecorderProps {
 
 export interface InstanceContainerProps {
   getCompilerDetails: () => Promise<any>
+  runTabState: RunTabState
   instances: {
     instanceList: {
       contractData?: ContractData,
@@ -382,6 +385,8 @@ export interface DeployOptions {
 export interface ContractGUIProps {
   getCompilerDetails: () => Promise<any>
   evmCheckComplete: boolean,
+  plugin: RunTab,
+  runTabState: RunTabState
   title?: string,
   funcABI: FuncABI,
   inputs: string,
@@ -422,6 +427,7 @@ export interface MainnetProps {
 
 export interface UdappProps {
   getCompilerDetails: () => Promise<any>
+  runTabState: RunTabState
   instance: {
     contractData?: ContractData,
     address: string,

From 9c0433f9c591663d2b37e6286916fda9f05807a1 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Sat, 2 Nov 2024 00:52:29 +0100
Subject: [PATCH 17/27] fix error notification to show in terminal

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

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 f8bf41c447..a210aa7dbb 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -136,7 +136,7 @@ export function RunTabUI(props: RunTabProps) {
       const chain = await returnCompatibleChain(ideDefault, targetChainId)
       if (chain === undefined) {
         //show modal
-        await plugin.call('notification', 'alert', { id: 'evm-chainId-error', message: 'No compatible chain found for the selected EVM version.', title: 'Error' })
+        plugin.call('terminal', 'log', { type: 'log', value: 'No compatible chain found for the selected EVM version.' })
         return
       } else {
         setEvmCheckComplete(true)

From 2b052f8e053733f37b127d93ed15dec442d4af73 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 4 Nov 2024 13:13:58 +0100
Subject: [PATCH 18/27] fix external provider failure

---
 .../run-tab/src/lib/actions/evmmap.ts         |  29 ++--
 .../src/lib/components/contractGUI.tsx        | 144 ++++++++++++------
 libs/remix-ui/run-tab/src/lib/run-tab.tsx     |   7 +-
 libs/remix-ui/run-tab/src/lib/types/index.ts  |   9 +-
 4 files changed, 119 insertions(+), 70 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
index 00d5242fe1..2551ac12c3 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -41,7 +41,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59141, name: "Linea Testnet" },
       { id: 421614, name: "Arbitrum Sepolia" },
       { id: 534352, name: "Scroll" },
-      // { id: 11155111, name: "Sepolia" }
+      { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.8.24+commit.e11b9ed9",
     evmVersion: 'cancun'
@@ -73,7 +73,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59902, name: "Metis Sepolia Testnet" },
       { id: 421614, name: "Arbitrum Sepolia" },
       { id: 534352, name: "Scroll" },
-      // { id: 11155111, name: "Sepolia" },
+      { id: 11155111, name: "Sepolia" },
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
     ],
@@ -109,7 +109,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 59902, name: "Metis Sepolia Testnet" },
       { id: 421614, name: "Arbitrum Sepolia" },
       { id: 534352, name: "Scroll" },
-      // { id: 11155111, name: "Sepolia" },
+      { id: 11155111, name: "Sepolia" },
       { id: 11155420, name: "Optimism Sepolia Testnet" },
       { id: 1666600000, name: "Harmony Mainnet Shard 0" }
     ],
@@ -132,7 +132,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 42220, name: "Celo Mainnet" },
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
-      // { id: 11155111, name: "Sepolia" },
+      { id: 11155111, name: "Sepolia" },
     ],
     minCompilerVersion: "0.8.7+commit.e28d00a7",
     evmVersion: 'london'
@@ -153,7 +153,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 42220, name: "Celo Mainnet" },
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
-      // { id: 11155111, name: "Sepolia" }
+      { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.8.5+commit.a4f2e591",
     evmVersion: 'berlin'
@@ -174,7 +174,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 42220, name: "Celo Mainnet" },
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
-      // { id: 11155111, name: "Sepolia" }
+      { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.5.14+commit.01f1aaa4",
     evmVersion: 'istanbul'
@@ -183,7 +183,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
-      // { id: 11155111, name: "Sepolia" }
+      { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.5.5+commit.47a71e8f",
     evmVersion: 'petersburg'
@@ -192,7 +192,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
-      // { id: 11155111, name: "Sepolia" }
+      { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.5.5+commit.47a71e8f",
     evmVersion: 'constantinople'
@@ -222,7 +222,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
     chainId: [
       { id: 1, name: "Ethereum Mainnet" },
       { id: 5, name: "Goerli" },
-      // { id: 11155111, name: "Sepolia" }
+      { id: 11155111, name: "Sepolia" }
     ],
     minCompilerVersion: "0.1.2+commit.d0d36e3",
     evmVersion: 'homestead'
@@ -247,17 +247,6 @@ export function getCompatibleChain(
   fork: HardFork,
   chainId: number
 ): ChainCompatibleInfo | undefined {
-  // const forkData = evmMap.get(fork)
-  // if (!forkData) return undefined
-
-  // const compatibleChain = forkData.chainId.find(chain => chain.id === chainId)
-  // if (compatibleChain) {
-  //   return {
-  //     chain: compatibleChain,
-  //     minCompilerVersion: forkData.minCompilerVersion,
-  //     evmVersion: fork
-  //   }
-  // }
 
   for (const [forkKey, forkData] of evmMap) {
     const compatibleChain = forkData.chainId.find(chain => chain.id === chainId)
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 8e2e0330a9..da49a73978 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -174,56 +174,112 @@ export function ContractGUI(props: ContractGUIProps) {
 
   const handleActionClick = async () => {
     props.getVersion()
-    await props.getCompilerDetails()
-    if (props.evmCheckComplete === false && !props.runTabState.selectExEnv.toLowerCase().includes('vm-')) return
-    if (deployState.deploy) {
-      const proxyInitializeString = getMultiValsString(initializeFields.current)
-      props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
-    } else if (deployState.upgrade) {
-      if (proxyAddress === '') {
-        setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError1' }))
-      } else {
-        const isValidProxyAddress = await props.isValidProxyAddress(proxyAddress)
-        if (isValidProxyAddress) {
-          setProxyAddressError('')
-          const upgradeReport: any = await props.isValidProxyUpgrade(proxyAddress)
-          if (upgradeReport.ok) {
-            !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
-          } else {
-            if (upgradeReport.warning) {
-              props.modal(
-                'Proxy Upgrade Warning',
-                unavailableProxyLayoutMsg(),
-                'Proceed',
-                () => {
-                  !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
-                },
-                'Cancel',
-                () => {},
-                'btn-warning',
-                'btn-secondary'
-              )
+
+    if (!props.runTabState.selectExEnv.toLowerCase().includes('vm-') || !props.runTabState.selectExEnv.toLowerCase().includes('basic-http-provider')) {
+      const status = await props.getCompilerDetails()
+      if (status === 'Failed') {
+        props.plugin.call('terminal', 'log', { type: 'log', value: 'Consider opening an issue to update our internal store with your desired chainId.' })
+        return
+      }
+      if (deployState.deploy) {
+        const proxyInitializeString = getMultiValsString(initializeFields.current)
+        props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
+      } else if (deployState.upgrade) {
+        if (proxyAddress === '') {
+          setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError1' }))
+        } else {
+          const isValidProxyAddress = await props.isValidProxyAddress(proxyAddress)
+          if (isValidProxyAddress) {
+            setProxyAddressError('')
+            const upgradeReport: any = await props.isValidProxyUpgrade(proxyAddress)
+            if (upgradeReport.ok) {
+              !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
             } else {
-              props.modal(
-                'Proxy Upgrade Error',
-                upgradeReportMsg(upgradeReport),
-                'Continue anyway ',
-                () => {
-                  !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
-                },
-                'Cancel',
-                () => {},
-                'btn-warning',
-                'btn-secondary'
-              )
+              if (upgradeReport.warning) {
+                props.modal(
+                  'Proxy Upgrade Warning',
+                  unavailableProxyLayoutMsg(),
+                  'Proceed',
+                  () => {
+                    !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
+                  },
+                  'Cancel',
+                  () => {},
+                  'btn-warning',
+                  'btn-secondary'
+                )
+              } else {
+                props.modal(
+                  'Proxy Upgrade Error',
+                  upgradeReportMsg(upgradeReport),
+                  'Continue anyway ',
+                  () => {
+                    !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
+                  },
+                  'Cancel',
+                  () => {},
+                  'btn-warning',
+                  'btn-secondary'
+                )
+              }
             }
+          } else {
+            setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError2' }))
           }
-        } else {
-          setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError2' }))
         }
+      } else {
+        props.clickCallBack(props.funcABI.inputs, basicInput)
       }
     } else {
-      props.clickCallBack(props.funcABI.inputs, basicInput)
+      if (deployState.deploy) {
+        const proxyInitializeString = getMultiValsString(initializeFields.current)
+        props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
+      } else if (deployState.upgrade) {
+        if (proxyAddress === '') {
+          setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError1' }))
+        } else {
+          const isValidProxyAddress = await props.isValidProxyAddress(proxyAddress)
+          if (isValidProxyAddress) {
+            setProxyAddressError('')
+            const upgradeReport: any = await props.isValidProxyUpgrade(proxyAddress)
+            if (upgradeReport.ok) {
+              !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
+            } else {
+              if (upgradeReport.warning) {
+                props.modal(
+                  'Proxy Upgrade Warning',
+                  unavailableProxyLayoutMsg(),
+                  'Proceed',
+                  () => {
+                    !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
+                  },
+                  'Cancel',
+                  () => {},
+                  'btn-warning',
+                  'btn-secondary'
+                )
+              } else {
+                props.modal(
+                  'Proxy Upgrade Error',
+                  upgradeReportMsg(upgradeReport),
+                  'Continue anyway ',
+                  () => {
+                    !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
+                  },
+                  'Cancel',
+                  () => {},
+                  'btn-warning',
+                  'btn-secondary'
+                )
+              }
+            }
+          } else {
+            setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError2' }))
+          }
+        }
+      } else {
+        props.clickCallBack(props.funcABI.inputs, basicInput)
+      }
     }
   }
 
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 a210aa7dbb..835bf7aafd 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -58,6 +58,8 @@ import { ScenarioPrompt } from './components/scenario'
 import { setIpfsCheckedState, setRemixDActivated } from './actions/payload'
 import { ChainCompatibleInfo, getCompatibleChain, getCompatibleChains, HardFork, isChainCompatible, isChainCompatibleWithAnyFork } from './actions/evmmap'
 
+export type CheckStatus = 'Passed' | 'Failed'
+
 export function RunTabUI(props: RunTabProps) {
   const { plugin } = props
   const [focusModal, setFocusModal] = useState<Modal>({
@@ -129,7 +131,7 @@ export function RunTabUI(props: RunTabProps) {
     const compilerState = await plugin.call('solidity', 'getCompilerState')
 
     // if no contract file is open, don't do anything
-    if (compilerState.target !== null && !runTab.networkName.toLowerCase().includes('vm')) {
+    if (compilerState.target !== null) {
       const targetChainId = runTab.chainId
       const ideDefault = fetchDetails && fetchDetails.evmVersion !== null ? fetchDetails.evmVersion : 'cancun'
       const IsCompatible = isChainCompatible(ideDefault, targetChainId)
@@ -137,7 +139,7 @@ export function RunTabUI(props: RunTabProps) {
       if (chain === undefined) {
         //show modal
         plugin.call('terminal', 'log', { type: 'log', value: 'No compatible chain found for the selected EVM version.' })
-        return
+        return 'Failed'
       } else {
         setEvmCheckComplete(true)
         if (!IsCompatible) {
@@ -161,6 +163,7 @@ export function RunTabUI(props: RunTabProps) {
           })
         }
       }
+      return 'Passed'
     }
   }
 
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 2be96aed4a..103c918a12 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -4,6 +4,7 @@ import { ContractData, FuncABI, OverSizeLimit } from '@remix-project/core-plugin
 import { RunTab } from './run-tab'
 import { SolcInput, SolcOutput } from '@openzeppelin/upgrades-core'
 import { LayoutCompatibilityReport } from '@openzeppelin/upgrades-core/dist/storage/report'
+import { CheckStatus } from '../run-tab'
 export interface RunTabProps {
   plugin: RunTab,
   initialState?: RunTabState
@@ -232,7 +233,7 @@ export type MainnetPrompt = (
   ) => JSX.Element
 
 export interface ContractDropdownProps {
-  getCompilerDetails: () => Promise<any>
+  getCompilerDetails: () => Promise<CheckStatus>
   evmCheckComplete: boolean,
   plugin: RunTab,
   runTabState: RunTabState
@@ -300,7 +301,7 @@ export interface RecorderProps {
 }
 
 export interface InstanceContainerProps {
-  getCompilerDetails: () => Promise<any>
+  getCompilerDetails: () => Promise<CheckStatus>
   runTabState: RunTabState
   instances: {
     instanceList: {
@@ -383,7 +384,7 @@ export interface DeployOptions {
 }
 
 export interface ContractGUIProps {
-  getCompilerDetails: () => Promise<any>
+  getCompilerDetails: () => Promise<CheckStatus>
   evmCheckComplete: boolean,
   plugin: RunTab,
   runTabState: RunTabState
@@ -426,7 +427,7 @@ export interface MainnetProps {
 }
 
 export interface UdappProps {
-  getCompilerDetails: () => Promise<any>
+  getCompilerDetails: () => Promise<CheckStatus>
   runTabState: RunTabState
   instance: {
     contractData?: ContractData,

From 67cd165f166ae2738878101d68ca914e0e847a68 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 4 Nov 2024 13:32:27 +0100
Subject: [PATCH 19/27] fix condition

---
 .../run-tab/src/lib/components/contractGUI.tsx      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
index da49a73978..30ccf5ec25 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -175,12 +175,7 @@ export function ContractGUI(props: ContractGUIProps) {
   const handleActionClick = async () => {
     props.getVersion()
 
-    if (!props.runTabState.selectExEnv.toLowerCase().includes('vm-') || !props.runTabState.selectExEnv.toLowerCase().includes('basic-http-provider')) {
-      const status = await props.getCompilerDetails()
-      if (status === 'Failed') {
-        props.plugin.call('terminal', 'log', { type: 'log', value: 'Consider opening an issue to update our internal store with your desired chainId.' })
-        return
-      }
+    if (props.runTabState.selectExEnv.toLowerCase().startsWith('vm-') || props.runTabState.selectExEnv.toLowerCase().includes('basic-http-provider')) {
       if (deployState.deploy) {
         const proxyInitializeString = getMultiValsString(initializeFields.current)
         props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
@@ -231,6 +226,12 @@ export function ContractGUI(props: ContractGUIProps) {
         props.clickCallBack(props.funcABI.inputs, basicInput)
       }
     } else {
+      const status = await props.getCompilerDetails()
+      console.log('exenv', props.runTabState.selectExEnv)
+      if (status === 'Failed') {
+        props.plugin.call('terminal', 'log', { type: 'log', value: 'Consider opening an issue to update our internal store with your desired chainId.' })
+        return
+      }
       if (deployState.deploy) {
         const proxyInitializeString = getMultiValsString(initializeFields.current)
         props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])

From c95973d61a60b93514ab2204e41a819a0c49aef8 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 4 Nov 2024 16:01:32 +0100
Subject: [PATCH 20/27] fix groth zk test by adding pause

---
 apps/remix-ide-e2e/src/tests/circom.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
index 9ef2661f82..fb5e374ace 100644
--- a/apps/remix-ide-e2e/src/tests/circom.test.ts
+++ b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -195,7 +195,7 @@ module.exports = {
       .waitForElementPresent('[data-id="verticalIconsKindcircuit-compiler"]')
       .waitForElementVisible('[data-id="verticalIconsKindcircuit-compiler"]')
       .click('[data-id="play-editor"]')
-      .pause(7000)
+      .pause(15000)
       .journalLastChildIncludes('newZkey')
       .pause(25000)
       .journalLastChildIncludes('setup done.')

From 8988197d78c06a94abffdc5500febd671afd24ee Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 4 Nov 2024 16:12:27 +0100
Subject: [PATCH 21/27] revert

---
 apps/remix-ide-e2e/src/tests/circom.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
index fb5e374ace..cc2c3ddef3 100644
--- a/apps/remix-ide-e2e/src/tests/circom.test.ts
+++ b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -195,7 +195,7 @@ module.exports = {
       .waitForElementPresent('[data-id="verticalIconsKindcircuit-compiler"]')
       .waitForElementVisible('[data-id="verticalIconsKindcircuit-compiler"]')
       .click('[data-id="play-editor"]')
-      .pause(15000)
+      .pause(10000)
       .journalLastChildIncludes('newZkey')
       .pause(25000)
       .journalLastChildIncludes('setup done.')

From aa8dbb3520264cd5632304f7183dd4b7ef0484c6 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 4 Nov 2024 23:43:16 +0100
Subject: [PATCH 22/27] update fixes from @ryestew

---
 libs/remix-ui/run-tab/src/lib/actions/evmmap.ts | 2 ++
 libs/remix-ui/run-tab/src/lib/run-tab.tsx       | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
index 2551ac12c3..3e8c5a2873 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
@@ -37,6 +37,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 42161, name: "Arbitrum One" },
       { id: 42170, name: "Arbitrum Nova" },
       { id: 43114, name: "Avalanche C-Chain" },
+      { id: 44787, name: "Celo Alfajores Testnet" },
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
       { id: 421614, name: "Arbitrum Sepolia" },
@@ -68,6 +69,7 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
       { id: 2000, name: "Dogechain Mainnet" },
       { id: 42161, name: "Arbitrum One" },
       { id: 42170, name: "Arbitrum Nova" },
+      { id: 44787, name: "Celo Alfajores Testnet" },
       { id: 59144, name: "Linea Mainnet" },
       { id: 59141, name: "Linea Testnet" },
       { id: 59902, name: "Metis Sepolia Testnet" },
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 835bf7aafd..fa6b96a855 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -146,9 +146,9 @@ export function RunTabUI(props: RunTabProps) {
         //show modal
           plugin.call('notification', 'modal', {
             id: 'evm-chainId-incompatible',
-            title: 'Incompatible EVM - ChainId Detected',
+            title: 'Incompatible EVM for the selected chain',
             message: <div className="px-3">
-              <p>The selected chain is not compatible with the selected EVM version. Please select a one of the options below.</p>
+              <p>The selected chain is not compatible with the EVM version that the Solidity contract had been compiled with. Please select a one of the options below.</p>
               <ul className="px-3">
                 <li>Have Remix switch to a compatible EVM version for this chain and recompile the contract.</li>
                 <li>Cancel to keep the current EVM version.</li>

From 5c3f507c43a791162491c690867d35893822b531 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 5 Nov 2024 10:52:26 +0100
Subject: [PATCH 23/27] fix issues identified by @ryestew and @LianaHus

---
 .../src/lib/components/contractDropdownUI.tsx |   1 +
 .../src/lib/components/contractGUI.tsx        | 151 +++++++-----------
 libs/remix-ui/run-tab/src/lib/run-tab.tsx     |   3 +-
 libs/remix-ui/run-tab/src/lib/types/index.ts  |   8 +-
 4 files changed, 62 insertions(+), 101 deletions(-)

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 5945e0e126..212adea8ab 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -483,6 +483,7 @@ export function ContractDropdownUI(props: ContractDropdownProps) {
                 setSolcVersion={props.setCompilerVersion}
                 getVersion={props.getCompilerVersion}
                 evmCheckComplete={props.evmCheckComplete}
+                setEvmCheckComplete={props.setEvmCheckComplete}
                 plugin={props.plugin}
                 runTabState={props.runTabState}
               />
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 30ccf5ec25..71904b4850 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -172,114 +172,71 @@ export function ContractGUI(props: ContractGUIProps) {
     }
   }
 
-  const handleActionClick = async () => {
-    props.getVersion()
-
-    if (props.runTabState.selectExEnv.toLowerCase().startsWith('vm-') || props.runTabState.selectExEnv.toLowerCase().includes('basic-http-provider')) {
-      if (deployState.deploy) {
-        const proxyInitializeString = getMultiValsString(initializeFields.current)
-        props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
-      } else if (deployState.upgrade) {
-        if (proxyAddress === '') {
-          setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError1' }))
-        } else {
-          const isValidProxyAddress = await props.isValidProxyAddress(proxyAddress)
-          if (isValidProxyAddress) {
-            setProxyAddressError('')
-            const upgradeReport: any = await props.isValidProxyUpgrade(proxyAddress)
-            if (upgradeReport.ok) {
-              !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
+  const handleDeploy = async () => {
+    if (deployState.deploy) {
+      const proxyInitializeString = getMultiValsString(initializeFields.current)
+      props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
+    } else if (deployState.upgrade) {
+      if (proxyAddress === '') {
+        setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError1' }))
+      } else {
+        const isValidProxyAddress = await props.isValidProxyAddress(proxyAddress)
+        if (isValidProxyAddress) {
+          setProxyAddressError('')
+          const upgradeReport: any = await props.isValidProxyUpgrade(proxyAddress)
+          if (upgradeReport.ok) {
+            !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
+          } else {
+            if (upgradeReport.warning) {
+              props.modal(
+                'Proxy Upgrade Warning',
+                unavailableProxyLayoutMsg(),
+                'Proceed',
+                () => {
+                  !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
+                },
+                'Cancel',
+                () => {},
+                'btn-warning',
+                'btn-secondary'
+              )
             } else {
-              if (upgradeReport.warning) {
-                props.modal(
-                  'Proxy Upgrade Warning',
-                  unavailableProxyLayoutMsg(),
-                  'Proceed',
-                  () => {
-                    !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
-                  },
-                  'Cancel',
-                  () => {},
-                  'btn-warning',
-                  'btn-secondary'
-                )
-              } else {
-                props.modal(
-                  'Proxy Upgrade Error',
-                  upgradeReportMsg(upgradeReport),
-                  'Continue anyway ',
-                  () => {
-                    !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
-                  },
-                  'Cancel',
-                  () => {},
-                  'btn-warning',
-                  'btn-secondary'
-                )
-              }
+              props.modal(
+                'Proxy Upgrade Error',
+                upgradeReportMsg(upgradeReport),
+                'Continue anyway ',
+                () => {
+                  !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
+                },
+                'Cancel',
+                () => {},
+                'btn-warning',
+                'btn-secondary'
+              )
             }
-          } else {
-            setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError2' }))
           }
+        } else {
+          setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError2' }))
         }
-      } else {
-        props.clickCallBack(props.funcABI.inputs, basicInput)
       }
+    } else {
+      props.clickCallBack(props.funcABI.inputs, basicInput)
+    }
+  }
+
+  const handleActionClick = async () => {
+    props.getVersion()
+
+    if (props.runTabState.selectExEnv.toLowerCase().startsWith('vm-') || props.runTabState.selectExEnv.toLowerCase().includes('basic-http-provider')) {
+      await handleDeploy()
     } else {
       const status = await props.getCompilerDetails()
-      console.log('exenv', props.runTabState.selectExEnv)
       if (status === 'Failed') {
         props.plugin.call('terminal', 'log', { type: 'log', value: 'Consider opening an issue to update our internal store with your desired chainId.' })
         return
       }
-      if (deployState.deploy) {
-        const proxyInitializeString = getMultiValsString(initializeFields.current)
-        props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
-      } else if (deployState.upgrade) {
-        if (proxyAddress === '') {
-          setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError1' }))
-        } else {
-          const isValidProxyAddress = await props.isValidProxyAddress(proxyAddress)
-          if (isValidProxyAddress) {
-            setProxyAddressError('')
-            const upgradeReport: any = await props.isValidProxyUpgrade(proxyAddress)
-            if (upgradeReport.ok) {
-              !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
-            } else {
-              if (upgradeReport.warning) {
-                props.modal(
-                  'Proxy Upgrade Warning',
-                  unavailableProxyLayoutMsg(),
-                  'Proceed',
-                  () => {
-                    !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
-                  },
-                  'Cancel',
-                  () => {},
-                  'btn-warning',
-                  'btn-secondary'
-                )
-              } else {
-                props.modal(
-                  'Proxy Upgrade Error',
-                  upgradeReportMsg(upgradeReport),
-                  'Continue anyway ',
-                  () => {
-                    !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
-                  },
-                  'Cancel',
-                  () => {},
-                  'btn-warning',
-                  'btn-secondary'
-                )
-              }
-            }
-          } else {
-            setProxyAddressError(intl.formatMessage({ id: 'udapp.proxyAddressError2' }))
-          }
-        }
-      } else {
-        props.clickCallBack(props.funcABI.inputs, basicInput)
+      if (props.evmCheckComplete) {
+        await handleDeploy()
       }
     }
   }
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 fa6b96a855..9b1302e25a 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -124,6 +124,7 @@ export function RunTabUI(props: RunTabProps) {
     await plugin.call('solidity', 'setCompilerConfig', compilerParams)
     const currentFile = await plugin.call('fileManager', 'getCurrentFile')
     await plugin.call('solidity', 'compile', currentFile)
+    setEvmCheckComplete(true)
   }
 
   const checkEvmChainCompatibility = async () => {
@@ -141,7 +142,6 @@ export function RunTabUI(props: RunTabProps) {
         plugin.call('terminal', 'log', { type: 'log', value: 'No compatible chain found for the selected EVM version.' })
         return 'Failed'
       } else {
-        setEvmCheckComplete(true)
         if (!IsCompatible) {
         //show modal
           plugin.call('notification', 'modal', {
@@ -400,6 +400,7 @@ export function RunTabUI(props: RunTabProps) {
             getCompilerVersion={getVersion}
             getCompilerDetails={getCompilerDetails}
             evmCheckComplete={evmCheckComplete}
+            setEvmCheckComplete={setEvmCheckComplete}
             plugin={plugin}
             runTabState={runTab}
           />
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 103c918a12..f9ac19b6c9 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -1,4 +1,4 @@
-import { Ref } from 'react'
+import { Dispatch, Ref } from 'react'
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 import { ContractData, FuncABI, OverSizeLimit } from '@remix-project/core-plugin'
 import { RunTab } from './run-tab'
@@ -234,7 +234,8 @@ export type MainnetPrompt = (
 
 export interface ContractDropdownProps {
   getCompilerDetails: () => Promise<CheckStatus>
-  evmCheckComplete: boolean,
+  evmCheckComplete?: boolean,
+  setEvmCheckComplete?: Dispatch<React.SetStateAction<boolean>>,
   plugin: RunTab,
   runTabState: RunTabState
   selectedAccount: string,
@@ -385,7 +386,8 @@ export interface DeployOptions {
 
 export interface ContractGUIProps {
   getCompilerDetails: () => Promise<CheckStatus>
-  evmCheckComplete: boolean,
+  evmCheckComplete?: boolean,
+  setEvmCheckComplete?: React.Dispatch<React.SetStateAction<boolean>>,
   plugin: RunTab,
   runTabState: RunTabState
   title?: string,

From 7261e56be1a37aafb9cde763116ab6f0102652d6 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 5 Nov 2024 10:57:24 +0100
Subject: [PATCH 24/27] adjust default evm version label as per @LianaHus

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

diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
index 57e75f5149..10e6b32635 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -974,7 +974,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
               >
                 {compileTabLogic.evmVersions.map((version, index) => (
                   <option key={index} data-id={state.evmVersion === version ? 'selected' : ''} value={version}>
-                    {version}
+                    {version === 'default' ? `default (${compileTabLogic.evmVersions[index + 1]})` : version}
                   </option>
                 ))}
               </select>

From 43ba1e4418a68a360a667798007792e862af7047 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 5 Nov 2024 15:42:05 +0100
Subject: [PATCH 25/27] update messaging

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

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 9b1302e25a..79ee119a75 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -148,7 +148,7 @@ export function RunTabUI(props: RunTabProps) {
             id: 'evm-chainId-incompatible',
             title: 'Incompatible EVM for the selected chain',
             message: <div className="px-3">
-              <p>The selected chain is not compatible with the EVM version that the Solidity contract had been compiled with. Please select a one of the options below.</p>
+              <p>The smart contract has not been compiled with an EVM version that is compatible with the selected chain.</p>
               <ul className="px-3">
                 <li>Have Remix switch to a compatible EVM version for this chain and recompile the contract.</li>
                 <li>Cancel to keep the current EVM version.</li>

From dbf10882ec0cc2dce9e0e36c7a9adebb19ae8b0a Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 5 Nov 2024 23:46:41 +0100
Subject: [PATCH 26/27] fix toaster messaging.

---
 apps/remix-ide/src/app/tabs/compile-tab.js | 8 ++++++--
 apps/remix-ide/src/app/udapp/run-tab.tsx   | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 1fb7dea231..70f0d498a7 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -99,13 +99,17 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
    * This function is used by remix-plugin compiler API.
    * @param {object} settings {evmVersion, optimize, runs, version, language}
    */
-  setCompilerConfig (settings) {
+  async setCompilerConfig (settings) {
     super.setCompilerConfig(settings)
     this.renderComponent()
     // @todo(#2875) should use loading compiler return value to check whether the compiler is loaded instead of "setInterval"
     const value = JSON.stringify(settings, null, '\t')
+    let pluginInfo
+    pluginInfo = await this.call('udapp', 'showPluginDetails')
 
-    this.call('notification', 'toast', compilerConfigChangedToastMsg(this.currentRequest.from, value))
+    if (this.currentRequest.from === 'udapp') {
+      this.call('notification', 'toast', compilerConfigChangedToastMsg((pluginInfo ? pluginInfo.displayName : this.currentRequest.from ), value))
+    }
   }
 
   compile (fileName) {
diff --git a/apps/remix-ide/src/app/udapp/run-tab.tsx b/apps/remix-ide/src/app/udapp/run-tab.tsx
index bc811f8aff..b17d95b9c6 100644
--- a/apps/remix-ide/src/app/udapp/run-tab.tsx
+++ b/apps/remix-ide/src/app/udapp/run-tab.tsx
@@ -35,7 +35,8 @@ const profile = {
     'setEnvironmentMode',
     'clearAllInstances',
     'addInstance',
-    'resolveContractAndAddInstance'
+    'resolveContractAndAddInstance',
+    'showPluginDetails'
   ]
 }
 
@@ -87,6 +88,10 @@ export class RunTab extends ViewPlugin {
     })
   }
 
+  showPluginDetails() {
+    return profile
+  }
+
   async setEnvironmentMode(env) {
     const canCall = await this.askUserPermission('setEnvironmentMode', 'change the environment used')
     if (canCall) {

From 2536fb58acf449441b48f1224e70a1c8ba293301 Mon Sep 17 00:00:00 2001
From: Sr20dem <cryptoexch@yahoo.com>
Date: Sun, 3 Nov 2024 06:18:33 +0300
Subject: [PATCH 27/27] add some changes to the Russian translation

---
 apps/remix-ide/src/app/tabs/locales/ru/home.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/app/tabs/locales/ru/home.json b/apps/remix-ide/src/app/tabs/locales/ru/home.json
index 48044db76d..894148bb5a 100644
--- a/apps/remix-ide/src/app/tabs/locales/ru/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/ru/home.json
@@ -1,4 +1,5 @@
 {
+  "home.home": "Главная",
   "home.scamAlert": "Предупреждение о мошенничестве",
   "home.scamAlertText": "Единственный URL, который использует Remix, - это remix.ethereum.org",
   "home.scamAlertText2": "Остерегайтесь видеороликов, рекламирующих \"ботов-передовиков ликвидности\"",
@@ -6,6 +7,9 @@
   "home.learnMore": "Узнать больше",
   "home.here": "здесь",
   "home.featured": "Рекомендуемые",
+  "home.learnEthPromoTitle": "LearnEth: Учебники внутри Remix",
+  "home.learnEthPromoButton": "Начать обучение",
+  "home.learnEthPromoText": "Ознакомьтесь с уроками по Remix, Solidity и другим проектам Web3. Отлично подходит для всех уровней навыков.",
   "home.jumpIntoWeb3": "Перейти в WEB3",
   "home.jumpIntoWeb3More": "Подробнее",
   "home.jumpIntoWeb3Text": "Remix IDE является частью проекта Remix, широкий выбор инструментов которого, может быть использован для всего путешествия по разработке контракта пользователями любого уровня знаний. Узнайте больше на сайте проекта Remix.",
@@ -36,6 +40,7 @@
   "home.ozerc1155TemplateDesc": "Создайте ERC1155 токен, импортируя библиотеку OpenZeppelin.",
   "home.gnosisSafeMultisigTemplateDesc": "Создайте кошельки с мульти-подписью с использованием этого шаблона.",
   "home.zeroxErc20TemplateDesc": "Создайте токен ERC20, импортируя контракт с 0xProject.",
+  "home.learnEthPluginDesc": "Узнайте о Remix, Solidity и других проектах Web3.",
   "home.learn": "Обучение",
   "home.learnEth1": "Основы Remix",
   "home.learnEth1Desc": "Введение в интерфейс Remix-а и основные операции.",
@@ -65,5 +70,8 @@
   "home.resources": "Источники",
   "home.connectToLocalhost": "Подключиться к локальному хосту",
   "home.seeAllTutorials": "Посмотреть все уроки",
-  "home.maintainedByRemix": "Поддерживается Remix"
+  "home.maintainedByRemix": "Поддерживается Remix",
+  "home.gitCloneTooltip": "Клонировать репозиторий Github в новую рабочую область",
+  "home.gistTooltip": "Открыть репозиторий Gist",
+  "home.newFileTooltip": "Добавить новый файл в рабочую область"
 }