From 2db77fbc1b64e036eb902e8c536d03002a2b222c Mon Sep 17 00:00:00 2001 From: truph01 Date: Tue, 17 Dec 2024 11:03:40 +0700 Subject: [PATCH 1/2] fix: update here link in suspended account message --- docs/redirects.csv | 2 +- src/CONST.ts | 1 + src/pages/signin/EmailDeliveryFailurePage.tsx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/redirects.csv b/docs/redirects.csv index 751e072fb13f..5c8626516978 100644 --- a/docs/redirects.csv +++ b/docs/redirects.csv @@ -385,7 +385,7 @@ https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Vac https://community.expensify.com/discussion/5678/deep-dive-secondary-login-merge-accounts-what-does-this-mean,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts https://community.expensify.com/discussion/5103/how-to-create-and-use-custom-units/,https://help.expensify.com/ https://community.expensify.com/discussion/6530/how-to-set-your-time-zone-for-report-history-comments,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-time-zone -https://community.expensify.com/discussion/5651/deep-dive--practices-when-youre-running-into-trouble-receiving-emails-from-expensify,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-Notifications +https://community.expensify.com/discussion/5651/deep-dive-best-practices-when-youre-running-into-trouble-receiving-emails-from-expensify,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-Notifications https://community.expensify.com/discussion/5793/how-to-connect-your-personal-card-to-import-expenses/,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Personal-Credit-Cards https://community.expensify.com/discussion/5677/deep-dive-security-how-expensify-protects-your-information,https://help.expensify.com/articles/new-expensify/settings/Encryption-and-Data-Security https://community.expensify.com/discussion/4641/how-to-add-a-u-s-deposit-account,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-US-Bank-Account diff --git a/src/CONST.ts b/src/CONST.ts index eddccd74c5e0..f0a624abb86a 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -900,6 +900,7 @@ const CONST = { DEEP_DIVE_EXPENSIFY_CARD: 'https://community.expensify.com/discussion/4848/deep-dive-expensify-card-and-quickbooks-online-auto-reconciliation-how-it-works', DEEP_DIVE_ERECEIPTS: 'https://community.expensify.com/discussion/5542/deep-dive-what-are-ereceipts/', DEEP_DIVE_PER_DIEM: 'https://community.expensify.com/discussion/4772/how-to-add-a-single-rate-per-diem', + SET_NOTIFICATION_LINK: 'https://community.expensify.com/discussion/5651/deep-dive--practices-when-youre-running-into-trouble-receiving-emails-from-expensify', GITHUB_URL: 'https://github.com/Expensify/App', TERMS_URL: `${EXPENSIFY_URL}/terms`, PRIVACY_URL: `${EXPENSIFY_URL}/privacy`, diff --git a/src/pages/signin/EmailDeliveryFailurePage.tsx b/src/pages/signin/EmailDeliveryFailurePage.tsx index ff16af7dffd9..1d50717b629b 100644 --- a/src/pages/signin/EmailDeliveryFailurePage.tsx +++ b/src/pages/signin/EmailDeliveryFailurePage.tsx @@ -53,7 +53,7 @@ function EmailDeliveryFailurePage({credentials}: EmailDeliveryFailurePageProps) {translate('emailDeliveryFailurePage.ensureYourEmailClient')} {translate('emailDeliveryFailurePage.youCanFindDirections')} {translate('common.here')} From 9ca4f59a4e1a97b8dcc2991a8156d6ddc5bae980 Mon Sep 17 00:00:00 2001 From: truph01 Date: Tue, 17 Dec 2024 11:21:35 +0700 Subject: [PATCH 2/2] fix: remove withOnyx --- src/pages/signin/EmailDeliveryFailurePage.tsx | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/pages/signin/EmailDeliveryFailurePage.tsx b/src/pages/signin/EmailDeliveryFailurePage.tsx index 1d50717b629b..272e4f78aeba 100644 --- a/src/pages/signin/EmailDeliveryFailurePage.tsx +++ b/src/pages/signin/EmailDeliveryFailurePage.tsx @@ -1,8 +1,7 @@ import {Str} from 'expensify-common'; import React, {useEffect, useMemo} from 'react'; import {Keyboard, View} from 'react-native'; -import {withOnyx} from 'react-native-onyx'; -import type {OnyxEntry} from 'react-native-onyx'; +import {useOnyx} from 'react-native-onyx'; import PressableWithFeedback from '@components/Pressable/PressableWithFeedback'; import Text from '@components/Text'; import TextLink from '@components/TextLink'; @@ -12,16 +11,9 @@ import useThemeStyles from '@hooks/useThemeStyles'; import * as Session from '@userActions/Session'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -import type {Credentials} from '@src/types/onyx'; -type EmailDeliveryFailurePageOnyxProps = { - /** The credentials of the logged in person */ - credentials: OnyxEntry; -}; - -type EmailDeliveryFailurePageProps = EmailDeliveryFailurePageOnyxProps; - -function EmailDeliveryFailurePage({credentials}: EmailDeliveryFailurePageProps) { +function EmailDeliveryFailurePage() { + const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS); const styles = useThemeStyles(); const {isKeyboardShown} = useKeyboardState(); const {translate} = useLocalize(); @@ -90,6 +82,4 @@ function EmailDeliveryFailurePage({credentials}: EmailDeliveryFailurePageProps) EmailDeliveryFailurePage.displayName = 'EmailDeliveryFailurePage'; -export default withOnyx({ - credentials: {key: ONYXKEYS.CREDENTIALS}, -})(EmailDeliveryFailurePage); +export default EmailDeliveryFailurePage;