Skip to content

Remove code that explicitly pushed to MFA outcome screens #94103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neil-marcellini merged 6 commits into from
Jun 26, 2026
Merged

Remove code that explicitly pushed to MFA outcome screens #94103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3223b42
Animate entire MFA panel out on finishClose
chuckdries Jun 19, 2026
797364f
Revert "Animate entire MFA panel out on finishClose"
chuckdries Jun 23, 2026
9e67140
Remove override for OUTCOME_SCREENs in mfaNavigation `navigate`
chuckdries Jun 23, 2026
8506037
Merge remote-tracking branch 'origin/main' into chuckdries/mobile-3ds…
chuckdries Jun 23, 2026
1cd41a1
Fix lint mfaNavigation.ts
chuckdries Jun 24, 2026
7374965
MFA Navigator: use popToTop for dismissal
chuckdries Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions src/components/MultifactorAuthentication/mfaNavigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {createNavigationContainerRef, StackActions} from '@react-navigation/native';
import type {MultifactorAuthenticationModalNavigatorParamList} from '@libs/Navigation/types';
import CONFIG from '@src/CONFIG';
import SCREENS from '@src/SCREENS';

/**
Expand All @@ -16,12 +15,6 @@ type MultifactorAuthenticationModalNavigatorInternalParamList = MultifactorAuthe

const mfaNavigationRef = createNavigationContainerRef<MultifactorAuthenticationModalNavigatorInternalParamList>();

// Outcome screens are terminal states the flow ends on.
const OUTCOME_SCREENS = new Set<keyof MultifactorAuthenticationModalNavigatorParamList>([
SCREENS.MULTIFACTOR_AUTHENTICATION.OUTCOME_SUCCESS,
SCREENS.MULTIFACTOR_AUTHENTICATION.OUTCOME_FAILURE,
]);

// Screens that live inside this independent overlay navigator. REVOKE and AUTHORIZE_TRANSACTION are intentionally excluded: they
// render in the main RHP modal stack, not this tree.
const MFA_OVERLAY_SCREENS = new Set<string>([
Expand Down Expand Up @@ -71,16 +64,6 @@ function navigate<T extends keyof MultifactorAuthenticationModalNavigatorParamLi
return;
}

// In HybridApp the MFA overlay renders in an independent BaseNavigationContainer presented inside a native
// modal, where StackActions.replace silently fails to commit (the computed state is never applied), stranding
// the user on the spinner-bearing Prompt screen. For the terminal outcome screens we push instead, which
// commits reliably; outcome screens end the flow (the stack is reset when the overlay closes) so the extra
// stack entry has no downside. Standalone keeps replace, where it works as expected.
if (CONFIG.IS_HYBRID_APP && OUTCOME_SCREENS.has(screen)) {
mfaNavigationRef.dispatch(StackActions.push(screen, params));
return;
}

mfaNavigationRef.dispatch(StackActions.replace(screen, params));
}

Expand Down
4 changes: 2 additions & 2 deletions src/libs/Navigation/AppNavigator/Navigators/MultifactorAuthenticationModalNavigator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {BaseNavigationContainer, NavigationIndependentTree} from '@react-navigation/core';
import {BaseNavigationContainer, NavigationIndependentTree, StackActions} from '@react-navigation/core';
import type {StackCardInterpolationProps} from '@react-navigation/stack';
import React, {useEffect, useState} from 'react';
import {StyleSheet, View} from 'react-native';
Expand Down Expand Up @@ -117,7 +117,7 @@ function MultifactorAuthenticationModalNavigator() {
return;
}
if (mfaNavigationRef.isReady() && mfaNavigationRef.canGoBack()) {
mfaNavigationRef.goBack();
mfaNavigationRef.dispatch(StackActions.popToTop());
}
backdropProgress.set(withTiming(0, {duration: CONST.ANIMATED_TRANSITION}));
const handle = Navigation.runAfterUpcomingTransition(() => {
Expand Down
Loading