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

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

1 files changed, 4 insertions, 1 deletions

diff --git a/src/components/taggs/Tagg.tsx b/src/components/taggs/Tagg.tsx
index 547a77cb..4e4987fb 100644
--- a/src/components/taggs/Tagg.tsx
+++ b/src/components/taggs/Tagg.tsx
@@ -34,6 +34,7 @@ interface TaggProps {
   userXId: string | undefined;
   user: UserType;
   whiteRing: boolean | undefined;
+  allowNavigation?: boolean;
 }
 
 const Tagg: React.FC<TaggProps> = ({
@@ -45,6 +46,7 @@ const Tagg: React.FC<TaggProps> = ({
   userXId,
   user,
   whiteRing,
+  allowNavigation = true,
 }) => {
   const navigation = useNavigation();
   const [modalVisible, setModalVisible] = useState(false);
@@ -145,7 +147,8 @@ const Tagg: React.FC<TaggProps> = ({
           <View style={whiteRing ? styles.spcontainer : styles.container}>
             <TouchableOpacity
               style={styles.iconTap}
-              onPress={modalOrAuthBrowserOrPass}>
+              onPress={modalOrAuthBrowserOrPass}
+              disabled={!allowNavigation}>
               <SocialIcon style={styles.icon} social={social} whiteRing />
               {pickTheRightRingHere()}
             </TouchableOpacity>