@tima2025/react-native-timalender 1.1.3 → 1.1.5

package/src/screens/InvestDetail/index.tsx

@@ -18,17 +18,27 @@ import ClassBG from '../../assets/images/ClassBG';
 import HomeImages from '../../assets/images/HomePage';
 import InvestImages from '../../assets/images/Invest';
 import constant from '../../common/constants';
-import { numberWithCommas } from '../../common/Metrics';
+import {
+  actuatedNormalize,
+  formatMoneyText,
+  numberWithCommas,
+} from '../../common/Metrics';
 import RText from '../../common/RText';
 import Screens from '../../components/Navigation/Screens';
 import { AppDispatch } from '../../components/Redux/store';
 
+import FastImage from 'react-native-fast-image';
 import { showMessage } from 'react-native-flash-message';
+import imageOptions from '../../assets/images/Optional';
 import Colors from '../../common/Colors';
 import Loading from '../../common/Loading';
 import { getStatsContractInfo } from '../../components/Features/Lender/lenderSlice';
 import { lenderAfterDateContract } from '../../components/Features/Loans/loanSlice';
 import { selectLoading } from '../../components/Redux/selector';
+import ConfirmAddInvestment from '../../screens/AdditionalInvestmentCapital/Components/ConfirmAddInvestment';
+import ConfirmRecharge from '../../screens/AdditionalInvestmentCapital/Components/ConfirmRecharge';
+import Success from '../../screens/AdditionalInvestmentCapital/Components/Success';
+import AddInvestment from '../../screens/DashBoardDetail/Components/AddInvestment';
 
 const listTitle = [
   {
@@ -95,18 +105,26 @@ const lenderAfter = [
 export const InvestDetail = ({ route, navigation }: any) => {
   const dispatch = useDispatch<AppDispatch>();
   const isLoading = useSelector(selectLoading);
-  // const item = route?.params?.item;
+  const item = route?.params?.item;
   const lenderTypeName = route?.params?.lenderTypeName;
-  // const investmentTypeText = route?.params?.investmentTypeText;
+  const investmentTypeText = route?.params?.investmentTypeText;
   const [chooseFinishContract, setChooseFinishContract] = useState('');
   const [openModal, setOpenModal] = useState(false);
-  // const [chooseLender, setChooseLender] = useState<any>(null);
-  // const [totalMoney, setTotalMoney] = useState(item?.totalMoneyCurrent);
+  const [chooseLender, setChooseLender] = useState<any>(null);
+  const [totalMoney, setTotalMoney] = useState(item?.totalMoneyCurrent);
+  const [listBank, setListBank] = useState<any>([]);
+  const [money, setMoney] = useState('');
+  const [chooseBank, setChooseBank] = useState<any>();
+  const [openAddInvestment, setOpenAddInvestment] = useState(false);
+  const [openConfirmInvestment, setOpenConfirmInvestment] = useState(false);
+  const [openRecharge, setOpenRecharge] = useState(false);
+  const [openSuccess, setOpenSuccess] = useState(false);
+  const [dataConfirm, setDataConfirm] = useState();
   const [data, setData] = useState();
+  console.log('lenderTypeName: ', lenderTypeName);
 
   useEffect(() => {
     getContractInfo();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const getContractInfo = async () => {
@@ -125,6 +143,15 @@ export const InvestDetail = ({ route, navigation }: any) => {
     }
   };
 
+  const getBankTransfer = async () => {
+    const resp: any = await dispatch(getTransferBanks());
+    console.log('resp', resp);
+    if (resp?.payload?.meta?.errCode === 200) {
+      const _data = resp?.payload?.data || [];
+      setListBank(_data);
+    }
+  };
+
   const mapIconType: any = {
     Gold: InvestImages.gold,
     UQĐT: InvestImages.money,
@@ -190,6 +217,34 @@ export const InvestDetail = ({ route, navigation }: any) => {
     }
   };
 
+  const onRecharge = async () => {
+    const params = {
+      bankId: chooseBank?.bin || listBank[0]?.bin,
+      bankAccount: chooseBank?.account || listBank[0]?.account,
+      money: money.split(',').join(''),
+      lenderId: item?.lenderID,
+    };
+    const resp: any = await dispatch(getTransferContent(params));
+    console.log('resp transfer', JSON.stringify(resp));
+    if (resp?.payload?.meta?.errCode === 200) {
+      setDataConfirm(resp?.payload?.data);
+      setOpenConfirmInvestment(false);
+      setTimeout(() => {
+        setOpenRecharge(true);
+      }, 800);
+    } else {
+      // WToastShowError(resp?.payload?.meta?.errMessage, WToast.position.TOP);
+      showMessage({
+        message: 'Thông báo',
+        description: resp?.payload?.meta?.errMessage,
+        type: 'danger',
+        icon: 'warning',
+        position: 'top',
+        backgroundColor: Colors.DANGER,
+      });
+    }
+  };
+
   const chooseLenderAfterDateContract = async (item: any) => {
     setOpenModal(false);
     const resp: any = await dispatch(
@@ -401,7 +456,7 @@ export const InvestDetail = ({ route, navigation }: any) => {
               color: '#606060',
             }}
           >
-            {'Lãi đã nhận'}
+            {`Lãi đã nhận`}
           </Text>
           <View
             style={{
@@ -420,6 +475,41 @@ export const InvestDetail = ({ route, navigation }: any) => {
             <Icon name="chevron-forward" color="#999999" size={24} />
           </View>
         </TouchableOpacity>
+
+        {lenderTypeName === 'Diamonds' && (
+          <TouchableOpacity
+            onPress={() => {
+              getBankTransfer();
+              setOpenAddInvestment(true);
+            }}
+            style={{
+              alignItems: 'center',
+              flexDirection: 'row',
+              alignSelf: 'center',
+              marginBottom: actuatedNormalize(36),
+              borderWidth: 1,
+              borderRadius: actuatedNormalize(36),
+              borderColor: Colors.ORANGE,
+            }}
+          >
+            <FastImage
+              source={imageOptions.them_von_new}
+              style={{
+                width: actuatedNormalize(40),
+                height: actuatedNormalize(40),
+              }}
+            />
+            <RText
+              textStyle={{
+                color: Colors.ORANGE,
+                marginHorizontal: actuatedNormalize(8),
+                fontSize: 16,
+              }}
+            >
+              Thêm vốn
+            </RText>
+          </TouchableOpacity>
+        )}
       </ScrollView>
       <Modal
         isVisible={openModal}
@@ -441,7 +531,7 @@ export const InvestDetail = ({ route, navigation }: any) => {
           <Text style={{ fontSize: 18, fontWeight: '700', marginBottom: 16 }}>
             Chọn phương thức đáo hạn
           </Text>
-          {lenderAfter.map((item, _index) => {
+          {lenderAfter.map((item, index) => {
             return (
               <TouchableOpacity
                 onPress={() => {
@@ -465,7 +555,50 @@ export const InvestDetail = ({ route, navigation }: any) => {
           })}
         </View>
       </Modal>
+      <AddInvestment
+        isVisible={openAddInvestment}
+        onBackdropPress={() => setOpenAddInvestment(false)}
+        lenderName={item?.lenderName}
+        listBank={listBank}
+        value={money}
+        chooseBank={(val: React.SetStateAction<undefined>) =>
+          setChooseBank(val)
+        }
+        onChangeText={(val: string) => setMoney(formatMoneyText(val))}
+        onPress={() => {
+          setOpenAddInvestment(false);
+          setTimeout(() => {
+            setOpenConfirmInvestment(true);
+          }, 800);
+        }}
+      />
 
+      <ConfirmAddInvestment
+        isVisible={openConfirmInvestment}
+        money={money}
+        lenderCode={item?.lenderName}
+        bank={chooseBank || listBank[0]}
+        onBackdropPress={() => setOpenConfirmInvestment(false)}
+        onPress={() => onRecharge()}
+        isLoading={isLoading}
+      />
+
+      <ConfirmRecharge
+        isVisible={openRecharge}
+        onBackdropPress={() => setOpenRecharge(false)}
+        data={dataConfirm}
+        bank={chooseBank || listBank[0]}
+        onPress={() => {
+          setOpenRecharge(false);
+          setTimeout(() => {
+            setOpenSuccess(true);
+          }, 800);
+        }}
+      />
+      <Success
+        isVisible={openSuccess}
+        onBackdropPress={() => setOpenSuccess(false)}
+      />
       {isLoading && <Loading />}
     </ImageBackground>
   );

package/src/screens/InvestNew/index.tsx

@@ -1,19 +1,23 @@
 /* eslint-disable react-native/no-inline-styles */
 import React, { useState } from 'react';
 import { TouchableOpacity } from 'react-native';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import RText from '../../common/RText';
 import HomeLoan from './Screens/HomeLoan';
 import PersonalLoan from './Screens/PersonalLoan';
 
-export const InvestNew = () => {
+export const InvestNew = ({ navigation }: any) => {
   const [tabIndex, setTabIndex] = useState(0);
   return (
     <Container isStatusBar>
-      <AppHeader title="DANH SÁCH KHOẢN CHỜ ĐẦU TƯ" />
+      {/* <AppHeader title="DANH SÁCH KHOẢN CHỜ ĐẦU TƯ" /> */}
+      <BackHeader
+        title="DANH SÁCH KHOẢN CHỜ ĐẦU TƯ"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <FlexRow>
         <TouchableOpacity
           onPress={() => setTabIndex(0)}

package/src/screens/LinkSuccess/index.tsx

@@ -2,9 +2,9 @@
 import React from 'react';
 import { Image, View } from 'react-native';
 import imageBanks from '../../assets/images/Banks';
-import AppHeader from '../../common/AppHeader';
 import Button from '../../common/Button';
 import Container from '../../common/Container';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import { actuatedNormalize } from '../../common/Metrics';
 import RText from '../../common/RText';
 import Screens from '../../components/Navigation/Screens';
@@ -12,7 +12,11 @@ import Screens from '../../components/Navigation/Screens';
 export const LinkSuccess = ({ navigation }: any) => {
   return (
     <Container isStatusBar>
-      <AppHeader title="LIÊN KẾT NGÂN HÀNG" />
+      {/* <AppHeader title="LIÊN KẾT NGÂN HÀNG" /> */}
+      <BackHeader
+        title="LIÊN KẾT NGÂN HÀNG"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <View
         style={{
           backgroundColor: 'white',

package/src/screens/ListLoan/index.tsx

@@ -6,12 +6,12 @@ import { FlatList, TouchableOpacity, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import LinearGradient from 'react-native-linear-gradient';
 import { useDispatch, useSelector } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import EmptyView from '../../common/EmptyView';
 import FlexRow from '../../common/FlexRow';
 import formatNumber from '../../common/FormatNumber';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import Loading from '../../common/Loading';
 import { actuatedNormalize, Shadow } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -51,7 +51,7 @@ const dateTypes = [
   },
 ];
 
-export const ListLoan = ({ _navigation, route }: any) => {
+export const ListLoan = ({ navigation, route }: any) => {
   const typeName = route?.params?.typeName;
   const scrollRef = useRef<any>(null);
   const touchRef = useRef<any>(null);
@@ -244,12 +244,16 @@ export const ListLoan = ({ _navigation, route }: any) => {
 
   return (
     <Container isStatusBar>
-      <AppHeader
+      {/* <AppHeader
         title="Số tiền đang cho vay"
         backColor={Colors.WHITE}
         iconColor={Colors.BLACK}
         titleStyle={{ color: Colors.BLACK }}
         // renderRight={() => rightItem()}
+      /> */}
+      <BackHeader
+        title="Số tiền đang cho vay"
+        onPress={() => navigation.navigate('MyBank.Main')}
       />
       <View
         style={{

package/src/screens/ListWaitingApproval/index.tsx

@@ -22,13 +22,13 @@ import {
 import { useSelector } from 'react-redux';
 import InvestIcons from '../../assets/images/Invest';
 import imageOptions from '../../assets/images/Optional';
-import AppHeader from '../../common/AppHeader';
 import BorderWidth from '../../common/BorderWidth';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import EmptyView from '../../common/EmptyView';
 import FlexRow from '../../common/FlexRow';
 import formatNumber from '../../common/FormatNumber';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import LazyImage from '../../common/LazyImage';
 import Loading from '../../common/Loading';
 import { actuatedNormalize, Shadow } from '../../common/Metrics';
@@ -44,7 +44,7 @@ import { useAppDispatch } from '../../components/Redux/store';
 import Success from '../AdditionalInvestmentCapital/Components/Success';
 import ConfirmRecharge from './Components/ConfirmRecharge';
 
-const ListWaitingApproval = () => {
+const ListWaitingApproval = ({ navigation }: any) => {
   const dispatch = useAppDispatch();
   const userData = useSelector(userInfor);
   const isLoading = useSelector(selectLoading);
@@ -297,11 +297,15 @@ const ListWaitingApproval = () => {
   };
   return (
     <Container style={{ backgroundColor: '#F5F5F5' }}>
-      <AppHeader
+      {/* <AppHeader
         title={`Danh sách đợi duyệt (${data?.length || 0})`}
         backColor={Colors.WHITE}
         iconColor={Colors.BLACK}
         titleStyle={{ color: Colors.BLACK }}
+      /> */}
+      <BackHeader
+        title={`Danh sách đợi duyệt (${data?.length || 0})`}
+        onPress={() => navigation.navigate('MyBank.Main')}
       />
       <FlatList
         data={data}

package/src/screens/ListWaitingExtension/index.tsx

@@ -4,7 +4,6 @@ import React, { useEffect, useState } from 'react';
 import { FlatList, TouchableOpacity, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import LinearGradient from 'react-native-linear-gradient';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
@@ -228,12 +227,12 @@ const ListWaitingExtension = ({ navigation }: any) => {
 
   return (
     <Container>
-      <AppHeader
+      {/* <AppHeader
         title="Danh sách chờ gia hạn"
         backColor="white"
         iconColor="black"
         titleStyle={{ color: 'black' }}
-      />
+      /> */}
       <LinearGradient
         colors={['#FF8E4F', '#EF592E']}
         style={{ paddingVertical: 8 }}

package/src/screens/LoanApplication/index.tsx

@@ -7,11 +7,11 @@ import { FlatList, TouchableOpacity, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import { useSelector } from 'react-redux';
 import InvestNewImages from '../../assets/images/InvestNew';
-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 LazyImage from '../../common/LazyImage';
 import Loading from '../../common/Loading';
 import { actuatedNormalize, Shadow } from '../../common/Metrics';
@@ -259,11 +259,15 @@ const LoanApplication = ({ navigation }: any) => {
   };
   return (
     <Container>
-      <AppHeader
+      {/* <AppHeader
         backColor={Colors.WHITE}
         iconColor={Colors.BLACK}
         titleStyle={{ color: Colors.BLACK }}
         title="Đơn vay đủ điều kiện bán"
+      /> */}
+      <BackHeader
+        title="Đơn vay đủ điều kiện bán"
+        onPress={() => navigation.navigate('MyBank.Main')}
       />
       <View
         style={{

package/src/screens/LockingLoan/index.tsx

@@ -3,9 +3,9 @@
 import React, { useEffect, useState } from 'react';
 import { FlatList, TouchableOpacity, View } from 'react-native';
 import { useDispatch } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import { numberWithCommas } from '../../common/Metrics';
 import RText from '../../common/RText';
 import constant from '../../common/constants/index';
@@ -79,7 +79,11 @@ export const LockingLoan = ({ navigation }: any) => {
   }
   return (
     <Container isStatusBar>
-      <AppHeader title={'Hợp đồng chờ đối soát'.toUpperCase()} />
+      {/* <AppHeader title={'Hợp đồng chờ đối soát'.toUpperCase()} /> */}
+      <BackHeader
+        title={'Hợp đồng chờ đối soát'.toUpperCase()}
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <View style={{ flex: 1 }}>
         <FlexRow
           style={{

package/src/screens/Notification/index.tsx

@@ -13,10 +13,10 @@ import {
 import { showMessage } from 'react-native-flash-message';
 import { useDispatch, useSelector } from 'react-redux';
 import Images from '../../assets/images/Logo';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import Loading from '../../common/Loading';
 import RText from '../../common/RText';
 import {
@@ -165,7 +165,11 @@ export const Notification = ({ navigation }: any) => {
 
   return (
     <Container isStatusBar>
-      <AppHeader title="THÔNG BÁO" />
+      {/* <AppHeader title="THÔNG BÁO" /> */}
+      <BackHeader
+        title="THÔNG BÁO"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <FlatList
         data={dataNotifi}
         keyExtractor={(item, index) => index.toString()}

package/src/screens/OTP/index.tsx

@@ -4,11 +4,11 @@ import React, { useEffect, useState } from 'react';
 import { ScrollView, TextInput, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import { useDispatch, useSelector } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 import Button from '../../common/Button';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import Loading from '../../common/Loading';
 import { actuatedNormalize, numberWithCommas } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -185,7 +185,11 @@ export const OTP = ({ route, navigation }: any) => {
 
   return (
     <Container isStatusBar>
-      <AppHeader title="NHẬP MÃ XÁC THỰC" />
+      {/* <AppHeader title="NHẬP MÃ XÁC THỰC" /> */}
+      <BackHeader
+        title="NHẬP MÃ XÁC THỰC"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <ScrollView
         style={{ paddingHorizontal: actuatedNormalize(20) }}
         scrollEnabled={false}