Merge branch 'main' into fix/nft-grid-item-crash

MetaMask · Feb 24, 2025 · 6fc8cda · 6fc8cda
2 parents 52b7075 + a245dc3
commit 6fc8cda
Show file tree

Hide file tree

Showing 47 changed files with 1,159 additions and 502 deletions.
diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
@@ -441,8 +441,10 @@ export const SENTRY_UI_STATE = {
     isInitialized: true,
     useSafeChainsListValidation: true,
     watchEthereumAccountEnabled: false,
+    ///: BEGIN:ONLY_INCLUDE_IF(bitcoin)
     bitcoinSupportEnabled: false,
     bitcoinTestnetSupportEnabled: false,
+    ///: END:ONLY_INCLUDE_IF
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     addSnapAccountEnabled: false,
     snapsAddSnapAccountModalDismissed: false,

diff --git a/app/scripts/controllers/mmi-controller.test.ts b/app/scripts/controllers/mmi-controller.test.ts
@@ -174,7 +174,11 @@ describe('MMIController', function () {
         ],
       }),
       keyringBuilders: [...custodianKeyringBuilders],
-      state: {},
+      state: {
+        keyrings: [],
+        isUnlocked: true,
+        keyringsMetadata: [],
+      },
       encryptor: {
         encrypt(_, object) {
           this.object = object;

diff --git a/app/scripts/controllers/preferences-controller.test.ts b/app/scripts/controllers/preferences-controller.test.ts
@@ -155,6 +155,12 @@ describe('preferences controller', () => {
               accounts: [firstAddress, secondAddress],
             },
           ],
+          keyringsMetadata: [
+            {
+              id: '01JKDGGBRE3DGZA7N1PZJSQK4W',
+              name: '',
+            },
+          ],
         },
         [],
       );
@@ -200,6 +206,12 @@ describe('preferences controller', () => {
               accounts: [firstAddress, secondAddress],
             },
           ],
+          keyringsMetadata: [
+            {
+              id: '01JKDGGBRE3DGZA7N1PZJSQK4W',
+              name: '',
+            },
+          ],
         },
         [],
       );
@@ -251,6 +263,12 @@ describe('preferences controller', () => {
               accounts: [firstAddress, secondAddress],
             },
           ],
+          keyringsMetadata: [
+            {
+              id: '01JKDGGBRE3DGZA7N1PZJSQK4W',
+              name: '',
+            },
+          ],
         },
         [],
       );
@@ -286,6 +304,12 @@ describe('preferences controller', () => {
               accounts: [firstAddress, secondAddress],
             },
           ],
+          keyringsMetadata: [
+            {
+              id: '01JKDGGBRE3DGZA7N1PZJSQK4W',
+              name: '',
+            },
+          ],
         },
         [],
       );
@@ -529,6 +553,12 @@ describe('preferences controller', () => {
               accounts: [firstAddress, secondAddress],
             },
           ],
+          keyringsMetadata: [
+            {
+              id: '01JKDGGBRE3DGZA7N1PZJSQK4W',
+              name: '',
+            },
+          ],
         },
         [],
       );

diff --git a/app/scripts/controllers/preferences-controller.ts b/app/scripts/controllers/preferences-controller.ts
@@ -145,8 +145,10 @@ export type PreferencesControllerState = Omit<
   ///: BEGIN:ONLY_INCLUDE_IF(solana)
   solanaSupportEnabled: boolean;
   ///: END:ONLY_INCLUDE_IF
+  ///: BEGIN:ONLY_INCLUDE_IF(bitcoin)
   bitcoinSupportEnabled: boolean;
   bitcoinTestnetSupportEnabled: boolean;
+  ///: END:ONLY_INCLUDE_IF
   addSnapAccountEnabled?: boolean;
   advancedGasFee: Record<string, Record<string, string>>;
   incomingTransactionsPreferences: Record<number, boolean>;
@@ -677,6 +679,7 @@ export class PreferencesController extends BaseController<
   }
   ///: END:ONLY_INCLUDE_IF
 
+  ///: BEGIN:ONLY_INCLUDE_IF(bitcoin)
   /**
    * Setter for the `bitcoinSupportEnabled` property.
    *
@@ -700,6 +703,7 @@ export class PreferencesController extends BaseController<
       state.bitcoinTestnetSupportEnabled = bitcoinTestnetSupportEnabled;
     });
   }
+  ///: END:ONLY_INCLUDE_IF
 
   /**
    * Setter for the `useExternalNameSources` property