Merge branch 'master' into tma570-revamp-comments-keyboard-2

# Conflicts:
#	src/components/profile/Content.tsx

3 files changed, 24 insertions, 17 deletions

diff --git a/src/components/profile/Content.tsx b/src/components/profile/Content.tsx
index 104d63fa..eb60a005 100644
--- a/src/components/profile/Content.tsx
+++ b/src/components/profile/Content.tsx
@@ -17,6 +17,12 @@ import {Cover} from '.';
 import GreyPlusLogo from '../../assets/icons/grey-plus-logo.svg';
 import {COVER_HEIGHT, TAGG_LIGHT_BLUE} from '../../constants';
 import {
+  UPLOAD_MOMENT_PROMPT_THREE_HEADER,
+  UPLOAD_MOMENT_PROMPT_THREE_MESSAGE,
+  UPLOAD_MOMENT_PROMPT_TWO_HEADER,
+  UPLOAD_MOMENT_PROMPT_TWO_MESSAGE,
+} from '../../constants/strings';
+import {
   blockUnblockUser,
   deleteUserMomentsForCategory,
   friendUnfriendUser,
@@ -344,10 +350,8 @@ const Content: React.FC<ContentProps> = ({y, userXId, screenType}) => {
           profile.profile_completion_stage === 2 &&
           !isStageTwoPromptClosed && (
             <TaggPrompt
-              messageHeader="Create a new category"
-              messageBody={
-                'Post your first moment to continue building your digital identity!'
-              }
+              messageHeader={UPLOAD_MOMENT_PROMPT_TWO_HEADER}
+              messageBody={UPLOAD_MOMENT_PROMPT_TWO_MESSAGE}
               logoType=""
               onClose={() => {
                 setIsStageTwoPromptClosed(true);
@@ -358,10 +362,8 @@ const Content: React.FC<ContentProps> = ({y, userXId, screenType}) => {
           profile.profile_completion_stage === 3 &&
           !isStageThreePromptClosed && (
             <TaggPrompt
-              messageHeader="Continue to build your profile"
-              messageBody={
-                'Continue to personalize your own digital space in\nthis community by filling your profile with\ncategories and moments!'
-              }
+              messageHeader={UPLOAD_MOMENT_PROMPT_THREE_HEADER}
+              messageBody={UPLOAD_MOMENT_PROMPT_THREE_MESSAGE}
               logoType=""
               onClose={() => {
                 setIsStageThreePromptClosed(true);
diff --git a/src/constants/strings.ts b/src/constants/strings.ts
index b5344afd..a1793658 100644
--- a/src/constants/strings.ts
+++ b/src/constants/strings.ts
@@ -12,23 +12,23 @@ export const ERROR_DOUBLE_CHECK_CONNECTION = 'Please double-check your network c
 export const ERROR_DUP_OLD_PWD = 'You may not use a previously used password';
 export const ERROR_EMAIL_IN_USE = 'Email already in use, please try another one';
 export const ERROR_FAILED_LOGIN_INFO = 'Login failed, please try re-entering your login information';
-export const ERROR_FAILED_TO_COMMENT =  'Unable to post comment, refresh and try again!';
+export const ERROR_FAILED_TO_COMMENT = 'Unable to post comment, refresh and try again!';
 export const ERROR_INVALID_INVITATION_CODE = 'Invitation code invalid, try again or talk to the friend that sent it 😬';
 export const ERROR_INVALID_LOGIN = 'Invalid login, Please login again';
 export const ERROR_INVALID_PWD_CODE = 'Looks like you have entered the wrong code, please try again';
 export const ERROR_INVALID_VERIFICATION_CODE = 'Invalid verification code, try re-entering or tap the resend code button for a new code';
 export const ERROR_INVALID_VERIFICATION_CODE_FORMAT = 'Please enter the 6 digit code sent to your phone';
 export const ERROR_INVLAID_CODE = 'The code entered is not valid!';
-export const ERROR_LINK = (str: string) =>  `Unable to link with ${str}, Please check your login and try again`;
-export const ERROR_LOGIN =  'There was a problem logging you in, please refresh and try again';
+export const ERROR_LINK = (str: string) => `Unable to link with ${str}, Please check your login and try again`;
+export const ERROR_LOGIN = 'There was a problem logging you in, please refresh and try again';
 export const ERROR_LOGIN_FAILED = 'Login failed. Check your username and passoword, and try again';
 export const ERROR_NEXT_PAGE = 'There was a problem while loading the next page 😓, try again in a couple minutes';
 export const ERROR_PROFILE_CREATION_SHORT = 'Profile creation failed 😓';
 export const ERROR_PWD_ACCOUNT = (str: string) => `Please make sure that the email / username entered is registered with us. You may contact our customer support at ${str}`;
-export const ERROR_REGISTRATION = (str: string) =>  `Registration failed 😔, ${str}`;
+export const ERROR_REGISTRATION = (str: string) => `Registration failed 😔, ${str}`;
 export const ERROR_SELECT_CLASS_YEAR = 'Please select your Class Year';
 export const ERROR_SERVER_DOWN = 'mhm, looks like our servers are down, please refresh and try again in a few mins';
-export const ERROR_SOMETHING_WENT_WRONG = "Oh dear, don’t worry someone will be held responsible for this error, In the meantime refresh the app";
+export const ERROR_SOMETHING_WENT_WRONG = 'Oh dear, don’t worry someone will be held responsible for this error, In the meantime refresh the app';
 export const ERROR_SOMETHING_WENT_WRONG_REFRESH = "Ha, looks like this one's on us, please refresh and try again";
 export const ERROR_SOMETHING_WENT_WRONG_RELOAD = "You broke it, Just kidding! we don't know what happened... Please reload the app and try again";
 export const ERROR_UNABLE_TO_FIND_PROFILE = 'We were unable to find this profile. Please check username and try again';
@@ -45,3 +45,8 @@ export const SUCCESS_LINK = (str: string) => `Successfully linked ${str} 🎉`;
 export const SUCCESS_PIC_UPLOAD = 'Beautiful, the picture was uploaded successfully!';
 export const SUCCESS_PWD_RESET = 'Your password was reset successfully!';
 export const SUCCESS_VERIFICATION_CODE_SENT = 'New verification code sent! Check your phone messages for your code';
+export const UPLOAD_MOMENT_PROMPT_ONE_MESSAGE = 'Post your first moment to\n continue building your digital\nidentity!';
+export const UPLOAD_MOMENT_PROMPT_THREE_HEADER = 'Continue to build your profile';
+export const UPLOAD_MOMENT_PROMPT_THREE_MESSAGE = 'Continue to personalize your own digital space in\nthis community by filling your profile with\ncategories and moments!';
+export const UPLOAD_MOMENT_PROMPT_TWO_HEADER = 'Create a new category';
+export const UPLOAD_MOMENT_PROMPT_TWO_MESSAGE = 'You can now create new categories \nand continue to fill your profile with moments!';
diff --git a/src/screens/profile/MomentUploadPromptScreen.tsx b/src/screens/profile/MomentUploadPromptScreen.tsx
index 6111985d..9d46c1e9 100644
--- a/src/screens/profile/MomentUploadPromptScreen.tsx
+++ b/src/screens/profile/MomentUploadPromptScreen.tsx
@@ -6,6 +6,7 @@ import CloseIcon from '../../assets/ionicons/close-outline.svg';
 import {StyleSheet, Text, View} from 'react-native';
 import {Moment} from '../../components';
 import {Image} from 'react-native-animatable';
+import {UPLOAD_MOMENT_PROMPT_ONE_MESSAGE} from '../../constants/strings';
 
 type MomentUploadPromptScreenRouteProp = RouteProp<
   MainStackParams,
@@ -38,10 +39,7 @@ const MomentUploadPromptScreen: React.FC<MomentUploadPromptScreenProps> = ({
         }}
       />
 
-      <Text style={styles.text}>
-        Post your first moment to {'\n'} continue building your digital {'\n'}{' '}
-        identity!
-      </Text>
+      <Text style={styles.text}>{UPLOAD_MOMENT_PROMPT_ONE_MESSAGE}</Text>
       <Image
         source={require('../../assets/gifs/dotted-arrow-white.gif')}
         style={styles.arrowGif}
@@ -54,6 +52,8 @@ const MomentUploadPromptScreen: React.FC<MomentUploadPromptScreenProps> = ({
         screenType={screenType}
         handleMomentCategoryDelete={() => {}}
         shouldAllowDeletion={false}
+        showDownButton={false}
+        showUpButton={false}
         externalStyles={{
           container: styles.momentContainer,
           titleText: styles.momentHeaderText,