merge code

src/RootView.js

 import React, {useEffect, useRef} from 'react';
 import {
     View,
-  Text,
-  ImageBackground,
-  StyleSheet,
-  StatusBar,
-  SafeAreaView,
 } from 'react-native';
 
 import {connect} from 'react-redux';
@@ -16,10 +11,14 @@ import {enableScreens} from 'react-native-screens';
 import NoInternetComponent from './components/NoInternet';
 import DropdownAlert from 'react-native-dropdownalert';
 import DeviceInfo from 'react-native-device-info';
-import VersionChecker from './Screens/VersionChecker';
 import R from './assets/R';
 import {WIDTHXD, HEIGHTXD} from './Config/Functions';
 import DropdownManager from './components/DropdownAlert/DropdownManager';
+import AsyncStorage from '@react-native-community/async-storage';
+import KEY from './assets/AsynStorage';
+import I18n, {setLocation} from './helper/i18/i18n';
+import {changeLanguage} from './actions/language';
+
 
 enableScreens();
 
@@ -29,25 +28,24 @@ const RootView = (props) => {
             dropDownAlertRef.current,
             dropDownAlertLongTimeRef.current,
         );
+        setInitLanguage()
     }, []);
 
     const dropDownAlertRef = useRef(null);
     const dropDownAlertLongTimeRef = useRef(null);
-
-  const checkVersion = (props) => {
-    const verCurrent = DeviceInfo.getVersion();
-    console.log('version current', verCurrent);
+    const setInitLanguage = async () => {
+        const laguage = await AsyncStorage.getItem(KEY.LANGUAGE);
+        if (laguage) props.changeLanguage(laguage);
+        setLocation(I18n, laguage);
     };
-
     return (
         <>
             <View style={{flex: 1}}>
                 <Modal isVisible={props.loadingModal.isVisible}>
-          <SkypeIndicator color={'white'} />
+                    <SkypeIndicator color={'white'}/>
                 </Modal>
-        <StackNavigation />
+                <StackNavigation/>
             </View>
-      {/*<VersionChecker/>*/}
             <DropdownAlert
                 inactiveStatusBarBackgroundColor={R.colors.main}
                 activeStatusBarBackgroundColor={R.colors.main}
@@ -86,8 +84,7 @@ const RootView = (props) => {
                     paddingHorizontal: WIDTHXD(20),
                 }}
             />
-
-      <NoInternetComponent />
+            <NoInternetComponent/>
         </>
     );
 };
@@ -98,4 +95,4 @@ const mapStateToProps = (state) => {
     };
 };
 
-export default connect(mapStateToProps, {})(RootView);
+export default connect(mapStateToProps, {changeLanguage})(RootView);

src/Screens/Account/PacrtCQG/Footer.js

@@ -8,10 +8,10 @@ import I18n from '../../../helper/i18/i18n';
 const Footer = (props) => {
   return (
     <View style={{flex: 1, paddingHorizontal: 10, marginTop: 10}}>
-      <View style={{flexDirection: 'row', marginVertical: 5}}>
       <Text style={styles.txtTitle}>
         {I18n.t('Provisional')}:{toPriceVnd(props.price)}
       </Text>
+      <View style={{flexDirection: 'row', marginVertical: 5}}>
         <AppText i18nKey={'Open_account_demo'} style={styles.txtTitle} />
         <TouchableOpacity
           onPress={() =>

src/Screens/Home/Home.js

@@ -11,6 +11,7 @@ import {getListCategoryProduct} from '../../apis/Functions/Transaction';
 import {hideLoading, showLoading} from '../../actions/loadingAction';
 import _ from 'lodash';
 import {showAlert, TYPE} from '../../components/DropdownAlert/index';
+import VersionChecker from '../VersionChecker';
 
 const Home = (props) => {
   const [data, setData] = useState({total_deposit: 0, total_withdraw: 0});
@@ -23,8 +24,6 @@ const Home = (props) => {
   const [isSortPercent, setIsSortPercent] = useState(null);
   const [isSortPriceOpenClose, setIsSortPriceOpenClose] = useState(null);
   const [isSortPriceHighLow, setIsSortPriceHighLow] = useState(null);
-
-  console.log(props.user);
   const SORT_TYPE = {
     DESC: 'DESC',
     ASC: 'ASC',
@@ -113,7 +112,9 @@ const Home = (props) => {
 
   const onSortByName = () => {
     let type = 'ASC';
-    if (!isSortName || isSortName == SORT_TYPE.ASC) type = SORT_TYPE.DESC;
+    if (!isSortName || isSortName == SORT_TYPE.ASC) {
+      type = SORT_TYPE.DESC;
+    }
     let newData =
       type == SORT_TYPE.ASC
         ? [...dataPriceFilter].sort((a, b) => (a.name > b.name ? 1 : -1))
@@ -126,7 +127,9 @@ const Home = (props) => {
   };
   const onSortByPercent = () => {
     let type = 'ASC';
-    if (!isSortPercent || isSortPercent == SORT_TYPE.ASC) type = SORT_TYPE.DESC;
+    if (!isSortPercent || isSortPercent == SORT_TYPE.ASC) {
+      type = SORT_TYPE.DESC;
+    }
     let newData =
       type == SORT_TYPE.ASC
         ? [...dataPriceFilter].sort((a, b) => (a.change > b.change ? 1 : -1))
@@ -139,8 +142,9 @@ const Home = (props) => {
   };
   const onSortByPriceOpenClose = () => {
     let type = 'ASC';
-    if (!isSortPriceOpenClose || isSortPriceOpenClose == SORT_TYPE.ASC)
+    if (!isSortPriceOpenClose || isSortPriceOpenClose == SORT_TYPE.ASC) {
       type = SORT_TYPE.DESC;
+    }
     let newData =
       type == SORT_TYPE.ASC
         ? [...dataPriceFilter].sort((a, b) =>
@@ -157,8 +161,9 @@ const Home = (props) => {
   };
   const onSortByPriceHighLow = () => {
     let type = 'ASC';
-    if (!isSortPriceHighLow || isSortPriceHighLow == SORT_TYPE.ASC)
+    if (!isSortPriceHighLow || isSortPriceHighLow == SORT_TYPE.ASC) {
       type = SORT_TYPE.DESC;
+    }
     let newData =
       type == SORT_TYPE.ASC
         ? [...dataPriceFilter].sort((a, b) =>
@@ -175,6 +180,7 @@ const Home = (props) => {
   };
 
   return (
+    <>
       <HomeView
         data={data}
         dataPrice={dataPriceFilter}
@@ -187,6 +193,8 @@ const Home = (props) => {
         onSortByPriceOpenClose={onSortByPriceOpenClose}
         onSortByPriceHighLow={onSortByPriceHighLow}
       />
+      <VersionChecker />
+    </>
   );
 };
 

src/Screens/Tool/CaculatedStopLoss.js

@@ -79,7 +79,7 @@ const CaculatedStopLoss = (props) => {
     if (res.status == 200 && res.data.code == 200) {
       setDataProduct(res.data.data);
     } else {
-      showAlert(TYPE.ERROR, I18n.t('Notification', I18n.t('Can_not_get_data')));
+      showAlert(TYPE.ERROR, I18n.t('Notification'), I18n.t('Can_not_get_data'));
     }
   };
 

src/Screens/Tool/CalculatorProfitLoss/CalculatorProfitLoss.js

@@ -36,7 +36,7 @@ const CalculatorProfitLoss = (props) => {
     if (res.status == 200 && res.data.code == 200) {
       setDataProduct(res.data.data);
     } else {
-      showAlert(TYPE.ERROR, I18n.t('Notification', I18n.t('Can_not_get_data')));
+      showAlert(TYPE.ERROR, I18n.t('Notification'), I18n.t('Can_not_get_data'));
     }
   };
 
@@ -67,7 +67,7 @@ const CalculatorProfitLoss = (props) => {
       });
       props.hideLoading();
       if (res.status == 200 && res.data.code == 200) {
-        const newList = [res.data.data].concat(dataCalculator);
+        const newList = [res.data.data].concat([...dataCalculator]);
         setDataCalculator(newList);
         setLotTransactionNumber(null);
         setOpenPrice(null);

src/Screens/Tool/CalculatorProfitLoss/CalculatorProfitLossView.js

@@ -112,7 +112,7 @@ const CalculatorProfitLossView = (props) => {
         </View>
         <FlatList
           style={{paddingBottom: HEIGHTXD(15), backgroundColor: R.colors.white}}
-          keyExtractor={(item) => item.id}
+          keyExtractor={(item) => item}
           data={props.dataCalculator}
           renderItem={({item, index}) => (
             <ItemCalculator

src/Screens/Tool/CalculatorProfitLoss/ItemCalculator.js

@@ -37,7 +37,7 @@ const ItemCalculator = (props) => {
     });
     setExpanded(!expanded);
   };
-  console.log(props.item.transaction_type);
+  console.log(props.item);
 
   return (
     <View
@@ -78,8 +78,8 @@ const ItemCalculator = (props) => {
             content={I18n.t(props.item.transaction_type)}
             color={
               props.item.transaction_type == 'SELL_OUT'
-                ? R.colors.green
-                : R.colors.red2
+                ? R.colors.red2
+                : R.colors.green
             }
           />
           <TextField

src/Screens/Tool/ConvertUnit.js

-import React, {Component, useState} from 'react';
-import {
-  View,
-  Text,
-  StyleSheet,
-  TextInput,
-  TouchableOpacity,
-} from 'react-native';
+import React, {useEffect, useState} from 'react';
+import {Platform, StyleSheet, Text, TextInput, View} from 'react-native';
 import HeaderBack from '../../components/Header/HeaderBack';
 
 import PickerItem from '../../components/Picker/PickerItem';
 import I18n from '../../helper/i18/i18n';
 import AppText from '../../components/AppText';
-import TextField from '../../components/Input/TextField';
-import {getFontXD, HEIGHTXD, WIDTHXD} from '../../Config/Functions';
+import {getFontXD, HEIGHTXD, toPriceVnd, WIDTHXD} from '../../Config/Functions';
 import R from '../../assets/R';
-import Icon from 'react-native-vector-icons/FontAwesome';
+import {getUnitList} from '../../apis/Functions/Transaction';
+import {showAlert, TYPE} from '../../components/DropdownAlert';
+import {hideLoading, showLoading} from '../../actions/loadingAction';
+import {connect} from 'react-redux';
 
-const dataType = [
-  {
-    value: '0',
-    name: 'KG',
-  },
-  {
-    value: '1',
-    name: 'Pound',
-  },
-];
 
 const ConvertUnit = (props) => {
-  const [typeOne, setTypeOne] = useState();
-  const [typeTwo, setTypeTwo] = useState();
-  const [valueOne, setValueOne] = useState();
-  const [valueTwo, setValueTwo] = useState();
+    const [fromUnitList, setFromUnitList] = useState([]);
+    const [toUnitList, setToUnitList] = useState([]);
+    const [toUnit, setToUnit] = useState();
+    const [fromUnit, setFromUnit] = useState();
+    const [number, setNumber] = useState(null);
+    const [rateItem, setRateItem] = useState({
+        value_one: 0.025000000373,
+        value_two: 0,
+        name: 'Kg,',
+    });
     const [result, setResult] = useState();
+    useEffect(() => {
+        getDataUnit();
+    }, []);
+
+    useEffect(() => {
+        calcultorResult();
+    }, [number, fromUnit, toUnit]);
+
+    const getDataUnit = async () => {
+        props.showLoading();
+        const res = await getUnitList({
+            platform: Platform.OS,
+        });
+        if (res.status == 200 && res.data.code == 200) {
+            setFromUnitList(res.data.data);
+            setFromUnit(res.data.data[0]);
+            onChangeFromUnit('', res.data.data[0])
+        } else {
+            showAlert(TYPE.ERROR, I18n.t('Notification'), I18n.t('Can_not_get_data'));
+        }
+        props.hideLoading();
+    };
+
+    const onChangeNumber = (string) => {
+        let number = string.toString().split(',').join('');
+        setNumber(number);
+
+    };
 
-  const onClick = () => {
-    console.log('Heloo', typeOne, typeTwo, valueOne, valueTwo);
+    const onChangeFromUnit = (value, item) => {
+        setFromUnit(item);
+        let toUnit = [];
+        item.rates.map((rateItem) => {
+            toUnit.push({
+                id: rateItem.to_unit_id,
+                value: rateItem.to_unit.name,
+                name: rateItem.to_unit.name,
+                rate: rateItem.value_one > 0 ? rateItem.value_one : rateItem.value_two,
+            });
+        });
+        setToUnitList(toUnit);
+        setToUnit(toUnit[0]);
+    };
+
+    const onChangeToUnit = (value, item) => {
+        setToUnit(item);
+        if (number && number != '' && parseFloat(number) > 0) {
+            let result = parseFloat(number) * item.rate;
+            setResult(`${parseFloat(number)} ${fromUnit.name} = ${result} ${item.name}`);
+        }
+    };
+
+    const calcultorResult = () => {
+        if (number && number != '' && parseFloat(number) > 0) {
+            let result = parseFloat(number) * toUnit.rate;
+            setResult(`${parseFloat(number)} ${fromUnit.name} = ${result} ${toUnit.name}`);
+        } else {
+            setResult('')
+        }
     };
 
     return (
         <View style={{flex: 1}}>
-      <HeaderBack title={'ConvertUnit'} />
+            <HeaderBack title={'ConvertUnit'}/>
             <View style={{flex: 1, paddingTop: 20, paddingHorizontal: 20}}>
-        <AppText style={styles.txtTitle} i18nKey={'Count'} />
+                <AppText style={styles.txtTitle} i18nKey={'Count'}/>
                 <View style={styles.Item}>
                     <View style={styles.wrap}>
                         <TextInput
-              onChangeText={(val) => setValueOne(val)}
+                            onChangeText={(val) => onChangeNumber(val)}
                             keyboardType={'number-pad'}
                             style={styles.wrapInput}
                             maxLength={12}
+                            value={toPriceVnd(number)}
                         />
                     </View>
                 </View>
@@ -57,33 +106,31 @@ const ConvertUnit = (props) => {
                 <View style={styles.Item}>
                     <View style={styles.wrap}>
                         <PickerItem
-              width={WIDTHXD(400)}
-              data={dataType}
-              onValueChange={(value, items) => {
-                setTypeTwo(items);
+                            width={WIDTHXD(480)}
+                            data={fromUnitList}
+                            defaultValue={fromUnit?.name}
+                            value={fromUnit?.name}
+                            onValueChange={(value, item) => {
+                                onChangeFromUnit(value, item);
                             }}
                         />
-            <TouchableOpacity>
-              <Icon name={'exchange'} size={30} color={R.colors.black} />
-            </TouchableOpacity>
+                        {/*<TouchableOpacity>*/}
+                        {/*  <Icon name={'exchange'} size={30} color={R.colors.black} />*/}
+                        {/*</TouchableOpacity>*/}
 
                         <PickerItem
-              width={WIDTHXD(400)}
-              data={dataType}
-              onValueChange={(value, items) => {
-                setTypeOne(items);
+                            width={WIDTHXD(480)}
+                            data={toUnitList}
+                            defaultValue={toUnit?.name}
+                            value={toUnit?.name}
+                            onValueChange={(value, item) => {
+                                onChangeToUnit(value, item);
                             }}
                         />
                     </View>
                 </View>
 
-        <Text style={styles.txtResult}>Kết quả: {result}</Text>
-
-        <View style={styles.footer}>
-          <TouchableOpacity onPress={onClick} style={styles.btnContainer}>
-            <AppText style={styles.txtBtn} i18nKey={'Caculate'} />
-          </TouchableOpacity>
-        </View>
+                <Text style={styles.txtResult}>{result}</Text>
             </View>
         </View>
     );
@@ -162,4 +209,11 @@ const styles = StyleSheet.create({
         marginTop: 20,
     },
 });
-export default ConvertUnit;
+const mapStateToProps = (state) => {
+    return {};
+};
+export default connect(mapStateToProps, {
+    showLoading,
+    hideLoading,
+})(ConvertUnit);
+

src/Screens/Tool/EscrowCalculator/EscrowCalculator.js

@@ -12,11 +12,12 @@ const EscrowCalculator = (props) => {
         lotNumber: null,
         firstEscrow: 0,
     }]);
-    const [firstEscrow, setFirstEscrow] = useState(null);
+    const [firstEscrow, setFirstEscrow] = useState(0);
     const [firstEscrowTotal, setFirstEscrowTotal] = useState(0);
+    const [message, setMessage] = useState('');
     useEffect(() => {
-        getProductData()
-    }, [])
+        getProductData();
+    }, []);
 
     const getProductData = async () => {
         const res = await getTransactionListByCategory({
@@ -27,31 +28,56 @@ const EscrowCalculator = (props) => {
             type: 'PRICE_TABLE',
             category_id: -1,
         });
+        console.log('res', res);
+
         if (res.status == 200 && res.data.code == 200) {
             setDataProduct(res.data.data);
         } else {
-            showAlert(TYPE.ERROR, I18n.t('Notification', I18n.t('Can_not_get_data')))
+            showAlert(TYPE.ERROR, I18n.t('Notification'), I18n.t('Can_not_get_data'));
         }
     };
 
     const onCalculator = () => {
+        if(firstEscrowTotal === '' || firstEscrowTotal == 0) {
+            showAlert(TYPE.WARN, I18n.t('Notification'), I18n.t('EnterContractInfo'));
+            return
+        }
+
+        if(firstEscrow === '' || firstEscrow == 0) {
+            showAlert(TYPE.WARN, I18n.t('Notification'), I18n.t('EnterFirstEscrow'));
+            return
+        }
 
+        if (parseFloat(firstEscrowTotal) <= parseFloat(firstEscrow)) {
+            setMessage(I18n.t('YouCanTransaction'));
+        } else {
+            setMessage(I18n.t('YouCanNotTransaction'));
+        }
     };
 
     const onDelete = () => {
-
+        setListInput([{
+            product: null,
+            lotNumber: null,
+            firstEscrow: 0,
+        }])
+        setFirstEscrow(0)
+        setFirstEscrowTotal(0)
+        setMessage('')
     };
 
     const setItemInput = (item, index) => {
-        let data = [...listInput]
-        data[index] = item
-        setListInput(data)
-        let firstEscrowTotalTmp = 0
+        let data = [...listInput];
+        data[index] = item;
+        setListInput(data);
+        let firstEscrowTotalTmp = 0;
         data.map((item) => {
-            if(item.firstEscrow) firstEscrowTotalTmp = firstEscrowTotalTmp + item.firstEscrow
-        })
-        setFirstEscrowTotal(firstEscrowTotalTmp)
+            if (item.firstEscrow) {
+                firstEscrowTotalTmp = firstEscrowTotalTmp + item.firstEscrow;
             }
+        });
+        setFirstEscrowTotal(firstEscrowTotalTmp);
+    };
     const onAdd = () => {
         let data = [...listInput];
         data.push({
@@ -73,6 +99,7 @@ const EscrowCalculator = (props) => {
             firstEscrowTotal={firstEscrowTotal}
             setItemInput={setItemInput}
             setFirstEscrow={setFirstEscrow}
+            message={message}
         />
     );
 };

src/Screens/Tool/EscrowCalculator/EscrowCalculatorView.js

@@ -35,11 +35,12 @@ const EscrowCalculatorView = (props) => {
                 dataProduct={props.dataProduct}
                 setProduct={(product) => {
                   item.product = product;
+                  item.firstEscrow = parseFloat(item.lotNumber) * product.escrow;
                   props.setItemInput(item, index);
                 }}
                 setLotNumber={(lotNumber) => {
                   item.lotNumber = lotNumber.split('.').join('');
-                  item.firstEscrow = parseFloat(item.lotNumber) * 12312;
+                  item.firstEscrow = item.product ? parseFloat(item.lotNumber) * item.product.escrow : 0;
                   props.setItemInput(item, index);
                 }}
               />
@@ -73,10 +74,7 @@ const EscrowCalculatorView = (props) => {
               titleStyle={{marginTop: HEIGHTXD(20), fontSize: getFontXD(39)}}
               inputStyle={{backgroundColor: R.colors.gray7}}
             />
-            <Text style={styles.textMessage}>
-              Bạn có thể giao dịch các hợp đồng kể trên với mức ký quỹ khả dung
-              hiện tại
-            </Text>
+            <Text style={styles.textMessage}>{props.message}</Text>
           </View>
 
           <View

src/Screens/Tool/ExchangeRate.js

@@ -41,7 +41,7 @@ const ExchangeRate = (props) => {
     if (res.status == 200 && res.data.code == 200) {
       setDataProduct(res.data.data);
     } else {
-      showAlert(TYPE.ERROR, I18n.t('Notification', I18n.t('Can_not_get_data')));
+      showAlert(TYPE.ERROR, I18n.t('Notification'), I18n.t('Can_not_get_data'));
     }
   };
 

src/apis/Functions/Transaction.js

@@ -26,3 +26,8 @@ export const getListExchangeRate = async (body) =>
   GetData(url.urlGetListExchangeRate, body)
     .then((res) => res)
     .catch((err) => err);
+
+export const getUnitList = async (body) =>
+  GetData(url.urlGetUnitList, body)
+    .then((res) => res)
+    .catch((err) => err);

src/apis/url.js

@@ -59,4 +59,5 @@ export default {
   urlGetListExchangeRate: root + 'api/v1/customers/get-list-exchange-rate',
   urlCloseCQG: root + 'api/v1/customers/cancel-open-cqg',
   urlUpdateCQG: root + 'api/v1/customers/update-open-cqg',
+  urlGetUnitList: `${root}api/v1/customers/get-list-unit`,
 };

src/helper/i18/locales/en.js

@@ -257,8 +257,6 @@ export default {
     '(estimated according to the current state processing rate of MXV)',
   Caculate: 'Caculate',
   ConversionUnit: 'Conversion unit',
-  Delete: 'Delete',
-
   UnitsQuotedFloor: 'Units quoted in the floor',
   ConversionPrice: 'Conversion price',
   ConvertUSD: 'Convert USD/Ton',
@@ -274,6 +272,11 @@ export default {
   ProfitLoss: 'Profit/Loss',
   BUY_IN: 'Buy in',
   SELL_OUT: 'Sell out',
+  YouCanNotTransaction: 'You can not trade the above contracts with the current available escrow',
+  YouCanTransaction: 'You can trade the above contracts with the current available escrow',
+  EnterContractInfo: 'Enter contract information',
+  EnterFirstEscrow: 'Enter first escrow',
+
   CloseAccount: 'Close account',
   UpdatePacket: 'Update packet',
   Count: 'Count',

src/helper/i18/locales/vn.js

@@ -251,7 +251,6 @@ export default {
   noteStopLoss: 'Ước tính theo tỷ lệ xử lý trạng thái hiện tại của MXV',
   Caculate: 'Tính',
   ConversionUnit: 'Đơn vị quy đổi',
-  Delete: 'Xoá',
   UnitsQuotedFloor: 'Đơn vị yết giá trên sàn',
   ConversionPrice: 'Giá quy đổi',
   ConvertUSD: 'Quy đổi  USD/Tấn',
@@ -269,6 +268,11 @@ export default {
   SELL_OUT: 'Bán ra',
   EscrowCalculator: 'Tính ký quỹ',
   FirstEscrowTotal: 'Ký quỹ khả dụng',
+  YouCanNotTransaction: 'Bạn không thể giao dịch các hợp đồng kể trên với mức ký quỹ khả dụng hiện tại',
+  YouCanTransaction: 'Bạn có thể giao dịch các hợp đồng kể trên với mức ký quỹ khả dụng hiện tại',
+  EnterContractInfo: 'Nhập thông tin hợp đồng',
+  EnterFirstEscrow: 'Nhập ký quỹ ban đầu',
+
   CloseAccount: 'Đóng tài khoản',
   UpdatePacket: 'Cập nhật gói cước',
   Count: 'Số lượng',

src/routers/TabNavigation.js

@@ -18,7 +18,7 @@ import Test from '../Screens/NewFeed/Test';
 import {useNavigation} from '@react-navigation/native';
 import Transaction from '../Screens/Transaction/Transaction';
 import {AccountVerification, PACKETCQG} from '../routers/ScreenNames';
-import I18n from '../helper/i18/i18n';
+import I18n, {setLocation} from '../helper/i18/i18n';
 import {changeLanguage} from '../actions/language';
 import KEY from '../assets/AsynStorage';
 import AsyncStorage from '@react-native-community/async-storage';
@@ -77,6 +77,7 @@ const TabNavigator = (props) => {
   const setInitLanguage = async () => {
     const laguage = await AsyncStorage.getItem(KEY.LANGUAGE);
     if (laguage) props.changeLanguage(laguage);
+    setLocation(I18n, laguage);
   };
 
   const showPopUp = () => {