Skip to content
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

[CP Staging] fix: wait for navigation ready state before signing in #35827

Merged
merged 2 commits into from
Feb 5, 2024
Merged

[CP Staging] fix: wait for navigation ready state before signing in #35827

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbc4204
fix: wait for navigation ready state before signing in
aswin-s Feb 5, 2024
484116c
fix: redirect to signin page on validation failure
aswin-s Feb 5, 2024
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
28 changes: 21 additions & 7 deletions src/pages/ValidateLoginPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {withOnyx} from 'react-native-onyx';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import Navigation from '@libs/Navigation/Navigation';
import * as Session from '@userActions/Session';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {ValidateLoginPageOnyxNativeProps, ValidateLoginPageProps} from './types';

Expand All @@ -13,16 +14,29 @@ function ValidateLoginPage({
session,
}: ValidateLoginPageProps<ValidateLoginPageOnyxNativeProps>) {
useEffect(() => {
if (session?.authToken) {
// If already signed in, do not show the validate code if not on web,
// because we don't want to block the user with the interstitial page.
Navigation.goBack();
} else {
Session.signInWithValidateCodeAndNavigate(Number(accountID), validateCode);
}
// Wait till navigation becomes available
Navigation.isNavigationReady().then(() => {
if (session?.authToken) {
// If already signed in, do not show the validate code if not on web,
// because we don't want to block the user with the interstitial page.
Navigation.goBack();
} else {
Session.signInWithValidateCodeAndNavigate(Number(accountID), validateCode);
}
});
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

useEffect(() => {
if (session?.autoAuthState !== CONST.AUTO_AUTH_STATE.FAILED) {
return;
}
// Go back to initial route if validation fails
Navigation.isNavigationReady().then(() => {
Navigation.goBack();
});
}, [session?.autoAuthState]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were you able to find the root cause? How come it used to work before?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is because of navigation refactor. User should be redirected back to sign-in page if code validation fails.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know it's from navigation refactor. But wanted to know exactly which code caused this.
This file was not changed recently


return <FullScreenLoadingIndicator />;
}

Expand Down
Loading