@tima2025/react-native-timalender 1.1.7 → 1.1.8

package/src/components/Features/Debt/debtSlice.ts

@@ -12,7 +12,7 @@ const debt = createSlice({
 
 export const getBuyingDebtsTrading = createAsyncThunk(
   'debt/getBuyingDebtsTrading',
-  async (params: number) => {
+  async (params: number | number[]) => {
     const resp = await Debt.getBuyingDebtsTrading(params);
     return resp;
   }
@@ -20,7 +20,7 @@ export const getBuyingDebtsTrading = createAsyncThunk(
 
 export const getSellingDebtsTrading = createAsyncThunk(
   'debt/getSellingDebtsTrading',
-  async (params: number) => {
+  async (params: number | number[]) => {
     const resp = await Debt.getSellingDebtsTrading(params);
     return resp;
   }

package/src/controllers/Debt.ts

@@ -5,10 +5,14 @@ import client from './Client';
 
 const Debt = {
   // status = -111 tất cả,2 chờ ký,3 chờ nđt bán ký, 7 hoàn tất
-  async getBuyingDebtsTrading(params: number) {
+  async getBuyingDebtsTrading(params: number | number[]) {
     try {
+      const query = Array.isArray(params)
+        ? params.join(',')
+        : params.toString();
+
       const res = await client.get(
-        `/api/stats/get_buying_debts_trading?status=${params}`
+        `/api/stats/get_buying_debts_trading?status=${query}`
       );
       return res;
     } catch (err) {
@@ -16,10 +20,14 @@ const Debt = {
     }
   },
 
-  async getSellingDebtsTrading(params: number) {
+  async getSellingDebtsTrading(params: number | number[]) {
     try {
+      const query = Array.isArray(params)
+        ? params.join(',')
+        : params.toString();
+
       const res = await client.get(
-        `/api/stats/get_selling_debts_trading?status=${params}`
+        `/api/stats/get_selling_debts_trading?status=${query}`
       );
       return res;
     } catch (err) {

package/src/screens/BuyDebt/Components/ListSuccess/ListSuccess.tsx

@@ -281,6 +281,7 @@ const ListSuccess = () => {
             tintColor={Colors.ORANGE_H}
           />
         }
+        contentContainerStyle={{ paddingBottom: 200 }}
         data={data}
         stickyHeaderIndices={[0]}
         keyExtractor={(item, index) =>

package/src/screens/ContractDetail/index.tsx

@@ -244,6 +244,7 @@ export const ContractDetail = ({ route, navigation }: any) => {
         <FlatList
           data={listContracts?.detailData}
           keyExtractor={(item, index) => `${index}`}
+          contentContainerStyle={{ paddingBottom: 40 }}
           renderItem={_renderItem}
           ListEmptyComponent={() => <EmptyView text="Không có hợp đồng nào" />}
         />

package/src/screens/DetailBuyDue/index.tsx

@@ -54,27 +54,16 @@ export const DetailBuyDue = ({ navigation, route }: any) => {
         title="Hợp đồng"
         onPress={() => navigation.navigate('MyBank.Main')}
       />
-      <View
-        style={{
-          width: '100%',
-          height: '100%',
-        }}
-      >
+      <View style={{ flex: 1 }}>
         <Pdf
           showsVerticalScrollIndicator={false}
           source={{ uri: data?.url, cache: true }}
-          style={{ width: '100%', height: '100%' }}
+          style={{ flex: 1 }}
           trustAllCerts={false}
         />
-        <View
-          style={{
-            position: 'absolute',
-            width: '100%',
-            bottom: actuatedNormalize(100),
-          }}
-        >
+        <View style={{ padding: actuatedNormalize(16) }}>
           <Button
-            text={'Ký hợp đồng'}
+            text="Ký hợp đồng"
             onPress={onSubmit}
             buttonStyle={{
               marginBottom: actuatedNormalize(32),

package/src/screens/SellDebt/Tabs/Sold.tsx

@@ -277,7 +277,7 @@ const Sold = () => {
   };
 
   return (
-    <View>
+    <View style={{ flex: 1 }}>
       <FlexRow
         style={{
           padding: 12,
@@ -340,7 +340,7 @@ const Sold = () => {
         </View>
       </FlexRow>
 
-      <View style={{ height: '70%' }}>
+      <View style={{ flex: 1 }}>
         <FlatList
           refreshControl={
             <RefreshControl
@@ -350,6 +350,7 @@ const Sold = () => {
             />
           }
           data={data}
+          contentContainerStyle={{ paddingBottom: 40 }}
           keyExtractor={(item, index) => index.toString()}
           renderItem={_renderItemLenderSell}
           stickyHeaderIndices={[0]}

package/src/screens/Transfer/Tabs/Buy.tsx

@@ -25,15 +25,19 @@ import {
 import Countdown from '../../../hooks/Countdown/useCountdown';
 
 const Buy = (props) => {
-  const { dataDebts } = props;
+  const { dataDebts, value } = props;
   const navigation = useNavigation();
   const dispatch = useAppDispatch();
   const [refreshing, setRefreshing] = useState(false);
   const [debts, setDebts] = useState(dataDebts);
 
   useEffect(() => {
-    getListBuying(-111);
-  }, []);
+    getListBuying(value);
+  }, [value]);
+
+  useEffect(() => {
+    setDebts(dataDebts);
+  }, [dataDebts]);
 
   const wait = (timeout: number | undefined) => {
     return new Promise((resolve) => setTimeout(resolve, timeout));
@@ -59,7 +63,7 @@ const Buy = (props) => {
       } else {
         setDebts([]);
       }
-      console.log('respresp', JSON.stringify(resp));
+      console.log('respresp BUY', JSON.stringify(resp));
     } catch (error) {
       console.log('catching error getListBuy: ', error);
     }

package/src/screens/Transfer/Tabs/Sell.tsx

@@ -3,7 +3,7 @@
 //@ts-nocheck
 import { useNavigation } from '@react-navigation/native';
 import moment from 'moment';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { FlatList, RefreshControl, TouchableOpacity, View } from 'react-native';
 import Feather from 'react-native-vector-icons/Feather';
 import Colors from '../../../common/Colors';
@@ -25,11 +25,20 @@ import {
 import Countdown from '../../../hooks/Countdown/useCountdown';
 
 const Sell = (props) => {
-  const { dataDebts } = props;
+  const { dataDebts, value } = props;
   const navigation = useNavigation();
   const dispatch = useAppDispatch();
+  const [debts, setDebts] = useState(dataDebts);
   const [refreshing, setRefreshing] = useState(false);
 
+  useEffect(() => {
+    getListSelling(value);
+  }, [value]);
+
+  useEffect(() => {
+    setDebts(dataDebts);
+  }, [dataDebts]);
+
   const wait = (timeout: number | undefined) => {
     return new Promise((resolve) => setTimeout(resolve, timeout));
   };
@@ -251,7 +260,7 @@ const Sell = (props) => {
       }}
     >
       <FlatList
-        data={dataDebts}
+        data={debts}
         keyExtractor={(i, index) => index.toString()}
         renderItem={_renderItems}
         showsVerticalScrollIndicator={false}

package/src/screens/Transfer/index.tsx

@@ -1,5 +1,5 @@
-//@ts-nocheck
 /* eslint-disable react-native/no-inline-styles */
+//@ts-nocheck
 import React, { useEffect, useRef, useState } from 'react';
 import { TouchableOpacity, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
@@ -38,8 +38,9 @@ const Transfer = ({ navigation, route }: any) => {
   const [showPopover, setShowPopover] = useState(false);
   const [openDropdown, setOpenDropdown] = useState(false);
   const [shopName, setShopName] = useState('');
-  const [value, setValue] = useState(-111);
-  const [dataDebts, setDataDebts] = useState([]);
+  const [value, setValue] = useState<number[]>([-111]);
+  const [dataBuy, setDataBuy] = useState([]);
+  const [dataSell, setDataSell] = useState([]);
   const [refreshing, setRefreshing] = useState(false);
   const userData = useSelector(userInfor);
 
@@ -59,26 +60,26 @@ const Transfer = ({ navigation, route }: any) => {
     } else {
       getListBuying(value);
     }
-  }, [currentTab, userData?.accessToken]);
+  }, [currentTab, userData?.accessToken, value]);
 
-  const getListSelling = async (status: number) => {
+  const getListSelling = async (status: number | number[]) => {
     const resp: any = await dispatch(getSellingDebtsTrading(status));
     if (resp?.payload?.data?.length) {
       const _data = resp?.payload?.data || [];
-      setDataDebts(_data);
+      setDataSell(_data);
     } else {
-      setDataDebts([]);
+      setDataSell([]);
     }
     console.log('resp selling----', resp);
   };
 
-  const getListBuying = async (status: number) => {
+  const getListBuying = async (status: number | number[]) => {
     const resp: any = await dispatch(getBuyingDebtsTrading(status));
     if (resp?.payload?.data?.length) {
       const _data = resp?.payload?.data || [];
-      setDataDebts(_data);
+      setDataBuy(_data);
     } else {
-      setDataDebts([]);
+      setDataBuy([]);
     }
     console.log('respresp', JSON.stringify(resp));
   };
@@ -292,20 +293,20 @@ const Transfer = ({ navigation, route }: any) => {
         </FlexRow>
 
         {currentTab === 0 ? (
-          <Buy dataDebts={dataDebts} />
+          <Buy dataDebts={dataBuy} />
         ) : (
-          <Sell dataDebts={dataDebts} />
+          <Sell dataDebts={dataSell} />
         )}
       </View>
 
       <PopoverSortDebt
         tab={currentTab}
-        onPress={(value) => {
-          if (currentTab === 0) {
-            getListBuying(value);
-          } else {
-            getListSelling(value);
-          }
+        onPress={(val: string) => {
+          console.log('value press: ', val);
+
+          const arr = val.split(',').map((v) => Number(v.trim()));
+
+          setValue(arr);
           setShowPopover(false);
         }}
         isVisible={showPopover}