From 89c0a42397c1f4bbb1d984c8a83e74562c1392c8 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Thu, 10 Oct 2024 11:17:58 +0700
Subject: [PATCH 1/3] fx: Display error message in SignUpWelcomeForm

---
 src/pages/signin/SignUpWelcomeForm.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
index 68bb7d10796a..6f99ee0dfb0a 100644
--- a/src/pages/signin/SignUpWelcomeForm.tsx
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -1,11 +1,14 @@
-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';
@@ -23,6 +26,7 @@ function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
     const network = useNetwork();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const serverErrorText = useMemo(() => (account ? ErrorUtils.getLatestErrorMessage(account) : ''), [account]);
 
     return (
         <>
@@ -37,6 +41,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]}>

From 3a125b2ddee845df9dc58133dd6bc05b91edda56 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Mon, 14 Oct 2024 16:44:10 +0700
Subject: [PATCH 2/3] fix: lint

---
 src/pages/signin/SignUpWelcomeForm.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
index 6f99ee0dfb0a..25b48a32fe53 100644
--- a/src/pages/signin/SignUpWelcomeForm.tsx
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -2,7 +2,6 @@ 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';

From 41df30a09aafd901e18509c2856556f829d4253b Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Wed, 16 Oct 2024 15:25:39 +0700
Subject: [PATCH 3/3] fix: lint

---
 src/pages/signin/SignUpWelcomeForm.tsx | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
index 25b48a32fe53..be16475cdfc7 100644
--- a/src/pages/signin/SignUpWelcomeForm.tsx
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -1,7 +1,6 @@
 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';
@@ -10,21 +9,14 @@ 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 (
@@ -56,6 +48,4 @@ function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
 }
 SignUpWelcomeForm.displayName = 'SignUpWelcomeForm';
 
-export default withOnyx<SignUpWelcomeFormProps, SignUpWelcomeFormOnyxProps>({
-    account: {key: ONYXKEYS.ACCOUNT},
-})(SignUpWelcomeForm);
+export default SignUpWelcomeForm;