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

view/EmailConfirmation.js

@@ -195,6 +195,7 @@ class EmailConfirmation extends React.Component {
     }
 
     render() {
+        console.log(this.props.proses)
         return (
             <View style={styles.container}>
                 <MyStatusBar />
@@ -225,7 +226,7 @@ class EmailConfirmation extends React.Component {
                         <TouchableOpacity style={{ height: 60 }} onPress={() => this.handleResend()}>
                             <Text style={{ alignSelf: 'center', color: '#CFB368', fontFamily: 'Gotham-Black', fontSize: 20, top: 10 }}>RESEND EMAIL TOKEN</Text>
                         </TouchableOpacity>
-                        {this.props.isEmailverif == true ? (
+                        {this.props.proses == 'Register' ? (
                             <TouchableOpacity style={{ height: 60 }} onPress={() => this.props.navigation.navigate('Change Email')}>
                                 <Text style={{ alignSelf: 'center', color: '#CFB368', fontFamily: 'Gotham-Black', fontSize: 20, }}>CHANGE EMAIL</Text>
                             </TouchableOpacity>

view/Login.js

@@ -162,7 +162,7 @@ d        } else {
                 }
 
                 let prosesProps = {
-                    proses: 'Register'
+                    proses: ''
                 }
 
                 this.props.setProses(prosesProps);