Merge branch 'master' into newaichat

Author: joeizang

apps/remix-ide/src/blockchain/blockchain.tsx

@@ -623,10 +623,6 @@ export class Blockchain extends Plugin {
     return this.executionContext.getProviderObject()
   }
 
-  getInjectedWeb3Address() {
-    return this.executionContext.getSelectedAddress()
-  }
-
   /**
    * return the fork name applied to the current environment
    * @return {String} - fork name

apps/remix-ide/src/blockchain/execution-context.js

@@ -49,10 +49,6 @@ export class ExecutionContext {
     return this.customNetWorks[this.executionContext]
   }
 
-  getSelectedAddress () {
-    return injectedProvider ? injectedProvider.selectedAddress : null
-  }
-
   getCurrentFork () {
     return this.currentFork
   }

apps/remix-ide/src/index.tsx

@@ -3,7 +3,6 @@ import React from 'react'
 import './index.css'
 import { ThemeModule } from './app/tabs/theme-module'
 import { Preload } from './app/components/preload'
-import { BrowserRouter, Routes, Route } from 'react-router-dom'
 import { GitHubPopupCallback } from './app/pages/GitHubPopupCallback'
 import Config from './config'
 import { Registry } from '@remix-project/remix-lib'
@@ -23,13 +22,13 @@ import { createRoot } from 'react-dom/client'
   const container = document.getElementById('root');
   const root = createRoot(container)
   if (container) {
-    root.render(
-      <BrowserRouter>
-        <Routes>
-          <Route path="/auth/github/callback" element={<GitHubPopupCallback />} />
-          <Route path="*" element={<Preload root={root} />} />
-        </Routes>
-      </BrowserRouter>
-    )
+    if (window.location.hash.includes('source=github')) {
+      root.render(
+        <GitHubPopupCallback />
+      )
+    } else {
+      root.render(
+        <Preload root={root} />)
+    }
   }
 })()

libs/remix-ui/git/src/components/github/devicecode.tsx

@@ -49,7 +49,7 @@ export const GetDeviceCode = () => {
     }
 
     const clientId = await getClientId()
-    const redirectUri = `${window.location.origin}/auth/github/callback`
+    const redirectUri = `${window.location.origin}/?source=github`
     const scope = 'repo gist user:email read:user'
 
     const url = `https://github.com/login/oauth/authorize?client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}&scope=${encodeURIComponent(scope)}&response_type=code`

libs/remix-ui/run-tab/src/lib/actions/account.ts

@@ -49,10 +49,6 @@ export const fillAccountsList = async (plugin: RunTab, dispatch: React.Dispatch<
         loadedAccounts[account] = shortenAddress(account, balance)
         if (safeAddresses.length && safeAddresses.includes(account)) loadedAccounts[account] = `[SMART] ${loadedAccounts[account]}`
       }
-      if (provider && provider.startsWith('injected')) {
-        const selectedAddress = plugin.blockchain.getInjectedWeb3Address()
-        if (selectedAddress && !(Object.keys(loadedAccounts).includes(toChecksumAddress(selectedAddress)))) setAccount(dispatch, null)
-      }
       dispatch(fetchAccountsListSuccess(loadedAccounts))
     } catch (e) {
       dispatch(fetchAccountsListFailed(e.message))

libs/remix-ui/run-tab/src/lib/types/blockchain.d.ts

@@ -41,7 +41,6 @@ export class Blockchain extends Plugin<any, any> {
   changeExecutionContext(context: any, confirmCb: any, infoCb: any, cb: any): Promise<any>;
   detectNetwork(cb: any): void;
   getProvider(): any;
-  getInjectedWeb3Address(): any;
   /**
      * return the fork name applied to the current environment
      * @return {String} - fork name