Merge pull request #2292 from ethereum/fix_metamask

Fix Metamask integration

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

@@ -76,6 +76,15 @@ export class ExecutionContext {
     if (this.isVM()) {
       callback(null, { id: '-', name: 'VM' })
     } else {
+      if (!web3.currentProvider) {
+        return callback('No provider set')
+      }
+      if (web3.currentProvider.isConnected && !web3.currentProvider.isConnected()) {
+        if (web3.currentProvider.isMetaMask) {
+          this.askPermission()
+        }
+        return callback('Provider not connected')
+      }
       web3.eth.net.getId((err, id) => {
         let name = null
         if (err) name = 'Unknown'

libs/remix-ui/run-tab/src/lib/run-tab.tsx

@@ -56,6 +56,8 @@ export function RunTabUI (props: RunTabProps) {
     storage: null,
     contract: null
   })
+  runTabInitialState.selectExEnv = props.plugin.blockchain.getProvider()
+  runTabInitialState.selectExEnv = runTabInitialState.selectExEnv === 'vm' ? 'vm-london' : runTabInitialState.selectExEnv
   const [runTab, dispatch] = useReducer(runTabReducer, runTabInitialState)
   const REACT_API = { runTab }