fix: resolve conflict

apps/remix-ide-e2e/src/tests/publishContract.test.ts

@@ -22,7 +22,7 @@ module.exports = {
       .pause(8000)
       .getModalBody((value, done) => {
         if (value.indexOf('Metadata of "ballot" was published successfully.') === -1) browser.assert.fail('ipfs deploy failed', '', '')
-        if (value.indexOf('dweb:/ipfs') === -1) browser.assert.fail('ipfs deploy failed', '', '')
+        if (value.indexOf('ipfs://') === -1) browser.assert.fail('ipfs deploy failed', '', '')
         done()
       })
       .modalFooterOKClick()

apps/remix-ide-e2e/src/tests/recorder.spec.ts

@@ -83,7 +83,7 @@ module.exports = {
       .testFunction('last',
         {
           status: 'true Transaction mined and execution succeed',
-          'decoded input': { 'uint256 _po': { type: 'BigNumber', hex: '0x0a' } }
+          'decoded input': { 'uint256 _po': '10' }
         })
       .end()
   }

apps/remix-ide/src/app/components/plugin-manager-component.js

@@ -108,7 +108,7 @@ class PluginManagerComponent extends ViewPlugin {
   }
 
   deactivateP (name) {
-    this.appManager.deactivatePlugin(name)
+    this.call('manager', 'deactivatePlugin', name)
     _paq.push(['trackEvent', 'manager', 'deactivate', name])
   }
 

apps/remix-ide/src/app/panels/tab-proxy.js

@@ -128,7 +128,7 @@ export class TabProxy extends Plugin {
           () => this.event.emit('switchApp', name),
           () => {
             this.event.emit('closeApp', name)
-            this.appManager.deactivatePlugin(name)
+            this.call('manager', 'deactivatePlugin', name)
           },
           icon
         )

apps/remix-ide/src/index.html

@@ -43,9 +43,9 @@
 				var _paq = window._paq = window._paq || []
 				/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
 				_paq.push(['disableCookies']);
-				_paq.push(['enableLinkTracking']);
         _paq.push(['enableJSErrorTracking']);
 				_paq.push(['trackPageView']);
+				_paq.push(['enableLinkTracking']);
 				(function() {
 					var u="https://matomo.ethereum.org/";
 					_paq.push(['setTrackerUrl', u+'matomo.php'])

apps/remix-ide/src/publishToStorage.js

@@ -34,7 +34,7 @@ export default function publish (storage, fileProvider, fileManager, contract) {
             ${err}</span>`)
           } else {
             var result = yo`<div>${uploaded.map((value) => {
-              return yo`<div><b>${value.filename}</b> : <pre>${value.output.url}</pre></div>`
+              return yo`<div><b>${value.filename}</b> : <pre>${value.output.url.replace('dweb:/ipfs/', 'ipfs://')}</pre></div>`
             })}</div>`
             modalDialogCustom.alert(`Published ${contract.name}'s Metadata`, yo`<span>Metadata of "${contract.name.toLowerCase()}" was published successfully.<br> <pre>${result}</pre> </span>`)
           }

apps/remix-ide/src/remixAppManager.js

@@ -52,6 +52,16 @@ export class RemixAppManager extends PluginManager {
     return isNative(from.name)
   }
 
+  async deactivatePlugin (name) {
+    const [to, from] = [
+      await this.getProfile(name),
+      await this.getProfile(this.requestFrom)
+    ]
+    if (this.canDeactivatePlugin(from, to)) {
+      await this.toggleActive(name)
+    }
+  }
+
   async canCall (from, to, method, message) {
     // Make sure the caller of this methods is the target plugin
     if (to !== this.currentRequest.from) {

libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx

@@ -166,6 +166,19 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
     }
 
     const web3 = await debuggerModule.getDebugWeb3()
+    try {
+      if (await web3.eth.net.getId() === 42) {
+        setState(prevState => {
+          return {
+            ...prevState,
+            validationError: 'The Kovan network is unfortunately not supported.'
+          }
+        })
+        return
+      }
+    } catch (e) {
+      console.error(e)
+    }
     let currentReceipt
     try {
       currentReceipt = await web3.eth.getTransactionReceipt(txNumber)

package.json

@@ -237,7 +237,7 @@
     "eslint-plugin-promise": "4.2.1",
     "eslint-plugin-standard": "4.0.1",
     "ethereumjs-util": "^6.2.0",
-    "ethers": "^5.0.13",
+    "ethers": "^5.1.4",
     "events": "^3.0.0",
     "execr": "^1.0.1",
     "exorcist": "^0.4.0",