Merge branch 'master' into tma538-friend-requests

1 files changed, 27 insertions, 41 deletions

diff --git a/src/services/UserProfileService.ts b/src/services/UserProfileService.ts
index c9ec3604..75d7d367 100644
--- a/src/services/UserProfileService.ts
+++ b/src/services/UserProfileService.ts
@@ -17,6 +17,17 @@ import {
   SEND_OTP_ENDPOINT,
   PROFILE_PHOTO_THUMBNAIL_ENDPOINT,
 } from '../constants';
+import {
+  ERROR_DOUBLE_CHECK_CONNECTION,
+  ERROR_DUP_OLD_PWD,
+  ERROR_INVALID_PWD_CODE,
+  ERROR_PWD_ACCOUNT,
+  ERROR_SOMETHING_WENT_WRONG,
+  ERROR_SOMETHING_WENT_WRONG_REFRESH,
+  ERROR_VERIFICATION_FAILED_SHORT,
+  SUCCESS_PWD_RESET,
+  SUCCESS_VERIFICATION_CODE_SENT,
+} from '../constants/strings';
 
 export const loadProfileInfo = async (token: string, userId: string) => {
   try {
@@ -60,10 +71,7 @@ export const loadProfileInfo = async (token: string, userId: string) => {
       throw 'Unable to load profile data';
     }
   } catch (error) {
-    Alert.alert(
-      'Something went wrong! 😭',
-      "Would you believe me if I told you that I don't know what happened?",
-    );
+    Alert.alert(ERROR_SOMETHING_WENT_WRONG_REFRESH);
   }
 };
 
@@ -178,10 +186,7 @@ export const handlePasswordResetRequest = async (value: string) => {
           `Please make sure that the email / username entered is registered with us. You may contact our customer support at ${TAGG_CUSTOMER_SUPPORT}`,
         );
       } else {
-        Alert.alert(
-          'Something went wrong! 😭',
-          "Would you believe me if I told you that I don't know what happened?",
-        );
+        Alert.alert(ERROR_SOMETHING_WENT_WRONG_REFRESH);
       }
 
       console.log(response);
@@ -189,7 +194,7 @@ export const handlePasswordResetRequest = async (value: string) => {
     }
   } catch (error) {
     console.log(error);
-    Alert.alert('Something went wrong! 😭', 'Looks like our servers are down');
+    Alert.alert(ERROR_SOMETHING_WENT_WRONG);
     return false;
   }
 };
@@ -215,16 +220,11 @@ export const handlePasswordCodeVerification = async (
       return true;
     } else {
       if (status == 404) {
-        Alert.alert(
-          `Please make sure that the email / username entered is registered with us. You may contact our customer support at ${TAGG_CUSTOMER_SUPPORT}`,
-        );
+        Alert.alert(ERROR_PWD_ACCOUNT(TAGG_CUSTOMER_SUPPORT));
       } else if (status === 401) {
-        Alert.alert('Looks like you have entered the wrong code');
+        Alert.alert(ERROR_INVALID_PWD_CODE);
       } else {
-        Alert.alert(
-          'Something went wrong! 😭',
-          "Would you believe me if I told you that I don't know what happened?",
-        );
+        Alert.alert(ERROR_SOMETHING_WENT_WRONG);
       }
 
       console.log(response);
@@ -232,7 +232,7 @@ export const handlePasswordCodeVerification = async (
     }
   } catch (error) {
     console.log(error);
-    Alert.alert('Something went wrong! 😭', 'Looks like our servers are down');
+    Alert.alert(ERROR_SOMETHING_WENT_WRONG);
     return false;
   }
 };
@@ -252,27 +252,22 @@ export const handlePasswordReset = async (value: string, password: string) => {
     });
     const status = response.status;
     if (status === 200) {
-      Alert.alert('Your password was reset successfully');
+      Alert.alert(SUCCESS_PWD_RESET);
       return true;
     } else {
       if (status == 404) {
-        Alert.alert(
-          `Please make sure that the email / username entered is registered with us. You may contact our customer support at ${TAGG_CUSTOMER_SUPPORT}`,
-        );
+        Alert.alert(ERROR_PWD_ACCOUNT(TAGG_CUSTOMER_SUPPORT));
       } else if (status == 406) {
-        Alert.alert('You may not use an already used password');
+        Alert.alert(ERROR_DUP_OLD_PWD);
       } else {
-        Alert.alert(
-          'Something went wrong! 😭',
-          "Would you believe me if I told you that I don't know what happened?",
-        );
+        Alert.alert(ERROR_SOMETHING_WENT_WRONG_REFRESH);
       }
       console.log(response);
       return false;
     }
   } catch (error) {
     console.log(error);
-    Alert.alert('Something went wrong! 😭', 'Looks like our servers are down');
+    Alert.alert(ERROR_SOMETHING_WENT_WRONG);
     return false;
   }
 };
@@ -296,17 +291,11 @@ export const verifyOtp = async (phone: string, otp: string) => {
           'Try again. Tap the resend code button if you need a new code.',
         );
       } else {
-        Alert.alert(
-          'Something went wrong! 😭',
-          "Would you believe me if I told you that I don't know what happened?",
-        );
+        Alert.alert(ERROR_SOMETHING_WENT_WRONG_REFRESH);
       }
     }
   } catch (error) {
-    Alert.alert(
-      'Verifiation failed 😓',
-      'Please double-check your network connection and retry.',
-    );
+    Alert.alert(ERROR_VERIFICATION_FAILED_SHORT, ERROR_DOUBLE_CHECK_CONNECTION);
     return {
       name: 'Verification error',
       description: error,
@@ -326,13 +315,10 @@ export const sendOtp = async (phone: string) => {
 
     let status = response.status;
     if (status === 200) {
-      Alert.alert(
-        'New verification code sent!',
-        'Check your phone messages for your code.',
-      );
+      Alert.alert(SUCCESS_VERIFICATION_CODE_SENT);
       return true;
     } else {
-      Alert.alert('Something went wrong!');
+      Alert.alert(ERROR_SOMETHING_WENT_WRONG);
       return false;
     }
   } catch (error) {