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

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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/components/profile/ToggleButton.tsx b/src/components/profile/ToggleButton.tsx
index 5d8f7874..236d811c 100644
--- a/src/components/profile/ToggleButton.tsx
+++ b/src/components/profile/ToggleButton.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {StyleSheet, Text} from 'react-native';
 import {TouchableOpacity} from 'react-native-gesture-handler';
-import {TAGG_TEXT_LIGHT_BLUE} from '../../constants';
+import {TAGG_LIGHT_BLUE} from '../../constants';
 import {getToggleButtonText, SCREEN_WIDTH} from '../../utils';
 
 type ToggleButtonProps = {
@@ -36,7 +36,7 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     width: SCREEN_WIDTH * 0.4,
     height: SCREEN_WIDTH * 0.08,
-    borderColor: TAGG_TEXT_LIGHT_BLUE,
+    borderColor: TAGG_LIGHT_BLUE,
     borderWidth: 3,
     borderRadius: 5,
     marginRight: '2%',
@@ -45,10 +45,10 @@ const styles = StyleSheet.create({
     fontWeight: 'bold',
   },
   buttonColor: {
-    backgroundColor: TAGG_TEXT_LIGHT_BLUE,
+    backgroundColor: TAGG_LIGHT_BLUE,
   },
   textColor: {color: 'white'},
   buttonColorToggled: {backgroundColor: 'white'},
-  textColorToggled: {color: TAGG_TEXT_LIGHT_BLUE},
+  textColorToggled: {color: TAGG_LIGHT_BLUE},
 });
 export default ToggleButton;