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

Display not found page for invalid magic code #52407

Merged
merged 7 commits into from
Nov 15, 2024
Merged

Display not found page for invalid magic code #52407

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c5dcf2
display not found page for invalid magic code
mkzie2 Nov 12, 2024
20cb80a
Merge branch 'main' into mkzie2-issue/52124
mkzie2 Nov 13, 2024
b29da7b
remove withOnyx
mkzie2 Nov 13, 2024
a15ba6c
Merge branch 'main' into mkzie2-issue/52124
mkzie2 Nov 14, 2024
022cbdf
use FullPageNotFoundView
mkzie2 Nov 14, 2024
cfff1f6
Merge branch 'main' into mkzie2-issue/52124
mkzie2 Nov 15, 2024
5ab2011
hide back button in wide screen
mkzie2 Nov 15, 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
33 changes: 20 additions & 13 deletions src/components/ValidateCode/ValidateCodeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, {useCallback} from 'react';
import {View} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import {withOnyx} from 'react-native-onyx';
import {useOnyx} from 'react-native-onyx';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import * as Illustrations from '@components/Icon/Illustrations';
Expand All @@ -10,29 +9,39 @@ import TextLink from '@components/TextLink';
import useLocalize from '@hooks/useLocalize';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
import * as ValidationUtils from '@libs/ValidationUtils';
import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
import variables from '@styles/variables';
import * as Session from '@userActions/Session';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Session as SessionType} from '@src/types/onyx';

type ValidateCodeModalOnyxProps = {
/** Session of currently logged in user */
session: OnyxEntry<SessionType>;
};

type ValidateCodeModalProps = ValidateCodeModalOnyxProps & {
type ValidateCodeModalProps = {
/** Code to display. */
code: string;
/** The ID of the account to which the code belongs. */
accountID: number;
};

function ValidateCodeModal({code, accountID, session = {}}: ValidateCodeModalProps) {
function ValidateCodeModal({code, accountID}: ValidateCodeModalProps) {
const theme = useTheme();
const styles = useThemeStyles();
const [session] = useOnyx(ONYXKEYS.SESSION);
const signInHere = useCallback(() => Session.signInWithValidateCode(accountID, code), [accountID, code]);
const {translate} = useLocalize();

const isInvalidValidateCode = !ValidationUtils.isValidValidateCode(code);

if (isInvalidValidateCode) {
Copy link
Contributor

Choose a reason for hiding this comment

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

@mkzie2 I prefer to use FullPageNotFoundView as a wrapper for cleaner. Could you help to update it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DylanDylann I updated.

return (
<NotFoundPage
shouldShow
onLinkPress={() => {
Navigation.goBack();
}}
/>
);
}
return (
<View style={styles.deeplinkWrapperContainer}>
<View style={styles.deeplinkWrapperMessage}>
Expand Down Expand Up @@ -73,6 +82,4 @@ function ValidateCodeModal({code, accountID, session = {}}: ValidateCodeModalPro

ValidateCodeModal.displayName = 'ValidateCodeModal';

export default withOnyx<ValidateCodeModalProps, ValidateCodeModalOnyxProps>({
session: {key: ONYXKEYS.SESSION},
})(ValidateCodeModal);
export default ValidateCodeModal;
Loading