Merge pull request #50540 from truph01/fix/49696

fx: Display error message in SignUpWelcomeForm
Expensify · Oct 16, 2024 · 0aad704 · 0aad704
2 parents fd2e0cb + 1744177
commit 0aad704
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -1,28 +1,23 @@
-import React from 'react';
+import React, {useMemo} from 'react';
 import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
-import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
+import FormHelpMessage from '@components/FormHelpMessage';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
 import * as Session from '@userActions/Session';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Account} from '@src/types/onyx';
 import ChangeExpensifyLoginLink from './ChangeExpensifyLoginLink';
 import Terms from './Terms';
 
-type SignUpWelcomeFormOnyxProps = {
-    /** State for the account */
-    account: OnyxEntry<Account>;
-};
-
-type SignUpWelcomeFormProps = SignUpWelcomeFormOnyxProps;
-
-function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
+function SignUpWelcomeForm() {
     const network = useNetwork();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const serverErrorText = useMemo(() => (account ? ErrorUtils.getLatestErrorMessage(account) : ''), [account]);
 
     return (
         <>
@@ -37,6 +32,12 @@ function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
                     pressOnEnter
                     style={[styles.mb2]}
                 />
+                {serverErrorText && (
+                    <FormHelpMessage
+                        isError
+                        message={serverErrorText}
+                    />
+                )}
                 <ChangeExpensifyLoginLink onPress={() => Session.clearSignInData()} />
             </View>
             <View style={[styles.mt4, styles.signInPageWelcomeTextContainer]}>
@@ -47,6 +48,4 @@ function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
 }
 SignUpWelcomeForm.displayName = 'SignUpWelcomeForm';
 
-export default withOnyx<SignUpWelcomeFormProps, SignUpWelcomeFormOnyxProps>({
-    account: {key: ONYXKEYS.ACCOUNT},
-})(SignUpWelcomeForm);
+export default SignUpWelcomeForm;