Merge master into this test branch.

2 files changed, 15 insertions, 19 deletions

diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index ef3fc7fd..a5d73988 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -2,7 +2,6 @@
  * Note the name userXId here, it refers to the id of the user being visited
  */
 import {createStackNavigator} from '@react-navigation/stack';
-import {Image} from 'react-native-image-crop-picker';
 import {
   CommentBaseType,
   MomentTagType,
@@ -38,16 +37,16 @@ export type MainStackParams = {
   };
   CaptionScreen: {
     title?: string;
-    image?: {
-      filename: string;
-      path: string;
-    };
+    media?: {uri: string; isVideo: boolean};
     screenType: ScreenType;
     selectedTags?: MomentTagType[];
     moment?: MomentType;
   };
   TagFriendsScreen: {
-    imagePath: string;
+    media: {
+      uri: string;
+      isVideo: boolean;
+    };
     selectedTags?: MomentTagType[];
   };
   TagSelectionScreen: {
@@ -111,7 +110,7 @@ export type MainStackParams = {
   Chat: undefined;
   NewChatModal: undefined;
   ZoomInCropper: {
-    image: Image;
+    media: {uri: string; isVideo: boolean};
     screenType: ScreenType;
     title: string;
   };
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index f6adeab1..43760b60 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -332,6 +332,15 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
           name="ZoomInCropper"
           component={ZoomInCropper}
           options={{
+            ...modalStyle,
+            gestureEnabled: false,
+          }}
+        />
+        <MainStack.Screen
+          name="CameraScreen"
+          component={CameraScreen}
+          options={{
+            ...modalStyle,
             gestureEnabled: false,
           }}
         />
@@ -407,18 +416,6 @@ const styles = StyleSheet.create({
     letterSpacing: normalize(1.3),
     fontWeight: '700',
   },
-  whiteHeaderTitle: {
-    fontSize: normalize(16),
-    letterSpacing: normalize(1.3),
-    fontWeight: '700',
-    color: 'white',
-  },
-  blackHeaderTitle: {
-    fontSize: normalize(16),
-    letterSpacing: normalize(1.3),
-    fontWeight: '700',
-    color: 'black',
-  },
 });
 
 export default MainStackScreen;