fixing few bugs

lib/en.json

@@ -217,11 +217,13 @@
     "alertDeleteItemContent": "Are you sure want to delete item ?",
     "alertSelectOrderFirst": "Please choose your order first",
     "alertBalanceNotEnoughtWithVooucher": "Rewards cannot be used because the minimum transaction is not enough, let's add your order again",
-    "alertSuccessTransaction":"Transaction successful",
-    "updateVersion":"Please update your application",
-    "upgradePremiumRespon":"We have received your premium upgrade request, please wait 1x24 hours!",
+    "alertSuccessTransaction": "Transaction successful",
+    "updateVersion": "Please update your application",
+    "upgradePremiumRespon": "We have received your premium upgrade request, please wait 1x24 hours!",
     "signin": "Sign In",
     "cardActivation": "Card Activation",
-    "headerPrivacyPolicy":"Privacy Policy",
-    "alertTokenResetPassword":"Please insert token"
+    "headerPrivacyPolicy": "Privacy Policy",
+    "alertTokenResetPassword": "Please insert token",
+    "alertNewPassword": "Please insert new password",
+    "alerConfirmNewPassword": "Please insert confirm password"
 }
\ No newline at end of file

lib/id.json

@@ -223,5 +223,7 @@
   "signin": "Masuk",
   "cardActivation": "Aktivasi Kartu",
   "headerPrivacyPolicy":"Kebijakan Privasi",
-  "alertTokenResetPassword":"Silahkan masukan token"
+  "alertTokenResetPassword":"Silahkan masukan token",
+  "alertNewPassword": "Silahkan masukan password baru",
+  "alerConfirmNewPassword": "Silahkan masukan konfirmasi password baru"
 }
\ No newline at end of file

view/AddreesDetail.js

@@ -5,7 +5,7 @@ import * as Location from 'expo-location';
 import * as Permissions from 'expo-permissions';
 import i18n from 'i18n-js';
 import React from 'react';
-import { ActivityIndicator, Alert, Platform, StyleSheet, Text, TextInput, View } from 'react-native';
+import { ActivityIndicator, Alert, Platform, StyleSheet, Text, TextInput, View, KeyboardAvoidingView } from 'react-native';
 import { ScrollView, TouchableOpacity } from 'react-native-gesture-handler';
 import MapView, { PROVIDER_GOOGLE } from 'react-native-maps';
 import { connect } from 'react-redux';
@@ -219,7 +219,7 @@ class AddreesDetail extends React.Component {
 
     render() {
         return (
-            <View style={styles.container}>
+            <KeyboardAvoidingView behavior={Platform.OS == "ios" ? 40 : 0} style={styles.container}>
                 <ScrollView>
                     <View style={styles.content}>
                         <View style={{ height: 45, borderRadius: 10, borderColor: '#ccb46c', borderWidth: 1, flexDirection: 'row', marginTop: 15, marginLeft: 10, marginRight: 10 }}>
@@ -229,7 +229,7 @@ class AddreesDetail extends React.Component {
                             <View style={{ flex: 6 }}>
                                 <TextInput style={{ height: 45 }} placeholder={i18n.t('findAddress')}
                                     caretHidden={this.state.caretHidden}
-                                    onFocus={() => this.setState({caretHidden: false})}
+                                    onFocus={() => this.setState({ caretHidden: false })}
                                     onChangeText={(address) => this.setState({ address })}>
                                 </TextInput>
                             </View>
@@ -294,9 +294,9 @@ class AddreesDetail extends React.Component {
                             <View style={styles.field_name_addrees}>
                                 <Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c", textAlign: 'center', fontSize: 18 }}>{i18n.t('label')}</Text>
                                 <TextInput style={{ color: 'grey', fontFamily: 'Gotham-Black', height: 40, borderWidth: 1, padding: 5, flex: 1, margin: 10, borderRadius: 10, borderColor: 'grey', textAlign: 'center' }}
-                                 onChangeText={(name) => this.setState({ name })} 
-                                 caretHidden={this.state.caretHidden}
-                                 onFocus={() => this.setState({caretHidden: false})} />
+                                    onChangeText={(name) => this.setState({ name })}
+                                    caretHidden={this.state.caretHidden}
+                                    onFocus={() => this.setState({ caretHidden: false })} />
                             </View>
 
                             <View style={styles.field_detail_addrees}>
@@ -307,7 +307,7 @@ class AddreesDetail extends React.Component {
                                     numberOfLines={10}
                                     multiline={true}
                                     caretHidden={this.state.caretHidden}
-                                    onFocus={() => this.setState({caretHidden: false})} />
+                                    onFocus={() => this.setState({ caretHidden: false })} />
                             </View>
                             <View style={{ margin: 50, justifyContent: 'center' }}>
                                 <TouchableOpacity onPress={() => this.saveAddress()}>
@@ -320,7 +320,7 @@ class AddreesDetail extends React.Component {
                         </View>
                     </View>
                 </ScrollView>
-            </View>
+            </KeyboardAvoidingView>
         )
     }
 }

view/InboxList.js

@@ -57,7 +57,7 @@ class InboxList extends React.Component {
         })
         Axios.post(this.props.BASE_URL + 'crm/v2/inbox/get_list', params).then(res => {
             let data = res.data.messages
-            // console.log(data)
+            console.log(data)
 
             this.setState({
                 inbox_list: data,

view/NewPassword.js

@@ -15,7 +15,7 @@ class NewPassword extends React.Component {
             caretHidden:true,
             confirmation_number: '',
             email: this.props.email,
-            password: this.props.password,
+            password: '',
             password_confirmation: '',
             spinner: false,
         }
@@ -38,6 +38,27 @@ class NewPassword extends React.Component {
                 i18n.t('alertTokenResetPassword')
                 ,
             )
+
+        } else if(this.state.password == '') {
+            this.setState({
+                spinner: false,
+            })
+            Alert.alert(
+                '',
+                i18n.t('alertNewPassword')
+                ,
+            )
+
+        } else if(this.state.password_confirmation == '') {
+            this.setState({
+                spinner: false,
+            })
+            Alert.alert(
+                '',
+                i18n.t('alerConfirmNewPassword')
+                ,
+            )
+
         } else if (this.state.password !== this.state.password_confirmation) {
             this.setState({
                 spinner: false,