feat(card): migrate card on-chain checks to CardController

app/components/Nav/Main/index.js

@@ -94,7 +94,6 @@
 } from '../../hooks/useNetworksByNamespace/useNetworksByNamespace';
 import { useNetworkSelection } from '../../hooks/useNetworkSelection/useNetworkSelection';
 import { useIsOnBridgeRoute } from '../../UI/Bridge/hooks/useIsOnBridgeRoute';
-import { CardVerification } from '../../UI/Card/sdk';
 
 const Stack = createStackNavigator();
 
@@ -168,7 +167,7 @@
     } else {
       props.setInfuraAvailabilityNotBlocked();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
     props.navigation,
     props.providerType,
@@ -379,7 +378,7 @@
       removeConnectionStatusListener.current &&
         removeConnectionStatusListener.current();
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [connectionChangeHandler]);
 
   const openDeprecatedNetworksArticle = () => {
@@ -420,7 +419,6 @@
         <FadeOutOverlay />
         <Notification navigation={props.navigation} />
         <RampOrders />
-        <CardVerification />
         <EarnTransactionMonitor />
         {renderDeprecatedNetworkAlert(
           props.chainId,

app/components/UI/Card/Views/CardAuthentication/CardAuthentication.test.tsx

@@ -11,6 +11,17 @@ jest.mock('../../../../../util/analytics/whenEngineReady', () => ({
   default: jest.fn().mockResolvedValue(undefined),
 }));
 
+jest.mock('../../../../../core/Engine', () => ({
+  __esModule: true,
+  default: {
+    context: {
+      CardController: {
+        setUserLocation: jest.fn(),
+      },
+    },
+  },
+}));
+
 const mockNavigate = jest.fn();
 const mockGoBack = jest.fn();
 const mockReset = jest.fn();

app/components/UI/Card/Views/CardAuthentication/CardAuthentication.tsx

@@ -24,11 +24,9 @@ import Logger from '../../../../../util/Logger';
 import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import { useDispatch, useSelector } from 'react-redux';
-import {
-  selectUserCardLocation,
-  setOnboardingId,
-  setUserCardLocation,
-} from '../../../../../core/redux/slices/card';
+import { setOnboardingId } from '../../../../../core/redux/slices/card';
+import { selectCardUserLocation } from '../../../../../selectors/cardController';
+import Engine from '../../../../../core/Engine';
 import { CardActions, CardScreens } from '../../util/metrics';
 import OnboardingStep from '../../components/Onboarding/OnboardingStep';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
@@ -49,7 +47,7 @@ const CardAuthentication = () => {
   const [password, setPassword] = useState('');
   const [isPasswordVisible, setIsPasswordVisible] = useState(false);
   const [loading, setLoading] = useState(false);
-  const location = useSelector(selectUserCardLocation);
+  const location = useSelector(selectCardUserLocation);
   const [otpData, setOtpData] = useState<{
     userId: string;
     maskedPhoneNumber?: string;
@@ -357,7 +355,9 @@ const CardAuthentication = () => {
         <>
           <Box twClassName="flex-row justify-between gap-2">
             <TouchableOpacity
-              onPress={() => dispatch(setUserCardLocation('international'))}
+              onPress={() =>
+                Engine.context.CardController.setUserLocation('international')
+              }
               style={tw.style(
                 `flex flex-col items-center justify-center flex-1 bg-background-muted rounded-lg ${location === 'international' ? 'border border-text-default' : ''}`,
               )}
@@ -376,7 +376,9 @@ const CardAuthentication = () => {
               </Box>
             </TouchableOpacity>
             <TouchableOpacity
-              onPress={() => dispatch(setUserCardLocation('us'))}
+              onPress={() =>
+                Engine.context.CardController.setUserLocation('us')
+              }
               style={tw.style(
                 `flex flex-col items-center justify-center flex-1 bg-background-muted rounded-lg ${location === 'us' ? 'border border-text-default' : ''}`,
               )}
@@ -460,7 +462,6 @@ const CardAuthentication = () => {
       resendCooldown,
       step,
       tw,
-      dispatch,
       location,
     ],
   );

app/components/UI/Card/Views/CardHome/CardHome.test.tsx

@@ -90,10 +90,10 @@ import {
 } from '../../../../../selectors/featureFlagController/deposit';
 import { selectMetalCardCheckoutFeatureFlag } from '../../../../../selectors/featureFlagController/card';
 import {
+  selectIsCardAuthenticated,
   selectCardholderAccounts,
-  selectIsAuthenticatedCard,
-  selectUserCardLocation,
-} from '../../../../../core/redux/slices/card';
+  selectCardUserLocation,
+} from '../../../../../selectors/cardController';
 import { useIsSwapEnabledForPriorityToken } from '../../hooks/useIsSwapEnabledForPriorityToken';
 import useCardDetailsToken from '../../hooks/useCardDetailsToken';
 import useCardPinToken from '../../hooks/useCardPinToken';
@@ -376,9 +376,6 @@ jest.mock('../../util/cardTokenVault', () => ({
 }));
 
 // Mock Redux card actions
-const mockResetAuthenticatedData = jest.fn(() => ({
-  type: 'card/resetAuthenticatedData',
-}));
 const mockClearAllCache = jest.fn(() => ({
   type: 'card/clearAllCache',
 }));
@@ -388,7 +385,6 @@ jest.mock('../../../../../core/redux/slices/card', () => {
   );
   return {
     ...actualModule,
-    resetAuthenticatedData: () => mockResetAuthenticatedData(),
     clearAllCache: () => mockClearAllCache(),
   };
 });
@@ -422,6 +418,9 @@ jest.mock('../../../../../core/Engine', () => ({
         getAccountByAddress: jest.fn().mockReturnValue({ id: 'account-id' }),
         setSelectedAccount: jest.fn(),
       },
+      CardController: {
+        validateAndRefreshSession: jest.fn().mockResolvedValue(undefined),
+      },
     },
   },
 }));
@@ -601,8 +600,8 @@ function setupMockSelectors(
     if (selector === selectDepositMinimumVersionFlag)
       return config.depositMinVersion;
     if (selector === selectCardholderAccounts) return config.cardholderAccounts;
-    if (selector === selectIsAuthenticatedCard) return config.isAuthenticated;
-    if (selector === selectUserCardLocation) return config.userLocation;
+    if (selector === selectIsCardAuthenticated) return config.isAuthenticated;
+    if (selector === selectCardUserLocation) return config.userLocation;
     if (selector === selectMetalCardCheckoutFeatureFlag)
       return config.isMetalCardCheckoutEnabled;
 
@@ -725,7 +724,6 @@ describe('CardHome Component', () => {
     mockIsAuthenticationError.mockReturnValue(false); // Default to no auth error
     mockRemoveCardBaanxToken.mockClear();
     mockRemoveCardBaanxToken.mockResolvedValue(undefined);
-    mockResetAuthenticatedData.mockClear();
     mockClearAllCache.mockClear();
     mockNavigationDispatch.mockClear();
 
@@ -2619,9 +2617,6 @@ describe('CardHome Component', () => {
       });
 
       await waitFor(() => {
-        expect(mockDispatch).toHaveBeenCalledWith(
-          expect.objectContaining({ type: 'card/resetAuthenticatedData' }),
-        );
         expect(mockRemoveQueries).toHaveBeenCalled();
       });
 
@@ -2652,7 +2647,6 @@ describe('CardHome Component', () => {
 
       // Then: should not trigger authentication error handling
       expect(mockRemoveCardBaanxToken).not.toHaveBeenCalled();
-      expect(mockResetAuthenticatedData).not.toHaveBeenCalled();
       expect(mockRemoveQueries).not.toHaveBeenCalled();
       expect(mockNavigationDispatch).not.toHaveBeenCalledWith(
         expect.objectContaining({ type: 'REPLACE' }),
@@ -2673,7 +2667,6 @@ describe('CardHome Component', () => {
 
       // Then: should not trigger authentication error handling
       expect(mockRemoveCardBaanxToken).not.toHaveBeenCalled();
-      expect(mockResetAuthenticatedData).not.toHaveBeenCalled();
       expect(mockRemoveQueries).not.toHaveBeenCalled();
     });
 
@@ -2691,7 +2684,6 @@ describe('CardHome Component', () => {
 
       // Then: should not trigger authentication error handling
       expect(mockRemoveCardBaanxToken).not.toHaveBeenCalled();
-      expect(mockResetAuthenticatedData).not.toHaveBeenCalled();
       expect(mockRemoveQueries).not.toHaveBeenCalled();
       expect(mockNavigationDispatch).not.toHaveBeenCalledWith(
         expect.objectContaining({ type: 'REPLACE' }),
@@ -2750,9 +2742,6 @@ describe('CardHome Component', () => {
       });
 
       await waitFor(() => {
-        expect(mockDispatch).toHaveBeenCalledWith(
-          expect.objectContaining({ type: 'card/resetAuthenticatedData' }),
-        );
         expect(mockRemoveQueries).toHaveBeenCalled();
       });
     });
@@ -2857,9 +2846,6 @@ describe('CardHome Component', () => {
       // Then: should clear auth state and navigate to welcome
       await waitFor(() => {
         expect(mockRemoveCardBaanxToken).toHaveBeenCalled();
-        expect(mockDispatch).toHaveBeenCalledWith(
-          expect.objectContaining({ type: 'card/resetAuthenticatedData' }),
-        );
         expect(mockRemoveQueries).toHaveBeenCalled();
         expect(StackActions.replace).toHaveBeenCalledWith(
           Routes.CARD.AUTHENTICATION,
@@ -2877,13 +2863,6 @@ describe('CardHome Component', () => {
         callOrder.push('removeToken');
       });
 
-      mockDispatch.mockImplementation((action) => {
-        if (action.type === 'card/resetAuthenticatedData') {
-          callOrder.push('resetAuth');
-        }
-        return action;
-      });
-
       mockRemoveQueries.mockImplementation(() => {
         callOrder.push('removeQueries');
       });
@@ -2902,12 +2881,7 @@ describe('CardHome Component', () => {
 
       // Then: operations should execute in correct order
       await waitFor(() => {
-        expect(callOrder).toEqual([
-          'removeToken',
-          'resetAuth',
-          'removeQueries',
-          'navigate',
-        ]);
+        expect(callOrder).toEqual(['removeToken', 'removeQueries', 'navigate']);
       });
     });
 
@@ -2930,11 +2904,8 @@ describe('CardHome Component', () => {
         expect(mockRemoveCardBaanxToken).toHaveBeenCalled();
       });
 
-      // 2. Dispatch Redux actions and clear query cache
+      // 2. Clear query cache
       await waitFor(() => {
-        expect(mockDispatch).toHaveBeenCalledWith(
-          expect.objectContaining({ type: 'card/resetAuthenticatedData' }),
-        );
         expect(mockRemoveQueries).toHaveBeenCalled();
       });
 

app/components/UI/Card/Views/CardHome/CardHome.tsx

@@ -76,10 +76,7 @@ import {
 } from '../../constants';
 import { useCardSDK } from '../../sdk';
 import Routes from '../../../../../constants/navigation/Routes';
-import {
-  resetAuthenticatedData,
-  selectUserCardLocation,
-} from '../../../../../core/redux/slices/card';
+import { selectCardUserLocation } from '../../../../../selectors/cardController';
 import { cardQueries } from '../../queries';
 import { selectMetalCardCheckoutFeatureFlag } from '../../../../../selectors/featureFlagController/card';
 import CardMessageBox from '../../components/CardMessageBox/CardMessageBox';
@@ -144,7 +141,7 @@ const CardHome = () => {
   const [isHandlingAuthError, setIsHandlingAuthError] = useState(false);
   const { toastRef } = useContext(ToastContext);
   const { logoutFromProvider, isLoading: isSDKLoading } = useCardSDK();
-  const userLocation = useSelector(selectUserCardLocation);
+  const userLocation = useSelector(selectCardUserLocation);
   const isMetalCardCheckoutEnabled = useSelector(
     selectMetalCardCheckoutFeatureFlag,
   );
@@ -1130,12 +1127,16 @@ const CardHome = () => {
 
       try {
         await removeCardBaanxToken();
+        // Sync controller state: token is now gone so validateAndRefreshSession
+        // will mark CardController.isAuthenticated = false without an API call.
+        await Engine.context.CardController.validateAndRefreshSession().catch(
+          () => undefined,
+        );
 
         if (isComponentUnmountedRef.current) {
           return;
         }
 
-        dispatch(resetAuthenticatedData());
         queryClient.removeQueries({ queryKey: cardQueries.keys.all() });
 
         toastRef?.current?.showToast({
@@ -1159,7 +1160,7 @@ const CardHome = () => {
     };
 
     handleAuthenticationError();
-  }, [cardError, dispatch, queryClient, isAuthenticated, navigation, toastRef]);
+  }, [cardError, queryClient, isAuthenticated, navigation, toastRef]);
 
   useEffect(() => {
     if (isSDKLoading) {

app/components/UI/Card/Views/CardWelcome/CardWelcome.test.tsx

@@ -59,10 +59,20 @@ jest.mock('../../../../../util/theme', () => {
   };
 });
 
-const createTestStore = (initialState = {}) =>
+const createTestStore = (
+  initialState: { cardholderAccounts?: string[] } = {},
+) =>
   configureStore({
     reducer: {
-      card: (state = { cardholderAccounts: [], ...initialState }) => state,
+      engine: (
+        state = {
+          backgroundState: {
+            CardController: {
+              cardholderAccounts: initialState.cardholderAccounts ?? [],
+            },
+          },
+        },
+      ) => state,
     },
   });
 

app/components/UI/Card/Views/CardWelcome/CardWelcome.tsx

@@ -22,7 +22,7 @@ import Routes from '../../../../../constants/navigation/Routes';
 import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import { CardActions, CardScreens } from '../../util/metrics';
-import { selectHasCardholderAccounts } from '../../../../../core/redux/slices/card';
+import { selectHasCardholderAccounts } from '../../../../../selectors/cardController';
 import { useSelector } from 'react-redux';
 
 const CardWelcome = () => {

app/components/UI/Card/components/AssetSelectionBottomSheet/AssetSelectionBottomSheet.test.tsx

@@ -220,12 +220,7 @@ describe('AssetSelectionBottomSheet', () => {
   beforeEach(() => {
     jest.clearAllMocks();
 
-    mockUseSelector.mockImplementation((selector) => {
-      if (selector.toString().includes('selectUserCardLocation')) {
-        return 'international';
-      }
-      return undefined;
-    });
+    mockUseSelector.mockReturnValue(undefined);
 
     (useAssetBalances as jest.Mock).mockReturnValue(new Map());
 
@@ -393,12 +388,7 @@ describe('AssetSelectionBottomSheet', () => {
 
   describe('token sorting', () => {
     it('sorts tokens by priority', () => {
-      mockUseSelector.mockImplementation((selector) => {
-        if (selector.toString().includes('selectUserCardLocation')) {
-          return 'international';
-        }
-        return undefined;
-      });
+      mockUseSelector.mockReturnValue(undefined);
       const token1 = createMockToken({
         symbol: 'USDC',
         priority: 2,

app/components/UI/Card/components/CardButton/CardButton.test.tsx

@@ -51,9 +51,7 @@ function renderWithProvider(
           },
         },
         card: {
-          cardholderAccounts: [],
           hasViewedCardButton: false,
-          isLoaded: false,
           ...cardState,
         },
       },

app/components/UI/Card/components/CardButton/CardButton.tsx

@@ -25,7 +25,6 @@ import {
   CARD_BUTTON_BADGE_AB_KEY,
   CARD_BUTTON_BADGE_VARIANTS,
 } from './abTestConfig';
-import Logger from '../../../../../util/Logger';
 
 interface CardButtonProps {
   onPress: () => void;
@@ -56,9 +55,6 @@ const CardButton: React.FC<CardButtonProps> = ({ onPress, touchAreaSlop }) => {
   useEffect(() => {
     if (hasTrackedViewedEvent.current || !flagsResolved) return;
     hasTrackedViewedEvent.current = true;
-    Logger.log({
-      active_ab_tests: [{ key: CARD_BUTTON_BADGE_AB_KEY, value: variantName }],
-    });
 
     trackEvent(
       createEventBuilder(MetaMetricsEvents.CARD_BUTTON_VIEWED)