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

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

lib/en.json

@@ -89,7 +89,7 @@
     "addaddress": "Add Address",
     "label": "Label",
     "selectaddress": "SELECT",
-    "detail": "Details",
+    "completeaddress": "Complete address",
     "Transferbalance": "TRANSFER BALANCE",
     "Transactionhistory": "TRANSACTION HISTORY",
     "Renewal": "RENEWAL",
@@ -228,5 +228,6 @@
     "alerConfirmNewPassword": "Password confirmation field is required!",
     "alertLabelAddress": "Label field is required",
     "alertDetailAddress": "Detail field is required",
-    "alertVoucher":"Voucher cannot be used with point"
+    "alertVoucher":"Voucher cannot be used with point",
+    "alertemailblank":"Email cannot be empty"
 }
\ No newline at end of file

lib/id.json

@@ -89,7 +89,7 @@
   "addaddress": "Tambah Alamat",
   "label": "Label",
   "selectaddress": "PILIH",
-  "detail": "Detail",
+  "completeaddress":"Alamat lengkap",
   "Transferbalance": "TRANSFER SALDO",
   "Transactionhistory": "RIWAYAT TRANSAKSI",
   "Renewal": "RENEWAL",
@@ -228,5 +228,6 @@
   "alerConfirmNewPassword": "Konfirmasi password harus diisi!",
   "alertLabelAddress": "Nama alamat harus diisi!",
   "alertDetailAddress": "Detail alamat harus diisi!",
-  "alertVoucher":"Voucher tidak bisa digunakan dengan point"
+  "alertVoucher":"Voucher tidak bisa digunakan dengan point",
+  "alertemailblank":"Email tidak boleh kosong"
 }
\ No newline at end of file

view/Auth.js

@@ -700,7 +700,7 @@ class Auth extends React.Component {
             fontFamily: 'Gotham-Black',
             color: 'white'
           },
-          headerTitle: 'CHANGE EMAIL'
+          headerTitle: i18n.t('changeEmail')
 
         }} />
         {/* <Stack.Screen name="Card Activation" component={CardActivation} /> */}

view/ChangeEmail.js

@@ -19,6 +19,9 @@ class ChangeEmail extends React.Component {
     }
 
     changeEmail() {
+        if (this.state.email=="") {
+            Alert.alert("",i18n.t('alertemailblank'));
+        } else {
             this.setState({
                 spinner: true,
             })
@@ -40,6 +43,7 @@ class ChangeEmail extends React.Component {
                 this.props.setChangeEmail(loginProps)
                 this.props.setEmailConfirm(emailConfirmProps)
     
+    
                 Alert.alert(
                     '',
                     i18n.t('alertCheckEmail'),
@@ -70,6 +74,8 @@ class ChangeEmail extends React.Component {
             })
         }
         
+    }
+
     render() {
         return (
             <View style={styles.container}>