Merge branch 'master' into tma994-bugfix-camera-screen-preview

# Conflicts:
#	src/components/moments/TrimmerPlayer.tsx
#	src/screens/upload/EditMedia.tsx

1 files changed, 2 insertions, 2 deletions

diff --git a/src/components/camera/GalleryIcon.tsx b/src/components/camera/GalleryIcon.tsx
index ca2d2559..44297d6d 100644
--- a/src/components/camera/GalleryIcon.tsx
+++ b/src/components/camera/GalleryIcon.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {Image, Text, TouchableOpacity, View} from 'react-native';
-import {navigateToImagePicker} from '../../utils/camera';
+import {navigateToMediaPicker} from '../../utils/camera';
 import {ImageOrVideo} from 'react-native-image-crop-picker';
 import {styles} from './styles';
 
@@ -19,7 +19,7 @@ export const GalleryIcon: React.FC<GalleryIconProps> = ({
 }) => {
   return (
     <TouchableOpacity
-      onPress={() => navigateToImagePicker(callback)}
+      onPress={() => navigateToMediaPicker(callback)}
       style={styles.saveButton}>
       {mostRecentPhotoUri !== '' ? (
         <Image