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