update code

src/Screens/Account/AccountView.js

@@ -26,41 +26,41 @@ const AccountView = (props) => {
           onPress={() => navigate.navigate(PROFILE)}
           style={styles.containerItem}>
           <Image source={R.images.iconUser} style={styles.imgIcon} />
-          <AppText i18nKey={'MyProfile'}>Thông tin cá nhân</AppText>
+          <AppText i18nKey={'MyProfile'}> </AppText>
         </TouchableOpacity>
         <TouchableOpacity
           onPress={() => navigate.navigate(AccountVerification)}
           style={styles.containerItem}>
           <Image source={R.images.iconUserAccuracy} style={styles.imgIcon} />
-          <AppText i18nKey={'VerifyAccount'}>Xác thực tài khoản</AppText>
+          <AppText i18nKey={'VerifyAccount'}> </AppText>
         </TouchableOpacity>
 
         <TouchableOpacity
           onPress={() => navigate.navigate(PAYMENTS)}
           style={styles.containerItem}>
           <Image source={R.images.iconList} style={styles.imgIcon} />
-          <AppText i18nKey={'Payments'}>Các khoản thanh toán</AppText>
+          <AppText i18nKey={'Payments'}> </AppText>
         </TouchableOpacity>
 
         <TouchableOpacity
           onPress={() => navigate.navigate(ROSE)}
           style={styles.containerItem}>
           <Image source={R.images.iconRose} style={styles.imgIcon} />
-          <AppText i18nKey={'Rose'}>Hoa hồng</AppText>
+          <AppText i18nKey={'Rose'}> </AppText>
         </TouchableOpacity>
 
         <TouchableOpacity
           onPress={() => navigate.navigate(BONUSTEAM)}
           style={styles.containerItem}>
           <Image source={R.images.iconWallet} style={styles.imgIcon} />
-          <AppText i18nKey={'TeamBonus'}>Tiền thưởng đội nhóm</AppText>
+          <AppText i18nKey={'TeamBonus'}> </AppText>
         </TouchableOpacity>
 
         <TouchableOpacity
           onPress={() => navigate.navigate(MYGROUP)}
           style={styles.containerItem}>
           <Image source={R.images.moneyteam} style={styles.imgIcon} />
-          <AppText i18nKey={'MyPartner'}>Đối tác của tôi</AppText>
+          <AppText i18nKey={'MyPartner'}> </AppText>
         </TouchableOpacity>
       </View>
     </View>

src/Screens/AccountVerification/AccountVerificationView.js

@@ -17,6 +17,8 @@ import {getFontXD} from '../../Config/Functions';
 const Tab = createMaterialTopTabNavigator();
 import {connect} from 'react-redux';
 
+import I18n from '../../helper/i18/i18n';
+
 const AccountVerificationView = (props) => {
   return (
     <View style={{flex: 1}}>
@@ -32,12 +34,12 @@ const AccountVerificationView = (props) => {
         <Tab.Screen
           name="GeneralInfor"
           component={props.user.status == 1 ? GeneralInfor : GeneralView}
-          options={{tabBarLabel: 'Thông tin chung'}}
+          options={{tabBarLabel: I18n.t('GeneralInformation')}}
         />
         <Tab.Screen
           name="Profile"
           component={props.user.status == 1 ? Profile : ProfileView}
-          options={{tabBarLabel: 'Hồ sơ'}}
+          options={{tabBarLabel: I18n.t('Profile')}}
         />
       </Tab.Navigator>
     </View>

src/Screens/Action/History/HistoryView.js

@@ -56,9 +56,7 @@ const HistoryView = (props) => {
                   style={[
                     styles.txtFillter,
                     selected == e.value ? {color: '#1473E6'} : {},
-                  ]}>
-                  {e.name}
-                </AppText>
+                  ]}></AppText>
               </TouchableOpacity>
             ))}
           </ScrollView>
@@ -72,9 +70,7 @@ const HistoryView = (props) => {
               style={{
                 fontSize: 18,
                 fontWeight: 'bold',
-              }}>
-              Không có dữ liệu!
-            </AppText>
+              }}></AppText>
           </View>
         ) : (
           <FlatList

src/Screens/Action/Wallet/Tab/Success.js

@@ -75,9 +75,7 @@ const Success = (props) => {
             style={{
               fontSize: 18,
               fontWeight: 'bold',
-            }}>
-            Không có dữ liệu!
-          </AppText>
+            }}></AppText>
         </View>
       ) : (
         <FlatList

src/Screens/Action/Wallet/Tab/Watting.js

@@ -80,9 +80,7 @@ const Watting = (props) => {
             style={{
               fontSize: 18,
               fontWeight: 'bold',
-            }}>
-            Không có dữ liệu!
-          </AppText>
+            }}></AppText>
         </View>
       ) : (
         <FlatList

src/Screens/Action/Wallet/Wallet.js

@@ -5,7 +5,8 @@ import Success from './Tab/Success';
 import Watting from './Tab/Watting';
 import {getFontXD} from '../../../Config/Functions';
 import {WALLETDEPOSIT, WALLETWITHDRAW} from '../../../routers/ScreenNames';
-
+import I18n from '../../../helper/i18/i18n';
+import AppText from '../../../components/AppText';
 import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs';
 import R from '../../../assets/R';
 const Tab = createMaterialTopTabNavigator();
@@ -28,12 +29,12 @@ const Wallet = (props) => {
           <Tab.Screen
             name="Tab1"
             component={Watting}
-            options={{tabBarLabel: 'Đang chờ'}}
+            options={{tabBarLabel: I18n.t('Waiting')}}
           />
           <Tab.Screen
             name="Tab2"
             component={Success}
-            options={{tabBarLabel: 'Thành công'}}
+            options={{tabBarLabel: I18n.t('Success')}}
           />
         </Tab.Navigator>
       </View>
@@ -41,12 +42,16 @@ const Wallet = (props) => {
       <TouchableOpacity
         onPress={() => navigate.navigate(WALLETDEPOSIT)}
         style={styles.btnLeft}>
-        <Text style={styles.txtTitle}>Nạp tiền</Text>
+        <AppText i18nKey={'Deposit'} style={styles.txtTitle}>
+          Nạp tiền
+        </AppText>
       </TouchableOpacity>
       <TouchableOpacity
         onPress={() => navigate.navigate(WALLETWITHDRAW)}
         style={styles.btnRight}>
-        <Text style={styles.txtTitle}>Rút tiền</Text>
+        <AppText i18nKey={'Withdraw'} style={styles.txtTitle}>
+          Rút tiền
+        </AppText>
       </TouchableOpacity>
     </View>
   );

src/Screens/Home/Footer.js

@@ -12,9 +12,7 @@ const Footer = (props) => {
           <Image source={R.images.moneyteam} style={styles.imgIcon} />
         </View>
         <View style={{flex: 1, paddingHorizontal: 15}}>
-          <AppText i18nKey={'RevenueTeam'} style={styles.txt}>
-            Doanh thu của đội
-          </AppText>
+          <AppText i18nKey={'RevenueTeam'} style={styles.txt}></AppText>
           <Text style={styles.txtMoney}>0 Đ</Text>
         </View>
         <View style={{justifyContent: 'center', alignItems: 'center'}}>
@@ -27,9 +25,7 @@ const Footer = (props) => {
           <Image source={R.images.moneysupport} style={styles.imgIcon} />
         </View>
         <View style={{flex: 1, paddingHorizontal: 15}}>
-          <AppText i18nKey={'RevenueDonors'} style={styles.txt}>
-            Doanh thu nhà tài trợ
-          </AppText>
+          <AppText i18nKey={'RevenueDonors'} style={styles.txt}></AppText>
           <Text style={styles.txtMoney}> 0 Đ</Text>
         </View>
         <View style={{justifyContent: 'center', alignItems: 'center'}}>
@@ -42,9 +38,7 @@ const Footer = (props) => {
           <Image source={R.images.moneyinvest} style={styles.imgIcon} />
         </View>
         <View style={{flex: 1, paddingHorizontal: 15}}>
-          <AppText i18nKey={'Invset'} style={styles.txt}>
-            Đầu tư
-          </AppText>
+          <AppText i18nKey={'Invset'} style={styles.txt}></AppText>
           <Text style={styles.txtMoney}>0 Đ</Text>
         </View>
         <View style={{justifyContent: 'center', alignItems: 'center'}}>

src/Screens/LegalDocument/LegalDocument.js

@@ -9,27 +9,34 @@ import {
   LEGALCUSTOMER,
   LEGALBUSINESS,
 } from '../../routers/ScreenNames';
+import AppText from '../../components/AppText';
 
 const LegalDocument = (props) => {
   const navigate = useNavigation();
   return (
     <View style={{flex: 1}}>
-      <HeaderBack title={'Giấy tờ pháp lý'} />
+      <HeaderBack title={'LegalDocument'} />
       <View style={styles.container}>
         <TouchableOpacity
           onPress={() => navigate.navigate(LEGALCUSTOMER)}
           style={styles.containerItem}>
-          <Text style={styles.txtTitle}> Thoả thuận khách hàng</Text>
+          <AppText i18nKey={'CustomerAgreement'} style={styles.txtTitle}>
+            {' '}
+          </AppText>
         </TouchableOpacity>
         <TouchableOpacity
           onPress={() => navigate.navigate(LEGALBUSINESS)}
           style={styles.containerItem}>
-          <Text style={styles.txtTitle}> Thoả thuận kinh doanh chung</Text>
+          <AppText i18nKey={'BusinessAgreement'} style={styles.txtTitle}>
+            {' '}
+          </AppText>
         </TouchableOpacity>
         <TouchableOpacity
           onPress={() => navigate.navigate(LEGALPARTNER)}
           style={styles.containerItem}>
-          <Text style={styles.txtTitle}> Thoả thuận quan hệ đối tác</Text>
+          <AppText i18nKey={'PartnershipAgreement'} style={styles.txtTitle}>
+            {' '}
+          </AppText>
         </TouchableOpacity>
       </View>
     </View>

src/Screens/Menu/Profile/ProfileView.js

@@ -12,6 +12,7 @@ import CQG from './Tab/CQG';
 import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs';
 import {getFontXD} from '../../../Config/Functions';
 const Tab = createMaterialTopTabNavigator();
+import I18n from '../../../helper/i18/i18n';
 
 const ProfileView = (props) => {
   return (
@@ -29,12 +30,12 @@ const ProfileView = (props) => {
         <Tab.Screen
           name="GeneralInfor"
           component={GeneralInfor}
-          options={{tabBarLabel: 'Thông tin chung'}}
+          options={{tabBarLabel: I18n.t('GeneralInformation')}}
         />
         <Tab.Screen
           name="CQG"
           component={CQG}
-          options={{tabBarLabel: 'Tài khoản CQG'}}
+          options={{tabBarLabel: I18n.t('AccountCQG')}}
         />
       </Tab.Navigator>
     </View>

src/Screens/Menu/Profile/Tab/CQG.js

@@ -2,21 +2,28 @@ import React from 'react';
 import {View, Text, TouchableOpacity, Image, StyleSheet} from 'react-native';
 import R from '../../../../assets/R';
 import {getFontXD} from '../../../../Config/Functions';
+import {connect} from 'react-redux';
+import AppText from '../../../../components/AppText';
+import I18n from '../../../../helper/i18/i18n';
 
 const Profile = (props) => {
   return (
     <View style={styles.container}>
       <View style={styles.item}>
-        <Text style={styles.txtTitle}>Mã hợp đồng</Text>
-        <Text style={styles.txtBig}>Network & internet</Text>
+        <AppText i18nKey={'ContactCode'} style={styles.txtTitle}></AppText>
+        <Text style={styles.txtBig}>{props.user.cqg_id}</Text>
       </View>
       <View style={styles.item}>
-        <Text style={styles.txtTitle}>Tên tài khoản giao dịch</Text>
-        <Text style={styles.txtBig}>Network & internet</Text>
+        <AppText
+          i18nKey={'TraddingAccountName'}
+          style={styles.txtTitle}></AppText>
+        <Text style={styles.txtBig}>{props.user.cqg_name}</Text>
       </View>
       <View style={styles.item}>
-        <Text style={styles.txtTitle}>Số tài khoản giao dịch</Text>
-        <Text style={styles.txtBig}>0202020202</Text>
+        <AppText
+          i18nKey={'TraddingAccountNumber'}
+          style={styles.txtTitle}></AppText>
+        <Text style={styles.txtBig}>{props.user.account}</Text>
       </View>
     </View>
   );
@@ -46,4 +53,9 @@ const styles = StyleSheet.create({
   },
 });
 
-export default Profile;
+const mapStateToProps = (state) => {
+  return {
+    user: state.userReducer,
+  };
+};
+export default connect(mapStateToProps, {})(Profile);

src/Screens/Menu/Profile/Tab/GeneralInfor.js

@@ -17,7 +17,8 @@ import TextMulti from '../../../../components/Input/TextMulti';
 import {connect} from 'react-redux';
 import {showLoading, hideLoading} from '../../../../actions/loadingAction';
 import {saveUserToRedux} from '../../../../actions/users';
-
+import AppText from '../../../../components/AppText';
+import I18n from '../../../../helper/i18/i18n';
 import TextField from '../../../../components/Input/TextField';
 import {
   getFontXD,
@@ -64,6 +65,7 @@ const GeneralInfor = (props) => {
     if (props.user.gender == 1) return 'Nữ';
     return 'Nam';
   };
+
   return (
     <KeyboardAvoidingView
       behavior={Platform.Os === 'ios' ? 'padding' : 'height'}
@@ -74,7 +76,7 @@ const GeneralInfor = (props) => {
           <View style={styles.container}>
             <View style={styles.wrapItem}>
               <View style={styles.wrapLeft}>
-                <Text style={styles.txtTitle}>Họ và tên</Text>
+                <AppText i18nKey={'Fullname'} style={styles.txtTitle}></AppText>
               </View>
               <View style={styles.wrapRight}>
                 <Text style={styles.txtTitle}>{props.user.fullname}</Text>
@@ -90,7 +92,7 @@ const GeneralInfor = (props) => {
             </View>
             <View style={styles.wrapItem}>
               <View style={styles.wrapLeft}>
-                <Text style={styles.txtTitle}>Ngày sinh</Text>
+                <AppText i18nKey={'Birth'} style={styles.txtTitle}></AppText>
               </View>
               <View style={styles.wrapRight}>
                 <Text style={styles.txtTitle}>{props.user.birthday}</Text>
@@ -98,7 +100,7 @@ const GeneralInfor = (props) => {
             </View>
             <View style={styles.wrapItem}>
               <View style={styles.wrapLeft}>
-                <Text style={styles.txtTitle}>Giới tính</Text>
+                <AppText i18nKey={'Male'} style={styles.txtTitle}></AppText>
               </View>
               <View style={styles.wrapRight}>
                 <Text style={styles.txtTitle}>{renderMale()}</Text>
@@ -106,7 +108,7 @@ const GeneralInfor = (props) => {
             </View>
             <View style={styles.wrapItem}>
               <View style={styles.wrapLeft}>
-                <Text style={styles.txtTitle}>Trạng thái</Text>
+                <AppText i18nKey={'Status'} style={styles.txtTitle}></AppText>
               </View>
               <View style={styles.wrapRight}>
                 <Text style={styles.txtTitle}>
@@ -117,7 +119,7 @@ const GeneralInfor = (props) => {
             </View>
 
             <TextField
-              title={'Điện thoại'}
+              title={I18n.t('Phone')}
               value={phone}
               onChangeText={(val) => setPhone(val)}
             />
@@ -125,13 +127,15 @@ const GeneralInfor = (props) => {
             <TextMulti
               onChangeText={(val) => setAddress(val)}
               value={address}
-              title={'Địa chỉ'}
+              title={I18n.t('Address')}
             />
 
             <View style={{height: 40}} />
             <View style={{justifyContent: 'center', alignItems: 'center'}}>
               <TouchableOpacity onPress={onClick} style={styles.btn}>
-                <Text style={styles.txtBtn}>Cập nhật</Text>
+                <AppText i18nKey={'Update'} style={styles.txtBtn}>
+                  Cập nhật
+                </AppText>
               </TouchableOpacity>
             </View>
           </View>

src/Screens/Notification/NotificaitonView.js

@@ -58,9 +58,7 @@ const NotificaitonView = (props) => {
                 style={[
                   styles.txtFillter,
                   fillter == e.value ? {color: '#1473E6'} : {},
-                ]}>
-                {e.name}
-              </AppText>
+                ]}></AppText>
             </TouchableOpacity>
           ))}
         </ScrollView>
@@ -73,9 +71,7 @@ const NotificaitonView = (props) => {
             style={{
               fontSize: 18,
               fontWeight: 'bold',
-            }}>
-            Không có dữ liệu!
-          </AppText>
+            }}></AppText>
         </View>
       ) : (
         <FlatList

src/components/Header/Drawer.js

@@ -98,9 +98,7 @@ const Drawer = (props) => {
             key={e.id}
             style={styles.containerItem}>
             <Image source={e.icon} style={styles.imgIcon} />
-            <AppText i18nKey={e.title} style={styles.txtTitle}>
-              {e.title}
-            </AppText>
+            <AppText i18nKey={e.title} style={styles.txtTitle}></AppText>
           </TouchableOpacity>
         ))}
       </View>
@@ -116,9 +114,7 @@ const Drawer = (props) => {
         }}
         style={styles.footer}>
         <Icon name={'logout'} size={25} color={'#F81515'} />
-        <AppText i18nKey={'Logout'} Logout style={styles.txtTitle}>
-          Đăng xuất
-        </AppText>
+        <AppText i18nKey={'Logout'} Logout style={styles.txtTitle}></AppText>
       </TouchableOpacity>
     </View>
   );

src/components/Header/HeaderBack.js

@@ -37,9 +37,7 @@ const HeaderHome = (props) => {
           onPress={() => navigate.goBack()}>
           <Image source={R.images.iconBack} style={styles.imgIcon} />
         </TouchableOpacity>
-        <AppText i18nKey={title} style={styles.txtTitle}>
-          {title}
-        </AppText>
+        <AppText i18nKey={title} style={styles.txtTitle}></AppText>
         <View style={{width: 35, height: 30}} />
       </View>
     </ImageBackground>

src/components/Header/HeaderDrawer.js

@@ -43,9 +43,7 @@ const HeaderDrawer = (props) => {
           <Image source={R.images.iconMenu} style={styles.imgIcon} />
         </TouchableOpacity>
 
-        <AppText i18nKey={title} style={styles.txtTitle}>
-          {title}
-        </AppText>
+        <AppText i18nKey={title} style={styles.txtTitle}></AppText>
         <View style={{width: 35, height: 30}} />
       </View>
       <Modal

src/components/Header/HeaderHome.js

@@ -40,9 +40,7 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => {
     return (
       <View style={{flex: 1, flexDirection: 'row'}}>
         <View style={styles.containerWallet}>
-          <AppText i18nKey={'AccountWallet'} style={styles.txtWallet}>
-            Tài khoản ví
-          </AppText>
+          <AppText i18nKey={'AccountWallet'} style={styles.txtWallet}></AppText>
           <View style={{flexDirection: 'row'}}>
             <Text style={styles.txtMoney}>
               {current_money == 0 ? 0 : toPriceVnd(current_money)}
@@ -52,9 +50,7 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => {
         </View>
         <View style={{width: 1, backgroundColor: '#EDEDF1', height: '100%'}} />
         <View style={styles.containerWallet}>
-          <AppText i18nKey={'AccountCQG'} style={styles.txtWallet}>
-            Tài khoản CQG
-          </AppText>
+          <AppText i18nKey={'AccountCQG'} style={styles.txtWallet}></AppText>
           <View style={{flexDirection: 'row'}}>
             <Text style={styles.txtMoney}>
               {current_cqg_money == 0 ? 0 : toPriceVnd(current_cqg_money)}
@@ -68,9 +64,7 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => {
     return (
       <View style={{flex: 1, flexDirection: 'row'}}>
         <View style={styles.containerWallet}>
-          <AppText i18nKey={'AccountWallet'} style={styles.txtWallet}>
-            Tài khoản ví
-          </AppText>
+          <AppText i18nKey={'AccountWallet'} style={styles.txtWallet}></AppText>
           <View style={{flexDirection: 'row'}}>
             <Text style={styles.txtMoney}>
               {current_money == 0 ? 0 : toPriceVnd(current_money)}
@@ -82,9 +76,7 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => {
         <View style={styles.containerWallet}>
           <AppText
             i18nKey={'WaitOpenCQG'}
-            style={[styles.txtWhite, {color: '#FFB721'}]}>
-            Chờ mở TK CQG
-          </AppText>
+            style={[styles.txtWhite, {color: '#FFB721'}]}></AppText>
         </View>
       </View>
     );
@@ -92,9 +84,7 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => {
     return (
       <View style={{flex: 1, flexDirection: 'row'}}>
         <View style={styles.containerWallet}>
-          <AppText i18nKey={'AccountWallet'} style={styles.txtWallet}>
-            Tài khoản ví
-          </AppText>
+          <AppText i18nKey={'AccountWallet'} style={styles.txtWallet}></AppText>
           <View style={{flexDirection: 'row'}}>
             <Text style={styles.txtMoney}>
               {' '}
@@ -111,9 +101,9 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => {
               navigate.navigate(PACKETCQG);
             }}
             style={styles.btn}>
-            <AppText i18nKey={'OpenAccountCQG'} style={styles.txtWhite}>
-              Mở tài khoản CQG
-            </AppText>
+            <AppText
+              i18nKey={'OpenAccountCQG'}
+              style={styles.txtWhite}></AppText>
           </TouchableOpacity>
         </View>
       </View>
@@ -137,15 +127,11 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => {
           {status == 2 ? (
             <AppText
               i18nKey={'WaitVerification'}
-              style={{fontSize: getFontXD(52), color: 'white'}}>
-              Chờ xác minh
-            </AppText>
+              style={{fontSize: getFontXD(52), color: 'white'}}></AppText>
           ) : (
             <AppText
               i18nKey={'AccountVerify'}
-              style={{fontSize: getFontXD(52), color: 'white'}}>
-              Xác minh tài khoản
-            </AppText>
+              style={{fontSize: getFontXD(52), color: 'white'}}></AppText>
           )}
         </ImageBackground>
       </TouchableOpacity>
@@ -156,21 +142,15 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => {
 const renderLabel = (status) => {
   if (status == 1)
     return (
-      <AppText i18nKey={'NotVerified'} style={{color: '#E3434F'}}>
-        Chưa xác minh
-      </AppText>
+      <AppText i18nKey={'NotVerified'} style={{color: '#E3434F'}}></AppText>
     );
   if (status == 2)
-    return (
-      <AppText i18nKey={'Verified'} style={{color: '#FFB721'}}>
-        Chờ xác minh
-      </AppText>
-    );
+    return <AppText i18nKey={'Verified'} style={{color: '#FFB721'}}></AppText>;
   if (status == 3)
     return (
-      <AppText i18nKey={'WaitVerification'} style={{color: '#17B217'}}>
-        Đã xác minh
-      </AppText>
+      <AppText
+        i18nKey={'WaitVerification'}
+        style={{color: '#17B217'}}></AppText>
     );
 };
 

src/components/Header/HeaderNewFeed.js

@@ -39,9 +39,7 @@ const HeaderHome = (props) => {
           <Image source={R.images.iconMenu} style={styles.imgIcon} />
         </TouchableOpacity>
 
-        <AppText i18nKey={'Account'} style={styles.txtTitle}>
-          Tài khoản
-        </AppText>
+        <AppText i18nKey={'Account'} style={styles.txtTitle}></AppText>
         <View style={styles.imgIcon} />
       </View>
       <Modal

src/components/Header/HeaderSB.js

@@ -57,9 +57,7 @@ const HeaderSearch = (props) => {
             value={txtSearch}
           />
         ) : (
-          <AppText i18nKey={title} style={styles.txtTitle}>
-            {title ? title : ''}{' '}
-          </AppText>
+          <AppText i18nKey={title} style={styles.txtTitle}></AppText>
         )}
         <TouchableOpacity onPress={toggleSearch}>
           {openSearch ? (

src/components/Header/HeaderSearch.js

@@ -57,9 +57,7 @@ const HeaderSearch = (props) => {
             value={txtSearch}
           />
         ) : (
-          <AppText i18nKey={title} style={styles.txtTitle}>
-            {title}
-          </AppText>
+          <AppText i18nKey={title} style={styles.txtTitle}></AppText>
         )}
         <TouchableOpacity onPress={toggleSearch}>
           {openSearch ? (

src/components/Input/InputIcon.js

@@ -19,7 +19,7 @@ const InputIcon = (props) => {
     <View style={container}>
       <Image source={icon} style={iconImg} />
       <View style={wrapRight}>
-        <AppText i18nKey={title}>{title}</AppText>
+        <AppText i18nKey={title}> </AppText>
         <TextInput
           maxLength={maxLength}
           autoCapitalize="none"

src/helper/i18/locales/en.js

@@ -45,7 +45,6 @@ export default {
   SendFeedback: 'Send feedback',
   GeneralBusiness: 'General business',
   Customer: 'Customer',
-  LegalDocuments: 'Legal documents',
   Partnership: 'Partnership',
   AddPaymentMethod: 'Add payment method',
   DetailMethod: 'Detail method',
@@ -56,4 +55,23 @@ export default {
   PriceTable: 'Price table',
   Chart: 'Chart',
   Calendar: 'Calendar',
+  Fullname: 'Full name',
+  Birth: 'Birth',
+  Male: 'Male',
+  Status: 'Status',
+  Phone: 'Phone',
+  Address: 'Address',
+  Update: 'Update',
+
+  ContactCode: 'Contact code',
+  TraddingAccountName: 'Tradding account name',
+  TraddingAccountNumber: 'Tradding account number',
+  GeneralInformation: 'General information',
+  Profile: 'Profile',
+  CustomerAgreement: 'Customer agreement',
+  BusinessAgreement: 'Business agreement',
+  PartnershipAgreement: 'Partnership agreement',
+
+  Waiting: 'Waiting',
+  Success: 'Success',
 };

src/helper/i18/locales/vn.js

@@ -45,7 +45,6 @@ export default {
   SendFeedback: 'Gửi phản hồi',
   GeneralBusiness: 'Kinh doanh chung',
   Customer: 'Khách hàng',
-  LegalDocuments: 'Giấy tờ pháp lý',
   Partnership: 'Quan hệ đối tác',
   AddPaymentMethod: 'Thêm phương thức thanh toán',
   DetailMethod: 'Chi tiết phương thức',
@@ -56,4 +55,19 @@ export default {
   PriceTable: 'Bảng giá',
   Chart: 'Biểu đồ',
   Calendar: 'Lịch thị trường',
+  Fullname: 'Họ và tên',
+  Birth: 'Ngày sinh',
+  Male: 'Giới tính',
+  Status: 'Trạng thái',
+  Phone: 'Điện thoại',
+  Address: 'Địa chỉ',
+  Update: 'Cập nhật',
+  ContactCode: 'Mã hợp đồng',
+  TraddingAccountName: 'Tên tài khoản giao dịch',
+  TraddingAccountNumber: 'Số tài khoản giao dịch',
+  GeneralInformation: 'Thông tin chung',
+  Profile: 'Hồ sơ',
+  CustomerAgreement: 'Thoả thuận khách hàng',
+  BusinessAgreement: 'Thoả thuận kinh doanh chung',
+  PartnershipAgreement: 'Thoả thuận quan hệ đối tác',
 };

src/routers/PlussModal.js

@@ -54,9 +54,7 @@ const PlussModal = (props) => {
               }}
               style={styles.wraper1}>
               <Image style={styles.imgIcon} source={R.images.iconWallet1} />
-              <AppText i18nKey={'Wallet'} style={styles.txt}>
-                Ví tiền
-              </AppText>
+              <AppText i18nKey={'Wallet'} style={styles.txt}></AppText>
             </TouchableOpacity>
             <TouchableOpacity
               onPress={() => {
@@ -65,9 +63,7 @@ const PlussModal = (props) => {
               }}
               style={styles.wraper1}>
               <Image style={styles.imgIcon} source={R.images.iconRecharge} />
-              <AppText i18nKey={'Deposit'} style={styles.txt}>
-                Nạp tiền
-              </AppText>
+              <AppText i18nKey={'Deposit'} style={styles.txt}></AppText>
             </TouchableOpacity>
             <TouchableOpacity
               onPress={() => {
@@ -76,9 +72,7 @@ const PlussModal = (props) => {
               }}
               style={styles.wraper1}>
               <Image style={styles.imgIcon} source={R.images.iconWithdrawal} />
-              <AppText i18nKey={'Withdraw'} style={styles.txt}>
-                Rút tiền
-              </AppText>
+              <AppText i18nKey={'Withdraw'} style={styles.txt}></AppText>
             </TouchableOpacity>
             <TouchableOpacity
               onPress={() => {
@@ -87,9 +81,7 @@ const PlussModal = (props) => {
               }}
               style={styles.wraper1}>
               <Image style={styles.imgIcon} source={R.images.iconTransfer} />
-              <AppText i18nKey={'Transfer'} style={styles.txt}>
-                Chuyển khoản
-              </AppText>
+              <AppText i18nKey={'Transfer'} style={styles.txt}></AppText>
             </TouchableOpacity>
           </View>
         </View>