Improving handling for non-existent props in state migrations (#11829)

app/scripts/migrations/053.js

@@ -23,23 +23,27 @@ function transformState(state) {
     state?.IncomingTransactionsController?.incomingTransactions;
   if (Array.isArray(transactions)) {
     transactions.forEach((transaction) => {
-      if (
+      if (transaction) {
-        transaction.type !== TRANSACTION_TYPES.RETRY &&
+        if (
-        transaction.type !== TRANSACTION_TYPES.CANCEL
+          transaction.type !== TRANSACTION_TYPES.RETRY &&
-      ) {
+          transaction.type !== TRANSACTION_TYPES.CANCEL
-        transaction.type = transaction.transactionCategory;
+        ) {
+          transaction.type = transaction.transactionCategory;
+        }
+        delete transaction.transactionCategory;
       }
-      delete transaction.transactionCategory;
     });
   }
   if (incomingTransactions) {
     const incomingTransactionsEntries = Object.entries(incomingTransactions);
     incomingTransactionsEntries.forEach(([key, transaction]) => {
-      delete transaction.transactionCategory;
+      if (transaction) {
-      state.IncomingTransactionsController.incomingTransactions[key] = {
+        delete transaction.transactionCategory;
-        ...transaction,
+        state.IncomingTransactionsController.incomingTransactions[key] = {
-        type: TRANSACTION_TYPES.INCOMING,
+          ...transaction,
-      };
+          type: TRANSACTION_TYPES.INCOMING,
+        };
+      }
     });
   }
   return state;

app/scripts/migrations/056.js

@@ -15,14 +15,14 @@ export default {
 
     const { PreferencesController } = versionedData.data;
 
-    if (Array.isArray(PreferencesController.tokens)) {
+    if (Array.isArray(PreferencesController?.tokens)) {
       PreferencesController.tokens = PreferencesController.tokens.filter(
         ({ address }) => address,
       );
     }
 
     if (
-      PreferencesController.accountTokens &&
+      PreferencesController?.accountTokens &&
       typeof PreferencesController.accountTokens === 'object'
     ) {
       Object.keys(PreferencesController.accountTokens).forEach((account) => {
@@ -40,7 +40,7 @@ export default {
     }
 
     if (
-      PreferencesController.assetImages &&
+      PreferencesController?.assetImages &&
       'undefined' in PreferencesController.assetImages
     ) {
       delete PreferencesController.assetImages.undefined;