Merged

Author: maciejka

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis-dex",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "private": true,
   "dependencies": {
     "autoprefixer": "7.1.2",

public/favicon.ico

@@ -1,13 +1,6 @@
 {
   "short_name": "OasisDEX",
   "name": "OasisDEX",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "192x192",
-      "type": "image/png"
-    }
-  ],
   "start_url": "./200.html",
   "display": "standalone",
   "theme_color": "#000000",

public/manifest.json

@@ -138,10 +138,16 @@ const init = async (dispatch) => {
     await dispatch(
       networkReducer.actions.setWaitingForNetworkAccess(true)
     );
-    window.ethereum.enable().finally(() => {
+    window.ethereum.enable().then(() => {
       dispatch(
         networkReducer.actions.setWaitingForNetworkAccess(false)
       );
+    }).catch(e => {
+      console.log(e);
+      dispatch(
+        networkReducer.actions.setWaitingForNetworkAccess(false)
+      );
+      dispatch(platformReducer.actions.accountLocked());
     });
     setInterval(detectNetworkChange, 500);
   } else if (window.web3) {