Merge branch 'master' into tma936-pause-video

3 files changed, 9 insertions, 7 deletions

diff --git a/src/constants/api.ts b/src/constants/api.ts
index 6dab1153..1de6871c 100644
--- a/src/constants/api.ts
+++ b/src/constants/api.ts
@@ -34,11 +34,13 @@ export const MOMENTS_ENDPOINT: string = API_URL + 'moments/';
 export const MOMENT_TAGS_ENDPOINT: string = API_URL + 'moments/tags/';
 export const MOMENTTAG_ENDPOINT: string = API_URL + 'moment-tag/';
 export const MOMENT_THUMBNAIL_ENDPOINT: string = API_URL + 'moment-thumbnail/';
+export const MOMENT_VIEW_COUNT_API: string = API_URL + 'moment-view-count/';
 export const VERIFY_INVITATION_CODE_ENDPOUNT: string = API_URL + 'verify-code/';
 export const COMMENTS_ENDPOINT: string = API_URL + 'comments/';
 export const COMMENT_REACTIONS_ENDPOINT: string = API_URL + 'reaction-comment/';
 export const COMMENT_REACTIONS_REPLY_ENDPOINT: string = API_URL + 'reaction-reply/';
 export const PRESIGNED_URL_ENDPOINT: string = API_URL + 'presigned-url/';
+export const CHECK_MOMENT_UPLOAD_DONE_PROCESSING_ENDPOINT: string = API_URL + 'moments/check_done_processing/';
 export const FRIENDS_ENDPOINT: string = API_URL + 'friends/';
 export const ALL_USERS_ENDPOINT: string = API_URL + 'users/';
 export const REPORT_ISSUE_ENDPOINT: string = API_URL + 'report/';
diff --git a/src/constants/constants.ts b/src/constants/constants.ts
index 13a73208..476e7af4 100644
--- a/src/constants/constants.ts
+++ b/src/constants/constants.ts
@@ -69,6 +69,7 @@ export const TAGG_DARK_BLUE = '#4E699C';
 export const TAGG_DARK_PURPLEISH_BLUE = '#4755A1';
 export const TAGG_LIGHT_BLUE: string = '#698DD3';
 export const TAGG_LIGHT_BLUE_2: string = '#6EE7E7';
+export const TAGG_LIGHT_BLUE_3 = '#DDE8FE';
 export const TAGG_LIGHT_PURPLE = '#F4DDFF';
 export const RADIO_BUTTON_GREY: string = '#BEBEBE';
 
diff --git a/src/constants/strings.ts b/src/constants/strings.ts
index 071b3835..450d7e5c 100644
--- a/src/constants/strings.ts
+++ b/src/constants/strings.ts
@@ -2,8 +2,8 @@
 // Below is the regex to convert this into a csv for the Google Sheet
 // export const (.*) = .*?(['|"|`])(.*)\2;
 // replace with: $1\t$3
-export const APP_STORE_LINK = 'https://apps.apple.com/us/app/tagg-discover-your-community/id1537853613'
 export const ADD_COMMENT_TEXT = (username?: string) => username ? `Reply to ${username}` : 'Add a comment...'
+export const APP_STORE_LINK = 'https://apps.apple.com/us/app/tagg-discover-your-community/id1537853613'
 export const COMING_SOON_MSG = 'Creating more fun things for you, surprises coming soon 😉';
 export const ERROR_ATTEMPT_EDIT_SP = 'Can\'t let you do that yet! Please onboard Suggested People first!';
 export const ERROR_AUTHENTICATION = 'An error occurred during authentication. Please login again!';
@@ -31,8 +31,10 @@ 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_LOGIN_FAILED = 'Login failed. Check your username and password, and try again';
+export const ERROR_MOMENT_UPLOAD_IN_PROGRESS = 'Please wait, there is a Moment upload in progress.';
 export const ERROR_NEXT_PAGE = 'There was a problem while loading the next page 😓, try again in a couple minutes';
 export const ERROR_NO_CONTACT_INVITE_LEFT = 'You have no more invites left!'
+export const ERROR_NO_MOMENT_CATEGORY = 'Please select a category!';
 export const ERROR_NOT_ONBOARDED = 'You are now on waitlist, please enter your invitation code if you have one';
 export const ERROR_PHONE_IN_USE = 'Phone already in use, please try another one';
 export const ERROR_PROFILE_CREATION_SHORT = 'Profile creation failed 😓';
@@ -45,7 +47,6 @@ export const ERROR_SELECT_GENDER = 'Please select your gender';
 export const ERROR_SELECT_UNIVERSITY = 'Please select your University';
 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_NO_MOMENT_CATEGORY = 'Please select a category!';
 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_T_AND_C_NOT_ACCEPTED = 'You must first agree to the terms and conditions.';
@@ -61,6 +62,7 @@ export const ERROR_UPLOAD_SMALL_PROFILE_PIC = "Can't have a profile without a pi
 export const ERROR_UPLOAD_SP_PHOTO = 'Unable to update suggested people photo. Please retry!';
 export const ERROR_VERIFICATION_FAILED_SHORT = 'Verification failed 😓';
 export const FIRST_MESSAGE = 'How about sending your first message to your friend';
+export const INVITE_USER_SMS_BODY = (invitedUserName: string, invitee: string, inviteCode: string) => `Hey ${invitedUserName}!\nYou've been tagged by ${invitee}. Follow the instructions below to skip the line and join them on Tagg!\nSign up and use this code to get in: ${inviteCode}\n ${APP_STORE_LINK}`;
 export const MARKED_AS_MSG = (str: string) => `Marked as ${str}`;
 export const MOMENT_DELETED_MSG = 'Moment deleted....Some moments have to go, to create space for greater ones';
 export const NO_NEW_NOTIFICATIONS = 'You have no new notifications';
@@ -69,13 +71,10 @@ export const PRIVATE_ACCOUNT = 'This account is private';
 export const START_CHATTING = 'Let’s Start Chatting!';
 export const SUCCESS_BADGES_UPDATE = 'Badges updated successfully!'
 export const SUCCESS_CATEGORY_DELETE = 'Category successfully deleted, but its memory will live on';
+export const SUCCESS_CONFIRM_INVITE_CONTACT_MESSAGE = 'Use one now?';
+export const SUCCESS_CONFIRM_INVITE_CONTACT_TITLE = (str: string) => `You have ${str} invites left!`;
 export const SUCCESS_INVITATION_CODE = 'Welcome to Tagg!';
 export const SUCCESS_INVITE_CONTACT = (str: string) => `Success! You now have ${str} invites left!`;
-export const SUCCESS_CONFIRM_INVITE_CONTACT_TITLE = (str: string) => `You have ${str} invites left!`;
-export const SUCCESS_CONFIRM_INVITE_CONTACT_MESSAGE = 'Use one now?';
-export const INVITE_USER_SMS_BODY = (invitedUserName: string, invitee: string, inviteCode: string) => `Hey ${invitedUserName}!\n
-You've been tagged by ${invitee}. Follow the instructions below to skip the line and join them on Tagg!\n
-Sign up and use this code to get in: ${inviteCode}\n ${APP_STORE_LINK}`;
 export const SUCCESS_LAST_CONTACT_INVITE = 'Done! That was your last invite, hope you used it wisely!';
 export const SUCCESS_LINK = (str: string) => `Successfully linked ${str} 🎉`;
 export const SUCCESS_PIC_UPLOAD = 'Beautiful, the Moment was uploaded successfully!';