Merge pull request #2871 from ethereum/better_electron_support

better electron support
ethereum · Sep 5, 2022 · a1d888a · a1d888a · vercel · Sep 5, 2022
2 parents 22d03b2 + 0753cfd
commit a1d888a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
@@ -354,10 +354,6 @@ class AppComponent {
     const queryParams = new QueryParams()
     const params = queryParams.get()
 
-    if (isElectron()) {
-      this.appManager.activatePlugin('remixd')
-    }
-
     try {
       this.engine.register(await this.appManager.registeredPlugins())
     } catch (e) {

diff --git a/libs/remix-ui/workspace/src/lib/actions/index.ts b/libs/remix-ui/workspace/src/lib/actions/index.ts
@@ -8,6 +8,7 @@ import { createWorkspaceTemplate, getWorkspaces, loadWorkspacePreset, setPlugin,
 import { QueryParams } from '@remix-project/remix-lib'
 import { fetchContractFromEtherscan } from '@remix-project/core-plugin' // eslint-disable-line
 import JSZip from 'jszip'
+import isElectron  from 'is-electron'
 
 export * from './events'
 export * from './workspace'
@@ -111,6 +112,10 @@ export const initWorkspace = (filePanelPlugin) => async (reducerDispatch: React.
           await basicWorkspaceInit(workspaces, workspaceProvider)
         }
       } else await basicWorkspaceInit(workspaces, workspaceProvider)
+    } else if (isElectron()) {
+      plugin.call('notification', 'toast', `connecting to localhost...`)
+      await basicWorkspaceInit(workspaces, workspaceProvider)
+      await plugin.call('manager', 'activatePlugin', 'remixd')
     } else if (localStorage.getItem("currentWorkspace")) {
       const index = workspaces.findIndex(element => element.name == localStorage.getItem("currentWorkspace"))
       if (index !== -1) {