diff options
author | Ashm Walia <40498934+ashmgarv@users.noreply.github.com> | 2020-10-27 14:16:50 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-27 17:16:50 -0400 |
commit | 9b9b1b792f914709de01e1d502014b8deb66e291 (patch) | |
tree | 8d403d2232cfab31c590acd26222bfa476de4dee /src | |
parent | 9c7a867c1851914322a4b60f20223ae06a31c661 (diff) |
[HOT FIX] Fix stack navigation (#78)
* Fix stack navigation
* Fix stack navigation
Diffstat (limited to 'src')
-rw-r--r-- | src/components/comments/CommentsCount.tsx | 2 | ||||
-rw-r--r-- | src/components/moments/MomentTile.tsx | 2 | ||||
-rw-r--r-- | src/components/profile/FollowCount.tsx | 2 | ||||
-rw-r--r-- | src/components/profile/Followers.tsx | 2 | ||||
-rw-r--r-- | src/components/profile/ProfilePreview.tsx | 4 | ||||
-rw-r--r-- | src/components/taggs/Tagg.tsx | 2 | ||||
-rw-r--r-- | src/screens/profile/IndividualMoment.tsx | 2 | ||||
-rw-r--r-- | src/screens/profile/MomentCommentsScreen.tsx | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/components/comments/CommentsCount.tsx b/src/components/comments/CommentsCount.tsx index 74b4194c..bd87a2b2 100644 --- a/src/components/comments/CommentsCount.tsx +++ b/src/components/comments/CommentsCount.tsx @@ -22,7 +22,7 @@ const CommentsCount: React.FC<CommentsCountProps> = ({ }) => { const navigation = useNavigation(); const navigateToCommentsScreen = async () => { - navigation.navigate('MomentCommentsScreen', { + navigation.push('MomentCommentsScreen', { isProfileView: isProfileView, moment_id: moment_id, }); diff --git a/src/components/moments/MomentTile.tsx b/src/components/moments/MomentTile.tsx index 70b20d40..1d483875 100644 --- a/src/components/moments/MomentTile.tsx +++ b/src/components/moments/MomentTile.tsx @@ -12,7 +12,7 @@ const MomentTile: React.FC<MomentTileProps> = ({moment}) => { return ( <TouchableOpacity onPress={() => { - navigation.navigate('IndividualMoment', {moment}); + navigation.push('IndividualMoment', {moment}); }}> <View style={styles.image}> <Image style={styles.image} source={{uri: path_hash}} /> diff --git a/src/components/profile/FollowCount.tsx b/src/components/profile/FollowCount.tsx index 9cace17d..80d56de4 100644 --- a/src/components/profile/FollowCount.tsx +++ b/src/components/profile/FollowCount.tsx @@ -27,7 +27,7 @@ const FollowCount: React.FC<FollowCountProps> = ({ return ( <TouchableOpacity onPress={() => - navigation.navigate('FollowersListScreen', { + navigation.push('FollowersListScreen', { isProfileView: isProfileView, isFollowers: mode === 'followers', }) diff --git a/src/components/profile/Followers.tsx b/src/components/profile/Followers.tsx index bee02e07..6f56c03c 100644 --- a/src/components/profile/Followers.tsx +++ b/src/components/profile/Followers.tsx @@ -20,7 +20,7 @@ const Followers: React.FC<FollowersListProps> = ({result, sectionTitle}) => { buttonStyle={styles.button} titleStyle={styles.buttonText} onPress={() => { - navigation.goBack(); + navigation.pop(); }} /> <Text style={styles.title}>{sectionTitle}</Text> diff --git a/src/components/profile/ProfilePreview.tsx b/src/components/profile/ProfilePreview.tsx index c527746a..ec0be50c 100644 --- a/src/components/profile/ProfilePreview.tsx +++ b/src/components/profile/ProfilePreview.tsx @@ -132,11 +132,11 @@ const ProfilePreview: React.FC<ProfilePreviewProps> = ({ loadProfile(user.id, user.username); updateMoments(true); if (!isComment) { - navigation.navigate('Profile', { + navigation.push('Profile', { isProfileView: true, }); } else { - navigation.navigate('ProfileView', { + navigation.push('ProfileView', { isProfileView: true, }); } diff --git a/src/components/taggs/Tagg.tsx b/src/components/taggs/Tagg.tsx index c64da5ef..39cbee06 100644 --- a/src/components/taggs/Tagg.tsx +++ b/src/components/taggs/Tagg.tsx @@ -54,7 +54,7 @@ const Tagg: React.FC<TaggProps> = ({ const modalOrAuthBrowserOrPass = async () => { if (youMayPass) { if (INTEGRATED_SOCIAL_LIST.indexOf(social) !== -1) { - navigation.navigate('SocialMediaTaggs', { + navigation.push('SocialMediaTaggs', { socialMediaType: social, isProfileView: isProfileView, }); diff --git a/src/screens/profile/IndividualMoment.tsx b/src/screens/profile/IndividualMoment.tsx index 91f76f9b..b76f36d0 100644 --- a/src/screens/profile/IndividualMoment.tsx +++ b/src/screens/profile/IndividualMoment.tsx @@ -91,7 +91,7 @@ const IndividualMoment: React.FC<IndividualMomentProps> = ({ title="Close" buttonStyle={styles.button} onPress={() => { - navigation.navigate('Profile', {isProfileView: isProfileView}); + navigation.pop(); }} /> </View> diff --git a/src/screens/profile/MomentCommentsScreen.tsx b/src/screens/profile/MomentCommentsScreen.tsx index 30dde8b4..0d685ad1 100644 --- a/src/screens/profile/MomentCommentsScreen.tsx +++ b/src/screens/profile/MomentCommentsScreen.tsx @@ -58,7 +58,7 @@ const MomentCommentsScreen: React.FC<MomentCommentsScreenProps> = ({route}) => { buttonStyle={styles.button} titleStyle={styles.buttonText} onPress={() => { - navigation.goBack(); + navigation.pop(); }} /> <Text style={styles.headerText}> |