Reality2byte
diff --git a/‎app/actions/settings/index.js‎
Lines changed: 21 additions & 2 deletions b/‎app/actions/settings/index.js‎
Lines changed: 21 additions & 2 deletions
diff --git a/‎app/actions/settings/toggleBasicFunctionality.test.js‎
Lines changed: 49 additions & 3 deletions b/‎app/actions/settings/toggleBasicFunctionality.test.js‎
Lines changed: 49 additions & 3 deletions
diff --git a/‎app/components/Views/Settings/AdvancedSettings/index.tsx‎
Lines changed: 8 additions & 1 deletion b/‎app/components/Views/Settings/AdvancedSettings/index.tsx‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx‎
Lines changed: 31 additions & 15 deletions b/‎app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx‎
Lines changed: 31 additions & 15 deletions
diff --git a/‎app/reducers/settings/index.js‎
Lines changed: 7 additions & 0 deletions b/‎app/reducers/settings/index.js‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎app/selectors/featureFlagController/basicFunctionalityConsolidation/index.test.ts‎
Lines changed: 87 additions & 0 deletions b/‎app/selectors/featureFlagController/basicFunctionalityConsolidation/index.test.ts‎
Lines changed: 87 additions & 0 deletions
diff --git a/‎app/selectors/featureFlagController/basicFunctionalityConsolidation/index.ts‎
Lines changed: 36 additions & 0 deletions b/‎app/selectors/featureFlagController/basicFunctionalityConsolidation/index.ts‎
Lines changed: 36 additions & 0 deletions
@@ -55,12 +55,31 @@ export function setBasicFunctionality(basicFunctionalityEnabled) {
   };
 }
 
+export function setBasicFunctionalityConsolidatedEnabled(
+  isBasicFunctionalityConsolidatedEnabled,
+) {
+  return {
+    type: 'SET_BASIC_FUNCTIONALITY_CONSOLIDATED_ENABLED',
+    isBasicFunctionalityConsolidatedEnabled,
+  };
+}
+
 // Thunk action creator for user-initiated toggles (includes MultichainAccountService integration)
 export function toggleBasicFunctionality(basicFunctionalityEnabled) {
-  return async (dispatch) => {
-    // First dispatch the Redux state update
+  return async (dispatch, getState) => {
     dispatch(setBasicFunctionality(basicFunctionalityEnabled));
 
+    const {
+      selectIsBasicFunctionalityConsolidationEnabled,
+    } = require('../../selectors/featureFlagController/basicFunctionalityConsolidation');
+    const {
+      syncConsolidatedBasicFunctionalityPreferences,
+    } = require('../../util/basicFunctionality/syncConsolidatedBasicFunctionalityPreferences');
+
+    if (selectIsBasicFunctionalityConsolidationEnabled(getState())) {
+      syncConsolidatedBasicFunctionalityPreferences(basicFunctionalityEnabled);
+    }
+
     const Engine = require('../../core/Engine').default;
     Engine.context.MultichainAccountService.setBasicFunctionality(
       basicFunctionalityEnabled,
 
@@ -1,4 +1,13 @@
 import { toggleBasicFunctionality, setBasicFunctionality } from './index';
+import { selectIsBasicFunctionalityConsolidationEnabled } from '../../selectors/featureFlagController/basicFunctionalityConsolidation';
+import { syncConsolidatedBasicFunctionalityPreferences } from '../../util/basicFunctionality/syncConsolidatedBasicFunctionalityPreferences';
+
+const mockSyncConsolidatedBasicFunctionalityPreferences = jest.mocked(
+  syncConsolidatedBasicFunctionalityPreferences,
+);
+const mockSelectIsBasicFunctionalityConsolidationEnabled = jest.mocked(
+  selectIsBasicFunctionalityConsolidationEnabled,
+);
 
 // Mock Engine
 const mockSetBasicFunctionality = jest.fn().mockResolvedValue(undefined);
@@ -8,21 +17,39 @@ jest.mock('../../core/Engine', () => ({
       MultichainAccountService: {
         setBasicFunctionality: mockSetBasicFunctionality,
       },
+      PreferencesController: {},
     },
   },
 }));
 
+jest.mock(
+  '../../selectors/featureFlagController/basicFunctionalityConsolidation',
+  () => ({
+    selectIsBasicFunctionalityConsolidationEnabled: jest.fn(() => false),
+  }),
+);
+
+jest.mock(
+  '../../util/basicFunctionality/syncConsolidatedBasicFunctionalityPreferences',
+  () => ({
+    syncConsolidatedBasicFunctionalityPreferences: jest.fn(),
+  }),
+);
+
 describe('toggleBasicFunctionality action', () => {
   let mockDispatch;
+  let mockGetState;
 
   beforeEach(() => {
     mockDispatch = jest.fn();
+    mockGetState = jest.fn(() => ({}));
     jest.clearAllMocks();
+    mockSelectIsBasicFunctionalityConsolidationEnabled.mockReturnValue(false);
   });
 
   it('dispatches Redux state update and calls MultichainAccountService', async () => {
     const action = toggleBasicFunctionality(true);
-    await action(mockDispatch);
+    await action(mockDispatch, mockGetState);
 
     // Verify Redux state is updated
     expect(mockDispatch).toHaveBeenCalledWith(setBasicFunctionality(true));
@@ -33,7 +60,7 @@ describe('toggleBasicFunctionality action', () => {
 
   it('dispatches Redux state update with false value', async () => {
     const action = toggleBasicFunctionality(false);
-    await action(mockDispatch);
+    await action(mockDispatch, mockGetState);
 
     // Verify Redux state is updated
     expect(mockDispatch).toHaveBeenCalledWith(setBasicFunctionality(false));
@@ -51,7 +78,7 @@ describe('toggleBasicFunctionality action', () => {
     const consoleSpy = jest.spyOn(console, 'error').mockImplementation();
 
     const action = toggleBasicFunctionality(false);
-    await action(mockDispatch);
+    await action(mockDispatch, mockGetState);
 
     // Verify Redux state is still updated despite service error
     expect(mockDispatch).toHaveBeenCalledWith(setBasicFunctionality(false));
@@ -70,4 +97,23 @@ describe('toggleBasicFunctionality action', () => {
 
     consoleSpy.mockRestore();
   });
+
+  it('syncs consolidated preferences when consolidation is enabled', async () => {
+    mockSelectIsBasicFunctionalityConsolidationEnabled.mockReturnValue(true);
+    const action = toggleBasicFunctionality(false);
+    await action(mockDispatch, mockGetState);
+
+    expect(
+      mockSyncConsolidatedBasicFunctionalityPreferences,
+    ).toHaveBeenCalledWith(false);
+  });
+
+  it('does not sync consolidated preferences when consolidation is disabled', async () => {
+    const action = toggleBasicFunctionality(true);
+    await action(mockDispatch, mockGetState);
+
+    expect(
+      mockSyncConsolidatedBasicFunctionalityPreferences,
+    ).not.toHaveBeenCalled();
+  });
 });
@@ -43,6 +43,7 @@ import type { RootState } from '../../../../reducers';
 import type { AppNavigationProp } from '../../../../core/NavigationService/types';
 import { SettingsToggleRow } from '../components/SettingsToggleRow';
 import { createStyles } from './AdvancedSettings.styles';
+import { selectIsBasicFunctionalityConsolidationEnabled } from '../../../../selectors/featureFlagController/basicFunctionalityConsolidation';
 
 interface SettingsState {
   showHexData: boolean;
@@ -63,6 +64,7 @@ interface StateProps {
   dismissSmartAccountSuggestionEnabled: ReturnType<
     typeof selectDismissSmartAccountSuggestionEnabled
   >;
+  isBasicFunctionalityConsolidationEnabled: boolean;
 }
 
 interface DispatchProps {
@@ -94,6 +96,7 @@ const AdvancedSettings = ({
   route,
   smartTransactionsOptInStatus,
   dismissSmartAccountSuggestionEnabled,
+  isBasicFunctionalityConsolidationEnabled,
 }: Props) => {
   const { colors } = useTheme();
   const styles = createStyles(colors);
@@ -242,7 +245,9 @@ const AdvancedSettings = ({
             onValueChange={setShowHexData}
           />
 
-          <AutoDetectTokensSettings />
+          {!isBasicFunctionalityConsolidationEnabled && (
+            <AutoDetectTokensSettings />
+          )}
 
           <SettingsToggleRow
             title={strings('app_settings.show_fiat_on_testnets')}
@@ -295,6 +300,8 @@ const mapStateToProps = (state: SettingsRootState): StateProps => ({
   smartTransactionsOptInStatus: selectSmartTransactionsOptInStatus(state),
   dismissSmartAccountSuggestionEnabled:
     selectDismissSmartAccountSuggestionEnabled(state),
+  isBasicFunctionalityConsolidationEnabled:
+    selectIsBasicFunctionalityConsolidationEnabled(state),
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({
 
@@ -72,6 +72,7 @@ import BatchAccountBalanceSettings from '../../Settings/BatchAccountBalanceSetti
 import useCheckNftAutoDetectionModal from '../../../hooks/useCheckNftAutoDetectionModal';
 import useCheckMultiRpcModal from '../../../hooks/useCheckMultiRpcModal';
 import { useStyles } from '../../../../component-library/hooks/useStyles';
+import { selectIsBasicFunctionalityConsolidationEnabled } from '../../../../selectors/featureFlagController/basicFunctionalityConsolidation';
 
 const Settings: React.FC = () => {
   const { trackEvent, isEnabled, createEventBuilder } = useAnalytics();
@@ -90,6 +91,9 @@ const Settings: React.FC = () => {
   const isBasicFunctionalityEnabled = useSelector(
     (state: RootState) => state?.settings?.basicFunctionalityEnabled,
   );
+  const isBasicFunctionalityConsolidationEnabled = useSelector(
+    selectIsBasicFunctionalityConsolidationEnabled,
+  );
   const scrollViewRef = useRef<ScrollView>(null);
   const metaMetricsSectionRef = useRef<View>(null);
   const dataCollectionSectionRef = useRef<View>(null);
@@ -379,7 +383,7 @@ const Settings: React.FC = () => {
           <ChangePassword />
           <AutoLock />
           <DeviceSecurityToggle />
-          <BlockaidSettings />
+          {!isBasicFunctionalityConsolidationEnabled && <BlockaidSettings />}
           <Text variant={TextVariant.HeadingMd} style={styles.subHeading}>
             {strings('app_settings.privacy_heading')}
           </Text>
@@ -392,21 +396,33 @@ const Settings: React.FC = () => {
           <ClearPrivacy />
           {renderClearBrowserHistorySection()}
           <ClearCookiesSection />
-          <Text variant={TextVariant.HeadingMd} style={styles.subHeading}>
-            {strings('app_settings.network_provider')}
-          </Text>
-          <NetworkDetailsCheckSettings />
-          <Text variant={TextVariant.HeadingMd} style={styles.subHeading}>
-            {strings('app_settings.transactions_subheading')}
-          </Text>
-          <BatchAccountBalanceSettings />
+          {!isBasicFunctionalityConsolidationEnabled && (
+            <>
+              <Text variant={TextVariant.HeadingMd} style={styles.subHeading}>
+                {strings('app_settings.network_provider')}
+              </Text>
+              <NetworkDetailsCheckSettings />
+            </>
+          )}
+          {!isBasicFunctionalityConsolidationEnabled && (
+            <>
+              <Text variant={TextVariant.HeadingMd} style={styles.subHeading}>
+                {strings('app_settings.transactions_subheading')}
+              </Text>
+              <BatchAccountBalanceSettings />
+              {renderUseTransactionSimulations()}
+            </>
+          )}
           {renderHistoryModal()}
-          {renderUseTransactionSimulations()}
-          <Text variant={TextVariant.HeadingMd} style={styles.subHeading}>
-            {strings('app_settings.token_nft_ens_subheading')}
-          </Text>
-          <DisplayNFTMediaSettings />
-          {isMainnet && <AutoDetectNFTSettings />}
+          {!isBasicFunctionalityConsolidationEnabled && (
+            <>
+              <Text variant={TextVariant.HeadingMd} style={styles.subHeading}>
+                {strings('app_settings.token_nft_ens_subheading')}
+              </Text>
+              <DisplayNFTMediaSettings />
+              {isMainnet && <AutoDetectNFTSettings />}
+            </>
+          )}
           <IPFSGatewaySettings />
           <Text variant={TextVariant.HeadingMd} style={styles.subHeading}>
             {strings('app_settings.analytics_subheading')}
 
@@ -8,6 +8,7 @@ const initialState = {
   avatarAccountType: AvatarAccountType.Maskicon,
   hideZeroBalanceTokens: true,
   basicFunctionalityEnabled: true,
+  isBasicFunctionalityConsolidatedEnabled: false,
   deepLinkModalDisabled: false,
   hapticsEnabled: true,
   // Whether this account is shown on the Top Traders leaderboard. Local mirror
@@ -61,6 +62,12 @@ const settingsReducer = (state = initialState, action) => {
         ...state,
         basicFunctionalityEnabled: action.basicFunctionalityEnabled,
       };
+    case 'SET_BASIC_FUNCTIONALITY_CONSOLIDATED_ENABLED':
+      return {
+        ...state,
+        isBasicFunctionalityConsolidatedEnabled:
+          action.isBasicFunctionalityConsolidatedEnabled,
+      };
     case 'TOGGLE_DEVICE_NOTIFICATIONS':
       return {
         ...state,
 
@@ -0,0 +1,87 @@
+import {
+  MOBILE_UX_BFTC_CONSOLIDATION_FLAG_NAME,
+  selectIsBasicFunctionalityConsolidationEnabled,
+  selectMobileUxBftcConsolidationFlagEnabled,
+} from './index';
+// eslint-disable-next-line import-x/no-namespace
+import * as remoteFeatureFlagModule from '../../../util/remoteFeatureFlag';
+
+jest.mock('react-native-device-info', () => ({
+  getVersion: jest.fn(() => '7.60.0'),
+}));
+
+describe('basicFunctionalityConsolidation selectors', () => {
+  let mockHasMinimumRequiredVersion: jest.SpyInstance;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockHasMinimumRequiredVersion = jest.spyOn(
+      remoteFeatureFlagModule,
+      'hasMinimumRequiredVersion',
+    );
+    mockHasMinimumRequiredVersion.mockReturnValue(true);
+  });
+
+  afterEach(() => {
+    mockHasMinimumRequiredVersion?.mockRestore();
+  });
+
+  describe('selectMobileUxBftcConsolidationFlagEnabled', () => {
+    it('returns true when remote flag is valid and enabled', () => {
+      const result = selectMobileUxBftcConsolidationFlagEnabled.resultFunc({
+        [MOBILE_UX_BFTC_CONSOLIDATION_FLAG_NAME]: {
+          enabled: true,
+          minimumVersion: '1.0.0',
+        },
+      });
+
+      expect(result).toBe(true);
+    });
+
+    it('returns false when remote flag is disabled', () => {
+      const result = selectMobileUxBftcConsolidationFlagEnabled.resultFunc({
+        [MOBILE_UX_BFTC_CONSOLIDATION_FLAG_NAME]: {
+          enabled: false,
+          minimumVersion: '1.0.0',
+        },
+      });
+
+      expect(result).toBe(false);
+    });
+
+    it('returns false when remote flag is missing', () => {
+      const result = selectMobileUxBftcConsolidationFlagEnabled.resultFunc({});
+
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('selectIsBasicFunctionalityConsolidationEnabled', () => {
+    it('returns true when remote flag and cohort marker are enabled', () => {
+      const result = selectIsBasicFunctionalityConsolidationEnabled.resultFunc(
+        true,
+        true,
+      );
+
+      expect(result).toBe(true);
+    });
+
+    it('returns false when remote flag is disabled (kill-switch)', () => {
+      const result = selectIsBasicFunctionalityConsolidationEnabled.resultFunc(
+        false,
+        true,
+      );
+
+      expect(result).toBe(false);
+    });
+
+    it('returns false when cohort marker is missing for existing users', () => {
+      const result = selectIsBasicFunctionalityConsolidationEnabled.resultFunc(
+        true,
+        false,
+      );
+
+      expect(result).toBe(false);
+    });
+  });
+});
@@ -0,0 +1,36 @@
+import { createSelector } from 'reselect';
+import { selectRemoteFeatureFlags } from '..';
+import {
+  validatedVersionGatedFeatureFlag,
+  type VersionGatedFeatureFlag,
+} from '../../../util/remoteFeatureFlag';
+import { selectIsBasicFunctionalityConsolidatedEnabled } from '../../settings';
+
+export const MOBILE_UX_BFTC_CONSOLIDATION_FLAG_NAME =
+  'mobileUxBftcConsolidation';
+
+/**
+ * Remote rollout flag for consolidated Basic Functionality (version-gated).
+ * Default OFF in production; acts as kill-switch when disabled.
+ */
+export const selectMobileUxBftcConsolidationFlagEnabled = createSelector(
+  selectRemoteFeatureFlags,
+  (remoteFeatureFlags) => {
+    const remoteFlag = remoteFeatureFlags?.[
+      MOBILE_UX_BFTC_CONSOLIDATION_FLAG_NAME
+    ] as unknown as VersionGatedFeatureFlag;
+
+    return validatedVersionGatedFeatureFlag(remoteFlag) ?? false;
+  },
+);
+
+/**
+ * True when the user should see consolidated Basic Functionality settings.
+ * Requires both the remote flag and the persisted onboarding cohort marker.
+ */
+export const selectIsBasicFunctionalityConsolidationEnabled = createSelector(
+  selectMobileUxBftcConsolidationFlagEnabled,
+  selectIsBasicFunctionalityConsolidatedEnabled,
+  (isRemoteFlagEnabled, isConsolidatedUser) =>
+    isRemoteFlagEnabled && isConsolidatedUser,
+);