PR comments

adnenre · Aug 3, 2022 · f72ce58 · f72ce58
1 parent 4e3a4d2
commit f72ce58
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -164,7 +164,7 @@ That action will then call `Onyx.merge()` to [set default data and a loading sta
 
 ```js
 function signIn(password, twoFactorAuthCode) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: true});
     Authentication.Authenticate({
         ...defaultParams,
         password,
@@ -177,7 +177,7 @@ function signIn(password, twoFactorAuthCode) {
             Onyx.merge(ONYXKEYS.ACCOUNT, {error: error.message});
         })
         .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+            Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
         });
 }
 ```
@@ -188,7 +188,7 @@ Keeping our `Onyx.merge()` out of the view layer and in actions helps organize t
 // Bad
 validateAndSubmitForm() {
     // validate...
-    this.setState({loading: true});
+    this.setState({isLoading: true});
     signIn()
         .then((response) => {
             if (result.jsonCode === 200) {
@@ -198,7 +198,7 @@ validateAndSubmitForm() {
             this.setState({error: response.message});
         })
         .finally(() => {
-            this.setState({loading: false});
+            this.setState({isLoading: false});
         });
 }
 

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
@@ -102,7 +102,7 @@ function resendValidationLink(login = credentials.login) {
  *
  * @param {String} login
  */
-function fetchAccountDetails(login) {
+function beginSignIn(login) {
     const optimisticData = [
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
@@ -492,7 +492,7 @@ function setShouldShowComposeInput(shouldShowComposeInput) {
 }
 
 export {
-    fetchAccountDetails,
+    beginSignIn,
     setPassword,
     signIn,
     signInWithShortLivedToken,

diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
@@ -50,21 +50,21 @@ function updatePassword(oldPassword, password) {
             {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
-                value: {...CONST.DEFAULT_ACCOUNT_DATA, loading: true},
+                value: {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true},
             },
         ],
         successData: [
             {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
-                value: {loading: false},
+                value: {isLoading: false},
             },
         ],
         failureData: [
             {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
-                value: {loading: false},
+                value: {isLoading: false},
             },
         ],
     });
@@ -177,7 +177,7 @@ function updateNewsletterSubscription(isSubscribed) {
  * @returns {Promise}
  */
 function setSecondaryLoginAndNavigate(login, password) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true});
 
     return DeprecatedAPI.User_SecondaryLogin_Send({
         email: login,
@@ -202,7 +202,7 @@ function setSecondaryLoginAndNavigate(login, password) {
 
         Onyx.merge(ONYXKEYS.USER, {error});
     }).finally(() => {
-        Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+        Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
     });
 }
 
@@ -215,7 +215,7 @@ function setSecondaryLoginAndNavigate(login, password) {
 function validateLogin(accountID, validateCode) {
     const isLoggedIn = !_.isEmpty(sessionAuthToken);
     const redirectRoute = isLoggedIn ? ROUTES.getReportRoute(currentlyViewedReportID) : ROUTES.HOME;
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true});
 
     DeprecatedAPI.ValidateEmail({
         accountID,
@@ -236,7 +236,7 @@ function validateLogin(accountID, validateCode) {
             Onyx.merge(ONYXKEYS.ACCOUNT, {error});
         }
     }).finally(() => {
-        Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+        Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
         Navigation.navigate(redirectRoute);
     });
 }

diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js
@@ -132,7 +132,7 @@ class LoginForm extends React.Component {
         });
 
         // Check if this login has an account associated with it or not
-        Session.fetchAccountDetails(isValidPhoneLogin ? phoneLogin : login);
+        Session.beginSignIn(isValidPhoneLogin ? phoneLogin : login);
     }
 
     render() {

diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
@@ -104,10 +104,7 @@ class ResendValidationForm extends React.Component {
                 </View>
                 <View style={[styles.mv5]}>
                     <Text>
-                        {this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {
-                            login,
-                            loginType,
-                        })}
+                        {this.props.translate('resendValidationForm.weSentYouMagicSignInLink', {login, loginType})}
                     </Text>
                 </View>
                 {!_.isEmpty(this.state.formSuccess) && (

diff --git a/tests/actions/ReportTest.js b/tests/actions/ReportTest.js
@@ -204,7 +204,6 @@ describe('actions/Report', () => {
 
     it('should be updated correctly when new comments are added, deleted or marked as unread', () => {
         const REPORT_ID = 1;
-
         let report;
         Onyx.connect({
             key: `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`,

diff --git a/tests/unit/NetworkTest.js b/tests/unit/NetworkTest.js
@@ -260,7 +260,7 @@ test('Request will not run until credentials are read from Onyx', () => {
     const spyHttpUtilsXhr = jest.spyOn(HttpUtils, 'xhr').mockImplementation(() => Promise.resolve({}));
 
     // When we make a request
-    Session.fetchAccountDetails(TEST_USER_LOGIN);
+    Session.beginSignIn(TEST_USER_LOGIN);
 
     // Then we should expect that no requests have been made yet
     expect(spyHttpUtilsXhr).not.toHaveBeenCalled();

diff --git a/tests/utils/TestHelper.js b/tests/utils/TestHelper.js
@@ -40,7 +40,7 @@ function signInWithTestUser(accountID = 1, login = '[email protected]', password = '
     }));
 
     // Simulate user entering their login and populating the credentials.login
-    Session.fetchAccountDetails(login);
+    Session.beginSignIn(login);
     return waitForPromisesToResolve()
         .then(() => {
             // First call to Authenticate