diff --git a/packages/bottom-tabs/src/navigators/createBottomTabNavigator.js b/packages/bottom-tabs/src/navigators/createBottomTabNavigator.js
index c9bedaa5..33ea7e27 100644
--- a/packages/bottom-tabs/src/navigators/createBottomTabNavigator.js
+++ b/packages/bottom-tabs/src/navigators/createBottomTabNavigator.js
@@ -2,8 +2,11 @@
 
 import * as React from 'react';
 import { View, StyleSheet } from 'react-native';
-import { ScreenContainer } from 'react-native-screens';
 import { polyfill } from 'react-lifecycles-compat';
+
+// eslint-disable-next-line import/no-unresolved
+import { ScreenContainer } from 'react-native-screens';
+
 import createTabNavigator, {
   type InjectedProps,
 } from '../utils/createTabNavigator';
diff --git a/packages/bottom-tabs/src/utils/createTabNavigator.js b/packages/bottom-tabs/src/utils/createTabNavigator.js
index 937f4fee..a84d1a06 100644
--- a/packages/bottom-tabs/src/utils/createTabNavigator.js
+++ b/packages/bottom-tabs/src/utils/createTabNavigator.js
@@ -9,7 +9,7 @@ import {
   NavigationActions,
 } from '@react-navigation/core';
 
-import { createNavigationContainer } from '@react-navigation/native';
+import { createAppContainer } from '@react-navigation/native';
 
 export type InjectedProps = {
   getLabelText: (props: { route: any }) => any,
@@ -198,6 +198,6 @@ export default function createTabNavigator(TabView: React.ComponentType<*>) {
     const router = TabRouter(routes, config);
     const navigator = createNavigator(NavigationView, router, config);
 
-    return createNavigationContainer(navigator);
+    return createAppContainer(navigator);
   };
 }
diff --git a/packages/bottom-tabs/src/views/ResourceSavingScene.js b/packages/bottom-tabs/src/views/ResourceSavingScene.js
index b9374a26..f5d70767 100644
--- a/packages/bottom-tabs/src/views/ResourceSavingScene.js
+++ b/packages/bottom-tabs/src/views/ResourceSavingScene.js
@@ -2,6 +2,8 @@
 
 import * as React from 'react';
 import { Platform, StyleSheet, View } from 'react-native';
+
+// eslint-disable-next-line import/no-unresolved
 import { Screen, screensEnabled } from 'react-native-screens';
 
 type Props = {