diff --git a/app/components/Nav/Main/MainNavigator.js b/app/components/Nav/Main/MainNavigator.js
index e147398cfe3a..360a619d1b55 100644
--- a/app/components/Nav/Main/MainNavigator.js
+++ b/app/components/Nav/Main/MainNavigator.js
@@ -100,13 +100,9 @@ import {
   PerpsScreenStack,
   PerpsModalStack,
   PerpsTutorialCarousel,
-  selectPerpsEnabledFlag,
 } from '../../UI/Perps';
-import {
-  PredictScreenStack,
-  PredictModalStack,
-  selectPredictEnabledFlag,
-} from '../../UI/Predict';
+import { PredictScreenStack, PredictModalStack } from '../../UI/Predict';
+import { useFeatureFlag, FeatureFlagNames } from '../../hooks/useFeatureFlag';
 import { selectAssetsTrendingTokensEnabled } from '../../../selectors/featureFlagController/assetsTrendingTokens';
 import PerpsPositionTransactionView from '../../UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView';
 import PerpsOrderTransactionView from '../../UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView';
@@ -921,11 +917,15 @@ const SampleFeatureFlow = () => (
 
 const MainNavigator = () => {
   // Get feature flag state for conditional Perps screen registration
-  const perpsEnabledFlag = useSelector(selectPerpsEnabledFlag);
+  const perpsEnabledFlag = useFeatureFlag(
+    FeatureFlagNames.perpsPerpTradingEnabled,
+  );
   const isEvmSelected = useSelector(selectIsEvmNetworkSelected);
   const isPerpsEnabled = useMemo(() => perpsEnabledFlag, [perpsEnabledFlag]);
   // Get feature flag state for conditional Predict screen registration
-  const predictEnabledFlag = useSelector(selectPredictEnabledFlag);
+  const predictEnabledFlag = useFeatureFlag(
+    FeatureFlagNames.predictTradingEnabled,
+  );
   const isPredictEnabled = useMemo(
     () => predictEnabledFlag,
     [predictEnabledFlag],
diff --git a/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx b/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx
index 636b9f155b82..5c141c826688 100644
--- a/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx
+++ b/app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx
@@ -11,7 +11,12 @@ import {
   StyleSheet,
   TextInputProps,
 } from 'react-native';
-import { Box, Text, TextVariant } from '@metamask/design-system-react-native';
+import {
+  Box,
+  FontWeight,
+  Text,
+  TextVariant,
+} from '@metamask/design-system-react-native';
 
 import Icon, {
   IconName,
@@ -608,14 +613,18 @@ const CardAuthentication = () => {
                 width={ButtonWidthTypes.Full}
                 disabled={isLoginDisabled || loading}
               />
-              <Button
-                variant={ButtonVariants.Secondary}
-                label={strings('card.card_authentication.signup_button')}
-                size={ButtonSize.Lg}
-                testID={CardAuthenticationSelectors.SIGNUP_BUTTON}
+              <TouchableOpacity
                 onPress={() => navigation.navigate(Routes.CARD.ONBOARDING.ROOT)}
-                width={ButtonWidthTypes.Full}
-              />
+              >
+                <Text
+                  testID={CardAuthenticationSelectors.SIGNUP_BUTTON}
+                  variant={TextVariant.BodyMd}
+                  fontWeight={FontWeight.Medium}
+                  twClassName="text-default text-center p-4"
+                >
+                  {strings('card.card_authentication.signup_button')}
+                </Text>
+              </TouchableOpacity>
             </Box>
           </Box>
         </ScrollView>
diff --git a/app/components/UI/Card/Views/CardAuthentication/__snapshots__/CardAuthentication.test.tsx.snap b/app/components/UI/Card/Views/CardAuthentication/__snapshots__/CardAuthentication.test.tsx.snap
index 8c4939f2d9fa..66b570a403d9 100644
--- a/app/components/UI/Card/Views/CardAuthentication/__snapshots__/CardAuthentication.test.tsx.snap
+++ b/app/components/UI/Card/Views/CardAuthentication/__snapshots__/CardAuthentication.test.tsx.snap
@@ -838,40 +838,29 @@ exports[`CardAuthentication Component Login Step - Component Rendering matches l
                                   </Text>
                                 </TouchableOpacity>
                                 <TouchableOpacity
-                                  accessibilityRole="button"
-                                  accessible={true}
-                                  activeOpacity={1}
                                   onPress={[Function]}
-                                  onPressIn={[Function]}
-                                  onPressOut={[Function]}
-                                  style={
-                                    {
-                                      "alignItems": "center",
-                                      "alignSelf": "stretch",
-                                      "backgroundColor": "#3c4d9d0f",
-                                      "borderColor": "transparent",
-                                      "borderRadius": 12,
-                                      "borderWidth": 1,
-                                      "flexDirection": "row",
-                                      "height": 48,
-                                      "justifyContent": "center",
-                                      "overflow": "hidden",
-                                      "paddingHorizontal": 16,
-                                    }
-                                  }
-                                  testID="signup-button"
                                 >
                                   <Text
                                     accessibilityRole="text"
                                     style={
-                                      {
-                                        "color": "#121314",
-                                        "fontFamily": "Geist Medium",
-                                        "fontSize": 16,
-                                        "letterSpacing": 0,
-                                        "lineHeight": 24,
-                                      }
+                                      [
+                                        {
+                                          "color": "#121314",
+                                          "fontFamily": "Geist Medium",
+                                          "fontSize": 16,
+                                          "fontWeight": 400,
+                                          "letterSpacing": 0,
+                                          "lineHeight": 24,
+                                          "paddingBottom": 16,
+                                          "paddingLeft": 16,
+                                          "paddingRight": 16,
+                                          "paddingTop": 16,
+                                          "textAlign": "center",
+                                        },
+                                        undefined,
+                                      ]
                                     }
+                                    testID="signup-button"
                                   >
                                     card.card_authentication.signup_button
                                   </Text>
diff --git a/app/components/UI/Card/Views/CardHome/CardHome.test.tsx b/app/components/UI/Card/Views/CardHome/CardHome.test.tsx
index 66568edb3701..d5852f7348f1 100644
--- a/app/components/UI/Card/Views/CardHome/CardHome.test.tsx
+++ b/app/components/UI/Card/Views/CardHome/CardHome.test.tsx
@@ -784,6 +784,30 @@ describe('CardHome Component', () => {
     ).not.toBeOnTheScreen();
   });
 
+  it('passes formatted balance to CardAssetItem', () => {
+    // Given: asset balances with formatted balance
+    mockUseAssetBalances.mockReturnValue(
+      createMockAssetBalancesMap({
+        balanceFiat: '$1,000.00',
+        asset: {
+          symbol: 'USDC',
+          image: 'usdc-image-url',
+        },
+        balanceFormatted: '1000.000000 USDC',
+        rawTokenBalance: 1000,
+        rawFiatNumber: 1000,
+      }),
+    );
+
+    // When: component renders
+    render();
+
+    // Then: CardAssetItem should be rendered with formatted balance
+    expect(
+      screen.queryByTestId(CardHomeSelectors.CARD_ASSET_ITEM_SKELETON),
+    ).not.toBeOnTheScreen();
+  });
+
   it('displays manage card section', () => {
     // Given: default state
     // When: component renders
diff --git a/app/components/UI/Card/Views/CardHome/CardHome.tsx b/app/components/UI/Card/Views/CardHome/CardHome.tsx
index 3dc62dd2af8c..4d00c8618cfc 100644
--- a/app/components/UI/Card/Views/CardHome/CardHome.tsx
+++ b/app/components/UI/Card/Views/CardHome/CardHome.tsx
@@ -784,7 +784,11 @@ const CardHome = () => {
               testID={CardHomeSelectors.CARD_ASSET_ITEM_SKELETON}
             />
           ) : (
-            <CardAssetItem asset={asset} privacyMode={privacyMode} />
+            <CardAssetItem
+              asset={asset}
+              privacyMode={privacyMode}
+              balanceFormatted={balanceFormatted}
+            />
           )}
         </View>
 
diff --git a/app/components/UI/Card/Views/SpendingLimit/SpendingLimit.tsx b/app/components/UI/Card/Views/SpendingLimit/SpendingLimit.tsx
index bcec86419679..274e5e515ec5 100644
--- a/app/components/UI/Card/Views/SpendingLimit/SpendingLimit.tsx
+++ b/app/components/UI/Card/Views/SpendingLimit/SpendingLimit.tsx
@@ -136,7 +136,6 @@ const SpendingLimit = ({
         // If not loading or we're explicitly allowing navigation, allow it
         return;
       }
-      Logger.log('Blocking back navigation while loading');
 
       // Prevent default navigation behavior
       e.preventDefault();
diff --git a/app/components/UI/Card/components/AssetSelectionBottomSheet/AssetSelectionBottomSheet.test.tsx b/app/components/UI/Card/components/AssetSelectionBottomSheet/AssetSelectionBottomSheet.test.tsx
index 741bce8fb383..7cc15b32bdf9 100644
--- a/app/components/UI/Card/components/AssetSelectionBottomSheet/AssetSelectionBottomSheet.test.tsx
+++ b/app/components/UI/Card/components/AssetSelectionBottomSheet/AssetSelectionBottomSheet.test.tsx
@@ -48,7 +48,15 @@ jest.mock('react-redux', () => ({
 }));
 
 const mockSdk = {
-  getSupportedTokensByChainId: jest.fn(() => []),
+  getSupportedTokensByChainId: jest.fn<
+    {
+      address: string;
+      symbol: string;
+      name: string;
+      decimals: number;
+    }[],
+    [string?]
+  >(() => []),
   updateWalletPriority: jest.fn(),
   lineaChainId: 'eip155:59144',
 };
@@ -882,6 +890,78 @@ describe('AssetSelectionBottomSheet', () => {
     });
   });
 
+  describe('navigation-based selection', () => {
+    it('navigates back to caller route with selected token', () => {
+      const token = createMockToken({
+        symbol: 'EURe',
+        address: '0xeure',
+      });
+      const delegationSettings = createMockDelegationSettings();
+      const callerParams = { someParam: 'value' };
+
+      // Mock SDK to return EURe with proper casing
+      mockSdk.getSupportedTokensByChainId.mockReturnValue([
+        {
+          address: '0xeure',
+          symbol: 'EURe',
+          name: 'Euro Coin',
+          decimals: 6,
+        },
+      ]);
+
+      const { getByText } = setupComponent({
+        tokensWithAllowances: [token],
+        delegationSettings,
+        selectionOnly: true,
+        callerRoute: Routes.CARD.SPENDING_LIMIT,
+        callerParams,
+      });
+
+      fireEvent.press(getByText(/EURe on/));
+
+      expect(mockNavigate).toHaveBeenCalledWith(
+        Routes.CARD.SPENDING_LIMIT,
+        expect.objectContaining({
+          ...callerParams,
+          returnedSelectedToken: expect.objectContaining({
+            address: token.address,
+            symbol: 'EURe',
+          }),
+        }),
+      );
+    });
+
+    it('goes back when no caller route is provided in navigation mode', () => {
+      const token = createMockToken({
+        symbol: 'mUSD',
+        address: '0xmusd',
+      });
+      const delegationSettings = createMockDelegationSettings();
+
+      // Mock SDK to return mUSD with proper casing
+      mockSdk.getSupportedTokensByChainId.mockReturnValue([
+        {
+          address: '0xmusd',
+          symbol: 'mUSD',
+          name: 'MetaMask USD',
+          decimals: 6,
+        },
+      ]);
+
+      const { getByText } = setupComponent({
+        tokensWithAllowances: [token],
+        delegationSettings,
+        selectionOnly: true,
+        callerRoute: undefined,
+        callerParams: undefined,
+      });
+
+      fireEvent.press(getByText(/mUSD on/));
+
+      expect(mockGoBack).toHaveBeenCalled();
+    });
+  });
+
   describe('Solana not supported footer', () => {
     it('displays Solana not supported button when hideSolanaAssets is true', () => {
       const token = createMockToken();
@@ -927,4 +1007,195 @@ describe('AssetSelectionBottomSheet', () => {
       ).toBeNull();
     });
   });
+
+  describe('wallet address display', () => {
+    it('displays truncated wallet address when available', () => {
+      const token = createMockToken({
+        symbol: 'mUSD',
+        address: '0xmusd',
+        walletAddress: '0x1234567890abcdef1234567890abcdef12345678',
+      });
+      const delegationSettings = createMockDelegationSettings();
+
+      // Mock SDK to return mUSD with proper casing
+      mockSdk.getSupportedTokensByChainId.mockReturnValue([
+        {
+          address: '0xmusd',
+          symbol: 'mUSD',
+          name: 'MetaMask USD',
+          decimals: 6,
+        },
+      ]);
+
+      const { getByText } = setupComponent({
+        tokensWithAllowances: [token],
+        delegationSettings,
+      });
+
+      expect(getByText(/0x1234.../)).toBeOnTheScreen();
+    });
+
+    it('does not display wallet address when not available', () => {
+      const token = createMockToken({
+        symbol: 'EURe',
+        address: '0xeure',
+        walletAddress: undefined,
+      });
+      const delegationSettings = createMockDelegationSettings();
+
+      // Mock SDK to return EURe with proper casing
+      mockSdk.getSupportedTokensByChainId.mockReturnValue([
+        {
+          address: '0xeure',
+          symbol: 'EURe',
+          name: 'Euro Coin',
+          decimals: 6,
+        },
+      ]);
+
+      const { queryByText } = setupComponent({
+        tokensWithAllowances: [token],
+        delegationSettings,
+      });
+
+      expect(queryByText(/0x/)).toBeNull();
+    });
+  });
+
+  describe('token merging from delegation settings', () => {
+    it('adds supported tokens from delegation settings not in user wallet', () => {
+      const userToken = createMockToken({
+        symbol: 'mUSD',
+        address: '0x123',
+      });
+      const delegationSettings: DelegationSettingsResponse = {
+        networks: [
+          {
+            network: 'linea',
+            environment: 'production',
+            chainId: '59144',
+            delegationContract: '0xdelegation',
+            tokens: {
+              mUSD: {
+                symbol: 'mUSD',
+                decimals: 6,
+                address: '0x123',
+              },
+              EURe: {
+                symbol: 'EURe',
+                decimals: 6,
+                address: '0x456',
+              },
+            },
+          },
+        ],
+        count: 1,
+        _links: { self: '/api' },
+      };
+
+      // Mock SDK to return both tokens with proper casing
+      mockSdk.getSupportedTokensByChainId.mockReturnValue([
+        {
+          address: '0x123',
+          symbol: 'mUSD',
+          name: 'MetaMask USD',
+          decimals: 6,
+        },
+        {
+          address: '0x456',
+          symbol: 'EURe',
+          name: 'Euro Coin',
+          decimals: 6,
+        },
+      ]);
+
+      const { getByText } = setupComponent({
+        tokensWithAllowances: [userToken],
+        delegationSettings,
+      });
+
+      expect(getByText(/mUSD on/)).toBeOnTheScreen();
+      expect(getByText(/EURe on/)).toBeOnTheScreen();
+    });
+
+    it('does not duplicate tokens already in user wallet', () => {
+      const userToken = createMockToken({
+        symbol: 'mUSD',
+        address: '0x123',
+      });
+      const delegationSettings: DelegationSettingsResponse = {
+        networks: [
+          {
+            network: 'linea',
+            environment: 'production',
+            chainId: '59144',
+            delegationContract: '0xdelegation',
+            tokens: {
+              mUSD: {
+                symbol: 'mUSD',
+                decimals: 6,
+                address: '0x123',
+              },
+            },
+          },
+        ],
+        count: 1,
+        _links: { self: '/api' },
+      };
+
+      // Mock SDK to return mUSD with proper casing
+      mockSdk.getSupportedTokensByChainId.mockReturnValue([
+        {
+          address: '0x123',
+          symbol: 'mUSD',
+          name: 'MetaMask USD',
+          decimals: 6,
+        },
+      ]);
+
+      const { getAllByText } = setupComponent({
+        tokensWithAllowances: [userToken],
+        delegationSettings,
+      });
+
+      const musdElements = getAllByText(/mUSD on/);
+      expect(musdElements.length).toBe(1);
+    });
+  });
+
+  describe('priority token highlighting', () => {
+    it('highlights priority token with border', () => {
+      const token = createMockToken({
+        symbol: 'EURe',
+        address: '0xeure',
+      });
+      const delegationSettings = createMockDelegationSettings();
+      const cardExternalWalletDetails = {
+        walletDetails: [],
+        mappedWalletDetails: [],
+        priorityWalletDetail: token,
+      };
+
+      // Mock SDK to return EURe with proper casing
+      mockSdk.getSupportedTokensByChainId.mockReturnValue([
+        {
+          address: '0xeure',
+          symbol: 'EURe',
+          name: 'Euro Coin',
+          decimals: 6,
+        },
+      ]);
+
+      const { getByTestId } = setupComponent({
+        tokensWithAllowances: [token],
+        delegationSettings,
+        cardExternalWalletDetails,
+      });
+
+      const tokenItem = getByTestId(
+        `asset-select-item-EURe-${token.caipChainId}`,
+      );
+      expect(tokenItem).toBeTruthy();
+    });
+  });
 });
diff --git a/app/components/UI/Card/components/AssetSelectionBottomSheet/AssetSelectionBottomSheet.tsx b/app/components/UI/Card/components/AssetSelectionBottomSheet/AssetSelectionBottomSheet.tsx
index 2e639c7fe9b3..1cca08f52bed 100644
--- a/app/components/UI/Card/components/AssetSelectionBottomSheet/AssetSelectionBottomSheet.tsx
+++ b/app/components/UI/Card/components/AssetSelectionBottomSheet/AssetSelectionBottomSheet.tsx
@@ -194,12 +194,23 @@ const AssetSelectionBottomSheet: React.FC = () => {
       userToken: CardTokenAllowance,
     ): CardTokenAllowance & { chainName: string } => {
       const chainName = mapCaipChainIdToChainName(userToken.caipChainId);
+      const supportedToken = sdk
+        ?.getSupportedTokensByChainId(userToken.caipChainId)
+        ?.find(
+          (token) =>
+            token.address?.toLowerCase() === userToken.address?.toLowerCase() &&
+            token.symbol?.toLowerCase() === userToken.symbol?.toLowerCase(),
+        );
 
       return {
         ...userToken,
         address: userToken.address ?? '',
-        symbol: userToken.symbol?.toUpperCase() ?? '',
-        name: userToken.name ?? userToken.symbol?.toUpperCase() ?? '',
+        symbol: supportedToken?.symbol ?? userToken.symbol?.toUpperCase() ?? '',
+        name:
+          supportedToken?.name ??
+          userToken.name ??
+          userToken.symbol?.toUpperCase() ??
+          '',
         decimals: userToken.decimals ?? 0,
         chainName,
         allowance: userToken.allowance || '0',
@@ -207,7 +218,7 @@ const AssetSelectionBottomSheet: React.FC = () => {
         stagingTokenAddress: userToken.stagingTokenAddress ?? undefined,
       } as CardTokenAllowance & { chainName: string };
     },
-    [],
+    [sdk],
   );
 
   // Helper: Check if token exists in user tokens
@@ -411,11 +422,20 @@ const AssetSelectionBottomSheet: React.FC = () => {
 
           const tokenAddress = getTokenAddress(tokenConfig, network);
           const isNonProduction = network.environment !== 'production';
+          const supportedToken = sdk
+            ?.getSupportedTokensByChainId(caipChainId)
+            ?.find(
+              (token) =>
+                token.address?.toLowerCase() ===
+                  tokenConfig.address?.toLowerCase() &&
+                token.symbol?.toLowerCase() ===
+                  tokenConfig.symbol?.toLowerCase(),
+            );
 
           supportedFromSettings.push({
             address: tokenAddress,
-            symbol: tokenConfig.symbol.toUpperCase(),
-            name: tokenConfig.symbol.toUpperCase(),
+            symbol: supportedToken?.symbol ?? tokenConfig.symbol,
+            name: supportedToken?.name ?? tokenConfig.symbol,
             decimals: tokenConfig.decimals,
             caipChainId,
             walletAddress: undefined,
diff --git a/app/components/UI/Card/components/CardAssetItem/CardAssetItem.test.tsx b/app/components/UI/Card/components/CardAssetItem/CardAssetItem.test.tsx
index d866b8d74ab2..1aefb93e35fe 100644
--- a/app/components/UI/Card/components/CardAssetItem/CardAssetItem.test.tsx
+++ b/app/components/UI/Card/components/CardAssetItem/CardAssetItem.test.tsx
@@ -180,4 +180,26 @@ describe('CardAssetItem Component', () => {
 
     expect(getByText('ETH')).toBeOnTheScreen();
   });
+
+  it('uses balanceFormatted when provided', () => {
+    const balanceFormatted = '1.234567 ETH';
+
+    renderWithProvider(() => (
+      <CardAssetItem
+        asset={mockAsset}
+        privacyMode={false}
+        balanceFormatted={balanceFormatted}
+      />
+    ));
+
+    expect(mockAsset.balance).toBe('1000000000000000000');
+  });
+
+  it('falls back to asset balance when balanceFormatted is not provided', () => {
+    renderWithProvider(() => (
+      <CardAssetItem asset={mockAsset} privacyMode={false} />
+    ));
+
+    expect(mockAsset.balance).toBe('1000000000000000000');
+  });
 });
diff --git a/app/components/UI/Card/components/CardAssetItem/CardAssetItem.tsx b/app/components/UI/Card/components/CardAssetItem/CardAssetItem.tsx
index ee606006cb31..8ed0b60af3ca 100644
--- a/app/components/UI/Card/components/CardAssetItem/CardAssetItem.tsx
+++ b/app/components/UI/Card/components/CardAssetItem/CardAssetItem.tsx
@@ -21,12 +21,14 @@ interface CardAssetItemProps {
   asset: TokenI | undefined;
   privacyMode: boolean;
   onPress?: (asset: TokenI) => void;
+  balanceFormatted?: string;
 }
 
 const CardAssetItem: React.FC<CardAssetItemProps> = ({
   asset,
   onPress,
   privacyMode,
+  balanceFormatted,
 }) => {
   const { styles } = useStyles(styleSheet, {});
   const chainId = asset?.chainId as Hex;
@@ -46,7 +48,7 @@ const CardAssetItem: React.FC<CardAssetItemProps> = ({
       disabled
       asset={asset}
       balance={asset.balanceFiat}
-      secondaryBalance={`${asset.balance} ${asset.symbol}`}
+      secondaryBalance={balanceFormatted ?? `${asset.balance} ${asset.symbol}`}
       privacyMode={privacyMode}
     >
       <BadgeWrapper
diff --git a/app/components/UI/Card/components/Onboarding/SignUp.tsx b/app/components/UI/Card/components/Onboarding/SignUp.tsx
index 33f1325749ef..bacb3192e919 100644
--- a/app/components/UI/Card/components/Onboarding/SignUp.tsx
+++ b/app/components/UI/Card/components/Onboarding/SignUp.tsx
@@ -356,7 +356,7 @@ const SignUp = () => {
           testID="signup-i-already-have-an-account-text"
           variant={TextVariant.BodyMd}
           fontWeight={FontWeight.Medium}
-          twClassName="text-primary-default text-center p-4 underline"
+          twClassName="text-default text-center p-4"
         >
           {strings('card.card_onboarding.sign_up.i_already_have_an_account')}
         </Text>
diff --git a/app/components/UI/Card/hooks/useOpenSwaps.test.ts b/app/components/UI/Card/hooks/useOpenSwaps.test.ts
index d6d5b414ad37..50281ab2186c 100644
--- a/app/components/UI/Card/hooks/useOpenSwaps.test.ts
+++ b/app/components/UI/Card/hooks/useOpenSwaps.test.ts
@@ -3,7 +3,10 @@ import { useSelector, useDispatch } from 'react-redux';
 import { useOpenSwaps } from './useOpenSwaps';
 import { buildTokenIconUrl } from '../util/buildTokenIconUrl';
 import { getHighestFiatToken } from '../util/getHighestFiatToken';
-import { setDestToken } from '../../../../core/redux/slices/bridge';
+import {
+  setDestToken,
+  selectSelectedSourceChainIds,
+} from '../../../../core/redux/slices/bridge';
 import { SwapBridgeNavigationLocation } from '../../Bridge/hooks/useSwapBridgeNavigation';
 import { CardTokenAllowance } from '../types';
 import { selectAllPopularNetworkConfigurations } from '../../../../selectors/networkController';
@@ -33,6 +36,7 @@ jest.mock('../util/getHighestFiatToken', () => ({
 
 jest.mock('../../../../core/redux/slices/bridge', () => ({
   setDestToken: jest.fn(),
+  selectSelectedSourceChainIds: jest.fn(),
 }));
 
 jest.mock('../../../../selectors/multichain', () => ({
@@ -61,6 +65,8 @@ describe('useOpenSwaps', () => {
   const mockTrackEvent = jest.fn();
   const mockCreateEventBuilder = jest.fn();
 
+  const mockChainIds = ['0xe708'];
+
   const mockTokensWithBalance = [
     {
       address: '0xbeef',
@@ -115,6 +121,9 @@ describe('useOpenSwaps', () => {
     (
       selectAllPopularNetworkConfigurations as unknown as jest.Mock
     ).mockReturnValue(mockPopularNetworks);
+    (selectSelectedSourceChainIds as unknown as jest.Mock).mockReturnValue(
+      mockChainIds,
+    );
     (useTokensWithBalance as jest.Mock).mockReturnValue(mockTokensWithBalance);
 
     (useSelector as jest.Mock).mockImplementation((selector) => selector());
@@ -311,4 +320,12 @@ describe('useOpenSwaps', () => {
     expect(result.current).toBeDefined();
     expect(typeof result.current.openSwaps).toBe('function');
   });
+
+  it('calls useTokensWithBalance with chain IDs from selector', () => {
+    renderHook(() => useOpenSwaps());
+
+    expect(useTokensWithBalance).toHaveBeenCalledWith({
+      chainIds: mockChainIds,
+    });
+  });
 });
diff --git a/app/components/UI/Card/hooks/useOpenSwaps.ts b/app/components/UI/Card/hooks/useOpenSwaps.ts
index 098d21c32791..5abe338646c7 100644
--- a/app/components/UI/Card/hooks/useOpenSwaps.ts
+++ b/app/components/UI/Card/hooks/useOpenSwaps.ts
@@ -11,9 +11,11 @@ import { BridgeToken } from '../../Bridge/types';
 import { CardTokenAllowance } from '../types';
 import { buildTokenIconUrl } from '../util/buildTokenIconUrl';
 import { getHighestFiatToken } from '../util/getHighestFiatToken';
-import { setDestToken } from '../../../../core/redux/slices/bridge';
+import {
+  selectSelectedSourceChainIds,
+  setDestToken,
+} from '../../../../core/redux/slices/bridge';
 import { MetaMetricsEvents, useMetrics } from '../../../hooks/useMetrics';
-import { selectAllPopularNetworkConfigurations } from '../../../../selectors/networkController';
 import { useTokensWithBalance } from '../../Bridge/hooks/useTokensWithBalance';
 
 export interface OpenSwapsParams {
@@ -32,10 +34,7 @@ export const useOpenSwaps = ({
   priorityToken,
 }: UseOpenSwapsOptions = {}) => {
   const dispatch = useDispatch();
-  const popularNetworks = useSelector(selectAllPopularNetworkConfigurations);
-  const chainIds = Object.entries(popularNetworks).map(
-    (network) => network[1].chainId,
-  );
+  const chainIds = useSelector(selectSelectedSourceChainIds);
   const tokensWithBalance = useTokensWithBalance({
     chainIds,
   });
diff --git a/app/components/UI/Card/sdk/CardSDK.ts b/app/components/UI/Card/sdk/CardSDK.ts
index db216167b099..640ddbeb5702 100644
--- a/app/components/UI/Card/sdk/CardSDK.ts
+++ b/app/components/UI/Card/sdk/CardSDK.ts
@@ -1008,7 +1008,7 @@ export class CardSDK {
 
     if (delegationSettingNetwork.environment === 'staging') {
       return {
-        symbol: delegationSettingToken.symbol.toUpperCase(),
+        symbol: tokenDetails.symbol,
         address: tokenDetails.address,
         decimals: delegationSettingToken.decimals,
         decimalChainId: delegationSettingNetwork.chainId,
@@ -1020,7 +1020,7 @@ export class CardSDK {
     }
 
     return {
-      symbol: delegationSettingToken.symbol.toUpperCase(),
+      symbol: tokenDetails.symbol,
       address: delegationSettingToken.address,
       decimals: delegationSettingToken.decimals,
       decimalChainId: delegationSettingNetwork.chainId,
diff --git a/app/components/UI/Earn/components/EarnTokenList/EarnTokenList.test.tsx b/app/components/UI/Earn/components/EarnTokenList/EarnTokenList.test.tsx
index e248dff8e02d..da1a614e0d64 100644
--- a/app/components/UI/Earn/components/EarnTokenList/EarnTokenList.test.tsx
+++ b/app/components/UI/Earn/components/EarnTokenList/EarnTokenList.test.tsx
@@ -19,17 +19,28 @@ import { getMockUseEarnTokens } from '../../__mocks__/earnMockData';
 import { EARN_EXPERIENCES } from '../../constants/experiences';
 import * as useEarnTokensHook from '../../hooks/useEarnTokens';
 import * as useEarnNetworkPollingHook from '../../hooks/useEarnNetworkPolling';
+import { selectStablecoinLendingEnabledFlag } from '../../selectors/featureFlags';
 import {
-  selectPooledStakingEnabledFlag,
-  selectStablecoinLendingEnabledFlag,
-} from '../../selectors/featureFlags';
+  useFeatureFlag,
+  FeatureFlagNames,
+} from '../../../../../components/hooks/useFeatureFlag';
 import { EarnTokenDetails } from '../../types/lending.types';
 
 jest.mock('../../selectors/featureFlags', () => ({
-  selectPooledStakingEnabledFlag: jest.fn().mockImplementation(() => true),
   selectStablecoinLendingEnabledFlag: jest.fn().mockImplementation(() => true),
+  selectPooledStakingEnabledFlag: jest.fn().mockImplementation(() => true),
 }));
 
+jest.mock('../../../../../components/hooks/useFeatureFlag', () => {
+  const actual = jest.requireActual(
+    '../../../../../components/hooks/useFeatureFlag',
+  );
+  return {
+    ...actual,
+    useFeatureFlag: jest.fn().mockReturnValue(true),
+  };
+});
+
 jest.mock('../../../../../core/Engine', () => ({
   context: {
     NetworkController: {
@@ -140,8 +151,13 @@ describe('EarnTokenList', () => {
     (
       selectStablecoinLendingEnabledFlag as unknown as jest.Mock
     ).mockReturnValue(true);
-    (selectPooledStakingEnabledFlag as unknown as jest.Mock).mockReturnValue(
-      true,
+    (useFeatureFlag as unknown as jest.Mock).mockImplementation(
+      (flagName: string) => {
+        if (flagName === FeatureFlagNames.earnPooledStakingEnabled) {
+          return true;
+        }
+        return true;
+      },
     );
 
     jest
@@ -491,9 +507,7 @@ describe('EarnTokenList', () => {
   describe('ETH token filtering based on pooled staking status', () => {
     it('filters out ETH tokens that are not staked when pooled staking is disabled', () => {
       // Mock pooled staking as disabled
-      (selectPooledStakingEnabledFlag as unknown as jest.Mock).mockReturnValue(
-        false,
-      );
+      (useFeatureFlag as unknown as jest.Mock).mockReturnValue(false);
 
       const mockTokens = [
         {
@@ -550,9 +564,7 @@ describe('EarnTokenList', () => {
 
     it('shows ETH tokens that are staked when pooled staking is disabled', () => {
       // Mock pooled staking as disabled
-      (selectPooledStakingEnabledFlag as unknown as jest.Mock).mockReturnValue(
-        false,
-      );
+      (useFeatureFlag as unknown as jest.Mock).mockReturnValue(false);
 
       const mockTokens = [
         {
@@ -609,9 +621,7 @@ describe('EarnTokenList', () => {
 
     it('shows ETH tokens that are not staked when pooled staking is enabled', () => {
       // Mock pooled staking as enabled
-      (selectPooledStakingEnabledFlag as unknown as jest.Mock).mockReturnValue(
-        true,
-      );
+      (useFeatureFlag as unknown as jest.Mock).mockReturnValue(true);
 
       const mockTokens = [
         {
@@ -668,9 +678,7 @@ describe('EarnTokenList', () => {
 
     it('shows non-ETH tokens regardless of pooled staking status', () => {
       // Mock pooled staking as disabled
-      (selectPooledStakingEnabledFlag as unknown as jest.Mock).mockReturnValue(
-        false,
-      );
+      (useFeatureFlag as unknown as jest.Mock).mockReturnValue(false);
 
       const mockTokens = [
         {
diff --git a/app/components/UI/Earn/components/EarnTokenList/index.tsx b/app/components/UI/Earn/components/EarnTokenList/index.tsx
index 4c2550eab75e..1e54245725fa 100644
--- a/app/components/UI/Earn/components/EarnTokenList/index.tsx
+++ b/app/components/UI/Earn/components/EarnTokenList/index.tsx
@@ -34,10 +34,11 @@ import Engine from '../../../../../core/Engine';
 import SkeletonPlaceholder from 'react-native-skeleton-placeholder';
 import useEarnTokens from '../../hooks/useEarnTokens';
 import { useSelector } from 'react-redux';
+import { selectStablecoinLendingEnabledFlag } from '../../selectors/featureFlags';
 import {
-  selectPooledStakingEnabledFlag,
-  selectStablecoinLendingEnabledFlag,
-} from '../../selectors/featureFlags';
+  useFeatureFlag,
+  FeatureFlagNames,
+} from '../../../../../components/hooks/useFeatureFlag';
 import useEarnNetworkPolling from '../../hooks/useEarnNetworkPolling';
 import { EARN_INPUT_VIEW_ACTIONS } from '../../Views/EarnInputView/EarnInputView.types';
 import EarnDepositTokenListItem from '../EarnDepositTokenListItem';
@@ -99,7 +100,9 @@ const EarnTokenList = () => {
   const bottomSheetRef = useRef<BottomSheetRef>(null);
   const traceEndedRef = useRef(false);
 
-  const isPooledStakingEnabled = useSelector(selectPooledStakingEnabledFlag);
+  const isPooledStakingEnabled = useFeatureFlag(
+    FeatureFlagNames.earnPooledStakingEnabled,
+  );
   const { includeReceiptTokens } = params?.tokenFilter ?? {};
 
   const { earnTokens, earnOutputTokens, earnableTotalFiatFormatted } =
diff --git a/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.test.tsx b/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.test.tsx
index 6316288d77d3..060bc6fd92f5 100644
--- a/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.test.tsx
+++ b/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.test.tsx
@@ -11,7 +11,7 @@ import {
   selectRewardsCardSpendFeatureFlags,
   selectRewardsMusdDepositEnabledFlag,
 } from '../../../../../../../selectors/featureFlagController/rewards';
-import { selectPredictEnabledFlag } from '../../../../../Predict/selectors/featureFlags';
+import { useFeatureFlag } from '../../../../../../../components/hooks/useFeatureFlag';
 import { MetaMetricsEvents } from '../../../../../../hooks/useMetrics';
 import { RewardsMetricsButtons } from '../../../../utils';
 
@@ -58,6 +58,17 @@ jest.mock('../../../../../../hooks/useMetrics', () => ({
   },
 }));
 
+// Mock useFeatureFlag hook
+jest.mock('../../../../../../../components/hooks/useFeatureFlag', () => {
+  const actual = jest.requireActual(
+    '../../../../../../../components/hooks/useFeatureFlag',
+  );
+  return {
+    useFeatureFlag: jest.fn(),
+    FeatureFlagNames: actual.FeatureFlagNames,
+  };
+});
+
 // Mock getNativeAssetForChainId
 jest.mock('@metamask/bridge-controller', () => ({
   getNativeAssetForChainId: jest.fn(() => ({
@@ -71,6 +82,10 @@ const mockUseNavigation = useNavigation as jest.MockedFunction<
   typeof useNavigation
 >;
 
+const mockUseFeatureFlag = useFeatureFlag as jest.MockedFunction<
+  typeof useFeatureFlag
+>;
+
 // Mock i18n strings
 jest.mock('../../../../../../../../locales/i18n', () => ({
   strings: jest.fn((key: string) => {
@@ -207,14 +222,13 @@ describe('WaysToEarn', () => {
       if (selector === selectRewardsCardSpendFeatureFlags) {
         return mockIsCardSpendEnabled;
       }
-      if (selector === selectPredictEnabledFlag) {
-        return mockIsPredictEnabled;
-      }
       if (selector === selectRewardsMusdDepositEnabledFlag) {
         return mockIsMusdDepositEnabled;
       }
       return undefined;
     });
+    // Mock useFeatureFlag for predict flag
+    mockUseFeatureFlag.mockReturnValue(mockIsPredictEnabled);
   });
 
   it('renders the component title', () => {
@@ -503,6 +517,7 @@ describe('WaysToEarn', () => {
 
       // Enable flag
       mockIsPredictEnabled = true;
+      mockUseFeatureFlag.mockReturnValue(mockIsPredictEnabled);
       rerender(<WaysToEarn />);
 
       // Assert visible now
@@ -513,6 +528,7 @@ describe('WaysToEarn', () => {
     it('opens modal for predict earning way when pressed', () => {
       // Arrange
       mockIsPredictEnabled = true;
+      mockUseFeatureFlag.mockReturnValue(mockIsPredictEnabled);
       const { getByText } = render(<WaysToEarn />);
       const predictButton = getByText('Prediction markets');
 
@@ -541,6 +557,7 @@ describe('WaysToEarn', () => {
     it('navigates to predict market list when predict CTA is pressed', () => {
       // Arrange
       mockIsPredictEnabled = true;
+      mockUseFeatureFlag.mockReturnValue(mockIsPredictEnabled);
       const { getByText } = render(<WaysToEarn />);
       const predictButton = getByText('Prediction markets');
 
diff --git a/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.tsx b/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.tsx
index 804cfae36dbc..8dfcab62b0fe 100644
--- a/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.tsx
+++ b/app/components/UI/Rewards/components/Tabs/OverviewTab/WaysToEarn/WaysToEarn.tsx
@@ -31,7 +31,10 @@ import {
   selectRewardsCardSpendFeatureFlags,
   selectRewardsMusdDepositEnabledFlag,
 } from '../../../../../../../selectors/featureFlagController/rewards';
-import { selectPredictEnabledFlag } from '../../../../../Predict/selectors/featureFlags';
+import {
+  useFeatureFlag,
+  FeatureFlagNames,
+} from '../../../../../../hooks/useFeatureFlag';
 import { PredictEventValues } from '../../../../../Predict/constants/eventNames';
 import {
   MetaMetricsEvents,
@@ -231,7 +234,9 @@ export const WaysToEarn = () => {
   const navigation = useNavigation();
   const isFirstTimePerpsUser = useSelector(selectIsFirstTimePerpsUser);
   const isCardSpendEnabled = useSelector(selectRewardsCardSpendFeatureFlags);
-  const isPredictEnabled = useSelector(selectPredictEnabledFlag);
+  const isPredictEnabled = useFeatureFlag(
+    FeatureFlagNames.predictTradingEnabled,
+  );
   const isMusdDepositEnabled = useSelector(selectRewardsMusdDepositEnabledFlag);
   const { trackEvent, createEventBuilder } = useMetrics();
 
diff --git a/app/components/UI/Stake/components/StakeButton/StakeButton.test.tsx b/app/components/UI/Stake/components/StakeButton/StakeButton.test.tsx
index db0c3c2fdd11..22040519791f 100644
--- a/app/components/UI/Stake/components/StakeButton/StakeButton.test.tsx
+++ b/app/components/UI/Stake/components/StakeButton/StakeButton.test.tsx
@@ -16,15 +16,17 @@ import useStakingEligibility from '../../hooks/useStakingEligibility';
 import { RootState } from '../../../../../reducers';
 import { SolScope } from '@metamask/keyring-api';
 import Engine from '../../../../../core/Engine';
-import {
-  selectPooledStakingEnabledFlag,
-  selectStablecoinLendingEnabledFlag,
-} from '../../../Earn/selectors/featureFlags';
+import { selectStablecoinLendingEnabledFlag } from '../../../Earn/selectors/featureFlags';
+import { useFeatureFlag } from '../../../../../components/hooks/useFeatureFlag';
 import { TokenI } from '../../../Tokens/types';
 import { EARN_EXPERIENCES } from '../../../Earn/constants/experiences';
 
 const mockNavigate = jest.fn();
 
+const mockUseFeatureFlag = useFeatureFlag as jest.MockedFunction<
+  typeof useFeatureFlag
+>;
+
 const MOCK_APR_VALUES: { [symbol: string]: string } = {
   Ethereum: '2.3',
   USDC: '4.5',
@@ -81,10 +83,19 @@ jest.mock('../../../../../util/environment', () => ({
 
 // Mock the feature flags selector
 jest.mock('../../../Earn/selectors/featureFlags', () => ({
-  selectPooledStakingEnabledFlag: jest.fn().mockReturnValue(true),
   selectStablecoinLendingEnabledFlag: jest.fn().mockReturnValue(true),
 }));
 
+jest.mock('../../../../../components/hooks/useFeatureFlag', () => {
+  const actual = jest.requireActual(
+    '../../../../../components/hooks/useFeatureFlag',
+  );
+  return {
+    useFeatureFlag: jest.fn().mockReturnValue(true),
+    FeatureFlagNames: actual.FeatureFlagNames,
+  };
+});
+
 jest.mock('../../../../../selectors/earnController/earn', () => {
   const { EARN_EXPERIENCES } = jest.requireActual(
     '../../../Earn/constants/experiences',
@@ -331,11 +342,7 @@ describe('StakeButton', () => {
   });
 
   it('does not render button when all earn experiences are disabled', () => {
-    (
-      selectPooledStakingEnabledFlag as jest.MockedFunction<
-        typeof selectPooledStakingEnabledFlag
-      >
-    ).mockReturnValue(false);
+    mockUseFeatureFlag.mockReturnValue(false);
     (
       selectStablecoinLendingEnabledFlag as jest.MockedFunction<
         typeof selectStablecoinLendingEnabledFlag
@@ -348,11 +355,7 @@ describe('StakeButton', () => {
   });
 
   it('does not render button when all pooled staking experience is disabled and token is ETH', () => {
-    (
-      selectPooledStakingEnabledFlag as jest.MockedFunction<
-        typeof selectPooledStakingEnabledFlag
-      >
-    ).mockReturnValue(false);
+    mockUseFeatureFlag.mockReturnValue(false);
     (
       selectStablecoinLendingEnabledFlag as jest.MockedFunction<
         typeof selectStablecoinLendingEnabledFlag
diff --git a/app/components/UI/Stake/components/StakeButton/index.tsx b/app/components/UI/Stake/components/StakeButton/index.tsx
index 4b6865c2c26b..543493ccd77e 100644
--- a/app/components/UI/Stake/components/StakeButton/index.tsx
+++ b/app/components/UI/Stake/components/StakeButton/index.tsx
@@ -22,10 +22,11 @@ import { useTheme } from '../../../../../util/theme';
 import { MetaMetricsEvents, useMetrics } from '../../../../hooks/useMetrics';
 import { EARN_EXPERIENCES } from '../../../Earn/constants/experiences';
 import useEarnTokens from '../../../Earn/hooks/useEarnTokens';
+import { selectStablecoinLendingEnabledFlag } from '../../../Earn/selectors/featureFlags';
 import {
-  selectPooledStakingEnabledFlag,
-  selectStablecoinLendingEnabledFlag,
-} from '../../../Earn/selectors/featureFlags';
+  useFeatureFlag,
+  FeatureFlagNames,
+} from '../../../../../components/hooks/useFeatureFlag';
 import createStyles from '../../../Tokens/styles';
 import { BrowserTab, TokenI } from '../../../Tokens/types';
 import { EVENT_LOCATIONS } from '../../constants/events';
@@ -53,7 +54,9 @@ const StakeButtonContent = ({ asset }: StakeButtonProps) => {
   const { isEligible } = useStakingEligibility();
   const { isStakingSupportedChain } = useStakingChain();
 
-  const isPooledStakingEnabled = useSelector(selectPooledStakingEnabledFlag);
+  const isPooledStakingEnabled = useFeatureFlag(
+    FeatureFlagNames.earnPooledStakingEnabled,
+  );
   const isStablecoinLendingEnabled = useSelector(
     selectStablecoinLendingEnabledFlag,
   );
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx b/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx
index 5d0530865d09..b726e39c9003 100644
--- a/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx
+++ b/app/components/UI/Stake/components/StakingBalance/StakingBalance.test.tsx
@@ -21,7 +21,10 @@ import {
   getMockUseEarnTokens,
 } from '../../../Earn/__mocks__/earnMockData';
 import { EARN_EXPERIENCES } from '../../../Earn/constants/experiences';
-import { selectPooledStakingEnabledFlag } from '../../../Earn/selectors/featureFlags';
+import {
+  useFeatureFlag,
+  FeatureFlagNames,
+} from '../../../../../components/hooks/useFeatureFlag';
 import { TokenI } from '../../../Tokens/types';
 
 const mockEarnTokenPair = getMockUseEarnTokens(EARN_EXPERIENCES.POOLED_STAKING);
@@ -49,8 +52,8 @@ jest.mock('../../../../../selectors/earnController', () => ({
   },
 }));
 
-type MockSelectPooledStakingEnabledFlagSelector = jest.MockedFunction<
-  typeof selectPooledStakingEnabledFlag
+const mockUseFeatureFlag = useFeatureFlag as jest.MockedFunction<
+  typeof useFeatureFlag
 >;
 
 const MOCK_ADDRESS_1 = '0x0';
@@ -177,13 +180,23 @@ jest.mock('../../../../../core/Engine', () => ({
 }));
 
 jest.mock('../../../Earn/selectors/featureFlags', () => ({
-  selectPooledStakingEnabledFlag: jest.fn(),
+  selectPooledStakingEnabledFlag: jest.fn().mockReturnValue(true),
   selectStablecoinLendingEnabledFlag: jest.fn(),
   selectPooledStakingServiceInterruptionBannerEnabledFlag: jest
     .fn()
     .mockReturnValue(false),
 }));
 
+jest.mock('../../../../../components/hooks/useFeatureFlag', () => {
+  const actual = jest.requireActual(
+    '../../../../../components/hooks/useFeatureFlag',
+  );
+  return {
+    ...actual,
+    useFeatureFlag: jest.fn(),
+  };
+});
+
 afterEach(() => {
   jest.clearAllMocks();
 });
@@ -191,9 +204,12 @@ afterEach(() => {
 describe('StakingBalance', () => {
   beforeEach(() => {
     jest.resetAllMocks();
-    (
-      selectPooledStakingEnabledFlag as MockSelectPooledStakingEnabledFlagSelector
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.earnPooledStakingEnabled) {
+        return true;
+      }
+      return false;
+    });
     (earnSelectors.selectEarnToken as unknown as jest.Mock).mockImplementation(
       (_token: TokenI) => {
         const experienceType =
@@ -296,9 +312,12 @@ describe('StakingBalance', () => {
   });
 
   it('should not render stake cta if pooled staking is disabled', () => {
-    (
-      selectPooledStakingEnabledFlag as MockSelectPooledStakingEnabledFlagSelector
-    ).mockReturnValue(false);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.earnPooledStakingEnabled) {
+        return false;
+      }
+      return false;
+    });
 
     const { getByText, getByTestId, queryByText } = renderWithProvider(
       <StakingBalance asset={MOCK_STAKED_ETH_MAINNET_ASSET} />,
@@ -345,9 +364,12 @@ describe('StakingBalance', () => {
 
   // We don't want to prevent users from withdrawing their ETH regardless of feature flags.
   it('should render unstake and claim buttons even if pooled-staking feature flag is disabled', () => {
-    (
-      selectPooledStakingEnabledFlag as MockSelectPooledStakingEnabledFlagSelector
-    ).mockReturnValue(false);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.earnPooledStakingEnabled) {
+        return false;
+      }
+      return false;
+    });
 
     const { getByText, getByTestId, queryByText } = renderWithProvider(
       <StakingBalance asset={MOCK_STAKED_ETH_MAINNET_ASSET} />,
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingBalance.tsx b/app/components/UI/Stake/components/StakingBalance/StakingBalance.tsx
index e7ea338cb23a..b6e6165ce939 100644
--- a/app/components/UI/Stake/components/StakingBalance/StakingBalance.tsx
+++ b/app/components/UI/Stake/components/StakingBalance/StakingBalance.tsx
@@ -49,7 +49,10 @@ import UnstakingBanner from './StakingBanners/UnstakeBanner/UnstakeBanner';
 import StakingButtons from './StakingButtons/StakingButtons';
 import StakingCta from './StakingCta/StakingCta';
 import { filterExitRequests } from './utils';
-import { selectPooledStakingEnabledFlag } from '../../../Earn/selectors/featureFlags';
+import {
+  useFeatureFlag,
+  FeatureFlagNames,
+} from '../../../../../components/hooks/useFeatureFlag';
 import PercentageChange from '../../../../../component-library/components-temp/Price/PercentageChange';
 import { useTokenPricePercentageChange } from '../../../Tokens/hooks/useTokenPricePercentageChange';
 import StakingEarnings from '../StakingEarnings';
@@ -70,7 +73,9 @@ const StakingBalanceContent = ({ asset }: StakingBalanceProps) => {
     selectNetworkConfigurationByChainId(state, asset.chainId as Hex),
   );
 
-  const isPooledStakingEnabled = useSelector(selectPooledStakingEnabledFlag);
+  const isPooledStakingEnabled = useFeatureFlag(
+    FeatureFlagNames.earnPooledStakingEnabled,
+  );
 
   const { isEligible: isEligibleForPooledStaking } = useStakingEligibility();
 
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingButtons/StakingButtons.test.tsx b/app/components/UI/Stake/components/StakingBalance/StakingButtons/StakingButtons.test.tsx
index baedbfff2a8f..c510617e64ce 100644
--- a/app/components/UI/Stake/components/StakingBalance/StakingButtons/StakingButtons.test.tsx
+++ b/app/components/UI/Stake/components/StakingBalance/StakingButtons/StakingButtons.test.tsx
@@ -16,18 +16,16 @@ import {
   ParamListBase,
 } from '@react-navigation/native';
 import { MOCK_ETH_MAINNET_ASSET } from '../../../__mocks__/stakeMockData';
-import {
-  selectPooledStakingEnabledFlag,
-  selectStablecoinLendingEnabledFlag,
-} from '../../../../Earn/selectors/featureFlags';
+import { selectStablecoinLendingEnabledFlag } from '../../../../Earn/selectors/featureFlags';
+import { useFeatureFlag } from '../../../../../../components/hooks/useFeatureFlag';
 import { TokenI } from '../../../../Tokens/types';
 import { EARN_EXPERIENCES } from '../../../../Earn/constants/experiences';
 import { getMockUseEarnTokens } from '../../../../Earn/__mocks__/earnMockData';
 
 const mockEarnTokenPair = getMockUseEarnTokens(EARN_EXPERIENCES.POOLED_STAKING);
 
-type MockSelectPooledStakingEnabledFlagSelector = jest.MockedFunction<
-  typeof selectPooledStakingEnabledFlag
+const mockUseFeatureFlag = useFeatureFlag as jest.MockedFunction<
+  typeof useFeatureFlag
 >;
 
 const MOCK_APR_VALUES: { [symbol: string]: string } = {
@@ -79,10 +77,27 @@ jest.mock('@react-navigation/native', () => ({
 }));
 
 jest.mock('../../../../Earn/selectors/featureFlags', () => ({
-  selectPooledStakingEnabledFlag: jest.fn(),
+  selectPooledStakingEnabledFlag: jest.fn().mockReturnValue(true),
   selectStablecoinLendingEnabledFlag: jest.fn(),
 }));
 
+jest.mock('../../../../../../components/hooks/useFeatureFlag', () => {
+  const actual = jest.requireActual(
+    '../../../../../../components/hooks/useFeatureFlag',
+  );
+  return {
+    useFeatureFlag: jest.fn().mockReturnValue(true),
+    FeatureFlagNames: actual.FeatureFlagNames,
+  };
+});
+
+jest.mock('../../../../../../components/hooks/useFeatureFlag', () => ({
+  useFeatureFlag: jest.fn(),
+  FeatureFlagNames: {
+    earnPooledStakingEnabled: 'earnPooledStakingEnabled',
+  },
+}));
+
 jest.mock('../../../../../../core/Engine', () => ({
   context: {
     NetworkController: {
@@ -141,9 +156,7 @@ describe('StakingButtons', () => {
       dispatch: jest.fn(),
     } as unknown as NavigationProp<ParamListBase>);
 
-    (
-      selectPooledStakingEnabledFlag as MockSelectPooledStakingEnabledFlagSelector
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockReturnValue(true);
     (
       selectStablecoinLendingEnabledFlag as jest.MockedFunction<
         typeof selectStablecoinLendingEnabledFlag
@@ -166,9 +179,7 @@ describe('StakingButtons', () => {
   });
 
   it('should not render stake/stake more button if pooled staking is disabled', () => {
-    (
-      selectPooledStakingEnabledFlag as MockSelectPooledStakingEnabledFlagSelector
-    ).mockReturnValue(false);
+    mockUseFeatureFlag.mockReturnValue(false);
 
     const props = {
       style: {},
diff --git a/app/components/UI/Stake/components/StakingBalance/StakingButtons/StakingButtons.tsx b/app/components/UI/Stake/components/StakingBalance/StakingButtons/StakingButtons.tsx
index 8a02e3604e9a..e9dc7e8a54a4 100644
--- a/app/components/UI/Stake/components/StakingBalance/StakingButtons/StakingButtons.tsx
+++ b/app/components/UI/Stake/components/StakingBalance/StakingButtons/StakingButtons.tsx
@@ -13,7 +13,10 @@ import { RootState } from '../../../../../../reducers';
 import { earnSelectors } from '../../../../../../selectors/earnController';
 import { selectEvmChainId } from '../../../../../../selectors/networkController';
 import { MetaMetricsEvents, useMetrics } from '../../../../../hooks/useMetrics';
-import { selectPooledStakingEnabledFlag } from '../../../../Earn/selectors/featureFlags';
+import {
+  useFeatureFlag,
+  FeatureFlagNames,
+} from '../../../../../../components/hooks/useFeatureFlag';
 import { TokenI } from '../../../../Tokens/types';
 import { EVENT_LOCATIONS } from '../../../constants/events';
 import useStakingChain from '../../../hooks/useStakingChain';
@@ -39,7 +42,9 @@ const StakingButtons = ({
   const { trackEvent, createEventBuilder } = useMetrics();
 
   const chainId = useSelector(selectEvmChainId);
-  const isPooledStakingEnabled = useSelector(selectPooledStakingEnabledFlag);
+  const isPooledStakingEnabled = useFeatureFlag(
+    FeatureFlagNames.earnPooledStakingEnabled,
+  ) as boolean;
 
   const { isStakingSupportedChain } = useStakingChain();
 
diff --git a/app/components/Views/ActivityView/index.js b/app/components/Views/ActivityView/index.js
index 52e238d57ea5..3c0baddb27d8 100644
--- a/app/components/Views/ActivityView/index.js
+++ b/app/components/Views/ActivityView/index.js
@@ -52,8 +52,7 @@ import { useTheme } from '../../../util/theme';
 import TabBar from '../../Base/TabBar';
 import { getTransactionsNavbarOptions } from '../../UI/Navbar';
 import { createNetworkManagerNavDetails } from '../../UI/NetworkManager';
-import { selectPerpsEnabledFlag } from '../../UI/Perps';
-import { selectPredictEnabledFlag } from '../../UI/Predict/selectors/featureFlags';
+import { useFeatureFlag, FeatureFlagNames } from '../../hooks/useFeatureFlag';
 import PredictTransactionsView from '../../UI/Predict/views/PredictTransactionsView/PredictTransactionsView';
 import PerpsTransactionsView from '../../UI/Perps/Views/PerpsTransactionsView';
 import { PerpsConnectionProvider } from '../../UI/Perps/providers/PerpsConnectionProvider';
@@ -176,13 +175,17 @@ const ActivityView = () => {
 
   const tabViewRef = useRef();
   const params = useParams();
-  const perpsEnabledFlag = useSelector(selectPerpsEnabledFlag);
+  const perpsEnabledFlag = useFeatureFlag(
+    FeatureFlagNames.perpsPerpTradingEnabled,
+  );
   const isPerpsEnabled = useMemo(
     () => perpsEnabledFlag && isEvmSelected,
     [perpsEnabledFlag, isEvmSelected],
   );
   const [activeTabIndex, setActiveTabIndex] = useState(0);
-  const predictEnabledFlag = useSelector(selectPredictEnabledFlag);
+  const predictEnabledFlag = useFeatureFlag(
+    FeatureFlagNames.predictTradingEnabled,
+  );
   const isPredictEnabled = useMemo(
     () => predictEnabledFlag,
     [predictEnabledFlag],
diff --git a/app/components/Views/Asset/index.js b/app/components/Views/Asset/index.js
index 5276f89edf76..d39c8ba83403 100644
--- a/app/components/Views/Asset/index.js
+++ b/app/components/Views/Asset/index.js
@@ -292,10 +292,6 @@ class Asset extends PureComponent {
       this.checkLiveness(tokenChainId);
     }
 
-    InteractionManager.runAfterInteractions(() => {
-      this.normalizeTransactions();
-      this.mounted = true;
-    });
     this.navSymbol = (this.props.route.params?.symbol ?? '').toLowerCase();
     this.navAddress = (this.props.route.params?.address ?? '').toLowerCase();
 
@@ -304,6 +300,9 @@ class Asset extends PureComponent {
     } else {
       this.filter = this.ethFilter;
     }
+
+    this.normalizeTransactions();
+    this.mounted = true;
   }
 
   componentDidUpdate(prevProps) {
diff --git a/app/components/Views/FeatureFlagOverride/FeatureFlagOverride.test.tsx b/app/components/Views/FeatureFlagOverride/FeatureFlagOverride.test.tsx
index 8ece0d1a6508..a1df559fd280 100644
--- a/app/components/Views/FeatureFlagOverride/FeatureFlagOverride.test.tsx
+++ b/app/components/Views/FeatureFlagOverride/FeatureFlagOverride.test.tsx
@@ -10,7 +10,6 @@ import {
   FeatureFlagInfo,
   isMinimumRequiredVersionSupported,
 } from '../../../util/feature-flags';
-import { FeatureFlagNames } from '../../hooks/useFeatureFlag';
 
 // Mock all dependencies
 jest.mock('@react-navigation/native', () => ({
@@ -76,6 +75,18 @@ jest.mock('../../../util/feature-flags', () => ({
   isMinimumRequiredVersionSupported: jest.fn(),
 }));
 
+// Mock FeatureFlagNames to include testFlag for testing
+jest.mock('../../hooks/useFeatureFlag', () => {
+  const actual = jest.requireActual('../../hooks/useFeatureFlag');
+  return {
+    ...actual,
+    FeatureFlagNames: {
+      ...actual.FeatureFlagNames,
+      testFlag: 'testFlag',
+    },
+  };
+});
+
 describe('FeatureFlagOverride', () => {
   let mockNavigation: ReturnType<typeof useNavigation>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -659,7 +670,7 @@ describe('FeatureFlagOverride', () => {
       (isMinimumRequiredVersionSupported as jest.Mock).mockReturnValue(false);
 
       const versionFlag = createMockFeatureFlag(
-        FeatureFlagNames.rewardsEnabled,
+        'testFlag',
         'boolean with minimumVersion',
         {
           enabled: true,
@@ -787,13 +798,7 @@ describe('FeatureFlagOverride', () => {
         setOverride: jest.fn(),
         removeOverride: jest.fn(),
         clearAllOverrides: jest.fn(),
-        featureFlagsList: [
-          createMockFeatureFlag(
-            FeatureFlagNames.rewardsEnabled,
-            'boolean',
-            false,
-          ),
-        ],
+        featureFlagsList: [createMockFeatureFlag('testFlag', 'boolean', false)],
       });
 
       render(<FeatureFlagOverride />);
diff --git a/app/components/Views/ResetPassword/index.js b/app/components/Views/ResetPassword/index.js
index 4861199216e6..e7595bf24c3d 100644
--- a/app/components/Views/ResetPassword/index.js
+++ b/app/components/Views/ResetPassword/index.js
@@ -548,7 +548,7 @@ class ResetPassword extends PureComponent {
           this.state.biometryChoice,
           this.state.rememberMe,
         );
-        await Authentication.storePassword(password, authData.currentAuthType);
+        await Authentication.storePasswordWithFallback(password, authData);
       } catch (error) {
         Logger.error(error);
       }
diff --git a/app/components/Views/Settings/DeveloperOptions/index.test.tsx b/app/components/Views/Settings/DeveloperOptions/index.test.tsx
index 85004da0e626..ac3b93bc9693 100644
--- a/app/components/Views/Settings/DeveloperOptions/index.test.tsx
+++ b/app/components/Views/Settings/DeveloperOptions/index.test.tsx
@@ -1,15 +1,24 @@
 import { backgroundState } from '../../../../util/test/initial-root-state';
 import DeveloperOptions from './';
 import { renderScreen } from '../../../../util/test/renderWithProvider';
-
-const mockSelectPerpsEnabledFlag = jest.fn();
-
-jest.mock('../../../UI/Perps/selectors/featureFlags', () => ({
-  selectPerpsEnabledFlag: () => mockSelectPerpsEnabledFlag(),
-}));
+import {
+  useFeatureFlag,
+  FeatureFlagNames,
+} from '../../../hooks/useFeatureFlag';
+
+const mockUseFeatureFlag = useFeatureFlag as jest.MockedFunction<
+  typeof useFeatureFlag
+>;
+
+jest.mock('../../../hooks/useFeatureFlag', () => {
+  const actual = jest.requireActual('../../../hooks/useFeatureFlag');
+  return {
+    ...actual,
+    useFeatureFlag: jest.fn(),
+  };
+});
 
 const initialState = {
-  DeveloperOptions: {},
   engine: {
     backgroundState,
   },
@@ -18,7 +27,12 @@ const initialState = {
 describe('DeveloperOptions', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    mockSelectPerpsEnabledFlag.mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.perpsPerpTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
   });
 
   it('renders correctly', () => {
@@ -31,7 +45,12 @@ describe('DeveloperOptions', () => {
   });
 
   it('does not render PerpsDeveloperOptionsSection when Perps is not enabled', () => {
-    mockSelectPerpsEnabledFlag.mockReturnValue(false);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.perpsPerpTradingEnabled) {
+        return false;
+      }
+      return false;
+    });
 
     const { queryByText } = renderScreen(
       DeveloperOptions,
diff --git a/app/components/Views/Settings/DeveloperOptions/index.tsx b/app/components/Views/Settings/DeveloperOptions/index.tsx
index fa84445ad7ec..a2887c200621 100644
--- a/app/components/Views/Settings/DeveloperOptions/index.tsx
+++ b/app/components/Views/Settings/DeveloperOptions/index.tsx
@@ -13,8 +13,10 @@ import SentryTest from './SentryTest';
 import SampleFeatureDevSettingsEntryPoint from '../../../../features/SampleFeature/components/views/SampleFeatureDevSettingsEntryPoint/SampleFeatureDevSettingsEntryPoint';
 ///: END:ONLY_INCLUDE_IF
 import { PerpsDeveloperOptionsSection } from '../../../UI/Perps/components/PerpsDeveloperOptionsSection/PerpsDeveloperOptionsSection';
-import { useSelector } from 'react-redux';
-import { selectPerpsEnabledFlag } from '../../../UI/Perps';
+import {
+  useFeatureFlag,
+  FeatureFlagNames,
+} from '../../../hooks/useFeatureFlag';
 import { ConfirmationsDeveloperOptions } from '../../confirmations/components/developer/confirmations-developer-options';
 
 const DeveloperOptions = () => {
@@ -26,7 +28,9 @@ const DeveloperOptions = () => {
   const { colors } = theme;
   const { styles } = useStyles(styleSheet, { theme });
 
-  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
+  const isPerpsEnabled = useFeatureFlag(
+    FeatureFlagNames.perpsPerpTradingEnabled,
+  ) as boolean;
 
   useEffect(
     () => {
diff --git a/app/components/Views/Settings/NotificationsSettings/PushNotificationToggle.hooks.test.tsx b/app/components/Views/Settings/NotificationsSettings/PushNotificationToggle.hooks.test.tsx
index a7ee574997ab..e145556f5642 100644
--- a/app/components/Views/Settings/NotificationsSettings/PushNotificationToggle.hooks.test.tsx
+++ b/app/components/Views/Settings/NotificationsSettings/PushNotificationToggle.hooks.test.tsx
@@ -1,12 +1,23 @@
 import { renderHook, act } from '@testing-library/react-hooks';
 // eslint-disable-next-line import/no-namespace
 import * as PushNotificationsHooks from '../../../../util/notifications/hooks/usePushNotifications';
+// eslint-disable-next-line import/no-namespace
+import * as NotificationService from '../../../../util/notifications/services/NotificationService';
 import { usePushNotificationSettingsToggle } from './PushNotificationToggle.hooks';
 
 describe('usePushNotificationSettingsToggle', () => {
+  beforeEach(() => jest.resetAllMocks());
+
   const arrange = () => {
     const mockTogglePushNotification = jest.fn();
-
+    const mockGetPushPermission = jest.spyOn(
+      NotificationService,
+      'getPushPermission',
+    );
+    const mockOpenNotificationSettings = jest.spyOn(
+      NotificationService.default,
+      'openSystemSettings',
+    );
     jest
       .spyOn(PushNotificationsHooks, 'usePushNotificationsToggle')
       .mockReturnValue({
@@ -17,16 +28,40 @@ describe('usePushNotificationSettingsToggle', () => {
 
     const hook = renderHook(() => usePushNotificationSettingsToggle());
 
-    return { hook, mockTogglePushNotification };
+    return {
+      hook,
+      mockTogglePushNotification,
+      mockGetPushPermission,
+      mockOpenNotificationSettings,
+    };
   };
 
   it('toggles the push notification setting', async () => {
-    const { hook, mockTogglePushNotification } = arrange();
-
+    const { hook, mockTogglePushNotification, mockGetPushPermission } =
+      arrange();
+    mockGetPushPermission.mockResolvedValue('authorized');
     await act(async () => {
       hook.result.current.onToggle();
     });
 
     expect(mockTogglePushNotification).toHaveBeenCalled();
   });
+
+  it('opens settings if permission is denied', async () => {
+    const {
+      hook,
+      mockGetPushPermission,
+      mockOpenNotificationSettings,
+      mockTogglePushNotification,
+    } = arrange();
+    mockGetPushPermission.mockResolvedValue('denied');
+    await act(async () => {
+      hook.result.current.onToggle();
+    });
+
+    // Assert - opens settings
+    expect(mockOpenNotificationSettings).toHaveBeenCalled();
+    // Assert - was not toggled as a user needs to complete settings action
+    expect(mockTogglePushNotification).not.toHaveBeenCalled();
+  });
 });
diff --git a/app/components/Views/Settings/NotificationsSettings/PushNotificationToggle.hooks.tsx b/app/components/Views/Settings/NotificationsSettings/PushNotificationToggle.hooks.tsx
index 57d0ff49e31d..c550ddd74855 100644
--- a/app/components/Views/Settings/NotificationsSettings/PushNotificationToggle.hooks.tsx
+++ b/app/components/Views/Settings/NotificationsSettings/PushNotificationToggle.hooks.tsx
@@ -1,14 +1,22 @@
 import { useCallback } from 'react';
+import NotificationService, {
+  getPushPermission,
+} from '../../../../util/notifications/services/NotificationService';
 import { usePushNotificationsToggle } from '../../../../util/notifications/hooks/usePushNotifications';
 
 export function usePushNotificationSettingsToggle() {
   const { data, togglePushNotification, loading } = usePushNotificationsToggle({
     nudgeEnablePush: true,
   });
-  const onToggle = useCallback(
-    () => togglePushNotification(!data),
-    [data, togglePushNotification],
-  );
+  const onToggle = useCallback(async () => {
+    const perm = await getPushPermission();
+    if (perm === 'denied') {
+      await NotificationService.openSystemSettings();
+      return;
+    }
+
+    togglePushNotification(!data);
+  }, [data, togglePushNotification]);
   return {
     onToggle,
     value: data,
diff --git a/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx b/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx
index 60fc6a1fe204..fb3b4c0d35e9 100644
--- a/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx
+++ b/app/components/Views/TradeWalletActions/TradeWalletActions.test.tsx
@@ -14,14 +14,10 @@ import {
 } from '../../../util/test/accountsControllerTestUtils';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { mockNetworkState } from '../../../util/test/network';
-import {
-  selectPooledStakingEnabledFlag,
-  selectStablecoinLendingEnabledFlag,
-} from '../../UI/Earn/selectors/featureFlags';
+import { selectStablecoinLendingEnabledFlag } from '../../UI/Earn/selectors/featureFlags';
 import { EarnTokenDetails } from '../../UI/Earn/types/lending.types';
-import { selectPerpsEnabledFlag } from '../../UI/Perps';
 import { selectIsFirstTimePerpsUser } from '../../UI/Perps/selectors/perpsController';
-import { selectPredictEnabledFlag } from '../../UI/Predict';
+import { useFeatureFlag, FeatureFlagNames } from '../../hooks/useFeatureFlag';
 import { selectIsEvmNetworkSelected } from '../../../selectors/multichainNetworkController';
 import TradeWalletActions from './TradeWalletActions';
 
@@ -29,21 +25,21 @@ jest.mock('react-native-device-info', () => ({
   getVersion: jest.fn().mockReturnValue('1.0.0'),
 }));
 
-jest.mock('../../UI/Perps', () => ({
-  selectPerpsEnabledFlag: jest.fn(),
-}));
-
 jest.mock('../../UI/Perps/selectors/perpsController', () => ({
   selectIsFirstTimePerpsUser: jest.fn(),
 }));
 
-jest.mock('../../UI/Predict', () => ({
-  selectPredictEnabledFlag: jest.fn(),
-}));
-
 jest.mock('../../UI/Earn/selectors/featureFlags', () => ({
   selectStablecoinLendingEnabledFlag: jest.fn(),
-  selectPooledStakingEnabledFlag: jest.fn(),
+}));
+
+jest.mock('../../hooks/useFeatureFlag', () => ({
+  useFeatureFlag: jest.fn(),
+  FeatureFlagNames: {
+    perpsPerpTradingEnabled: 'perpsPerpTradingEnabled',
+    predictTradingEnabled: 'predictTradingEnabled',
+    earnPooledStakingEnabled: 'earnPooledStakingEnabled',
+  },
 }));
 
 jest.mock('../../../selectors/earnController/earn', () => ({
@@ -248,6 +244,10 @@ const mockInitialState: DeepPartial<RootState> = {
 const mockNavigate = jest.fn();
 const mockGoBack = jest.fn();
 
+const mockUseFeatureFlag = useFeatureFlag as jest.MockedFunction<
+  typeof useFeatureFlag
+>;
+
 jest.mock('@react-navigation/native', () => {
   const actualReactNavigation = jest.requireActual('@react-navigation/native');
   return {
@@ -361,11 +361,12 @@ describe('TradeWalletActions', () => {
         typeof selectStablecoinLendingEnabledFlag
       >
     ).mockReturnValue(true);
-    (
-      selectPooledStakingEnabledFlag as jest.MockedFunction<
-        typeof selectPooledStakingEnabledFlag
-      >
-    ).mockReturnValue(false);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.earnPooledStakingEnabled) {
+        return false;
+      }
+      return false;
+    });
 
     (
       earnSelectors.selectEarnTokens as jest.MockedFunction<
@@ -408,11 +409,12 @@ describe('TradeWalletActions', () => {
   });
 
   it('should render the Perpetuals button if the Perps feature flag is enabled', () => {
-    (
-      selectPerpsEnabledFlag as jest.MockedFunction<
-        typeof selectPerpsEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.perpsPerpTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
 
     const { getByTestId } = renderScreen(
       TradeWalletActions,
@@ -430,11 +432,12 @@ describe('TradeWalletActions', () => {
   });
 
   it('should render the Predict button if the Predict feature flag is enabled', () => {
-    (
-      selectPredictEnabledFlag as jest.MockedFunction<
-        typeof selectPredictEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.predictTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
 
     const { getByTestId } = renderScreen(
       TradeWalletActions,
@@ -452,11 +455,12 @@ describe('TradeWalletActions', () => {
   });
 
   it('should set up perps navigation to markets for returning users', () => {
-    (
-      selectPerpsEnabledFlag as jest.MockedFunction<
-        typeof selectPerpsEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.perpsPerpTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
     (
       selectIsFirstTimePerpsUser as jest.MockedFunction<
         typeof selectIsFirstTimePerpsUser
@@ -483,11 +487,12 @@ describe('TradeWalletActions', () => {
   });
 
   it('should set up perps navigation to tutorial for first-time users', () => {
-    (
-      selectPerpsEnabledFlag as jest.MockedFunction<
-        typeof selectPerpsEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.perpsPerpTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
     (
       selectIsFirstTimePerpsUser as jest.MockedFunction<
         typeof selectIsFirstTimePerpsUser
@@ -510,11 +515,12 @@ describe('TradeWalletActions', () => {
   });
 
   it.skip('should navigate to Predict markets when user presses Predict button', async () => {
-    (
-      selectPredictEnabledFlag as jest.MockedFunction<
-        typeof selectPredictEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.predictTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
 
     const { getByTestId } = renderScreen(
       TradeWalletActions,
@@ -551,21 +557,16 @@ describe('TradeWalletActions', () => {
         typeof selectStablecoinLendingEnabledFlag
       >
     ).mockReturnValue(true);
-    (
-      selectPooledStakingEnabledFlag as jest.MockedFunction<
-        typeof selectPooledStakingEnabledFlag
-      >
-    ).mockReturnValue(true);
-    (
-      selectPerpsEnabledFlag as jest.MockedFunction<
-        typeof selectPerpsEnabledFlag
-      >
-    ).mockReturnValue(true);
-    (
-      selectPredictEnabledFlag as jest.MockedFunction<
-        typeof selectPredictEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (
+        flagName === FeatureFlagNames.earnPooledStakingEnabled ||
+        flagName === FeatureFlagNames.perpsPerpTradingEnabled ||
+        flagName === FeatureFlagNames.predictTradingEnabled
+      ) {
+        return true;
+      }
+      return false;
+    });
     (selectCanSignTransactions as unknown as jest.Mock).mockReturnValue(false);
 
     const mockStateWithoutSigningAndStablecoinLendingEnabled: DeepPartial<RootState> =
@@ -627,12 +628,13 @@ describe('TradeWalletActions', () => {
     expect(mockOnDismiss).not.toHaveBeenCalled();
   });
 
-  it('should show Predict button on non-EVM networks', () => {
-    (
-      selectPredictEnabledFlag as jest.MockedFunction<
-        typeof selectPredictEnabledFlag
-      >
-    ).mockReturnValue(true);
+  it('should not show Predict button on non-EVM networks', () => {
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.predictTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
     (
       selectIsEvmNetworkSelected as jest.MockedFunction<
         typeof selectIsEvmNetworkSelected
diff --git a/app/components/Views/TradeWalletActions/TradeWalletActions.tsx b/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
index c613f9c4067a..e3ceefe37f4d 100644
--- a/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
+++ b/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
@@ -42,12 +42,8 @@ import {
   useSwapBridgeNavigation,
 } from '../../UI/Bridge/hooks/useSwapBridgeNavigation';
 import { EARN_INPUT_VIEW_ACTIONS } from '../../UI/Earn/Views/EarnInputView/EarnInputView.types';
-import {
-  selectPooledStakingEnabledFlag,
-  selectStablecoinLendingEnabledFlag,
-} from '../../UI/Earn/selectors/featureFlags';
-import { selectPerpsEnabledFlag } from '../../UI/Perps';
-import { selectPredictEnabledFlag } from '../../UI/Predict';
+import { selectStablecoinLendingEnabledFlag } from '../../UI/Earn/selectors/featureFlags';
+import { useFeatureFlag, FeatureFlagNames } from '../../hooks/useFeatureFlag';
 import { PredictEventValues } from '../../UI/Predict/constants/eventNames';
 import { EVENT_LOCATIONS as STAKE_EVENT_LOCATIONS } from '../../UI/Stake/constants/events';
 import { MetaMetricsEvents, useMetrics } from '../../hooks/useMetrics';
@@ -86,14 +82,20 @@ function TradeWalletActions() {
   const isSwapsEnabled = useSelector((state: RootState) =>
     selectIsSwapsEnabled(state),
   );
-  const isPooledStakingEnabled = useSelector(selectPooledStakingEnabledFlag);
+  const isPooledStakingEnabled = useFeatureFlag(
+    FeatureFlagNames.earnPooledStakingEnabled,
+  );
 
   const { trackEvent, createEventBuilder } = useMetrics();
   const navigation = useNavigation();
 
   const canSignTransactions = useSelector(selectCanSignTransactions);
-  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
-  const isPredictEnabled = useSelector(selectPredictEnabledFlag);
+  const isPerpsEnabled = useFeatureFlag(
+    FeatureFlagNames.perpsPerpTradingEnabled,
+  ) as boolean;
+  const isPredictEnabled = useFeatureFlag(
+    FeatureFlagNames.predictTradingEnabled,
+  ) as boolean;
   const isEvmSelected = useSelector(selectIsEvmNetworkSelected);
 
   const isStablecoinLendingEnabled = useSelector(
diff --git a/app/components/Views/TrendingView/ExploreSearchBar/ExploreSearchBar.tsx b/app/components/Views/TrendingView/ExploreSearchBar/ExploreSearchBar.tsx
index bc67ffb81dd2..47d6414a686b 100644
--- a/app/components/Views/TrendingView/ExploreSearchBar/ExploreSearchBar.tsx
+++ b/app/components/Views/TrendingView/ExploreSearchBar/ExploreSearchBar.tsx
@@ -101,40 +101,38 @@ const ExploreSearchBar: React.FC<ExploreSearchBarProps> = (props) => {
   );
 
   return (
-    <Box twClassName="px-4 pb-3">
-      <Box
-        flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        twClassName="gap-2"
-      >
-        {isButtonMode ? (
-          <TouchableOpacity
-            onPress={props.onPress}
-            testID="explore-view-search-button"
-            activeOpacity={0.7}
-            style={tw.style('flex-1')}
-          >
-            {searchBarContent}
-          </TouchableOpacity>
-        ) : (
-          <>
-            <Box twClassName="flex-1">{searchBarContent}</Box>
-            {props.isSearchFocused && (
-              <TouchableOpacity
-                onPress={handleCancel}
-                testID="explore-search-cancel-button"
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      alignItems={BoxAlignItems.Center}
+      twClassName="gap-2"
+    >
+      {isButtonMode ? (
+        <TouchableOpacity
+          onPress={props.onPress}
+          testID="explore-view-search-button"
+          activeOpacity={0.7}
+          style={tw.style('flex-1')}
+        >
+          {searchBarContent}
+        </TouchableOpacity>
+      ) : (
+        <>
+          <Box twClassName="flex-1">{searchBarContent}</Box>
+          {props.isSearchFocused && (
+            <TouchableOpacity
+              onPress={handleCancel}
+              testID="explore-search-cancel-button"
+            >
+              <Text
+                variant={TextVariant.BodyMd}
+                style={tw.style('text-default font-medium')}
               >
-                <Text
-                  variant={TextVariant.BodyMd}
-                  style={tw.style('text-default font-medium')}
-                >
-                  {strings('transaction.cancel')}
-                </Text>
-              </TouchableOpacity>
-            )}
-          </>
-        )}
-      </Box>
+                {strings('transaction.cancel')}
+              </Text>
+            </TouchableOpacity>
+          )}
+        </>
+      )}
     </Box>
   );
 };
diff --git a/app/components/Views/TrendingView/ExploreSearchScreen/ExploreSearchScreen.tsx b/app/components/Views/TrendingView/ExploreSearchScreen/ExploreSearchScreen.tsx
index dc9f103b3f57..ef4bc0c0cca7 100644
--- a/app/components/Views/TrendingView/ExploreSearchScreen/ExploreSearchScreen.tsx
+++ b/app/components/Views/TrendingView/ExploreSearchScreen/ExploreSearchScreen.tsx
@@ -21,13 +21,15 @@ const ExploreSearchScreen: React.FC = () => {
 
   return (
     <Box style={{ paddingTop: insets.top }} twClassName="flex-1 bg-default">
-      <ExploreSearchBar
-        type="interactive"
-        isSearchFocused
-        searchQuery={searchQuery}
-        onSearchChange={setSearchQuery}
-        onCancel={handleSearchCancel}
-      />
+      <Box twClassName="px-4 pb-3">
+        <ExploreSearchBar
+          type="interactive"
+          isSearchFocused
+          searchQuery={searchQuery}
+          onSearchChange={setSearchQuery}
+          onCancel={handleSearchCancel}
+        />
+      </Box>
 
       <PerpsConnectionProvider>
         <PerpsStreamProvider>
diff --git a/app/components/Views/TrendingView/TrendingView.test.tsx b/app/components/Views/TrendingView/TrendingView.test.tsx
index d727b9b1fd31..6ee212af7d47 100644
--- a/app/components/Views/TrendingView/TrendingView.test.tsx
+++ b/app/components/Views/TrendingView/TrendingView.test.tsx
@@ -172,6 +172,345 @@ describe('TrendingView', () => {
     expect(browserButton).toBeDefined();
   });
 
+  describe('browser button states', () => {
+    it('displays add icon when no browser tabs are open', () => {
+      mockUseSelector.mockImplementation((selector) => {
+        // Handle browser tabs count selector
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (selectorStr.includes('browser') && selectorStr.includes('tabs')) {
+            return 0;
+          }
+        }
+        // Return default mock values for other selectors
+        if (selector === selectChainId) {
+          return '0x1';
+        }
+        if (selector === selectIsEvmNetworkSelected) {
+          return true;
+        }
+        if (selector === selectEnabledNetworksByNamespace) {
+          return { eip155: { '0x1': true } };
+        }
+        if (selector === selectPopularNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectCustomNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectMultichainAccountsState2Enabled) {
+          return false;
+        }
+        if (selector === selectSelectedInternalAccountByScope) {
+          return (_scope: string) => null;
+        }
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (
+            selectorStr.includes('selectSelectedInternalAccountByScope') ||
+            selectorStr.includes('SelectedInternalAccountByScope')
+          ) {
+            return (_scope: string) => null;
+          }
+        }
+        return undefined;
+      });
+
+      const { getByTestId, queryByText } = render(
+        <NavigationContainer>
+          <TrendingView />
+        </NavigationContainer>,
+      );
+
+      const browserButton = getByTestId('trending-view-browser-button');
+
+      expect(browserButton).toBeDefined();
+      expect(queryByText(/^\d+$/)).toBeNull();
+    });
+
+    it('displays tab count when one browser tab is open', () => {
+      mockUseSelector.mockImplementation((selector) => {
+        // Handle browser tabs count selector
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (selectorStr.includes('browser') && selectorStr.includes('tabs')) {
+            return 1;
+          }
+        }
+        // Return default mock values for other selectors
+        if (selector === selectChainId) {
+          return '0x1';
+        }
+        if (selector === selectIsEvmNetworkSelected) {
+          return true;
+        }
+        if (selector === selectEnabledNetworksByNamespace) {
+          return { eip155: { '0x1': true } };
+        }
+        if (selector === selectPopularNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectCustomNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectMultichainAccountsState2Enabled) {
+          return false;
+        }
+        if (selector === selectSelectedInternalAccountByScope) {
+          return (_scope: string) => null;
+        }
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (
+            selectorStr.includes('selectSelectedInternalAccountByScope') ||
+            selectorStr.includes('SelectedInternalAccountByScope')
+          ) {
+            return (_scope: string) => null;
+          }
+        }
+        return undefined;
+      });
+
+      const { getByText } = render(
+        <NavigationContainer>
+          <TrendingView />
+        </NavigationContainer>,
+      );
+
+      expect(getByText('1')).toBeDefined();
+    });
+
+    it('displays tab count when multiple browser tabs are open', () => {
+      mockUseSelector.mockImplementation((selector) => {
+        // Handle browser tabs count selector
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (selectorStr.includes('browser') && selectorStr.includes('tabs')) {
+            return 5;
+          }
+        }
+        // Return default mock values for other selectors
+        if (selector === selectChainId) {
+          return '0x1';
+        }
+        if (selector === selectIsEvmNetworkSelected) {
+          return true;
+        }
+        if (selector === selectEnabledNetworksByNamespace) {
+          return { eip155: { '0x1': true } };
+        }
+        if (selector === selectPopularNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectCustomNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectMultichainAccountsState2Enabled) {
+          return false;
+        }
+        if (selector === selectSelectedInternalAccountByScope) {
+          return (_scope: string) => null;
+        }
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (
+            selectorStr.includes('selectSelectedInternalAccountByScope') ||
+            selectorStr.includes('SelectedInternalAccountByScope')
+          ) {
+            return (_scope: string) => null;
+          }
+        }
+        return undefined;
+      });
+
+      const { getByText } = render(
+        <NavigationContainer>
+          <TrendingView />
+        </NavigationContainer>,
+      );
+
+      expect(getByText('5')).toBeDefined();
+    });
+
+    it('displays tab count when many browser tabs are open', () => {
+      mockUseSelector.mockImplementation((selector) => {
+        // Handle browser tabs count selector
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (selectorStr.includes('browser') && selectorStr.includes('tabs')) {
+            return 99;
+          }
+        }
+        // Return default mock values for other selectors
+        if (selector === selectChainId) {
+          return '0x1';
+        }
+        if (selector === selectIsEvmNetworkSelected) {
+          return true;
+        }
+        if (selector === selectEnabledNetworksByNamespace) {
+          return { eip155: { '0x1': true } };
+        }
+        if (selector === selectPopularNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectCustomNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectMultichainAccountsState2Enabled) {
+          return false;
+        }
+        if (selector === selectSelectedInternalAccountByScope) {
+          return (_scope: string) => null;
+        }
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (
+            selectorStr.includes('selectSelectedInternalAccountByScope') ||
+            selectorStr.includes('SelectedInternalAccountByScope')
+          ) {
+            return (_scope: string) => null;
+          }
+        }
+        return undefined;
+      });
+
+      const { getByText } = render(
+        <NavigationContainer>
+          <TrendingView />
+        </NavigationContainer>,
+      );
+
+      expect(getByText('99')).toBeDefined();
+    });
+
+    it('navigates to TrendingBrowser when button is pressed with no tabs', () => {
+      mockUseSelector.mockImplementation((selector) => {
+        // Handle browser tabs count selector
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (selectorStr.includes('browser') && selectorStr.includes('tabs')) {
+            return 0;
+          }
+          if (selectorStr.includes('dataCollectionForMarketing')) {
+            return false;
+          }
+        }
+        // Return default mock values for other selectors
+        if (selector === selectChainId) {
+          return '0x1';
+        }
+        if (selector === selectIsEvmNetworkSelected) {
+          return true;
+        }
+        if (selector === selectEnabledNetworksByNamespace) {
+          return { eip155: { '0x1': true } };
+        }
+        if (selector === selectPopularNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectCustomNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectMultichainAccountsState2Enabled) {
+          return false;
+        }
+        if (selector === selectSelectedInternalAccountByScope) {
+          return (_scope: string) => null;
+        }
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (
+            selectorStr.includes('selectSelectedInternalAccountByScope') ||
+            selectorStr.includes('SelectedInternalAccountByScope')
+          ) {
+            return (_scope: string) => null;
+          }
+        }
+        return undefined;
+      });
+
+      const { getByTestId } = render(
+        <NavigationContainer>
+          <TrendingView />
+        </NavigationContainer>,
+      );
+
+      const browserButton = getByTestId('trending-view-browser-button');
+      fireEvent.press(browserButton);
+
+      expect(mockNavigate).toHaveBeenCalledWith('TrendingBrowser', {
+        newTabUrl: expect.stringContaining('?metamaskEntry=mobile'),
+        timestamp: expect.any(Number),
+        fromTrending: true,
+      });
+      expect(updateLastTrendingScreen).toHaveBeenCalledWith('TrendingBrowser');
+    });
+
+    it('navigates to TrendingBrowser when button is pressed with existing tabs', () => {
+      mockUseSelector.mockImplementation((selector) => {
+        // Handle browser tabs count selector
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (selectorStr.includes('browser') && selectorStr.includes('tabs')) {
+            return 3;
+          }
+          if (selectorStr.includes('dataCollectionForMarketing')) {
+            return false;
+          }
+        }
+        // Return default mock values for other selectors
+        if (selector === selectChainId) {
+          return '0x1';
+        }
+        if (selector === selectIsEvmNetworkSelected) {
+          return true;
+        }
+        if (selector === selectEnabledNetworksByNamespace) {
+          return { eip155: { '0x1': true } };
+        }
+        if (selector === selectPopularNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectCustomNetworkConfigurationsByCaipChainId) {
+          return [];
+        }
+        if (selector === selectMultichainAccountsState2Enabled) {
+          return false;
+        }
+        if (selector === selectSelectedInternalAccountByScope) {
+          return (_scope: string) => null;
+        }
+        if (typeof selector === 'function') {
+          const selectorStr = selector.toString();
+          if (
+            selectorStr.includes('selectSelectedInternalAccountByScope') ||
+            selectorStr.includes('SelectedInternalAccountByScope')
+          ) {
+            return (_scope: string) => null;
+          }
+        }
+        return undefined;
+      });
+
+      const { getByTestId } = render(
+        <NavigationContainer>
+          <TrendingView />
+        </NavigationContainer>,
+      );
+
+      const browserButton = getByTestId('trending-view-browser-button');
+      fireEvent.press(browserButton);
+
+      expect(mockNavigate).toHaveBeenCalledWith('TrendingBrowser', {
+        newTabUrl: expect.stringContaining('?metamaskEntry=mobile'),
+        timestamp: expect.any(Number),
+        fromTrending: true,
+      });
+      expect(updateLastTrendingScreen).toHaveBeenCalledWith('TrendingBrowser');
+    });
+  });
+
   it('renders title in header', () => {
     const { getByText } = render(
       <NavigationContainer>
diff --git a/app/components/Views/TrendingView/TrendingView.tsx b/app/components/Views/TrendingView/TrendingView.tsx
index 93d69fecae7b..a7685473bc2c 100644
--- a/app/components/Views/TrendingView/TrendingView.tsx
+++ b/app/components/Views/TrendingView/TrendingView.tsx
@@ -6,7 +6,6 @@ import { useSelector } from 'react-redux';
 import { createStackNavigator } from '@react-navigation/stack';
 import {
   Box,
-  BoxFlexDirection,
   Text,
   TextVariant,
   ButtonIcon,
@@ -17,6 +16,7 @@ import { strings } from '../../../../locales/i18n';
 import AppConstants from '../../../core/AppConstants';
 import { appendURLParams } from '../../../util/browser';
 import { useMetrics } from '../../hooks/useMetrics';
+import { useTheme } from '../../../util/theme';
 import Browser from '../Browser';
 import Routes from '../../../constants/navigation/Routes';
 import {
@@ -35,6 +35,7 @@ import PredictBuyPreview from '../../UI/Predict/views/PredictBuyPreview/PredictB
 import QuickActions from './components/QuickActions/QuickActions';
 import SectionHeader from './components/SectionHeader/SectionHeader';
 import { HOME_SECTIONS_ARRAY } from './config/sections.config';
+import ButtonLink from '../../../component-library/components/Buttons/Button/variants/ButtonLink';
 
 const Stack = createStackNavigator();
 
@@ -74,6 +75,7 @@ const TrendingFeed: React.FC = () => {
   const insets = useSafeAreaInsets();
   const navigation = useNavigation();
   const { isEnabled } = useMetrics();
+  const { colors } = useTheme();
 
   // Update state when returning to TrendingFeed
   useEffect(() => {
@@ -89,6 +91,10 @@ const TrendingFeed: React.FC = () => {
       state.security.dataCollectionForMarketing,
   );
 
+  const browserTabsCount = useSelector(
+    (state: { browser: { tabs: unknown[] } }) => state.browser.tabs.length,
+  );
+
   const portfolioUrl = appendURLParams(AppConstants.PORTFOLIO.URL, {
     metamaskEntry: 'mobile',
     metricsEnabled: isEnabled(),
@@ -110,23 +116,42 @@ const TrendingFeed: React.FC = () => {
 
   return (
     <Box style={{ paddingTop: insets.top }} twClassName="flex-1 bg-default">
-      <Box twClassName="flex-row justify-between items-center px-4 py-3">
+      <Box twClassName="px-4 py-3">
         <Text variant={TextVariant.HeadingLg} twClassName="text-default">
           {strings('trending.title')}
         </Text>
+      </Box>
 
-        <Box flexDirection={BoxFlexDirection.Row}>
-          <ButtonIcon
-            iconName={IconName.Explore}
-            size={ButtonIconSize.Lg}
-            onPress={handleBrowserPress}
-            testID="trending-view-browser-button"
-          />
+      <Box twClassName="px-4 pb-3">
+        <Box twClassName="flex-row items-center gap-2">
+          <Box twClassName="flex-1">
+            <ExploreSearchBar type="button" onPress={handleSearchPress} />
+          </Box>
+
+          <Box
+            twClassName="rounded-md items-center justify-center h-8 w-8 border-4"
+            style={{
+              borderColor: colors.text.default,
+            }}
+          >
+            {browserTabsCount > 0 ? (
+              <ButtonLink
+                onPress={handleBrowserPress}
+                label={browserTabsCount}
+                testID="trending-view-browser-button"
+              />
+            ) : (
+              <ButtonIcon
+                iconName={IconName.Add}
+                size={ButtonIconSize.Md}
+                onPress={handleBrowserPress}
+                testID="trending-view-browser-button"
+              />
+            )}
+          </Box>
         </Box>
       </Box>
 
-      <ExploreSearchBar type="button" onPress={handleSearchPress} />
-
       <ScrollView
         style={styles.scrollView}
         showsVerticalScrollIndicator={false}
diff --git a/app/components/Views/Wallet/index.test.tsx b/app/components/Views/Wallet/index.test.tsx
index c61f8d0da109..033f1b2cd916 100644
--- a/app/components/Views/Wallet/index.test.tsx
+++ b/app/components/Views/Wallet/index.test.tsx
@@ -50,27 +50,35 @@ jest.mock(
   }),
 );
 
-// Mock the Perps feature flag selector - will be controlled per test
+// Mock the Perps feature flag - will be controlled per test
 let mockPerpsEnabled = true;
 let mockPerpsGTMModalEnabled = false;
 jest.mock('../../UI/Perps/selectors/featureFlags', () => ({
-  selectPerpsEnabledFlag: jest.fn(() => mockPerpsEnabled),
   selectPerpsServiceInterruptionBannerEnabledFlag: jest.fn(() => false),
   selectPerpsGtmOnboardingModalEnabledFlag: jest.fn(
     () => mockPerpsGTMModalEnabled,
   ),
 }));
 
-// Mock the Predict feature flag selector - will be controlled per test
+// Mock the Predict feature flag - will be controlled per test
 let mockPredictEnabled = true;
 let mockPredictGTMModalEnabled = false;
 jest.mock('../../UI/Predict/selectors/featureFlags', () => ({
-  selectPredictEnabledFlag: jest.fn(() => mockPredictEnabled),
   selectPredictGtmOnboardingModalEnabledFlag: jest.fn(
     () => mockPredictGTMModalEnabled,
   ),
 }));
 
+// Mock useFeatureFlag hook
+jest.mock('../../hooks/useFeatureFlag', () => ({
+  useFeatureFlag: jest.fn(),
+  FeatureFlagNames: {
+    perpsPerpTradingEnabled: 'perpsPerpTradingEnabled',
+    predictTradingEnabled: 'predictTradingEnabled',
+    carouselBanners: 'carouselBanners',
+  },
+}));
+
 // Create shared mock reference for TabsList
 let mockTabsListComponent: jest.Mock;
 
@@ -102,6 +110,7 @@ import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../util/test/accountsContr
 import { WalletViewSelectorsIDs } from '../../../../e2e/selectors/wallet/WalletView.selectors';
 import Engine from '../../../core/Engine';
 import { useSelector } from 'react-redux';
+import { useFeatureFlag, FeatureFlagNames } from '../../hooks/useFeatureFlag';
 import { mockedPerpsFeatureFlagsEnabledState } from '../../UI/Perps/mocks/remoteFeatureFlagMocks';
 import { initialState as cardInitialState } from '../../../core/redux/slices/card';
 import { NavigationProp, ParamListBase } from '@react-navigation/native';
@@ -1069,6 +1078,23 @@ describe('Wallet', () => {
       mockPerpsGTMModalEnabled = false;
       mockPredictEnabled = true;
       mockPredictGTMModalEnabled = false;
+
+      // Set up useFeatureFlag mock
+      const mockUseFeatureFlag = useFeatureFlag as jest.MockedFunction<
+        typeof useFeatureFlag
+      >;
+      mockUseFeatureFlag.mockImplementation((flagName) => {
+        if (flagName === FeatureFlagNames.perpsPerpTradingEnabled) {
+          return mockPerpsEnabled;
+        }
+        if (flagName === FeatureFlagNames.predictTradingEnabled) {
+          return mockPredictEnabled;
+        }
+        if (flagName === FeatureFlagNames.carouselBanners) {
+          return true; // Default to enabled
+        }
+        return false;
+      });
     });
 
     afterEach(() => {
diff --git a/app/components/Views/Wallet/index.tsx b/app/components/Views/Wallet/index.tsx
index f05216dd4cd2..cc8596b7070e 100644
--- a/app/components/Views/Wallet/index.tsx
+++ b/app/components/Views/Wallet/index.tsx
@@ -170,19 +170,13 @@ import {
   useNetworksByNamespace,
 } from '../../hooks/useNetworksByNamespace/useNetworksByNamespace';
 import { useNetworkSelection } from '../../hooks/useNetworkSelection/useNetworkSelection';
-import {
-  selectPerpsEnabledFlag,
-  selectPerpsGtmOnboardingModalEnabledFlag,
-} from '../../UI/Perps';
+import { selectPerpsGtmOnboardingModalEnabledFlag } from '../../UI/Perps';
 import PerpsTabView from '../../UI/Perps/Views/PerpsTabView';
-import {
-  selectPredictEnabledFlag,
-  selectPredictGtmOnboardingModalEnabledFlag,
-} from '../../UI/Predict/selectors/featureFlags';
+import { selectPredictGtmOnboardingModalEnabledFlag } from '../../UI/Predict/selectors/featureFlags';
 import PredictTabView from '../../UI/Predict/views/PredictTabView';
 import { InitSendLocation } from '../confirmations/constants/send';
 import { useSendNavigation } from '../confirmations/hooks/useSendNavigation';
-import { selectCarouselBannersFlag } from '../../UI/Carousel/selectors/featureFlags';
+import { useFeatureFlag, FeatureFlagNames } from '../../hooks/useFeatureFlag';
 import { SolScope } from '@metamask/keyring-api';
 import { selectSelectedInternalAccountByScope } from '../../../selectors/multichainAccounts/accounts';
 import { EVM_SCOPE } from '../../UI/Earn/constants/networks';
@@ -247,7 +241,9 @@ interface WalletTokensTabViewProps {
 }
 
 const WalletTokensTabView = React.memo((props: WalletTokensTabViewProps) => {
-  const isPerpsFlagEnabled = useSelector(selectPerpsEnabledFlag);
+  const isPerpsFlagEnabled = useFeatureFlag(
+    FeatureFlagNames.perpsPerpTradingEnabled,
+  );
   const isEvmSelected = useSelector(selectIsEvmNetworkSelected);
   const isMultichainAccountsState2Enabled = useSelector(
     selectMultichainAccountsState2Enabled,
@@ -261,7 +257,9 @@ const WalletTokensTabView = React.memo((props: WalletTokensTabViewProps) => {
       (isEvmSelected || isMultichainAccountsState2Enabled),
     [isPerpsFlagEnabled, isEvmSelected, isMultichainAccountsState2Enabled],
   );
-  const isPredictFlagEnabled = useSelector(selectPredictEnabledFlag);
+  const isPredictFlagEnabled = useFeatureFlag(
+    FeatureFlagNames.predictTradingEnabled,
+  );
   const isPredictEnabled = useMemo(
     () => isPredictFlagEnabled,
     [isPredictFlagEnabled],
@@ -515,12 +513,16 @@ const Wallet = ({
   const walletRef = useRef(null);
   const theme = useTheme();
 
-  const isPerpsFlagEnabled = useSelector(selectPerpsEnabledFlag);
+  const isPerpsFlagEnabled = useFeatureFlag(
+    FeatureFlagNames.perpsPerpTradingEnabled,
+  );
   const isPerpsGTMModalEnabled = useSelector(
     selectPerpsGtmOnboardingModalEnabledFlag,
   );
 
-  const isPredictFlagEnabled = useSelector(selectPredictEnabledFlag);
+  const isPredictFlagEnabled = useFeatureFlag(
+    FeatureFlagNames.predictTradingEnabled,
+  );
   const isPredictGTMModalEnabled = useSelector(
     selectPredictGtmOnboardingModalEnabledFlag,
   );
@@ -955,7 +957,9 @@ const Wallet = ({
   const isTokenDetectionEnabled = useSelector(selectUseTokenDetection);
   const isPopularNetworks = useSelector(selectIsPopularNetwork);
   const detectedTokens = useSelector(selectDetectedTokens) as TokenI[];
-  const isCarouselBannersEnabled = useSelector(selectCarouselBannersFlag);
+  const isCarouselBannersEnabled = useFeatureFlag(
+    FeatureFlagNames.carouselBanners,
+  );
 
   const allDetectedTokens = useSelector(
     selectAllDetectedTokensFlat,
diff --git a/app/components/Views/WalletActions/WalletActions.test.tsx b/app/components/Views/WalletActions/WalletActions.test.tsx
index eef26b865a29..3085dcb9acf1 100644
--- a/app/components/Views/WalletActions/WalletActions.test.tsx
+++ b/app/components/Views/WalletActions/WalletActions.test.tsx
@@ -14,35 +14,31 @@ import {
 } from '../../../util/test/accountsControllerTestUtils';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { mockNetworkState } from '../../../util/test/network';
-import {
-  selectPooledStakingEnabledFlag,
-  selectStablecoinLendingEnabledFlag,
-} from '../../UI/Earn/selectors/featureFlags';
+import { selectStablecoinLendingEnabledFlag } from '../../UI/Earn/selectors/featureFlags';
 import { EarnTokenDetails } from '../../UI/Earn/types/lending.types';
 import WalletActions from './WalletActions';
-import { selectPerpsEnabledFlag } from '../../UI/Perps';
 import { selectIsFirstTimePerpsUser } from '../../UI/Perps/selectors/perpsController';
-import { selectPredictEnabledFlag } from '../../UI/Predict/selectors/featureFlags';
+import { useFeatureFlag, FeatureFlagNames } from '../../hooks/useFeatureFlag';
 
 jest.mock('react-native-device-info', () => ({
   getVersion: jest.fn().mockReturnValue('1.0.0'),
 }));
 
-jest.mock('../../UI/Perps', () => ({
-  selectPerpsEnabledFlag: jest.fn(),
-}));
-
 jest.mock('../../UI/Perps/selectors/perpsController', () => ({
   selectIsFirstTimePerpsUser: jest.fn(),
 }));
 
-jest.mock('../../UI/Predict/selectors/featureFlags', () => ({
-  selectPredictEnabledFlag: jest.fn(),
-}));
-
 jest.mock('../../UI/Earn/selectors/featureFlags', () => ({
   selectStablecoinLendingEnabledFlag: jest.fn(),
-  selectPooledStakingEnabledFlag: jest.fn(),
+}));
+
+jest.mock('../../hooks/useFeatureFlag', () => ({
+  useFeatureFlag: jest.fn(),
+  FeatureFlagNames: {
+    perpsPerpTradingEnabled: 'perpsPerpTradingEnabled',
+    predictTradingEnabled: 'predictTradingEnabled',
+    earnPooledStakingEnabled: 'earnPooledStakingEnabled',
+  },
 }));
 
 jest.mock('../../../selectors/earnController/earn', () => ({
@@ -243,6 +239,10 @@ const mockInitialState: DeepPartial<RootState> = {
 const mockNavigate = jest.fn();
 const mockGoBack = jest.fn();
 
+const mockUseFeatureFlag = useFeatureFlag as jest.MockedFunction<
+  typeof useFeatureFlag
+>;
+
 jest.mock('@react-navigation/native', () => {
   const actualReactNavigation = jest.requireActual('@react-navigation/native');
   return {
@@ -271,6 +271,8 @@ describe('WalletActions', () => {
   beforeEach(() => {
     // Clear all mocks first for test isolation
     jest.clearAllMocks();
+    // Default mock: all feature flags disabled
+    mockUseFeatureFlag.mockReturnValue(false);
   });
 
   afterEach(() => {
@@ -364,11 +366,12 @@ describe('WalletActions', () => {
         typeof selectStablecoinLendingEnabledFlag
       >
     ).mockReturnValue(true);
-    (
-      selectPooledStakingEnabledFlag as jest.MockedFunction<
-        typeof selectPooledStakingEnabledFlag
-      >
-    ).mockReturnValue(false);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.earnPooledStakingEnabled) {
+        return false;
+      }
+      return false;
+    });
 
     (
       earnSelectors.selectEarnTokens as jest.MockedFunction<
@@ -405,11 +408,12 @@ describe('WalletActions', () => {
   });
 
   it('should render the Perpetuals button if the Perps feature flag is enabled', () => {
-    (
-      selectPerpsEnabledFlag as jest.MockedFunction<
-        typeof selectPerpsEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.perpsPerpTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
 
     const { getByTestId } = renderWithProvider(<WalletActions />, {
       state: mockInitialState,
@@ -421,11 +425,12 @@ describe('WalletActions', () => {
   });
 
   it('should navigate to Perps markets when returning user presses Perpetuals button', async () => {
-    (
-      selectPerpsEnabledFlag as jest.MockedFunction<
-        typeof selectPerpsEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.perpsPerpTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
     (
       selectIsFirstTimePerpsUser as jest.MockedFunction<
         typeof selectIsFirstTimePerpsUser
@@ -453,11 +458,12 @@ describe('WalletActions', () => {
   });
 
   it('should navigate to Perps tutorial when first-time user presses Perpetuals button', async () => {
-    (
-      selectPerpsEnabledFlag as jest.MockedFunction<
-        typeof selectPerpsEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.perpsPerpTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
     (
       selectIsFirstTimePerpsUser as jest.MockedFunction<
         typeof selectIsFirstTimePerpsUser
@@ -480,11 +486,12 @@ describe('WalletActions', () => {
   });
 
   it('should render the Predict button if the Predict feature flag is enabled', () => {
-    (
-      selectPredictEnabledFlag as jest.MockedFunction<
-        typeof selectPredictEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.predictTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
 
     const { getByTestId } = renderWithProvider(<WalletActions />, {
       state: mockInitialState,
@@ -496,11 +503,12 @@ describe('WalletActions', () => {
   });
 
   it('should call the onPredict function when the Predict button is pressed', async () => {
-    (
-      selectPredictEnabledFlag as jest.MockedFunction<
-        typeof selectPredictEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (flagName === FeatureFlagNames.predictTradingEnabled) {
+        return true;
+      }
+      return false;
+    });
 
     const { getByTestId } = renderWithProvider(<WalletActions />, {
       state: mockInitialState,
@@ -528,21 +536,16 @@ describe('WalletActions', () => {
         typeof selectStablecoinLendingEnabledFlag
       >
     ).mockReturnValue(true);
-    (
-      selectPooledStakingEnabledFlag as jest.MockedFunction<
-        typeof selectPooledStakingEnabledFlag
-      >
-    ).mockReturnValue(true);
-    (
-      selectPerpsEnabledFlag as jest.MockedFunction<
-        typeof selectPerpsEnabledFlag
-      >
-    ).mockReturnValue(true);
-    (
-      selectPredictEnabledFlag as jest.MockedFunction<
-        typeof selectPredictEnabledFlag
-      >
-    ).mockReturnValue(true);
+    mockUseFeatureFlag.mockImplementation((flagName) => {
+      if (
+        flagName === FeatureFlagNames.earnPooledStakingEnabled ||
+        flagName === FeatureFlagNames.perpsPerpTradingEnabled ||
+        flagName === FeatureFlagNames.predictTradingEnabled
+      ) {
+        return true;
+      }
+      return false;
+    });
     (selectCanSignTransactions as unknown as jest.Mock).mockReturnValue(false);
 
     // Import and mock selectIsSwapsEnabled to return false when can't sign
diff --git a/app/components/Views/WalletActions/WalletActions.tsx b/app/components/Views/WalletActions/WalletActions.tsx
index b3bfc7b1e71c..13413254b835 100644
--- a/app/components/Views/WalletActions/WalletActions.tsx
+++ b/app/components/Views/WalletActions/WalletActions.tsx
@@ -24,13 +24,9 @@ import styleSheet from './WalletActions.styles';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 import { selectCanSignTransactions } from '../../../selectors/accountsController';
 import { EVENT_LOCATIONS as STAKE_EVENT_LOCATIONS } from '../../UI/Stake/constants/events';
-import {
-  selectPooledStakingEnabledFlag,
-  selectStablecoinLendingEnabledFlag,
-} from '../../UI/Earn/selectors/featureFlags';
-import { selectPerpsEnabledFlag } from '../../UI/Perps';
+import { selectStablecoinLendingEnabledFlag } from '../../UI/Earn/selectors/featureFlags';
 import { PerpsEventValues } from '../../UI/Perps/constants/eventNames';
-import { selectPredictEnabledFlag } from '../../UI/Predict/selectors/featureFlags';
+import { useFeatureFlag, FeatureFlagNames } from '../../hooks/useFeatureFlag';
 import { PredictEventValues } from '../../UI/Predict/constants/eventNames';
 import { EARN_INPUT_VIEW_ACTIONS } from '../../UI/Earn/Views/EarnInputView/EarnInputView.types';
 import { earnSelectors } from '../../../selectors/earnController/earn';
@@ -47,7 +43,9 @@ const WalletActions = () => {
   const { styles } = useStyles(styleSheet, {});
   const sheetRef = useRef<BottomSheetRef>(null);
   const { navigate } = useNavigation();
-  const isPooledStakingEnabled = useSelector(selectPooledStakingEnabledFlag);
+  const isPooledStakingEnabled = useFeatureFlag(
+    FeatureFlagNames.earnPooledStakingEnabled,
+  );
   const { earnTokens } = useSelector(earnSelectors.selectEarnTokens);
 
   const isFirstTimePerpsUser = useSelector(selectIsFirstTimePerpsUser);
@@ -58,8 +56,12 @@ const WalletActions = () => {
   const isSwapsEnabled = useSelector((state: RootState) =>
     selectIsSwapsEnabled(state),
   );
-  const isPerpsEnabled = useSelector(selectPerpsEnabledFlag);
-  const isPredictEnabled = useSelector(selectPredictEnabledFlag);
+  const isPerpsEnabled = useFeatureFlag(
+    FeatureFlagNames.perpsPerpTradingEnabled,
+  ) as boolean;
+  const isPredictEnabled = useFeatureFlag(
+    FeatureFlagNames.predictTradingEnabled,
+  ) as boolean;
   const isEvmSelected = useSelector(selectIsEvmNetworkSelected);
   const { trackEvent, createEventBuilder } = useMetrics();
   const canSignTransactions = useSelector(selectCanSignTransactions);
diff --git a/app/components/hooks/useFeatureFlag.ts b/app/components/hooks/useFeatureFlag.ts
index 4bbfb9ebc0ef..3b0c01547caa 100644
--- a/app/components/hooks/useFeatureFlag.ts
+++ b/app/components/hooks/useFeatureFlag.ts
@@ -3,8 +3,18 @@ import { useFeatureFlagOverride } from '../../contexts/FeatureFlagOverrideContex
 import { selectBasicFunctionalityEnabled } from '../../selectors/settings';
 
 export enum FeatureFlagNames {
-  rewardsEnabled = 'rewardsEnabled',
   otaUpdatesEnabled = 'otaUpdatesEnabled',
+  rewardsEnableCardSpend = 'rewardsEnableCardSpend',
+  rewardsEnableMusdDeposit = 'rewardsEnableMusdDeposit',
+  cardFeature = 'cardFeature', //remote config
+  sampleFeatureCounterEnabled = 'sampleFeatureCounterEnabled',
+  bridgeConfigV2 = 'bridgeConfigV2', //remote config
+  depositConfig = 'depositConfig', //remote config
+  earnPooledStakingEnabled = 'earnPooledStakingEnabled',
+  predictTradingEnabled = 'predictTradingEnabled',
+  perpsPerpTradingEnabled = 'perpsPerpTradingEnabled',
+  confirmationsPay = 'confirmations_pay', //remote config
+  carouselBanners = 'carouselBanners',
 }
 
 export const useFeatureFlag = (key: FeatureFlagNames) => {
diff --git a/app/components/hooks/useTokenHistoricalPrices.ts b/app/components/hooks/useTokenHistoricalPrices.ts
index 28d74519585f..2ac359f0468c 100644
--- a/app/components/hooks/useTokenHistoricalPrices.ts
+++ b/app/components/hooks/useTokenHistoricalPrices.ts
@@ -141,6 +141,10 @@ const useTokenHistoricalPrices = ({
           });
           const response = await fetch(uri.toString());
           endTrace({ name: TraceName.FetchHistoricalPrices });
+          if (response.status !== 200) {
+            setPrices([]);
+            return;
+          }
           const data: { prices: TokenPrice[] } = await response.json();
           setPrices(data.prices as TokenPrice[]);
         }
diff --git a/app/core/Authentication/Authentication.test.ts b/app/core/Authentication/Authentication.test.ts
index 4cff4386c18d..d07644aeb35b 100644
--- a/app/core/Authentication/Authentication.test.ts
+++ b/app/core/Authentication/Authentication.test.ts
@@ -35,7 +35,7 @@ import {
 import { EncryptionKey } from '@metamask/browser-passworder';
 import { uint8ArrayToMnemonic } from '../../util/mnemonic';
 import { SolScope } from '@metamask/keyring-api';
-import { logOut } from '../../actions/user';
+import { logOut, setExistingUser, logIn } from '../../actions/user';
 import { RootState } from '../../reducers';
 import {
   SeedlessOnboardingControllerError,
@@ -514,6 +514,196 @@ describe('Authentication', () => {
         );
       }
     });
+
+    it('falls back to PASSWORD authType when biometric storePassword fails in newWalletAndKeychain', async () => {
+      const mockDispatch = jest.fn();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        dispatch: mockDispatch,
+        getState: () => ({ security: { allowLoginWithRememberMe: true } }),
+      } as unknown as ReduxStore);
+
+      const Engine = jest.requireMock('../Engine');
+
+      // Mock successful vault creation
+      Engine.context.KeyringController.createNewVaultAndKeychain.mockResolvedValueOnce(
+        undefined,
+      );
+      Engine.resetState = jest.fn().mockResolvedValueOnce(undefined);
+
+      // Mock storePassword to fail on first call (biometric), succeed on second (password)
+      const storePasswordSpy = jest
+        .spyOn(Authentication, 'storePassword')
+        .mockRejectedValueOnce(new Error('Biometric storage failed'))
+        .mockResolvedValueOnce(undefined);
+
+      await Authentication.newWalletAndKeychain('password', {
+        currentAuthType: AUTHENTICATION_TYPE.BIOMETRIC,
+      });
+
+      // Should have called storePassword twice: first with BIOMETRIC (failed), then with PASSWORD (succeeded)
+      expect(storePasswordSpy).toHaveBeenCalledTimes(2);
+      expect(storePasswordSpy).toHaveBeenNthCalledWith(
+        1,
+        'password',
+        AUTHENTICATION_TYPE.BIOMETRIC,
+      );
+      expect(storePasswordSpy).toHaveBeenNthCalledWith(
+        2,
+        'password',
+        AUTHENTICATION_TYPE.PASSWORD,
+      );
+
+      // Should have completed successfully
+      expect(mockDispatch).toHaveBeenCalledWith(setExistingUser(true));
+      expect(mockDispatch).toHaveBeenCalledWith(logIn());
+
+      storePasswordSpy.mockRestore();
+    });
+
+    it('falls back to PASSWORD authType when biometric storePassword fails in newWalletAndRestore', async () => {
+      const mockDispatch = jest.fn();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        dispatch: mockDispatch,
+        getState: () => ({ security: { allowLoginWithRememberMe: true } }),
+      } as unknown as ReduxStore);
+
+      const Engine = jest.requireMock('../Engine');
+
+      // Mock successful vault restoration
+      Engine.context.KeyringController.createNewVaultAndRestore.mockResolvedValueOnce(
+        undefined,
+      );
+      Engine.resetState = jest.fn().mockResolvedValueOnce(undefined);
+
+      // Mock storePassword to fail on first call (biometric), succeed on second (password)
+      const storePasswordSpy = jest
+        .spyOn(Authentication, 'storePassword')
+        .mockRejectedValueOnce(new Error('Biometric storage failed'))
+        .mockResolvedValueOnce(undefined);
+
+      await Authentication.newWalletAndRestore(
+        'password',
+        {
+          currentAuthType: AUTHENTICATION_TYPE.BIOMETRIC,
+        },
+        'test seed phrase',
+        true,
+      );
+
+      // Should have called storePassword twice: first with BIOMETRIC (failed), then with PASSWORD (succeeded)
+      expect(storePasswordSpy).toHaveBeenCalledTimes(2);
+      expect(storePasswordSpy).toHaveBeenNthCalledWith(
+        1,
+        'password',
+        AUTHENTICATION_TYPE.BIOMETRIC,
+      );
+      expect(storePasswordSpy).toHaveBeenNthCalledWith(
+        2,
+        'password',
+        AUTHENTICATION_TYPE.PASSWORD,
+      );
+
+      // Should have completed successfully
+      expect(mockDispatch).toHaveBeenCalledWith(setExistingUser(true));
+      expect(mockDispatch).toHaveBeenCalledWith(logIn());
+
+      storePasswordSpy.mockRestore();
+    });
+
+    it('throws error when PASSWORD authType storePassword fails in newWalletAndKeychain', async () => {
+      const mockDispatch = jest.fn();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        dispatch: mockDispatch,
+        getState: () => ({ security: { allowLoginWithRememberMe: true } }),
+      } as unknown as ReduxStore);
+
+      const Engine = jest.requireMock('../Engine');
+
+      Engine.context.KeyringController.setLocked.mockResolvedValue(undefined);
+
+      // Mock successful vault creation
+      Engine.context.KeyringController.createNewVaultAndKeychain.mockResolvedValueOnce(
+        undefined,
+      );
+      Engine.resetState = jest.fn().mockResolvedValueOnce(undefined);
+
+      // Mock storePassword to fail even with PASSWORD authType
+      const storePasswordSpy = jest
+        .spyOn(Authentication, 'storePassword')
+        .mockRejectedValue(new Error('Password storage failed'));
+
+      try {
+        await Authentication.newWalletAndKeychain('password', {
+          currentAuthType: AUTHENTICATION_TYPE.PASSWORD,
+        });
+        throw new Error('Expected an error to be thrown');
+      } catch (error) {
+        expect(error).toBeInstanceOf(AuthenticationError);
+        expect((error as AuthenticationError).customErrorMessage).toBe(
+          AUTHENTICATION_FAILED_WALLET_CREATION,
+        );
+        expect((error as AuthenticationError).message).toBe(
+          'Password storage failed',
+        );
+        // Should have called storePassword only once since it's PASSWORD authType (no fallback)
+        expect(storePasswordSpy).toHaveBeenCalledTimes(1);
+        await Promise.resolve();
+        jest.runAllTimers();
+        expect(mockDispatch).toHaveBeenCalledWith(logOut());
+      }
+
+      storePasswordSpy.mockRestore();
+    });
+
+    it('throws error when PASSWORD authType storePassword fails in newWalletAndRestore', async () => {
+      const mockDispatch = jest.fn();
+      jest.spyOn(ReduxService, 'store', 'get').mockReturnValue({
+        dispatch: mockDispatch,
+        getState: () => ({ security: { allowLoginWithRememberMe: true } }),
+      } as unknown as ReduxStore);
+
+      const Engine = jest.requireMock('../Engine');
+
+      Engine.context.KeyringController.setLocked.mockResolvedValue(undefined);
+
+      // Mock successful vault restoration
+      Engine.context.KeyringController.createNewVaultAndRestore.mockResolvedValueOnce(
+        undefined,
+      );
+      Engine.resetState = jest.fn().mockResolvedValueOnce(undefined);
+
+      // Mock storePassword to fail even with PASSWORD authType
+      const storePasswordSpy = jest
+        .spyOn(Authentication, 'storePassword')
+        .mockRejectedValue(new Error('Password storage failed'));
+
+      try {
+        await Authentication.newWalletAndRestore(
+          'password',
+          {
+            currentAuthType: AUTHENTICATION_TYPE.PASSWORD,
+          },
+          'test seed phrase',
+          true,
+        );
+        throw new Error('Expected an error to be thrown');
+      } catch (error) {
+        expect(error).toBeInstanceOf(AuthenticationError);
+        expect((error as AuthenticationError).customErrorMessage).toBe(
+          AUTHENTICATION_FAILED_WALLET_CREATION,
+        );
+        expect((error as AuthenticationError).message).toBe(
+          'Password storage failed',
+        );
+        // Should have called storePassword only once since it's PASSWORD authType (no fallback)
+        expect(storePasswordSpy).toHaveBeenCalledTimes(1);
+        await Promise.resolve();
+        jest.runAllTimers();
+        expect(mockDispatch).toHaveBeenCalledWith(logOut());
+      }
+
+      storePasswordSpy.mockRestore();
+    });
   });
 
   describe('Multichain - discoverAccounts', () => {
diff --git a/app/core/Authentication/Authentication.ts b/app/core/Authentication/Authentication.ts
index 05319a188729..5744b100ce14 100644
--- a/app/core/Authentication/Authentication.ts
+++ b/app/core/Authentication/Authentication.ts
@@ -447,6 +447,31 @@ class AuthenticationService {
     }
   };
 
+  /**
+   * store password with fallback to password authType if the storePassword with non Password authType fails
+   * it should only apply for create wallet, import wallet and reset password flows for now
+   *
+   * @param password - password to store
+   * @param authData - authentication data
+   * @returns void
+   */
+  storePasswordWithFallback = async (password: string, authData: AuthData) => {
+    try {
+      await this.storePassword(password, authData.currentAuthType);
+      this.authData = authData;
+    } catch (error) {
+      if (authData.currentAuthType === AUTHENTICATION_TYPE.PASSWORD) {
+        throw error;
+      }
+      // Fall back to password authType
+      await this.storePassword(password, AUTHENTICATION_TYPE.PASSWORD);
+      this.authData = {
+        currentAuthType: AUTHENTICATION_TYPE.PASSWORD,
+        availableBiometryType: authData.availableBiometryType,
+      };
+    }
+  };
+
   /**
    * Fetches the password from the keychain using the auth method it was originally stored
    */
@@ -523,14 +548,13 @@ class AuthenticationService {
         await this.createWalletVaultAndKeychain(password);
       }
 
-      await this.storePassword(password, authData?.currentAuthType);
+      await this.storePasswordWithFallback(password, authData);
       ReduxService.store.dispatch(setExistingUser(true));
       await StorageWrapper.removeItem(SEED_PHRASE_HINTS);
 
       await this.dispatchLogin({
         clearAccountTreeState: true,
       });
-      this.authData = authData;
       // TODO: Replace "any" with type
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
@@ -559,13 +583,12 @@ class AuthenticationService {
   ): Promise<void> => {
     try {
       await this.newWalletVaultAndRestore(password, parsedSeed, clearEngine);
-      await this.storePassword(password, authData.currentAuthType);
+      await this.storePasswordWithFallback(password, authData);
       ReduxService.store.dispatch(setExistingUser(true));
       await StorageWrapper.removeItem(SEED_PHRASE_HINTS);
       await this.dispatchLogin({
         clearAccountTreeState: true,
       });
-      this.authData = authData;
       // TODO: Replace "any" with type
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
diff --git a/app/core/Engine/controllers/snaps/execution-service-init.ts b/app/core/Engine/controllers/snaps/execution-service-init.ts
index 612044ffa8dc..d86d4530f7ac 100644
--- a/app/core/Engine/controllers/snaps/execution-service-init.ts
+++ b/app/core/Engine/controllers/snaps/execution-service-init.ts
@@ -9,6 +9,7 @@ import Logger from '../../../../util/Logger';
 import { SnapBridge } from '../../../Snaps';
 import getRpcMethodMiddleware from '../../../RPCMethods/RPCMethodMiddleware';
 import { Duration, inMilliseconds } from '@metamask/utils';
+import { SnapId } from '@metamask/snaps-sdk';
 
 /**
  * Initialize the Snaps execution service.
@@ -38,7 +39,7 @@ export const executionServiceInit: ControllerInitFunction<
     // Consider developing an abstract class to derived custom implementations
     // for each use case.
     const bridge = new SnapBridge({
-      snapId,
+      snapId: snapId as SnapId,
       connectionStream,
       getRPCMethodMiddleware: ({ hostname, getProviderState }) =>
         getRpcMethodMiddleware({
diff --git a/app/core/SecureKeychain.test.ts b/app/core/SecureKeychain.test.ts
index ff20a006ffcd..175a5e5ba149 100644
--- a/app/core/SecureKeychain.test.ts
+++ b/app/core/SecureKeychain.test.ts
@@ -12,6 +12,7 @@ import {
 import { UserProfileProperty } from '../util/metrics/UserSettingsAnalyticsMetaData/UserProfileAnalyticsMetaData.types';
 import AUTHENTICATION_TYPE from '../constants/userProperties';
 import QuickCrypto from 'react-native-quick-crypto';
+import { STORAGE_TYPE } from 'react-native-keychain';
 
 jest.mock('../../locales/i18n', () => ({
   strings: jest.fn((key) => key),
@@ -37,6 +38,9 @@ jest.mock('react-native-keychain', () => ({
   setGenericPassword: jest.fn(),
   getGenericPassword: jest.fn(),
   resetGenericPassword: jest.fn(),
+  STORAGE_TYPE: {
+    AES_GCM: 'AES_GCM',
+  },
 }));
 
 jest.mock('../store/storage-wrapper', () => ({
@@ -171,7 +175,10 @@ describe('SecureKeychain - setGenericPassword', () => {
     });
 
     it('should successfully set up biometric authentication', async () => {
-      (Keychain.getGenericPassword as jest.Mock).mockResolvedValueOnce({
+      jest.spyOn(SecureKeychain, 'getGenericPassword').mockResolvedValueOnce({
+        service: 'metamask',
+        username: 'metamask-user',
+        storage: STORAGE_TYPE.AES_GCM,
         password: 'encrypted_password',
       });
 
diff --git a/app/core/SecureKeychain.ts b/app/core/SecureKeychain.ts
index f8f5300e5ac4..6dc92af3a7fb 100644
--- a/app/core/SecureKeychain.ts
+++ b/app/core/SecureKeychain.ts
@@ -252,6 +252,7 @@ const SecureKeychain = {
 
             return;
           }
+          throw error;
         }
       }
     } else if (type === this.TYPES.PASSCODE) {
diff --git a/app/core/Snaps/SnapBridge.ts b/app/core/Snaps/SnapBridge.ts
index e813ad801f40..ebf635983225 100644
--- a/app/core/Snaps/SnapBridge.ts
+++ b/app/core/Snaps/SnapBridge.ts
@@ -1,186 +1,137 @@
-///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
-/* eslint-disable import/no-commonjs */
-/* eslint-disable @typescript-eslint/no-require-imports */
-/* eslint-disable @typescript-eslint/no-var-requires */
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
 // eslint-disable-next-line import/no-nodejs-modules
 import { Duplex } from 'stream';
+// @ts-expect-error - No types declarations
+import pump from 'pump';
+
+import { JsonRpcEngine, JsonRpcMiddleware } from '@metamask/json-rpc-engine';
+// @ts-expect-error - No types declarations
+import createFilterMiddleware from '@metamask/eth-json-rpc-filters';
+// @ts-expect-error - No types declarations
+import createSubscriptionManager from '@metamask/eth-json-rpc-filters/subscriptionManager';
+import { JsonRpcParams, Json } from '@metamask/utils';
 import {
-  createSwappableProxy,
-  createEventEmitterProxy,
-} from '@metamask/swappable-obj-proxy';
-import { JsonRpcEngine } from '@metamask/json-rpc-engine';
+  createSelectedNetworkMiddleware,
+  SelectedNetworkControllerMessenger,
+} from '@metamask/selected-network-controller';
+import { createPreinstalledSnapsMiddleware } from '@metamask/snaps-rpc-methods';
+import { SubjectType } from '@metamask/permission-controller';
+import { providerAsMiddleware } from '@metamask/eth-json-rpc-middleware';
 import { createEngineStream } from '@metamask/json-rpc-middleware-stream';
-import EthQuery from '@metamask/eth-query';
+import { SnapId } from '@metamask/snaps-sdk';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 
 import Engine from '../Engine';
 import { setupMultiplex } from '../../util/streams';
 import Logger from '../../util/Logger';
+import { createOriginMiddleware } from '../../util/middlewares';
+import { RPCMethodsMiddleParameters } from '../RPCMethods/RPCMethodMiddleware';
 import snapMethodMiddlewareBuilder from './SnapsMethodMiddleware';
-import { SubjectType } from '@metamask/permission-controller';
-import { createPreinstalledSnapsMiddleware } from '@metamask/snaps-rpc-methods';
 import { isSnapPreinstalled } from '../SnapKeyring/utils/snaps';
 
-import ObjectMultiplex from '@metamask/object-multiplex';
-import createFilterMiddleware from '@metamask/eth-json-rpc-filters';
-import createSubscriptionManager from '@metamask/eth-json-rpc-filters/subscriptionManager';
-import { providerAsMiddleware } from '@metamask/eth-json-rpc-middleware';
-import { createOriginMiddleware } from '../../util/middlewares';
-import { createSelectedNetworkMiddleware } from '@metamask/selected-network-controller';
-const pump = require('pump');
-
-interface ISnapBridgeProps {
-  snapId: string;
-  connectionStream: Duplex;
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getRPCMethodMiddleware: (args: any) => any;
-}
-
+/**
+ * Type definition for the GetRPCMethodMiddleware function.
+ */
+type GetRPCMethodMiddleware = ({
+  hostname,
+  getProviderState,
+}: {
+  hostname: RPCMethodsMiddleParameters['hostname'];
+  getProviderState: RPCMethodsMiddleParameters['getProviderState'];
+}) => JsonRpcMiddleware<JsonRpcParams, Json>;
+
+/**
+ * A bridge for connecting the client Ethereum provider to a Snap's execution environment.
+ *
+ * @param params - The parameters for the SnapBridge.
+ * @param params.snapId - The ID of the Snap.
+ * @param params.connectionStream - The stream to connect to the Snap.
+ * @param params.getRPCMethodMiddleware - A function to get the RPC method middleware.
+ */
 export default class SnapBridge {
-  snapId: string;
-  stream: Duplex;
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getRPCMethodMiddleware: (args: any) => any;
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  provider: any;
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  blockTracker: any;
-
-  #mux: typeof ObjectMultiplex;
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #providerProxy: any;
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #blockTrackerProxy: any;
+  #snapId: SnapId;
+  #stream: Duplex;
+  #getRPCMethodMiddleware: GetRPCMethodMiddleware;
 
   constructor({
     snapId,
     connectionStream,
     getRPCMethodMiddleware,
-  }: ISnapBridgeProps) {
-    Logger.log(
-      '[SNAP BRIDGE LOG] Engine+setupSnapProvider: Setup bridge for Snap',
-      snapId,
-    );
-
-    this.snapId = snapId;
-    this.stream = connectionStream;
-    this.getRPCMethodMiddleware = getRPCMethodMiddleware;
-    this.deprecatedNetworkVersions = {};
-
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const { NetworkController } = Engine.context as any;
-
-    const { provider, blockTracker } =
-      NetworkController.getProviderAndBlockTracker();
-
-    this.#providerProxy = null;
-    this.#blockTrackerProxy = null;
-
-    this.#setProvider(provider);
-    this.#setBlockTracker(blockTracker);
-
-    this.#mux = setupMultiplex(this.stream);
+  }: {
+    snapId: SnapId;
+    connectionStream: Duplex;
+    getRPCMethodMiddleware: GetRPCMethodMiddleware;
+  }) {
+    Logger.log('[SNAP BRIDGE] Initializing SnapBridge for Snap:', snapId);
+
+    this.#snapId = snapId;
+    this.#stream = connectionStream;
+    this.#getRPCMethodMiddleware = getRPCMethodMiddleware;
   }
 
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #setProvider = (provider: any): void => {
-    if (this.#providerProxy) {
-      this.#providerProxy.setTarget(provider);
-    } else {
-      this.#providerProxy = createSwappableProxy(provider);
-    }
-    this.provider = provider;
-  };
-
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  #setBlockTracker = (blockTracker: any): void => {
-    if (this.#blockTrackerProxy) {
-      this.#blockTrackerProxy.setTarget(blockTracker);
-    } else {
-      this.#blockTrackerProxy = createEventEmitterProxy(blockTracker, {
-        eventFilter: 'skipInternal',
-      });
-    }
-    this.blockTracker = blockTracker;
-  };
-
-  async getProviderState() {
+  /**
+   * Gets the provider state.
+   * @returns An object containing the provider state.
+   */
+  #getProviderState() {
     return {
-      isUnlocked: this.isUnlocked(),
-      ...(await this.getProviderNetworkState(this.snapId)),
+      isUnlocked: Engine.context.KeyringController.isUnlocked(),
     };
   }
 
-  setupProviderConnection = () => {
-    Logger.log('[SNAP BRIDGE LOG] Engine+setupProviderConnection');
-    const outStream = this.#mux.createStream('metamask-provider');
-    const engine = this.setupProviderEngine();
+  /**
+   * Sets up the provider engine for the Snap.
+   * @returns The configured JSON-RPC engine.
+   */
+  #setupProviderEngine() {
+    Logger.log('[SNAP BRIDGE] Setting up provider engine');
 
-    const providerStream = createEngineStream({ engine });
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    pump(outStream, providerStream, outStream, (err: any) => {
-      engine.destroy();
-      if (err) Logger.log('Error with provider stream conn', err);
-    });
-  };
-
-  setupProviderEngine = () => {
+    const { context, controllerMessenger } = Engine;
+    const { SelectedNetworkController, PermissionController } = context;
     const engine = new JsonRpcEngine();
 
-    // create filter polyfill middleware
-    const filterMiddleware = createFilterMiddleware({
-      provider: this.#providerProxy,
-      blockTracker: this.#blockTrackerProxy,
-    });
+    const proxy = SelectedNetworkController.getProviderAndBlockTracker(
+      this.#snapId,
+    );
 
-    // create subscription polyfill middleware
-    const subscriptionManager = createSubscriptionManager({
-      provider: this.#providerProxy,
-      blockTracker: this.#blockTrackerProxy,
-    });
+    const filterMiddleware = createFilterMiddleware(proxy);
 
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    subscriptionManager.events.on('notification', (message: any) =>
+    const subscriptionManager = createSubscriptionManager(proxy);
+    subscriptionManager.events.on('notification', (message: Json) =>
       engine.emit('notification', message),
     );
 
-    engine.push(createOriginMiddleware({ origin: this.snapId }));
-    engine.push(createSelectedNetworkMiddleware(Engine.controllerMessenger));
+    engine.push(
+      createOriginMiddleware({ origin: this.#snapId }) as JsonRpcMiddleware<
+        JsonRpcParams,
+        Json
+      >,
+    );
+
+    engine.push(
+      createSelectedNetworkMiddleware(
+        controllerMessenger as unknown as SelectedNetworkControllerMessenger,
+      ),
+    );
 
     // Filter and subscription polyfills
     engine.push(filterMiddleware);
     engine.push(subscriptionManager.middleware);
 
-    const { context, controllerMessenger } = Engine;
-    const { PermissionController } = context;
-
-    if (isSnapPreinstalled(this.snapId)) {
+    if (isSnapPreinstalled(this.#snapId)) {
       engine.push(
         createPreinstalledSnapsMiddleware({
           getPermissions: PermissionController.getPermissions.bind(
             PermissionController,
-            this.snapId,
+            this.#snapId,
           ),
           getAllEvmAccounts: () =>
             controllerMessenger
               .call('AccountsController:listAccounts')
-              .map((account) => account.address),
+              .map((account: InternalAccount) => account.address),
           grantPermissions: (approvedPermissions) =>
             controllerMessenger.call('PermissionController:grantPermissions', {
               approvedPermissions,
-              subject: { origin: this.snapId },
+              subject: { origin: this.#snapId },
             }),
         }),
       );
@@ -188,7 +139,7 @@ export default class SnapBridge {
 
     engine.push(
       PermissionController.createPermissionMiddleware({
-        origin: this.snapId,
+        origin: this.#snapId,
       }),
     );
 
@@ -196,64 +147,44 @@ export default class SnapBridge {
       snapMethodMiddlewareBuilder(
         context,
         controllerMessenger,
-        this.snapId,
+        this.#snapId,
         SubjectType.Snap,
       ),
     );
 
     // User-Facing RPC methods
     engine.push(
-      this.getRPCMethodMiddleware({
-        hostname: this.snapId,
-        getProviderState: this.getProviderState.bind(this),
+      this.#getRPCMethodMiddleware({
+        hostname: this.#snapId,
+        getProviderState: this.#getProviderState.bind(this),
       }),
     );
 
     // Forward to metamask primary provider
-    engine.push(providerAsMiddleware(this.#providerProxy));
+    engine.push(providerAsMiddleware(proxy.provider));
+
     return engine;
-  };
+  }
 
-  isUnlocked = (): boolean => {
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const { KeyringController } = Engine.context as any;
-    return KeyringController.isUnlocked();
-  };
+  /**
+   * Sets up the provider connection for the Snap.
+   */
+  setupProviderConnection() {
+    Logger.log('[SNAP BRIDGE] Setting up provider connection');
 
-  async getProviderNetworkState(origin: string) {
-    const networkClientId = Engine.controllerMessenger.call(
-      'SelectedNetworkController:getNetworkClientIdForDomain',
-      origin,
-    );
+    const mux = setupMultiplex(this.#stream);
+    const stream = mux.createStream('metamask-provider');
 
-    const networkClient = Engine.controllerMessenger.call(
-      'NetworkController:getNetworkClientById',
-      networkClientId,
-    );
+    const engine = this.#setupProviderEngine();
 
-    const { chainId } = networkClient.configuration;
+    const providerStream = createEngineStream({ engine });
 
-    let networkVersion = this.deprecatedNetworkVersions[networkClientId];
-    if (!networkVersion) {
-      const ethQuery = new EthQuery(networkClient.provider);
-      networkVersion = await new Promise((resolve) => {
-        ethQuery.sendAsync({ method: 'net_version' }, (error, result) => {
-          if (error) {
-            console.error(error);
-            resolve(null);
-          } else {
-            resolve(result);
-          }
-        });
-      });
-      this.deprecatedNetworkVersions[networkClientId] = networkVersion;
-    }
+    pump(stream, providerStream, stream, (error: Error | null) => {
+      engine.destroy();
 
-    return {
-      chainId,
-      networkVersion: networkVersion ?? 'loading',
-    };
+      if (error) {
+        Logger.log('[SNAP BRIDGE] Error with provider stream:', error);
+      }
+    });
   }
 }
-///: END:ONLY_INCLUDE_IF
diff --git a/app/features/SampleFeature/components/views/SampleFeature.test.tsx b/app/features/SampleFeature/components/views/SampleFeature.test.tsx
index 5141c37f47a7..0ce60d7a25c4 100644
--- a/app/features/SampleFeature/components/views/SampleFeature.test.tsx
+++ b/app/features/SampleFeature/components/views/SampleFeature.test.tsx
@@ -3,7 +3,7 @@ import { View } from 'react-native';
 import renderWithProvider from '../../../../util/test/renderWithProvider';
 import SampleFeature from './SampleFeature';
 import initialRootState from '../../../../util/test/initial-root-state';
-import { selectSampleFeatureCounterEnabled } from '../../selectors/sampleFeatureCounter';
+import { useFeatureFlag } from '../../../../components/hooks/useFeatureFlag';
 
 /**
  * Mock implementation for react-native Linking module
@@ -16,10 +16,13 @@ jest.mock('react-native/Libraries/Linking/Linking', () => ({
 }));
 
 /**
- * Mock the feature flag selector to control test scenarios
+ * Mock the feature flag hook to control test scenarios
  */
-jest.mock('../../selectors/sampleFeatureCounter', () => ({
-  selectSampleFeatureCounterEnabled: jest.fn(),
+jest.mock('../../../../components/hooks/useFeatureFlag', () => ({
+  useFeatureFlag: jest.fn(),
+  FeatureFlagNames: {
+    sampleFeatureCounterEnabled: 'sampleFeatureCounterEnabled',
+  },
 }));
 
 /**
@@ -51,10 +54,9 @@ jest.mock('./SamplePetNames/SamplePetNames', () => ({
  * @group SampleFeature
  */
 describe('SampleFeature', () => {
-  const mockSelectSampleFeatureCounterEnabled =
-    selectSampleFeatureCounterEnabled as jest.MockedFunction<
-      typeof selectSampleFeatureCounterEnabled
-    >;
+  const mockUseFeatureFlag = useFeatureFlag as jest.MockedFunction<
+    typeof useFeatureFlag
+  >;
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -67,7 +69,7 @@ describe('SampleFeature', () => {
    */
   it('matches rendered snapshot when feature flag is enabled', () => {
     // Arrange
-    mockSelectSampleFeatureCounterEnabled.mockReturnValue(true);
+    mockUseFeatureFlag.mockReturnValue(true);
 
     // Act
     const { toJSON } = renderWithProvider(<SampleFeature />, {
@@ -85,7 +87,7 @@ describe('SampleFeature', () => {
    */
   it('matches rendered snapshot when feature flag is disabled', () => {
     // Arrange
-    mockSelectSampleFeatureCounterEnabled.mockReturnValue(false);
+    mockUseFeatureFlag.mockReturnValue(false);
 
     // Act
     const { toJSON } = renderWithProvider(<SampleFeature />, {
diff --git a/app/features/SampleFeature/components/views/SampleFeature.tsx b/app/features/SampleFeature/components/views/SampleFeature.tsx
index ca59ba8e319b..0f286130331c 100644
--- a/app/features/SampleFeature/components/views/SampleFeature.tsx
+++ b/app/features/SampleFeature/components/views/SampleFeature.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 
 import { strings } from '../../../../../locales/i18n';
 import Text, {
@@ -14,7 +13,10 @@ import { useStyles } from '../../../../component-library/hooks';
 import styleSheet from './SampleFeature.styles';
 import { baseStyles } from '../../../../styles/common';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
-import { selectSampleFeatureCounterEnabled } from '../../selectors/sampleFeatureCounter';
+import {
+  useFeatureFlag,
+  FeatureFlagNames,
+} from '../../../../components/hooks/useFeatureFlag';
 
 /**
  * SampleFeature Component
@@ -44,7 +46,9 @@ import { selectSampleFeatureCounterEnabled } from '../../selectors/sampleFeature
 const SampleFeature = () => {
   const { styles } = useStyles(styleSheet, {});
   const { networkName, networkImageSource } = useSampleNetwork();
-  const isCounterEnabled = useSelector(selectSampleFeatureCounterEnabled);
+  const isCounterEnabled = useFeatureFlag(
+    FeatureFlagNames.sampleFeatureCounterEnabled,
+  ) as boolean;
 
   return (
     <KeyboardAwareScrollView
diff --git a/app/images/bitcoin-logo.png b/app/images/bitcoin-logo.png
index af7e5ad593a8..76449f2261a7 100644
Binary files a/app/images/bitcoin-logo.png and b/app/images/bitcoin-logo.png differ
diff --git a/app/images/bitcoin-testnet-logo.png b/app/images/bitcoin-testnet-logo.png
index 37c4e60eb55f..c54f68363571 100644
Binary files a/app/images/bitcoin-testnet-logo.png and b/app/images/bitcoin-testnet-logo.png differ
diff --git a/app/images/image-icons.js b/app/images/image-icons.js
index b5cf92a6db27..b39220aee163 100644
--- a/app/images/image-icons.js
+++ b/app/images/image-icons.js
@@ -53,7 +53,7 @@ import PLASMA from './plasma-native.png';
 import CRONOS from './cronos.png';
 import HYPE from './hyperevm.png';
 /// BEGIN:ONLY_INCLUDE_IF(tron)
-import TRON from './tron.png';
+import TRON from './tron-logo.png';
 /// END:ONLY_INCLUDE_IF
 
 export default {
@@ -81,6 +81,8 @@ export default {
   BTC,
   ///: BEGIN:ONLY_INCLUDE_IF(tron)
   TRON,
+  TRX: TRON,
+  sTRX: TRON,
   ///: END:ONLY_INCLUDE_IF
   ///: BEGIN:ONLY_INCLUDE_IF(bitcoin)
   'BTC-TESTNET': BTC_TESTNET,
diff --git a/app/images/megaeth-mainnet-logo.png b/app/images/megaeth-mainnet-logo.png
index 2abc2a3f9f4d..d89c1d851469 100644
Binary files a/app/images/megaeth-mainnet-logo.png and b/app/images/megaeth-mainnet-logo.png differ
diff --git a/app/images/monad-mainnet-logo.png b/app/images/monad-mainnet-logo.png
index 793ea61de974..acf969c4cc9c 100644
Binary files a/app/images/monad-mainnet-logo.png and b/app/images/monad-mainnet-logo.png differ
diff --git a/app/images/sei.png b/app/images/sei.png
index e240d3ea7ba5..9f1dedc54251 100644
Binary files a/app/images/sei.png and b/app/images/sei.png differ
diff --git a/app/images/tron-logo.png b/app/images/tron-logo.png
new file mode 100644
index 000000000000..39d91c983446
Binary files /dev/null and b/app/images/tron-logo.png differ
diff --git a/app/images/tron.png b/app/images/tron.png
index 8bd7214e3665..d06bbbfc6b14 100644
Binary files a/app/images/tron.png and b/app/images/tron.png differ
diff --git a/app/util/notifications/services/NotificationService.test.ts b/app/util/notifications/services/NotificationService.test.ts
index 59fa43323784..3902cd77a2d2 100644
--- a/app/util/notifications/services/NotificationService.test.ts
+++ b/app/util/notifications/services/NotificationService.test.ts
@@ -10,7 +10,7 @@ import {
   ChannelId,
   notificationChannels,
 } from '../../../util/notifications/androidChannels';
-import NotificationService from './NotificationService';
+import NotificationService, { getPushPermission } from './NotificationService';
 import { store } from '../../../store';
 
 jest.mock('@notifee/react-native', () => ({
@@ -124,6 +124,28 @@ describe('NotificationsService - getBlockedNotifications', () => {
   });
 });
 
+describe('getPushPermission', () => {
+  const arrangeMocks = () => {
+    const mockGetAllPermissions = jest.spyOn(
+      NotificationService,
+      'getAllPermissions',
+    );
+    return { mockGetAllPermissions };
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns the push permission from getAllPermissions', async () => {
+    const mocks = arrangeMocks();
+    mocks.mockGetAllPermissions.mockResolvedValue({ permission: 'authorized' });
+    expect(await getPushPermission()).toBe('authorized');
+    mocks.mockGetAllPermissions.mockResolvedValue({ permission: 'denied' });
+    expect(await getPushPermission()).toBe('denied');
+  });
+});
+
 describe('NotificationService - getAllPermissions', () => {
   const arrangeMocks = () => {
     const mockCreateChannel = jest
diff --git a/app/util/notifications/services/NotificationService.ts b/app/util/notifications/services/NotificationService.ts
index 5a68af48ed6e..1a90ba791412 100644
--- a/app/util/notifications/services/NotificationService.ts
+++ b/app/util/notifications/services/NotificationService.ts
@@ -60,7 +60,9 @@ class NotificationsService {
     }
   }
 
-  async getAllPermissions(shouldOpenSettings = true) {
+  async getAllPermissions(
+    shouldOpenSettings = true,
+  ): Promise<{ permission: 'authorized' | 'denied' }> {
     const promises: Promise<string>[] = notificationChannels.map(
       async (channel: AndroidChannel) =>
         await withTimeout(this.createChannel(channel), 5000),
@@ -174,10 +176,19 @@ class NotificationsService {
 
   async hasPerimssion() {
     const settings = await notifee.getNotificationSettings();
-    return settings.authorizationStatus === AuthorizationStatus.AUTHORIZED ||
-      settings.authorizationStatus === AuthorizationStatus.PROVISIONAL
-      ? ('authorized' as const)
-      : ('denied' as const);
+    // status where we can assume authorized
+    if (
+      [
+        AuthorizationStatus.NOT_DETERMINED,
+        AuthorizationStatus.AUTHORIZED,
+        AuthorizationStatus.PROVISIONAL,
+      ].includes(settings.authorizationStatus)
+    ) {
+      return 'authorized' as const;
+    }
+
+    // Otherwise this settings has been denied
+    return 'denied' as const;
   }
 
   onForegroundEvent = (
@@ -311,3 +322,8 @@ export async function hasPushPermission() {
   const result = await NotificationService.getAllPermissions(false);
   return result.permission === 'authorized';
 }
+
+export async function getPushPermission() {
+  const result = await NotificationService.getAllPermissions(false);
+  return result.permission;
+}
diff --git a/app/util/notifications/settings/auth.ts b/app/util/notifications/settings/auth.ts
deleted file mode 100644
index b576e4cc6eca..000000000000
--- a/app/util/notifications/settings/auth.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function mmAuth() {
-  // TODO: This will be used to host all interactions with MM auth
-}
diff --git a/app/util/notifications/settings/firebase.ts b/app/util/notifications/settings/firebase.ts
deleted file mode 100644
index e19382e0ea54..000000000000
--- a/app/util/notifications/settings/firebase.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function mmFirebase() {
-  // TODO: This will be used to host all interactions with MM storage
-}
diff --git a/app/util/notifications/settings/index.ts b/app/util/notifications/settings/index.ts
index 5a27af866d02..85674ee7cdb7 100644
--- a/app/util/notifications/settings/index.ts
+++ b/app/util/notifications/settings/index.ts
@@ -1,3 +1 @@
-export * from './auth';
 export * from './storage';
-export * from './firebase';
diff --git a/e2e/pages/Settings/SnapSettingsView.ts b/e2e/pages/Settings/SnapSettingsView.ts
index 9c4a3f1400bc..5a139fa6c472 100644
--- a/e2e/pages/Settings/SnapSettingsView.ts
+++ b/e2e/pages/Settings/SnapSettingsView.ts
@@ -1,5 +1,6 @@
 import Matchers from '../../framework/Matchers';
 import Gestures from '../../framework/Gestures';
+import { CommonSelectorsIDs } from '../../selectors/Common.selectors';
 
 class SnapSettingsView {
   get enabledToggle(): DetoxElement {
@@ -14,6 +15,10 @@ class SnapSettingsView {
     return Matchers.getIdentifier('snap-settings-scrollview');
   }
 
+  get backButton(): DetoxElement {
+    return Matchers.getElementByID(CommonSelectorsIDs.BACK_ARROW_BUTTON);
+  }
+
   async toggleEnable(): Promise<void> {
     await Gestures.tap(this.enabledToggle, {
       elemDescription: 'Snap Settings - Toggle Button',
@@ -36,6 +41,12 @@ class SnapSettingsView {
       elemDescription: `Snap Settings - Remove Snap`,
     });
   }
+
+  async tapBackButton(): Promise<void> {
+    await Gestures.tapAtIndex(this.backButton, 0, {
+      elemDescription: 'Snap Settings - Back Button',
+    });
+  }
 }
 
 export default new SnapSettingsView();
diff --git a/e2e/specs/identity/account-syncing/multi-srp.spec.ts b/e2e/specs/identity/account-syncing/multi-srp.spec.ts
index 8ac26c69724e..e3377d9f8436 100644
--- a/e2e/specs/identity/account-syncing/multi-srp.spec.ts
+++ b/e2e/specs/identity/account-syncing/multi-srp.spec.ts
@@ -59,6 +59,7 @@ describe(SmokeIdentity('Account syncing - Mutiple SRPs'), () => {
       },
       async ({ userStorageMockttpController }) => {
         await loginToApp();
+        await device.disableSynchronization(); // All expected syncs are awaited with retries, so disable auto-sync to avoid test flakiness/hangs
 
         // Wait for wallet to be ready after login
         await Assertions.expectElementToBeVisible(WalletView.container, {
@@ -73,6 +74,7 @@ describe(SmokeIdentity('Account syncing - Mutiple SRPs'), () => {
           ),
           {
             description: `Account with name "${DEFAULT_ACCOUNT_NAME}" should be visible`,
+            timeout: 30000,
           },
         );
 
@@ -94,6 +96,7 @@ describe(SmokeIdentity('Account syncing - Mutiple SRPs'), () => {
           ),
           {
             description: `Account with name "${SECOND_ACCOUNT_NAME}" should be visible`,
+            timeout: 30000,
           },
         );
         await AccountListBottomSheet.swipeToDismissAccountsModal(); // the next action taps on the identicon again
@@ -164,6 +167,7 @@ describe(SmokeIdentity('Account syncing - Mutiple SRPs'), () => {
       },
       async () => {
         await loginToApp();
+        await device.disableSynchronization(); // All expected syncs are awaited with retries, so disable auto-sync to avoid test flakiness/hangs
         // Wait for wallet to be ready after login
         await Assertions.expectElementToBeVisible(WalletView.container, {
           description: 'wallet should be visible after login',
diff --git a/e2e/specs/predict/predict-cash-out.spec.ts b/e2e/specs/predict/predict-cash-out.spec.ts
index 6e499432fa5d..271a8b139165 100644
--- a/e2e/specs/predict/predict-cash-out.spec.ts
+++ b/e2e/specs/predict/predict-cash-out.spec.ts
@@ -44,7 +44,7 @@ const PredictionMarketFeature = async (mockServer: Mockttp) => {
 };
 
 describe(SmokePredictions('Predictions'), () => {
-  it('should cash out on open position: Spurs vs. Pelicans', async () => {
+  it.skip('should cash out on open position: Spurs vs. Pelicans', async () => {
     await withFixtures(
       {
         fixture: new FixtureBuilder().withPolygon().build(),
diff --git a/e2e/specs/snaps/test-snap-management.spec.ts b/e2e/specs/snaps/test-snap-management.spec.ts
index ad04139a1a50..6040a646e885 100644
--- a/e2e/specs/snaps/test-snap-management.spec.ts
+++ b/e2e/specs/snaps/test-snap-management.spec.ts
@@ -41,6 +41,10 @@ describe(FlaskBuildTests('Snap Management Tests'), () => {
         await SnapSettingsView.selectSnap('Dialog Example Snap');
         await SnapSettingsView.toggleEnable();
 
+        await SnapSettingsView.tapBackButton();
+        await SnapSettingsView.tapBackButton();
+        await SettingsView.tapCloseButton();
+
         await TabBarComponent.tapBrowser();
 
         await TestSnaps.tapButton('sendAlertButton');
@@ -61,10 +65,15 @@ describe(FlaskBuildTests('Snap Management Tests'), () => {
       },
       async () => {
         await TabBarComponent.tapSettings();
+        await SettingsView.tapSnaps();
 
         await SnapSettingsView.selectSnap('Dialog Example Snap');
         await SnapSettingsView.toggleEnable();
 
+        await SnapSettingsView.tapBackButton();
+        await SnapSettingsView.tapBackButton();
+        await SettingsView.tapCloseButton();
+
         await TabBarComponent.tapBrowser();
 
         await TestSnaps.tapButton('sendAlertButton');
@@ -86,6 +95,7 @@ describe(FlaskBuildTests('Snap Management Tests'), () => {
       },
       async () => {
         await TabBarComponent.tapSettings();
+        await SettingsView.tapSnaps();
 
         await SnapSettingsView.selectSnap('Dialog Example Snap');
         await SnapSettingsView.removeSnap();
diff --git a/e2e/tags.js b/e2e/tags.js
index 67b9a30c3425..c51e5c1ba266 100644
--- a/e2e/tags.js
+++ b/e2e/tags.js
@@ -2,16 +2,20 @@
 const smokeTags = {
   smokeAccounts: {
     tag: 'SmokeAccounts:',
-    description: 'Multi-account, account management',
+    description: 'Multi-account, account management, BIP-44, Keyrings',
+  },
+  smokeCore: {
+    tag: 'SmokeCore:',
+    description:
+      'Core wallet functionality, framework, react native, app state, navigation',
   },
-  smokeCore: { tag: 'SmokeCore:', description: 'Core wallet functionality' },
   smokeConfirmationsRedesigned: {
     tag: 'SmokeConfirmationsRedesigned:',
     description: 'New confirmation UI as well as all confirmation flows',
   },
   smokeIdentity: {
     tag: 'SmokeIdentity:',
-    description: 'User identity, authentication',
+    description: 'Sync accounts, sync contacts',
   },
   smokeNetworkAbstractions: {
     tag: 'SmokeNetworkAbstractions:',
@@ -21,18 +25,21 @@ const smokeTags = {
     tag: 'SmokeNetworkExpansion:',
     description: 'New networks, network config (Solana, Bitcoin, etc)',
   },
-  smokeTrade: { tag: 'SmokeTrade:', description: 'Token swaps, DEX trading' },
+  smokeTrade: {
+    tag: 'SmokeTrade:',
+    description: 'Token swaps, bridge, DEX trading',
+  },
   smokeWalletPlatform: {
     tag: 'SmokeWalletPlatform:',
     description: 'Core wallet, accounts, network switching',
   },
   smokeWalletUX: {
     tag: 'SmokeWalletUX:',
-    description: 'Wallet user experience and UI',
+    description: 'Wallet user experience and UI, settings, notifications, etc',
   },
   smokeAssets: {
     tag: 'SmokeAssets:',
-    description: 'Asset management and display',
+    description: 'Asset management and display, NFTs, token details, etc',
   },
   smokeSwaps: { tag: 'SmokeSwaps:', description: 'Token swap functionality' },
   smokeStake: { tag: 'SmokeStake:', description: 'Staking features' },
@@ -46,10 +53,13 @@ const smokeTags = {
     description: 'Rewards and incentive features',
   },
   smokePerps: { tag: 'SmokePerps:', description: 'Perpetuals trading' },
-  smokeRamps: { tag: 'SmokeRamps:', description: 'On/off ramp features' },
+  smokeRamps: {
+    tag: 'SmokeRamps:',
+    description: 'On/off ramp features, buy/sell',
+  },
   smokeMultiChainPermissions: {
     tag: 'SmokeMultiChainPermissions:',
-    description: 'Multi-chain permissions',
+    description: 'Multi-chain permissions, permission management',
   },
   smokeAnalytics: { tag: 'SmokeAnalytics:', description: 'Analytics' },
   smokeMultiChainAPI: {
@@ -58,7 +68,7 @@ const smokeTags = {
   },
   smokePredictions: {
     tag: 'SmokePredictions:',
-    description: 'Predictions features',
+    description: 'Predictions features, prediction market',
   },
 };
 
diff --git a/e2e/tools/e2e-ai-analyzer/analysis/analyzer.ts b/e2e/tools/e2e-ai-analyzer/analysis/analyzer.ts
index d73b4e3e2402..9fd5706a4f0c 100644
--- a/e2e/tools/e2e-ai-analyzer/analysis/analyzer.ts
+++ b/e2e/tools/e2e-ai-analyzer/analysis/analyzer.ts
@@ -140,19 +140,27 @@ export async function analyzeWithAgent<M extends ModeKey>(
             },
           );
 
-          // Log tool result summary
+          // Log tool result with status indicator
+          const errorPattern =
+            /^(Error:|Invalid|Tool error:|Unknown tool:|File not found:|Directory not found:)|Error (searching|finding|reading)|Could not get|Cannot extract/;
+          const emptyPattern = /No (matches found|git diff|related|importers)/;
+
+          const isError = errorPattern.test(toolResult);
+          const isEmpty = emptyPattern.test(toolResult);
+
+          let status = '✅';
+          if (isError) status = '❌';
+          else if (isEmpty) status = '📭';
+
           const resultPreview = toolResult
-            .substring(0, 150)
+            .substring(0, 120)
             .replace(/\n/g, ' ');
           console.log(
-            `   → ${resultPreview}${toolResult.length > 150 ? '...' : ''}`,
+            `   ${status} ${resultPreview}${
+              toolResult.length > 120 ? '...' : ''
+            }`,
           );
 
-          // Check for actual errors (starts with "Error:")
-          if (toolResult.startsWith('Error:')) {
-            console.log(`   ⚠️ Tool returned error`);
-          }
-
           // Handle finalize tool (mode-specific)
           if (toolUse.name === modeConfig.finalizeToolName) {
             const analysis = await modeConfig.processAnalysis(
diff --git a/e2e/tools/e2e-ai-analyzer/modes/select-tags/prompt.ts b/e2e/tools/e2e-ai-analyzer/modes/select-tags/prompt.ts
index 19328da32a01..35f4b3fc508d 100644
--- a/e2e/tools/e2e-ai-analyzer/modes/select-tags/prompt.ts
+++ b/e2e/tools/e2e-ai-analyzer/modes/select-tags/prompt.ts
@@ -16,15 +16,14 @@ import { CLAUDE_CONFIG } from '../../config';
  * Builds the system prompt, i.e. the initial system message
  */
 export function buildSystemPrompt(): string {
-  const role = `You are an expert in the E2E testing of MetaMask Mobile.`;
-  const goal = `GOAL: Analyze code changes and select appropriate test tags to run.`;
-
+  const role = `You are an expert in E2E testing for MetaMask Mobile, responsible for analyzing code changes in pull requests to determine which tests are necessary for adequate validation.`;
+  const goal = `GOAL: Implement a risk-based testing strategy by identifying and running only the tests relevant to the specific changes introduced in the PR, while safely skipping unrelated tests.`;
   const guidanceSection = `GUIDANCE:
-Use your judgment - selecting all tags is acceptable (recommended as conservative approach), as well as selecting none of them.
-Critical files (marked in file list) typically warrant testing. Use tools to investigate when uncertain.
+Use your judgment - selecting all tags is acceptable (recommended as conservative approach for risky changes), as well as selecting none of them if the changes are unrisky.
+Critical files (marked in file list) typically warrant wide testing. Use tools to investigate the impact of the changes.
 For E2E test infrastructure related changes, consider running the necessary tests or all of them in case the changes are wide-ranging.
-Balance thoroughness with efficiency, and be conservative in the assessment of risk and tags to run.
-Do not exceed the maximum number of analysis iterations which is ${CLAUDE_CONFIG.maxIterations}.`;
+Balance thoroughness with efficiency, and be conservative in your risk assessment. When in doubt, err on the side of running more test tags to ensure adequate coverage.
+Do not exceed the maximum number of analysis iterations which is ${CLAUDE_CONFIG.maxIterations}, i.e. try to decide before the maximum number of iterations is reached.`;
 
   const prompt = [
     role,
@@ -67,13 +66,12 @@ export function buildTaskPrompt(
     otherFiles.forEach((f) => fileList.push(`  ${f}`));
   }
 
-  const instruction = `Analyze the changed files and select the E2E test tags to run so the tests can verify the changes.`;
-  const tagsSection = `AVAILABLE TEST TAGS:\n${tagCoverageList}`;
+  const instruction = `Analyze the changed files and the impacted codebase to select the E2E test tags to run so the changes can be verified safely with minimal risk.`;
+  const tagsSection = `AVAILABLE TEST TAGS (select from these and don't search for additional tags):\n${tagCoverageList}`;
   const filesSection = `CHANGED FILES (${
     allFiles.length
   } total):\n${fileList.join('\n')}`;
-  const closing = `Use tools to investigate. Call finalize_tag_selection when ready.`;
-
+  const closing = `Investigate efficiently (consider using several tool calls in the same iteration), then call finalize_tag_selection when ready`;
   const prompt = [instruction, tagsSection, filesSection, closing].join('\n\n');
 
   return prompt;
diff --git a/locales/languages/en.json b/locales/languages/en.json
index 145ad8ce67ed..c9e04b8b8c59 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -6481,7 +6481,7 @@
       "email_placeholder": "Enter your email address",
       "password_placeholder": "Enter your password",
       "login_button": "Log in",
-      "signup_button": "Sign up",
+      "signup_button": "I don't have an account",
       "errors": {
         "invalid_credentials": "Invalid login details",
         "unknown_error": "Unknown error, please try again later",