Merge branch 'aiui_steph' of https://github.com/ethereum/remix-project into aiui_steph after rebase

apps/remixdesktop/src/menus/view.ts

@@ -1,90 +0,0 @@
-import {BrowserWindow, MenuItemConstructorOptions} from 'electron';
-
-export default (
-  commandKeys: Record<string, string>,
-  execCommand: (command: string, focusedWindow?: BrowserWindow) => void
-): MenuItemConstructorOptions => {
-  const isMac = process.platform === 'darwin';
-
-  return {
-    label: 'View',
-    submenu: [
-      {
-        label: 'Toggle Developer Tools',
-        accelerator: (function() {
-          if (process.platform === 'darwin')
-            return 'Alt+Command+I';
-          else
-            return 'Ctrl+Shift+I';
-        })(),
-        click: function(item, focusedWindow) {
-          if (focusedWindow)
-            focusedWindow.webContents.toggleDevTools();
-        }
-      },
-      {
-        label: 'Reload',
-        accelerator: 'CmdOrCtrl+R',
-        click: function(item, focusedWindow) {
-          if (focusedWindow)
-            focusedWindow.reload();
-        }
-      },
-      {
-        label: 'Toggle Full Screen',
-        accelerator: (function() {
-          if (process.platform === 'darwin')
-
-            return 'Ctrl+Command+F';
-          else
-            return 'F11';
-        })(),
-        click: function(item, focusedWindow) {
-          if (focusedWindow)
-            focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
-        }
-      },
-      {
-        label: 'Zoom In',
-        accelerator: 'CmdOrCtrl+=',
-        click: function(item, focusedWindow) {
-          if (focusedWindow){
-            let factor = focusedWindow.webContents.getZoomFactor()
-            if (factor < 4) {
-              factor = factor + 0.25
-              focusedWindow.webContents.setZoomFactor(factor)
-            }
-          }
-        }
-      },
-      {
-        label: 'Zoom Out',
-        accelerator: 'CmdOrCtrl+-',
-        click: function(item, focusedWindow) {
-          if (focusedWindow){
-            let factor = focusedWindow.webContents.getZoomFactor()
-            console.log(factor)
-            if (factor > 1.25) {
-              factor = factor - 0.25
-              focusedWindow.webContents.setZoomFactor(factor)
-            }else{
-              focusedWindow.webContents.setZoomFactor(1)
-            }
-
-          }
-        }
-      },
-      {
-        label: 'Reset Zoom',
-        accelerator: 'CmdOrCtrl+0',
-        click: function(item, focusedWindow) {
-          if (focusedWindow)
-          {
-            focusedWindow.webContents.setZoomFactor(1)
-          }
-        }
-      },
-
-    ]
-  };
-};

libs/remix-ui/settings/src/lib/remix-ui-settings.tsx

@@ -4,12 +4,6 @@ import React, {useState, useRef, useReducer, useEffect, useCallback} from 'react
 import {AppModal, AlertModal, ModalTypes} from '@remix-ui/app'
 import {labels, textDark, textSecondary} from './constants'
 
-enum CONSENT {
-  GIVEN = 0,
-  NOT_GIVEN,
-  NOT_ASKED
-}
-let consentGivenForAI = CONSENT.NOT_ASKED
 
 import './remix-ui-settings.css'
 import {
@@ -138,8 +132,6 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
   }
 
   const onchangeCopilotActivate = () => {
-    console.log("onchangeCopilotActivate ", props.useCopilot)
-  const onchangeCopilotActivate = async () => {
     if (!props.useCopilot) {
       copilotActivate(props.config, props.useCopilot, dispatch)
       props.plugin.call('copilot-suggestion', 'uninstall')
@@ -162,18 +154,17 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
       props.plugin.call('terminal', 'log', {type: 'typewriterlog', value: `Solidity Copilot activated` })
     })
 
-    if (await props.plugin.call('copilot-suggestion', 'status')) {
+    if (props.plugin.call('copilot-suggestion', 'status')) {
       copilotActivate(props.config, true, dispatch)          
-    }else {
+    } else {
       startCopilot()
     }
   }
 
- useEffect(() => {
+  useEffect(() => {
-  if (props.useCopilot !== null) copilotActivate(props.config, props.useCopilot, dispatch)
+    if (props.useCopilot !== null) copilotActivate(props.config, props.useCopilot, dispatch)
-  onchangeCopilotActivate()
+    onchangeCopilotActivate()
-}, [props.useCopilot])
+  }, [props.useCopilot])
-
 
   const onchangeCopilotMaxNewToken = (event) => {
     copilotMaxNewToken(props.config, parseInt(event.target.value), dispatch)