Merge branch 'master' into clear_storage

apps/remix-ide/src/app/components/preload.tsx

@@ -99,7 +99,7 @@ export const Preload = () => {
             </div>
             {!supported ?
                 <div className='preload-info-container alert alert-warning'>
-                    Your browser does not support any of the filesytems required by Remix.
+                    Your browser does not support any of the filesystems required by Remix.
                     Either change the settings in your browser or use a supported browser.
                 </div> : null}
             {error ?
@@ -127,4 +127,4 @@ const logo = <svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000
     <path d="M91.84,35a.09.09,0,0,1-.1-.07,41,41,0,0,0-79.48,0,.09.09,0,0,1-.1.07C9.45,35,1,35.35,1,42.53c0,8.56,1,16,6,20.32,2.16,1.85,5.81,2.3,9.27,2.22a44.4,44.4,0,0,0,6.45-.68.09.09,0,0,0,.06-.15A34.81,34.81,0,0,1,17,45c0-.1,0-.21,0-.31a35,35,0,0,1,70,0c0,.1,0,.21,0,.31a34.81,34.81,0,0,1-5.78,19.24.09.09,0,0,0,.06.15,44.4,44.4,0,0,0,6.45.68c3.46.08,7.11-.37,9.27-2.22,5-4.27,6-11.76,6-20.32C103,35.35,94.55,35,91.84,35Z" />
     <path d="M52,74,25.4,65.13a.1.1,0,0,0-.1.17L51.93,91.93a.1.1,0,0,0,.14,0L78.7,65.3a.1.1,0,0,0-.1-.17L52,74A.06.06,0,0,1,52,74Z" />
     <path d="M75.68,46.9,82,45a.09.09,0,0,0,.08-.09,29.91,29.91,0,0,0-.87-6.94.11.11,0,0,0-.09-.08l-6.43-.58a.1.1,0,0,1-.06-.18l4.78-4.18a.13.13,0,0,0,0-.12,30.19,30.19,0,0,0-3.65-6.07.09.09,0,0,0-.11,0l-5.91,2a.1.1,0,0,1-.12-.14L72.19,23a.11.11,0,0,0,0-.12,29.86,29.86,0,0,0-5.84-4.13.09.09,0,0,0-.11,0l-4.47,4.13a.1.1,0,0,1-.17-.07l.09-6a.1.1,0,0,0-.07-.1,30.54,30.54,0,0,0-7-1.47.1.1,0,0,0-.1.07l-2.38,5.54a.1.1,0,0,1-.18,0l-2.37-5.54a.11.11,0,0,0-.11-.06,30,30,0,0,0-7,1.48.12.12,0,0,0-.07.1l.08,6.05a.09.09,0,0,1-.16.07L37.8,18.76a.11.11,0,0,0-.12,0,29.75,29.75,0,0,0-5.83,4.13.11.11,0,0,0,0,.12l2.59,5.6a.11.11,0,0,1-.13.14l-5.9-2a.11.11,0,0,0-.12,0,30.23,30.23,0,0,0-3.62,6.08.11.11,0,0,0,0,.12l4.79,4.19a.1.1,0,0,1-.06.17L23,37.91a.1.1,0,0,0-.09.07A29.9,29.9,0,0,0,22,44.92a.1.1,0,0,0,.07.1L28.4,47a.1.1,0,0,1,0,.18l-5.84,3.26a.16.16,0,0,0,0,.11,30.17,30.17,0,0,0,2.1,6.76c.32.71.67,1.4,1,2.08a.1.1,0,0,0,.06,0L52,68.16H52l26.34-8.78a.1.1,0,0,0,.06-.05,30.48,30.48,0,0,0,3.11-8.88.1.1,0,0,0-.05-.11l-5.83-3.26A.1.1,0,0,1,75.68,46.9Z" />
-</svg>
+</svg>

apps/remix-ide/src/app/plugins/permission-handler-plugin.tsx

@@ -14,8 +14,10 @@ const profile = {
 export class PermissionHandlerPlugin extends Plugin {
     permissions: any
     currentVersion: number
+    fallbackMemory: boolean
     constructor() {
         super(profile)
+        this.fallbackMemory = false
         this.permissions = this._getFromLocal()
         this.currentVersion = 1
         // here we remove the old permissions saved before adding 'permissionVersion'
@@ -27,13 +29,19 @@ export class PermissionHandlerPlugin extends Plugin {
     }
 
     _getFromLocal() {
+        if (this.fallbackMemory) return this.permissions
         const permission = localStorage.getItem('plugins/permissions')
         return permission ? JSON.parse(permission) : {}
     }
 
     persistPermissions() {
         const permissions = JSON.stringify(this.permissions)
-        localStorage.setItem('plugins/permissions', permissions)
+        try {
+            localStorage.setItem('plugins/permissions', permissions)
+        } catch (e) {
+            this.fallbackMemory = true
+            console.log(e)
+        }
     }
 
     switchMode (from: Profile, to: Profile, method: string, set: boolean) {
@@ -123,4 +131,4 @@ export class PermissionHandlerPlugin extends Plugin {
             }
         })
     }
-}
+}