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

view/ChangeEmail.js

@@ -13,11 +13,15 @@ class ChangeEmail extends React.Component {
         super(props);
         this.state = {
             email: "",
-            caretHidden:true
+            caretHidden:true,
+            spinner: false,
         }
     }
 
     changeEmail() {
+        this.setState({
+            spinner: true,
+        })
 
         let paramater = {
             "email": this.state.email,
@@ -35,16 +39,34 @@ class ChangeEmail extends React.Component {
             }
             this.props.setChangeEmail(loginProps)
             this.props.setEmailConfirm(emailConfirmProps)
+
             Alert.alert(
                 '',
-                i18n.t('alertCheckEmail')
-                ,
-            )
+                i18n.t('alertCheckEmail'),
+                [
+                    {
+                        text: 'OK', onPress: () => {
+                            this.setState({
+                                spinner: false,
+                            })
                             this.props.navigation.navigate("Email Confirmation");
+                        }
+                    }
+                ]
+            );
         }).catch(error => {
-
             let response = error.response.data;
-            Alert.alert(response.msg);
+            Alert.alert(
+                '',
+                response.msg,
+                [
+                    {
+                        text: 'OK', onPress: () => this.setState({
+                            spinner: false,
+                        })
+                    }
+                ]
+            );
         })
     }
 

view/EmailConfirmation.js

@@ -78,12 +78,18 @@ class EmailConfirmation extends React.Component {
                 })
             }).catch(error => {
                 let response = error.response.data;
-                Alert.alert('',response.msg);
-                this.setState({
+                Alert.alert(
+                    '',
+                    response.msg,
+                    [
+                        {
+                            text: 'OK', onPress: () => this.setState({
                                 spinner: false,
                             })
+                        }
+                    ]
+                );
             })
-
         } else {
 
             let pageProps = {
@@ -114,11 +120,18 @@ class EmailConfirmation extends React.Component {
                 })
 
             }).catch(error => {
-                this.setState({
+                let response = error.response.data;
+                Alert.alert(
+                    '',
+                    response.msg,
+                    [
+                        {
+                            text: 'OK', onPress: () => this.setState({
                                 spinner: false,
                             })
-                let response = error.response.data;
-                Alert.alert(response.msg);
+                        }
+                    ]
+                );
             })
         }
     }
@@ -159,18 +172,22 @@ class EmailConfirmation extends React.Component {
             }
             // console.log(params)
             Axios.post(this.props.BASE_URL+'crm/v2/auth/login', params).then(res => {
-
                 this.setState({
                     spinner: false,
                 })
-
             }).catch(error => {
-
                 let response = error.response.data;
-                Alert.alert('', i18n.t('alertCheckEmail'));
-                this.setState({
+                Alert.alert(
+                    '',
+                    i18n.t('alertCheckEmail'),
+                    [
+                        {
+                            text: 'OK', onPress: () => this.setState({
                                 spinner: false,
                             })
+                        }
+                    ]
+                );
 
             })
         } else {
@@ -184,22 +201,30 @@ class EmailConfirmation extends React.Component {
             this.props.setPage(pageProps)
 
             Axios.post(this.props.BASE_URL+'crm/v2/auth/register_resend_email', paramater).then(res => {
-                this.setState({
-                    spinner: false,
-                })
                 Alert.alert(
                     i18n.t('alertSuccessTitle'),
-                    i18n.t('alertEmailSended')
-
-                )
+                    i18n.t('alertEmailSended'),
+                    [
+                        {
+                            text: 'OK', onPress: () => this.setState({
+                                spinner: false,
+                            })
+                        }
+                    ]
+                );
             }).catch(error => {
-
                 let response = error.response.data;
-                // console.log(response);
-                this.setState({
+                Alert.alert(
+                    '',
+                    response.msg,
+                    [
+                        {
+                            text: 'OK', onPress: () => this.setState({
                                 spinner: false,
                             })
-                Alert.alert('', response.msg)
+                        }
+                    ]
+                );
             })
         }
 

view/Login.js

@@ -247,11 +247,18 @@ class Login extends React.Component {
 
                 } else {
                     let response = error.response.data;
-                    Alert.alert(response.msg);
-                    this.setState({
+                    Alert.alert(
+                        '',
+                        response.msg,
+                        [
+                            {
+                                text: 'OK', onPress: () => this.setState({
                                     spinner: false,
                                 })
                             }
+                        ]
+                    );
+                }
             })
         }
     }

view/NewPassword.js

@@ -96,11 +96,18 @@ class NewPassword extends React.Component {
             })
             this.props.navigation.navigate('Login')
         }).catch(error => {
-            this.setState({
+            let response = error.response.data;
+            Alert.alert(
+                '',
+                response.msg,
+                [
+                    {
+                        text: 'OK', onPress: () => this.setState({
                             spinner: false,
                         })
-            let response = error.response.data;
-            Alert.alert('',response.msg);
+                    }
+                ]
+            );
         })
     }
 

view/New_Register.js

@@ -237,15 +237,21 @@ class NewRegister extends React.Component {
             this.props.setRegistration(registerProps);
             Alert.alert(
                 '',
-                i18n.t('alertCheckEmail')
-                    ,
-            )
+                i18n.t('alertCheckEmail'),
+                [
+                    {
+                        text: 'OK', onPress: () => {
                             this.setState({
                                 spinner: false,
                             })
 
                             this.props.navigation.navigate('Email Confirmation')
+                        }
                         
+                    }
+                ],
+                { cancelable: false }
+            );
         }).catch(error => {
 
             // console.log(JSON.stringify(error.response));
@@ -260,7 +266,7 @@ class NewRegister extends React.Component {
                         })
                     }
                 ]
-            )
+            );
         })
 
     }

view/ResetPassword.js

@@ -43,23 +43,25 @@ class ResetPassword extends React.Component {
                 }
                 this.props.setChangeIsSubmit(isSubmit)
 
+                Alert.alert(
+                    '',
+                    i18n.t('alertCheckEmail'),
+                    [
+                        {
+                            text: 'OK', onPress: () => {
                                 this.setState({
                                     spinner: false,
                                 })
-                Alert.alert(
-                    '',
-                    i18n.t('alertCheckEmail')
-                    ,
-                )
-
                                 this.props.navigation.navigate('New Password');
                             }
+                            
+                        }
+                    ],
+                    { cancelable: false }
+                );
+            }
         }).catch(error => {
-            // this.setState({
-            //     spinner: false,
-            // })
             let response = error.response.data;
-            // Alert.alert('',response.msg);
             Alert.alert(
                 '',
                 response.msg,