Merge pull request #2038 from ethereum/fix-import

Reset selected account when account changes on injectedWeb3.

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

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

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

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

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

@@ -145,6 +145,13 @@ const fillAccountsList = async () => {
           })
         })
       }))
+      const provider = plugin.blockchain.getProvider()
+
+      if (provider === 'injected') {
+        const selectedAddress = plugin.blockchain.getInjectedWeb3Address()
+
+        if (!(Object.keys(loadedAccounts).includes(selectedAddress))) setAccount(null)
+      }
       dispatch(fetchAccountsListSuccess(loadedAccounts))
     }).catch((e) => {
       dispatch(fetchAccountsListFailed(e.message))

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

@@ -37,6 +37,7 @@ export class Blockchain extends Plugin<any, any> {
     setProviderFromEndpoint(target: any, context: any, cb: any): void;
     detectNetwork(cb: any): void;
     getProvider(): any;
+    getInjectedWeb3Address(): any;
     /**
      * return the fork name applied to the current envionment
      * @return {String} - fork name