Merge branch 'master' into tma988-remove-positioned-tags-for-video-moments

3 files changed, 6 insertions, 8 deletions

diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index c569d2d6..11e9d08d 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -39,7 +39,7 @@ export type MainStackParams = {
     screenType: ScreenType;
     selectedCategory?: string;
   };
-  ZoomInCropper: {
+  EditMedia: {
     media: {uri: string; isVideo: boolean};
     screenType: ScreenType;
     selectedCategory?: string;
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 15300c0d..064e9725 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -34,12 +34,12 @@ import {
   TagSelectionScreen,
   TagFriendsScreen,
   CameraScreen,
+  EditMedia,
 } from '../../screens';
 import MutualBadgeHolders from '../../screens/suggestedPeople/MutualBadgeHolders';
 import {ScreenType} from '../../types';
 import {AvatarHeaderHeight, ChatHeaderHeight, SCREEN_WIDTH} from '../../utils';
 import {MainStack, MainStackParams} from './MainStackNavigator';
-import {ZoomInCropper} from '../../components/comments/ZoomInCropper';
 import ChoosingCategoryScreen from '../../screens/profile/ChoosingCategoryScreen';
 
 /**
@@ -336,8 +336,8 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
           }}
         />
         <MainStack.Screen
-          name="ZoomInCropper"
-          component={ZoomInCropper}
+          name="EditMedia"
+          component={EditMedia}
           options={{
             ...modalStyle,
             gestureEnabled: false,
diff --git a/src/routes/tabs/NavigationBar.tsx b/src/routes/tabs/NavigationBar.tsx
index c3f0b9f8..a3584f55 100644
--- a/src/routes/tabs/NavigationBar.tsx
+++ b/src/routes/tabs/NavigationBar.tsx
@@ -6,7 +6,7 @@ import {NO_NOTIFICATIONS} from '../../store/initialStates';
 import {RootState} from '../../store/rootReducer';
 import {setNotificationsReadDate} from '../../services';
 import {ScreenType} from '../../types';
-import {haveUnreadNotifications} from '../../utils';
+import {haveUnreadNotifications, isIPhoneX} from '../../utils';
 import MainStackScreen from '../main/MainStackScreen';
 import {NotificationPill} from '../../components/notifications';
 
@@ -84,9 +84,7 @@ const NavigationBar: React.FC = () => {
             backgroundColor: 'transparent',
             position: 'absolute',
             borderTopWidth: 0,
-            left: 0,
-            right: 0,
-            bottom: '1%',
+            height: isIPhoneX() ? 85 : 55,
           },
         }}>
         <Tabs.Screen