fix bug language

android/app/build.gradle

@@ -132,8 +132,8 @@ android {
         applicationId "com.dcv.invest"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2
-        versionName "1.4"
+        versionCode 11
+        versionName "1.5"
         vectorDrawables.useSupportLibrary = true
     }
     splits {

ios/Invest.xcodeproj/project.pbxproj

@@ -903,7 +903,7 @@
 				CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = MXZ24GRH48;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -912,7 +912,7 @@
 				);
 				INFOPLIST_FILE = Invest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0;
+				MARKETING_VERSION = 2.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -937,11 +937,11 @@
 				CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = MXZ24GRH48;
 				INFOPLIST_FILE = Invest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0;
+				MARKETING_VERSION = 2.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

src/Screens/Action/Wallet/WalletWithdraw.js

@@ -38,8 +38,13 @@ import {getOTPApi} from '../../../apis/Functions/users';
 import {OTPWALLET} from '../../../routers/ScreenNames';
 import {showAlert, TYPE} from '../../../components/DropdownAlert';
 var radio_props = [
-  {label: I18n.t('FromWallet'), value: 'WALLET'},
-  {label: I18n.t('FromCQGAccount'), value: 'INVESTMENT'},
+  {label: 'Từ ví', value: 'WALLET'},
+  {label: 'Từ tài khoản CQG', value: 'INVESTMENT'},
+];
+
+var radio_propsEN = [
+  {label: 'From wallet', value: 'WALLET'},
+  {label: 'From CQG Account', value: 'INVESTMENT'},
 ];
 const {width} = Dimensions.get('window');
 
@@ -161,7 +166,11 @@ const WalletWithdraw = (props) => {
                 </Text>
                 {/* <View style={styles.row}> */}
                 <RadioForm
-                  radio_props={radio_props}
+                  radio_props={
+                    props.language.language == 'vi'
+                      ? radio_props
+                      : radio_propsEN
+                  }
                   labelStyle={{fontSize: getFontXD(42)}}
                   formHorizontal={true}
                   style={styles.row}
@@ -273,6 +282,7 @@ const styles = StyleSheet.create({
 const mapStateToProps = (state) => {
   return {
     user: state.userReducer,
+    language: state.languageReducer,
   };
 };
 export default connect(mapStateToProps, {

src/Screens/Tool/ExchangeRate.js

@@ -56,6 +56,11 @@ const ExchangeRate = (props) => {
     } else if (!priceExchange) setUsdTan('');
   };
 
+  const onClick = () => {
+    setPriceExchange('');
+    setUsdTan('');
+  };
+
   return (
     <View style={{flex: 1}}>
       <HeaderBack title={'ExchangeRate'} />
@@ -76,6 +81,7 @@ const ExchangeRate = (props) => {
         <TextField
           isNumber={true}
           maxLength={12}
+          value={priceExchange}
           onChangeText={(val) => setPriceExchange(val)}
           title={I18n.t('ConversionPrice')}
         />
@@ -85,7 +91,7 @@ const ExchangeRate = (props) => {
           title={I18n.t('ConvertUSD')}
         />
         <View style={styles.footer}>
-          <TouchableOpacity style={styles.btnContainer}>
+          <TouchableOpacity onPress={onClick} style={styles.btnContainer}>
             <AppText style={styles.txtBtn} i18nKey={'Delete'} />
           </TouchableOpacity>
         </View>