From da9324c5b42a4fac762ab358d3b80a99a955b518 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 20 Dec 2023 16:18:48 +0100
Subject: [PATCH] fix autocompile

---
 .../solidity-compiler/src/lib/actions/compiler.ts |  5 +++--
 .../src/lib/compiler-container.tsx                | 15 ++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
index b1c0b686de..1808c182e7 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
@@ -1,5 +1,6 @@
 import React from 'react'
 import { CompileTabLogic } from '../logic/compileTabLogic'
+
 export const setEditorMode = (mode: string) => {
   return {
     type: 'SET_EDITOR_MODE',
@@ -28,7 +29,7 @@ export const resetCompilerMode = () => (dispatch: React.Dispatch<any>) => {
 
 export const listenToEvents = (compileTabLogic: CompileTabLogic, api) => (dispatch: React.Dispatch<any>) => {
   api.onSessionSwitched = () => {
-    dispatch(setEditorMode('sessionSwitched'))
+    dispatch(setEditorMode('sessionSwitched_' + Date.now()))
   }
 
   compileTabLogic.event.on('startingCompilation', () => {
@@ -40,7 +41,7 @@ export const listenToEvents = (compileTabLogic: CompileTabLogic, api) => (dispat
   })
 
   api.onContentChanged = () => {
-    dispatch(setEditorMode('contentChanged'))
+    dispatch(setEditorMode('contentChanged_' + Date.now()))
   }
   compileTabLogic.compiler.event.register('loadingCompiler', () => {
     dispatch(setCompilerMode('loadingCompiler'))
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 b1a1d74f21..05eab14966 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -6,7 +6,7 @@ import {ConfigurationSettings} from '@remix-project/remix-lib'
 import {checkSpecialChars, CustomTooltip, extractNameFromKey} from '@remix-ui/helper'
 import {canUseWorker, urlFromVersion, pathToURL} from '@remix-project/remix-solidity'
 import {compilerReducer, compilerInitialState} from './reducers/compiler'
-import {resetEditorMode, listenToEvents} from './actions/compiler'
+import {listenToEvents} from './actions/compiler'
 import {getValidLanguage} from '@remix-project/remix-solidity'
 import {CopyToClipboard} from '@remix-ui/clipboard'
 import {configFileContent} from './compilerConfiguration'
@@ -231,16 +231,13 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
 
   useEffect(() => {
     if (compilerContainer.editor.mode) {
-      switch (compilerContainer.editor.mode) {
-      case 'sessionSwitched':
+      if (compilerContainer.editor.mode.startsWith('sessionSwitched')) {
         sessionSwitched()
-        resetEditorMode()(dispatch)
-        break
-      case 'contentChanged':
+        return
+      } else if (compilerContainer.editor.mode.startsWith('contentChanged')) {
         contentChanged()
-        resetEditorMode()(dispatch)
-        break
-      }
+        return
+      }      
     }
   }, [compilerContainer.editor.mode])