@tima2025/react-native-timalender 1.1.2 → 1.1.5

package/src/screens/WithDraw/index.tsx

@@ -2,7 +2,14 @@
 /* eslint-disable react-native/no-inline-styles */
 import moment from 'moment';
 import React, { useEffect, useState } from 'react';
-import { FlatList, ScrollView, TextInput, View } from 'react-native';
+import {
+  Alert,
+  FlatList,
+  ScrollView,
+  TextInput,
+  TouchableOpacity,
+  View,
+} from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import { useDispatch, useSelector } from 'react-redux';
 import AppHeader from '../../common/AppHeader';
@@ -21,10 +28,11 @@ import {
   withdrawHistory,
   withdrawRequest,
 } from '../../components/Features/bank/bankSlice';
+import { cancelWithdrawRequest } from '../../components/Features/Lender/lenderSlice';
 import { selectLoading } from '../../components/Redux/selector';
 import { AppDispatch } from '../../components/Redux/store';
 
-export const WithDraw = ({ _navigation }: any) => {
+export const WithDraw = ({ navigation }: any) => {
   const dispatch = useDispatch<AppDispatch>();
   const isLoading = useSelector(selectLoading);
   const [dataHistory, setDataHistory] = useState<any>(null);
@@ -34,7 +42,6 @@ export const WithDraw = ({ _navigation }: any) => {
 
   useEffect(() => {
     getHistory();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const getHistory = async () => {
@@ -55,7 +62,51 @@ export const WithDraw = ({ _navigation }: any) => {
     }
   };
 
+  console.log('dataHistory: ', dataHistory);
+
+  const handleCancelWithdraw = async (item: any) => {
+    Alert.alert(
+      'Vui lòng xác nhận lại',
+      `Bạn có chắc chắn muốn huỷ Lệnh\nrút số tiền ${numberWithCommas(
+        item?.money
+      )}đ không?`,
+      [
+        {
+          text: 'Xác nhận',
+          onPress: async () => {
+            console.log('withdraw item: ', item);
+            try {
+              const resp: any = await dispatch(
+                cancelWithdrawRequest({ Id: item.id, Money: item.money })
+              );
+              console.log('response withdraw: ', JSON.stringify(resp));
+              if (resp.payload.meta.errCode === 200) {
+                getHistory();
+                Alert.alert('Thông báo', 'Huỷ rút tiền thành công');
+              } else {
+                showMessage({
+                  message: 'Thông báo',
+                  description: 'Có lỗi xảy ra. Vui lòng thử lại',
+                  type: 'danger',
+                  icon: 'warning',
+                  backgroundColor: Colors.DANGER,
+                });
+              }
+            } catch (error) {
+              console.log('catching error withdraw: ', error);
+            }
+          },
+        },
+        {
+          text: 'Huỷ',
+          onPress: () => {},
+        },
+      ]
+    );
+  };
+
   const _renderItems = (item: any, index: number) => {
+    console.log('item: ', item);
     return (
       <View>
         <FlexRow
@@ -74,20 +125,37 @@ export const WithDraw = ({ _navigation }: any) => {
               {moment(item?.createDate).format('DD/MM/YYYY')}
             </RText>
           </View>
-          <View style={{ flex: 115 }}>
+          <View style={{ flex: 100 }}>
             <RText style={{ fontSize: 11, color: '#000000' }}>
               {item?.noteAgency}
             </RText>
           </View>
-          <View style={{ flex: 87 }}>
+          <View style={{ flex: 62 }}>
             <RText
               style={{ fontSize: 11, color: '#000000', fontWeight: 'bold' }}
             >
               {numberWithCommas(item?.money)}
             </RText>
           </View>
-          <View style={{ flex: 60, alignItems: 'flex-end' }}>
+          <View style={{ flex: 68, alignItems: 'center' }}>
             {statusView(item)}
+            {item.status === 0 && (
+              <TouchableOpacity onPress={() => handleCancelWithdraw(item)}>
+                <RText
+                  textStyle={{
+                    fontSize: 10,
+                    textDecorationLine: 'underline',
+                    color: 'red',
+                    textAlign: 'center',
+                    marginTop: 4,
+                    fontWeight: '400',
+                    alignSelf: 'center',
+                  }}
+                >
+                  Huỷ lệnh
+                </RText>
+              </TouchableOpacity>
+            )}
           </View>
         </FlexRow>
       </View>
@@ -147,7 +215,53 @@ export const WithDraw = ({ _navigation }: any) => {
           style={{
             justifyContent: 'center',
             alignItems: 'center',
-            backgroundColor: 'yellow',
+            backgroundColor: '#FFE86D',
+            borderRadius: 10,
+            marginRight: 4,
+          }}
+        >
+          <RText
+            style={{
+              paddingHorizontal: 8,
+              paddingVertical: 4,
+              fontSize: 9,
+              color: '#333333',
+            }}
+          >
+            {item?.statusText}
+          </RText>
+        </FlexRow>
+      );
+    } else if (item.status === 2) {
+      return (
+        <FlexRow
+          style={{
+            justifyContent: 'center',
+            alignItems: 'center',
+            backgroundColor: '#FFF6E9',
+            borderRadius: 10,
+            marginRight: 4,
+          }}
+        >
+          <RText
+            style={{
+              paddingHorizontal: 8,
+              paddingVertical: 4,
+              fontSize: 9,
+              color: '#333333',
+            }}
+          >
+            {item?.statusText}
+          </RText>
+        </FlexRow>
+      );
+    } else {
+      return (
+        <FlexRow
+          style={{
+            justifyContent: 'center',
+            alignItems: 'center',
+            backgroundColor: '#cccccc',
             borderRadius: 10,
             marginRight: 4,
           }}
@@ -167,6 +281,8 @@ export const WithDraw = ({ _navigation }: any) => {
     }
   }
 
+  console.log('dataTransaction: ', dataTransaction);
+
   const onWithdraw = async () => {
     if (dataHistory?.moneyWithdrawable < getMoney(money)) {
       // WToastShowError('Số tiền rút cần nhỏ hơn hoặc bằng số tiền có thể rút.');
@@ -194,6 +310,7 @@ export const WithDraw = ({ _navigation }: any) => {
           backgroundColor: Colors.SUCCESS,
         });
         setMoney('');
+        setNote('');
         getHistory();
       } else if (resp.payload.meta.errCode === 241) {
         // WToastShowError(resp?.payload?.meta?.errMessage);
@@ -219,7 +336,7 @@ export const WithDraw = ({ _navigation }: any) => {
 
   return (
     <Container>
-      <AppHeader title={'Rút tiền'.toUpperCase()} />
+      <AppHeader title={`Rút tiền`.toUpperCase()} />
       <ScrollView>
         <View
           style={{
@@ -358,33 +475,32 @@ export const WithDraw = ({ _navigation }: any) => {
                   color: '#000000',
                   fontWeight: 'bold',
                 }}
-              >
-                {'Thời gian'}
-              </RText>
+              >{`Thời gian`}</RText>
             </View>
-            <View style={{ flex: 115 }}>
+            <View style={{ flex: 100 }}>
               <RText
                 style={{
                   fontSize: 11,
                   color: '#000000',
                   fontWeight: 'bold',
                 }}
-              >
-                {'Nội dung đối tác'}
-              </RText>
+              >{`Nội dung đối tác`}</RText>
             </View>
-            <View style={{ flex: 87 }}>
+            <View style={{ flex: 62 }}>
               <RText
                 style={{
                   fontSize: 11,
                   color: '#000000',
                   fontWeight: 'bold',
                 }}
-              >
-                {'Số tiền'}
-              </RText>
+              >{`Số tiền`}</RText>
             </View>
-            <View style={{ flex: 57, alignItems: 'flex-end' }}>
+            <View
+              style={{
+                flex: 68,
+                alignItems: 'center',
+              }}
+            >
               <RText
                 style={{
                   fontSize: 11,
@@ -392,9 +508,7 @@ export const WithDraw = ({ _navigation }: any) => {
                   fontWeight: 'bold',
                   paddingRight: 4,
                 }}
-              >
-                {'Trạng thái'}
-              </RText>
+              >{`Trạng thái`}</RText>
             </View>
           </FlexRow>
           <FlatList

package/src/screens/WithdrawGpay/index.tsx

@@ -4,11 +4,11 @@ import React, { useState } from 'react';
 import { ScrollView, TextInput, TouchableOpacity, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import { useDispatch, useSelector } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
 import formatNumber from '../../common/FormatNumber';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import Loading from '../../common/Loading';
 import {
   actuatedNormalize,
@@ -84,7 +84,11 @@ export const WithdrawGpay = ({ navigation, route }: any) => {
 
   return (
     <Container>
-      <AppHeader title="Rút tiền Gpay" />
+      {/* <AppHeader title="Rút tiền Gpay" /> */}
+      <BackHeader
+        title="Rút tiền Gpay"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <ScrollView scrollEnabled={false}>
         <SpaceBetween
           style={{

package/src/screens/WithdrawSuccess/index.tsx

@@ -5,9 +5,9 @@ import moment from 'moment';
 import React from 'react';
 import { ScrollView, TouchableOpacity, View } from 'react-native';
 import successful from '../../assets/JSON/successful.json';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import { actuatedNormalize } from '../../common/Metrics';
 import RText from '../../common/RText';
 import SpaceBetween from '../../common/SpaceBetween';
@@ -17,7 +17,11 @@ export const WithdrawSuccess = ({ navigation, route }: any) => {
   const data = route?.params?.data;
   return (
     <Container>
-      <AppHeader canBack title="Chi tiết giao dịch" />
+      {/* <AppHeader canBack title="Chi tiết giao dịch" /> */}
+      <BackHeader
+        title="Chi tiết giao dịch"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <ScrollView style={{ padding: actuatedNormalize(16) }}>
         <View
           style={{

package/src/screens/terms/index.tsx

@@ -2,7 +2,6 @@
 /* eslint-disable react-native/no-inline-styles */
 import React from 'react';
 import WebView from 'react-native-webview';
-import AppHeader from '../../common/AppHeader';
 import Container from '../../common/Container';
 
 export const TermsScreen = ({ route }: any) => {
@@ -163,7 +162,7 @@ export const TermsScreen = ({ route }: any) => {
 
   return (
     <Container style={{ flex: 1, backgroundColor: '#F05123' }}>
-      <AppHeader title="ĐIỀU KHOẢN" />
+      {/* <AppHeader title="ĐIỀU KHOẢN" /> */}
       <WebView
         source={{ html: route?.params?.linkBank ? termLinkBank : term }}
         onLoadProgress={(e) => console.log(e.nativeEvent.progress)}