Merge pull request #87996 from callstack-internal/fix/87757-plaid-redirect-issue

[CP staging] Fix Plaid redirect issue on iOS

(cherry picked from commit fca974f)

(cherry-picked to staging by AndrewGable)

Author: amyevans

src/libs/Navigation/helpers/getAdaptedStateFromPath.ts

@@ -354,6 +354,13 @@ const getAdaptedStateFromPath: GetAdaptedStateFromPath = (path, options, shouldR
         normalizedPath = '/';
     }
 
+    // The Plaid OAuth redirect URI for iOS (partners/plaid/oauth_ios) is not a registered route.
+    // When this URL is processed — either as a deep link or opened in Safari — redirect to home
+    // to avoid showing NotFound. The native Plaid SDK handles the actual OAuth callback separately.
+    if (normalizedPath.startsWith('/partners/plaid/oauth_ios')) {
+        normalizedPath = '/';
+    }
+
     const state = getStateFromPath(normalizedPath as RoutePath) as PartialState<NavigationState<RootNavigatorParamList>>;
     if (shouldReplacePathInNestedState) {
         replacePathInNestedState(state, normalizedPath);

src/libs/actions/Link.ts

@@ -281,6 +281,11 @@ function openReportFromDeepLink(
         return;
     }
 
+    // The Plaid OAuth redirect URI is handled by the native Plaid SDK on iOS — skip navigation to avoid showing NotFound
+    if (route?.includes('partners/plaid/oauth_ios')) {
+        return;
+    }
+
     // Navigate to the report after sign-in/sign-up.
     // eslint-disable-next-line @typescript-eslint/no-deprecated
     InteractionManager.runAfterInteractions(() => {

src/pages/settings/Wallet/PersonalCards/steps/PlaidConnectionStep.tsx

@@ -13,6 +13,7 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {setAddNewPersonalCardStepAndData} from '@libs/actions/PersonalCards';
+import getPlaidOAuthReceivedRedirectURI from '@libs/getPlaidOAuthReceivedRedirectURI';
 import KeyboardShortcut from '@libs/KeyboardShortcut';
 import Log from '@libs/Log';
 import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan';
@@ -33,9 +34,10 @@ type PlaidLinkContentProps = {
     onError: (error: ErrorEvent | null) => void;
     onEvent: (eventName: string) => void;
     onExit: () => void;
+    receivedRedirectURI?: string;
 };
 
-function PlaidLinkContent({plaidLinkToken, plaidDataErrorMessage, plaidData, onSuccess, onError, onEvent, onExit}: PlaidLinkContentProps) {
+function PlaidLinkContent({plaidLinkToken, plaidDataErrorMessage, plaidData, onSuccess, onError, onEvent, onExit, receivedRedirectURI}: PlaidLinkContentProps) {
     const styles = useThemeStyles();
 
     if (plaidLinkToken) {
@@ -46,6 +48,7 @@ function PlaidLinkContent({plaidLinkToken, plaidDataErrorMessage, plaidData, onS
                 onError={onError}
                 onEvent={onEvent}
                 onExit={onExit}
+                receivedRedirectURI={receivedRedirectURI}
             />
         );
     }
@@ -202,6 +205,7 @@ function PlaidConnectionStep({feed, onExit}: {feed?: CompanyCardFeedWithDomainID
                         onError={handlePlaidLinkError}
                         onEvent={handlePlaidLinkEvent}
                         onExit={handlePlaidLinkExit}
+                        receivedRedirectURI={getPlaidOAuthReceivedRedirectURI()}
                     />
                 </FullPageOfflineBlockingView>
             )}

src/pages/workspace/companyCards/addNew/PlaidConnectionStep.tsx

@@ -13,6 +13,7 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {setAddNewCompanyCardStepAndData, setAssignCardStepAndData} from '@libs/actions/CompanyCards';
+import getPlaidOAuthReceivedRedirectURI from '@libs/getPlaidOAuthReceivedRedirectURI';
 import KeyboardShortcut from '@libs/KeyboardShortcut';
 import Log from '@libs/Log';
 import {getDomainNameForPolicy} from '@libs/PolicyUtils';
@@ -121,6 +122,7 @@ function PlaidConnectionStep({feed, policyID, onExit, title}: PlaidConnectionSte
             return (
                 <PlaidLink
                     token={plaidLinkToken}
+                    receivedRedirectURI={getPlaidOAuthReceivedRedirectURI()}
                     onSuccess={({publicToken, metadata}) => {
                         // on success we need to move to bank connection screen with token, bank name = plaid
                         Log.info('[PlaidLink] Success!');