Merge branch 'master' into indexdbpackupdate

apps/remix-ide/src/app/tabs/compile-tab.js

@@ -126,7 +126,9 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
     })
     try {
       this.currentFile = await this.call('fileManager', 'file')
-    } catch (e) {}
+    } catch (error) {
+      if (error.message !== 'Error: No such file or directory No file selected') throw error
+    }
   }
 
   getCompilerParameters () {

libs/remix-tests/src/testRunner.ts

@@ -251,7 +251,6 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
       method.call(sendParams).then(async (result) => {
         const time = (Date.now() - startTime) / 1000.0
         let tagTxHash
-        let hhLogs
         if (web3.eth && web3.eth.getHashFromTagBySimulator) tagTxHash = await web3.eth.getHashFromTagBySimulator(tagTimestamp)
         if (web3.eth && web3.eth.getHHLogsForTx) hhLogs = await web3.eth.getHHLogsForTx(tagTxHash)
         if (result) {
@@ -262,7 +261,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
             time: time,
             context: testName
           }
-          if (hhLogs) resp.hhLogs = hhLogs
+          if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
           testCallback(undefined, resp)
           passingNum += 1
           timePassed += time
@@ -275,7 +274,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
             errMsg: 'function returned false',
             context: testName
           }
-          if (hhLogs) resp.hhLogs = hhLogs
+          if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
           testCallback(undefined, resp)
           failureNum += 1
           timePassed += time
@@ -325,7 +324,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
                     location,
                     web3
                   }
-                  if (hhLogs) resp.hhLogs = hhLogs
+                  if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
                   testCallback(undefined, resp)
                   failureNum += 1
                   timePassed += time
@@ -344,11 +343,11 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
               time: time,
               context: testName
             }
-            if (hhLogs) resp.hhLogs = hhLogs
+            if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
             testCallback(undefined, resp)
             passingNum += 1
             timePassed += time
-          } else if (hhLogs) {
+          } else if (hhLogs && hhLogs.length) {
             const resp: TestResultInterface = {
               type: 'logOnly',
               value: changeCase.sentenceCase(func.name),
@@ -380,7 +379,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
         if (err.message.includes('Transaction has been reverted by the EVM')) {
           const txHash = JSON.parse(err.message.replace('Transaction has been reverted by the EVM:', '')).transactionHash
           if (web3.eth && web3.eth.getHHLogsForTx) hhLogs = await web3.eth.getHHLogsForTx(txHash)
-          if (hhLogs) resp.hhLogs = hhLogs
+          if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
         }
         testCallback(undefined, resp)
         failureNum += 1

libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx

@@ -52,7 +52,7 @@ function LocalPluginForm ({ closeModal, visible, pluginManager }: LocalPluginFor
     setMethods(Array.isArray(storagePlugin.methods) ? storagePlugin.methods.join(',') : storagePlugin.methods)
     setType(storagePlugin.type)
     setDisplayName(storagePlugin.displayName)
-    setCanactivate(Array.isArray(storagePlugin.canActivate) ? storagePlugin.canActivate.join(',') : storagePlugin.canActivate)
+    setCanactivate(Array.isArray(storagePlugin.canActivate) ? storagePlugin.canActivate.join(',') : storagePlugin.canActivate || '')
   }, [])
 
   const handleModalOkClick = async () => {

package-lock.json

@@ -31110,9 +31110,9 @@
       }
     },
     "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
     },
     "merge-descriptors": {
       "version": "1.0.1",

package.json

@@ -171,7 +171,7 @@
     "jquery": "^3.3.1",
     "jszip": "^3.6.0",
     "latest-version": "^5.1.0",
-    "merge": "^1.2.0",
+    "merge": "^2.1.1",
     "npm-install-version": "^6.0.2",
     "react": "^17.0.2",
     "react-beautiful-dnd": "^13.1.0",