Merge branch 'master' into refactoring-static-analyser

bf28e5b9 · David Zagi · GitHub · 4d2db415 · c71aacd6 · bf28e5b9
Unverified Commit bf28e5b9 authored Apr 30, 2021 by David Zagi Committed by GitHub Apr 30, 2021
24 changed files
--- a/apps/remix-ide-e2e/src/commands/addFile.ts
+++ b/apps/remix-ide-e2e/src/commands/addFile.ts
@@ -15,7 +15,7 @@ class AddFile extends EventEmitter {
 function addFile (browser: NightwatchBrowser, name: string, content: NightwatchContractContent, done: VoidFunction) {
  browser.clickLaunchIcon('udapp')
-    .clickLaunchIcon('fileExplorers')
+    .clickLaunchIcon('filePanel')
    .click('li[data-id="treeViewLitreeViewItemREADME.txt"]') // focus on root directory
    .click('.newFile')
    .waitForElementContainsText('*[data-id="treeViewLitreeViewItem/blank"]', '', 60000)

--- a/apps/remix-ide-e2e/src/commands/openFile.ts
+++ b/apps/remix-ide-e2e/src/commands/openFile.ts
@@ -15,7 +15,7 @@ class OpenFile extends EventEmitter {
 // click on fileExplorer can toggle it. We go through settings to be sure FE is open
 function openFile (browser: NightwatchBrowser, name: string, done: VoidFunction) {
-  browser.clickLaunchIcon('settings').clickLaunchIcon('fileExplorers')
+  browser.clickLaunchIcon('settings').clickLaunchIcon('filePanel')
    .waitForElementVisible('li[data-id="treeViewLitreeViewItem' + name + '"', 60000)
    .click('li[data-id="treeViewLitreeViewItem' + name + '"')
    .pause(2000)

--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -27,7 +27,7 @@ function initModules (browser: NightwatchBrowser, callback: VoidFunction) {
    .click('[data-id="verticalIconsKindpluginManager"]')
    .scrollAndClick('[data-id="pluginManagerComponentActivateButtonsolidityStaticAnalysis"]')
    .scrollAndClick('[data-id="pluginManagerComponentActivateButtondebugger"]')
-    .scrollAndClick('[data-id="verticalIconsKindfileExplorers"]')
+    .scrollAndClick('[data-id="verticalIconsKindfilePanel"]')
    .clickLaunchIcon('settings')
    .click('*[data-id="settingsTabGenerateContractMetadataLabel"]')
    .setValue('[data-id="settingsTabGistAccessToken"]', process.env.gist_token)

--- a/apps/remix-ide-e2e/src/tests/ballot.test.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts
@@ -51,7 +51,7 @@ module.exports = {
      .click('*[data-id="universalDappUiUdappClose"]')
      .addFile('ballot.abi', { content: ballotABI })
      .addAtAddressInstance('0x692a70D2e424a56D2C6C27aA97D1a86395877b3B', true, false)
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .addAtAddressInstance('0x692a70D2e424a56D2C6C27aA97D1a86395877b3A', true, true)
      .pause(500)
      .waitForElementPresent('*[data-id="universalDappUiContractActionWrapper"]', 60000)

--- a/apps/remix-ide-e2e/src/tests/ballot_0_4_11.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot_0_4_11.spec.ts
@@ -61,7 +61,7 @@ module.exports = {
      .click('*[data-id="universalDappUiUdappClose"]')
      .addFile('ballot.abi', { content: ballotABI })
      .addAtAddressInstance('0x692a70D2e424a56D2C6C27aA97D1a86395877b3B', true, false)
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .addAtAddressInstance('0x692a70D2e424a56D2C6C27aA97D1a86395877b3A', true, true)
      .pause(500)
      .waitForElementPresent('*[data-id="universalDappUiContractActionWrapper"]', 60000)

--- a/apps/remix-ide-e2e/src/tests/debugger.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/debugger.spec.ts
@@ -106,7 +106,7 @@ module.exports = {
    browser
      .clickLaunchIcon('solidity')
      .setSolidityCompilerVersion('soljson-v0.6.12+commit.27d51765.js')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .click('li[data-id="treeViewLitreeViewItemexternalImport.sol"')
      .testContracts('withABIEncoderV2.sol', sources[2]['withABIEncoderV2.sol'], ['test'])
      .clickLaunchIcon('udapp')

--- a/apps/remix-ide-e2e/src/tests/defaultLayout.test.ts
+++ b/apps/remix-ide-e2e/src/tests/defaultLayout.test.ts
@@ -10,7 +10,7 @@ module.exports = {
  'Loads Icon\'s Panel': function (browser: NightwatchBrowser) {
    browser.waitForElementVisible('div[data-id="remixIdeIconPanel"]', 10000)
      .waitForElementVisible('div[data-id="verticalIconsHomeIcon"]')
-      .waitForElementVisible('div[plugin="fileExplorers"]')
+      .waitForElementVisible('div[plugin="filePanel"]')
      .waitForElementVisible('div[plugin="pluginManager"]')
      .waitForElementVisible('div[plugin="settings"]')
  },
@@ -41,9 +41,9 @@ module.exports = {
  'Toggles Side Panel': function (browser: NightwatchBrowser) {
    browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
      .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .assert.hidden('div[data-id="remixIdeSidePanel"]')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .assert.visible('div[data-id="remixIdeSidePanel"]')
      .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
  },

--- a/apps/remix-ide-e2e/src/tests/editor.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/editor.spec.ts
@@ -11,7 +11,7 @@ module.exports = {
  'Should zoom in editor': function (browser: NightwatchBrowser) {
    browser.waitForElementVisible('div[data-id="mainPanelPluginsContainer"]')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
      .openFile('contracts')
      .openFile('contracts/1_Storage.sol')

--- a/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts
+++ b/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts
@@ -17,7 +17,7 @@ module.exports = {
  'Should create a new file `5_New_contract.sol` in file explorer': function (browser: NightwatchBrowser) {
    browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
      .click('li[data-id="treeViewLitreeViewItemREADME.txt"]') // focus on root directory
      .click('*[data-id="fileExplorerNewFilecreateNewFile"]')

--- a/apps/remix-ide-e2e/src/tests/generalSettings.test.ts
+++ b/apps/remix-ide-e2e/src/tests/generalSettings.test.ts
@@ -25,7 +25,7 @@ module.exports = {
      .pause(2000)
      .click('*[data-id="compilerContainerCompileBtn"]')
      .pause(3000)
-      .click('*[data-id="verticalIconsKindfileExplorers"]')
+      .click('*[data-id="verticalIconsKindfilePanel"]')
      .openFile('contracts/artifacts/Ballot.json')
      .openFile('contracts/artifacts/Ballot_metadata.json')
      .getEditorValue((content) => {

--- a/apps/remix-ide-e2e/src/tests/gist.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/gist.spec.ts
@@ -64,7 +64,7 @@ module.exports = {
  'Load Gist Modal': function (browser: NightwatchBrowser) {
    browser.clickLaunchIcon('home')
      .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .scrollAndClick('*[data-id="landingPageImportFromGistButton"]')
      .waitForElementVisible('*[data-id="modalDialogModalTitle"]')
      .assert.containsText('*[data-id="modalDialogModalTitle"]', 'Load a Gist')
@@ -77,7 +77,7 @@ module.exports = {
  'Display Error Message For Invalid Gist ID': function (browser: NightwatchBrowser) {
    browser
      .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .scrollAndClick('*[data-id="landingPageImportFromGistButton"]')
      .waitForElementVisible('*[data-id="modalDialogCustomPromptText"]')
      .setValue('*[data-id="modalDialogCustomPromptText"]', testData.invalidGistId)
@@ -93,7 +93,7 @@ module.exports = {
      .clickLaunchIcon('settings')
      .waitForElementVisible('[data-id="settingsTabRemoveGistToken"]')
      .click('[data-id="settingsTabRemoveGistToken"]')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .waitForElementVisible('*[data-id="fileExplorerNewFilepublishToGist"]')
      .click('*[data-id="fileExplorerNewFilepublishToGist"]')
      .waitForElementVisible('*[data-id="default_workspaceModalDialogContainer-react"]')
@@ -113,7 +113,7 @@ module.exports = {
      .click('*[data-id="settingsTabGenerateContractMetadataLabel"]')
      .setValue('[data-id="settingsTabGistAccessToken"]', process.env.gist_token)
      .click('[data-id="settingsTabSaveGistToken"]')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .scrollAndClick('*[data-id="landingPageImportFromGistButton"]')
      .waitForElementVisible('*[data-id="modalDialogCustomPromptText"]')
      .setValue('*[data-id="modalDialogCustomPromptText"]', testData.validGistId)

--- a/apps/remix-ide-e2e/src/tests/publishContract.test.ts
+++ b/apps/remix-ide-e2e/src/tests/publishContract.test.ts
@@ -14,7 +14,7 @@ module.exports = {
  'Publish on IPFS': function (browser: NightwatchBrowser) {
    browser
      .waitForElementVisible('#icon-panel', 10000)
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .click('[data-id="treeViewLitreeViewItemcontracts"]')
      .openFile('contracts/3_Ballot.sol')
      .verifyContracts(['Ballot'])
@@ -43,7 +43,7 @@ module.exports = {
  'Should publish contract metadata to ipfs on deploy': function (browser: NightwatchBrowser) {
    browser
      .waitForElementVisible('#icon-panel')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .openFile('contracts/1_Storage.sol')
      .clickLaunchIcon('udapp')
      .waitForElementPresent('*[data-id="contractDropdownIpfsCheckbox"]')

--- a/apps/remix-ide-e2e/src/tests/remixd.test.ts
+++ b/apps/remix-ide-e2e/src/tests/remixd.test.ts
@@ -56,7 +56,7 @@ module.exports = {
    */
    browser.waitForElementVisible('#icon-panel', 2000)
-      // .clickLaunchIcon('fileExplorers')
+      // .clickLaunchIcon('filePanel')
      .click('[data-path="ballot.sol"]')
      .addFile('test_import_node_modules.sol', sources[3]['test_import_node_modules.sol'])
      .clickLaunchIcon('solidity')
@@ -65,7 +65,7 @@ module.exports = {
  },
  'Import from node_modules and reference a github import': function (browser) {
    browser.waitForElementVisible('#icon-panel', 2000)
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .addFile('test_import_node_modules_with_github_import.sol', sources[4]['test_import_node_modules_with_github_import.sol'])
      .clickLaunchIcon('solidity')
      .setSolidityCompilerVersion('soljson-v0.8.0+commit.c7dfd78e.js') // open-zeppelin moved to pragma ^0.8.0
@@ -97,13 +97,13 @@ function runTests (browser: NightwatchBrowser) {
  browser
    .waitForElementVisible('#icon-panel', 2000)
-    .clickLaunchIcon('fileExplorers')
+    .clickLaunchIcon('filePanel')
    .clickLaunchIcon('pluginManager')
    .scrollAndClick('#pluginManager article[id="remixPluginManagerListItem_remixd"] button')
    .waitForElementVisible('#modal-footer-ok', 2000)
    .pause(2000)
    .click('#modal-footer-ok')
-    .clickLaunchIcon('fileExplorers')
+    .clickLaunchIcon('filePanel')
    .waitForElementVisible('[data-path="folder1"]')
    .click('[data-path="folder1"]')
    .waitForElementVisible('[data-path="contract1.sol"]')
@@ -127,7 +127,7 @@ function runTests (browser: NightwatchBrowser) {
    .perform(function (done) {
      testImportFromRemixd(browser, () => { done() })
    })
-    .clickLaunchIcon('fileExplorers')
+    .clickLaunchIcon('filePanel')
    .waitForElementVisible('[data-path="folder1"]')
    .click('[data-path="folder1"]')
    .click('[data-path="folder1"]') // click twice because remixd does not return nested folder details after update

--- a/apps/remix-ide-e2e/src/tests/runAndDeploy.ts
+++ b/apps/remix-ide-e2e/src/tests/runAndDeploy.ts
@@ -47,7 +47,7 @@ module.exports = {
  'Should deploy contract on JavascriptVM': function (browser: NightwatchBrowser) {
    browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .addFile('Greet.sol', sources[0]['Greet.sol'])
      .clickLaunchIcon('udapp')
      .selectAccount('0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c')
@@ -95,7 +95,7 @@ module.exports = {
  'Should deploy contract on Goerli Test Network using MetaMask': '' + function (browser: NightwatchBrowser) {
    browser.waitForElementPresent('*[data-id="runTabSelectAccount"] option')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .openFile('Greet.sol')
      .clickLaunchIcon('udapp')
      .waitForElementPresent('*[data-id="Deploy - transact (not payable)"]')
@@ -147,7 +147,7 @@ module.exports = {
  'Should deploy contract on Ethereum Main Network using MetaMask': '' + function (browser: NightwatchBrowser) {
    browser.waitForElementPresent('*[data-id="runTabSelectAccount"] option')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .openFile('Greet.sol')
      .clickLaunchIcon('udapp')
      .waitForElementPresent('*[data-id="Deploy - transact (not payable)"]')

--- a/apps/remix-ide-e2e/src/tests/solidityImport.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/solidityImport.spec.ts
@@ -33,7 +33,7 @@ module.exports = {
    browser
      .setSolidityCompilerVersion('soljson-v0.8.0+commit.c7dfd78e.js') // open-zeppelin moved to pragma ^0.8.0 (master branch)
      .addFile('Untitled4.sol', sources[3]['Untitled4.sol'])
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .verifyContracts(['test7', 'ERC20'], { wait: 10000 })
  },
@@ -41,36 +41,36 @@ module.exports = {
    browser
      .setSolidityCompilerVersion('soljson-v0.5.0+commit.1d4f565a.js') // switch back to 0.5.0 : release-v2.3.0 branch is not solidity 0.6 compliant
      .addFile('Untitled5.sol', sources[4]['Untitled5.sol'])
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .verifyContracts(['test8', 'ERC20', 'SafeMath'], { wait: 10000 })
  },
  'Test Github Import - no branch specified': function (browser: NightwatchBrowser) {
    browser
      .setSolidityCompilerVersion('soljson-v0.8.0+commit.c7dfd78e.js') // open-zeppelin moved to pragma ^0.8.0 (master branch)
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .click('li[data-id="treeViewLitreeViewItemREADME.txt"')
      .addFile('Untitled6.sol', sources[5]['Untitled6.sol'])
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .verifyContracts(['test10', 'ERC20'], { wait: 10000 })
  },
  'Test Github Import - raw URL': function (browser: NightwatchBrowser) {
    browser
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .click('li[data-id="treeViewLitreeViewItemREADME.txt"')
      .addFile('Untitled7.sol', sources[6]['Untitled7.sol'])
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .verifyContracts(['test11', 'ERC20'], { wait: 10000 })
  },
  'Test switch to a github import from a solidity warning': function (browser: NightwatchBrowser) {
    browser
      .setSolidityCompilerVersion('soljson-v0.7.4+commit.3f05b770.js')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .click('li[data-id="treeViewLitreeViewItemREADME.txt"')
      .addFile('Untitled8.sol', sources[7]['Untitled8.sol'])
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .clickLaunchIcon('solidity')
      .waitForElementVisible('[data-id="https://raw.githubusercontent.com/OpenZeppelin/openzeppelin-contracts/master/contracts/token/ERC20/ERC20.sol"]', 120000)
      .scrollAndClick('[data-id="https://raw.githubusercontent.com/OpenZeppelin/openzeppelin-contracts/master/contracts/token/ERC20/ERC20.sol"]') // click on error which point to ERC20 code
@@ -81,10 +81,10 @@ module.exports = {
  'Test NPM Import (with unpkg.com)': function (browser: NightwatchBrowser) {
    browser
      .setSolidityCompilerVersion('soljson-v0.8.1+commit.df193b15.js')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .click('li[data-id="treeViewLitreeViewItemREADME.txt"')
      .addFile('Untitled9.sol', sources[8]['Untitled9.sol'])
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .verifyContracts(['test13', 'ERC20'], { wait: 30000 })
      .end()
  }

--- a/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts
@@ -14,8 +14,8 @@ module.exports = {
  },
  'Should launch solidity unit test plugin': function (browser: NightwatchBrowser) {
-    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .addFile('simple_storage.sol', sources[0]['simple_storage.sol'])
      .addFile('ks2a.sol', sources[0]['ks2a.sol'])
      .clickLaunchIcon('pluginManager')
@@ -26,21 +26,21 @@ module.exports = {
  },
  'Should generate test file': function (browser: NightwatchBrowser) {
-    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .openFile('simple_storage.sol')
      .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
      .waitForElementPresent('*[data-id="testTabGenerateTestFile"]')
      .click('*[data-id="testTabGenerateTestFile"]')
      .waitForElementPresent('*[title="tests/simple_storage_test.sol"]')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .pause(10000)
      .openFile('tests/simple_storage_test.sol')
      .removeFile('tests/simple_storage_test.sol', 'default_workspace')
  },
  'Should run simple unit test `simple_storage_test.sol` ': function (browser: NightwatchBrowser) {
-    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
      .addFile('tests/simple_storage_test.sol', sources[0]['tests/simple_storage_test.sol'])
      .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
      .waitForElementPresent('*[data-id="testTabCheckAllTests"]')
@@ -57,8 +57,8 @@ module.exports = {
  },
  'Should run advance unit test using natspec and experimental ABIEncoderV2 `ks2b_test.sol` ': function (browser: NightwatchBrowser) {
-    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .addFile('tests/ks2b_test.sol', sources[0]['tests/ks2b_test.sol'])
      .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
      .waitForElementPresent('*[data-id="testTabCheckAllTests"]')
@@ -77,7 +77,7 @@ module.exports = {
  },
  'Should stop unit tests during test execution` ': function (browser: NightwatchBrowser) {
-    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
      .waitForElementPresent('*[data-id="testTabRunTestsTabRunAction"]')
      .clickElementAtPosition('.singleTestLabel', 0)
      .clickElementAtPosition('.singleTestLabel', 1)
@@ -92,9 +92,9 @@ module.exports = {
  },
  'Should fail on compilation': function (browser: NightwatchBrowser) {
-    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
      .addFile('tests/compilationError_test.sol', sources[0]['compilationError_test.sol'])
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .openFile('tests/compilationError_test.sol')
      .clickLaunchIcon('solidityUnitTesting')
      .click('*[data-id="testTabCheckAllTests"]')
@@ -105,9 +105,9 @@ module.exports = {
  },
  'Should fail on deploy': function (browser: NightwatchBrowser) {
-    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
      .addFile('tests/deployError_test.sol', sources[0]['tests/deployError_test.sol'])
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .openFile('tests/deployError_test.sol')
      .clickLaunchIcon('solidityUnitTesting')
      .click('*[data-id="testTabCheckAllTests"]')
@@ -117,9 +117,9 @@ module.exports = {
  },
  'Should fail when parameters are to method in test contract': function (browser: NightwatchBrowser) {
-    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
      .addFile('tests/methodFailure_test.sol', sources[0]['tests/methodFailure_test.sol'])
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .openFile('tests/methodFailure_test.sol')
      .clickLaunchIcon('solidityUnitTesting')
      .click('*[data-id="testTabCheckAllTests"]')
@@ -130,7 +130,7 @@ module.exports = {
  'Changing current path': function (browser: NightwatchBrowser) {
    browser
-      .waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+      .waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
      .addFile('myTests/simple_storage_test.sol', sources[0]['tests/simple_storage_test.sol'])
      .clickLaunchIcon('solidityUnitTesting')
      .setValue('*[data-id="uiPathInput"]', 'myTests')
@@ -151,8 +151,8 @@ module.exports = {
 function runTests (browser: NightwatchBrowser) {
  browser
-    .waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
-    .clickLaunchIcon('fileExplorers')
+    .clickLaunchIcon('filePanel')
    .click('*[data-id="treeViewLitreeViewItemcontracts"]')
    .openFile('contracts/3_Ballot.sol')
    .clickLaunchIcon('solidityUnitTesting')

--- a/apps/remix-ide-e2e/src/tests/usingWebWorker.test.ts
+++ b/apps/remix-ide-e2e/src/tests/usingWebWorker.test.ts
@@ -29,7 +29,7 @@ module.exports = {
  'Using Web Worker': function (browser: NightwatchBrowser) {
    browser
      .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .addFile('basic.sol', sources[0]['basic.sol'])
      .clickLaunchIcon('solidity')
      .execute(function () {

--- a/apps/remix-ide-e2e/src/tests/workspace.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace.test.ts
@@ -32,7 +32,7 @@ module.exports = {
  'Should create two workspace and switch to the first one': function (browser: NightwatchBrowser) {
    browser
-      .clickLaunchIcon('fileExplorers')
+      .clickLaunchIcon('filePanel')
      .click('*[data-id="workspaceCreate"]') // create workspace_name
      .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
      // eslint-disable-next-line dot-notation

--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -453,7 +453,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
  await appManager.activatePlugin(['mainPanel', 'menuicons', 'tabs'])
  await appManager.activatePlugin(['sidePanel']) // activating  host plugin separately
  await appManager.activatePlugin(['home'])
-  await appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'fileExplorers', 'settings', 'contextualListener', 'terminal', 'fetchAndCompile'])
+  await appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'filePanel', 'settings', 'contextualListener', 'terminal', 'fetchAndCompile'])
  const queryParams = new QueryParams()
  const params = queryParams.get()

--- a/apps/remix-ide/src/app/components/vertical-icons.js
+++ b/apps/remix-ide/src/app/components/vertical-icons.js
@@ -230,7 +230,7 @@ export class VerticalIcons extends Plugin {
        // this.call('manager', 'deactivatePlugin', name)
        this.appManager.deactivatePlugin(name)
        if (e.target.parentElement.classList.contains('active')) {
-          this.select('fileExplorers')
+          this.select('filePanel')
        }
      }
    }

--- a/apps/remix-ide/src/app/panels/file-panel.js
+++ b/apps/remix-ide/src/app/panels/file-panel.js
@@ -32,7 +32,7 @@ const modalDialogCustom = require('../ui/modal-dialog-custom')
 */
 const profile = {
-  name: 'fileExplorers',
+  name: 'filePanel',
  displayName: 'File explorers',
  methods: ['createNewFile', 'uploadFile', 'getCurrentWorkspace', 'getWorkspaces', 'createWorkspace'],
  events: ['setWorkspace', 'renameWorkspace', 'deleteWorkspace'],

--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -261,7 +261,7 @@ export class LandingPage extends ViewPlugin {
              } else {
                try {
                  fileProviders.workspace.addExternal(type + '/' + cleanUrl, content, url)
-                  this.verticalIcons.select('fileExplorers')
+                  this.verticalIcons.select('filePanel')
                } catch (e) {
                  modalDialogCustom.alert(title, e.message)
                }
@@ -308,7 +308,7 @@ export class LandingPage extends ViewPlugin {
    }
    const createNewFile = () => {
-      this.call('fileExplorers', 'createNewFile')
+      this.call('filePanel', 'createNewFile')
    }
    const saveAs = (blob, name) => {
@@ -348,7 +348,7 @@ export class LandingPage extends ViewPlugin {
    }
    const uploadFile = (target) => {
-      this.call('fileExplorers', 'uploadFile', target)
+      this.call('filePanel', 'uploadFile', target)
    }
    const connectToLocalhost = () => {
@@ -356,7 +356,7 @@ export class LandingPage extends ViewPlugin {
    }
    const importFromGist = () => {
      this.gistHandler.loadFromGist({ gist: '' }, globalRegistry.get('filemanager').api)
-      this.verticalIcons.select('fileExplorers')
+      this.verticalIcons.select('filePanel')
    }
    globalRegistry.get('themeModule').api.events.on('themeChanged', (theme) => {

--- a/apps/remix-ide/src/framingService.js
+++ b/apps/remix-ide/src/framingService.js
@@ -18,12 +18,12 @@ export class FramingService {
      this.resizeFeature.showPanel()
    })
-    this.verticalIcon.select('fileExplorers')
+    this.verticalIcon.select('filePanel')
    document.addEventListener('keypress', (e) => {
      if (e.shiftKey && e.ctrlKey) {
        if (e.code === 'KeyF') { // Ctrl+Shift+F
-          this.verticalIcon.select('fileExplorers')
+          this.verticalIcon.select('filePanel')
        } else if (e.code === 'KeyA') { // Ctrl+Shift+A
          this.verticalIcon.select('pluginManager')
        } else if (e.code === 'KeyS') { //  Ctrl+Shift+S

--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -9,7 +9,7 @@ const _paq = window._paq = window._paq || []
 const requiredModules = [ // services + layout views + system views
  'manager', 'compilerArtefacts', 'compilerMetadata', 'contextualListener', 'editor', 'offsetToLineColumnConverter', 'network', 'theme',
  'fileManager', 'contentImport', 'web3Provider', 'scriptRunner', 'fetchAndCompile', 'mainPanel', 'hiddenPanel', 'sidePanel', 'menuicons',
-  'fileExplorers', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp']
+  'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp']
 const dependentModules = ['git'] // module which shouldn't be manually activated (e.g git is activated by remixd)