Merge pull request #1996 from ethereum/sidePanel

Fix setFile toaster

package.json

@@ -48,7 +48,7 @@
     "remix-debug": "0.3.7",
     "remix-lib": "0.4.6",
     "remix-solidity": "0.3.6",
-    "remix-tabs": "^1.0.0",
+    "remix-tabs": "1.0.46",
     "remix-tests": "0.1.8",
     "remixd": "0.1.8-alpha.6",
     "request": "^2.83.0",

src/app/files/fileManager.js

@@ -148,7 +148,7 @@ class FileManager extends FileSystemApi {
           warnToaster.hide()
         }}>Save As Copy</button>
         </div>`
-      warnToaster = await toaster(yo`<div><span class="text-primary">${this.currentRequest.from}</span> is modyfing <span class="text-primary">${path}</span></div>`, actions, { time: 6000 })
+      warnToaster = await toaster(yo`<div><i class="fas fa-exclamation-triangle text-info mr-1"></i><span class="text-primary">${this.currentRequest.from}</span> is modyfing <span class="text-primary">${path}</span></div>`, actions, { time: 4000 })
       if (reject) throw new Error(`set file operation on ${path} aborted by user.`)
       if (savedAsAnotherFile) return
     }

src/app/ui/tooltip.js

@@ -9,8 +9,7 @@ var modal = require('./modal-dialog-custom')
  */
 module.exports = function addTooltip (tooltipText, action, opts) {
   let t = new Toaster()
-  t.render(tooltipText, action, opts)
+  return t.render(tooltipText, action, opts)
-  return t
 }
 
 class Toaster {