Merge branch 'master' into tma739-bugfix-profile-onboarding-tutorial

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

3 files changed, 58 insertions, 0 deletions

diff --git a/src/constants/api.ts b/src/constants/api.ts
index 6afdf384..22890c33 100644
--- a/src/constants/api.ts
+++ b/src/constants/api.ts
@@ -64,3 +64,7 @@ export const DEEPLINK: string = 'https://tinyurl.com/y3o4aec5';
 export const LINK_IG_OAUTH: string = `https://www.instagram.com/oauth/authorize/?client_id=205466150510738&redirect_uri=${DEEPLINK}&scope=user_profile,user_media&response_type=code`;
 export const LINK_FB_OAUTH: string = `https://www.facebook.com/v8.0/dialog/oauth?client_id=1308555659343609&redirect_uri=${DEEPLINK}&scope=user_posts,public_profile&response_type=code`;
 export const LINK_TWITTER_OAUTH: string = API_URL + 'link-twitter-request/';
+
+// Profile Links 
+export const COMMUNITY_GUIDELINES: string = 'https://www.tagg.id/community-guidelines';
+export const PRIVACY_POLICY: string = 'https://www.tagg.id/privacy-policy';
diff --git a/src/constants/constants.ts b/src/constants/constants.ts
index d24e352e..f533563d 100644
--- a/src/constants/constants.ts
+++ b/src/constants/constants.ts
@@ -186,3 +186,55 @@ export const SP_WIDTH = 375;
 export const SP_HEIGHT = 812;
 
 export const SP_PAGE_SIZE = 5;
+
+export const SETTINGS_DATA = {
+  SettingsAndPrivacy: [
+    {
+      title: 'ACCOUNT',
+      data: [
+        {
+          title: 'Suggested People Profile',
+          preimage: require('../assets/images/tagg-logo.png'),
+          postimage: require('../assets/images/settings/white-arrow.png'),
+        },
+        {
+          title: 'Privacy',
+          preimage: require('../assets/images/settings/settings-white.png'),
+          postimage: require('../assets/images/settings/white-arrow.png'),
+        },
+      ],
+    },
+    {
+      title: 'GENERAL',
+      data: [
+        {
+          title: 'Community Guidelines',
+          preimage: require('../assets/images/settings/termsofuse.png'),
+          postimage: require('../assets/images/settings/white-arrow.png'),
+        },
+        {
+          title: 'Privacy Policy',
+          preimage: require('../assets/images/settings/privacypolicy.png'),
+          postimage: require('../assets/images/settings/white-arrow.png'),
+        },
+      ],
+    },
+  ],
+  PrivacyScreen: [
+    {
+      title: '',
+      data: [
+        {
+          title: 'Account Type',
+          preimage: require('../assets/images/settings/lock-white.png'),
+          postimage: require('../assets/images/settings/white-arrow.png'),
+        },
+        // {
+        //   title: 'Blocked Accounts',
+        //   preimage: require('../assets/images/settings/blocked-white.png'),
+        //   postimage: require('../assets/images/settings/white-arrow.png'),
+        // },
+      ],
+    },
+  ],
+};
diff --git a/src/constants/strings.ts b/src/constants/strings.ts
index 66d4a6d9..4f792dcc 100644
--- a/src/constants/strings.ts
+++ b/src/constants/strings.ts
@@ -31,6 +31,7 @@ export const ERROR_NEXT_PAGE = 'There was a problem while loading the next page
 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 😓';
+export const ERROR_PROFILE_UPDATE_SHORT = 'Profile update 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_SELECT_BIRTHDAY = 'Please select your birthday';
@@ -55,6 +56,7 @@ 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';
 export const NO_RESULTS_FOUND = 'No Results Found!';
+export const PRIVATE_ACCOUNT = 'This account is private';
 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_INVITATION_CODE = 'Welcome to Tagg!';