From 173bc34c826afb55c75b8d25111ed32bbce3c5e3 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 24 Oct 2023 11:10:10 +0800
Subject: [PATCH 1/3] set login initial value from saved credentials

---
 src/pages/signin/LoginForm/BaseLoginForm.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin/LoginForm/BaseLoginForm.js b/src/pages/signin/LoginForm/BaseLoginForm.js
index 6270e6982e6e..e0e7a4bd6290 100644
--- a/src/pages/signin/LoginForm/BaseLoginForm.js
+++ b/src/pages/signin/LoginForm/BaseLoginForm.js
@@ -60,6 +60,12 @@ const propTypes = {
         success: PropTypes.string,
     }),
 
+    /** The credentials of the logged in person */
+    credentials: PropTypes.shape({
+        /** The email the user logged in with */
+        login: PropTypes.string,
+    }),
+
     /** Props to detect online status */
     network: networkPropTypes.isRequired,
 
@@ -78,6 +84,7 @@ const propTypes = {
 
 const defaultProps = {
     account: {},
+    credentials: {},
     closeAccount: {},
     blurOnSubmit: false,
     innerRef: () => {},
@@ -86,7 +93,10 @@ const defaultProps = {
 
 function LoginForm(props) {
     const input = useRef();
-    const [login, setLogin] = useState('');
+    const [login, setLogin] = useState(() => {
+        const userLogin = Str.removeSMSDomain(props.credentials.login || '');
+        return userLogin;
+    });
     const [formError, setFormError] = useState(false);
     const prevIsVisible = usePrevious(props.isVisible);
 
@@ -289,6 +299,7 @@ export default compose(
     withNavigationFocus,
     withOnyx({
         account: {key: ONYXKEYS.ACCOUNT},
+        credentials: {key: ONYXKEYS.CREDENTIALS},
         closeAccount: {key: ONYXKEYS.FORMS.CLOSE_ACCOUNT_FORM},
     }),
     withWindowDimensions,

From d79e6cab69e1a41a627c0925939e80684459bd62 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 25 Oct 2023 00:13:43 +0800
Subject: [PATCH 2/3] add login default value

---
 src/pages/signin/LoginForm/BaseLoginForm.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin/LoginForm/BaseLoginForm.js b/src/pages/signin/LoginForm/BaseLoginForm.js
index e0e7a4bd6290..4fd52777546c 100644
--- a/src/pages/signin/LoginForm/BaseLoginForm.js
+++ b/src/pages/signin/LoginForm/BaseLoginForm.js
@@ -84,7 +84,9 @@ const propTypes = {
 
 const defaultProps = {
     account: {},
-    credentials: {},
+    credentials: {
+        login: '',
+    },
     closeAccount: {},
     blurOnSubmit: false,
     innerRef: () => {},

From 8eca62a6438d98ffa206257d5ef51743fbad55ee Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 25 Oct 2023 00:13:57 +0800
Subject: [PATCH 3/3] simplify code

---
 src/pages/signin/LoginForm/BaseLoginForm.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/signin/LoginForm/BaseLoginForm.js b/src/pages/signin/LoginForm/BaseLoginForm.js
index 4fd52777546c..1e3836ced3f8 100644
--- a/src/pages/signin/LoginForm/BaseLoginForm.js
+++ b/src/pages/signin/LoginForm/BaseLoginForm.js
@@ -95,10 +95,7 @@ const defaultProps = {
 
 function LoginForm(props) {
     const input = useRef();
-    const [login, setLogin] = useState(() => {
-        const userLogin = Str.removeSMSDomain(props.credentials.login || '');
-        return userLogin;
-    });
+    const [login, setLogin] = useState(() => Str.removeSMSDomain(props.credentials.login));
     const [formError, setFormError] = useState(false);
     const prevIsVisible = usePrevious(props.isVisible);