From 4e27b644ab962cd45ebadf33f3671eebbad93b01 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Thu, 31 Jan 2019 08:09:28 -1000
Subject: fix - migration 30 undefinds (#6079)

---
 app/scripts/migrations/030.js | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/scripts/migrations/030.js b/app/scripts/migrations/030.js
index 19b686c58..10f7d33b2 100644
--- 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
-- 
cgit v1.2.3