Merge branch 'master' into selvi

ethereum · Dec 5, 2023 · 5bb6abd · 5bb6abd
2 parents f2051b6 + 79228da
commit 5bb6abd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx
@@ -201,6 +201,7 @@ contract HelloWorld {
 
   const handleSwichToRecentWorkspace = async (e, workspaceName) => {
     e.preventDefault()
+    _paq.push(['trackEvent', 'hometab', 'filesSection', 'loadRecentWorkspace'])
     await plugin.call('filePanel', 'switchToWorkspace', { name: workspaceName, isLocalhost: false })
   }
 

diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -111,10 +111,10 @@ export class CompileTabLogic {
         this.event.emit('removeAnnotations')
         this.event.emit('startingCompilation')
         if(await this.api.fileExists('remappings.txt')) {
-          this.api.readFile('remappings.txt').then( remappings => {
-            this.compiler.set('remappings', remappings.split('\n'))
+          this.api.readFile('remappings.txt').then(remappings => {
+            this.compiler.set('remappings', remappings.split('\n').filter(Boolean))
           })
-        }
+        } else this.compiler.set('remappings', [])
         if (this.configFilePath) {
           this.api.readFile(this.configFilePath).then( contentConfig => {
             this.compiler.set('configFileContent', contentConfig)