diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index bffd23548..6a6f6c417 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -828,4 +828,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 0282022703ad578ab2d9afbf3147ba3b373b4311
-COCOAPODS: 1.10.2
+COCOAPODS: 1.11.3
diff --git a/src/constants/routeNames.js b/src/constants/routeNames.js
index 8807340bb..35c291087 100644
--- a/src/constants/routeNames.js
+++ b/src/constants/routeNames.js
@@ -2,6 +2,7 @@ const DRAWER_SUFFIX = 'Drawer';
const MODAL_SUFFIX = 'Modal';
const SCREEN_SUFFIX = 'Screen';
const TABBAR_SUFFIX = 'Tabbar';
+const STACK_SUFFIX = 'Stack';
export default {
SCREENS: {
@@ -49,4 +50,7 @@ export default {
MODAL: {
LOGOUT: `Logout${MODAL_SUFFIX}`,
},
+ STACK: {
+ MAIN: `Main${STACK_SUFFIX}`,
+ },
};
diff --git a/src/navigation/stackNavigator.tsx b/src/navigation/stackNavigator.tsx
index 88cb05808..cf9809638 100644
--- a/src/navigation/stackNavigator.tsx
+++ b/src/navigation/stackNavigator.tsx
@@ -34,45 +34,53 @@ import {
} from '../screens';
import { DrawerNavigator } from './drawerNavigator';
-const Stack = createNativeStackNavigator();
+const RootStack = createNativeStackNavigator();
+const MainStack = createNativeStackNavigator();
+
+const MainStackNavigator = () => {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
export const StackNavigator = () => {
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
)
}
diff --git a/src/screens/login/screen/loginScreen.js b/src/screens/login/screen/loginScreen.js
index e718968dd..569ba89a1 100644
--- a/src/screens/login/screen/loginScreen.js
+++ b/src/screens/login/screen/loginScreen.js
@@ -1,5 +1,5 @@
import React, { PureComponent } from 'react';
-import { View, StatusBar, Platform, Keyboard } from 'react-native';
+import { View, Platform, Keyboard } from 'react-native';
import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
import ScrollableTabView from 'react-native-scrollable-tab-view';
import { injectIntl } from 'react-intl';
@@ -83,7 +83,6 @@ class LoginScreen extends PureComponent {
console.log('keyboardIsOpen : ', keyboardIsOpen);
return (
-