Merge branch 'master' into tma948-video-playback

# Conflicts:
#	ios/Podfile.lock
#	package.json
#	src/components/moments/Moment.tsx
#	src/routes/main/MainStackNavigator.tsx
#	src/screens/moments/TagFriendsScreen.tsx
#	src/screens/profile/CaptionScreen.tsx
#	yarn.lock

2 files changed, 3 insertions, 9 deletions

diff --git a/src/components/profile/MomentMoreInfoDrawer.tsx b/src/components/profile/MomentMoreInfoDrawer.tsx
index c70df875..910aa095 100644
--- a/src/components/profile/MomentMoreInfoDrawer.tsx
+++ b/src/components/profile/MomentMoreInfoDrawer.tsx
@@ -3,7 +3,6 @@ import React, {useEffect, useState} from 'react';
 import {
   Alert,
   GestureResponderEvent,
-  StyleSheet,
   TextStyle,
   TouchableOpacity,
   ViewProps,
@@ -174,7 +173,6 @@ const MomentMoreInfoDrawer: React.FC<MomentMoreInfoDrawerProps> = (props) => {
   return (
     <>
       <TouchableOpacity
-        style={styles.icon}
         onPress={() => {
           setIsOpen(true);
         }}>
@@ -189,10 +187,4 @@ const MomentMoreInfoDrawer: React.FC<MomentMoreInfoDrawerProps> = (props) => {
   );
 };
 
-const styles = StyleSheet.create({
-  icon: {
-    marginRight: '3%',
-  },
-});
-
 export default MomentMoreInfoDrawer;
diff --git a/src/components/profile/PublicProfile.tsx b/src/components/profile/PublicProfile.tsx
index 8a80c56f..6b991d7c 100644
--- a/src/components/profile/PublicProfile.tsx
+++ b/src/components/profile/PublicProfile.tsx
@@ -87,7 +87,9 @@ const PublicProfile: React.FC<ContentProps> = ({
               scrollViewRef.current
             ) {
               setScrollEnabled(false);
-              scrollViewRef.current.scrollTo({y: 0});
+              if (scrollViewRef && scrollViewRef.current) {
+                scrollViewRef.current.scrollTo({y: 0});
+              }
               navigation.navigate('MomentUploadPrompt', {
                 screenType,
                 momentCategory: momentCategories[0],