From 9db15727eb090b2bffe1b5f63067ebf3ad7fd199 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Fri, 17 Jun 2022 17:35:19 +0200
Subject: [PATCH 1/5] renamed envs

---
 libs/remix-ui/run-tab/src/lib/reducers/runTab.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
index 20ecb8b1ef..c61d82905d 100644
--- a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
+++ b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
@@ -118,26 +118,26 @@ export const runTabInitialState: RunTabState = {
       title: 'Execution environment is local to Remix.  Data is only saved to browser memory and will vanish upon reload.',
       value: 'vm-london',
       fork: 'london',
-      content: 'JavaScript VM (London)'
+      content: 'Local VM (London)'
     }, {
       id: 'vm-mode-berlin',
       dataId: 'settingsVMBerlinMode',
       title: 'Execution environment is local to Remix.  Data is only saved to browser memory and will vanish upon reload.',
       value: 'vm-berlin',
       fork: 'berlin',
-      content: 'JavaScript VM (Berlin)'
+      content: 'Local VM (Berlin)'
     }, {
       id: 'injected-mode',
       dataId: 'settingsInjectedMode',
       title: 'Execution environment has been provided by Metamask or similar provider.',
       value: 'injected',
-      content: 'Injected Web3'
+      content: 'Injected Provider - Metamask'
     }, {
       id: 'web3-mode',
       dataId: 'settingsWeb3Mode',
       title: `Execution environment connects to an external node. For security, only connect to trusted networks. If Remix is served via https and your node is accessed via http, it might not work. In this case, try cloning the repository and serving it via http.`,
       value: 'web3',
-      content: 'Web3 Provider'
+      content: 'JSON-RPC Provider'
     }],
     isRequesting: false,
     isSuccessful: false,

From 4b7114417da89abef7025dfb7015b1a60d93998e Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Fri, 17 Jun 2022 17:47:01 +0200
Subject: [PATCH 2/5] e2e fix

---
 apps/remix-ide-e2e/src/tests/plugin_api.ts                      | 2 +-
 .../remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx | 2 +-
 libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx    | 2 +-
 libs/remix-ui/run-tab/src/lib/css/run-tab.css                   | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/plugin_api.ts b/apps/remix-ide-e2e/src/tests/plugin_api.ts
index faabf03247..2f4aae42e0 100644
--- a/apps/remix-ide-e2e/src/tests/plugin_api.ts
+++ b/apps/remix-ide-e2e/src/tests/plugin_api.ts
@@ -188,7 +188,7 @@ module.exports = {
       .frameParent()
       .useCss()
       .clickLaunchIcon('udapp')
-      .waitForElementContainsText('#selectExEnvOptions option:checked', 'JavaScript VM (Berlin)')
+      .waitForElementContainsText('#selectExEnvOptions option:checked', 'Local VM (Berlin)')
       .clickLaunchIcon('localPlugin')
       .useXpath()
       // @ts-ignore
diff --git a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
index 5c2800ef4d..6890c53f6d 100644
--- a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
@@ -12,7 +12,7 @@ export function InstanceContainerUI (props: InstanceContainerProps) {
 
   return (
     <div className="udapp_instanceContainer mt-3 border-0 list-group-item">
-      <label className="udapp_deployedContracts d-flex justify-content-between align-items-center pl-2 mb-1"
+      <label className="udapp_deployedContracts d-flex justify-content-between align-items-center pl-2 mb-2"
         title="Autogenerated generic user interfaces for interaction with deployed contracts">
         Deployed Contracts
         { instanceList.length > 0
diff --git a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
index ad3c48cabc..679ab61b15 100644
--- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
@@ -204,7 +204,7 @@ export function UniversalDappUI (props: UdappProps) {
 
   return (
     <div className={`instance udapp_instance udapp_run-instance border-dark ${toggleExpander ? 'udapp_hidesub' : 'bg-light'}`} id={`instance${address}`} data-shared="universalDappUiInstance">
-      <div className="udapp_title alert alert-secondary">
+      <div className="udapp_title pb-0 alert alert-secondary">
         <span data-id={`universalDappUiTitleExpander${props.index}`} className="btn udapp_titleExpander" onClick={toggleClass}>
           <i className={`fas ${toggleExpander ? 'fa-angle-right' : 'fa-angle-down'}`} aria-hidden="true"></i>
         </span>
diff --git a/libs/remix-ui/run-tab/src/lib/css/run-tab.css b/libs/remix-ui/run-tab/src/lib/css/run-tab.css
index 60cf8ad00f..c4c65e4e01 100644
--- a/libs/remix-ui/run-tab/src/lib/css/run-tab.css
+++ b/libs/remix-ui/run-tab/src/lib/css/run-tab.css
@@ -286,7 +286,6 @@
 .udapp_instance {
   display: block;
   flex-direction: column;
-  margin-bottom: 12px;
   background: none;
   border-radius: 2px;
 }

From 0acb5db97e2df30ce8aa89a462d3fe21e1e1e71e Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Wed, 29 Jun 2022 12:27:21 +0200
Subject: [PATCH 3/5] new names:wq

---
 apps/remix-ide-e2e/src/tests/plugin_api.ts             | 2 +-
 apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts      | 2 +-
 libs/remix-ui/helper/src/lib/components/web3Dialog.tsx | 2 +-
 libs/remix-ui/run-tab/src/lib/reducers/runTab.ts       | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/plugin_api.ts b/apps/remix-ide-e2e/src/tests/plugin_api.ts
index 2f4aae42e0..1c21c849ca 100644
--- a/apps/remix-ide-e2e/src/tests/plugin_api.ts
+++ b/apps/remix-ide-e2e/src/tests/plugin_api.ts
@@ -188,7 +188,7 @@ module.exports = {
       .frameParent()
       .useCss()
       .clickLaunchIcon('udapp')
-      .waitForElementContainsText('#selectExEnvOptions option:checked', 'Local VM (Berlin)')
+      .waitForElementContainsText('#selectExEnvOptions option:checked', 'Remix VM (Berlin)')
       .clickLaunchIcon('localPlugin')
       .useXpath()
       // @ts-ignore
diff --git a/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts b/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts
index 7b3315e614..dc00530bdd 100644
--- a/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts
+++ b/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts
@@ -198,7 +198,7 @@ module.exports = {
       .assert.containsText('*[data-id="solidityLocals"]', 'to: 0x6C3CCC7FBA111707D5A1AAF2758E9D4F4AC5E7B1')
   },
 
-  'Call web3.eth.getAccounts() using Injected web3 (Metamask)': '' + function (browser: NightwatchBrowser) {
+  'Call web3.eth.getAccounts() using Injected Provider (Metamask)': '' + function (browser: NightwatchBrowser) {
     browser
       .executeScript('web3.eth.getAccounts()')
       .pause(2000)
diff --git a/libs/remix-ui/helper/src/lib/components/web3Dialog.tsx b/libs/remix-ui/helper/src/lib/components/web3Dialog.tsx
index 30055f322a..204418ce0c 100644
--- a/libs/remix-ui/helper/src/lib/components/web3Dialog.tsx
+++ b/libs/remix-ui/helper/src/lib/components/web3Dialog.tsx
@@ -27,7 +27,7 @@ export function Web3ProviderDialog (props: web3ProviderDialogProps) {
         <br />For more info: <a href="https://remix-ide.readthedocs.io/en/latest/run.html#more-about-web3-provider" target="_blank" rel="noreferrer">Remix Docs on Web3 Provider</a>
         <br />
         <br />
-        Web3 Provider Endpoint
+        External HTTP Provider Endpoint
       </div>
       <input
         onInput={handleInputEndpoint}
diff --git a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
index c61d82905d..51a007fd00 100644
--- a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
+++ b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
@@ -118,14 +118,14 @@ export const runTabInitialState: RunTabState = {
       title: 'Execution environment is local to Remix.  Data is only saved to browser memory and will vanish upon reload.',
       value: 'vm-london',
       fork: 'london',
-      content: 'Local VM (London)'
+      content: 'Remix VM (London)'
     }, {
       id: 'vm-mode-berlin',
       dataId: 'settingsVMBerlinMode',
       title: 'Execution environment is local to Remix.  Data is only saved to browser memory and will vanish upon reload.',
       value: 'vm-berlin',
       fork: 'berlin',
-      content: 'Local VM (Berlin)'
+      content: 'Remix VM (Berlin)'
     }, {
       id: 'injected-mode',
       dataId: 'settingsInjectedMode',
@@ -137,7 +137,7 @@ export const runTabInitialState: RunTabState = {
       dataId: 'settingsWeb3Mode',
       title: `Execution environment connects to an external node. For security, only connect to trusted networks. If Remix is served via https and your node is accessed via http, it might not work. In this case, try cloning the repository and serving it via http.`,
       value: 'web3',
-      content: 'JSON-RPC Provider'
+      content: 'External HTTP Provider'
     }],
     isRequesting: false,
     isSuccessful: false,

From 371d71d1e1d77cc310d6689381476c99e902e831 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Thu, 30 Jun 2022 11:32:59 +0200
Subject: [PATCH 4/5] more renames

---
 apps/remix-ide-e2e/src/tests/terminal.test.ts            | 2 +-
 apps/remix-ide/src/blockchain/blockchain.js              | 2 +-
 libs/remix-ui/run-tab/src/lib/reducers/runTab.ts         | 5 ++++-
 libs/remix-ui/run-tab/src/lib/types/blockchain.d.ts      | 9 +++++----
 libs/remix-ui/settings/src/lib/constants.ts              | 2 +-
 libs/remix-ui/terminal/src/lib/components/RenderCall.tsx | 2 +-
 .../src/lib/components/RenderKnownTransactions.tsx       | 2 +-
 .../src/lib/components/RenderUnknownTransactions.tsx     | 2 +-
 8 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts
index 40c59875da..a4b9421b56 100644
--- a/apps/remix-ide-e2e/src/tests/terminal.test.ts
+++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts
@@ -40,7 +40,7 @@ module.exports = {
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'contract Ballot {', 60000)
   },
 
-  'Call web3.eth.getAccounts() using JavaScript VM #group2': function (browser: NightwatchBrowser) {
+  'Call web3.eth.getAccounts() using Remix VM #group2': function (browser: NightwatchBrowser) {
     browser
       .executeScript('web3.eth.getAccounts()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', '["0x5B38Da6a701c568545dCfcB03FcB875f56beddC4","0xAb8483F64d9C6d1EcF9b849Ae677dD3315835cb2","0x4B20993Bc481177ec7E8f571ceCaE8A9e22C02db","0x78731D3Ca6b7E34aC0F824c42a7cC18A495cabaB","0x617F2E2fD72FD9D5503197092aC168c91465E7f2","0x17F6AD8Ef982297579C203069C1DbfFE4348c372","0x5c6B0f7Bf3E7ce046039Bd8FABdfD3f9F5021678","0x03C6FcED478cBbC9a4FAB34eF9f40767739D1Ff7","0x1aE0EA34a72D944a8C7603FfB3eC30a6669E454C","0x0A098Eda01Ce92ff4A4CCb7A4fFFb5A43EBC70DC","0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c","0x14723A09ACff6D2A60DcdF7aA4AFf308FDDC160C","0x4B0897b0513fdC7C541B6d9D7E929C4e5364D2dB","0x583031D1113aD414F02576BD6afaBfb302140225","0xdD870fA1b7C4700F2BD7f44238821C26f7392148"]')
diff --git a/apps/remix-ide/src/blockchain/blockchain.js b/apps/remix-ide/src/blockchain/blockchain.js
index 5f6d3ad6c6..baba1ad2e1 100644
--- a/apps/remix-ide/src/blockchain/blockchain.js
+++ b/apps/remix-ide/src/blockchain/blockchain.js
@@ -464,7 +464,7 @@ export class Blockchain extends Plugin {
   }
 
   /**
-   * This function send a tx only to javascript VM or testnet, will return an error for the mainnet
+   * This function send a tx only to Remix VM or testnet, will return an error for the mainnet
    * SHOULD BE TAKEN CAREFULLY!
    *
    * @param {Object} tx    - transaction.
diff --git a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
index 51a007fd00..38f17d8f17 100644
--- a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
+++ b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
@@ -2,6 +2,9 @@ import { CompilerAbstract } from '@remix-project/remix-solidity-ts'
 import { ContractData } from '@remix-project/core-plugin'
 import { DeployMode, DeployOption, DeployOptions } from '../types'
 import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_TX_FEE_CONTENT } from '../constants'
+import Web3 from 'web3'
+
+declare const window: any
 interface Action {
   type: string
   payload: any
@@ -131,7 +134,7 @@ export const runTabInitialState: RunTabState = {
       dataId: 'settingsInjectedMode',
       title: 'Execution environment has been provided by Metamask or similar provider.',
       value: 'injected',
-      content: 'Injected Provider - Metamask'
+      content: `Injected Provider${(window && window.web3 && window.web3.currentProvider.isMetaMask) ? ' - Metamask' : ''}`
     }, {
       id: 'web3-mode',
       dataId: 'settingsWeb3Mode',
diff --git a/libs/remix-ui/run-tab/src/lib/types/blockchain.d.ts b/libs/remix-ui/run-tab/src/lib/types/blockchain.d.ts
index 1b2f7d442d..1d6e7a5edc 100644
--- a/libs/remix-ui/run-tab/src/lib/types/blockchain.d.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/blockchain.d.ts
@@ -1,3 +1,6 @@
+import { Plugin } from "@remixproject/engine/lib/abstract";
+import { ExecutionContext } from "./execution-context";
+import { EventEmitter } from "events";
 export class Blockchain extends Plugin<any, any> {
     constructor(config: any);
     event: any;
@@ -70,7 +73,7 @@ export class Blockchain extends Plugin<any, any> {
     getBalanceInEther(address: any, cb: any): void;
     pendingTransactionsCount(): number;
     /**
-     * This function send a tx only to javascript VM or testnet, will return an error for the mainnet
+     * This function send a tx only to Remix VM or testnet, will return an error for the mainnet
      * SHOULD BE TAKEN CAREFULLY!
      *
      * @param {Object} tx    - transaction.
@@ -78,6 +81,4 @@ export class Blockchain extends Plugin<any, any> {
     sendTransaction(tx: any): any;
     runTx(args: any, confirmationCb: any, continueCb: any, promptCb: any, cb: any): void;
 }
-import { Plugin } from "@remixproject/engine/lib/abstract";
-import { ExecutionContext } from "./execution-context";
-import { EventEmitter } from "events";
+
diff --git a/libs/remix-ui/settings/src/lib/constants.ts b/libs/remix-ui/settings/src/lib/constants.ts
index ac7e6d1069..048a4a2bf6 100644
--- a/libs/remix-ui/settings/src/lib/constants.ts
+++ b/libs/remix-ui/settings/src/lib/constants.ts
@@ -11,7 +11,7 @@ export const etherscanTokenTitle = 'EtherScan Access Token'
 export const etherscanTokenLink = 'https://etherscan.io/myapikey'
 export const etherscanAccessTokenText = 'Manage the api key used to interact with Etherscan.'
 export const etherscanAccessTokenText2 = 'Go to Etherscan api key page (link below) to create a new api key and save it in Remix.'
-export const ethereunVMText = 'Always use Javascript VM at load'
+export const ethereunVMText = 'Always use Remix VM at load'
 export const wordWrapText = 'Word wrap in editor'
 export const enablePersonalModeText = ' Enable Personal Mode for web3 provider. Transaction sent over Web3 will use the web3.personal API.\n'
 export const matomoAnalytics = 'Enable Matomo Analytics. We do not collect personally identifiable information (PII). The info is used to improve the site’s UX & UI. See more about '
diff --git a/libs/remix-ui/terminal/src/lib/components/RenderCall.tsx b/libs/remix-ui/terminal/src/lib/components/RenderCall.tsx
index 7656ce2680..ba49eb1503 100644
--- a/libs/remix-ui/terminal/src/lib/components/RenderCall.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/RenderCall.tsx
@@ -15,7 +15,7 @@ const RenderCall = ({ tx, resolvedData, logs, index, plugin, showTableHash, txDe
   const debug = (event, tx) => {
     event.stopPropagation()
     if (tx.isCall && tx.envMode !== 'vm') {
-      modal('VM mode', 'Cannot debug this call. Debugging calls is only possible in JavaScript VM mode.', 'Ok', true, () => {}, 'Cancel', () => {})
+      modal('VM mode', 'Cannot debug this call. Debugging calls is only possible in Remix VM mode.', 'Ok', true, () => {}, 'Cancel', () => {})
     } else {
       plugin.event.trigger('debuggingRequested', [tx.hash])
     }
diff --git a/libs/remix-ui/terminal/src/lib/components/RenderKnownTransactions.tsx b/libs/remix-ui/terminal/src/lib/components/RenderKnownTransactions.tsx
index 84603d6a1c..3d3b1a2d8e 100644
--- a/libs/remix-ui/terminal/src/lib/components/RenderKnownTransactions.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/RenderKnownTransactions.tsx
@@ -10,7 +10,7 @@ const RenderKnownTransactions = ({ tx, receipt, resolvedData, logs, index, plugi
   const debug = (event, tx) => {
     event.stopPropagation()
     if (tx.isCall && tx.envMode !== 'vm') {
-      modal('VM mode', 'Cannot debug this call. Debugging calls is only possible in JavaScript VM mode.', 'Ok', true, () => {}, 'Cancel', () => {})
+      modal('VM mode', 'Cannot debug this call. Debugging calls is only possible in Remix VM mode.', 'Ok', true, () => {}, 'Cancel', () => {})
     } else {
       plugin.event.trigger('debuggingRequested', [tx.hash])
     }
diff --git a/libs/remix-ui/terminal/src/lib/components/RenderUnknownTransactions.tsx b/libs/remix-ui/terminal/src/lib/components/RenderUnknownTransactions.tsx
index eef87c2a12..448e77b40e 100644
--- a/libs/remix-ui/terminal/src/lib/components/RenderUnknownTransactions.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/RenderUnknownTransactions.tsx
@@ -7,7 +7,7 @@ const RenderUnKnownTransactions = ({ tx, receipt, index, plugin, showTableHash,
   const debug = (event, tx) => {
     event.stopPropagation()
     if (tx.isCall && tx.envMode !== 'vm') {
-      modal('VM mode', 'Cannot debug this call. Debugging calls is only possible in JavaScript VM mode.', 'Ok', true, () => {}, 'Cancel', () => {})
+      modal('VM mode', 'Cannot debug this call. Debugging calls is only possible in Remix VM mode.', 'Ok', true, () => {}, 'Cancel', () => {})
     } else {
       plugin.event.trigger('debuggingRequested', [tx.hash])
     }

From 5d01301b9f8b0810a9742b0159edb147f439d443 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 5 Jul 2022 12:34:33 +0200
Subject: [PATCH 5/5] more renames

---
 libs/remix-ui/helper/src/lib/components/web3Dialog.tsx | 2 +-
 libs/remix-ui/run-tab/src/lib/reducers/runTab.ts       | 2 +-
 libs/remix-ui/settings/src/lib/constants.ts            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/remix-ui/helper/src/lib/components/web3Dialog.tsx b/libs/remix-ui/helper/src/lib/components/web3Dialog.tsx
index 204418ce0c..3412148086 100644
--- a/libs/remix-ui/helper/src/lib/components/web3Dialog.tsx
+++ b/libs/remix-ui/helper/src/lib/components/web3Dialog.tsx
@@ -24,7 +24,7 @@ export function Web3ProviderDialog (props: web3ProviderDialogProps) {
         <br />
         <b>WARNING:</b> It is not safe to use the --http.corsdomain flag with a wildcard: <b>--http.corsdomain *</b>
         <br />
-        <br />For more info: <a href="https://remix-ide.readthedocs.io/en/latest/run.html#more-about-web3-provider" target="_blank" rel="noreferrer">Remix Docs on Web3 Provider</a>
+        <br />For more info: <a href="https://remix-ide.readthedocs.io/en/latest/run.html#more-about-web3-provider" target="_blank" rel="noreferrer">Remix Docs on Remix Provider</a>
         <br />
         <br />
         External HTTP Provider Endpoint
diff --git a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
index 38f17d8f17..010ebf31c5 100644
--- a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
+++ b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
@@ -134,7 +134,7 @@ export const runTabInitialState: RunTabState = {
       dataId: 'settingsInjectedMode',
       title: 'Execution environment has been provided by Metamask or similar provider.',
       value: 'injected',
-      content: `Injected Provider${(window && window.web3 && window.web3.currentProvider.isMetaMask) ? ' - Metamask' : ''}`
+      content: `Injected Provider${(window && window.ethereum && window.ethereum.isMetaMask) ? ' - Metamask' : ''}`
     }, {
       id: 'web3-mode',
       dataId: 'settingsWeb3Mode',
diff --git a/libs/remix-ui/settings/src/lib/constants.ts b/libs/remix-ui/settings/src/lib/constants.ts
index 048a4a2bf6..4062c68657 100644
--- a/libs/remix-ui/settings/src/lib/constants.ts
+++ b/libs/remix-ui/settings/src/lib/constants.ts
@@ -13,7 +13,7 @@ export const etherscanAccessTokenText = 'Manage the api key used to interact wit
 export const etherscanAccessTokenText2 = 'Go to Etherscan api key page (link below) to create a new api key and save it in Remix.'
 export const ethereunVMText = 'Always use Remix VM at load'
 export const wordWrapText = 'Word wrap in editor'
-export const enablePersonalModeText = ' Enable Personal Mode for web3 provider. Transaction sent over Web3 will use the web3.personal API.\n'
+export const enablePersonalModeText = ' Enable Personal Mode for Remix Provider. Transaction sent over Web3 will use the web3.personal API.\n'
 export const matomoAnalytics = 'Enable Matomo Analytics. We do not collect personally identifiable information (PII). The info is used to improve the site’s UX & UI. See more about '
 export const swarmSettingsTitle = 'Swarm Settings'
 export const swarmSettingsText = 'Swarm Settings'