From 83f1338d18900440fc5ba58fdfae73dd4c7472e5 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 29 Oct 2024 09:46:28 +0100
Subject: [PATCH 01/82] popup panel

---
 apps/remix-ide/src/app.js                     |  5 +-
 .../src/app/components/popup-panel.tsx        | 69 +++++++++++++++++++
 .../src/app/plugins/remixAIPlugin.tsx         |  2 +-
 .../app/src/lib/remix-app/remix-app.tsx       |  1 +
 4 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 apps/remix-ide/src/app/components/popup-panel.tsx

diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index 796d354c5c..d9a4cf6f13 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -12,6 +12,7 @@ import { SidePanel } from './app/components/side-panel'
 import { StatusBar } from './app/components/status-bar'
 import { HiddenPanel } from './app/components/hidden-panel'
 import { PinnedPanel } from './app/components/pinned-panel'
+import { PopupPanel } from './app/components/popup-panel'
 import { VerticalIcons } from './app/components/vertical-icons'
 import { LandingPage } from './app/ui/landing-page/landing-page'
 import { MainPanel } from './app/components/main-panel'
@@ -445,6 +446,7 @@ class AppComponent {
     this.sidePanel = new SidePanel()
     this.hiddenPanel = new HiddenPanel()
     this.pinnedPanel = new PinnedPanel()
+    this.popupPanel = new PopupPanel()
 
     const pluginManagerComponent = new PluginManagerComponent(appManager, this.engine)
     const filePanel = new FilePanel(appManager, contentImport)
@@ -452,7 +454,7 @@ class AppComponent {
     const landingPage = new LandingPage(appManager, this.menuicons, fileManager, filePanel, contentImport)
     this.settings = new SettingsTab(Registry.getInstance().get('config').api, editor, appManager)
 
-    this.engine.register([this.menuicons, landingPage, this.hiddenPanel, this.sidePanel, this.statusBar, filePanel, pluginManagerComponent, this.settings, this.pinnedPanel])
+    this.engine.register([this.menuicons, landingPage, this.hiddenPanel, this.sidePanel, this.statusBar, filePanel, pluginManagerComponent, this.settings, this.pinnedPanel, this.popupPanel])
 
     // CONTENT VIEWS & DEFAULT PLUGINS
     const openZeppelinProxy = new OpenZeppelinProxy(blockchain)
@@ -535,6 +537,7 @@ class AppComponent {
     await this.appManager.activatePlugin(['statusBar'])
     await this.appManager.activatePlugin(['sidePanel']) // activating  host plugin separately
     await this.appManager.activatePlugin(['pinnedPanel'])
+    await this.appManager.activatePlugin(['popupPanel'])
     await this.appManager.activatePlugin(['home'])
     await this.appManager.activatePlugin(['settings', 'config'])
     await this.appManager.activatePlugin([
diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
new file mode 100644
index 0000000000..c91ab9644c
--- /dev/null
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -0,0 +1,69 @@
+import React from 'react' // eslint-disable-line
+import { AbstractPanel } from './panel'
+import { RemixPluginPanel } from '@remix-ui/panel'
+import packageJson from '../../../../../package.json'
+import { PluginViewWrapper } from '@remix-ui/helper'
+
+const profile = {
+  name: 'popupPanel',
+  displayName: 'Popup Panel',
+  description: 'Remix IDE popup panel',
+  version: packageJson.version,
+  methods: ['addView', 'removeView', 'showContent']
+}
+
+export class PopupPanel extends AbstractPanel {
+  element: HTMLDivElement
+  dispatch: React.Dispatch<any> = () => {}
+  constructor(config) {
+    super(profile)
+  }
+
+  setDispatch(dispatch: React.Dispatch<any>) {
+    this.dispatch = dispatch
+  }
+
+  onActivation() {
+    this.renderComponent()
+  }
+
+  focus(name) {
+    this.emit('focusChanged', name)
+    super.focus(name)
+    this.renderComponent()
+  }
+
+  addView(profile, view) {
+    super.addView(profile, view)
+    this.renderComponent()
+    this.showContent(profile.name) // should be handled by some click
+  }
+
+  removeView(profile) {
+    super.removeView(profile)
+    this.renderComponent()
+  }
+
+  async showContent(name) {
+    super.showContent(name)
+    this.renderComponent()
+  }
+
+  renderComponent() {
+    this.dispatch({
+      plugins: this.plugins
+    })
+  }
+
+  render() {
+    return (
+      <div style={{ height: '200', width: '200', position: 'fixed', bottom: 0, left: 0 }} data-id="popupPanelPluginsContainer">
+        <PluginViewWrapper plugin={this} />
+      </div>
+    )
+  }
+
+  updateComponent(state: any) {
+    return <RemixPluginPanel header={<></>} plugins={state.plugins} />
+  }
+}
diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
index d6d3c78a48..e307433c69 100644
--- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
@@ -21,7 +21,7 @@ const profile = {
   icon: 'assets/img/remix-logo-blue.png',
   description: 'RemixAI provides AI services to Remix IDE.',
   kind: '',
-  location: 'sidePanel',
+  location: 'popupPanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/remixai.html',
   version: packageJson.version,
   maintainedBy: 'Remix'
diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index f343310096..dd8a672525 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -244,6 +244,7 @@ const RemixApp = (props: IRemixAppUi) => {
                 }
                 <div>{props.app.hiddenPanel.render()}</div>
               </div>
+              <div>{props.app.popupPanel.render()}</div>
               <div className="statusBar fixed-bottom">
                 {props.app.statusBar.render()}
               </div>

From 6ffdb154f64fb34eb59b9b36d7c34b24ccfa6df2 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Mon, 4 Nov 2024 09:30:14 +0100
Subject: [PATCH 02/82] popup for ai

---
 .../src/app/components/popup-panel.tsx        | 54 +++++++++++++++++--
 .../plugins/electron/remixAIDesktopPlugin.tsx |  2 +-
 .../src/app/plugins/remixAIPlugin.tsx         | 44 ++++++++++++++-
 .../remixdesktop/src/plugins/remixAIDektop.ts |  2 +-
 libs/remix-api/src/lib/plugins/remixai-api.ts |  1 +
 libs/remix-api/src/lib/remix-api.ts           |  8 +++
 .../panel/src/lib/plugins/remix-ui-panel.tsx  | 15 ++++--
 .../remix-ai/src/lib/components/Default.tsx   |  4 +-
 .../remix-ai/src/lib/components/RemixAI.tsx   | 18 +++++--
 .../remix-ai/src/lib/components/color.css     | 36 ++++++++++---
 libs/remix-ui/statusbar/src/css/statusbar.css |  5 ++
 .../statusbar/src/lib/components/aiStatus.tsx | 53 +++++++++++++++---
 .../src/lib/components/scamDetails.tsx        | 14 +++--
 .../src/lib/remixui-statusbar-panel.tsx       | 22 +++++---
 libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx  |  2 +-
 15 files changed, 236 insertions(+), 44 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index c91ab9644c..2f0f5ef049 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -3,20 +3,26 @@ import { AbstractPanel } from './panel'
 import { RemixPluginPanel } from '@remix-ui/panel'
 import packageJson from '../../../../../package.json'
 import { PluginViewWrapper } from '@remix-ui/helper'
+import {EventEmitter} from 'events'
 
 const profile = {
   name: 'popupPanel',
   displayName: 'Popup Panel',
   description: 'Remix IDE popup panel',
   version: packageJson.version,
-  methods: ['addView', 'removeView', 'showContent']
+  events: ['popupPanelShown'],
+  methods: ['addView', 'removeView', 'showContent', 'showPopupPanel']
 }
 
 export class PopupPanel extends AbstractPanel {
   element: HTMLDivElement
   dispatch: React.Dispatch<any> = () => {}
+  showPanel: boolean
+  
   constructor(config) {
     super(profile)
+    this.event = new EventEmitter()
+    this.showPanel = true
   }
 
   setDispatch(dispatch: React.Dispatch<any>) {
@@ -49,21 +55,59 @@ export class PopupPanel extends AbstractPanel {
     this.renderComponent()
   }
 
+  async showPopupPanel(show) {
+    console.log("hide in popup-panel =", show)
+    this.showPanel = show
+    this.event.emit('popupPanelShown', show)
+    this.renderComponent()
+  }
+
   renderComponent() {
     this.dispatch({
-      plugins: this.plugins
+      plugins: this.plugins,
+      showPpPanel: this.showPanel
     })
   }
 
   render() {
     return (
-      <div style={{ height: '200', width: '200', position: 'fixed', bottom: 0, left: 0 }} data-id="popupPanelPluginsContainer">
-        <PluginViewWrapper plugin={this} />
+      <div
+        className={'px-0 bg-light border-info ' + (!this.showPanel ? 'd-none' : 'd-flex')}
+        style={{
+          maxHeight: '40rem',
+          maxWidth: '25rem',
+          width: 'max-content',
+          height: '40rem',
+          position: 'fixed',
+          bottom: '2rem',
+          right: '3.5rem',
+          zIndex: 2000,
+          boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
+        }}
+        data-id="popupPanelPluginsContainer"
+      >
+        {this.showPanel && <PluginViewWrapper plugin={this} />}
       </div>
     )
   }
 
   updateComponent(state: any) {
-    return <RemixPluginPanel header={<></>} plugins={state.plugins} />
+    return (
+      <div className={!state.showPpPanel ? 'd-none' : 'd-flex'}>
+        <RemixPluginPanel
+          header={
+            <span id='menubarAIChat' className='pb-2 d-flex flex-row'>
+              <button
+                className='btn fas fa-angle-double-down'
+                onClick={async () => {
+                  console.log("hide")
+                  await this.showPopupPanel(false)
+                }}
+              >
+              </button>
+            </span>
+          }
+          plugins={state.plugins} />
+      </div>)
   }
 }
diff --git a/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx b/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx
index e9909ebc1f..1ead4faafd 100644
--- a/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx
@@ -10,7 +10,7 @@ const desktop_profile = {
   description: 'RemixAI provides AI services to Remix IDE Desktop.',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/remixai.html',
   icon: 'assets/img/remix-logo-blue.png',
-  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer'],
+  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer', 'toggle'],
 }
 
 export class remixAIDesktopPlugin extends ElectronPlugin {
diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
index e307433c69..eb5ef592a4 100644
--- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
@@ -5,10 +5,15 @@ import { RemixAITab, ChatApi } from '@remix-ui/remix-ai'
 import React, { useCallback } from 'react';
 import { ICompletions, IModel, RemoteInferencer, IRemoteModel, IParams, GenerationParams, CodeExplainAgent } from '@remix/remix-ai-core';
 import { CustomRemixApi } from '@remix-api'
+import { PluginViewWrapper } from '@remix-ui/helper'
 
 type chatRequestBufferT<T> = {
   [key in keyof T]: T[key]
 }
+enum AIChatViewState {
+  minimized = 0,
+  open = 1
+}
 
 const profile = {
   name: 'remixAI',
@@ -16,7 +21,8 @@ const profile = {
   methods: ['code_generation', 'code_completion',
     "solidity_answer", "code_explaining",
     "code_insertion", "error_explaining",
-    "initialize", 'chatPipe', 'ProcessChatRequestBuffer', 'isChatRequestPending'],
+    "initialize", 'chatPipe', 'ProcessChatRequestBuffer',
+    'isChatRequestPending', 'toggle'],
   events: [],
   icon: 'assets/img/remix-logo-blue.png',
   description: 'RemixAI provides AI services to Remix IDE.',
@@ -37,6 +43,7 @@ export class RemixAIPlugin extends ViewPlugin {
   chatRequestBuffer: chatRequestBufferT<any> = null
   agent: CodeExplainAgent
   useRemoteInferencer:boolean = false
+  dispatch: any
 
   constructor(inDesktop:boolean) {
     super(profile)
@@ -46,6 +53,7 @@ export class RemixAIPlugin extends ViewPlugin {
   }
 
   onActivation(): void {
+    //this.renderComponent(AIChatViewState.open)
     if (this.isOnDesktop) {
       console.log('Activating RemixAIPlugin on desktop')
       // this.on(this.remixDesktopPluginName, 'activated', () => {
@@ -59,6 +67,10 @@ export class RemixAIPlugin extends ViewPlugin {
     }
   }
 
+  toggle (open: AIChatViewState) {
+    this.renderComponent(open)
+  }
+  
   async initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean){
     if (this.isOnDesktop && !this.useRemoteInferencer) {
       // on desktop use remote inferencer -> false
@@ -201,13 +213,41 @@ export class RemixAIPlugin extends ViewPlugin {
       return ""
     }
   }
+
   isChatRequestPending(){
     return this.chatRequestBuffer != null
   }
 
+  setDispatch(dispatch) {
+    this.dispatch = dispatch
+    this.renderComponent(AIChatViewState.open)
+  }
+
+  renderComponent (open: AIChatViewState) {
+    this.dispatch({
+      plugin: this,
+      openState: open
+    })
+  }
+
   render() {
+    return <div
+      id='ai-view'
+      className='pb-2 mb-2 h-100 d-flex'
+      data-id='aichat-view'
+      style={{
+        minHeight: 'max-content',
+        maxWidth: '25rem',
+        width: '24rem',
+      }}
+    >
+      <PluginViewWrapper plugin={this} />
+    </div>
+  }
+
+  updateComponent(state) {
     return (
-      <RemixAITab plugin={this}></RemixAITab>
+      <RemixAITab plugin={state.plugin} openState={state.openState}></RemixAITab>
     )
   }
 }
diff --git a/apps/remixdesktop/src/plugins/remixAIDektop.ts b/apps/remixdesktop/src/plugins/remixAIDektop.ts
index 6382e28bba..75cf39612c 100644
--- a/apps/remixdesktop/src/plugins/remixAIDektop.ts
+++ b/apps/remixdesktop/src/plugins/remixAIDektop.ts
@@ -32,7 +32,7 @@ const clientProfile: Profile = {
   description: 'RemixAI provides AI services to Remix IDE Desktop.',
   kind: '',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/remixai.html',
-  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer']
+  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer', 'toggle']
 }
 
 class RemixAIDesktopPluginClient extends ElectronBasePluginClient {
diff --git a/libs/remix-api/src/lib/plugins/remixai-api.ts b/libs/remix-api/src/lib/plugins/remixai-api.ts
index 0ea1498151..799b180662 100644
--- a/libs/remix-api/src/lib/plugins/remixai-api.ts
+++ b/libs/remix-api/src/lib/plugins/remixai-api.ts
@@ -19,5 +19,6 @@ export interface IRemixAI {
     chatPipe(pipeMessage: string): Promise<void>,
     ProcessChatRequestBuffer(params:IParams): Promise<void>,
     initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean): Promise<void>,
+    toggle(boolean)
   }
 }
\ No newline at end of file
diff --git a/libs/remix-api/src/lib/remix-api.ts b/libs/remix-api/src/lib/remix-api.ts
index 75e9e6476d..0d7a8f4634 100644
--- a/libs/remix-api/src/lib/remix-api.ts
+++ b/libs/remix-api/src/lib/remix-api.ts
@@ -16,8 +16,15 @@ import { IMatomoApi } from "./plugins/matomo-api"
 import { IRemixAI } from "./plugins/remixai-api"
 import { IRemixAID } from "./plugins/remixAIDesktop-api"
 import { IDgitPlugin } from "./plugins/dgitplugin-api"
+import { Api } from "@remixproject/plugin-utils";
+
 
 export interface ICustomRemixApi extends IRemixApi {
+  popupPanel: {
+    methods: ['showPopupPanel']
+    events: ['popupPanelShown']
+    showPopupPanel(): void
+  } & Api
   dgitApi: IGitApi
   dgit: IDgitPlugin
   config: IConfigApi
@@ -37,4 +44,5 @@ export interface ICustomRemixApi extends IRemixApi {
   remixAID: IRemixAID
 }
 
+
 export declare type CustomRemixApi = Readonly<ICustomRemixApi>
\ No newline at end of file
diff --git a/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx b/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
index 4e1fa59a2e..71aa3db8b0 100644
--- a/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
+++ b/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
@@ -14,16 +14,21 @@ export interface RemixPanelProps {
 
 export function RemixPluginPanel(props: RemixPanelProps) {
   return (
-    <>
+    <div className='d-flex flex-column'>
       {props.header}
       <div className="pluginsContainer">
         <div className="plugins" id="plugins">
-          {Object.values(props.plugins).map((pluginRecord) => {
-            return <RemixUIPanelPlugin key={pluginRecord.profile.name} pluginRecord={pluginRecord} initialState={props.pluginState} highlightStamp={props.highlightStamp} />
-          })}
+          { Object.values(props.plugins).map((pluginRecord) => {
+            return <RemixUIPanelPlugin
+              key={pluginRecord.profile.name}
+              pluginRecord={pluginRecord}
+              initialState={props.pluginState}
+              highlightStamp={props.highlightStamp}
+            />
+          }) }
         </div>
       </div>
-    </>
+    </div>
   )
 }
 
diff --git a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
index 459797294c..1f1ce48323 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
@@ -42,8 +42,8 @@ export const Default = (props) => {
   };
   ChatApi = useAiChatApi();
   const conversationStarters: ConversationStarter[] = [
-    { prompt: 'Explain briefly the current file in Editor', icon: <span>⭐️</span> },
-    { prompt: 'Explain what is a solidity contract!' }]
+    { prompt: 'Explain what is a solidity contract!'},
+    { prompt: 'Explain briefly the current file in Editor'}]
 
   // Define initial messages
   const initialMessages: ChatItem[] = [
diff --git a/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx b/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
index d55a3a9256..61b5910913 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
@@ -1,14 +1,22 @@
 import React, { useContext } from 'react'
 import '../remix-ai.css'
 import { Default, ChatApi } from './Default'
+enum AIChatViewState {
+  minimized = 0,
+  open = 1
+}
+interface IRemixAITab {
+  plugin: any,
+  openState: AIChatViewState
+}
+export const RemixAITab = (props: IRemixAITab) => {
 
-export const RemixAITab = (props) => {
-
-  const plugin = props.plugin
   return (
     <>
-      <div id="remixAITab" className="px-2 pb-4">
-        <Default plugin={plugin}></Default>
+      <div id="remixAITab" className="h-100 w-100 px-2 pb-1">
+        <div className='h-100'>
+          <Default plugin={props.plugin}></Default>
+        </div>
       </div>
     </>
   )
diff --git a/libs/remix-ui/remix-ai/src/lib/components/color.css b/libs/remix-ui/remix-ai/src/lib/components/color.css
index 836a05f103..40e54d438b 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/color.css
+++ b/libs/remix-ui/remix-ai/src/lib/components/color.css
@@ -1,11 +1,32 @@
 .nlux-theme-remix_ai_theme[data-color-scheme='light'] {
     --nlux-ChatRoom--BackgroundColor: var(--text-background);
+    padding-bottom: 0.1rem;
 }
 
 .nlux-theme-remix_ai_theme[data-color-scheme='dark'] {
     --nlux-ChatRoom--BackgroundColor: var(--text-background);
+    padding-bottom: 0.1rem;
 }
 
+.nlux-launchPad-container {
+  padding-bottom: 2rem;
+}
+
+.nlux-conversationStarters-container {
+  overflow-y: hidden;
+}
+
+.nlux-comp-conversationStarters {
+  width: auto !important;
+  padding: 0px !important
+}
+
+.nlux-conversationStarters-container>.nlux-comp-conversationStarters>.nlux-comp-conversationStarter {
+  border-width: 1px !important;
+  border-color: var(--text-background) !important;
+}
+
+
 .nlux-theme-remix_ai_theme {
 
     /* Override top-level chat room colors */
@@ -35,9 +56,13 @@
     --nlux-PromptInput-Focus-Outline--Width: 10px;
     --nlux-PromptInput-Max-Height: 50px;
     --nlux-PromptInput--BorderWidth: 0;
-    .nlux-comp-composer > textarea {padding: 8px;}
     --nlux-PromptInput--BorderRadius: 10px 0 0 10px;
-    --nlux-PromptInput-Height: 50px;
+    --nlux-PromptInput-Height: 30px;
+    --nlux-cvStrt--brdrWd: 0;
+    --nlux-cvStrt--brdClr: var(--light);
+    --nlux-cvStrt--brdrWd: 'hidden';
+    --nlux-comp-composer > textarea {padding: 8px;}
+
 
 
     /* Override input colors */
@@ -49,10 +74,10 @@
     --nlux-Composer--Gap: 0;
 
     /* Override submit button colors */
-    --nlux-SubmitButton--BackgroundColor: var(--primary);
-    --nlux-SubmitButton-Active--BackgroundColor:var(--primary);
+    --nlux-SubmitButton--BackgroundColor: var(--light);
+    --nlux-SubmitButton-Active--BackgroundColor:var(--light);
     --nlux-SubmitButton-Disabled--BackgroundColor: var(--dark);
-    --nlux-SubmitButton-Active--TextColor: var(--text);
+    --nlux-SubmitButton-Active--TextColor: var(--primary);
     --nlux-SubmitButton-Disabled--TextColor: var(--text);
 
     /** Inline code in markdown */
@@ -61,7 +86,6 @@
     --nlux-InlineCode--Padding: 0 2px;
     --nlux-InlineCode--FontSize: 14px;
     
-
     /*code block */
     --nlux-CodeBlock-CopyButton--BackgroundColor: var(--bg-text);
     --nlux-CodeBlock-CopyButton--TextColor: var(--text);
diff --git a/libs/remix-ui/statusbar/src/css/statusbar.css b/libs/remix-ui/statusbar/src/css/statusbar.css
index 4792ca77f3..30a5712f89 100644
--- a/libs/remix-ui/statusbar/src/css/statusbar.css
+++ b/libs/remix-ui/statusbar/src/css/statusbar.css
@@ -1,4 +1,9 @@
 
+.remixui_statusbar_gitstatus {
+  position: relative;
+  left: 20rem;
+}
+
 .remixui_statusbar_gitstatus
 .remixui_statusbar_gitstatus:hover {
   cursor: pointer;
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index fc6d774ce4..d476fba092 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -12,12 +12,24 @@ interface AIStatusProps {
 
 export default function AIStatus(props: AIStatusProps) {
   const [copilotActive, setCopilotActive] = useState(false)
+  const [expandAIChat, setExpandAIChat] = useState(true)
+
   useEffect(() => {
+    const popupPanelListener = async (show) => {
+      setTimeout(() => setExpandAIChat(show), 0);
+    };
+  
+    props.plugin.on('popupPanel', 'popupPanelShown', popupPanelListener)
+  
     const run = async () => {
       const aiActivate = await props.plugin.call('settings', 'get', 'settings/copilot/suggest/activate')
       setCopilotActive(aiActivate)
     }
     run()
+  
+    return () => {
+      props.plugin.off('popupPanel', 'popupPanelShown')
+    }
   }, [])
 
   useEffect(() => {
@@ -29,15 +41,42 @@ export default function AIStatus(props: AIStatusProps) {
     }
     run()
   }, [props.plugin.isAiActive, props.plugin.isAiActive])
+
   return (
-    <CustomTooltip
-      tooltipText={copilotActive ? "RemixAI Copilot enabled" : "RemixAI Copilot disabled. To enable, open a .sol file and toggle the switch at the left-top of the editor"}
-    >
-      <div className="d-flex flex-row pr-2 text-white justify-content-center align-items-center">
-        <span className={copilotActive === false ? "small mx-1 text-white semi-bold" : "small mx-1 text-white semi-bold" }>
+    <div>
+      <CustomTooltip
+        tooltipText={copilotActive ? "Disable RemixAI Copilot" : "Enable RemixAI Copilot. Switch to .sol file to try it."}
+      >
+        <span
+          style={{cursor: 'pointer'}}
+          className={"small mx-1 bg-info border-0 text-white " + (copilotActive === false ? "semi-bold" : "")}
+          onClick={async () => {
+            await props.plugin.call('settings' as any, 'updateCopilotChoice', !copilotActive)
+          }}
+        >
           {copilotActive === false ? 'RemixAI Copilot (disabled)' : 'RemixAI Copilot (enabled)'}
         </span>
+      </CustomTooltip>
+      <div className="d-flex text-sm flex-row pr-2 text-white justify-content-center align-items-center">
+        <button
+          style={{
+            position: 'absolute',
+            bottom: '0.7rem',
+            right: '0.3rem',
+            height: '3rem',
+            width: '3rem',
+            borderRadius: '50%',
+            color: 'var(--ai)',
+            boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
+          }}
+          className='p-1 alert alert-info border border-info fa-solid fa-message-bot'
+          onClick={async () => {
+            await props.plugin.call('popupPanel', 'showPopupPanel', !expandAIChat)
+          }}
+        >
+          {expandAIChat ? '1' : '0'}
+        </button>
       </div>
-    </CustomTooltip>
+    </div>
   )
-}
+}
\ No newline at end of file
diff --git a/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx b/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
index e72bfe62b5..9c9193b933 100644
--- a/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
@@ -18,13 +18,21 @@ export default function ScamDetails ({ refs, floatStyle, scamAlerts }: ScamDetai
   return (
     <div
       ref={refs.setFloating}
-      style={ floatStyle }
-      className="px-1 ml-1 mb-1 d-flex w-25 alert alert-warning border border-warning"
+      style={{
+        position: 'absolute',
+        bottom: '-3.3rem',
+        left: '-4rem',
+        height: '6rem',
+        transform: 'translate(88.5px, -80px)',
+        willChange: 'transform',
+        boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
+      } }
+      className="p-1 pb-0 mb-1 d-flex alert alert-warning border border-warning"
     >
       <span className="align-self-center pl-4 mt-1">
         <i style={{ fontSize: 'xxx-large', fontWeight: 'lighter' }} className="pr-2 far fa-exclamation-triangle"></i>
       </span>
-      <div className="d-flex flex-column">
+      <div className="d-flex flex-column pr-4 pt-2">
         {scamAlerts && scamAlerts.map((alert, index) => (
           <span className="pl-4 mt-1" key={`${alert.url}${index}`}>
             {alert.url.length < 1 ? <FormattedMessage id={`home.scamAlertText${index + 1}`} defaultMessage={alert.message} />
diff --git a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
index 5099d31286..cfd5caf99c 100644
--- a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
+++ b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
@@ -72,25 +72,35 @@ export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
       <StatusBarContextProvider>
         {(platform !== appPlatformTypes.desktop) && showScamDetails && (
           <FloatingFocusManager context={context} modal={false}>
-            <ScamDetails refs={refs} floatStyle={{ ...floatingStyles, minHeight: 'auto', alignContent: 'center', paddingRight: '0.5rem' }} getFloatingProps={getFloatingProps} scamAlerts={scamAlerts} />
+            <ScamDetails
+              refs={refs}
+              floatStyle={{
+                ...floatingStyles,
+                minHeight: 'auto',
+                alignContent: 'center',
+                paddingRight: '0.5rem',
+                bottom: '-8,5rem',
+                left: '0rem'
+              }}
+              getFloatingProps={getFloatingProps}
+              scamAlerts={scamAlerts}
+            />
           </FloatingFocusManager>
         )}
         <div className="d-flex remixui_statusbar_height flex-row bg-info justify-content-between align-items-center">
+          { (platform !== appPlatformTypes.desktop) && <div className="remixui_statusbar bg-warning px-2 remixui_statusbar_custom_padding d-flex justify-center align-items-center">
+              <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
+            </div> }
           <div className="remixui_statusbar remixui_statusbar_gitstatus">
             <GitStatus plugin={statusBarPlugin} gitBranchName={gitBranchName} setGitBranchName={setGitBranchName} />
           </div>
-          <div className="remixui_statusbar"></div>
           <div className="remixui_statusbar">
             <DidYouKnow />
           </div>
-          <div className="remixui_statusbar"></div>
           <div className="remixui_statusbar d-flex align-items-center p-0">
             <div className="remixui_statusbar">
               <AIStatus plugin={statusBarPlugin} aiActive={lightAiUp} isAiActive={isAiActive} setIsAiActive={setIsAiActive} />
             </div>
-            { (platform !== appPlatformTypes.desktop) && <div className="remixui_statusbar bg-warning px-2 remixui_statusbar_custom_padding d-flex justify-center align-items-center">
-              <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
-            </div> }
           </div>
         </div>
       </StatusBarContextProvider>
diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
index bfa136f185..05596f3ee6 100644
--- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
+++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
@@ -261,7 +261,7 @@ export const TabsUI = (props: TabsUIProps) => {
                         methods: ['code_generation', 'code_completion',
                           "solidity_answer", "code_explaining",
                           "code_insertion", "error_explaining",
-                          "initialize", 'chatPipe', 'ProcessChatRequestBuffer', 'isChatRequestPending'],
+                          "initialize", 'chatPipe', 'ProcessChatRequestBuffer', 'isChatRequestPending', 'toggle'],
                         events: [],
                         icon: 'assets/img/remix-logo-blue.png',
                         description: 'RemixAI provides AI services to Remix IDE.',

From 0dfc70e7a1a820cde282d22a342fa2e1f989fb15 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 12:50:55 +0100
Subject: [PATCH 03/82] first fixes

---
 .../src/app/components/popup-panel.tsx        | 49 +++++++++++--------
 .../app/src/lib/remix-app/actions/app.ts      |  2 +
 .../app/src/lib/remix-app/interface/index.ts  |  1 +
 .../app/src/lib/remix-app/reducer/app.ts      | 47 ++++++++++--------
 .../app/src/lib/remix-app/state/app.ts        |  3 +-
 .../src/lib/components/PluginViewWrapper.tsx  | 14 +++++-
 .../panel/src/lib/plugins/remix-ui-panel.tsx  |  4 +-
 .../statusbar/src/lib/components/aiStatus.tsx | 10 +---
 8 files changed, 77 insertions(+), 53 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 2f0f5ef049..8388e8a83f 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -1,9 +1,11 @@
 import React from 'react' // eslint-disable-line
 import { AbstractPanel } from './panel'
-import { RemixPluginPanel } from '@remix-ui/panel'
+import { PluginRecord, RemixPluginPanel } from '@remix-ui/panel'
 import packageJson from '../../../../../package.json'
 import { PluginViewWrapper } from '@remix-ui/helper'
-import {EventEmitter} from 'events'
+import { EventEmitter } from 'events'
+import { AppState } from 'libs/remix-ui/app/src/lib/remix-app/interface'
+import { AppAction, appActionTypes } from '@remix-ui/app'
 
 const profile = {
   name: 'popupPanel',
@@ -13,22 +15,28 @@ const profile = {
   events: ['popupPanelShown'],
   methods: ['addView', 'removeView', 'showContent', 'showPopupPanel']
 }
+type popupPanelState = {
+  plugins: Record<string, PluginRecord>
+}
 
 export class PopupPanel extends AbstractPanel {
   element: HTMLDivElement
-  dispatch: React.Dispatch<any> = () => {}
-  showPanel: boolean
+  dispatch: React.Dispatch<any> = () => { }
+  appStateDispatch: React.Dispatch<AppAction> = () => { }
   
   constructor(config) {
     super(profile)
     this.event = new EventEmitter()
-    this.showPanel = true
   }
 
   setDispatch(dispatch: React.Dispatch<any>) {
     this.dispatch = dispatch
   }
 
+  setAppStateDispatch(appStateDispatch: React.Dispatch<AppAction>) {
+    this.appStateDispatch = appStateDispatch
+  }
+
   onActivation() {
     this.renderComponent()
   }
@@ -56,23 +64,31 @@ export class PopupPanel extends AbstractPanel {
   }
 
   async showPopupPanel(show) {
-    console.log("hide in popup-panel =", show)
-    this.showPanel = show
-    this.event.emit('popupPanelShown', show)
+    
+    this.appStateDispatch({
+      type: appActionTypes.setShowPopupPanel,
+      payload: show
+    })
     this.renderComponent()
   }
 
   renderComponent() {
     this.dispatch({
-      plugins: this.plugins,
-      showPpPanel: this.showPanel
+      plugins: this.plugins
     })
   }
 
   render() {
+    return (
+      <PluginViewWrapper plugin={this} />
+    )
+  }
+
+  updateComponent(state: popupPanelState & Partial<AppState>) {
+    console.log("state in updateComponent =", state)
     return (
       <div
-        className={'px-0 bg-light border-info ' + (!this.showPanel ? 'd-none' : 'd-flex')}
+        className={'px-0 bg-light border-info ' + (!state.showPopupPanel ? 'd-none' : 'd-flex')}
         style={{
           maxHeight: '40rem',
           maxWidth: '25rem',
@@ -86,14 +102,6 @@ export class PopupPanel extends AbstractPanel {
         }}
         data-id="popupPanelPluginsContainer"
       >
-        {this.showPanel && <PluginViewWrapper plugin={this} />}
-      </div>
-    )
-  }
-
-  updateComponent(state: any) {
-    return (
-      <div className={!state.showPpPanel ? 'd-none' : 'd-flex'}>
         <RemixPluginPanel
           header={
             <span id='menubarAIChat' className='pb-2 d-flex flex-row'>
@@ -108,6 +116,7 @@ export class PopupPanel extends AbstractPanel {
             </span>
           }
           plugins={state.plugins} />
-      </div>)
+      </div>
+    )
   }
 }
diff --git a/libs/remix-ui/app/src/lib/remix-app/actions/app.ts b/libs/remix-ui/app/src/lib/remix-app/actions/app.ts
index 716d351e94..246b10cad0 100644
--- a/libs/remix-ui/app/src/lib/remix-app/actions/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/actions/app.ts
@@ -17,6 +17,7 @@ export const enum appActionTypes {
   setCurrentBranch = 'SET_CURRENT_BRANCH',
   setNeedsGitInit = 'SET_NEEDS_GIT_INIT',
   setCanUseGit = 'SET_CAN_USE_GIT',
+  setShowPopupPanel = 'SET_SHOW_POPUP_PANEL',
 }
 
 type AppPayload = {
@@ -24,6 +25,7 @@ type AppPayload = {
   [appActionTypes.setCurrentBranch]: branch,
   [appActionTypes.setNeedsGitInit]: boolean,
   [appActionTypes.setCanUseGit]: boolean,
+  [appActionTypes.setShowPopupPanel]: boolean,
 }
 
 export type AppAction = ActionMap<AppPayload>[keyof ActionMap<
diff --git a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
index 0c146c98f7..531c2764d0 100644
--- a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
@@ -52,5 +52,6 @@ export interface AppState {
     currentBranch: branch
     needsGitInit: boolean
     canUseGit: boolean
+    showPopupPanel: boolean
 }
 
diff --git a/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts b/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
index 6dd37603bc..5abe07626c 100644
--- a/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
@@ -3,29 +3,36 @@ import { AppState } from "../interface";
 
 export const appReducer = (state: AppState, action: AppAction): AppState => {
   switch (action.type) {
-  case appActionTypes.setGitHubUser: {
-    return {
-      ...state,
-      gitHubUser: action.payload
+    case appActionTypes.setGitHubUser: {
+      return {
+        ...state,
+        gitHubUser: action.payload
+      }
     }
-  }
-  case appActionTypes.setCurrentBranch: {
-    return {
-      ...state,
-      currentBranch: action.payload
+    case appActionTypes.setCurrentBranch: {
+      return {
+        ...state,
+        currentBranch: action.payload
+      }
     }
-  }
-  case appActionTypes.setNeedsGitInit: {
-    return {
-      ...state,
-      needsGitInit: action.payload
+    case appActionTypes.setNeedsGitInit: {
+      return {
+        ...state,
+        needsGitInit: action.payload
+      }
     }
-  }
-  case appActionTypes.setCanUseGit: {
-    return {
-      ...state,
-      canUseGit: action.payload
+    case appActionTypes.setCanUseGit: {
+      return {
+        ...state,
+        canUseGit: action.payload
+      }
+    }
+
+    case appActionTypes.setShowPopupPanel: {
+      return {
+        ...state,
+        showPopupPanel: action.payload
+      }
     }
-  }
   }
 }
\ No newline at end of file
diff --git a/libs/remix-ui/app/src/lib/remix-app/state/app.ts b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
index 8086b75c9c..2778233a09 100644
--- a/libs/remix-ui/app/src/lib/remix-app/state/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
@@ -5,5 +5,6 @@ export const appInitialState: AppState = {
   gitHubUser: {} as GitHubUser,
   currentBranch: null,
   needsGitInit: true,
-  canUseGit: false
+  canUseGit: false,
+  showPopupPanel: true
 }
\ No newline at end of file
diff --git a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
index c88f985ef6..168f1095f2 100644
--- a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
+++ b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
@@ -1,4 +1,5 @@
-import React from 'react'
+import { AppContext } from '@remix-ui/app'
+import React, { useContext } from 'react'
 import { useEffect, useState } from 'react'
 
 interface IPluginViewWrapperProps {
@@ -7,12 +8,21 @@ interface IPluginViewWrapperProps {
 
 export const PluginViewWrapper = (props: IPluginViewWrapperProps) => {
   const [state, setState] = useState<any>(null)
+  const appContext = useContext(AppContext)
 
   useEffect(() => {
     if (props.plugin.setDispatch) {
       props.plugin.setDispatch(setState)
     }
+    if(props.plugin.setAppStateDispatch) {
+      props.plugin.setAppStateDispatch(appContext.appStateDispatch)
+    }
   }, [])
 
-  return <>{state ? <>{props.plugin.updateComponent(state)}</> : <></>}</>
+  return <>{state ? <>{props.plugin.updateComponent(
+    {
+      ...state,
+      ...appContext['appState']
+    })}
+  </> : <></>}</>
 }
diff --git a/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx b/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
index 71aa3db8b0..ba6c494a04 100644
--- a/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
+++ b/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
@@ -14,7 +14,7 @@ export interface RemixPanelProps {
 
 export function RemixPluginPanel(props: RemixPanelProps) {
   return (
-    <div className='d-flex flex-column'>
+    <>
       {props.header}
       <div className="pluginsContainer">
         <div className="plugins" id="plugins">
@@ -28,7 +28,7 @@ export function RemixPluginPanel(props: RemixPanelProps) {
           }) }
         </div>
       </div>
-    </div>
+    </>
   )
 }
 
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index d476fba092..55b4fbf43d 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -12,14 +12,8 @@ interface AIStatusProps {
 
 export default function AIStatus(props: AIStatusProps) {
   const [copilotActive, setCopilotActive] = useState(false)
-  const [expandAIChat, setExpandAIChat] = useState(true)
 
   useEffect(() => {
-    const popupPanelListener = async (show) => {
-      setTimeout(() => setExpandAIChat(show), 0);
-    };
-  
-    props.plugin.on('popupPanel', 'popupPanelShown', popupPanelListener)
   
     const run = async () => {
       const aiActivate = await props.plugin.call('settings', 'get', 'settings/copilot/suggest/activate')
@@ -71,10 +65,10 @@ export default function AIStatus(props: AIStatusProps) {
           }}
           className='p-1 alert alert-info border border-info fa-solid fa-message-bot'
           onClick={async () => {
-            await props.plugin.call('popupPanel', 'showPopupPanel', !expandAIChat)
+            await props.plugin.call('popupPanel', 'showPopupPanel', true)
           }}
         >
-          {expandAIChat ? '1' : '0'}
+
         </button>
       </div>
     </div>

From f866b4d9cbfce98ebfc7239b0dc83dd0541cb879 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 13:06:24 +0100
Subject: [PATCH 04/82] lianas css

---
 apps/remix-ide/src/app/components/popup-panel.tsx      |  2 +-
 libs/remix-ui/statusbar/src/css/statusbar.css          |  7 ++-----
 .../statusbar/src/lib/remixui-statusbar-panel.tsx      | 10 ++++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 8388e8a83f..2712b0725d 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -97,7 +97,7 @@ export class PopupPanel extends AbstractPanel {
           position: 'fixed',
           bottom: '2rem',
           right: '3.5rem',
-          zIndex: 2000,
+          zIndex: 200,
           boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
         }}
         data-id="popupPanelPluginsContainer"
diff --git a/libs/remix-ui/statusbar/src/css/statusbar.css b/libs/remix-ui/statusbar/src/css/statusbar.css
index 30a5712f89..11ee870603 100644
--- a/libs/remix-ui/statusbar/src/css/statusbar.css
+++ b/libs/remix-ui/statusbar/src/css/statusbar.css
@@ -1,9 +1,6 @@
-
-.remixui_statusbar_gitstatus {
-  position: relative;
-  left: 20rem;
+.remixui_statusbar {
+  white-space: nowrap;
 }
-
 .remixui_statusbar_gitstatus
 .remixui_statusbar_gitstatus:hover {
   cursor: pointer;
diff --git a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
index cfd5caf99c..a295239a10 100644
--- a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
+++ b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
@@ -91,13 +91,15 @@ export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
           { (platform !== appPlatformTypes.desktop) && <div className="remixui_statusbar bg-warning px-2 remixui_statusbar_custom_padding d-flex justify-center align-items-center">
               <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
             </div> }
-          <div className="remixui_statusbar remixui_statusbar_gitstatus">
-            <GitStatus plugin={statusBarPlugin} gitBranchName={gitBranchName} setGitBranchName={setGitBranchName} />
+          <div className='d-flex w-100 justify-content-between'>
+            <div className="remixui_statusbar remixui_statusbar_gitstatus">
+              <GitStatus plugin={statusBarPlugin} gitBranchName={gitBranchName} setGitBranchName={setGitBranchName} />
+            </div>
           </div>
-          <div className="remixui_statusbar">
+          <div className="w-100 remixui_statusbar">
             <DidYouKnow />
           </div>
-          <div className="remixui_statusbar d-flex align-items-center p-0">
+          <div className="remixui_statusbar d-flex w-100 justify-content-end p-0">
             <div className="remixui_statusbar">
               <AIStatus plugin={statusBarPlugin} aiActive={lightAiUp} isAiActive={isAiActive} setIsAiActive={setIsAiActive} />
             </div>

From a1ed9fd1660cccf50b1a1236e9c36184c7306b45 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 13:36:36 +0100
Subject: [PATCH 05/82] fix state

---
 .../src/app/components/popup-panel.tsx        |  2 +-
 .../src/app/plugins/remixAIPlugin.tsx         | 17 ++++----------
 .../src/lib/plugins/popuppanel-api.ts         | 10 ++++++++
 libs/remix-api/src/lib/plugins/remixai-api.ts |  1 -
 .../src/lib/plugins/remixaiDesktop-api.ts     | 23 -------------------
 libs/remix-api/src/lib/remix-api.ts           |  7 ++----
 .../remix-ai/src/lib/components/RemixAI.tsx   |  6 +----
 .../statusbar/src/lib/components/aiStatus.tsx | 13 ++++++-----
 8 files changed, 25 insertions(+), 54 deletions(-)
 create mode 100644 libs/remix-api/src/lib/plugins/popuppanel-api.ts
 delete mode 100644 libs/remix-api/src/lib/plugins/remixaiDesktop-api.ts

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 2712b0725d..3b9af9ff23 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -12,7 +12,7 @@ const profile = {
   displayName: 'Popup Panel',
   description: 'Remix IDE popup panel',
   version: packageJson.version,
-  events: ['popupPanelShown'],
+  events: [],
   methods: ['addView', 'removeView', 'showContent', 'showPopupPanel']
 }
 type popupPanelState = {
diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
index eb5ef592a4..5bb7ac7e93 100644
--- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
@@ -10,10 +10,6 @@ import { PluginViewWrapper } from '@remix-ui/helper'
 type chatRequestBufferT<T> = {
   [key in keyof T]: T[key]
 }
-enum AIChatViewState {
-  minimized = 0,
-  open = 1
-}
 
 const profile = {
   name: 'remixAI',
@@ -53,7 +49,7 @@ export class RemixAIPlugin extends ViewPlugin {
   }
 
   onActivation(): void {
-    //this.renderComponent(AIChatViewState.open)
+
     if (this.isOnDesktop) {
       console.log('Activating RemixAIPlugin on desktop')
       // this.on(this.remixDesktopPluginName, 'activated', () => {
@@ -66,10 +62,6 @@ export class RemixAIPlugin extends ViewPlugin {
       this.initialize()
     }
   }
-
-  toggle (open: AIChatViewState) {
-    this.renderComponent(open)
-  }
   
   async initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean){
     if (this.isOnDesktop && !this.useRemoteInferencer) {
@@ -220,13 +212,12 @@ export class RemixAIPlugin extends ViewPlugin {
 
   setDispatch(dispatch) {
     this.dispatch = dispatch
-    this.renderComponent(AIChatViewState.open)
+    this.renderComponent()
   }
 
-  renderComponent (open: AIChatViewState) {
+  renderComponent () {
     this.dispatch({
       plugin: this,
-      openState: open
     })
   }
 
@@ -247,7 +238,7 @@ export class RemixAIPlugin extends ViewPlugin {
 
   updateComponent(state) {
     return (
-      <RemixAITab plugin={state.plugin} openState={state.openState}></RemixAITab>
+      <RemixAITab plugin={state.plugin}></RemixAITab>
     )
   }
 }
diff --git a/libs/remix-api/src/lib/plugins/popuppanel-api.ts b/libs/remix-api/src/lib/plugins/popuppanel-api.ts
new file mode 100644
index 0000000000..040a70bc0a
--- /dev/null
+++ b/libs/remix-api/src/lib/plugins/popuppanel-api.ts
@@ -0,0 +1,10 @@
+import { IFilePanel } from '@remixproject/plugin-api'
+import { StatusEvents } from '@remixproject/plugin-utils'
+
+export interface IPopupPanelAPI {
+    events:{
+    } & StatusEvents
+    methods: {
+        showPopupPanel(state: boolean): void
+    }
+}
diff --git a/libs/remix-api/src/lib/plugins/remixai-api.ts b/libs/remix-api/src/lib/plugins/remixai-api.ts
index 799b180662..0ea1498151 100644
--- a/libs/remix-api/src/lib/plugins/remixai-api.ts
+++ b/libs/remix-api/src/lib/plugins/remixai-api.ts
@@ -19,6 +19,5 @@ export interface IRemixAI {
     chatPipe(pipeMessage: string): Promise<void>,
     ProcessChatRequestBuffer(params:IParams): Promise<void>,
     initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean): Promise<void>,
-    toggle(boolean)
   }
 }
\ No newline at end of file
diff --git a/libs/remix-api/src/lib/plugins/remixaiDesktop-api.ts b/libs/remix-api/src/lib/plugins/remixaiDesktop-api.ts
deleted file mode 100644
index dc9deb7e82..0000000000
--- a/libs/remix-api/src/lib/plugins/remixaiDesktop-api.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { IParams } from "@remix/remix-ai-core";
-import { StatusEvents } from "@remixproject/plugin-utils";
-
-export interface IRemixAID {
-  events: {
-    activated():void,
-    onInference():void,
-    onInferenceDone():void,
-    onStreamResult(streamText: string):void,
-
-  } & StatusEvents,
-  methods: {
-    code_completion(context: string): Promise<string> 
-    code_insertion(msg_pfx: string, msg_sfx: string): Promise<string>,
-    code_generation(prompt: string): Promise<string | null>,
-    code_explaining(code: string, context?: string): Promise<string | null>,
-    error_explaining(prompt: string): Promise<string | null>,
-    solidity_answer(prompt: string): Promise<string | null>,
-    initializeModelBackend(local: boolean, generalModel?, completionModel?): Promise<boolean>,
-    chatPipe(pipeMessage: string): Promise<void>,
-    ProcessChatRequestBuffer(params:IParams): Promise<void>,
-  }
-}
\ No newline at end of file
diff --git a/libs/remix-api/src/lib/remix-api.ts b/libs/remix-api/src/lib/remix-api.ts
index 0d7a8f4634..5b400d445f 100644
--- a/libs/remix-api/src/lib/remix-api.ts
+++ b/libs/remix-api/src/lib/remix-api.ts
@@ -17,14 +17,11 @@ import { IRemixAI } from "./plugins/remixai-api"
 import { IRemixAID } from "./plugins/remixAIDesktop-api"
 import { IDgitPlugin } from "./plugins/dgitplugin-api"
 import { Api } from "@remixproject/plugin-utils";
+import { IPopupPanelAPI } from "./plugins/popuppanel-api"
 
 
 export interface ICustomRemixApi extends IRemixApi {
-  popupPanel: {
-    methods: ['showPopupPanel']
-    events: ['popupPanelShown']
-    showPopupPanel(): void
-  } & Api
+  popupPanel: IPopupPanelAPI
   dgitApi: IGitApi
   dgit: IDgitPlugin
   config: IConfigApi
diff --git a/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx b/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
index 61b5910913..a5aaba4a7d 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
@@ -1,13 +1,9 @@
 import React, { useContext } from 'react'
 import '../remix-ai.css'
 import { Default, ChatApi } from './Default'
-enum AIChatViewState {
-  minimized = 0,
-  open = 1
-}
+
 interface IRemixAITab {
   plugin: any,
-  openState: AIChatViewState
 }
 export const RemixAITab = (props: IRemixAITab) => {
 
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 55b4fbf43d..48864811a2 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -1,7 +1,8 @@
 // eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
 import { StatusBar } from 'apps/remix-ide/src/app/components/status-bar'
 import { CustomTooltip } from '@remix-ui/helper'
-import React, { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
+import { appActionTypes, AppContext } from '@remix-ui/app'
 
 interface AIStatusProps {
   plugin: StatusBar
@@ -12,7 +13,7 @@ interface AIStatusProps {
 
 export default function AIStatus(props: AIStatusProps) {
   const [copilotActive, setCopilotActive] = useState(false)
-
+  const appContext = useContext(AppContext)
   useEffect(() => {
   
     const run = async () => {
@@ -21,9 +22,6 @@ export default function AIStatus(props: AIStatusProps) {
     }
     run()
   
-    return () => {
-      props.plugin.off('popupPanel', 'popupPanelShown')
-    }
   }, [])
 
   useEffect(() => {
@@ -65,7 +63,10 @@ export default function AIStatus(props: AIStatusProps) {
           }}
           className='p-1 alert alert-info border border-info fa-solid fa-message-bot'
           onClick={async () => {
-            await props.plugin.call('popupPanel', 'showPopupPanel', true)
+            appContext.appStateDispatch({
+              type: appActionTypes.setShowPopupPanel,
+              payload: !appContext.appState.showPopupPanel
+            })
           }}
         >
 

From 452ae03b88a25e9aed255c29f5bf72c66e35f8e3 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 13:46:01 +0100
Subject: [PATCH 06/82] clean up

---
 .../src/app/components/popup-panel.tsx        | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 3b9af9ff23..f45a9f3d3f 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -23,7 +23,7 @@ export class PopupPanel extends AbstractPanel {
   element: HTMLDivElement
   dispatch: React.Dispatch<any> = () => { }
   appStateDispatch: React.Dispatch<AppAction> = () => { }
-  
+
   constructor(config) {
     super(profile)
     this.event = new EventEmitter()
@@ -64,7 +64,7 @@ export class PopupPanel extends AbstractPanel {
   }
 
   async showPopupPanel(show) {
-    
+
     this.appStateDispatch({
       type: appActionTypes.setShowPopupPanel,
       payload: show
@@ -85,7 +85,6 @@ export class PopupPanel extends AbstractPanel {
   }
 
   updateComponent(state: popupPanelState & Partial<AppState>) {
-    console.log("state in updateComponent =", state)
     return (
       <div
         className={'px-0 bg-light border-info ' + (!state.showPopupPanel ? 'd-none' : 'd-flex')}
@@ -102,20 +101,21 @@ export class PopupPanel extends AbstractPanel {
         }}
         data-id="popupPanelPluginsContainer"
       >
-        <RemixPluginPanel
-          header={
-            <span id='menubarAIChat' className='pb-2 d-flex flex-row'>
-              <button
-                className='btn fas fa-angle-double-down'
-                onClick={async () => {
-                  console.log("hide")
-                  await this.showPopupPanel(false)
-                }}
-              >
-              </button>
-            </span>
-          }
-          plugins={state.plugins} />
+        <div className='d-flex flex-column'>
+          <RemixPluginPanel
+            header={
+              <span id='popupPanelToggle' className='pb-2 d-flex flex-row'>
+                <button
+                  className='btn fas fa-angle-double-down'
+                  onClick={async () => {
+                    await this.showPopupPanel(false)
+                  }}
+                >
+                </button>
+              </span>
+            }
+            plugins={state.plugins} />
+        </div>
       </div>
     )
   }

From 78d4ce895c4b8fef4ede89430c1ae5af8f875d1f Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 13:49:45 +0100
Subject: [PATCH 07/82] linting

---
 .../src/app/components/popup-panel.tsx        |  4 +-
 .../src/app/plugins/remixAIPlugin.tsx         |  2 +-
 libs/remix-ui/app/src/index.ts                |  2 +-
 .../app/src/lib/remix-app/reducer/app.ts      | 50 +++++++++----------
 .../src/lib/components/PluginViewWrapper.tsx  |  2 +-
 .../remix-ai/src/lib/components/Default.tsx   |  4 +-
 .../statusbar/src/lib/components/aiStatus.tsx |  6 +--
 .../src/lib/remixui-statusbar-panel.tsx       |  4 +-
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index f45a9f3d3f..363d89d2cf 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -4,8 +4,8 @@ import { PluginRecord, RemixPluginPanel } from '@remix-ui/panel'
 import packageJson from '../../../../../package.json'
 import { PluginViewWrapper } from '@remix-ui/helper'
 import { EventEmitter } from 'events'
-import { AppState } from 'libs/remix-ui/app/src/lib/remix-app/interface'
-import { AppAction, appActionTypes } from '@remix-ui/app'
+
+import { AppAction, appActionTypes, AppState } from '@remix-ui/app'
 
 const profile = {
   name: 'popupPanel',
diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
index 5bb7ac7e93..34a3a15298 100644
--- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
@@ -62,7 +62,7 @@ export class RemixAIPlugin extends ViewPlugin {
       this.initialize()
     }
   }
-  
+
   async initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean){
     if (this.isOnDesktop && !this.useRemoteInferencer) {
       // on desktop use remote inferencer -> false
diff --git a/libs/remix-ui/app/src/index.ts b/libs/remix-ui/app/src/index.ts
index 31dea89385..4602431686 100644
--- a/libs/remix-ui/app/src/index.ts
+++ b/libs/remix-ui/app/src/index.ts
@@ -2,6 +2,6 @@ export { default as RemixApp } from './lib/remix-app/remix-app'
 export { dispatchModalContext, dispatchModalInterface, AppContext, appProviderContextType, appPlatformTypes, platformContext, onLineContext } from './lib/remix-app/context/context'
 export { ModalProvider, useDialogDispatchers } from './lib/remix-app/context/provider'
 export { AppModal } from './lib/remix-app/interface/index'
-export { AlertModal } from './lib/remix-app/interface/index'
+export { AlertModal, AppState } from './lib/remix-app/interface/index'
 export { ModalTypes, AppModalCancelTypes } from './lib/remix-app/types/index'
 export { AppAction, appActionTypes } from './lib/remix-app/actions/app'
diff --git a/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts b/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
index 5abe07626c..39d61cab75 100644
--- a/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
@@ -3,36 +3,36 @@ import { AppState } from "../interface";
 
 export const appReducer = (state: AppState, action: AppAction): AppState => {
   switch (action.type) {
-    case appActionTypes.setGitHubUser: {
-      return {
-        ...state,
-        gitHubUser: action.payload
-      }
+  case appActionTypes.setGitHubUser: {
+    return {
+      ...state,
+      gitHubUser: action.payload
     }
-    case appActionTypes.setCurrentBranch: {
-      return {
-        ...state,
-        currentBranch: action.payload
-      }
+  }
+  case appActionTypes.setCurrentBranch: {
+    return {
+      ...state,
+      currentBranch: action.payload
     }
-    case appActionTypes.setNeedsGitInit: {
-      return {
-        ...state,
-        needsGitInit: action.payload
-      }
+  }
+  case appActionTypes.setNeedsGitInit: {
+    return {
+      ...state,
+      needsGitInit: action.payload
     }
-    case appActionTypes.setCanUseGit: {
-      return {
-        ...state,
-        canUseGit: action.payload
-      }
+  }
+  case appActionTypes.setCanUseGit: {
+    return {
+      ...state,
+      canUseGit: action.payload
     }
+  }
 
-    case appActionTypes.setShowPopupPanel: {
-      return {
-        ...state,
-        showPopupPanel: action.payload
-      }
+  case appActionTypes.setShowPopupPanel: {
+    return {
+      ...state,
+      showPopupPanel: action.payload
     }
   }
+  }
 }
\ No newline at end of file
diff --git a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
index 168f1095f2..c29f58d4dc 100644
--- a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
+++ b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
@@ -14,7 +14,7 @@ export const PluginViewWrapper = (props: IPluginViewWrapperProps) => {
     if (props.plugin.setDispatch) {
       props.plugin.setDispatch(setState)
     }
-    if(props.plugin.setAppStateDispatch) {
+    if (props.plugin.setAppStateDispatch) {
       props.plugin.setAppStateDispatch(appContext.appStateDispatch)
     }
   }, [])
diff --git a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
index 1f1ce48323..bdeaacbea7 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
@@ -42,8 +42,8 @@ export const Default = (props) => {
   };
   ChatApi = useAiChatApi();
   const conversationStarters: ConversationStarter[] = [
-    { prompt: 'Explain what is a solidity contract!'},
-    { prompt: 'Explain briefly the current file in Editor'}]
+    { prompt: 'Explain what is a solidity contract!' },
+    { prompt: 'Explain briefly the current file in Editor' }]
 
   // Define initial messages
   const initialMessages: ChatItem[] = [
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 48864811a2..53f3de6325 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -15,13 +15,13 @@ export default function AIStatus(props: AIStatusProps) {
   const [copilotActive, setCopilotActive] = useState(false)
   const appContext = useContext(AppContext)
   useEffect(() => {
-  
+
     const run = async () => {
       const aiActivate = await props.plugin.call('settings', 'get', 'settings/copilot/suggest/activate')
       setCopilotActive(aiActivate)
     }
     run()
-  
+
   }, [])
 
   useEffect(() => {
@@ -40,7 +40,7 @@ export default function AIStatus(props: AIStatusProps) {
         tooltipText={copilotActive ? "Disable RemixAI Copilot" : "Enable RemixAI Copilot. Switch to .sol file to try it."}
       >
         <span
-          style={{cursor: 'pointer'}}
+          style={{ cursor: 'pointer' }}
           className={"small mx-1 bg-info border-0 text-white " + (copilotActive === false ? "semi-bold" : "")}
           onClick={async () => {
             await props.plugin.call('settings' as any, 'updateCopilotChoice', !copilotActive)
diff --git a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
index a295239a10..22b1dac390 100644
--- a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
+++ b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
@@ -89,8 +89,8 @@ export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
         )}
         <div className="d-flex remixui_statusbar_height flex-row bg-info justify-content-between align-items-center">
           { (platform !== appPlatformTypes.desktop) && <div className="remixui_statusbar bg-warning px-2 remixui_statusbar_custom_padding d-flex justify-center align-items-center">
-              <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
-            </div> }
+            <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
+          </div> }
           <div className='d-flex w-100 justify-content-between'>
             <div className="remixui_statusbar remixui_statusbar_gitstatus">
               <GitStatus plugin={statusBarPlugin} gitBranchName={gitBranchName} setGitBranchName={setGitBranchName} />

From 87f2a7926310427a080a4e8a374ee28f2b3b26ad Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 14:07:23 +0100
Subject: [PATCH 08/82] hide popup

---
 libs/remix-ui/app/src/lib/remix-app/state/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/app/src/lib/remix-app/state/app.ts b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
index 2778233a09..708b22301a 100644
--- a/libs/remix-ui/app/src/lib/remix-app/state/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
@@ -6,5 +6,5 @@ export const appInitialState: AppState = {
   currentBranch: null,
   needsGitInit: true,
   canUseGit: false,
-  showPopupPanel: true
+  showPopupPanel: false
 }
\ No newline at end of file

From 45025f0e6f84b46dacf81632175d06a96be77483 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 14:32:47 +0100
Subject: [PATCH 09/82] hidescam button

---
 apps/remix-ide-e2e/src/helpers/init.ts                         | 3 +++
 libs/remix-ui/statusbar/src/lib/components/scamAlertStatus.tsx | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index f30ce3dd62..cd6bdb86af 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -27,6 +27,8 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     })
     .verifyLoad()
     .enableClipBoard()
+    .waitForElementVisible('*[data-id="hTScamAlertButton"]')
+    .click('*[data-id="hTScamAlertButton"]')
     .perform((done) => {
       browser.execute(function () { // hide tooltips
         function addStyle(styleString) {
@@ -76,6 +78,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
 
 function initModules(browser: NightwatchBrowser, callback: VoidFunction) {
   browser
+    .pause()
     .click('[data-id="verticalIconsKindpluginManager"]')
     .scrollAndClick('[data-id="pluginManagerComponentActivateButtonsolidityStaticAnalysis"]')
     .scrollAndClick('[data-id="pluginManagerComponentActivateButtondebugger"]')
diff --git a/libs/remix-ui/statusbar/src/lib/components/scamAlertStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/scamAlertStatus.tsx
index d3cbce68fd..98a8b1fc4c 100644
--- a/libs/remix-ui/statusbar/src/lib/components/scamAlertStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/scamAlertStatus.tsx
@@ -15,7 +15,7 @@ export default function ScamAlertStatus ({ refs, getReferenceProps }: ScamAlertS
       <CustomTooltip
         tooltipText={"Scam Alerts"}
       >
-        <div className="mr-1 d-flex align-items-center justify-content-center remixui_statusbar_scamAlert" id="hTScamAlertSection" ref={refs.setReference} {...getReferenceProps()}>
+        <div className="mr-1 d-flex align-items-center justify-content-center remixui_statusbar_scamAlert" data-id="hTScamAlertButton" id="hTScamAlertSection" ref={refs.setReference} {...getReferenceProps()}>
           <span className="pr-2 far fa-exclamation-triangle text-white"></span>
           <span className="text-white font-semibold small">
             <FormattedMessage id="home.scamAlert" />

From 624ac09b6ba633040fd5852c61b6734fb7c6f31d Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 15:16:14 +0100
Subject: [PATCH 10/82] fix bugs

---
 .../src/app/components/popup-panel.tsx        |  6 +--
 .../src/lib/components/PluginViewWrapper.tsx  | 37 +++++++++++--------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 363d89d2cf..b85c3eb8a8 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -80,14 +80,14 @@ export class PopupPanel extends AbstractPanel {
 
   render() {
     return (
-      <PluginViewWrapper plugin={this} />
+      <PluginViewWrapper useAppContext={true} plugin={this} />
     )
   }
 
-  updateComponent(state: popupPanelState & Partial<AppState>) {
+  updateComponent(state: popupPanelState, appState: Partial<AppState>) {
     return (
       <div
-        className={'px-0 bg-light border-info ' + (!state.showPopupPanel ? 'd-none' : 'd-flex')}
+        className={`px-0 bg-light border-info ${appState?.showPopupPanel ? 'd-flex' : 'd-none'}`}
         style={{
           maxHeight: '40rem',
           maxWidth: '25rem',
diff --git a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
index c29f58d4dc..e5e7700eac 100644
--- a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
+++ b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
@@ -1,28 +1,35 @@
 import { AppContext } from '@remix-ui/app'
-import React, { useContext } from 'react'
-import { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 
 interface IPluginViewWrapperProps {
   plugin: any
+  useAppContext?: boolean // Optional flag to decide whether to use AppContext
 }
 
-export const PluginViewWrapper = (props: IPluginViewWrapperProps) => {
+export const PluginViewWrapper = ({ plugin, useAppContext = false }: IPluginViewWrapperProps) => {
   const [state, setState] = useState<any>(null)
-  const appContext = useContext(AppContext)
+  const appContext = useAppContext ? useContext(AppContext) : null
 
   useEffect(() => {
-    if (props.plugin.setDispatch) {
-      props.plugin.setDispatch(setState)
+    if (plugin.setDispatch) {
+      plugin.setDispatch(setState)
     }
-    if (props.plugin.setAppStateDispatch) {
-      props.plugin.setAppStateDispatch(appContext.appStateDispatch)
+    if (useAppContext && appContext.appStateDispatch && plugin.setAppStateDispatch) {
+      plugin.setAppStateDispatch(appContext.appStateDispatch)
     }
-  }, [])
+  }, [plugin])
 
-  return <>{state ? <>{props.plugin.updateComponent(
-    {
-      ...state,
-      ...appContext['appState']
-    })}
-  </> : <></>}</>
+  if (useAppContext && appContext && appContext.appState) {
+    return (
+      <>
+        {state ? <>{plugin.updateComponent(state, appContext.appState)}</> : <></>}
+      </>
+    )
+  }
+
+  return (
+    <>
+      {state ? <>{plugin.updateComponent(state)}</> : <></>}
+    </>
+  )
 }

From 5ed722e0ff6c99c0b41abe38ff55d569572df12a Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 15:31:20 +0100
Subject: [PATCH 11/82] init

---
 apps/remix-ide-e2e/src/helpers/init.ts                  | 3 ++-
 libs/remix-ui/app/src/lib/remix-app/state/app.ts        | 2 +-
 libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index cd6bdb86af..a6c303f32d 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -29,6 +29,8 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     .enableClipBoard()
     .waitForElementVisible('*[data-id="hTScamAlertButton"]')
     .click('*[data-id="hTScamAlertButton"]')
+    .waitForElementVisible('*[data-id="aiStatusButton"]')
+    .click('*[data-id="aiStatusButton"]')
     .perform((done) => {
       browser.execute(function () { // hide tooltips
         function addStyle(styleString) {
@@ -78,7 +80,6 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
 
 function initModules(browser: NightwatchBrowser, callback: VoidFunction) {
   browser
-    .pause()
     .click('[data-id="verticalIconsKindpluginManager"]')
     .scrollAndClick('[data-id="pluginManagerComponentActivateButtonsolidityStaticAnalysis"]')
     .scrollAndClick('[data-id="pluginManagerComponentActivateButtondebugger"]')
diff --git a/libs/remix-ui/app/src/lib/remix-app/state/app.ts b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
index 708b22301a..2778233a09 100644
--- a/libs/remix-ui/app/src/lib/remix-app/state/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
@@ -6,5 +6,5 @@ export const appInitialState: AppState = {
   currentBranch: null,
   needsGitInit: true,
   canUseGit: false,
-  showPopupPanel: false
+  showPopupPanel: true
 }
\ No newline at end of file
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 53f3de6325..bfdf3f96bb 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -61,6 +61,7 @@ export default function AIStatus(props: AIStatusProps) {
             color: 'var(--ai)',
             boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
           }}
+          data-id="aiStatusButton"
           className='p-1 alert alert-info border border-info fa-solid fa-message-bot'
           onClick={async () => {
             appContext.appStateDispatch({

From 925bfa4e6e31db3bcdefb80e9bee1eda4ae978e4 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 15:58:48 +0100
Subject: [PATCH 12/82] hidescamdetails

---
 apps/remix-ide-e2e/src/commands/hideToolTips.ts            | 5 ++++-
 apps/remix-ide-e2e/src/helpers/init.ts                     | 5 +++--
 libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide-e2e/src/commands/hideToolTips.ts b/apps/remix-ide-e2e/src/commands/hideToolTips.ts
index 00a05e26c3..87d7e10b64 100644
--- a/apps/remix-ide-e2e/src/commands/hideToolTips.ts
+++ b/apps/remix-ide-e2e/src/commands/hideToolTips.ts
@@ -1,4 +1,4 @@
-import {NightwatchBrowser} from 'nightwatch'
+import { NightwatchBrowser } from 'nightwatch'
 import EventEmitter from 'events'
 
 class HideToolTips extends EventEmitter {
@@ -16,6 +16,9 @@ class HideToolTips extends EventEmitter {
             .popover {
               display:none !important;
             }
+            #scamDetails {
+              display:none !important;
+            }
           `)
         }, [], done())
       })
diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index a6c303f32d..5954ce7b38 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -27,8 +27,6 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     })
     .verifyLoad()
     .enableClipBoard()
-    .waitForElementVisible('*[data-id="hTScamAlertButton"]')
-    .click('*[data-id="hTScamAlertButton"]')
     .waitForElementVisible('*[data-id="aiStatusButton"]')
     .click('*[data-id="aiStatusButton"]')
     .perform((done) => {
@@ -43,6 +41,9 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
           .popover {
             display:none !important;
           }
+          #scamDetails {
+            display:none !important;
+          }
           `);
       }, [], done())
     })
diff --git a/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx b/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
index 9c9193b933..6a3108b313 100644
--- a/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
@@ -18,6 +18,7 @@ export default function ScamDetails ({ refs, floatStyle, scamAlerts }: ScamDetai
   return (
     <div
       ref={refs.setFloating}
+      id='scamDetails'
       style={{
         position: 'absolute',
         bottom: '-3.3rem',

From 7f5766765268c83b3c335f8e2026cfcb32a14a32 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 16:49:58 +0100
Subject: [PATCH 13/82] hide popup panel

---
 apps/remix-ide-e2e/src/helpers/init.ts           | 2 --
 libs/remix-ui/app/src/lib/remix-app/state/app.ts | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index 5954ce7b38..67e8f1a8fc 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -27,8 +27,6 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     })
     .verifyLoad()
     .enableClipBoard()
-    .waitForElementVisible('*[data-id="aiStatusButton"]')
-    .click('*[data-id="aiStatusButton"]')
     .perform((done) => {
       browser.execute(function () { // hide tooltips
         function addStyle(styleString) {
diff --git a/libs/remix-ui/app/src/lib/remix-app/state/app.ts b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
index 2778233a09..708b22301a 100644
--- a/libs/remix-ui/app/src/lib/remix-app/state/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
@@ -6,5 +6,5 @@ export const appInitialState: AppState = {
   currentBranch: null,
   needsGitInit: true,
   canUseGit: false,
-  showPopupPanel: true
+  showPopupPanel: false
 }
\ No newline at end of file

From da9549b35e0d6d34417633c1ea0e2e2bac0ac2f5 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 16:59:59 +0100
Subject: [PATCH 14/82] hide scam

---
 apps/remix-ide-e2e/src/commands/refreshPage.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/remix-ide-e2e/src/commands/refreshPage.ts b/apps/remix-ide-e2e/src/commands/refreshPage.ts
index 5147ceb839..309892536f 100644
--- a/apps/remix-ide-e2e/src/commands/refreshPage.ts
+++ b/apps/remix-ide-e2e/src/commands/refreshPage.ts
@@ -20,6 +20,9 @@ class RefreshPage extends EventEmitter {
                 .popover {
                   display:none !important;
                 }
+                #scamDetails {
+                  display:none !important;
+                }
                 `)
         }, [], done())
       })

From 73adade3383b1fa5c873e1eb43233efee5f4e6bb Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 29 Oct 2024 09:46:28 +0100
Subject: [PATCH 15/82] popup panel

---
 apps/remix-ide/src/app.js                     |  5 +-
 .../src/app/components/popup-panel.tsx        | 69 +++++++++++++++++++
 .../src/app/plugins/remixAIPlugin.tsx         |  2 +-
 .../app/src/lib/remix-app/remix-app.tsx       |  1 +
 4 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 apps/remix-ide/src/app/components/popup-panel.tsx

diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index a936cc5e33..23addcdf90 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -12,6 +12,7 @@ import { SidePanel } from './app/components/side-panel'
 import { StatusBar } from './app/components/status-bar'
 import { HiddenPanel } from './app/components/hidden-panel'
 import { PinnedPanel } from './app/components/pinned-panel'
+import { PopupPanel } from './app/components/popup-panel'
 import { VerticalIcons } from './app/components/vertical-icons'
 import { LandingPage } from './app/ui/landing-page/landing-page'
 import { MainPanel } from './app/components/main-panel'
@@ -450,6 +451,7 @@ class AppComponent {
     this.sidePanel = new SidePanel()
     this.hiddenPanel = new HiddenPanel()
     this.pinnedPanel = new PinnedPanel()
+    this.popupPanel = new PopupPanel()
 
     const pluginManagerComponent = new PluginManagerComponent(appManager, this.engine)
     const filePanel = new FilePanel(appManager, contentImport)
@@ -457,7 +459,7 @@ class AppComponent {
     const landingPage = new LandingPage(appManager, this.menuicons, fileManager, filePanel, contentImport)
     this.settings = new SettingsTab(Registry.getInstance().get('config').api, editor, appManager)
 
-    this.engine.register([this.menuicons, landingPage, this.hiddenPanel, this.sidePanel, this.statusBar, filePanel, pluginManagerComponent, this.settings, this.pinnedPanel])
+    this.engine.register([this.menuicons, landingPage, this.hiddenPanel, this.sidePanel, this.statusBar, filePanel, pluginManagerComponent, this.settings, this.pinnedPanel, this.popupPanel])
 
     // CONTENT VIEWS & DEFAULT PLUGINS
     const openZeppelinProxy = new OpenZeppelinProxy(blockchain)
@@ -540,6 +542,7 @@ class AppComponent {
     await this.appManager.activatePlugin(['statusBar'])
     await this.appManager.activatePlugin(['sidePanel']) // activating  host plugin separately
     await this.appManager.activatePlugin(['pinnedPanel'])
+    await this.appManager.activatePlugin(['popupPanel'])
     await this.appManager.activatePlugin(['home'])
     await this.appManager.activatePlugin(['settings', 'config'])
     await this.appManager.activatePlugin([
diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
new file mode 100644
index 0000000000..c91ab9644c
--- /dev/null
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -0,0 +1,69 @@
+import React from 'react' // eslint-disable-line
+import { AbstractPanel } from './panel'
+import { RemixPluginPanel } from '@remix-ui/panel'
+import packageJson from '../../../../../package.json'
+import { PluginViewWrapper } from '@remix-ui/helper'
+
+const profile = {
+  name: 'popupPanel',
+  displayName: 'Popup Panel',
+  description: 'Remix IDE popup panel',
+  version: packageJson.version,
+  methods: ['addView', 'removeView', 'showContent']
+}
+
+export class PopupPanel extends AbstractPanel {
+  element: HTMLDivElement
+  dispatch: React.Dispatch<any> = () => {}
+  constructor(config) {
+    super(profile)
+  }
+
+  setDispatch(dispatch: React.Dispatch<any>) {
+    this.dispatch = dispatch
+  }
+
+  onActivation() {
+    this.renderComponent()
+  }
+
+  focus(name) {
+    this.emit('focusChanged', name)
+    super.focus(name)
+    this.renderComponent()
+  }
+
+  addView(profile, view) {
+    super.addView(profile, view)
+    this.renderComponent()
+    this.showContent(profile.name) // should be handled by some click
+  }
+
+  removeView(profile) {
+    super.removeView(profile)
+    this.renderComponent()
+  }
+
+  async showContent(name) {
+    super.showContent(name)
+    this.renderComponent()
+  }
+
+  renderComponent() {
+    this.dispatch({
+      plugins: this.plugins
+    })
+  }
+
+  render() {
+    return (
+      <div style={{ height: '200', width: '200', position: 'fixed', bottom: 0, left: 0 }} data-id="popupPanelPluginsContainer">
+        <PluginViewWrapper plugin={this} />
+      </div>
+    )
+  }
+
+  updateComponent(state: any) {
+    return <RemixPluginPanel header={<></>} plugins={state.plugins} />
+  }
+}
diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
index d6d3c78a48..e307433c69 100644
--- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
@@ -21,7 +21,7 @@ const profile = {
   icon: 'assets/img/remix-logo-blue.png',
   description: 'RemixAI provides AI services to Remix IDE.',
   kind: '',
-  location: 'sidePanel',
+  location: 'popupPanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/remixai.html',
   version: packageJson.version,
   maintainedBy: 'Remix'
diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index f343310096..dd8a672525 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -244,6 +244,7 @@ const RemixApp = (props: IRemixAppUi) => {
                 }
                 <div>{props.app.hiddenPanel.render()}</div>
               </div>
+              <div>{props.app.popupPanel.render()}</div>
               <div className="statusBar fixed-bottom">
                 {props.app.statusBar.render()}
               </div>

From 13ef8733823c203b9e0a1ea26faaca2494108984 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Mon, 4 Nov 2024 09:30:14 +0100
Subject: [PATCH 16/82] popup for ai

---
 .../src/app/components/popup-panel.tsx        | 54 +++++++++++++++++--
 .../plugins/electron/remixAIDesktopPlugin.tsx |  2 +-
 .../src/app/plugins/remixAIPlugin.tsx         | 44 ++++++++++++++-
 .../remixdesktop/src/plugins/remixAIDektop.ts |  2 +-
 libs/remix-api/src/lib/plugins/remixai-api.ts |  1 +
 libs/remix-api/src/lib/remix-api.ts           |  8 +++
 .../panel/src/lib/plugins/remix-ui-panel.tsx  | 15 ++++--
 .../remix-ai/src/lib/components/Default.tsx   |  4 +-
 .../remix-ai/src/lib/components/RemixAI.tsx   | 18 +++++--
 .../remix-ai/src/lib/components/color.css     | 36 ++++++++++---
 libs/remix-ui/statusbar/src/css/statusbar.css |  5 ++
 .../statusbar/src/lib/components/aiStatus.tsx | 53 +++++++++++++++---
 .../src/lib/components/scamDetails.tsx        | 14 +++--
 .../src/lib/remixui-statusbar-panel.tsx       | 22 +++++---
 libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx  |  2 +-
 15 files changed, 236 insertions(+), 44 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index c91ab9644c..2f0f5ef049 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -3,20 +3,26 @@ import { AbstractPanel } from './panel'
 import { RemixPluginPanel } from '@remix-ui/panel'
 import packageJson from '../../../../../package.json'
 import { PluginViewWrapper } from '@remix-ui/helper'
+import {EventEmitter} from 'events'
 
 const profile = {
   name: 'popupPanel',
   displayName: 'Popup Panel',
   description: 'Remix IDE popup panel',
   version: packageJson.version,
-  methods: ['addView', 'removeView', 'showContent']
+  events: ['popupPanelShown'],
+  methods: ['addView', 'removeView', 'showContent', 'showPopupPanel']
 }
 
 export class PopupPanel extends AbstractPanel {
   element: HTMLDivElement
   dispatch: React.Dispatch<any> = () => {}
+  showPanel: boolean
+  
   constructor(config) {
     super(profile)
+    this.event = new EventEmitter()
+    this.showPanel = true
   }
 
   setDispatch(dispatch: React.Dispatch<any>) {
@@ -49,21 +55,59 @@ export class PopupPanel extends AbstractPanel {
     this.renderComponent()
   }
 
+  async showPopupPanel(show) {
+    console.log("hide in popup-panel =", show)
+    this.showPanel = show
+    this.event.emit('popupPanelShown', show)
+    this.renderComponent()
+  }
+
   renderComponent() {
     this.dispatch({
-      plugins: this.plugins
+      plugins: this.plugins,
+      showPpPanel: this.showPanel
     })
   }
 
   render() {
     return (
-      <div style={{ height: '200', width: '200', position: 'fixed', bottom: 0, left: 0 }} data-id="popupPanelPluginsContainer">
-        <PluginViewWrapper plugin={this} />
+      <div
+        className={'px-0 bg-light border-info ' + (!this.showPanel ? 'd-none' : 'd-flex')}
+        style={{
+          maxHeight: '40rem',
+          maxWidth: '25rem',
+          width: 'max-content',
+          height: '40rem',
+          position: 'fixed',
+          bottom: '2rem',
+          right: '3.5rem',
+          zIndex: 2000,
+          boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
+        }}
+        data-id="popupPanelPluginsContainer"
+      >
+        {this.showPanel && <PluginViewWrapper plugin={this} />}
       </div>
     )
   }
 
   updateComponent(state: any) {
-    return <RemixPluginPanel header={<></>} plugins={state.plugins} />
+    return (
+      <div className={!state.showPpPanel ? 'd-none' : 'd-flex'}>
+        <RemixPluginPanel
+          header={
+            <span id='menubarAIChat' className='pb-2 d-flex flex-row'>
+              <button
+                className='btn fas fa-angle-double-down'
+                onClick={async () => {
+                  console.log("hide")
+                  await this.showPopupPanel(false)
+                }}
+              >
+              </button>
+            </span>
+          }
+          plugins={state.plugins} />
+      </div>)
   }
 }
diff --git a/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx b/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx
index e9909ebc1f..1ead4faafd 100644
--- a/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx
@@ -10,7 +10,7 @@ const desktop_profile = {
   description: 'RemixAI provides AI services to Remix IDE Desktop.',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/remixai.html',
   icon: 'assets/img/remix-logo-blue.png',
-  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer'],
+  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer', 'toggle'],
 }
 
 export class remixAIDesktopPlugin extends ElectronPlugin {
diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
index e307433c69..eb5ef592a4 100644
--- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
@@ -5,10 +5,15 @@ import { RemixAITab, ChatApi } from '@remix-ui/remix-ai'
 import React, { useCallback } from 'react';
 import { ICompletions, IModel, RemoteInferencer, IRemoteModel, IParams, GenerationParams, CodeExplainAgent } from '@remix/remix-ai-core';
 import { CustomRemixApi } from '@remix-api'
+import { PluginViewWrapper } from '@remix-ui/helper'
 
 type chatRequestBufferT<T> = {
   [key in keyof T]: T[key]
 }
+enum AIChatViewState {
+  minimized = 0,
+  open = 1
+}
 
 const profile = {
   name: 'remixAI',
@@ -16,7 +21,8 @@ const profile = {
   methods: ['code_generation', 'code_completion',
     "solidity_answer", "code_explaining",
     "code_insertion", "error_explaining",
-    "initialize", 'chatPipe', 'ProcessChatRequestBuffer', 'isChatRequestPending'],
+    "initialize", 'chatPipe', 'ProcessChatRequestBuffer',
+    'isChatRequestPending', 'toggle'],
   events: [],
   icon: 'assets/img/remix-logo-blue.png',
   description: 'RemixAI provides AI services to Remix IDE.',
@@ -37,6 +43,7 @@ export class RemixAIPlugin extends ViewPlugin {
   chatRequestBuffer: chatRequestBufferT<any> = null
   agent: CodeExplainAgent
   useRemoteInferencer:boolean = false
+  dispatch: any
 
   constructor(inDesktop:boolean) {
     super(profile)
@@ -46,6 +53,7 @@ export class RemixAIPlugin extends ViewPlugin {
   }
 
   onActivation(): void {
+    //this.renderComponent(AIChatViewState.open)
     if (this.isOnDesktop) {
       console.log('Activating RemixAIPlugin on desktop')
       // this.on(this.remixDesktopPluginName, 'activated', () => {
@@ -59,6 +67,10 @@ export class RemixAIPlugin extends ViewPlugin {
     }
   }
 
+  toggle (open: AIChatViewState) {
+    this.renderComponent(open)
+  }
+  
   async initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean){
     if (this.isOnDesktop && !this.useRemoteInferencer) {
       // on desktop use remote inferencer -> false
@@ -201,13 +213,41 @@ export class RemixAIPlugin extends ViewPlugin {
       return ""
     }
   }
+
   isChatRequestPending(){
     return this.chatRequestBuffer != null
   }
 
+  setDispatch(dispatch) {
+    this.dispatch = dispatch
+    this.renderComponent(AIChatViewState.open)
+  }
+
+  renderComponent (open: AIChatViewState) {
+    this.dispatch({
+      plugin: this,
+      openState: open
+    })
+  }
+
   render() {
+    return <div
+      id='ai-view'
+      className='pb-2 mb-2 h-100 d-flex'
+      data-id='aichat-view'
+      style={{
+        minHeight: 'max-content',
+        maxWidth: '25rem',
+        width: '24rem',
+      }}
+    >
+      <PluginViewWrapper plugin={this} />
+    </div>
+  }
+
+  updateComponent(state) {
     return (
-      <RemixAITab plugin={this}></RemixAITab>
+      <RemixAITab plugin={state.plugin} openState={state.openState}></RemixAITab>
     )
   }
 }
diff --git a/apps/remixdesktop/src/plugins/remixAIDektop.ts b/apps/remixdesktop/src/plugins/remixAIDektop.ts
index 6382e28bba..75cf39612c 100644
--- a/apps/remixdesktop/src/plugins/remixAIDektop.ts
+++ b/apps/remixdesktop/src/plugins/remixAIDektop.ts
@@ -32,7 +32,7 @@ const clientProfile: Profile = {
   description: 'RemixAI provides AI services to Remix IDE Desktop.',
   kind: '',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/remixai.html',
-  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer']
+  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer', 'toggle']
 }
 
 class RemixAIDesktopPluginClient extends ElectronBasePluginClient {
diff --git a/libs/remix-api/src/lib/plugins/remixai-api.ts b/libs/remix-api/src/lib/plugins/remixai-api.ts
index 0ea1498151..799b180662 100644
--- a/libs/remix-api/src/lib/plugins/remixai-api.ts
+++ b/libs/remix-api/src/lib/plugins/remixai-api.ts
@@ -19,5 +19,6 @@ export interface IRemixAI {
     chatPipe(pipeMessage: string): Promise<void>,
     ProcessChatRequestBuffer(params:IParams): Promise<void>,
     initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean): Promise<void>,
+    toggle(boolean)
   }
 }
\ No newline at end of file
diff --git a/libs/remix-api/src/lib/remix-api.ts b/libs/remix-api/src/lib/remix-api.ts
index e8dad3b599..da580b7026 100644
--- a/libs/remix-api/src/lib/remix-api.ts
+++ b/libs/remix-api/src/lib/remix-api.ts
@@ -17,8 +17,15 @@ import { IRemixAI } from "./plugins/remixai-api"
 import { IRemixAID } from "./plugins/remixAIDesktop-api"
 import { IMenuIconsApi } from "./plugins/menuicons-api"
 import { IDgitPlugin } from "./plugins/dgitplugin-api"
+import { Api } from "@remixproject/plugin-utils";
+
 
 export interface ICustomRemixApi extends IRemixApi {
+  popupPanel: {
+    methods: ['showPopupPanel']
+    events: ['popupPanelShown']
+    showPopupPanel(): void
+  } & Api
   dgitApi: IGitApi
   dgit: IDgitPlugin
   config: IConfigApi
@@ -39,4 +46,5 @@ export interface ICustomRemixApi extends IRemixApi {
   remixAID: IRemixAID
 }
 
+
 export declare type CustomRemixApi = Readonly<ICustomRemixApi>
\ No newline at end of file
diff --git a/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx b/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
index 4e1fa59a2e..71aa3db8b0 100644
--- a/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
+++ b/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
@@ -14,16 +14,21 @@ export interface RemixPanelProps {
 
 export function RemixPluginPanel(props: RemixPanelProps) {
   return (
-    <>
+    <div className='d-flex flex-column'>
       {props.header}
       <div className="pluginsContainer">
         <div className="plugins" id="plugins">
-          {Object.values(props.plugins).map((pluginRecord) => {
-            return <RemixUIPanelPlugin key={pluginRecord.profile.name} pluginRecord={pluginRecord} initialState={props.pluginState} highlightStamp={props.highlightStamp} />
-          })}
+          { Object.values(props.plugins).map((pluginRecord) => {
+            return <RemixUIPanelPlugin
+              key={pluginRecord.profile.name}
+              pluginRecord={pluginRecord}
+              initialState={props.pluginState}
+              highlightStamp={props.highlightStamp}
+            />
+          }) }
         </div>
       </div>
-    </>
+    </div>
   )
 }
 
diff --git a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
index 459797294c..1f1ce48323 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
@@ -42,8 +42,8 @@ export const Default = (props) => {
   };
   ChatApi = useAiChatApi();
   const conversationStarters: ConversationStarter[] = [
-    { prompt: 'Explain briefly the current file in Editor', icon: <span>⭐️</span> },
-    { prompt: 'Explain what is a solidity contract!' }]
+    { prompt: 'Explain what is a solidity contract!'},
+    { prompt: 'Explain briefly the current file in Editor'}]
 
   // Define initial messages
   const initialMessages: ChatItem[] = [
diff --git a/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx b/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
index d55a3a9256..61b5910913 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
@@ -1,14 +1,22 @@
 import React, { useContext } from 'react'
 import '../remix-ai.css'
 import { Default, ChatApi } from './Default'
+enum AIChatViewState {
+  minimized = 0,
+  open = 1
+}
+interface IRemixAITab {
+  plugin: any,
+  openState: AIChatViewState
+}
+export const RemixAITab = (props: IRemixAITab) => {
 
-export const RemixAITab = (props) => {
-
-  const plugin = props.plugin
   return (
     <>
-      <div id="remixAITab" className="px-2 pb-4">
-        <Default plugin={plugin}></Default>
+      <div id="remixAITab" className="h-100 w-100 px-2 pb-1">
+        <div className='h-100'>
+          <Default plugin={props.plugin}></Default>
+        </div>
       </div>
     </>
   )
diff --git a/libs/remix-ui/remix-ai/src/lib/components/color.css b/libs/remix-ui/remix-ai/src/lib/components/color.css
index 836a05f103..40e54d438b 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/color.css
+++ b/libs/remix-ui/remix-ai/src/lib/components/color.css
@@ -1,11 +1,32 @@
 .nlux-theme-remix_ai_theme[data-color-scheme='light'] {
     --nlux-ChatRoom--BackgroundColor: var(--text-background);
+    padding-bottom: 0.1rem;
 }
 
 .nlux-theme-remix_ai_theme[data-color-scheme='dark'] {
     --nlux-ChatRoom--BackgroundColor: var(--text-background);
+    padding-bottom: 0.1rem;
 }
 
+.nlux-launchPad-container {
+  padding-bottom: 2rem;
+}
+
+.nlux-conversationStarters-container {
+  overflow-y: hidden;
+}
+
+.nlux-comp-conversationStarters {
+  width: auto !important;
+  padding: 0px !important
+}
+
+.nlux-conversationStarters-container>.nlux-comp-conversationStarters>.nlux-comp-conversationStarter {
+  border-width: 1px !important;
+  border-color: var(--text-background) !important;
+}
+
+
 .nlux-theme-remix_ai_theme {
 
     /* Override top-level chat room colors */
@@ -35,9 +56,13 @@
     --nlux-PromptInput-Focus-Outline--Width: 10px;
     --nlux-PromptInput-Max-Height: 50px;
     --nlux-PromptInput--BorderWidth: 0;
-    .nlux-comp-composer > textarea {padding: 8px;}
     --nlux-PromptInput--BorderRadius: 10px 0 0 10px;
-    --nlux-PromptInput-Height: 50px;
+    --nlux-PromptInput-Height: 30px;
+    --nlux-cvStrt--brdrWd: 0;
+    --nlux-cvStrt--brdClr: var(--light);
+    --nlux-cvStrt--brdrWd: 'hidden';
+    --nlux-comp-composer > textarea {padding: 8px;}
+
 
 
     /* Override input colors */
@@ -49,10 +74,10 @@
     --nlux-Composer--Gap: 0;
 
     /* Override submit button colors */
-    --nlux-SubmitButton--BackgroundColor: var(--primary);
-    --nlux-SubmitButton-Active--BackgroundColor:var(--primary);
+    --nlux-SubmitButton--BackgroundColor: var(--light);
+    --nlux-SubmitButton-Active--BackgroundColor:var(--light);
     --nlux-SubmitButton-Disabled--BackgroundColor: var(--dark);
-    --nlux-SubmitButton-Active--TextColor: var(--text);
+    --nlux-SubmitButton-Active--TextColor: var(--primary);
     --nlux-SubmitButton-Disabled--TextColor: var(--text);
 
     /** Inline code in markdown */
@@ -61,7 +86,6 @@
     --nlux-InlineCode--Padding: 0 2px;
     --nlux-InlineCode--FontSize: 14px;
     
-
     /*code block */
     --nlux-CodeBlock-CopyButton--BackgroundColor: var(--bg-text);
     --nlux-CodeBlock-CopyButton--TextColor: var(--text);
diff --git a/libs/remix-ui/statusbar/src/css/statusbar.css b/libs/remix-ui/statusbar/src/css/statusbar.css
index 4792ca77f3..30a5712f89 100644
--- a/libs/remix-ui/statusbar/src/css/statusbar.css
+++ b/libs/remix-ui/statusbar/src/css/statusbar.css
@@ -1,4 +1,9 @@
 
+.remixui_statusbar_gitstatus {
+  position: relative;
+  left: 20rem;
+}
+
 .remixui_statusbar_gitstatus
 .remixui_statusbar_gitstatus:hover {
   cursor: pointer;
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index fc6d774ce4..d476fba092 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -12,12 +12,24 @@ interface AIStatusProps {
 
 export default function AIStatus(props: AIStatusProps) {
   const [copilotActive, setCopilotActive] = useState(false)
+  const [expandAIChat, setExpandAIChat] = useState(true)
+
   useEffect(() => {
+    const popupPanelListener = async (show) => {
+      setTimeout(() => setExpandAIChat(show), 0);
+    };
+  
+    props.plugin.on('popupPanel', 'popupPanelShown', popupPanelListener)
+  
     const run = async () => {
       const aiActivate = await props.plugin.call('settings', 'get', 'settings/copilot/suggest/activate')
       setCopilotActive(aiActivate)
     }
     run()
+  
+    return () => {
+      props.plugin.off('popupPanel', 'popupPanelShown')
+    }
   }, [])
 
   useEffect(() => {
@@ -29,15 +41,42 @@ export default function AIStatus(props: AIStatusProps) {
     }
     run()
   }, [props.plugin.isAiActive, props.plugin.isAiActive])
+
   return (
-    <CustomTooltip
-      tooltipText={copilotActive ? "RemixAI Copilot enabled" : "RemixAI Copilot disabled. To enable, open a .sol file and toggle the switch at the left-top of the editor"}
-    >
-      <div className="d-flex flex-row pr-2 text-white justify-content-center align-items-center">
-        <span className={copilotActive === false ? "small mx-1 text-white semi-bold" : "small mx-1 text-white semi-bold" }>
+    <div>
+      <CustomTooltip
+        tooltipText={copilotActive ? "Disable RemixAI Copilot" : "Enable RemixAI Copilot. Switch to .sol file to try it."}
+      >
+        <span
+          style={{cursor: 'pointer'}}
+          className={"small mx-1 bg-info border-0 text-white " + (copilotActive === false ? "semi-bold" : "")}
+          onClick={async () => {
+            await props.plugin.call('settings' as any, 'updateCopilotChoice', !copilotActive)
+          }}
+        >
           {copilotActive === false ? 'RemixAI Copilot (disabled)' : 'RemixAI Copilot (enabled)'}
         </span>
+      </CustomTooltip>
+      <div className="d-flex text-sm flex-row pr-2 text-white justify-content-center align-items-center">
+        <button
+          style={{
+            position: 'absolute',
+            bottom: '0.7rem',
+            right: '0.3rem',
+            height: '3rem',
+            width: '3rem',
+            borderRadius: '50%',
+            color: 'var(--ai)',
+            boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
+          }}
+          className='p-1 alert alert-info border border-info fa-solid fa-message-bot'
+          onClick={async () => {
+            await props.plugin.call('popupPanel', 'showPopupPanel', !expandAIChat)
+          }}
+        >
+          {expandAIChat ? '1' : '0'}
+        </button>
       </div>
-    </CustomTooltip>
+    </div>
   )
-}
+}
\ No newline at end of file
diff --git a/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx b/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
index e72bfe62b5..9c9193b933 100644
--- a/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
@@ -18,13 +18,21 @@ export default function ScamDetails ({ refs, floatStyle, scamAlerts }: ScamDetai
   return (
     <div
       ref={refs.setFloating}
-      style={ floatStyle }
-      className="px-1 ml-1 mb-1 d-flex w-25 alert alert-warning border border-warning"
+      style={{
+        position: 'absolute',
+        bottom: '-3.3rem',
+        left: '-4rem',
+        height: '6rem',
+        transform: 'translate(88.5px, -80px)',
+        willChange: 'transform',
+        boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
+      } }
+      className="p-1 pb-0 mb-1 d-flex alert alert-warning border border-warning"
     >
       <span className="align-self-center pl-4 mt-1">
         <i style={{ fontSize: 'xxx-large', fontWeight: 'lighter' }} className="pr-2 far fa-exclamation-triangle"></i>
       </span>
-      <div className="d-flex flex-column">
+      <div className="d-flex flex-column pr-4 pt-2">
         {scamAlerts && scamAlerts.map((alert, index) => (
           <span className="pl-4 mt-1" key={`${alert.url}${index}`}>
             {alert.url.length < 1 ? <FormattedMessage id={`home.scamAlertText${index + 1}`} defaultMessage={alert.message} />
diff --git a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
index 5099d31286..cfd5caf99c 100644
--- a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
+++ b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
@@ -72,25 +72,35 @@ export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
       <StatusBarContextProvider>
         {(platform !== appPlatformTypes.desktop) && showScamDetails && (
           <FloatingFocusManager context={context} modal={false}>
-            <ScamDetails refs={refs} floatStyle={{ ...floatingStyles, minHeight: 'auto', alignContent: 'center', paddingRight: '0.5rem' }} getFloatingProps={getFloatingProps} scamAlerts={scamAlerts} />
+            <ScamDetails
+              refs={refs}
+              floatStyle={{
+                ...floatingStyles,
+                minHeight: 'auto',
+                alignContent: 'center',
+                paddingRight: '0.5rem',
+                bottom: '-8,5rem',
+                left: '0rem'
+              }}
+              getFloatingProps={getFloatingProps}
+              scamAlerts={scamAlerts}
+            />
           </FloatingFocusManager>
         )}
         <div className="d-flex remixui_statusbar_height flex-row bg-info justify-content-between align-items-center">
+          { (platform !== appPlatformTypes.desktop) && <div className="remixui_statusbar bg-warning px-2 remixui_statusbar_custom_padding d-flex justify-center align-items-center">
+              <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
+            </div> }
           <div className="remixui_statusbar remixui_statusbar_gitstatus">
             <GitStatus plugin={statusBarPlugin} gitBranchName={gitBranchName} setGitBranchName={setGitBranchName} />
           </div>
-          <div className="remixui_statusbar"></div>
           <div className="remixui_statusbar">
             <DidYouKnow />
           </div>
-          <div className="remixui_statusbar"></div>
           <div className="remixui_statusbar d-flex align-items-center p-0">
             <div className="remixui_statusbar">
               <AIStatus plugin={statusBarPlugin} aiActive={lightAiUp} isAiActive={isAiActive} setIsAiActive={setIsAiActive} />
             </div>
-            { (platform !== appPlatformTypes.desktop) && <div className="remixui_statusbar bg-warning px-2 remixui_statusbar_custom_padding d-flex justify-center align-items-center">
-              <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
-            </div> }
           </div>
         </div>
       </StatusBarContextProvider>
diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
index eaaffcad15..bae6a258c2 100644
--- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
+++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
@@ -279,7 +279,7 @@ export const TabsUI = (props: TabsUIProps) => {
                         methods: ['code_generation', 'code_completion',
                           "solidity_answer", "code_explaining",
                           "code_insertion", "error_explaining",
-                          "initialize", 'chatPipe', 'ProcessChatRequestBuffer', 'isChatRequestPending'],
+                          "initialize", 'chatPipe', 'ProcessChatRequestBuffer', 'isChatRequestPending', 'toggle'],
                         events: [],
                         icon: 'assets/img/remix-logo-blue.png',
                         description: 'RemixAI provides AI services to Remix IDE.',

From 14c15bd902d1b534acd6179b9eaaac5f1ee5545d Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 12:50:55 +0100
Subject: [PATCH 17/82] first fixes

---
 .../src/app/components/popup-panel.tsx        | 49 +++++++++++--------
 .../app/src/lib/remix-app/actions/app.ts      |  2 +
 .../app/src/lib/remix-app/interface/index.ts  |  1 +
 .../app/src/lib/remix-app/reducer/app.ts      | 47 ++++++++++--------
 .../app/src/lib/remix-app/state/app.ts        |  3 +-
 .../src/lib/components/PluginViewWrapper.tsx  | 14 +++++-
 .../panel/src/lib/plugins/remix-ui-panel.tsx  |  4 +-
 .../statusbar/src/lib/components/aiStatus.tsx | 10 +---
 8 files changed, 77 insertions(+), 53 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 2f0f5ef049..8388e8a83f 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -1,9 +1,11 @@
 import React from 'react' // eslint-disable-line
 import { AbstractPanel } from './panel'
-import { RemixPluginPanel } from '@remix-ui/panel'
+import { PluginRecord, RemixPluginPanel } from '@remix-ui/panel'
 import packageJson from '../../../../../package.json'
 import { PluginViewWrapper } from '@remix-ui/helper'
-import {EventEmitter} from 'events'
+import { EventEmitter } from 'events'
+import { AppState } from 'libs/remix-ui/app/src/lib/remix-app/interface'
+import { AppAction, appActionTypes } from '@remix-ui/app'
 
 const profile = {
   name: 'popupPanel',
@@ -13,22 +15,28 @@ const profile = {
   events: ['popupPanelShown'],
   methods: ['addView', 'removeView', 'showContent', 'showPopupPanel']
 }
+type popupPanelState = {
+  plugins: Record<string, PluginRecord>
+}
 
 export class PopupPanel extends AbstractPanel {
   element: HTMLDivElement
-  dispatch: React.Dispatch<any> = () => {}
-  showPanel: boolean
+  dispatch: React.Dispatch<any> = () => { }
+  appStateDispatch: React.Dispatch<AppAction> = () => { }
   
   constructor(config) {
     super(profile)
     this.event = new EventEmitter()
-    this.showPanel = true
   }
 
   setDispatch(dispatch: React.Dispatch<any>) {
     this.dispatch = dispatch
   }
 
+  setAppStateDispatch(appStateDispatch: React.Dispatch<AppAction>) {
+    this.appStateDispatch = appStateDispatch
+  }
+
   onActivation() {
     this.renderComponent()
   }
@@ -56,23 +64,31 @@ export class PopupPanel extends AbstractPanel {
   }
 
   async showPopupPanel(show) {
-    console.log("hide in popup-panel =", show)
-    this.showPanel = show
-    this.event.emit('popupPanelShown', show)
+    
+    this.appStateDispatch({
+      type: appActionTypes.setShowPopupPanel,
+      payload: show
+    })
     this.renderComponent()
   }
 
   renderComponent() {
     this.dispatch({
-      plugins: this.plugins,
-      showPpPanel: this.showPanel
+      plugins: this.plugins
     })
   }
 
   render() {
+    return (
+      <PluginViewWrapper plugin={this} />
+    )
+  }
+
+  updateComponent(state: popupPanelState & Partial<AppState>) {
+    console.log("state in updateComponent =", state)
     return (
       <div
-        className={'px-0 bg-light border-info ' + (!this.showPanel ? 'd-none' : 'd-flex')}
+        className={'px-0 bg-light border-info ' + (!state.showPopupPanel ? 'd-none' : 'd-flex')}
         style={{
           maxHeight: '40rem',
           maxWidth: '25rem',
@@ -86,14 +102,6 @@ export class PopupPanel extends AbstractPanel {
         }}
         data-id="popupPanelPluginsContainer"
       >
-        {this.showPanel && <PluginViewWrapper plugin={this} />}
-      </div>
-    )
-  }
-
-  updateComponent(state: any) {
-    return (
-      <div className={!state.showPpPanel ? 'd-none' : 'd-flex'}>
         <RemixPluginPanel
           header={
             <span id='menubarAIChat' className='pb-2 d-flex flex-row'>
@@ -108,6 +116,7 @@ export class PopupPanel extends AbstractPanel {
             </span>
           }
           plugins={state.plugins} />
-      </div>)
+      </div>
+    )
   }
 }
diff --git a/libs/remix-ui/app/src/lib/remix-app/actions/app.ts b/libs/remix-ui/app/src/lib/remix-app/actions/app.ts
index 716d351e94..246b10cad0 100644
--- a/libs/remix-ui/app/src/lib/remix-app/actions/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/actions/app.ts
@@ -17,6 +17,7 @@ export const enum appActionTypes {
   setCurrentBranch = 'SET_CURRENT_BRANCH',
   setNeedsGitInit = 'SET_NEEDS_GIT_INIT',
   setCanUseGit = 'SET_CAN_USE_GIT',
+  setShowPopupPanel = 'SET_SHOW_POPUP_PANEL',
 }
 
 type AppPayload = {
@@ -24,6 +25,7 @@ type AppPayload = {
   [appActionTypes.setCurrentBranch]: branch,
   [appActionTypes.setNeedsGitInit]: boolean,
   [appActionTypes.setCanUseGit]: boolean,
+  [appActionTypes.setShowPopupPanel]: boolean,
 }
 
 export type AppAction = ActionMap<AppPayload>[keyof ActionMap<
diff --git a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
index 0c146c98f7..531c2764d0 100644
--- a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
@@ -52,5 +52,6 @@ export interface AppState {
     currentBranch: branch
     needsGitInit: boolean
     canUseGit: boolean
+    showPopupPanel: boolean
 }
 
diff --git a/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts b/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
index 6dd37603bc..5abe07626c 100644
--- a/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
@@ -3,29 +3,36 @@ import { AppState } from "../interface";
 
 export const appReducer = (state: AppState, action: AppAction): AppState => {
   switch (action.type) {
-  case appActionTypes.setGitHubUser: {
-    return {
-      ...state,
-      gitHubUser: action.payload
+    case appActionTypes.setGitHubUser: {
+      return {
+        ...state,
+        gitHubUser: action.payload
+      }
     }
-  }
-  case appActionTypes.setCurrentBranch: {
-    return {
-      ...state,
-      currentBranch: action.payload
+    case appActionTypes.setCurrentBranch: {
+      return {
+        ...state,
+        currentBranch: action.payload
+      }
     }
-  }
-  case appActionTypes.setNeedsGitInit: {
-    return {
-      ...state,
-      needsGitInit: action.payload
+    case appActionTypes.setNeedsGitInit: {
+      return {
+        ...state,
+        needsGitInit: action.payload
+      }
     }
-  }
-  case appActionTypes.setCanUseGit: {
-    return {
-      ...state,
-      canUseGit: action.payload
+    case appActionTypes.setCanUseGit: {
+      return {
+        ...state,
+        canUseGit: action.payload
+      }
+    }
+
+    case appActionTypes.setShowPopupPanel: {
+      return {
+        ...state,
+        showPopupPanel: action.payload
+      }
     }
-  }
   }
 }
\ No newline at end of file
diff --git a/libs/remix-ui/app/src/lib/remix-app/state/app.ts b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
index 8086b75c9c..2778233a09 100644
--- a/libs/remix-ui/app/src/lib/remix-app/state/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
@@ -5,5 +5,6 @@ export const appInitialState: AppState = {
   gitHubUser: {} as GitHubUser,
   currentBranch: null,
   needsGitInit: true,
-  canUseGit: false
+  canUseGit: false,
+  showPopupPanel: true
 }
\ No newline at end of file
diff --git a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
index c88f985ef6..168f1095f2 100644
--- a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
+++ b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
@@ -1,4 +1,5 @@
-import React from 'react'
+import { AppContext } from '@remix-ui/app'
+import React, { useContext } from 'react'
 import { useEffect, useState } from 'react'
 
 interface IPluginViewWrapperProps {
@@ -7,12 +8,21 @@ interface IPluginViewWrapperProps {
 
 export const PluginViewWrapper = (props: IPluginViewWrapperProps) => {
   const [state, setState] = useState<any>(null)
+  const appContext = useContext(AppContext)
 
   useEffect(() => {
     if (props.plugin.setDispatch) {
       props.plugin.setDispatch(setState)
     }
+    if(props.plugin.setAppStateDispatch) {
+      props.plugin.setAppStateDispatch(appContext.appStateDispatch)
+    }
   }, [])
 
-  return <>{state ? <>{props.plugin.updateComponent(state)}</> : <></>}</>
+  return <>{state ? <>{props.plugin.updateComponent(
+    {
+      ...state,
+      ...appContext['appState']
+    })}
+  </> : <></>}</>
 }
diff --git a/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx b/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
index 71aa3db8b0..ba6c494a04 100644
--- a/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
+++ b/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx
@@ -14,7 +14,7 @@ export interface RemixPanelProps {
 
 export function RemixPluginPanel(props: RemixPanelProps) {
   return (
-    <div className='d-flex flex-column'>
+    <>
       {props.header}
       <div className="pluginsContainer">
         <div className="plugins" id="plugins">
@@ -28,7 +28,7 @@ export function RemixPluginPanel(props: RemixPanelProps) {
           }) }
         </div>
       </div>
-    </div>
+    </>
   )
 }
 
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index d476fba092..55b4fbf43d 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -12,14 +12,8 @@ interface AIStatusProps {
 
 export default function AIStatus(props: AIStatusProps) {
   const [copilotActive, setCopilotActive] = useState(false)
-  const [expandAIChat, setExpandAIChat] = useState(true)
 
   useEffect(() => {
-    const popupPanelListener = async (show) => {
-      setTimeout(() => setExpandAIChat(show), 0);
-    };
-  
-    props.plugin.on('popupPanel', 'popupPanelShown', popupPanelListener)
   
     const run = async () => {
       const aiActivate = await props.plugin.call('settings', 'get', 'settings/copilot/suggest/activate')
@@ -71,10 +65,10 @@ export default function AIStatus(props: AIStatusProps) {
           }}
           className='p-1 alert alert-info border border-info fa-solid fa-message-bot'
           onClick={async () => {
-            await props.plugin.call('popupPanel', 'showPopupPanel', !expandAIChat)
+            await props.plugin.call('popupPanel', 'showPopupPanel', true)
           }}
         >
-          {expandAIChat ? '1' : '0'}
+
         </button>
       </div>
     </div>

From f8667db195e0dd0b969550079ea68e2c9b6e9904 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 13:06:24 +0100
Subject: [PATCH 18/82] lianas css

---
 apps/remix-ide/src/app/components/popup-panel.tsx      |  2 +-
 libs/remix-ui/statusbar/src/css/statusbar.css          |  7 ++-----
 .../statusbar/src/lib/remixui-statusbar-panel.tsx      | 10 ++++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 8388e8a83f..2712b0725d 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -97,7 +97,7 @@ export class PopupPanel extends AbstractPanel {
           position: 'fixed',
           bottom: '2rem',
           right: '3.5rem',
-          zIndex: 2000,
+          zIndex: 200,
           boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
         }}
         data-id="popupPanelPluginsContainer"
diff --git a/libs/remix-ui/statusbar/src/css/statusbar.css b/libs/remix-ui/statusbar/src/css/statusbar.css
index 30a5712f89..11ee870603 100644
--- a/libs/remix-ui/statusbar/src/css/statusbar.css
+++ b/libs/remix-ui/statusbar/src/css/statusbar.css
@@ -1,9 +1,6 @@
-
-.remixui_statusbar_gitstatus {
-  position: relative;
-  left: 20rem;
+.remixui_statusbar {
+  white-space: nowrap;
 }
-
 .remixui_statusbar_gitstatus
 .remixui_statusbar_gitstatus:hover {
   cursor: pointer;
diff --git a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
index cfd5caf99c..a295239a10 100644
--- a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
+++ b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
@@ -91,13 +91,15 @@ export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
           { (platform !== appPlatformTypes.desktop) && <div className="remixui_statusbar bg-warning px-2 remixui_statusbar_custom_padding d-flex justify-center align-items-center">
               <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
             </div> }
-          <div className="remixui_statusbar remixui_statusbar_gitstatus">
-            <GitStatus plugin={statusBarPlugin} gitBranchName={gitBranchName} setGitBranchName={setGitBranchName} />
+          <div className='d-flex w-100 justify-content-between'>
+            <div className="remixui_statusbar remixui_statusbar_gitstatus">
+              <GitStatus plugin={statusBarPlugin} gitBranchName={gitBranchName} setGitBranchName={setGitBranchName} />
+            </div>
           </div>
-          <div className="remixui_statusbar">
+          <div className="w-100 remixui_statusbar">
             <DidYouKnow />
           </div>
-          <div className="remixui_statusbar d-flex align-items-center p-0">
+          <div className="remixui_statusbar d-flex w-100 justify-content-end p-0">
             <div className="remixui_statusbar">
               <AIStatus plugin={statusBarPlugin} aiActive={lightAiUp} isAiActive={isAiActive} setIsAiActive={setIsAiActive} />
             </div>

From fac93dc375ae5244d8e04edc16c49fed0f1414c8 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 13:36:36 +0100
Subject: [PATCH 19/82] fix state

---
 .../src/app/components/popup-panel.tsx        |  2 +-
 .../src/app/plugins/remixAIPlugin.tsx         | 17 ++++----------
 .../src/lib/plugins/popuppanel-api.ts         | 10 ++++++++
 libs/remix-api/src/lib/plugins/remixai-api.ts |  1 -
 .../src/lib/plugins/remixaiDesktop-api.ts     | 23 -------------------
 libs/remix-api/src/lib/remix-api.ts           |  7 ++----
 .../remix-ai/src/lib/components/RemixAI.tsx   |  6 +----
 .../statusbar/src/lib/components/aiStatus.tsx | 13 ++++++-----
 8 files changed, 25 insertions(+), 54 deletions(-)
 create mode 100644 libs/remix-api/src/lib/plugins/popuppanel-api.ts
 delete mode 100644 libs/remix-api/src/lib/plugins/remixaiDesktop-api.ts

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 2712b0725d..3b9af9ff23 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -12,7 +12,7 @@ const profile = {
   displayName: 'Popup Panel',
   description: 'Remix IDE popup panel',
   version: packageJson.version,
-  events: ['popupPanelShown'],
+  events: [],
   methods: ['addView', 'removeView', 'showContent', 'showPopupPanel']
 }
 type popupPanelState = {
diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
index eb5ef592a4..5bb7ac7e93 100644
--- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
@@ -10,10 +10,6 @@ import { PluginViewWrapper } from '@remix-ui/helper'
 type chatRequestBufferT<T> = {
   [key in keyof T]: T[key]
 }
-enum AIChatViewState {
-  minimized = 0,
-  open = 1
-}
 
 const profile = {
   name: 'remixAI',
@@ -53,7 +49,7 @@ export class RemixAIPlugin extends ViewPlugin {
   }
 
   onActivation(): void {
-    //this.renderComponent(AIChatViewState.open)
+
     if (this.isOnDesktop) {
       console.log('Activating RemixAIPlugin on desktop')
       // this.on(this.remixDesktopPluginName, 'activated', () => {
@@ -66,10 +62,6 @@ export class RemixAIPlugin extends ViewPlugin {
       this.initialize()
     }
   }
-
-  toggle (open: AIChatViewState) {
-    this.renderComponent(open)
-  }
   
   async initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean){
     if (this.isOnDesktop && !this.useRemoteInferencer) {
@@ -220,13 +212,12 @@ export class RemixAIPlugin extends ViewPlugin {
 
   setDispatch(dispatch) {
     this.dispatch = dispatch
-    this.renderComponent(AIChatViewState.open)
+    this.renderComponent()
   }
 
-  renderComponent (open: AIChatViewState) {
+  renderComponent () {
     this.dispatch({
       plugin: this,
-      openState: open
     })
   }
 
@@ -247,7 +238,7 @@ export class RemixAIPlugin extends ViewPlugin {
 
   updateComponent(state) {
     return (
-      <RemixAITab plugin={state.plugin} openState={state.openState}></RemixAITab>
+      <RemixAITab plugin={state.plugin}></RemixAITab>
     )
   }
 }
diff --git a/libs/remix-api/src/lib/plugins/popuppanel-api.ts b/libs/remix-api/src/lib/plugins/popuppanel-api.ts
new file mode 100644
index 0000000000..040a70bc0a
--- /dev/null
+++ b/libs/remix-api/src/lib/plugins/popuppanel-api.ts
@@ -0,0 +1,10 @@
+import { IFilePanel } from '@remixproject/plugin-api'
+import { StatusEvents } from '@remixproject/plugin-utils'
+
+export interface IPopupPanelAPI {
+    events:{
+    } & StatusEvents
+    methods: {
+        showPopupPanel(state: boolean): void
+    }
+}
diff --git a/libs/remix-api/src/lib/plugins/remixai-api.ts b/libs/remix-api/src/lib/plugins/remixai-api.ts
index 799b180662..0ea1498151 100644
--- a/libs/remix-api/src/lib/plugins/remixai-api.ts
+++ b/libs/remix-api/src/lib/plugins/remixai-api.ts
@@ -19,6 +19,5 @@ export interface IRemixAI {
     chatPipe(pipeMessage: string): Promise<void>,
     ProcessChatRequestBuffer(params:IParams): Promise<void>,
     initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean): Promise<void>,
-    toggle(boolean)
   }
 }
\ No newline at end of file
diff --git a/libs/remix-api/src/lib/plugins/remixaiDesktop-api.ts b/libs/remix-api/src/lib/plugins/remixaiDesktop-api.ts
deleted file mode 100644
index dc9deb7e82..0000000000
--- a/libs/remix-api/src/lib/plugins/remixaiDesktop-api.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { IParams } from "@remix/remix-ai-core";
-import { StatusEvents } from "@remixproject/plugin-utils";
-
-export interface IRemixAID {
-  events: {
-    activated():void,
-    onInference():void,
-    onInferenceDone():void,
-    onStreamResult(streamText: string):void,
-
-  } & StatusEvents,
-  methods: {
-    code_completion(context: string): Promise<string> 
-    code_insertion(msg_pfx: string, msg_sfx: string): Promise<string>,
-    code_generation(prompt: string): Promise<string | null>,
-    code_explaining(code: string, context?: string): Promise<string | null>,
-    error_explaining(prompt: string): Promise<string | null>,
-    solidity_answer(prompt: string): Promise<string | null>,
-    initializeModelBackend(local: boolean, generalModel?, completionModel?): Promise<boolean>,
-    chatPipe(pipeMessage: string): Promise<void>,
-    ProcessChatRequestBuffer(params:IParams): Promise<void>,
-  }
-}
\ No newline at end of file
diff --git a/libs/remix-api/src/lib/remix-api.ts b/libs/remix-api/src/lib/remix-api.ts
index da580b7026..7df4dc7104 100644
--- a/libs/remix-api/src/lib/remix-api.ts
+++ b/libs/remix-api/src/lib/remix-api.ts
@@ -18,14 +18,11 @@ import { IRemixAID } from "./plugins/remixAIDesktop-api"
 import { IMenuIconsApi } from "./plugins/menuicons-api"
 import { IDgitPlugin } from "./plugins/dgitplugin-api"
 import { Api } from "@remixproject/plugin-utils";
+import { IPopupPanelAPI } from "./plugins/popuppanel-api"
 
 
 export interface ICustomRemixApi extends IRemixApi {
-  popupPanel: {
-    methods: ['showPopupPanel']
-    events: ['popupPanelShown']
-    showPopupPanel(): void
-  } & Api
+  popupPanel: IPopupPanelAPI
   dgitApi: IGitApi
   dgit: IDgitPlugin
   config: IConfigApi
diff --git a/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx b/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
index 61b5910913..a5aaba4a7d 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
@@ -1,13 +1,9 @@
 import React, { useContext } from 'react'
 import '../remix-ai.css'
 import { Default, ChatApi } from './Default'
-enum AIChatViewState {
-  minimized = 0,
-  open = 1
-}
+
 interface IRemixAITab {
   plugin: any,
-  openState: AIChatViewState
 }
 export const RemixAITab = (props: IRemixAITab) => {
 
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 55b4fbf43d..48864811a2 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -1,7 +1,8 @@
 // eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
 import { StatusBar } from 'apps/remix-ide/src/app/components/status-bar'
 import { CustomTooltip } from '@remix-ui/helper'
-import React, { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
+import { appActionTypes, AppContext } from '@remix-ui/app'
 
 interface AIStatusProps {
   plugin: StatusBar
@@ -12,7 +13,7 @@ interface AIStatusProps {
 
 export default function AIStatus(props: AIStatusProps) {
   const [copilotActive, setCopilotActive] = useState(false)
-
+  const appContext = useContext(AppContext)
   useEffect(() => {
   
     const run = async () => {
@@ -21,9 +22,6 @@ export default function AIStatus(props: AIStatusProps) {
     }
     run()
   
-    return () => {
-      props.plugin.off('popupPanel', 'popupPanelShown')
-    }
   }, [])
 
   useEffect(() => {
@@ -65,7 +63,10 @@ export default function AIStatus(props: AIStatusProps) {
           }}
           className='p-1 alert alert-info border border-info fa-solid fa-message-bot'
           onClick={async () => {
-            await props.plugin.call('popupPanel', 'showPopupPanel', true)
+            appContext.appStateDispatch({
+              type: appActionTypes.setShowPopupPanel,
+              payload: !appContext.appState.showPopupPanel
+            })
           }}
         >
 

From cbab1a11fb730502a24b052146a8a576b13717ba Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 13:46:01 +0100
Subject: [PATCH 20/82] clean up

---
 .../src/app/components/popup-panel.tsx        | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 3b9af9ff23..f45a9f3d3f 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -23,7 +23,7 @@ export class PopupPanel extends AbstractPanel {
   element: HTMLDivElement
   dispatch: React.Dispatch<any> = () => { }
   appStateDispatch: React.Dispatch<AppAction> = () => { }
-  
+
   constructor(config) {
     super(profile)
     this.event = new EventEmitter()
@@ -64,7 +64,7 @@ export class PopupPanel extends AbstractPanel {
   }
 
   async showPopupPanel(show) {
-    
+
     this.appStateDispatch({
       type: appActionTypes.setShowPopupPanel,
       payload: show
@@ -85,7 +85,6 @@ export class PopupPanel extends AbstractPanel {
   }
 
   updateComponent(state: popupPanelState & Partial<AppState>) {
-    console.log("state in updateComponent =", state)
     return (
       <div
         className={'px-0 bg-light border-info ' + (!state.showPopupPanel ? 'd-none' : 'd-flex')}
@@ -102,20 +101,21 @@ export class PopupPanel extends AbstractPanel {
         }}
         data-id="popupPanelPluginsContainer"
       >
-        <RemixPluginPanel
-          header={
-            <span id='menubarAIChat' className='pb-2 d-flex flex-row'>
-              <button
-                className='btn fas fa-angle-double-down'
-                onClick={async () => {
-                  console.log("hide")
-                  await this.showPopupPanel(false)
-                }}
-              >
-              </button>
-            </span>
-          }
-          plugins={state.plugins} />
+        <div className='d-flex flex-column'>
+          <RemixPluginPanel
+            header={
+              <span id='popupPanelToggle' className='pb-2 d-flex flex-row'>
+                <button
+                  className='btn fas fa-angle-double-down'
+                  onClick={async () => {
+                    await this.showPopupPanel(false)
+                  }}
+                >
+                </button>
+              </span>
+            }
+            plugins={state.plugins} />
+        </div>
       </div>
     )
   }

From ed896ee6fc5c081b98939615e34b6b43a869c451 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 13:49:45 +0100
Subject: [PATCH 21/82] linting

---
 .../src/app/components/popup-panel.tsx        |  4 +-
 .../src/app/plugins/remixAIPlugin.tsx         |  2 +-
 libs/remix-ui/app/src/index.ts                |  2 +-
 .../app/src/lib/remix-app/reducer/app.ts      | 50 +++++++++----------
 .../src/lib/components/PluginViewWrapper.tsx  |  2 +-
 .../remix-ai/src/lib/components/Default.tsx   |  4 +-
 .../statusbar/src/lib/components/aiStatus.tsx |  6 +--
 .../src/lib/remixui-statusbar-panel.tsx       |  4 +-
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index f45a9f3d3f..363d89d2cf 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -4,8 +4,8 @@ import { PluginRecord, RemixPluginPanel } from '@remix-ui/panel'
 import packageJson from '../../../../../package.json'
 import { PluginViewWrapper } from '@remix-ui/helper'
 import { EventEmitter } from 'events'
-import { AppState } from 'libs/remix-ui/app/src/lib/remix-app/interface'
-import { AppAction, appActionTypes } from '@remix-ui/app'
+
+import { AppAction, appActionTypes, AppState } from '@remix-ui/app'
 
 const profile = {
   name: 'popupPanel',
diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
index 5bb7ac7e93..34a3a15298 100644
--- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
@@ -62,7 +62,7 @@ export class RemixAIPlugin extends ViewPlugin {
       this.initialize()
     }
   }
-  
+
   async initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean){
     if (this.isOnDesktop && !this.useRemoteInferencer) {
       // on desktop use remote inferencer -> false
diff --git a/libs/remix-ui/app/src/index.ts b/libs/remix-ui/app/src/index.ts
index 31dea89385..4602431686 100644
--- a/libs/remix-ui/app/src/index.ts
+++ b/libs/remix-ui/app/src/index.ts
@@ -2,6 +2,6 @@ export { default as RemixApp } from './lib/remix-app/remix-app'
 export { dispatchModalContext, dispatchModalInterface, AppContext, appProviderContextType, appPlatformTypes, platformContext, onLineContext } from './lib/remix-app/context/context'
 export { ModalProvider, useDialogDispatchers } from './lib/remix-app/context/provider'
 export { AppModal } from './lib/remix-app/interface/index'
-export { AlertModal } from './lib/remix-app/interface/index'
+export { AlertModal, AppState } from './lib/remix-app/interface/index'
 export { ModalTypes, AppModalCancelTypes } from './lib/remix-app/types/index'
 export { AppAction, appActionTypes } from './lib/remix-app/actions/app'
diff --git a/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts b/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
index 5abe07626c..39d61cab75 100644
--- a/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
@@ -3,36 +3,36 @@ import { AppState } from "../interface";
 
 export const appReducer = (state: AppState, action: AppAction): AppState => {
   switch (action.type) {
-    case appActionTypes.setGitHubUser: {
-      return {
-        ...state,
-        gitHubUser: action.payload
-      }
+  case appActionTypes.setGitHubUser: {
+    return {
+      ...state,
+      gitHubUser: action.payload
     }
-    case appActionTypes.setCurrentBranch: {
-      return {
-        ...state,
-        currentBranch: action.payload
-      }
+  }
+  case appActionTypes.setCurrentBranch: {
+    return {
+      ...state,
+      currentBranch: action.payload
     }
-    case appActionTypes.setNeedsGitInit: {
-      return {
-        ...state,
-        needsGitInit: action.payload
-      }
+  }
+  case appActionTypes.setNeedsGitInit: {
+    return {
+      ...state,
+      needsGitInit: action.payload
     }
-    case appActionTypes.setCanUseGit: {
-      return {
-        ...state,
-        canUseGit: action.payload
-      }
+  }
+  case appActionTypes.setCanUseGit: {
+    return {
+      ...state,
+      canUseGit: action.payload
     }
+  }
 
-    case appActionTypes.setShowPopupPanel: {
-      return {
-        ...state,
-        showPopupPanel: action.payload
-      }
+  case appActionTypes.setShowPopupPanel: {
+    return {
+      ...state,
+      showPopupPanel: action.payload
     }
   }
+  }
 }
\ No newline at end of file
diff --git a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
index 168f1095f2..c29f58d4dc 100644
--- a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
+++ b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
@@ -14,7 +14,7 @@ export const PluginViewWrapper = (props: IPluginViewWrapperProps) => {
     if (props.plugin.setDispatch) {
       props.plugin.setDispatch(setState)
     }
-    if(props.plugin.setAppStateDispatch) {
+    if (props.plugin.setAppStateDispatch) {
       props.plugin.setAppStateDispatch(appContext.appStateDispatch)
     }
   }, [])
diff --git a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
index 1f1ce48323..bdeaacbea7 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
@@ -42,8 +42,8 @@ export const Default = (props) => {
   };
   ChatApi = useAiChatApi();
   const conversationStarters: ConversationStarter[] = [
-    { prompt: 'Explain what is a solidity contract!'},
-    { prompt: 'Explain briefly the current file in Editor'}]
+    { prompt: 'Explain what is a solidity contract!' },
+    { prompt: 'Explain briefly the current file in Editor' }]
 
   // Define initial messages
   const initialMessages: ChatItem[] = [
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 48864811a2..53f3de6325 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -15,13 +15,13 @@ export default function AIStatus(props: AIStatusProps) {
   const [copilotActive, setCopilotActive] = useState(false)
   const appContext = useContext(AppContext)
   useEffect(() => {
-  
+
     const run = async () => {
       const aiActivate = await props.plugin.call('settings', 'get', 'settings/copilot/suggest/activate')
       setCopilotActive(aiActivate)
     }
     run()
-  
+
   }, [])
 
   useEffect(() => {
@@ -40,7 +40,7 @@ export default function AIStatus(props: AIStatusProps) {
         tooltipText={copilotActive ? "Disable RemixAI Copilot" : "Enable RemixAI Copilot. Switch to .sol file to try it."}
       >
         <span
-          style={{cursor: 'pointer'}}
+          style={{ cursor: 'pointer' }}
           className={"small mx-1 bg-info border-0 text-white " + (copilotActive === false ? "semi-bold" : "")}
           onClick={async () => {
             await props.plugin.call('settings' as any, 'updateCopilotChoice', !copilotActive)
diff --git a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
index a295239a10..22b1dac390 100644
--- a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
+++ b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
@@ -89,8 +89,8 @@ export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
         )}
         <div className="d-flex remixui_statusbar_height flex-row bg-info justify-content-between align-items-center">
           { (platform !== appPlatformTypes.desktop) && <div className="remixui_statusbar bg-warning px-2 remixui_statusbar_custom_padding d-flex justify-center align-items-center">
-              <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
-            </div> }
+            <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
+          </div> }
           <div className='d-flex w-100 justify-content-between'>
             <div className="remixui_statusbar remixui_statusbar_gitstatus">
               <GitStatus plugin={statusBarPlugin} gitBranchName={gitBranchName} setGitBranchName={setGitBranchName} />

From 8af1f52dbe32e4724fcbdd4975161155e5c96b3a Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 14:07:23 +0100
Subject: [PATCH 22/82] hide popup

---
 libs/remix-ui/app/src/lib/remix-app/state/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/app/src/lib/remix-app/state/app.ts b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
index 2778233a09..708b22301a 100644
--- a/libs/remix-ui/app/src/lib/remix-app/state/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
@@ -6,5 +6,5 @@ export const appInitialState: AppState = {
   currentBranch: null,
   needsGitInit: true,
   canUseGit: false,
-  showPopupPanel: true
+  showPopupPanel: false
 }
\ No newline at end of file

From 9734f542d6c40eea315a4931e3dea76b5f5042dc Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 14:32:47 +0100
Subject: [PATCH 23/82] hidescam button

---
 apps/remix-ide-e2e/src/helpers/init.ts                         | 3 +++
 libs/remix-ui/statusbar/src/lib/components/scamAlertStatus.tsx | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index f30ce3dd62..cd6bdb86af 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -27,6 +27,8 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     })
     .verifyLoad()
     .enableClipBoard()
+    .waitForElementVisible('*[data-id="hTScamAlertButton"]')
+    .click('*[data-id="hTScamAlertButton"]')
     .perform((done) => {
       browser.execute(function () { // hide tooltips
         function addStyle(styleString) {
@@ -76,6 +78,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
 
 function initModules(browser: NightwatchBrowser, callback: VoidFunction) {
   browser
+    .pause()
     .click('[data-id="verticalIconsKindpluginManager"]')
     .scrollAndClick('[data-id="pluginManagerComponentActivateButtonsolidityStaticAnalysis"]')
     .scrollAndClick('[data-id="pluginManagerComponentActivateButtondebugger"]')
diff --git a/libs/remix-ui/statusbar/src/lib/components/scamAlertStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/scamAlertStatus.tsx
index d3cbce68fd..98a8b1fc4c 100644
--- a/libs/remix-ui/statusbar/src/lib/components/scamAlertStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/scamAlertStatus.tsx
@@ -15,7 +15,7 @@ export default function ScamAlertStatus ({ refs, getReferenceProps }: ScamAlertS
       <CustomTooltip
         tooltipText={"Scam Alerts"}
       >
-        <div className="mr-1 d-flex align-items-center justify-content-center remixui_statusbar_scamAlert" id="hTScamAlertSection" ref={refs.setReference} {...getReferenceProps()}>
+        <div className="mr-1 d-flex align-items-center justify-content-center remixui_statusbar_scamAlert" data-id="hTScamAlertButton" id="hTScamAlertSection" ref={refs.setReference} {...getReferenceProps()}>
           <span className="pr-2 far fa-exclamation-triangle text-white"></span>
           <span className="text-white font-semibold small">
             <FormattedMessage id="home.scamAlert" />

From d244c909be59381867d4ae89c56dc68e90a9bc69 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 15:16:14 +0100
Subject: [PATCH 24/82] fix bugs

---
 .../src/app/components/popup-panel.tsx        |  6 +--
 .../src/lib/components/PluginViewWrapper.tsx  | 37 +++++++++++--------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 363d89d2cf..b85c3eb8a8 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -80,14 +80,14 @@ export class PopupPanel extends AbstractPanel {
 
   render() {
     return (
-      <PluginViewWrapper plugin={this} />
+      <PluginViewWrapper useAppContext={true} plugin={this} />
     )
   }
 
-  updateComponent(state: popupPanelState & Partial<AppState>) {
+  updateComponent(state: popupPanelState, appState: Partial<AppState>) {
     return (
       <div
-        className={'px-0 bg-light border-info ' + (!state.showPopupPanel ? 'd-none' : 'd-flex')}
+        className={`px-0 bg-light border-info ${appState?.showPopupPanel ? 'd-flex' : 'd-none'}`}
         style={{
           maxHeight: '40rem',
           maxWidth: '25rem',
diff --git a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
index c29f58d4dc..e5e7700eac 100644
--- a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
+++ b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
@@ -1,28 +1,35 @@
 import { AppContext } from '@remix-ui/app'
-import React, { useContext } from 'react'
-import { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 
 interface IPluginViewWrapperProps {
   plugin: any
+  useAppContext?: boolean // Optional flag to decide whether to use AppContext
 }
 
-export const PluginViewWrapper = (props: IPluginViewWrapperProps) => {
+export const PluginViewWrapper = ({ plugin, useAppContext = false }: IPluginViewWrapperProps) => {
   const [state, setState] = useState<any>(null)
-  const appContext = useContext(AppContext)
+  const appContext = useAppContext ? useContext(AppContext) : null
 
   useEffect(() => {
-    if (props.plugin.setDispatch) {
-      props.plugin.setDispatch(setState)
+    if (plugin.setDispatch) {
+      plugin.setDispatch(setState)
     }
-    if (props.plugin.setAppStateDispatch) {
-      props.plugin.setAppStateDispatch(appContext.appStateDispatch)
+    if (useAppContext && appContext.appStateDispatch && plugin.setAppStateDispatch) {
+      plugin.setAppStateDispatch(appContext.appStateDispatch)
     }
-  }, [])
+  }, [plugin])
 
-  return <>{state ? <>{props.plugin.updateComponent(
-    {
-      ...state,
-      ...appContext['appState']
-    })}
-  </> : <></>}</>
+  if (useAppContext && appContext && appContext.appState) {
+    return (
+      <>
+        {state ? <>{plugin.updateComponent(state, appContext.appState)}</> : <></>}
+      </>
+    )
+  }
+
+  return (
+    <>
+      {state ? <>{plugin.updateComponent(state)}</> : <></>}
+    </>
+  )
 }

From d3c71d16413d23d8cbb61bde0ca38f40592c1853 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 15:31:20 +0100
Subject: [PATCH 25/82] init

---
 apps/remix-ide-e2e/src/helpers/init.ts                  | 3 ++-
 libs/remix-ui/app/src/lib/remix-app/state/app.ts        | 2 +-
 libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index cd6bdb86af..a6c303f32d 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -29,6 +29,8 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     .enableClipBoard()
     .waitForElementVisible('*[data-id="hTScamAlertButton"]')
     .click('*[data-id="hTScamAlertButton"]')
+    .waitForElementVisible('*[data-id="aiStatusButton"]')
+    .click('*[data-id="aiStatusButton"]')
     .perform((done) => {
       browser.execute(function () { // hide tooltips
         function addStyle(styleString) {
@@ -78,7 +80,6 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
 
 function initModules(browser: NightwatchBrowser, callback: VoidFunction) {
   browser
-    .pause()
     .click('[data-id="verticalIconsKindpluginManager"]')
     .scrollAndClick('[data-id="pluginManagerComponentActivateButtonsolidityStaticAnalysis"]')
     .scrollAndClick('[data-id="pluginManagerComponentActivateButtondebugger"]')
diff --git a/libs/remix-ui/app/src/lib/remix-app/state/app.ts b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
index 708b22301a..2778233a09 100644
--- a/libs/remix-ui/app/src/lib/remix-app/state/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
@@ -6,5 +6,5 @@ export const appInitialState: AppState = {
   currentBranch: null,
   needsGitInit: true,
   canUseGit: false,
-  showPopupPanel: false
+  showPopupPanel: true
 }
\ No newline at end of file
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 53f3de6325..bfdf3f96bb 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -61,6 +61,7 @@ export default function AIStatus(props: AIStatusProps) {
             color: 'var(--ai)',
             boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
           }}
+          data-id="aiStatusButton"
           className='p-1 alert alert-info border border-info fa-solid fa-message-bot'
           onClick={async () => {
             appContext.appStateDispatch({

From 29fca2194639594a09688ad38f7fff8c6b07fe1a Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 15:58:48 +0100
Subject: [PATCH 26/82] hidescamdetails

---
 apps/remix-ide-e2e/src/commands/hideToolTips.ts            | 5 ++++-
 apps/remix-ide-e2e/src/helpers/init.ts                     | 5 +++--
 libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide-e2e/src/commands/hideToolTips.ts b/apps/remix-ide-e2e/src/commands/hideToolTips.ts
index 00a05e26c3..87d7e10b64 100644
--- a/apps/remix-ide-e2e/src/commands/hideToolTips.ts
+++ b/apps/remix-ide-e2e/src/commands/hideToolTips.ts
@@ -1,4 +1,4 @@
-import {NightwatchBrowser} from 'nightwatch'
+import { NightwatchBrowser } from 'nightwatch'
 import EventEmitter from 'events'
 
 class HideToolTips extends EventEmitter {
@@ -16,6 +16,9 @@ class HideToolTips extends EventEmitter {
             .popover {
               display:none !important;
             }
+            #scamDetails {
+              display:none !important;
+            }
           `)
         }, [], done())
       })
diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index a6c303f32d..5954ce7b38 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -27,8 +27,6 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     })
     .verifyLoad()
     .enableClipBoard()
-    .waitForElementVisible('*[data-id="hTScamAlertButton"]')
-    .click('*[data-id="hTScamAlertButton"]')
     .waitForElementVisible('*[data-id="aiStatusButton"]')
     .click('*[data-id="aiStatusButton"]')
     .perform((done) => {
@@ -43,6 +41,9 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
           .popover {
             display:none !important;
           }
+          #scamDetails {
+            display:none !important;
+          }
           `);
       }, [], done())
     })
diff --git a/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx b/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
index 9c9193b933..6a3108b313 100644
--- a/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
@@ -18,6 +18,7 @@ export default function ScamDetails ({ refs, floatStyle, scamAlerts }: ScamDetai
   return (
     <div
       ref={refs.setFloating}
+      id='scamDetails'
       style={{
         position: 'absolute',
         bottom: '-3.3rem',

From a82298ca28e434dc172313c3c384d988964329e1 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 16:49:58 +0100
Subject: [PATCH 27/82] hide popup panel

---
 apps/remix-ide-e2e/src/helpers/init.ts           | 2 --
 libs/remix-ui/app/src/lib/remix-app/state/app.ts | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index 5954ce7b38..67e8f1a8fc 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -27,8 +27,6 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     })
     .verifyLoad()
     .enableClipBoard()
-    .waitForElementVisible('*[data-id="aiStatusButton"]')
-    .click('*[data-id="aiStatusButton"]')
     .perform((done) => {
       browser.execute(function () { // hide tooltips
         function addStyle(styleString) {
diff --git a/libs/remix-ui/app/src/lib/remix-app/state/app.ts b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
index 2778233a09..708b22301a 100644
--- a/libs/remix-ui/app/src/lib/remix-app/state/app.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
@@ -6,5 +6,5 @@ export const appInitialState: AppState = {
   currentBranch: null,
   needsGitInit: true,
   canUseGit: false,
-  showPopupPanel: true
+  showPopupPanel: false
 }
\ No newline at end of file

From e958836133c825e23e1a2c9fa1eae914d53d968c Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 16:59:59 +0100
Subject: [PATCH 28/82] hide scam

---
 apps/remix-ide-e2e/src/commands/refreshPage.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/remix-ide-e2e/src/commands/refreshPage.ts b/apps/remix-ide-e2e/src/commands/refreshPage.ts
index 5147ceb839..309892536f 100644
--- a/apps/remix-ide-e2e/src/commands/refreshPage.ts
+++ b/apps/remix-ide-e2e/src/commands/refreshPage.ts
@@ -20,6 +20,9 @@ class RefreshPage extends EventEmitter {
                 .popover {
                   display:none !important;
                 }
+                #scamDetails {
+                  display:none !important;
+                }
                 `)
         }, [], done())
       })

From 8cba5e05a1207a1574cab1400ea24734ac1c2248 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 17:21:08 +0100
Subject: [PATCH 29/82] timeout

---
 apps/remix-ide-e2e/nightwatch-chrome.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/nightwatch-chrome.ts b/apps/remix-ide-e2e/nightwatch-chrome.ts
index f1b95992eb..864b5f9f4f 100644
--- a/apps/remix-ide-e2e/nightwatch-chrome.ts
+++ b/apps/remix-ide-e2e/nightwatch-chrome.ts
@@ -21,7 +21,7 @@ module.exports = {
     'default': {
       globals: {
         waitForConditionTimeout: 10000,
-        asyncHookTimeout: 10000000
+        asyncHookTimeout: 30000000
       },
       screenshots: {
         enabled: true,

From e4d64a8b756e6cb8a7d35d74dbdb18f59d24a7e8 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 17:25:22 +0100
Subject: [PATCH 30/82] increase timeouts

---
 apps/remix-ide-e2e/nightwatch-chrome.ts     | 2 +-
 apps/remix-ide-e2e/src/tests/circom.test.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/nightwatch-chrome.ts b/apps/remix-ide-e2e/nightwatch-chrome.ts
index 864b5f9f4f..f1b95992eb 100644
--- a/apps/remix-ide-e2e/nightwatch-chrome.ts
+++ b/apps/remix-ide-e2e/nightwatch-chrome.ts
@@ -21,7 +21,7 @@ module.exports = {
     'default': {
       globals: {
         waitForConditionTimeout: 10000,
-        asyncHookTimeout: 30000000
+        asyncHookTimeout: 10000000
       },
       screenshots: {
         enabled: true,
diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
index 9ef2661f82..3c62015ad8 100644
--- a/apps/remix-ide-e2e/src/tests/circom.test.ts
+++ b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -5,6 +5,7 @@ import init from '../helpers/init'
 module.exports = {
   '@disabled': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    browser.globals.asyncHookTimeout = 30000000; 
     init(browser, done)
   },
 

From 4d047091ba75176e297d5d5487de1511a28a7b37 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Mon, 4 Nov 2024 22:59:40 +0100
Subject: [PATCH 31/82] style

---
 .../src/app/components/popup-panel.tsx        |  4 +-
 .../plugins/electron/remixAIDesktopPlugin.tsx |  2 +-
 .../src/app/plugins/remixAIPlugin.tsx         |  4 +-
 .../remixdesktop/src/plugins/remixAIDektop.ts |  2 +-
 .../remix-ai/src/lib/components/RemixAI.tsx   |  2 +-
 .../remix-ai/src/lib/components/color.css     | 22 ++++---
 .../remix-ai/src/lib/components/personas.tsx  |  4 +-
 .../statusbar/src/lib/components/aiStatus.tsx | 60 +++++++++++--------
 .../src/lib/components/scamDetails.tsx        |  2 +-
 9 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index b85c3eb8a8..3e5155d181 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -97,14 +97,14 @@ export class PopupPanel extends AbstractPanel {
           bottom: '2rem',
           right: '3.5rem',
           zIndex: 200,
-          boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
+          boxShadow: "0 1px 7px var(--secondary)"
         }}
         data-id="popupPanelPluginsContainer"
       >
         <div className='d-flex flex-column'>
           <RemixPluginPanel
             header={
-              <span id='popupPanelToggle' className='pb-2 d-flex flex-row'>
+              <span id='popupPanelToggle' className='d-flex flex-row'>
                 <button
                   className='btn fas fa-angle-double-down'
                   onClick={async () => {
diff --git a/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx b/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx
index 1ead4faafd..e9909ebc1f 100644
--- a/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/electron/remixAIDesktopPlugin.tsx
@@ -10,7 +10,7 @@ const desktop_profile = {
   description: 'RemixAI provides AI services to Remix IDE Desktop.',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/remixai.html',
   icon: 'assets/img/remix-logo-blue.png',
-  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer', 'toggle'],
+  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer'],
 }
 
 export class remixAIDesktopPlugin extends ElectronPlugin {
diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
index 34a3a15298..6004c20c56 100644
--- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
@@ -18,7 +18,7 @@ const profile = {
     "solidity_answer", "code_explaining",
     "code_insertion", "error_explaining",
     "initialize", 'chatPipe', 'ProcessChatRequestBuffer',
-    'isChatRequestPending', 'toggle'],
+    'isChatRequestPending'],
   events: [],
   icon: 'assets/img/remix-logo-blue.png',
   description: 'RemixAI provides AI services to Remix IDE.',
@@ -224,7 +224,7 @@ export class RemixAIPlugin extends ViewPlugin {
   render() {
     return <div
       id='ai-view'
-      className='pb-2 mb-2 h-100 d-flex'
+      className='h-100 d-flex'
       data-id='aichat-view'
       style={{
         minHeight: 'max-content',
diff --git a/apps/remixdesktop/src/plugins/remixAIDektop.ts b/apps/remixdesktop/src/plugins/remixAIDektop.ts
index 75cf39612c..6382e28bba 100644
--- a/apps/remixdesktop/src/plugins/remixAIDektop.ts
+++ b/apps/remixdesktop/src/plugins/remixAIDektop.ts
@@ -32,7 +32,7 @@ const clientProfile: Profile = {
   description: 'RemixAI provides AI services to Remix IDE Desktop.',
   kind: '',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/remixai.html',
-  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer', 'toggle']
+  methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer']
 }
 
 class RemixAIDesktopPluginClient extends ElectronBasePluginClient {
diff --git a/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx b/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
index a5aaba4a7d..ff811e3f24 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/RemixAI.tsx
@@ -9,7 +9,7 @@ export const RemixAITab = (props: IRemixAITab) => {
 
   return (
     <>
-      <div id="remixAITab" className="h-100 w-100 px-2 pb-1">
+      <div id="remixAITab" className="mx-2 h-100 w-100 px-0">
         <div className='h-100'>
           <Default plugin={props.plugin}></Default>
         </div>
diff --git a/libs/remix-ui/remix-ai/src/lib/components/color.css b/libs/remix-ui/remix-ai/src/lib/components/color.css
index 40e54d438b..b13e9319a7 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/color.css
+++ b/libs/remix-ui/remix-ai/src/lib/components/color.css
@@ -16,6 +16,14 @@
   overflow-y: hidden;
 }
 
+.nlux-comp-composer {
+  line-height: normal;
+}
+
+.nlux-comp-composer>textarea  {
+  padding: 10px !important
+}
+
 .nlux-comp-conversationStarters {
   width: auto !important;
   padding: 0px !important
@@ -26,7 +34,6 @@
   border-color: var(--text-background) !important;
 }
 
-
 .nlux-theme-remix_ai_theme {
 
     /* Override top-level chat room colors */
@@ -61,9 +68,6 @@
     --nlux-cvStrt--brdrWd: 0;
     --nlux-cvStrt--brdClr: var(--light);
     --nlux-cvStrt--brdrWd: 'hidden';
-    --nlux-comp-composer > textarea {padding: 8px;}
-
-
 
     /* Override input colors */
     --nlux-PromptInput--BackgroundColor: var(--light);
@@ -74,10 +78,10 @@
     --nlux-Composer--Gap: 0;
 
     /* Override submit button colors */
-    --nlux-SubmitButton--BackgroundColor: var(--light);
-    --nlux-SubmitButton-Active--BackgroundColor:var(--light);
+    --nlux-SubmitButton--BackgroundColor: var(--primary);
+    --nlux-SubmitButton-Active--BackgroundColor:var(--primary);
     --nlux-SubmitButton-Disabled--BackgroundColor: var(--dark);
-    --nlux-SubmitButton-Active--TextColor: var(--primary);
+    --nlux-SubmitButton-Active--TextColor: var(--white);
     --nlux-SubmitButton-Disabled--TextColor: var(--text);
 
     /** Inline code in markdown */
@@ -103,11 +107,13 @@
     --nlux-ConversationStarter--BackgroundColor: var(--light);
     --nlux-copy-icon: url('data:image/svg+xml,\
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">\
-        <path fill-rule="evenodd" clip-rule="evenodd" d="M15 1.25H10.9436C9.10583 1.24998 7.65019 1.24997 6.51098 1.40314C5.33856 1.56076 4.38961 1.89288 3.64124 2.64124C2.89288 3.38961 2.56076 4.33856 2.40314 5.51098C2.24997 6.65019 2.24998 8.10582 2.25 9.94357V16C2.25 17.8722 3.62205 19.424 5.41551 19.7047C5.55348 20.4687 5.81753 21.1208 6.34835 21.6517C6.95027 22.2536 7.70814 22.5125 8.60825 22.6335C9.47522 22.75 10.5775 22.75 11.9451 22.75H15.0549C16.4225 22.75 17.5248 22.75 18.3918 22.6335C19.2919 22.5125 20.0497 22.2536 20.6517 21.6517C21.2536 21.0497 21.5125 20.2919 21.6335 19.3918C21.75 18.5248 21.75 17.4225 21.75 16.0549V10.9451C21.75 9.57754 21.75 8.47522 21.6335 7.60825C21.5125 6.70814 21.2536 5.95027 20.6517 5.34835C20.1208 4.81753 19.4687 4.55348 18.7047 4.41551C18.424 2.62205 16.8722 1.25 15 1.25ZM17.1293 4.27117C16.8265 3.38623 15.9876 2.75 15 2.75H11C9.09318 2.75 7.73851 2.75159 6.71085 2.88976C5.70476 3.02502 5.12511 3.27869 4.7019 3.7019C4.27869 4.12511 4.02502 4.70476 3.88976 5.71085C3.75159 6.73851 3.75 8.09318 3.75 10V16C3.75 16.9876 4.38624 17.8265 5.27117 18.1293C5.24998 17.5194 5.24999 16.8297 5.25 16.0549V10.9451C5.24998 9.57754 5.24996 8.47522 5.36652 7.60825C5.48754 6.70814 5.74643 5.95027 6.34835 5.34835C6.95027 4.74643 7.70814 4.48754 8.60825 4.36652C9.47522 4.24996 10.5775 4.24998 11.9451 4.25H15.0549C15.8297 4.24999 16.5194 4.24998 17.1293 4.27117ZM7.40901 6.40901C7.68577 6.13225 8.07435 5.9518 8.80812 5.85315C9.56347 5.75159 10.5646 5.75 12 5.75H15C16.4354 5.75 17.4365 5.75159 18.1919 5.85315C18.9257 5.9518 19.3142 6.13225 19.591 6.40901C19.8678 6.68577 20.0482 7.07435 20.1469 7.80812C20.2484 8.56347 20.25 9.56458 20.25 11V16C20.25 17.4354 20.2484 18.4365 20.1469 19.1919C20.0482 19.9257 19.8678 20.3142 19.591 20.591C19.3142 20.8678 18.9257 21.0482 18.1919 21.1469C17.4365 21.2484 16.4354 21.25 15 21.25H12C10.5646 21.25 9.56347 21.2484 8.80812 21.1469C8.07435 21.0482 7.68577 20.8678 7.40901 20.591C7.13225 20.3142 6.9518 19.9257 6.85315 19.1919C6.75159 18.4365 6.75 17.4354 6.75 16V11C6.75 9.56458 6.75159 8.56347 6.85315 7.80812C6.9518 7.07435 7.13225 6.68577 7.40901 6.40901Z" fill="currentColor"/>\
+      <path fill-rule="evenodd" clip-rule="evenodd" d="M15 1.25H10.9436C9.10583 1.24998 7.65019 1.24997 6.51098 1.40314C5.33856 1.56076 4.38961 1.89288 3.64124 2.64124C2.89288 3.38961 2.56076 4.33856 2.40314 5.51098C2.24997 6.65019 2.24998 8.10582 2.25 9.94357V16C2.25 17.8722 3.62205 19.424 5.41551 19.7047C5.55348 20.4687 5.81753 21.1208 6.34835 21.6517C6.95027 22.2536 7.70814 22.5125 8.60825 22.6335C9.47522 22.75 10.5775 22.75 11.9451 22.75H15.0549C16.4225 22.75 17.5248 22.75 18.3918 22.6335C19.2919 22.5125 20.0497 22.2536 20.6517 21.6517C21.2536 21.0497 21.5125 20.2919 21.6335 19.3918C21.75 18.5248 21.75 17.4225 21.75 16.0549V10.9451C21.75 9.57754 21.75 8.47522 21.6335 7.60825C21.5125 6.70814 21.2536 5.95027 20.6517 5.34835C20.1208 4.81753 19.4687 4.55348 18.7047 4.41551C18.424 2.62205 16.8722 1.25 15 1.25ZM17.1293 4.27117C16.8265 3.38623 15.9876 2.75 15 2.75H11C9.09318 2.75 7.73851 2.75159 6.71085 2.88976C5.70476 3.02502 5.12511 3.27869 4.7019 3.7019C4.27869 4.12511 4.02502 4.70476 3.88976 5.71085C3.75159 6.73851 3.75 8.09318 3.75 10V16C3.75 16.9876 4.38624 17.8265 5.27117 18.1293C5.24998 17.5194 5.24999 16.8297 5.25 16.0549V10.9451C5.24998 9.57754 5.24996 8.47522 5.36652 7.60825C5.48754 6.70814 5.74643 5.95027 6.34835 5.34835C6.95027 4.74643 7.70814 4.48754 8.60825 4.36652C9.47522 4.24996 10.5775 4.24998 11.9451 4.25H15.0549C15.8297 4.24999 16.5194 4.24998 17.1293 4.27117ZM7.40901 6.40901C7.68577 6.13225 8.07435 5.9518 8.80812 5.85315C9.56347 5.75159 10.5646 5.75 12 5.75H15C16.4354 5.75 17.4365 5.75159 18.1919 5.85315C18.9257 5.9518 19.3142 6.13225 19.591 6.40901C19.8678 6.68577 20.0482 7.07435 20.1469 7.80812C20.2484 8.56347 20.25 9.56458 20.25 11V16C20.25 17.4354 20.2484 18.4365 20.1469 19.1919C20.0482 19.9257 19.8678 20.3142 19.591 20.591C19.3142 20.8678 18.9257 21.0482 18.1919 21.1469C17.4365 21.2484 16.4354 21.25 15 21.25H12C10.5646 21.25 9.56347 21.2484 8.80812 21.1469C8.07435 21.0482 7.68577 20.8678 7.40901 20.591C7.13225 20.3142 6.9518 19.9257 6.85315 19.1919C6.75159 18.4365 6.75 17.4354 6.75 16V11C6.75 9.56458 6.75159 8.56347 6.85315 7.80812C6.9518 7.07435 7.13225 6.68577 7.40901 6.40901Z" fill="currentColor"/>\
     </svg>\
   ');
 
     /* Override icon for the send button */
     --nlux-send-icon: url('data:image/svg+xml, <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M0 256a256 256 0 1 0 512 0A256 256 0 1 0 0 256zM297 385c-9.4 9.4-24.6 9.4-33.9 0s-9.4-24.6 0-33.9l71-71L120 280c-13.3 0-24-10.7-24-24s10.7-24 24-24l214.1 0-71-71c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0L409 239c9.4 9.4 9.4 24.6 0 33.9L297 385z"/></svg>');
 
+    --nlux-comp-composer > textarea {padding: 10px;};
+
 }
diff --git a/libs/remix-ui/remix-ai/src/lib/components/personas.tsx b/libs/remix-ui/remix-ai/src/lib/components/personas.tsx
index 850fee3ac7..c3edd68646 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/personas.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/personas.tsx
@@ -1,8 +1,8 @@
 import { PersonaOptions, UserPersona } from '@nlux/react';
 
 export const user: UserPersona = {
-  name: 'Pipper',
+  name: 'Remi',
   avatar: 'assets/img/remix-logo-blue.png'
 };
 
-export const assistantAvatar = 'assets/img/remi-prof.webp';
+export const assistantAvatar = 'assets/img/aiLogo.svg'
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index bfdf3f96bb..fca0022e93 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -49,30 +49,42 @@ export default function AIStatus(props: AIStatusProps) {
           {copilotActive === false ? 'RemixAI Copilot (disabled)' : 'RemixAI Copilot (enabled)'}
         </span>
       </CustomTooltip>
-      <div className="d-flex text-sm flex-row pr-2 text-white justify-content-center align-items-center">
-        <button
-          style={{
-            position: 'absolute',
-            bottom: '0.7rem',
-            right: '0.3rem',
-            height: '3rem',
-            width: '3rem',
-            borderRadius: '50%',
-            color: 'var(--ai)',
-            boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
-          }}
-          data-id="aiStatusButton"
-          className='p-1 alert alert-info border border-info fa-solid fa-message-bot'
-          onClick={async () => {
-            appContext.appStateDispatch({
-              type: appActionTypes.setShowPopupPanel,
-              payload: !appContext.appState.showPopupPanel
-            })
-          }}
-        >
-
-        </button>
-      </div>
+      <CustomTooltip
+        tooltipText={"Ask RemixAI for help!"}
+      >
+        <div className="d-flex text-sm flex-row pr-2 text-white justify-content-center align-items-center">
+          <style>{`
+            button.fa-robot:focus {
+              outline: none;
+              box-shadow: none;
+            }
+            button.fa-robot:hover {
+              border-color: var(--info)
+            }
+          `}</style>
+          <button
+            style={{
+              position: 'absolute',
+              bottom: '0.7rem',
+              right: '0.1rem',
+              height: '3rem',
+              width: '3rem',
+              borderRadius: '50%',
+              color: 'var(--ai)',
+              boxShadow: "0 1px 7px var(--secondary)"
+            }}
+            data-id="aiStatusButton"
+            className='h3 p-1 alert alert-info fal fa-robot'
+            onClick={async () => {
+              appContext.appStateDispatch({
+                type: appActionTypes.setShowPopupPanel,
+                payload: !appContext.appState.showPopupPanel
+              })
+            }}
+          >
+          </button>
+        </div>
+      </CustomTooltip>
     </div>
   )
 }
\ No newline at end of file
diff --git a/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx b/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
index 6a3108b313..062424e2b2 100644
--- a/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx
@@ -26,7 +26,7 @@ export default function ScamDetails ({ refs, floatStyle, scamAlerts }: ScamDetai
         height: '6rem',
         transform: 'translate(88.5px, -80px)',
         willChange: 'transform',
-        boxShadow: '3px 3px var(--secondary), -0.1em 0 1.4em var(--secondary)'
+        boxShadow: "0 1px 7px var(--secondary)"
       } }
       className="p-1 pb-0 mb-1 d-flex alert alert-warning border border-warning"
     >

From cf6b7bfe478a1cd6730e729fd4de0e63b2b23329 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 07:30:39 +0100
Subject: [PATCH 32/82] show and hide panel

---
 apps/remix-ide-e2e/src/helpers/init.ts            |  9 +++++++++
 libs/remix-api/src/lib/remix-api.ts               |  2 --
 libs/remix-ui/app/src/lib/remix-app/remix-app.tsx | 15 +++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index 67e8f1a8fc..a98c0b6ac6 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -14,6 +14,15 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     .url(url || 'http://127.0.0.1:8080')
     .pause(5000)
     .switchBrowserTab(0)
+    // get value from local storage
+    .execute(function () {
+      return localStorage.getItem('did_show_popup_panel')
+    }, [], function (result) {
+      if (!result.value) {
+        browser.waitForElementVisible('*[data-id="aiStatusButton"]')
+        .click('*[data-id="aiStatusButton"]')
+      }
+    })
     .perform((done) => {
       if (!loadPlugin) return done()
       browser
diff --git a/libs/remix-api/src/lib/remix-api.ts b/libs/remix-api/src/lib/remix-api.ts
index 7df4dc7104..36d7fbf6a0 100644
--- a/libs/remix-api/src/lib/remix-api.ts
+++ b/libs/remix-api/src/lib/remix-api.ts
@@ -17,10 +17,8 @@ import { IRemixAI } from "./plugins/remixai-api"
 import { IRemixAID } from "./plugins/remixAIDesktop-api"
 import { IMenuIconsApi } from "./plugins/menuicons-api"
 import { IDgitPlugin } from "./plugins/dgitplugin-api"
-import { Api } from "@remixproject/plugin-utils";
 import { IPopupPanelAPI } from "./plugins/popuppanel-api"
 
-
 export interface ICustomRemixApi extends IRemixApi {
   popupPanel: IPopupPanelAPI
   dgitApi: IGitApi
diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index dd8a672525..5ab14a7811 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -9,10 +9,8 @@ import { AppProvider } from './context/provider'
 import AppDialogs from './components/modals/dialogs'
 import DialogViewPlugin from './components/modals/dialogViewPlugin'
 import { appProviderContextType, onLineContext, platformContext } from './context/context'
-import { FormattedMessage, IntlProvider } from 'react-intl'
-import { CustomTooltip } from '@remix-ui/helper'
+import { IntlProvider } from 'react-intl'
 import { UsageTypes } from './types'
-import { AppState } from './interface'
 import { appReducer } from './reducer/app'
 import { appInitialState } from './state/app'
 
@@ -45,7 +43,10 @@ const RemixApp = (props: IRemixAppUi) => {
   const sidePanelRef = useRef(null)
   const pinnedPanelRef = useRef(null)
 
-  const [appState, appStateDispatch] = useReducer(appReducer, appInitialState)
+  const [appState, appStateDispatch] = useReducer(appReducer, {
+    ...appInitialState,
+    showPopupPanel: !window.localStorage.getItem('did_show_popup_panel')
+  })
 
   useEffect(() => {
     async function activateApp() {
@@ -77,6 +78,12 @@ const RemixApp = (props: IRemixAppUi) => {
     }
   }, [])
 
+  useEffect(() => {
+    if(!appState.showPopupPanel) {
+      window.localStorage.setItem('did_show_popup_panel', 'true')
+    }
+  },[appState.showPopupPanel])
+
   function setListeners() {
     props.app.sidePanel.events.on('toggle', () => {
       setHideSidePanel((prev) => {

From b3d5a42c1004aaa7f34631ad5e044ec6ccdb3678 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 07:38:57 +0100
Subject: [PATCH 33/82] lint

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

diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index 5ab14a7811..f3738ee5b8 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -79,7 +79,7 @@ const RemixApp = (props: IRemixAppUi) => {
   }, [])
 
   useEffect(() => {
-    if(!appState.showPopupPanel) {
+    if (!appState.showPopupPanel) {
       window.localStorage.setItem('did_show_popup_panel', 'true')
     }
   },[appState.showPopupPanel])

From 51f6a52c913f32e574d3d7776bb25870f514d409 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 07:57:23 +0100
Subject: [PATCH 34/82] helpers

---
 .../src/commands/hidePopUpPanel.ts            | 32 +++++++++++++++++++
 apps/remix-ide-e2e/src/helpers/init.ts        | 11 ++-----
 apps/remix-ide-e2e/src/types/index.d.ts       |  1 +
 3 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 apps/remix-ide-e2e/src/commands/hidePopUpPanel.ts

diff --git a/apps/remix-ide-e2e/src/commands/hidePopUpPanel.ts b/apps/remix-ide-e2e/src/commands/hidePopUpPanel.ts
new file mode 100644
index 0000000000..196f7b4476
--- /dev/null
+++ b/apps/remix-ide-e2e/src/commands/hidePopUpPanel.ts
@@ -0,0 +1,32 @@
+import { NightwatchBrowser } from 'nightwatch'
+import EventEmitter from 'events'
+
+class HidePopUpPanel extends EventEmitter {
+  command(this: NightwatchBrowser) {
+    browser
+      .perform((done) => {
+        browser.execute(function () {
+          // hide tooltips
+          function addStyle(styleString) {
+            const style = document.createElement('style')
+            style.textContent = styleString
+            document.head.append(style)
+          }
+          addStyle(`
+            .popover {
+              display:none !important;
+            }
+            #scamDetails {
+              display:none !important;
+            }
+          `)
+        }, [], done())
+      })
+      .perform((done) => {
+        done()
+        this.emit('complete')
+      })
+  }
+}
+
+module.exports = HidePopUpPanel
diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index a98c0b6ac6..2bf8244c31 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -14,15 +14,8 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     .url(url || 'http://127.0.0.1:8080')
     .pause(5000)
     .switchBrowserTab(0)
-    // get value from local storage
-    .execute(function () {
-      return localStorage.getItem('did_show_popup_panel')
-    }, [], function (result) {
-      if (!result.value) {
-        browser.waitForElementVisible('*[data-id="aiStatusButton"]')
-        .click('*[data-id="aiStatusButton"]')
-      }
-    })
+    .hidePopUpPanel()
+    .pause()
     .perform((done) => {
       if (!loadPlugin) return done()
       browser
diff --git a/apps/remix-ide-e2e/src/types/index.d.ts b/apps/remix-ide-e2e/src/types/index.d.ts
index 4a5b1831ee..d031b6c992 100644
--- a/apps/remix-ide-e2e/src/types/index.d.ts
+++ b/apps/remix-ide-e2e/src/types/index.d.ts
@@ -77,6 +77,7 @@ declare module 'nightwatch' {
     enableClipBoard: () => NightwatchBrowser
     addFileSnekmate: (name: string, content: NightwatchContractContent) => NightwatchBrowser
     selectFiles: (selelectedElements: any[]) => NightwatchBrowser
+    hidePopUpPanel: (this: NightwatchBrowser) => NightwatchBrowser
   }
 
   export interface NightwatchBrowser {

From 578036f5765f30f57792bad28902f44346a0bbea Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 08:10:16 +0100
Subject: [PATCH 35/82] hide panel command

---
 .../src/commands/hidePopUpPanel.ts            | 32 -------------------
 .../src/commands/hidePopupPanel.ts            | 25 +++++++++++++++
 apps/remix-ide-e2e/src/helpers/init.ts        |  2 +-
 apps/remix-ide-e2e/src/types/index.d.ts       |  2 +-
 .../test/tests/app/compiler.test.ts           |  1 +
 .../test/tests/app/externaleditor.test.ts     |  1 +
 .../test/tests/app/foundry.test.ts            |  1 +
 apps/remixdesktop/test/tests/app/gist.test.ts |  1 +
 .../test/tests/app/git-ui.test.ts             |  2 +-
 .../test/tests/app/git-ui_2.test.ts           |  2 +-
 .../test/tests/app/git-ui_3.test.ts           |  2 +-
 .../test/tests/app/git-ui_4.test.ts           |  2 +-
 apps/remixdesktop/test/tests/app/git.test.ts  |  1 +
 .../test/tests/app/github.test.ts             |  2 +-
 .../test/tests/app/github_2.test.ts           |  2 +-
 .../test/tests/app/github_3.test.ts           |  2 +-
 .../test/tests/app/hardhat.test.ts            |  1 +
 .../test/tests/app/offline.test.ts            |  1 +
 .../test/tests/app/search.test.ts             |  1 +
 .../test/tests/app/slitherlinux.test.ts       |  1 +
 .../test/tests/app/templates.test.ts          |  1 +
 .../remixdesktop/test/tests/app/xterm.test.ts |  1 +
 .../test/tests/app/xtermwin.test.ts           |  1 +
 apps/remixdesktop/test/types/index.d.ts       |  1 +
 24 files changed, 47 insertions(+), 41 deletions(-)
 delete mode 100644 apps/remix-ide-e2e/src/commands/hidePopUpPanel.ts
 create mode 100644 apps/remix-ide-e2e/src/commands/hidePopupPanel.ts

diff --git a/apps/remix-ide-e2e/src/commands/hidePopUpPanel.ts b/apps/remix-ide-e2e/src/commands/hidePopUpPanel.ts
deleted file mode 100644
index 196f7b4476..0000000000
--- a/apps/remix-ide-e2e/src/commands/hidePopUpPanel.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { NightwatchBrowser } from 'nightwatch'
-import EventEmitter from 'events'
-
-class HidePopUpPanel extends EventEmitter {
-  command(this: NightwatchBrowser) {
-    browser
-      .perform((done) => {
-        browser.execute(function () {
-          // hide tooltips
-          function addStyle(styleString) {
-            const style = document.createElement('style')
-            style.textContent = styleString
-            document.head.append(style)
-          }
-          addStyle(`
-            .popover {
-              display:none !important;
-            }
-            #scamDetails {
-              display:none !important;
-            }
-          `)
-        }, [], done())
-      })
-      .perform((done) => {
-        done()
-        this.emit('complete')
-      })
-  }
-}
-
-module.exports = HidePopUpPanel
diff --git a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts
new file mode 100644
index 0000000000..29baee5523
--- /dev/null
+++ b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts
@@ -0,0 +1,25 @@
+import { NightwatchBrowser } from 'nightwatch'
+import EventEmitter from 'events'
+
+class HidePopupPanel extends EventEmitter {
+  command(this: NightwatchBrowser) {
+    browser
+      .perform((done) => {
+        browser.execute(function () {
+          return localStorage.getItem('did_show_popup_panel')
+        }, [], function (result) {
+          if (!result.value) {
+            browser.waitForElementVisible('*[data-id="aiStatusButton"]')
+            .click('*[data-id="aiStatusButton"]')
+          }
+          done()
+        })
+      })
+      .perform((done) => {
+        done()
+        this.emit('complete')
+      })
+  }
+}
+
+module.exports = HidePopupPanel
diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index 2bf8244c31..1caa647862 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -14,7 +14,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     .url(url || 'http://127.0.0.1:8080')
     .pause(5000)
     .switchBrowserTab(0)
-    .hidePopUpPanel()
+    .hidePopupPanel()
     .pause()
     .perform((done) => {
       if (!loadPlugin) return done()
diff --git a/apps/remix-ide-e2e/src/types/index.d.ts b/apps/remix-ide-e2e/src/types/index.d.ts
index d031b6c992..5c6d3bd262 100644
--- a/apps/remix-ide-e2e/src/types/index.d.ts
+++ b/apps/remix-ide-e2e/src/types/index.d.ts
@@ -74,10 +74,10 @@ declare module 'nightwatch' {
     connectToExternalHttpProvider: (url: string, identifier: string) => NightwatchBrowser
     waitForElementNotContainsText: (id: string, value: string, timeout: number = 10000) => NightwatchBrowser
     hideToolTips: (this: NightwatchBrowser) => NightwatchBrowser
+    hidePopupPanel: (this: NightwatchBrowser) => NightwatchBrowser
     enableClipBoard: () => NightwatchBrowser
     addFileSnekmate: (name: string, content: NightwatchContractContent) => NightwatchBrowser
     selectFiles: (selelectedElements: any[]) => NightwatchBrowser
-    hidePopUpPanel: (this: NightwatchBrowser) => NightwatchBrowser
   }
 
   export interface NightwatchBrowser {
diff --git a/apps/remixdesktop/test/tests/app/compiler.test.ts b/apps/remixdesktop/test/tests/app/compiler.test.ts
index 2fce46320c..7da49f2685 100644
--- a/apps/remixdesktop/test/tests/app/compiler.test.ts
+++ b/apps/remixdesktop/test/tests/app/compiler.test.ts
@@ -3,6 +3,7 @@ import { NightwatchBrowser } from 'nightwatch'
 
 module.exports = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hidePopupPanel()
         done()
     },
     'download compiler': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/externaleditor.test.ts b/apps/remixdesktop/test/tests/app/externaleditor.test.ts
index 89e991fdcd..75d074bb00 100644
--- a/apps/remixdesktop/test/tests/app/externaleditor.test.ts
+++ b/apps/remixdesktop/test/tests/app/externaleditor.test.ts
@@ -2,6 +2,7 @@ import {NightwatchBrowser} from 'nightwatch'
 
 const testsBash = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    browser.hidePopupPanel()
     done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/foundry.test.ts b/apps/remixdesktop/test/tests/app/foundry.test.ts
index 3aa370882a..a0457f6ee9 100644
--- a/apps/remixdesktop/test/tests/app/foundry.test.ts
+++ b/apps/remixdesktop/test/tests/app/foundry.test.ts
@@ -9,6 +9,7 @@ const dir = '/tmp/' + projectDir
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hidePopupPanel()
         done()
     },
     installFoundry: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/gist.test.ts b/apps/remixdesktop/test/tests/app/gist.test.ts
index b53c741910..443581eb0f 100644
--- a/apps/remixdesktop/test/tests/app/gist.test.ts
+++ b/apps/remixdesktop/test/tests/app/gist.test.ts
@@ -3,6 +3,7 @@ import { NightwatchBrowser } from 'nightwatch'
 const gist_id  = '02a847917a6a7ecaf4a7e0d4e68715bf'
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hidePopupPanel()
         done()
     },
     'start gist': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui.test.ts b/apps/remixdesktop/test/tests/app/git-ui.test.ts
index 813c31da44..ba954da076 100644
--- a/apps/remixdesktop/test/tests/app/git-ui.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips()
+        browser.hideToolTips().hidePopupPanel()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui_2.test.ts b/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
index 6a1f3b598b..cd1679a732 100644
--- a/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips()
+        browser.hideToolTips().hidePopupPanel()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
index 6fb96951ff..83906f9285 100644
--- a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips()
+        browser.hideToolTips().hidePopupPanel()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
index 521462122d..a82a0ad8b9 100644
--- a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips()
+        browser.hideToolTips().hidePopupPanel()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git.test.ts b/apps/remixdesktop/test/tests/app/git.test.ts
index 9cc26be3d0..a4f92f4bab 100644
--- a/apps/remixdesktop/test/tests/app/git.test.ts
+++ b/apps/remixdesktop/test/tests/app/git.test.ts
@@ -4,6 +4,7 @@ import { NightwatchBrowser } from 'nightwatch'
 module.exports = {
   '@isogit': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    browser.hidePopupPanel()
     done()
   },
   'clone a repo': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/github.test.ts b/apps/remixdesktop/test/tests/app/github.test.ts
index 612be7e02f..7e3f83265a 100644
--- a/apps/remixdesktop/test/tests/app/github.test.ts
+++ b/apps/remixdesktop/test/tests/app/github.test.ts
@@ -3,7 +3,7 @@ import { NightwatchBrowser } from "nightwatch"
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips()
+        browser.hideToolTips().hidePopupPanel()
         done()
     },
 
diff --git a/apps/remixdesktop/test/tests/app/github_2.test.ts b/apps/remixdesktop/test/tests/app/github_2.test.ts
index 3b02b3746c..55f011dee2 100644
--- a/apps/remixdesktop/test/tests/app/github_2.test.ts
+++ b/apps/remixdesktop/test/tests/app/github_2.test.ts
@@ -3,7 +3,7 @@ import { NightwatchBrowser } from "nightwatch"
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips()
+        browser.hideToolTips().hidePopupPanel()
         done()
     },
 
diff --git a/apps/remixdesktop/test/tests/app/github_3.test.ts b/apps/remixdesktop/test/tests/app/github_3.test.ts
index 12542bb86f..3bcc366964 100644
--- a/apps/remixdesktop/test/tests/app/github_3.test.ts
+++ b/apps/remixdesktop/test/tests/app/github_3.test.ts
@@ -5,7 +5,7 @@ let commitCount = 0
 let branchCount = 0
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips()
+        browser.hideToolTips().hidePopupPanel()
         done()
     },
 
diff --git a/apps/remixdesktop/test/tests/app/hardhat.test.ts b/apps/remixdesktop/test/tests/app/hardhat.test.ts
index f8c093102e..a9ca651595 100644
--- a/apps/remixdesktop/test/tests/app/hardhat.test.ts
+++ b/apps/remixdesktop/test/tests/app/hardhat.test.ts
@@ -8,6 +8,7 @@ const dir = path.join('remix-desktop-test-' + Date.now().toString())
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hidePopupPanel()
         done()
     },
     setuphardhat: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/offline.test.ts b/apps/remixdesktop/test/tests/app/offline.test.ts
index 284d44991a..48f308b7eb 100644
--- a/apps/remixdesktop/test/tests/app/offline.test.ts
+++ b/apps/remixdesktop/test/tests/app/offline.test.ts
@@ -4,6 +4,7 @@ import { NightwatchBrowser } from 'nightwatch'
 module.exports = {
     '@offline': true,
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hidePopupPanel()
         done()
     },
     'open default template': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/search.test.ts b/apps/remixdesktop/test/tests/app/search.test.ts
index 8f3ba0a9e7..7b5824d800 100644
--- a/apps/remixdesktop/test/tests/app/search.test.ts
+++ b/apps/remixdesktop/test/tests/app/search.test.ts
@@ -3,6 +3,7 @@ import { NightwatchBrowser } from 'nightwatch'
 
 module.exports = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hidePopupPanel()
         done()
     },
     'open default template': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/slitherlinux.test.ts b/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
index 21b3f38ea5..8af6d2ea6d 100644
--- a/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
+++ b/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
@@ -3,6 +3,7 @@ import { ChildProcess, spawn, execSync } from 'child_process'
 import { homedir } from 'os'
 const tests = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    browser.hidePopupPanel()
    done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/templates.test.ts b/apps/remixdesktop/test/tests/app/templates.test.ts
index 86528458e9..78d36507e9 100644
--- a/apps/remixdesktop/test/tests/app/templates.test.ts
+++ b/apps/remixdesktop/test/tests/app/templates.test.ts
@@ -3,6 +3,7 @@ import { NightwatchBrowser } from 'nightwatch'
 
 module.exports = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    browser.hidePopupPanel()
     done()
   },
   'open default template': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/xterm.test.ts b/apps/remixdesktop/test/tests/app/xterm.test.ts
index df238fbcc9..c7c32c0303 100644
--- a/apps/remixdesktop/test/tests/app/xterm.test.ts
+++ b/apps/remixdesktop/test/tests/app/xterm.test.ts
@@ -5,6 +5,7 @@ import {NightwatchBrowser} from 'nightwatch'
 
 const tests = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    browser.hidePopupPanel()
     done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/xtermwin.test.ts b/apps/remixdesktop/test/tests/app/xtermwin.test.ts
index cf7b1e5be4..f714d736cf 100644
--- a/apps/remixdesktop/test/tests/app/xtermwin.test.ts
+++ b/apps/remixdesktop/test/tests/app/xtermwin.test.ts
@@ -2,6 +2,7 @@ import {NightwatchBrowser} from 'nightwatch'
 
 const tests = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    browser.hidePopupPanel()
    done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/types/index.d.ts b/apps/remixdesktop/test/types/index.d.ts
index faf3a89d54..2a67630e60 100644
--- a/apps/remixdesktop/test/types/index.d.ts
+++ b/apps/remixdesktop/test/types/index.d.ts
@@ -71,6 +71,7 @@ declare module 'nightwatch' {
     connectToExternalHttpProvider: (url: string, identifier: string) => NightwatchBrowser
     waitForElementNotContainsText: (id: string, value: string, timeout: number = 10000) => NightwatchBrowser
     hideToolTips: (this: NightwatchBrowser) => NightwatchBrowser
+    hidePopupPanel: (this: NightwatchBrowser) => NightwatchBrowser
     enableClipBoard: () => NightwatchBrowser
   }
 

From 504ea40ef9119aea78a4a0e3e8b27d767fd03dee Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 08:10:58 +0100
Subject: [PATCH 36/82] rm pause

---
 apps/remix-ide-e2e/src/helpers/init.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index 1caa647862..9b8351f06b 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -15,7 +15,6 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     .pause(5000)
     .switchBrowserTab(0)
     .hidePopupPanel()
-    .pause()
     .perform((done) => {
       if (!loadPlugin) return done()
       browser

From 493110dac2d3527e17be407257f254bf523fc802 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 08:28:01 +0100
Subject: [PATCH 37/82] hide on desktop

---
 apps/remixdesktop/test/tests/app/compiler.test.ts       | 1 -
 apps/remixdesktop/test/tests/app/externaleditor.test.ts | 1 -
 apps/remixdesktop/test/tests/app/foundry.test.ts        | 1 -
 apps/remixdesktop/test/tests/app/gist.test.ts           | 1 -
 apps/remixdesktop/test/tests/app/git-ui.test.ts         | 2 +-
 apps/remixdesktop/test/tests/app/git-ui_2.test.ts       | 2 +-
 apps/remixdesktop/test/tests/app/git-ui_3.test.ts       | 2 +-
 apps/remixdesktop/test/tests/app/git-ui_4.test.ts       | 2 +-
 apps/remixdesktop/test/tests/app/git.test.ts            | 1 -
 apps/remixdesktop/test/tests/app/github.test.ts         | 2 +-
 apps/remixdesktop/test/tests/app/github_2.test.ts       | 2 +-
 apps/remixdesktop/test/tests/app/github_3.test.ts       | 2 +-
 apps/remixdesktop/test/tests/app/hardhat.test.ts        | 1 -
 apps/remixdesktop/test/tests/app/offline.test.ts        | 1 -
 apps/remixdesktop/test/tests/app/search.test.ts         | 1 -
 apps/remixdesktop/test/tests/app/slitherlinux.test.ts   | 1 -
 apps/remixdesktop/test/tests/app/templates.test.ts      | 1 -
 apps/remixdesktop/test/tests/app/xterm.test.ts          | 1 -
 apps/remixdesktop/test/tests/app/xtermwin.test.ts       | 1 -
 libs/remix-ui/app/src/lib/remix-app/remix-app.tsx       | 3 ++-
 20 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/apps/remixdesktop/test/tests/app/compiler.test.ts b/apps/remixdesktop/test/tests/app/compiler.test.ts
index 7da49f2685..2fce46320c 100644
--- a/apps/remixdesktop/test/tests/app/compiler.test.ts
+++ b/apps/remixdesktop/test/tests/app/compiler.test.ts
@@ -3,7 +3,6 @@ import { NightwatchBrowser } from 'nightwatch'
 
 module.exports = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     'download compiler': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/externaleditor.test.ts b/apps/remixdesktop/test/tests/app/externaleditor.test.ts
index 75d074bb00..89e991fdcd 100644
--- a/apps/remixdesktop/test/tests/app/externaleditor.test.ts
+++ b/apps/remixdesktop/test/tests/app/externaleditor.test.ts
@@ -2,7 +2,6 @@ import {NightwatchBrowser} from 'nightwatch'
 
 const testsBash = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
     done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/foundry.test.ts b/apps/remixdesktop/test/tests/app/foundry.test.ts
index a0457f6ee9..3aa370882a 100644
--- a/apps/remixdesktop/test/tests/app/foundry.test.ts
+++ b/apps/remixdesktop/test/tests/app/foundry.test.ts
@@ -9,7 +9,6 @@ const dir = '/tmp/' + projectDir
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     installFoundry: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/gist.test.ts b/apps/remixdesktop/test/tests/app/gist.test.ts
index 443581eb0f..b53c741910 100644
--- a/apps/remixdesktop/test/tests/app/gist.test.ts
+++ b/apps/remixdesktop/test/tests/app/gist.test.ts
@@ -3,7 +3,6 @@ import { NightwatchBrowser } from 'nightwatch'
 const gist_id  = '02a847917a6a7ecaf4a7e0d4e68715bf'
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     'start gist': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui.test.ts b/apps/remixdesktop/test/tests/app/git-ui.test.ts
index ba954da076..813c31da44 100644
--- a/apps/remixdesktop/test/tests/app/git-ui.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui_2.test.ts b/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
index cd1679a732..6a1f3b598b 100644
--- a/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
index 83906f9285..6fb96951ff 100644
--- a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
index a82a0ad8b9..521462122d 100644
--- a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
+++ b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
@@ -13,7 +13,7 @@ let gitserver: ChildProcess
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
     after: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/git.test.ts b/apps/remixdesktop/test/tests/app/git.test.ts
index a4f92f4bab..9cc26be3d0 100644
--- a/apps/remixdesktop/test/tests/app/git.test.ts
+++ b/apps/remixdesktop/test/tests/app/git.test.ts
@@ -4,7 +4,6 @@ import { NightwatchBrowser } from 'nightwatch'
 module.exports = {
   '@isogit': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
     done()
   },
   'clone a repo': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/github.test.ts b/apps/remixdesktop/test/tests/app/github.test.ts
index 7e3f83265a..612be7e02f 100644
--- a/apps/remixdesktop/test/tests/app/github.test.ts
+++ b/apps/remixdesktop/test/tests/app/github.test.ts
@@ -3,7 +3,7 @@ import { NightwatchBrowser } from "nightwatch"
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
 
diff --git a/apps/remixdesktop/test/tests/app/github_2.test.ts b/apps/remixdesktop/test/tests/app/github_2.test.ts
index 55f011dee2..3b02b3746c 100644
--- a/apps/remixdesktop/test/tests/app/github_2.test.ts
+++ b/apps/remixdesktop/test/tests/app/github_2.test.ts
@@ -3,7 +3,7 @@ import { NightwatchBrowser } from "nightwatch"
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
 
diff --git a/apps/remixdesktop/test/tests/app/github_3.test.ts b/apps/remixdesktop/test/tests/app/github_3.test.ts
index 3bcc366964..12542bb86f 100644
--- a/apps/remixdesktop/test/tests/app/github_3.test.ts
+++ b/apps/remixdesktop/test/tests/app/github_3.test.ts
@@ -5,7 +5,7 @@ let commitCount = 0
 let branchCount = 0
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hideToolTips().hidePopupPanel()
+        browser.hideToolTips()
         done()
     },
 
diff --git a/apps/remixdesktop/test/tests/app/hardhat.test.ts b/apps/remixdesktop/test/tests/app/hardhat.test.ts
index a9ca651595..f8c093102e 100644
--- a/apps/remixdesktop/test/tests/app/hardhat.test.ts
+++ b/apps/remixdesktop/test/tests/app/hardhat.test.ts
@@ -8,7 +8,6 @@ const dir = path.join('remix-desktop-test-' + Date.now().toString())
 
 const tests = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     setuphardhat: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/offline.test.ts b/apps/remixdesktop/test/tests/app/offline.test.ts
index 48f308b7eb..284d44991a 100644
--- a/apps/remixdesktop/test/tests/app/offline.test.ts
+++ b/apps/remixdesktop/test/tests/app/offline.test.ts
@@ -4,7 +4,6 @@ import { NightwatchBrowser } from 'nightwatch'
 module.exports = {
     '@offline': true,
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     'open default template': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/search.test.ts b/apps/remixdesktop/test/tests/app/search.test.ts
index 7b5824d800..8f3ba0a9e7 100644
--- a/apps/remixdesktop/test/tests/app/search.test.ts
+++ b/apps/remixdesktop/test/tests/app/search.test.ts
@@ -3,7 +3,6 @@ import { NightwatchBrowser } from 'nightwatch'
 
 module.exports = {
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
-        browser.hidePopupPanel()
         done()
     },
     'open default template': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/slitherlinux.test.ts b/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
index 8af6d2ea6d..21b3f38ea5 100644
--- a/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
+++ b/apps/remixdesktop/test/tests/app/slitherlinux.test.ts
@@ -3,7 +3,6 @@ import { ChildProcess, spawn, execSync } from 'child_process'
 import { homedir } from 'os'
 const tests = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
    done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/templates.test.ts b/apps/remixdesktop/test/tests/app/templates.test.ts
index 78d36507e9..86528458e9 100644
--- a/apps/remixdesktop/test/tests/app/templates.test.ts
+++ b/apps/remixdesktop/test/tests/app/templates.test.ts
@@ -3,7 +3,6 @@ import { NightwatchBrowser } from 'nightwatch'
 
 module.exports = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
     done()
   },
   'open default template': function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/xterm.test.ts b/apps/remixdesktop/test/tests/app/xterm.test.ts
index c7c32c0303..df238fbcc9 100644
--- a/apps/remixdesktop/test/tests/app/xterm.test.ts
+++ b/apps/remixdesktop/test/tests/app/xterm.test.ts
@@ -5,7 +5,6 @@ import {NightwatchBrowser} from 'nightwatch'
 
 const tests = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
     done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/apps/remixdesktop/test/tests/app/xtermwin.test.ts b/apps/remixdesktop/test/tests/app/xtermwin.test.ts
index f714d736cf..cf7b1e5be4 100644
--- a/apps/remixdesktop/test/tests/app/xtermwin.test.ts
+++ b/apps/remixdesktop/test/tests/app/xtermwin.test.ts
@@ -2,7 +2,6 @@ import {NightwatchBrowser} from 'nightwatch'
 
 const tests = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.hidePopupPanel()
    done()
   },
   open: function (browser: NightwatchBrowser) {
diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index f3738ee5b8..f3c0bf43d0 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -13,6 +13,7 @@ import { IntlProvider } from 'react-intl'
 import { UsageTypes } from './types'
 import { appReducer } from './reducer/app'
 import { appInitialState } from './state/app'
+import isElectron from 'is-electron'
 
 declare global {
   interface Window {
@@ -45,7 +46,7 @@ const RemixApp = (props: IRemixAppUi) => {
 
   const [appState, appStateDispatch] = useReducer(appReducer, {
     ...appInitialState,
-    showPopupPanel: !window.localStorage.getItem('did_show_popup_panel')
+    showPopupPanel: !window.localStorage.getItem('did_show_popup_panel') && !isElectron()
   })
 
   useEffect(() => {

From 8bce86f2de9378b128787a464cc93e722f20088a Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 5 Nov 2024 09:53:44 +0100
Subject: [PATCH 38/82] adding the avatar for ai

---
 apps/remix-ide/src/assets/img/aiLogo.svg | 77 ++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 apps/remix-ide/src/assets/img/aiLogo.svg

diff --git a/apps/remix-ide/src/assets/img/aiLogo.svg b/apps/remix-ide/src/assets/img/aiLogo.svg
new file mode 100644
index 0000000000..f6dc2a50b2
--- /dev/null
+++ b/apps/remix-ide/src/assets/img/aiLogo.svg
@@ -0,0 +1,77 @@
+<svg width="1080" height="1080" viewBox="0 0 1080 1080" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_62_13806)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M243.632 1074.71C243.014 1074.6 242.439 1074.32 241.962 1073.92C234.393 1067.49 170.155 1012.98 156.436 1001.34C155.758 1000.76 155.338 999.934 155.267 999.041C155.191 998.157 155.49 997.272 156.069 996.594C166.824 984.128 213.289 930.238 213.289 930.238C213.289 930.238 136.374 884.225 116.785 872.51C115.815 871.923 115.202 870.875 115.163 869.736C115.124 868.596 115.683 867.513 116.628 866.876C132.253 856.218 184.848 820.367 184.848 820.367C184.848 820.367 143.189 796.562 129.723 788.866C128.778 788.325 128.154 787.351 128.057 786.265C127.955 785.188 128.395 784.118 129.226 783.407C150.037 765.75 253.071 678.318 253.071 678.318C253.071 678.318 120.643 568.156 101.261 552.032C99.9274 550.923 99.6631 548.979 100.649 547.553C112.476 530.493 180.345 432.538 180.345 432.538C180.345 432.538 81.023 322.558 61.4772 300.915C60.7298 300.088 60.4511 298.952 60.7139 297.871C60.9764 296.791 61.7588 295.914 62.8047 295.531C89.0112 285.876 217.225 238.624 217.225 238.624C217.225 238.624 243.762 97.0242 248.974 69.227C249.176 68.154 249.883 67.2436 250.88 66.7932C251.877 66.3438 253.027 66.4057 253.965 66.9628C277.983 81.2078 398.947 152.954 398.947 152.954C398.947 152.954 464.447 41.4414 478.238 17.9661C478.8 17.0021 479.805 16.3832 480.922 16.3181C482.039 16.2539 483.108 16.745 483.783 17.6328C500.981 40.2573 585.732 151.762 585.732 151.762C585.732 151.762 716.782 81.8336 742.178 68.2874C743.147 67.7743 744.298 67.7605 745.274 68.2579C746.249 68.7553 746.922 69.6978 747.066 70.7796C750.766 97.4147 768.733 226.986 768.733 226.986C768.733 226.986 930.559 247.282 963.181 251.372C964.362 251.521 965.375 252.284 965.842 253.38C966.31 254.474 966.161 255.735 965.451 256.689C946.661 281.981 856.82 402.908 856.82 402.908C856.82 402.908 958.366 483.76 977.854 499.277C978.641 499.903 979.105 500.851 979.116 501.857C979.128 502.863 978.686 503.821 977.913 504.465C956.879 522.007 837.76 621.353 837.76 621.353L840.361 769.536C840.361 769.536 950.632 834.064 970.301 845.574C971.084 846.032 971.648 846.787 971.862 847.667C972.077 848.548 971.927 849.479 971.444 850.245C959.731 868.857 896.099 969.963 896.099 969.963C896.099 969.963 970.865 1044 987.455 1060.44C988.211 1061.19 988.568 1062.24 988.41 1063.31C988.255 1064.36 987.611 1065.27 986.669 1065.77C965.466 1077 867.657 1128.83 867.657 1128.83C867.657 1128.83 908.489 1214.19 916.057 1230.01C916.755 1231.46 916.313 1233.21 915.012 1234.16C900.776 1244.56 823.272 1301.2 812.11 1309.36C811.266 1309.97 810.182 1310.16 809.178 1309.86C785.939 1302.94 515.724 1222.5 515.724 1222.5C515.724 1222.5 348.111 1100.64 336.681 1092.33C336.268 1092.04 335.803 1091.84 335.324 1091.75C327.065 1090.22 252.859 1076.43 243.632 1074.71Z" fill="#222496"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M154.261 999.55L211.042 931.338C211.042 931.338 134.129 885.32 114.546 873.596C113.566 873.016 112.953 871.967 112.919 870.829C112.886 869.68 113.436 868.609 114.38 867.962C130.006 857.308 182.604 821.464 182.604 821.464C182.604 821.464 140.948 797.658 127.482 789.96C126.535 789.414 125.911 788.443 125.811 787.361C125.709 786.279 126.146 785.208 126.978 784.505C147.792 766.834 250.823 679.405 250.823 679.405C250.823 679.405 118.398 569.241 99.0156 553.121C97.6824 552.016 97.4169 550.064 98.4053 548.647C110.227 531.579 178.099 433.63 178.099 433.63C178.099 433.63 78.7798 323.645 59.2336 302.002C58.4884 301.177 58.2017 300.039 58.4672 298.957C58.7338 297.886 59.517 297.004 60.5601 296.625C86.763 286.964 214.983 239.719 214.983 239.719C214.983 239.719 241.518 98.1174 246.727 70.317C246.929 69.246 247.641 68.331 248.637 67.8848C249.632 67.4274 250.784 67.4945 251.724 68.0523C275.739 82.2983 396.704 154.042 396.704 154.042C396.704 154.042 462.203 42.5274 475.991 19.0554C476.557 18.096 477.564 17.4713 478.679 17.4044C479.792 17.3374 480.867 17.8397 481.541 18.721L488.245 27.5452L503.432 226.655L638.418 238.927L536.398 388.415L659.614 382.235L541.976 593.684L530.764 836.96L274.271 1104.43L154.261 999.55Z" fill="#2F63D1"/>
+<ellipse cx="562.952" cy="985.462" rx="11.4792" ry="6.78319" transform="rotate(60 562.952 985.462)" fill="#B9F3FF"/>
+<ellipse cx="585.067" cy="970.117" rx="11.4792" ry="3.69524" transform="rotate(60 585.067 970.117)" fill="#74E8FF"/>
+<path d="M522.73 768.855V375.5H869.678L792.144 705.156L711.264 779.9L522.73 768.855Z" fill="url(#paint0_linear_62_13806)"/>
+<path d="M545.599 760.506V375.5H198.651L276.185 705.156L357.065 779.9L545.599 760.506Z" fill="url(#paint1_linear_62_13806)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M165.466 403.392C302.125 355.422 474.484 429.608 539.188 476.462L480.619 17.3984L379.659 146.249L254.713 67.5999L241.884 246.094L62.832 297.969L165.466 403.392Z" fill="#2F63D1"/>
+<path d="M565.962 132.304L480.619 17.3984L539.188 476.462C597.756 425.145 781.27 378.848 883.904 374.386L973.709 255.576L800.235 231.591L756.169 211.511V61.4641L639.591 138.44L565.962 132.304Z" fill="#222496"/>
+<path d="M717.787 315.353C717.787 385.91 560.987 397.932 538.049 397.932C515.111 397.932 351.302 384.865 357.953 315.353C359.358 300.671 465.858 348.803 537.87 348.803C609.882 348.803 717.787 299.982 717.787 315.353Z" fill="#252773"/>
+<path d="M856.05 466.132C806.158 516.024 765.042 444.604 748.822 428.384C732.602 412.164 626.012 265.5 679.867 221.05C691.242 211.661 816.509 256.793 867.429 307.713C918.349 358.633 866.919 455.263 856.05 466.132Z" fill="#252773" fill-opacity="0.32"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M214.781 528.645C240.56 340.364 331.35 317.227 542.858 324.882C672.596 329.578 780.994 300.874 823.392 390.627C854.249 462.633 854.249 538.814 854.249 538.814L901.357 531.269C901.357 531.269 933.524 487.297 873.483 357.234C825.386 253.05 727.906 270.659 542.858 270.659C328.136 270.66 224.635 257.102 186.294 372.886C155.177 466.866 172.657 533.118 172.657 533.118C172.657 533.118 198.422 531.104 214.781 528.645Z" fill="#46D0FF"/>
+<path d="M870.313 568.843C870.313 568.843 905.92 514.415 851.046 384.371C807.089 280.202 711.791 308.27 542.671 308.27C346.43 308.271 252.121 283.212 217.08 398.98C188.641 492.946 204.332 570.692 204.332 570.692" stroke="#29C0F4" stroke-width="25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M910.424 311.537L874.083 408.681C872.608 412.624 874.839 416.982 878.901 418.093L911.092 426.897C915.196 428.02 919.368 425.338 920.049 421.139L936.885 317.416C937.513 313.549 934.914 309.895 931.054 309.218L918.368 306.994C914.972 306.398 911.633 308.307 910.424 311.537Z" fill="#03D5FE"/>
+<path d="M958.156 289.86C958.156 305.673 945.333 318.493 929.514 318.493C913.696 318.493 900.873 305.673 900.873 289.86C900.873 274.046 913.696 261.227 929.514 261.227C945.333 261.227 958.156 274.046 958.156 289.86Z" fill="#7FE5FF"/>
+<path d="M910.424 311.537L874.083 408.681C872.608 412.624 874.839 416.982 878.901 418.093L911.092 426.897C915.196 428.02 919.368 425.338 920.049 421.139L936.885 317.416C937.513 313.549 934.914 309.895 931.054 309.218L918.368 306.994C914.972 306.398 911.633 308.307 910.424 311.537Z" fill="white" fill-opacity="0.32"/>
+<path d="M958.156 289.86C958.156 305.673 945.333 318.493 929.514 318.493C913.696 318.493 900.873 305.673 900.873 289.86C900.873 274.046 913.696 261.227 929.514 261.227C945.333 261.227 958.156 274.046 958.156 289.86Z" fill="white" fill-opacity="0.32"/>
+<path d="M164.075 319.884L200.416 417.029C201.891 420.972 199.66 425.33 195.598 426.441L163.407 435.245C159.303 436.368 155.131 433.686 154.45 429.487L137.614 325.763C136.986 321.896 139.585 318.243 143.445 317.566L156.131 315.341C159.527 314.745 162.866 316.655 164.075 319.884Z" fill="#03D5FE"/>
+<path d="M116.343 298.207C116.343 314.021 129.166 326.84 144.985 326.84C160.803 326.84 173.626 314.021 173.626 298.207C173.626 282.394 160.803 269.574 144.985 269.574C129.166 269.574 116.343 282.394 116.343 298.207Z" fill="#7FE5FF"/>
+<path d="M164.075 319.884L200.416 417.029C201.891 420.972 199.66 425.33 195.598 426.441L163.407 435.245C159.303 436.368 155.131 433.686 154.45 429.487L137.614 325.763C136.986 321.896 139.585 318.243 143.445 317.566L156.131 315.341C159.527 314.745 162.866 316.655 164.075 319.884Z" fill="white" fill-opacity="0.32"/>
+<path d="M116.343 298.207C116.343 314.021 129.166 326.84 144.985 326.84C160.803 326.84 173.626 314.021 173.626 298.207C173.626 282.394 160.803 269.574 144.985 269.574C129.166 269.574 116.343 282.394 116.343 298.207Z" fill="white" fill-opacity="0.32"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M817.838 672.654C817.838 672.654 858.785 537.91 811.604 381.191C811.604 381.191 910.242 373.886 947.161 398.765C971.679 415.292 989.826 472.937 979.882 546.77C972.463 601.858 936.353 638.341 911.889 654.663C885.655 672.164 830.694 672.675 817.838 672.654Z" fill="#7FE5FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M904.192 384.41C921.06 387.19 936.629 391.665 947.162 398.769C971.68 415.296 989.827 472.941 979.883 546.774C972.464 601.862 936.353 638.345 911.89 654.667C909.445 656.297 906.695 657.789 903.719 659.136C946.83 529.006 914.015 413.662 904.192 384.41Z" fill="#46D0FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M969.057 524.311C969.057 524.311 975.676 481.083 956.955 429.507C955.893 426.579 952.654 425.067 949.727 426.129C946.799 427.192 945.285 430.43 946.348 433.357C963.98 481.93 957.9 522.621 957.9 522.621C957.434 525.7 959.556 528.578 962.634 529.043C965.713 529.51 968.591 527.388 969.057 524.311Z" fill="#7FE5FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M964.603 562.474C964.603 562.474 967.01 557.577 967.99 547.819C968.302 544.719 966.039 541.951 962.941 541.64C959.842 541.329 957.075 543.592 956.763 546.69C956.03 553.977 954.394 557.667 954.394 557.667C953.067 560.486 954.278 563.849 957.095 565.176C959.912 566.502 963.276 565.292 964.603 562.474Z" fill="#7FE5FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M257.492 378.07C257.492 378.07 211.004 507.589 279.465 701.67C279.465 701.67 131.521 668.521 110.893 624.987C72.8177 544.634 100.945 434.897 117.928 418.428C138.184 398.786 235.97 380.605 257.492 378.07Z" fill="#7FE5FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M169.372 667.29C142.49 655.654 118.605 641.263 110.892 624.986C72.8168 544.633 100.945 434.896 117.928 418.427C126.05 410.55 146.172 402.784 168.751 396.142C153.398 429.283 129.164 512.994 169.372 667.29Z" fill="#47D0FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M118.306 441.607C118.306 441.607 100.064 484.057 105.62 542.033C105.918 545.133 108.676 547.409 111.776 547.112C114.876 546.814 117.15 544.056 116.854 540.956C111.603 486.175 128.682 446.044 128.682 446.044C129.906 443.181 128.576 439.863 125.712 438.638C122.85 437.413 119.531 438.743 118.306 441.607Z" fill="#7FE5FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M108.52 570.949C108.52 570.949 107.328 578.232 114.124 591.271C115.562 594.033 118.973 595.106 121.734 593.667C124.496 592.228 125.569 588.818 124.131 586.056C119.856 577.855 119.685 573.034 119.74 572.139C119.742 572.092 119.745 572.068 119.745 572.068C120.093 569.193 117.882 566.384 114.791 566.014C111.698 565.646 108.888 567.857 108.52 570.949Z" fill="#7FE5FF"/>
+<path d="M649.442 993.36C649.442 1028.81 633.393 1060.5 608.166 1081.58C588.226 1098.24 562.552 1108.27 534.537 1108.27C507.904 1108.27 483.387 1099.21 463.902 1084C436.957 1062.97 419.631 1030.19 419.631 993.36C419.631 929.9 471.076 878.455 534.537 878.455C597.997 878.455 649.442 929.9 649.442 993.36Z" fill="#252773"/>
+<path d="M622.668 993.36C622.668 1042.03 583.21 1081.49 534.537 1081.49C485.863 1081.49 446.405 1042.03 446.405 993.36C446.405 944.687 485.863 905.229 534.537 905.229C583.21 905.229 622.668 944.687 622.668 993.36Z" fill="#01026D"/>
+<path d="M601.472 993.36C601.472 1030.33 571.504 1060.3 534.537 1060.3C497.57 1060.3 467.602 1030.33 467.602 993.36C467.602 956.393 497.57 926.425 534.537 926.425C571.504 926.425 601.472 956.393 601.472 993.36Z" fill="#03D5FE"/>
+<path d="M580.276 993.36C580.276 1018.62 559.798 1039.1 534.537 1039.1C509.276 1039.1 488.798 1018.62 488.798 993.36C488.798 968.099 509.276 947.621 534.537 947.621C559.798 947.621 580.276 968.099 580.276 993.36Z" fill="#74E8FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M313.3 1145.64C303.718 1143.94 292.13 1142.33 279.727 1140.6L279.726 1140.6C245.407 1135.82 204.854 1130.17 183.317 1119.56C170.44 1198.14 171.819 1281.17 299.08 1249.4C302.881 1248.46 305.654 1245.05 305.817 1241.14C306.843 1216.5 309.196 1183.05 313.3 1145.64Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M770.277 1249.4C897.538 1281.17 898.918 1198.14 886.041 1119.56C864.504 1130.17 823.95 1135.82 789.632 1140.6L789.631 1140.6C777.228 1142.33 765.64 1143.94 756.058 1145.64C760.161 1183.05 762.515 1216.5 763.54 1241.14C763.703 1245.05 766.477 1248.46 770.277 1249.4Z" fill="white"/>
+<path d="M901.007 1104.92C906.625 1078.7 882.6 1020.69 873.676 1012.33C870.553 1009.4 864.704 1008.06 857.025 1007.91C827.957 1007.35 772.675 1023.84 739.902 1035.75C746.997 1073.22 752.272 1111.12 756.058 1145.64C765.64 1143.94 777.228 1142.33 789.631 1140.6L789.632 1140.6C823.95 1135.82 864.504 1130.17 886.041 1119.56C894.307 1115.49 899.772 1110.68 901.007 1104.92Z" fill="#252773"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M279.727 1140.6L279.726 1140.6C245.407 1135.82 204.854 1130.17 183.317 1119.56C175.051 1115.49 169.586 1110.68 168.35 1104.92" fill="#40B7E2"/>
+<path d="M195.682 1012.33C186.757 1020.69 162.732 1078.7 168.35 1104.92C169.586 1110.68 175.051 1115.49 183.317 1119.56C204.854 1130.17 245.407 1135.82 279.726 1140.6L279.727 1140.6C292.13 1142.33 303.718 1143.94 313.3 1145.64C317.086 1111.12 322.361 1073.22 329.455 1035.75C296.683 1023.84 241.401 1007.35 212.333 1007.91C204.654 1008.06 198.804 1009.4 195.682 1012.33Z" fill="#252773"/>
+<path d="M756.058 1145.64C752.272 1111.12 746.997 1073.22 739.902 1035.75C772.675 1023.84 827.957 1007.35 857.025 1007.91C825.139 945.778 758.557 875.025 722.514 841.641H346.844C310.8 875.025 244.219 945.778 212.333 1007.91C241.401 1007.35 296.683 1023.84 329.455 1035.75C322.361 1073.22 317.086 1111.12 313.3 1145.64L379.47 1165.16L463.902 1084C436.957 1062.97 419.631 1030.19 419.631 993.36C419.631 929.9 471.076 878.455 534.537 878.455C597.997 878.455 649.442 929.9 649.442 993.36C649.442 1028.81 633.393 1060.5 608.166 1081.58L697.971 1165.16L756.058 1145.64Z" fill="white"/>
+<path d="M372.501 888.758C354.265 929.264 340.599 981.375 330.57 1034.34C324.567 1031.88 314.131 1027.18 302.13 1024.05C324.045 961.958 336.458 922.143 372.501 888.758Z" fill="#F8F8F8"/>
+<path d="M696.598 888.758C714.835 929.264 728.501 981.375 738.53 1034.34C744.533 1031.88 754.969 1027.18 766.97 1024.05C745.055 961.958 732.642 922.143 696.598 888.758Z" fill="#F8F8F8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M733.5 835.04L740.447 821.394C743.987 814.44 738.589 806.264 730.802 806.774C719.229 807.532 719.381 808.575 699.999 809.679C651.355 812.451 584.839 815.607 534.184 815.607C483.53 815.607 417.013 812.451 368.37 809.679C349.157 808.585 349.429 807.55 337.871 806.794C330.02 806.28 324.618 814.583 328.288 821.543L335.468 835.16C337.075 838.208 340.107 840.215 343.542 840.469C369.079 842.358 461.349 850.087 534.498 850.087C607.547 850.087 699.62 842.379 725.349 840.477C728.836 840.219 731.914 838.155 733.5 835.04Z" fill="#252773"/>
+<path d="M368.37 809.679C417.013 812.451 483.53 815.607 534.184 815.607C584.839 815.607 651.355 812.451 699.999 809.679L678.577 750.744C677.136 746.78 673.369 744.141 669.15 744.141H399.218C395 744.141 391.232 746.78 389.791 750.744L368.37 809.679Z" fill="url(#paint2_linear_62_13806)"/>
+<path d="M380.957 774.33C379.595 779.241 383.106 784.156 388.196 784.42C433.839 786.781 487.656 787.531 533.851 787.531C580.045 787.531 634.682 789.52 680.436 787.532C685.531 787.311 689.043 782.389 687.674 777.476L675.172 732.615C673.761 728.62 670.074 725.961 665.945 725.961H401.756C397.628 725.961 393.94 728.62 392.53 732.615L380.957 774.33Z" fill="#D9D9D9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M326.121 305.055C259.847 305.055 206.121 358.78 206.121 425.055V659.878C206.121 726.152 259.847 779.878 326.121 779.878H743.568C809.843 779.878 863.568 726.152 863.568 659.878V425.055C863.568 358.781 809.843 305.055 743.568 305.055H326.121ZM351.866 353.059C307.683 353.059 271.866 388.876 271.866 433.059V652.917C271.866 697.1 307.683 732.917 351.866 732.917H717.824C762.007 732.917 797.824 697.1 797.824 652.917V433.059C797.824 388.876 762.007 353.059 717.824 353.059H351.866Z" fill="white"/>
+<rect x="271.866" y="353.062" width="525.958" height="379.858" rx="80" fill="url(#paint3_radial_62_13806)"/>
+<rect x="277.866" y="359.062" width="513.958" height="367.858" rx="74" stroke="url(#paint4_linear_62_13806)" stroke-opacity="0.32" stroke-width="12"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M457.177 582.156C457.177 582.156 425.533 544.994 366.765 538.982C362.781 538.575 359.226 541.48 358.819 545.462C358.411 549.443 361.311 553.004 365.293 553.412C417.752 558.775 446.175 591.603 446.175 591.603C448.78 594.64 453.363 594.99 456.397 592.382C459.431 589.773 459.782 585.193 457.177 582.156Z" fill="#222496"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M616.002 582.156C616.002 582.156 647.647 544.994 706.415 538.982C710.398 538.575 713.954 541.48 714.361 545.462C714.768 549.443 711.869 553.004 707.886 553.412C655.427 558.775 627.005 591.603 627.005 591.603C624.4 594.64 619.816 594.99 616.783 592.382C613.749 589.773 613.397 585.193 616.002 582.156Z" fill="#222496"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_62_13806" x1="504.67" y1="375.298" x2="838.931" y2="558.421" gradientUnits="userSpaceOnUse">
+<stop stop-color="#D5CDFB"/>
+<stop offset="1" stop-color="#DBD4FC"/>
+</linearGradient>
+<linearGradient id="paint1_linear_62_13806" x1="198.931" y1="375.297" x2="522.238" y2="571.176" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F6F5FC"/>
+<stop offset="1" stop-color="#DBD6F4"/>
+</linearGradient>
+<linearGradient id="paint2_linear_62_13806" x1="534.184" y1="744.141" x2="534.406" y2="835.015" gradientUnits="userSpaceOnUse">
+<stop offset="0.359682" stop-color="#D9D9D9"/>
+<stop offset="1" stop-color="#FDFDFD"/>
+</linearGradient>
+<radialGradient id="paint3_radial_62_13806" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(422.432 470.962) rotate(66.7746) scale(285.06 382.801)">
+<stop offset="0.219155" stop-color="#D6F8FF"/>
+<stop offset="1" stop-color="#74E8FF"/>
+</radialGradient>
+<linearGradient id="paint4_linear_62_13806" x1="534.845" y1="353.062" x2="534.845" y2="732.921" gradientUnits="userSpaceOnUse">
+<stop stop-color="#526178" stop-opacity="0.16"/>
+<stop offset="1" stop-color="#97B4DE"/>
+</linearGradient>
+<clipPath id="clip0_62_13806">
+<rect width="1080" height="1080" fill="white"/>
+</clipPath>
+</defs>
+</svg>

From a36d473a88e1d584436a4211ea83a4fe2fb73b97 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 5 Nov 2024 15:13:44 +0100
Subject: [PATCH 39/82] icon for chat got new style

---
 .../src/app/components/popup-panel.tsx        |  2 +-
 .../css/themes/bootstrap-cerulean.min.css     |  1 +
 .../css/themes/bootstrap-cyborg.min.css       |  1 +
 .../css/themes/bootstrap-flatly.min.css       |  1 +
 .../css/themes/bootstrap-spacelab.min.css     |  1 +
 .../assets/css/themes/remix-black_undtds.css  |  1 +
 .../assets/css/themes/remix-candy_ikhg4m.css  |  1 +
 .../assets/css/themes/remix-dark_tvx1s2.css   |  1 +
 .../assets/css/themes/remix-hacker_owl.css    |  2 +-
 .../assets/css/themes/remix-light_powaqg.css  |  1 +
 .../css/themes/remix-midcentury_hrzph3.css    |  1 +
 .../src/assets/css/themes/remix-unicorn.css   |  1 +
 .../src/assets/css/themes/remix-violet.css    |  1 +
 .../src/lib/components/custom-tooltip.tsx     |  3 +-
 .../helper/src/types/customtooltip.ts         |  1 +
 .../src/lib/components/homeTabGetStarted.tsx  |  2 +-
 .../statusbar/src/lib/components/aiStatus.tsx | 83 +++++++++++--------
 libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx  |  2 +-
 18 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 3e5155d181..4ebc8a77bd 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -95,7 +95,7 @@ export class PopupPanel extends AbstractPanel {
           height: '40rem',
           position: 'fixed',
           bottom: '2rem',
-          right: '3.5rem',
+          right: '1.5rem',
           zIndex: 200,
           boxShadow: "0 1px 7px var(--secondary)"
         }}
diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-cerulean.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-cerulean.min.css
index a4aa80cea9..6dee3ce457 100644
--- a/apps/remix-ide/src/assets/css/themes/bootstrap-cerulean.min.css
+++ b/apps/remix-ide/src/assets/css/themes/bootstrap-cerulean.min.css
@@ -36,6 +36,7 @@
     --body-bg: #fff;
     --text-bg-mark: #fcf8e3;
     --custom-select: #fff;
+    --brand-dark-blue: #222496;
     --breakpoint-xs:0;
     --breakpoint-sm:576px;
     --breakpoint-md:768px;
diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css
index dd75e7682f..d4842f1d12 100644
--- a/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css
+++ b/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css
@@ -37,6 +37,7 @@
     --body-bg: #060606;
     --text-bg-mark: #fcf8e3;
     --custom-select: #fff;
+    --brand-dark-blue: #222496;
     --breakpoint-xs:0;
     --breakpoint-sm:576px;
     --breakpoint-md:768px;
diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css
index 54bed17144..9d764e4f83 100644
--- a/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css
+++ b/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css
@@ -36,6 +36,7 @@
 	--body-bg: #fff;
 	--text-bg-mark: #fcf8e3;
 	--custom-select: #fff;
+  --brand-dark-blue: #222496;
 	--breakpoint-xs:0;
 	--breakpoint-sm:576px;
 	--breakpoint-md:768px;
diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css
index 5856861ba6..35bf23f3c1 100644
--- a/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css
+++ b/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css
@@ -39,6 +39,7 @@
     --body-bg:#fff;
     --text-bg-mark: #fcf8e3;
     --custom-select: #fff;
+    --brand-dark-blue: #222496;
     --breakpoint-xs:0;
     --breakpoint-sm:576px;
     --breakpoint-md:768px;
diff --git a/apps/remix-ide/src/assets/css/themes/remix-black_undtds.css b/apps/remix-ide/src/assets/css/themes/remix-black_undtds.css
index a9ca2de081..2ff8c005fb 100644
--- a/apps/remix-ide/src/assets/css/themes/remix-black_undtds.css
+++ b/apps/remix-ide/src/assets/css/themes/remix-black_undtds.css
@@ -25,6 +25,7 @@
   --text: #babbcc;
   --body-bg: #1a1a1a;
   --custom-select: #252525;
+  --brand-dark-blue: #222496;
   --text-bg-mark: #a5a5a5;
   --breakpoint-xs: 0;
   --breakpoint-sm: 576px;
diff --git a/apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css b/apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css
index d291d9665d..b4552f4703 100644
--- a/apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css
+++ b/apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css
@@ -25,6 +25,7 @@
   --body-bg: #d5efff;
   --text-bg-mark: #fcf8e3;
   --custom-select: #ffffff;
+  --brand-dark-blue: #222496;
   --breakpoint-xs: 0;
   --breakpoint-sm: 576px;
   --breakpoint-md: 768px;
diff --git a/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css b/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css
index 0e57ee6fca..c131351a55 100644
--- a/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css
+++ b/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css
@@ -25,6 +25,7 @@
   --text-background: #222336;
   --text-bg-mark: #8388b2;
   --custom-select: #35384c;
+  --brand-dark-blue: #222496;
   --runtab: #8A93B0;
   --body-bg: #222336;
   --breakpoint-xs: 0;
diff --git a/apps/remix-ide/src/assets/css/themes/remix-hacker_owl.css b/apps/remix-ide/src/assets/css/themes/remix-hacker_owl.css
index bf4d7268fd..ac79dade67 100644
--- a/apps/remix-ide/src/assets/css/themes/remix-hacker_owl.css
+++ b/apps/remix-ide/src/assets/css/themes/remix-hacker_owl.css
@@ -27,7 +27,7 @@
   --body-bg: #011628;
   --custom-select: #252525;
   --text-bg-mark: #a5a5a5;
-  --custom-select: #011627;
+  --brand-dark-blue: #222496;
   --text-background: #011626;
   --breakpoint-xs: 0;
   --breakpoint-sm: 576px;
diff --git a/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css b/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css
index 1740f44c17..11dd9e544e 100644
--- a/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css
+++ b/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css
@@ -25,6 +25,7 @@
   --body-bg: #eef1f6;
   --text-bg-mark: #fcf8e3;
   --custom-select: #fff;
+  --brand-dark-blue: #222496;
   --breakpoint-xs: 0;
   --breakpoint-sm: 576px;
   --breakpoint-md: 768px;
diff --git a/apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css b/apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css
index 5eebada8ee..0b678a1272 100644
--- a/apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css
+++ b/apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css
@@ -25,6 +25,7 @@
   --body-bg: #DBE2E0;
   --text-bg-mark: #fcf8e3;
   --custom-select: #eeede9;
+  --brand-dark-blue: #222496;
   --breakpoint-xs: 0;
   --breakpoint-sm: 576px;
   --breakpoint-md: 768px;
diff --git a/apps/remix-ide/src/assets/css/themes/remix-unicorn.css b/apps/remix-ide/src/assets/css/themes/remix-unicorn.css
index afa9a5b270..ac3fe7175f 100644
--- a/apps/remix-ide/src/assets/css/themes/remix-unicorn.css
+++ b/apps/remix-ide/src/assets/css/themes/remix-unicorn.css
@@ -25,6 +25,7 @@
   --body-bg: #f1eef6;
   --text-bg-mark: #fcf8e3;
   --custom-select: #fff;
+  --brand-dark-blue: #222496;
   --breakpoint-xs: 0;
   --breakpoint-sm: 576px;
   --breakpoint-md: 768px;
diff --git a/apps/remix-ide/src/assets/css/themes/remix-violet.css b/apps/remix-ide/src/assets/css/themes/remix-violet.css
index 61c372a95f..740ef0dd68 100644
--- a/apps/remix-ide/src/assets/css/themes/remix-violet.css
+++ b/apps/remix-ide/src/assets/css/themes/remix-violet.css
@@ -25,6 +25,7 @@
   --body-bg: #f1eef6;
   --text-bg-mark: #fcf8e3;
   --custom-select: #fff;
+  --brand-dark-blue: #222496;
   --breakpoint-xs: 0;
   --breakpoint-sm: 576px;
   --breakpoint-md: 768px;
diff --git a/libs/remix-ui/helper/src/lib/components/custom-tooltip.tsx b/libs/remix-ui/helper/src/lib/components/custom-tooltip.tsx
index b199c1d8a9..9d3a2d31a7 100644
--- a/libs/remix-ui/helper/src/lib/components/custom-tooltip.tsx
+++ b/libs/remix-ui/helper/src/lib/components/custom-tooltip.tsx
@@ -4,7 +4,7 @@ import { Fragment } from 'react'
 import { OverlayTrigger, Popover, Tooltip } from 'react-bootstrap'
 import { CustomTooltipType } from '../../types/customtooltip'
 
-export function CustomTooltip({ children, placement, tooltipId, tooltipClasses, tooltipText, tooltipTextClasses, delay, hide }: CustomTooltipType) {
+export function CustomTooltip({ children, placement, tooltipId, tooltipClasses, tooltipText, tooltipTextClasses, delay, hide, show }: CustomTooltipType) {
   if (typeof tooltipText !== 'string') {
     const newTooltipText = React.cloneElement(tooltipText, {
       className: ' bg-secondary text-wrap p-1 px-2 '
@@ -16,6 +16,7 @@ export function CustomTooltip({ children, placement, tooltipId, tooltipClasses,
     (!hide ? (
       <Fragment>
         <OverlayTrigger
+          show={show}
           placement={placement}
           overlay={
             <Popover id={`popover-positioned-${placement}`}>
diff --git a/libs/remix-ui/helper/src/types/customtooltip.ts b/libs/remix-ui/helper/src/types/customtooltip.ts
index 7afb63f091..a7b1383089 100644
--- a/libs/remix-ui/helper/src/types/customtooltip.ts
+++ b/libs/remix-ui/helper/src/types/customtooltip.ts
@@ -10,4 +10,5 @@ export type CustomTooltipType = {
   tooltipTextClasses?: string
   delay?: OverlayDelay
   hide?: boolean
+  show?: boolean
 }
\ No newline at end of file
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
index 1671bf26ff..ce83ef76e2 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
@@ -171,7 +171,7 @@ function HomeTabGetStarted({ plugin }: HomeTabGetStartedProps) {
                   <button
                     key={index}
                     className={index === 0 ?
-                      'btn btn-primary border p-2 text-nowrap mr-3 mb-2' :
+                      'btn btn-primary border p-2 text-nowrap mr-3 mb-3' :
                       index === workspaceTemplates.length - 1 ?
                         'btn border p-2 text-nowrap mr-2 mb-3' :
                         'btn border p-2 text-nowrap mr-3 mb-3'
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index fca0022e93..67d60045a9 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -49,42 +49,53 @@ export default function AIStatus(props: AIStatusProps) {
           {copilotActive === false ? 'RemixAI Copilot (disabled)' : 'RemixAI Copilot (enabled)'}
         </span>
       </CustomTooltip>
-      <CustomTooltip
-        tooltipText={"Ask RemixAI for help!"}
-      >
-        <div className="d-flex text-sm flex-row pr-2 text-white justify-content-center align-items-center">
-          <style>{`
-            button.fa-robot:focus {
-              outline: none;
-              box-shadow: none;
-            }
-            button.fa-robot:hover {
-              border-color: var(--info)
-            }
-          `}</style>
-          <button
-            style={{
-              position: 'absolute',
-              bottom: '0.7rem',
-              right: '0.1rem',
-              height: '3rem',
-              width: '3rem',
-              borderRadius: '50%',
-              color: 'var(--ai)',
-              boxShadow: "0 1px 7px var(--secondary)"
-            }}
-            data-id="aiStatusButton"
-            className='h3 p-1 alert alert-info fal fa-robot'
-            onClick={async () => {
-              appContext.appStateDispatch({
-                type: appActionTypes.setShowPopupPanel,
-                payload: !appContext.appState.showPopupPanel
-              })
-            }}
-          >
-          </button>
-        </div>
-      </CustomTooltip>
+      <div className="d-flex text-sm flex-row pr-2 text-white justify-content-center align-items-center">
+        <style>{`
+          button.aiButton:focus {
+            outline: none;
+            box-shadow: none;
+          }
+          button.aiButton:hover {
+            border-color: var(--info)
+          }
+        `}</style>
+        { !appContext.appState.showPopupPanel && <div className='d-flex flex-column' style={{
+                position: 'absolute',
+                bottom: '1.5rem',
+                right: '1.5rem',
+                color: 'var(--ai)',
+                alignItems: 'self-end',
+              }}>
+            <span className='p-1 bg-info mr-4' style={{
+              boxShadow: "0 1px 7px var(--secondary)",
+              zIndex: '200',
+              marginBottom: '-7px'
+            }}>
+              👋 I'm here to help you!
+            </span>
+            <button
+              style={{
+                backgroundColor: 'var(--brand-dark-blue)',
+                height: '3rem',
+                width: '3rem',
+                borderRadius: '50%',
+                color: 'var(--ai)',
+                boxShadow: "0 1px 7px var(--secondary)"
+              }}
+              data-id="aiStatusButton"
+              className='aiButton d-flex align-items-center h3 p-1'
+              onClick={async () => {
+                appContext.appStateDispatch({
+                  type: appActionTypes.setShowPopupPanel,
+                  payload: !appContext.appState.showPopupPanel
+                })
+              }}
+            >
+              <img className="align-self-start" src="assets/img/aiLogoHead.webp" alt="" style={{height: "2rem"}}></img>
+            </button>
+          </div>
+        }
+      </div>
     </div>
   )
 }
\ No newline at end of file
diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
index bae6a258c2..eaaffcad15 100644
--- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
+++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
@@ -279,7 +279,7 @@ export const TabsUI = (props: TabsUIProps) => {
                         methods: ['code_generation', 'code_completion',
                           "solidity_answer", "code_explaining",
                           "code_insertion", "error_explaining",
-                          "initialize", 'chatPipe', 'ProcessChatRequestBuffer', 'isChatRequestPending', 'toggle'],
+                          "initialize", 'chatPipe', 'ProcessChatRequestBuffer', 'isChatRequestPending'],
                         events: [],
                         icon: 'assets/img/remix-logo-blue.png',
                         description: 'RemixAI provides AI services to Remix IDE.',

From 2de6d2880d507cbbac50fb06e6d0c82c16ce86c3 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 5 Nov 2024 15:20:36 +0100
Subject: [PATCH 40/82] color fix

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

diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 67d60045a9..1a2a157a9a 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -66,7 +66,7 @@ export default function AIStatus(props: AIStatusProps) {
                 color: 'var(--ai)',
                 alignItems: 'self-end',
               }}>
-            <span className='p-1 bg-info mr-4' style={{
+            <span className='p-1 bg-light text-info mr-4' style={{
               boxShadow: "0 1px 7px var(--secondary)",
               zIndex: '200',
               marginBottom: '-7px'

From ab73747edef5d91839dca2d6a88c9cc7a857cbb0 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 5 Nov 2024 15:32:59 +0100
Subject: [PATCH 41/82] linter

---
 apps/remix-ide/src/assets/img/aiLogoHead.webp | Bin 0 -> 66260 bytes
 .../statusbar/src/lib/components/aiStatus.tsx |  66 +++++++++---------
 2 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 apps/remix-ide/src/assets/img/aiLogoHead.webp

diff --git a/apps/remix-ide/src/assets/img/aiLogoHead.webp b/apps/remix-ide/src/assets/img/aiLogoHead.webp
new file mode 100644
index 0000000000000000000000000000000000000000..d026f81bbf60f9cdf6ab24ad4f7b09ac099106af
GIT binary patch
literal 66260
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

literal 0
HcmV?d00001

diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 1a2a157a9a..5ba0c390ff 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -60,40 +60,40 @@ export default function AIStatus(props: AIStatusProps) {
           }
         `}</style>
         { !appContext.appState.showPopupPanel && <div className='d-flex flex-column' style={{
-                position: 'absolute',
-                bottom: '1.5rem',
-                right: '1.5rem',
-                color: 'var(--ai)',
-                alignItems: 'self-end',
-              }}>
-            <span className='p-1 bg-light text-info mr-4' style={{
-              boxShadow: "0 1px 7px var(--secondary)",
-              zIndex: '200',
-              marginBottom: '-7px'
-            }}>
+          position: 'absolute',
+          bottom: '1.5rem',
+          right: '1.5rem',
+          color: 'var(--ai)',
+          alignItems: 'self-end',
+        }}>
+          <span className='p-1 bg-light text-info mr-4' style={{
+            boxShadow: "0 1px 7px var(--secondary)",
+            zIndex: '200',
+            marginBottom: '-7px'
+          }}>
               👋 I'm here to help you!
-            </span>
-            <button
-              style={{
-                backgroundColor: 'var(--brand-dark-blue)',
-                height: '3rem',
-                width: '3rem',
-                borderRadius: '50%',
-                color: 'var(--ai)',
-                boxShadow: "0 1px 7px var(--secondary)"
-              }}
-              data-id="aiStatusButton"
-              className='aiButton d-flex align-items-center h3 p-1'
-              onClick={async () => {
-                appContext.appStateDispatch({
-                  type: appActionTypes.setShowPopupPanel,
-                  payload: !appContext.appState.showPopupPanel
-                })
-              }}
-            >
-              <img className="align-self-start" src="assets/img/aiLogoHead.webp" alt="" style={{height: "2rem"}}></img>
-            </button>
-          </div>
+          </span>
+          <button
+            style={{
+              backgroundColor: 'var(--brand-dark-blue)',
+              height: '3rem',
+              width: '3rem',
+              borderRadius: '50%',
+              color: 'var(--ai)',
+              boxShadow: "0 1px 7px var(--secondary)"
+            }}
+            data-id="aiStatusButton"
+            className='aiButton d-flex align-items-center h3 p-1'
+            onClick={async () => {
+              appContext.appStateDispatch({
+                type: appActionTypes.setShowPopupPanel,
+                payload: !appContext.appState.showPopupPanel
+              })
+            }}
+          >
+            <img className="align-self-start" src="assets/img/aiLogoHead.webp" alt="" style={{ height: "2rem" }}></img>
+          </button>
+        </div>
         }
       </div>
     </div>

From 420575bae6f46e2334567bb1295fbb5f3b122b91 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 15:53:59 +0100
Subject: [PATCH 42/82] CI fix

---
 apps/remix-ide-e2e/src/commands/hidePopupPanel.ts | 4 ++--
 apps/remix-ide/src/app/components/popup-panel.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts
index 29baee5523..dd646722a5 100644
--- a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts
+++ b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts
@@ -9,8 +9,8 @@ class HidePopupPanel extends EventEmitter {
           return localStorage.getItem('did_show_popup_panel')
         }, [], function (result) {
           if (!result.value) {
-            browser.waitForElementVisible('*[data-id="aiStatusButton"]')
-            .click('*[data-id="aiStatusButton"]')
+            browser.waitForElementVisible('*[data-id="popupPanelToggle"]')
+            .click('*[data-id="popupPanelToggle"]')
           }
           done()
         })
diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 4ebc8a77bd..5d27c38828 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -104,7 +104,7 @@ export class PopupPanel extends AbstractPanel {
         <div className='d-flex flex-column'>
           <RemixPluginPanel
             header={
-              <span id='popupPanelToggle' className='d-flex flex-row'>
+              <span data-id='popupPanelToggle' id='popupPanelToggle' className='d-flex flex-row'>
                 <button
                   className='btn fas fa-angle-double-down'
                   onClick={async () => {

From 270aa772a0f78f0f14cf17a45971d711e6988327 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 5 Nov 2024 16:24:53 +0100
Subject: [PATCH 43/82] random fixes

---
 libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 5ba0c390ff..4603b6203c 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -62,13 +62,14 @@ export default function AIStatus(props: AIStatusProps) {
         { !appContext.appState.showPopupPanel && <div className='d-flex flex-column' style={{
           position: 'absolute',
           bottom: '1.5rem',
-          right: '1.5rem',
+          right: '0.5rem',
           color: 'var(--ai)',
           alignItems: 'self-end',
         }}>
-          <span className='p-1 bg-light text-info mr-4' style={{
+          <span className='p-1 alert alert-info' style={{
             boxShadow: "0 1px 7px var(--secondary)",
             zIndex: '200',
+            marginRight: '1.8rem',
             marginBottom: '-7px'
           }}>
               👋 I'm here to help you!

From 386c8eaa488c766d26785c7ed76bb627bc527399 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 19:36:56 +0100
Subject: [PATCH 44/82] fix data-id

---
 apps/remix-ide/src/app/components/popup-panel.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 5d27c38828..6c0d804719 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -104,8 +104,9 @@ export class PopupPanel extends AbstractPanel {
         <div className='d-flex flex-column'>
           <RemixPluginPanel
             header={
-              <span data-id='popupPanelToggle' id='popupPanelToggle' className='d-flex flex-row'>
+              <span id='popupPanelToggle' className='d-flex flex-row'>
                 <button
+                   data-id='popupPanelToggle'
                   className='btn fas fa-angle-double-down'
                   onClick={async () => {
                     await this.showPopupPanel(false)

From b569cbd44fc1c2481345368f3e9e452ddf2fbf5b Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 19:43:47 +0100
Subject: [PATCH 45/82] lint

---
 apps/remix-ide/src/app/components/popup-panel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 6c0d804719..4352394aae 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -106,7 +106,7 @@ export class PopupPanel extends AbstractPanel {
             header={
               <span id='popupPanelToggle' className='d-flex flex-row'>
                 <button
-                   data-id='popupPanelToggle'
+                  data-id='popupPanelToggle'
                   className='btn fas fa-angle-double-down'
                   onClick={async () => {
                     await this.showPopupPanel(false)

From 93befc2ee02aa1919abda68cd6b894fab126ef73 Mon Sep 17 00:00:00 2001
From: Liana Husikyan <liana@ethereum.org>
Date: Tue, 5 Nov 2024 21:56:38 +0100
Subject: [PATCH 46/82] Update aiStatus.tsx

---
 libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 4603b6203c..73ba8a1584 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -66,7 +66,7 @@ export default function AIStatus(props: AIStatusProps) {
           color: 'var(--ai)',
           alignItems: 'self-end',
         }}>
-          <span className='p-1 alert alert-info' style={{
+          <span className='p-1 text-info alert alert-secondary' style={{
             boxShadow: "0 1px 7px var(--secondary)",
             zIndex: '200',
             marginRight: '1.8rem',
@@ -99,4 +99,4 @@ export default function AIStatus(props: AIStatusProps) {
       </div>
     </div>
   )
-}
\ No newline at end of file
+}

From 2c7a6e20c308e670ddf855f938a3677ebd4c1ce4 Mon Sep 17 00:00:00 2001
From: Liana Husikyan <liana@ethereum.org>
Date: Tue, 5 Nov 2024 22:14:59 +0100
Subject: [PATCH 47/82] Update url.test.ts

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

diff --git a/apps/remix-ide-e2e/src/tests/url.test.ts b/apps/remix-ide-e2e/src/tests/url.test.ts
index 8a77f2e60c..43ee8e48f3 100644
--- a/apps/remix-ide-e2e/src/tests/url.test.ts
+++ b/apps/remix-ide-e2e/src/tests/url.test.ts
@@ -97,8 +97,8 @@ module.exports = {
       .refreshPage()
       .pause(7000)
       .currentWorkspaceIs('code-sample')
-      .waitForElementVisible('*[data-id=treeViewLitreeViewItemsepolia]')
-      .waitForElementVisible('*[data-id="treeViewLitreeViewItemsepolia/0xdac17f958d2ee523a2206206994597c13d831ec7/contracts/MetaMultiSigWallet.sol"]')
+      .waitForElementVisible('*[data-id=treeViewLitreeViewItemsepolia]', 20000)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemsepolia/0xdac17f958d2ee523a2206206994597c13d831ec7/contracts/MetaMultiSigWallet.sol"]', 20000)
       .getEditorValue((content) => {
         browser.assert.ok(content && content.indexOf(
           'contract MetaMultiSigWallet {') !== -1)

From b8893fd5f0185c09991682fcfbd8f1b1d89f0522 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 22:34:57 +0100
Subject: [PATCH 48/82] flaky run

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 67b99229f6..73a4af3952 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   run_flaky_tests:
     type: boolean
-    default: false
+    default: true
 orbs:
   browser-tools: circleci/browser-tools@1.4.4
   win: circleci/windows@5.0
diff --git a/apps/remix-ide-e2e/src/tests/url.test.ts b/apps/remix-ide-e2e/src/tests/url.test.ts
index 8a77f2e60c..b4ba938d59 100644
--- a/apps/remix-ide-e2e/src/tests/url.test.ts
+++ b/apps/remix-ide-e2e/src/tests/url.test.ts
@@ -91,7 +91,7 @@ module.exports = {
       })
   },
 
-  'Should load Etherscan verified contracts from URL "address" param) #group1': function (browser: NightwatchBrowser) {
+  'Should load Etherscan verified contracts from URL "address" param) #flaky #group1': function (browser: NightwatchBrowser) {
     browser
       .url('http://127.0.0.1:8080/#address=0xdac17f958d2ee523a2206206994597c13d831ec7')
       .refreshPage()

From cc4703d9cd6afdd6c7b3136da8a8c000a143b013 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 22:37:29 +0100
Subject: [PATCH 49/82] undo

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 73a4af3952..67b99229f6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   run_flaky_tests:
     type: boolean
-    default: true
+    default: false
 orbs:
   browser-tools: circleci/browser-tools@1.4.4
   win: circleci/windows@5.0
diff --git a/apps/remix-ide-e2e/src/tests/url.test.ts b/apps/remix-ide-e2e/src/tests/url.test.ts
index b4ba938d59..8a77f2e60c 100644
--- a/apps/remix-ide-e2e/src/tests/url.test.ts
+++ b/apps/remix-ide-e2e/src/tests/url.test.ts
@@ -91,7 +91,7 @@ module.exports = {
       })
   },
 
-  'Should load Etherscan verified contracts from URL "address" param) #flaky #group1': function (browser: NightwatchBrowser) {
+  'Should load Etherscan verified contracts from URL "address" param) #group1': function (browser: NightwatchBrowser) {
     browser
       .url('http://127.0.0.1:8080/#address=0xdac17f958d2ee523a2206206994597c13d831ec7')
       .refreshPage()

From 99289a4bca9598c03a278c79c7ee98a3c294a019 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 22:38:13 +0100
Subject: [PATCH 50/82] flaky test

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 67b99229f6..73a4af3952 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   run_flaky_tests:
     type: boolean
-    default: false
+    default: true
 orbs:
   browser-tools: circleci/browser-tools@1.4.4
   win: circleci/windows@5.0
diff --git a/apps/remix-ide-e2e/src/tests/url.test.ts b/apps/remix-ide-e2e/src/tests/url.test.ts
index 8a77f2e60c..b4ba938d59 100644
--- a/apps/remix-ide-e2e/src/tests/url.test.ts
+++ b/apps/remix-ide-e2e/src/tests/url.test.ts
@@ -91,7 +91,7 @@ module.exports = {
       })
   },
 
-  'Should load Etherscan verified contracts from URL "address" param) #group1': function (browser: NightwatchBrowser) {
+  'Should load Etherscan verified contracts from URL "address" param) #flaky #group1': function (browser: NightwatchBrowser) {
     browser
       .url('http://127.0.0.1:8080/#address=0xdac17f958d2ee523a2206206994597c13d831ec7')
       .refreshPage()

From a6ba619ce31e953fa8d312cddf514973f062bd86 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 23:04:04 +0100
Subject: [PATCH 51/82] fix url test

---
 apps/remix-ide-e2e/src/tests/url.test.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/url.test.ts b/apps/remix-ide-e2e/src/tests/url.test.ts
index b4ba938d59..15d64def03 100644
--- a/apps/remix-ide-e2e/src/tests/url.test.ts
+++ b/apps/remix-ide-e2e/src/tests/url.test.ts
@@ -95,15 +95,8 @@ module.exports = {
     browser
       .url('http://127.0.0.1:8080/#address=0xdac17f958d2ee523a2206206994597c13d831ec7')
       .refreshPage()
-      .pause(7000)
+      .pause(2000)
       .currentWorkspaceIs('code-sample')
-      .waitForElementVisible('*[data-id=treeViewLitreeViewItemsepolia]')
-      .waitForElementVisible('*[data-id="treeViewLitreeViewItemsepolia/0xdac17f958d2ee523a2206206994597c13d831ec7/contracts/MetaMultiSigWallet.sol"]')
-      .getEditorValue((content) => {
-        browser.assert.ok(content && content.indexOf(
-          'contract MetaMultiSigWallet {') !== -1)
-
-      })
       .waitForElementVisible('*[data-id=treeViewLitreeViewItemmainnet]')
       .click('*[data-id=treeViewLitreeViewItemmainnet]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7"]')

From 12b3f27b31a5526e6232ec432dfcf3a68e586154 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 23:10:59 +0100
Subject: [PATCH 52/82] don't click

---
 apps/remix-ide-e2e/src/tests/url.test.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/apps/remix-ide-e2e/src/tests/url.test.ts b/apps/remix-ide-e2e/src/tests/url.test.ts
index 15d64def03..538a1ae95d 100644
--- a/apps/remix-ide-e2e/src/tests/url.test.ts
+++ b/apps/remix-ide-e2e/src/tests/url.test.ts
@@ -92,6 +92,22 @@ module.exports = {
   },
 
   'Should load Etherscan verified contracts from URL "address" param) #flaky #group1': function (browser: NightwatchBrowser) {
+    browser
+      .url('http://127.0.0.1:8080/#address=0xdac17f958d2ee523a2206206994597c13d831ec7')
+      .refreshPage()
+      .pause(2000)
+      .currentWorkspaceIs('code-sample')
+      .waitForElementVisible('*[data-id=treeViewLitreeViewItemmainnet]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7/TetherToken.sol"]')
+      .click('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7/TetherToken.sol"]')
+      .getEditorValue((content) => {
+        browser.assert.ok(content && content.indexOf(
+          'contract TetherToken is Pausable, StandardToken, BlackList {') !== -1)
+
+      })
+  },
+  'Should load Etherscan sepolia verified contracts from URL "address" param) #flaky #group1': function (browser: NightwatchBrowser) {
     browser
       .url('http://127.0.0.1:8080/#address=0xdac17f958d2ee523a2206206994597c13d831ec7')
       .refreshPage()

From 1982977ce3c2d54d7b26eb995be2b39451d6fd40 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 23:12:34 +0100
Subject: [PATCH 53/82] no sepolia

---
 apps/remix-ide-e2e/src/tests/url.test.ts | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/url.test.ts b/apps/remix-ide-e2e/src/tests/url.test.ts
index 538a1ae95d..9db1b69bac 100644
--- a/apps/remix-ide-e2e/src/tests/url.test.ts
+++ b/apps/remix-ide-e2e/src/tests/url.test.ts
@@ -107,24 +107,6 @@ module.exports = {
 
       })
   },
-  'Should load Etherscan sepolia verified contracts from URL "address" param) #flaky #group1': function (browser: NightwatchBrowser) {
-    browser
-      .url('http://127.0.0.1:8080/#address=0xdac17f958d2ee523a2206206994597c13d831ec7')
-      .refreshPage()
-      .pause(2000)
-      .currentWorkspaceIs('code-sample')
-      .waitForElementVisible('*[data-id=treeViewLitreeViewItemmainnet]')
-      .click('*[data-id=treeViewLitreeViewItemmainnet]')
-      .waitForElementVisible('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7"]')
-      .click('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7"]')
-      .waitForElementVisible('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7/TetherToken.sol"]')
-      .click('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7/TetherToken.sol"]')
-      .getEditorValue((content) => {
-        browser.assert.ok(content && content.indexOf(
-          'contract TetherToken is Pausable, StandardToken, BlackList {') !== -1)
-
-      })
-  },
 
   'Should load Blockscout verified contracts from URL "address" and "blockscout" params (single source)': ''+function (browser: NightwatchBrowser) {
     browser

From a1be3eca928586b6f7f6f633e74ea58f038cac71 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Tue, 5 Nov 2024 23:19:18 +0100
Subject: [PATCH 54/82] turn off flaky

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 73a4af3952..67b99229f6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   run_flaky_tests:
     type: boolean
-    default: true
+    default: false
 orbs:
   browser-tools: circleci/browser-tools@1.4.4
   win: circleci/windows@5.0

From 302eb8edee1783d0215fd5550364eb21f3da0c00 Mon Sep 17 00:00:00 2001
From: ryestew <rob@stupay.com>
Date: Mon, 4 Nov 2024 14:50:37 -0500
Subject: [PATCH 55/82] update qdapp logo in udapp and change size of logo

---
 libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 37ba859f5f..601147f5d1 100644
--- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
@@ -287,12 +287,12 @@ export function UniversalDappUI(props: UdappProps) {
               <b><FormattedMessage id="udapp.balance" />:</b> {instanceBalance} ETH
             </span>
             <div></div>
-            <div className="d-flex align-self-center">
+            <div className="btn d-flex p-0 align-self-center">
               {props.exEnvironment && props.exEnvironment.startsWith('injected') && (
                 <CustomTooltip placement="top" tooltipClasses="text-nowrap" tooltipId="udapp_udappEditTooltip" tooltipText={<FormattedMessage id="udapp.tooltipTextEdit" />}>
                   <i
                     data-id="instanceEditIcon"
-                    className="fas fa-edit pr-3"
+                    className="fas fa-sparkles"
                     onClick={() => {
                       props.editInstance(props.instance)
                     }}

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 56/82] 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 57/82] 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 58/82] 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 59/82] 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 60/82] 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 61/82] 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 62/82] 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 63/82] 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 64/82] 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 65/82] 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 66/82] 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 67/82] 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 68/82] 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 69/82] 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 70/82] 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 71/82] 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 72/82] 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 73/82] 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 74/82] 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 75/82] 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 76/82] 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 77/82] 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 78/82] 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 79/82] 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 80/82] 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 81/82] 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 82/82] 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": "Добавить новый файл в рабочую область"
 }