fix - migration 30 undefinds (#6079)

MetaMask · Jan 31, 2019 · 4e27b64 · 4e27b64
1 parent 7c0e0b6
commit 4e27b64
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/app/scripts/migrations/030.js b/app/scripts/migrations/030.js
@@ -24,23 +24,25 @@ module.exports = {
 
 function transformState (state) {
   const newState = state
-
-  const frequentRpcListDetail = newState.PreferencesController.frequentRpcListDetail
-  if (frequentRpcListDetail) {
-    frequentRpcListDetail.forEach((rpc, index) => {
-      if (!!rpc.chainId && Number.isNaN(parseInt(rpc.chainId))) {
-        delete frequentRpcListDetail[index].chainId
-      }
-    })
-    newState.PreferencesController.frequentRpcListDetail = frequentRpcListDetail
-  }
-
-  if (newState.NetworkController.network && Number.isNaN(parseInt(newState.NetworkController.network))) {
-    delete newState.NetworkController.network
+  if (state.PreferencesController) {
+    const frequentRpcListDetail = newState.PreferencesController.frequentRpcListDetail
+    if (frequentRpcListDetail) {
+      frequentRpcListDetail.forEach((rpc, index) => {
+        if (!!rpc.chainId && Number.isNaN(parseInt(rpc.chainId))) {
+          delete frequentRpcListDetail[index].chainId
+        }
+      })
+      newState.PreferencesController.frequentRpcListDetail = frequentRpcListDetail
+    }
   }
-
-  if (newState.NetworkController.provider && newState.NetworkController.provider.chainId && Number.isNaN(parseInt(newState.NetworkController.provider.chainId))) {
-    delete newState.NetworkController.provider.chainId
+  if (state.NetworkController) {
+    if (newState.NetworkController.network && Number.isNaN(parseInt(newState.NetworkController.network))) {
+      delete newState.NetworkController.network
+    }
+
+    if (newState.NetworkController.provider && newState.NetworkController.provider.chainId && Number.isNaN(parseInt(newState.NetworkController.provider.chainId))) {
+      delete newState.NetworkController.provider.chainId
+    }
   }
 
   return newState