Merge branch 'master' into tma552-adjust-styles-and-sizes

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

1 files changed, 31 insertions, 31 deletions

diff --git a/src/components/profile/Content.tsx b/src/components/profile/Content.tsx
index 4082f734..a35a5820 100644
--- a/src/components/profile/Content.tsx
+++ b/src/components/profile/Content.tsx
@@ -1,3 +1,4 @@
+import {useFocusEffect, useNavigation} from '@react-navigation/native';
 import React, {useCallback, useEffect, useState} from 'react';
 import {
   Alert,
@@ -9,9 +10,35 @@ import {
   Text,
   View,
 } from 'react-native';
+import {TouchableOpacity} from 'react-native-gesture-handler';
 import Animated from 'react-native-reanimated';
+import {useDispatch, useSelector, useStore} from 'react-redux';
+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,
+  loadFriendsData,
+  updateMomentCategories,
+  updateUserXFriends,
+  updateUserXProfileAllScreens,
+} from '../../store/actions';
+import {
+  EMPTY_MOMENTS_LIST,
+  EMPTY_PROFILE_PREVIEW_LIST,
+  NO_PROFILE,
+  NO_USER,
+} from '../../store/initialStates';
+import {RootState} from '../../store/rootreducer';
 import {CategorySelectionScreenType, MomentType, ScreenType} from '../../types';
-import {COVER_HEIGHT, TAGG_TEXT_LIGHT_BLUE} from '../../constants';
 import {
   fetchUserX,
   getUserAsProfilePreviewType,
@@ -20,39 +47,12 @@ import {
   SCREEN_HEIGHT,
   userLogin,
 } from '../../utils';
-import TaggsBar from '../taggs/TaggsBar';
+import {TaggPrompt} from '../common';
 import {Moment} from '../moments';
+import TaggsBar from '../taggs/TaggsBar';
 import ProfileBody from './ProfileBody';
 import ProfileCutout from './ProfileCutout';
 import ProfileHeader from './ProfileHeader';
-import {useDispatch, useSelector, useStore} from 'react-redux';
-import {RootState} from '../../store/rootreducer';
-import {
-  friendUnfriendUser,
-  blockUnblockUser,
-  loadFriendsData,
-  updateUserXFriends,
-  updateMomentCategories,
-  deleteUserMomentsForCategory,
-  updateUserXProfileAllScreens,
-} from '../../store/actions';
-import {
-  NO_USER,
-  NO_PROFILE,
-  EMPTY_PROFILE_PREVIEW_LIST,
-  EMPTY_MOMENTS_LIST,
-} from '../../store/initialStates';
-import {Cover} from '.';
-import {TouchableOpacity} from 'react-native-gesture-handler';
-import {useFocusEffect, useNavigation} from '@react-navigation/native';
-import GreyPlusLogo from '../../assets/icons/grey-plus-logo.svg';
-import {TaggPrompt} from '../common';
-import {
-  UPLOAD_MOMENT_PROMPT_THREE_HEADER,
-  UPLOAD_MOMENT_PROMPT_THREE_MESSAGE,
-  UPLOAD_MOMENT_PROMPT_TWO_HEADER,
-  UPLOAD_MOMENT_PROMPT_TWO_MESSAGE,
-} from '../../constants/strings';
 
 interface ContentProps {
   y: Animated.Value<number>;
@@ -418,7 +418,7 @@ const styles = StyleSheet.create({
     flexDirection: 'column',
   },
   createCategoryButton: {
-    backgroundColor: TAGG_TEXT_LIGHT_BLUE,
+    backgroundColor: TAGG_LIGHT_BLUE,
     justifyContent: 'center',
     alignItems: 'center',
     width: '70%',