account view profil dan email confirmation

view/Account.js

@@ -188,29 +188,40 @@ class Account extends React.Component {
     }
 
 
+    handleSettings() {
+        if (this.state.clickSettings == 8) {
+            this.props.navigation.navigate('SettingsScreen')
+            this.setState({ clickSettings: 0 })
+        } else {
+            new_count = this.state.clickSettings
+            this.setState({ clickSettings: new_count + 1 })
+        }
+    }
+
+
     render() {
         const navigation = this.props.navigation
         return (
             <View style={styles.container}>
                 <ScrollView>
-
-                    <View style={{ flex: 1, height: 90 }}>
-                        <View style={{ alignSelf: 'center' }}>
-                            <Image
-                                style={{ height: 70, width: 70, justifyContent: 'center', top: 20 }}
-                                source={require('../assets/images/people-actv.png')}
-                            />
-                        </View>
-                        <View style={{ height: 90, justifyContent: 'center' }}>
-
-                            <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center' }}>
-                                {this.state.full_name}
-                            </Text>
-                            <TouchableOpacity onPress={() => this.props.navigation.navigate('Profile')}>
-                                <Text style={{ fontFamily: 'Gotham-Light', color: '#838383', fontSize: 12, textAlign: 'center', top: 2 }}>View Profile</Text>
-                            </TouchableOpacity>
+                    
+                        <View style={{ flex: 1, height: 90 }}>
+                            <View style={{ alignSelf: 'center' }}>
+                                <Image
+                                    style={{ height: 70, width: 70, justifyContent: 'center', top: 20 }}
+                                    source={require('../assets/images/people-actv.png')}
+                                />
+                            </View>
+                            <View style={{ height: 90, justifyContent: 'center' }}>
+
+                                <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center' }}>
+                                    {this.state.full_name}
+                                </Text>
+                                <TouchableOpacity onPress={() => this.props.navigation.navigate('Profile')}>
+                                    <Text style={{ fontFamily: 'Gotham-Light', color: '#838383', fontSize: 12, textAlign: 'center', top: 2 }}>View Profile</Text>
+                                </TouchableOpacity>
+                            </View>
                         </View>
-                    </View>
 
                     {
                         this.props.set_card === false ? (
@@ -278,11 +289,7 @@ class Account extends React.Component {
                                                                     </View>
                                                                 </View>
 
-
                                                                 <View style={styles.line2}></View>
-                                                                {/* <Text style={{ textAlign: 'left', fontWeight: 'bold' }}>
-                            {i18n.t('point')} {this.state.point}
-                          </Text> */}
                                                                 <View style={{ flexDirection: 'row', flex: 1 }}>
                                                                     <View style={{ flex: 0.3, justifyContent: 'center' }}>
                                                                         {/* <Text>{i18n.t('balance')}</Text> */}

view/EmailConfirmation.js

@@ -115,11 +115,21 @@ class EmailConfirmation extends React.Component {
     }
 
     handleCancel() {
-        let pageProps = {
-            pageEmailConfirmation: false
+        if (this.props.pageEmailConfirmation == true) {
+            let pageProps = {
+                pageEmailConfirmation: false
+            }
+            this.props.setPage(pageProps)
+            this.props.navigation.navigate('Login');
+        } else {
+            console.log("KE REGISTER ")
+            let pageProps = {
+                pageEmailConfirmation: false
+            }
+            this.props.setPage(pageProps)
+            this.props.navigation.navigate('New Register');
         }
-        this.props.setPage(pageProps)
-        this.props.navigation.navigate('New Register');
+
     }
 
     handleResend() {