Merge branch 'master' into poc-video

# Conflicts:
#	Makefile
#	ios/Frontend/Info.plist
#	src/components/camera/GalleryIcon.tsx
#	src/components/camera/SaveButton.tsx
#	src/components/moments/Moment.tsx
#	src/screens/moments/CameraScreen.tsx
#	src/utils/camera.ts

2 files changed, 8 insertions, 1 deletions

diff --git a/src/components/moments/Moment.tsx b/src/components/moments/Moment.tsx
index 108ea100..6850f154 100644
--- a/src/components/moments/Moment.tsx
+++ b/src/components/moments/Moment.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import {Alert, StyleProp, StyleSheet, View, ViewStyle} from 'react-native';
 import {Text} from 'react-native-animatable';
 import {ScrollView, TouchableOpacity} from 'react-native-gesture-handler';
-import ImagePicker from 'react-native-image-crop-picker';
 import LinearGradient from 'react-native-linear-gradient';
 import DeleteIcon from '../../assets/icons/delete-logo.svg';
 import DownIcon from '../../assets/icons/down_icon.svg';
@@ -14,6 +13,7 @@ import {TAGG_LIGHT_BLUE} from '../../constants';
 import {MomentType, ScreenType} from '../../types';
 import {normalize, SCREEN_WIDTH} from '../../utils';
 import {navigateToVideoPicker} from '../../utils/camera';
+import ImagePicker from 'react-native-image-crop-picker';
 import MomentTile from './MomentTile';
 
 interface MomentProps {
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 65a695f5..43760b60 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -344,6 +344,13 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
             gestureEnabled: false,
           }}
         />
+        <MainStack.Screen
+          name="CameraScreen"
+          component={CameraScreen}
+          options={{
+            gestureEnabled: false,
+          }}
+        />
       </MainStack.Navigator>
     );
   };