feat: add multi-srp fence

MetaMask · Mar 3, 2025 · 88b11b1 · 88b11b1
1 parent 4ed72c9
commit 88b11b1
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/app/components/Views/AccountConnect/AccountConnect.tsx b/app/components/Views/AccountConnect/AccountConnect.tsx
@@ -587,10 +587,12 @@ const AccountConnect = (props: AccountConnectProps) => {
           );
           break;
         }
+        ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
         case USER_INTENT.ImportSrp: {
           navigation.navigate('ImportSrpView');
           break;
         }
+        ///: END:ONLY_INCLUDE_IF
         case USER_INTENT.ConnectHW: {
           navigation.navigate('ConnectQRHardwareFlow');
           // TODO: Confirm if this is where we want to track connecting a hardware wallet or within ConnectQRHardwareFlow screen.

diff --git a/app/components/Views/AddAccountActions/AddAccountActions.tsx b/app/components/Views/AddAccountActions/AddAccountActions.tsx
@@ -58,11 +58,12 @@ const AddAccountActions = ({ onBack }: AddAccountActionsProps) => {
       createEventBuilder(MetaMetricsEvents.CONNECT_HARDWARE_WALLET).build(),
     );
   }, [onBack, navigate, trackEvent, createEventBuilder]);
-
+  ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
   const openImportSrp = useCallback(() => {
     navigate(Routes.MULTI_SRP.IMPORT);
     onBack();
   }, [onBack, navigate]);
+  ///: END:ONLY_INCLUDE_IF
 
   const createNewAccount = useCallback(async () => {
     const { KeyringController } = Engine.context;
@@ -219,13 +220,17 @@ const AddAccountActions = ({ onBack }: AddAccountActionsProps) => {
               AddAccountBottomSheetSelectorsIDs.ADD_HARDWARE_WALLET_BUTTON
             }
           />
-          <AccountAction
-            actionTitle={strings('account_actions.import_srp')}
-            iconName={IconName.Hardware}
-            onPress={openImportSrp}
-            disabled={isLoading}
-            testID={AddAccountBottomSheetSelectorsIDs.IMPORT_SRP_BUTTON}
-          />
+          {
+            ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
+            <AccountAction
+              actionTitle={strings('account_actions.import_srp')}
+              iconName={IconName.Hardware}
+              onPress={openImportSrp}
+              disabled={isLoading}
+              testID={AddAccountBottomSheetSelectorsIDs.IMPORT_SRP_BUTTON}
+            />
+            ///: END:ONLY_INCLUDE_IF
+          }
         </View>
       </Fragment>
     </SafeAreaView>

diff --git a/app/constants/navigation/Routes.ts b/app/constants/navigation/Routes.ts
@@ -163,9 +163,11 @@ const Routes = {
   STANDALONE_CONFIRMATIONS: {
     STAKE_DEPOSIT: 'RedesignedStakeDeposit',
   },
+  ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
   MULTI_SRP: {
     IMPORT: 'ImportSRPView',
   },
+  ///: END:ONLY_INCLUDE_IF
   ///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
   SNAPS: {
     SNAPS_SETTINGS_LIST: 'SnapsSettingsList',

diff --git a/app/constants/permissions.ts b/app/constants/permissions.ts
@@ -8,5 +8,7 @@ export enum USER_INTENT {
   Cancel,
   Import,
   ConnectHW,
+  ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
   ImportSrp,
+  ///: END:ONLY_INCLUDE_IF
 }
diff --git a/app/selectors/keyringController/index.ts b/app/selectors/keyringController/index.ts
@@ -1,4 +1,6 @@
+///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
 import ExtendedKeyringTypes from '../../constants/keyringTypes';
+///: END:ONLY_INCLUDE_IF
 import { RootState } from '../../reducers';
 import { createDeepEqualSelector } from '../util';
 
@@ -18,7 +20,9 @@ export const selectKeyrings = createDeepEqualSelector(
   (keyringControllerState) =>
     keyringControllerState.keyrings.map((keyring, index) => ({
       ...keyring,
+      ///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
       metadata: keyringControllerState.keyringsMetadata?.[index] || {},
+      ///: END:ONLY_INCLUDE_IF
     })),
 );
 

diff --git a/metro.transform.js b/metro.transform.js
@@ -18,6 +18,7 @@ const availableFeatures = new Set([
   'external-snaps',
   'beta',
   'keyring-snaps',
+  'multi-srp',
 ]);
 
 const mainFeatureSet = new Set(['preinstalled-snaps']);
@@ -26,6 +27,7 @@ const flaskFeatureSet = new Set([
   'preinstalled-snaps',
   'external-snaps',
   'keyring-snaps',
+  'multi-srp',
 ]);
 
 /**