Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

view/Auth.js

@@ -145,12 +145,7 @@ class Auth extends React.Component {
             <>
 
               <Stack.Screen name="Login" component={Login} options={{ headerShown: false }} />
-              <Stack.Screen name="Login Welcome" component={WelcomeLog} options={{
-                headerShown: false,
-              }} />
               <Stack.Screen name="Home" component={Home} />
-
-
               <Stack.Screen name="Profile" component={ProfilePage} options={{
                 headerStyle: { backgroundColor: '#CFB368' },
                 headerTitleContainerStyle: { alignContent: 'center' },
@@ -205,6 +200,9 @@ class Auth extends React.Component {
             </>
           ) : (
                 <>
+                  <Stack.Screen name="Login Welcome" component={WelcomeLog} options={{
+                    headerShown: false,
+                  }} />
                   <Stack.Screen name="Home" component={HomePage}
                     options={{
                       headerShown: false,

view/Login.js

@@ -138,7 +138,7 @@ class Login extends React.Component {
                     index: 0,
                     routes: [
                         {
-                            name: 'Home',
+                            name: 'LoginWelcome',
                             params: { someParam: 'Param1' },
                         },
                     ],

view/WelcomeLog.js

@@ -6,7 +6,7 @@ export default class WelcomeLog extends React.Component {
     constructor(props) {
         super(props);
         this.state = ({
-            spinner: ''
+            spinner: false
         })
     }
 
@@ -38,7 +38,7 @@ export default class WelcomeLog extends React.Component {
                     </View>
                     <View style={styles.v_policy}>
                         <View style={{ flex: 1, height: 50, marginRight: 70, marginLeft: 70, justifyContent: 'center' }}>
-                            <TouchableOpacity onPress={() => navigation.reset({
+                            <TouchableOpacity onPress={() => this.props.navigation.reset({
                                 index: 0,
                                 routes: [
                                     {

view/WelcomeReg.js

@@ -7,7 +7,7 @@ export default class Welcome extends React.Component {
     constructor(props) {
         super(props);
         this.state = ({
-            spinner: ''
+            spinner: false
         })
     }
 
@@ -39,7 +39,14 @@ export default class Welcome extends React.Component {
                     </View>
                     <View style={styles.v_policy}>
                     <View style={{ flex: 1, height: 50, marginRight: 70, marginLeft: 70, justifyContent: 'center' }}>
-                    <TouchableOpacity onPress={()=> this.props.navigation.navigate('Login')}>
+                    <TouchableOpacity onPress={()=> this.props.navigation.reset({
+                        index: 0,
+                        routes: [
+                            {
+                                name: 'Login',
+                            },
+                        ],
+                    })}>
                                 <View style={{ height: 50, borderRadius: 20, backgroundColor: '#CFB368' }}>
                                     <Text style={{ fontFamily: 'Gotham-Black', color: 'black', fontSize: 20, textAlign: 'center', margin: 15 }}>NEXT</Text>
                                 </View>