@tima2025/react-native-timalender 1.0.1 → 1.0.2

package/src/screens/EkycLiveness/index.tsx

@@ -18,10 +18,12 @@ import { useSelector } from 'react-redux';
 import Colors from '../../common/Colors';
 import Loading from '../../common/Loading';
 import { actuatedNormalize } from '../../common/Metrics';
+import { confirmGpayOnboarding } from '../../components/Features/Lender/lenderSlice';
 import { compare_liveness_cif } from '../../components/Features/user/userSlice';
 import Screens from '../../components/Navigation/Screens';
 import { userInfor } from '../../components/Redux/selector';
 import { useAppDispatch } from '../../components/Redux/store';
+import { save } from '../../components/Storage/storage';
 import { PortalFrame } from './Components/PortalFrame';
 import { RecordingGuildStep } from './Components/RecordingGuildStep';
 
@@ -31,14 +33,14 @@ const frameHeight = frameWidth;
 const dataAction = ['pitch_head', 'yaw_head', 'eyes', 'mouth'];
 const durationTime = Platform.OS === 'ios' ? 4200 : 5000;
 
-const EkycLiveness = ({ navigation, route }: any) => {
+const EkycLiveness = ({navigation, route}: any) => {
   const reference_id = route?.params?.reference_id;
   const camera = useRef<Camera>(null);
   const devices = useCameraDevices('wide-angle-camera');
   const device = devices.front;
   const [hasPermission, setHasPermission] = useState(false);
   const [isLoading, setLoading] = useState(false);
-  const [listStep, setListStep] = useState(['intro']);
+  const [listStep, setListStep] = useState<any[]>(['intro']);
   const interestRef = useRef<ScrollView>(null);
   const user_Infor = useSelector(userInfor);
   const dispatch = useAppDispatch();
@@ -60,7 +62,7 @@ const EkycLiveness = ({ navigation, route }: any) => {
   const extractFramesFromVideo = async (
     videoPath: string,
     duration: number,
-    interval: number
+    interval: number,
   ) => {
     const thumbnails: string[] = [];
     const numFrames = Math.floor(duration / interval);
@@ -93,7 +95,7 @@ const EkycLiveness = ({ navigation, route }: any) => {
     const paths = await extractFramesFromVideo(
       data.path,
       parseInt(data.duration) * 1000,
-      interval
+      interval,
     );
 
     const listImage: string[] = [];
@@ -106,13 +108,14 @@ const EkycLiveness = ({ navigation, route }: any) => {
         console.warn('Read base64 error:', err);
       }
     }
+    console.log('listImage.length: ', listImage.slice(0, 20).length);
 
     const params = {
-      phone: '0982515705',
-      files: listImage,
+      phone: user_Infor?.phone,
+      files: listImage.slice(0, 20),
     };
     dispatch(compare_liveness_cif(params))
-      .then((res1) => {
+      .then(async res1 => {
         console.log('res compare----', res1);
         setLoading(false);
         if (res1?.payload?.data?.meta.errorCode !== 200) {
@@ -128,12 +131,32 @@ const EkycLiveness = ({ navigation, route }: any) => {
           navigation.navigate(Screens.Optional);
         } else {
           console.log('------');
-          navigation.navigate(Screens.ConfirmContract, {
-            data: reference_id,
-          });
+          const response: any = await dispatch(
+            confirmGpayOnboarding({reference_id}),
+          );
+          console.log('response', response);
+          if (response?.payload.meta.errCode === 200) {
+            save('reference_id', response?.payload.data);
+            console.log('reference_id', response?.payload.data);
+            // navigation.navigate(Screens.EkycLiveness, {
+            //   reference_id: response?.payload.data,
+            // });
+            navigation.navigate(Screens.ConfirmContract, {
+              data: response?.payload.data,
+            });
+          } else {
+            // WToastShowError(response?.payload.meta.errMessage);
+            showMessage({
+              message: 'Thông báo',
+              description: response?.payload.meta.errMessage,
+              type: 'danger',
+              icon: 'warning',
+              backgroundColor: Colors.DANGER,
+            });
+          }
         }
       })
-      .catch((err) => {
+      .catch(err => {
         // WToastShowError('Có lôi xảy ra,vui lòng thử lại sau');
         showMessage({
           message: 'Thông báo thất bại',
@@ -150,66 +173,6 @@ const EkycLiveness = ({ navigation, route }: any) => {
       });
   };
 
-  const uploadFile = async (temp: string) => {
-    setLoading(true);
-    console.log('----uploadFile!!!: ', temp);
-    let listImage = [];
-    for (let i = 1; i <= 20; i++) {
-      const file = 'file://' + temp + `_img_${('000' + i).slice(-4)}.jpg`;
-      console.log('file ', file);
-      try {
-        const imgBase64 = await RNFS.readFile(file, 'base64');
-        listImage.push(imgBase64);
-      } catch (error) {
-        console.log('error file: ', error);
-      }
-      // console.log('imgBase64 ', imgBase64)
-      console.log('------');
-    }
-    // console.log('listImage: ', listImage);
-
-    const params = {
-      phone: '0982515705',
-      files: listImage,
-    };
-
-    dispatch(compare_liveness_cif(params))
-      .then((res1) => {
-        console.log('res compare----', res1);
-        setLoading(false);
-        if (res1?.payload?.data?.meta.errorCode !== 200) {
-          // WToastShowError(res1?.payload?.data?.meta?.errorMessage);
-          showMessage({
-            message: 'Thông báo',
-            description: res1?.payload?.data?.meta?.errorMessage,
-            type: 'danger',
-            icon: 'warning',
-            backgroundColor: Colors.DANGER,
-          });
-          navigation.navigate(Screens.Optional);
-        } else {
-          navigation.navigate(Screens.ConfirmContract, {
-            data: reference_id,
-          });
-        }
-      })
-      .catch((err) => {
-        // WToastShowError('Có lôi xảy ra,vui lòng thử lại sau');
-        showMessage({
-          message: 'Thông báo',
-          description: 'Có lỗi xảy ra,vui lòng thử lại sau',
-          type: 'danger',
-          icon: 'warning',
-          backgroundColor: Colors.DANGER,
-        });
-        navigation.navigate(Screens.Optional);
-        setLoading(false);
-      })
-      .finally(() => {
-        setLoading(false);
-      });
-  };
-
   const onRecording = async () => {
     console.log('onRecording');
     console.log('camera.current: ', camera.current);
@@ -219,11 +182,11 @@ const EkycLiveness = ({ navigation, route }: any) => {
         videoCodec: 'h264',
         fileType: 'mp4',
         flash: 'off',
-        onRecordingFinished: (video) => {
+        onRecordingFinished: video => {
           console.log('video: ', video);
           onConfirm(video);
         },
-        onRecordingError: (error) =>
+        onRecordingError: error =>
           // WToastShowError('Lỗi không quay được. Hãy thử lại '),
           showMessage({
             message: 'Thông báo lỗi',
@@ -248,7 +211,6 @@ const EkycLiveness = ({ navigation, route }: any) => {
     }
   };
   const onContinueRecording = async (isFinish: boolean, step: number) => {
-    console.log('ahihi', step);
     if (camera.current) {
       camera.current.resumeRecording();
       setTimeout(async () => {
@@ -274,7 +236,7 @@ const EkycLiveness = ({ navigation, route }: any) => {
     switch (index) {
       case 0:
         if (interestRef.current) {
-          interestRef?.current.scrollTo({ animated: true, x: deviceWidth });
+          interestRef?.current.scrollTo({animated: true, x: deviceWidth});
         }
         break;
       case 1:
@@ -296,24 +258,23 @@ const EkycLiveness = ({ navigation, route }: any) => {
   }
 
   return (
-    <View style={{ width: deviceWidth }}>
+    <View style={{width: deviceWidth}}>
       <View
         style={{
           width: deviceWidth,
           height: '100%',
           justifyContent: 'center',
           alignItems: 'center',
-        }}
-      >
+        }}>
         <View style={styles.frameContainer}>
-          <View style={{ flex: 1, justifyContent: 'center' }}>
+          <View style={{flex: 1, justifyContent: 'center'}}>
             <PortalFrame />
             {device != null && hasPermission ? (
               <Camera
                 fps={60}
                 // preset="iframe-960x540"
                 ref={camera}
-                style={{ flex: 1, zIndex: 1 }}
+                style={{flex: 1, zIndex: 1}}
                 device={device}
                 // isActive
                 isActive={isFocused && hasPermission}
@@ -325,15 +286,14 @@ const EkycLiveness = ({ navigation, route }: any) => {
             <ScrollView
               nestedScrollEnabled
               ref={interestRef}
-              style={{ width: deviceWidth }}
+              style={{width: deviceWidth}}
               horizontal
               pagingEnabled
               snapToInterval={deviceWidth}
               scrollEventThrottle={16}
               scrollEnabled={false}
               bounces={true}
-              showsHorizontalScrollIndicator={false}
-            >
+              showsHorizontalScrollIndicator={false}>
               {listStep.map((item, index) => (
                 <RecordingGuildStep
                   key={index.toString()}
@@ -405,4 +365,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default EkycLiveness;
+export default EkycLiveness;

package/src/screens/Invest/Screens/HomeLoan.tsx

@@ -27,7 +27,6 @@ import {
 import Screens from '../../../components/Navigation/Screens';
 import { selectLoading } from '../../../components/Redux/selector';
 import { AppDispatch } from '../../../components/Redux/store';
-import { setClientToken } from '../../../controllers/Client';
 const dayjs = require('dayjs');
 const relativeTime = require('dayjs/plugin/relativeTime');
 dayjs.extend(relativeTime);
@@ -50,7 +49,7 @@ const HomeLoan = (props) => {
   };
 
   const addToCart = async (item: any) => {
-    setClientToken(item?.access_token);
+    // setClientToken(item?.access_token);
     setTimeout(async () => {
       const resp: any = await dispatch(lockLoan(item?.id));
       console.log('resp lock---', resp);

package/src/screens/InvestNew/Screens/HomeLoan.tsx

@@ -27,7 +27,6 @@ import {
 import Screens from '../../../components/Navigation/Screens';
 import { selectLoading } from '../../../components/Redux/selector';
 import { AppDispatch } from '../../../components/Redux/store';
-import { setClientToken } from '../../../controllers/Client';
 const dayjs = require('dayjs');
 const relativeTime = require('dayjs/plugin/relativeTime');
 dayjs.extend(relativeTime);
@@ -50,7 +49,7 @@ const HomeLoan = (props) => {
   };
 
   const addToCart = async (item: any) => {
-    setClientToken(item?.access_token);
+    // setClientToken(item?.access_token);
     setTimeout(async () => {
       const resp: any = await dispatch(lockLoan(item?.id));
       console.log('resp lock---', resp);

package/src/screens/Optional/index.tsx

@@ -122,17 +122,20 @@ const options: Option[] = [
   },
 ];
 
-export const Optional = ({ navigation }: any) => {
+export const Optional = ({navigation}: any) => {
   const dispatch = useDispatch<AppDispatch>();
   const _userInfo = useGetUser();
   const isLoading = useSelector(selectLoading);
   const userData = useSelector(userInfor);
   const [openPickShop, setOpenPickShop] = useState(false);
   const [shopName, setShopName] = useState<string>(
-    userData?.shops[0]?.name || userData?.shop?.name
+    userData?.shops[0]?.name || userData?.shop?.name,
   );
+  const [lenderType, setLenderType] = useState<string | null>(null);
   const [isEnabled, setIsEnabled] = useState(false);
 
+  console.log('shopName: ', shopName);
+
   const getOneShop = async () => {
     await changeToken(userData?.shops[0]);
     // getPackagesList();
@@ -143,7 +146,6 @@ export const Optional = ({ navigation }: any) => {
     if (userData?.typeDisbursement === 'NA') {
       loadEnableNotification();
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const loadEnableNotification = async () => {
@@ -249,8 +251,8 @@ export const Optional = ({ navigation }: any) => {
     setOpenPickShop(true);
   };
 
-  const changeToken = async (shop: { shopId: any; regFromApp: any }) => {
-    const resp: any = await dispatch(ChangeToken({ shop_id: shop?.shopId }));
+  const changeToken = async (shop: {shopId: any; regFromApp: any}) => {
+    const resp: any = await dispatch(ChangeToken({shop_id: shop?.shopId}));
     if (resp && resp.payload && resp?.payload?.meta?.errCode === 200) {
       const obj = {
         ...userData,
@@ -270,7 +272,7 @@ export const Optional = ({ navigation }: any) => {
             text: 'Đồng ý',
             onPress: () => dispatch(logOut()),
           },
-        ]
+        ],
       );
     }
   };
@@ -284,7 +286,7 @@ export const Optional = ({ navigation }: any) => {
       />
       {/* <View style={styles.header}>
         <NotifyIcon />
-      </View> */}
+      </View>
       {/* <Image
         source={
           userData?.gender === 1
@@ -301,65 +303,79 @@ export const Optional = ({ navigation }: any) => {
         </TouchableOpacity>
       </View>
       <View style={styles.redLine} />
-      <ScrollView style={{ paddingHorizontal: actuatedNormalize(16) }}>
-        <TouchableOpacity
-          onPress={() => navigation.navigate(Screens.WithDraw)}
-          style={{
-            flex: 1,
-          }}
-        >
-          <View style={styles.optionItems}>
-            <Image
-              source={imageOptions.withdraw}
-              style={{
-                width: 24,
-                height: 24,
-                tintColor: Colors.ORANGE,
-                resizeMode: 'contain',
-              }}
-            />
-            <RText textStyle={{ paddingLeft: 12 }}>{'Rút tiền'}</RText>
-          </View>
-          <View style={{ height: 1, backgroundColor: '#E5E5E5' }} />
-        </TouchableOpacity>
-        {options.map((item: Option) => {
-          return (
+      <ScrollView style={{paddingHorizontal: actuatedNormalize(16)}}>
+        {shopName?.includes('DT') &&
+          (lenderType?.includes('Gold') ||
+            lenderType?.includes('Gold Plus')) && (
             <TouchableOpacity
-              onPress={() => handleNavigate(item.id)}
-              key={item?.id}
+              onPress={() => navigation.navigate(Screens.WithDraw)}
               style={{
                 flex: 1,
-                borderBottomWidth: 1,
-                borderColor: '#E5E5E5',
-                flexDirection: 'row',
-                alignItems: 'center',
-                justifyContent: 'space-between',
-              }}
-            >
+              }}>
               <View style={styles.optionItems}>
                 <Image
-                  source={item.icon}
+                  source={imageOptions.withdraw}
                   style={{
-                    width: actuatedNormalize(18),
-                    height: actuatedNormalize(18),
+                    width: 24,
+                    height: 24,
                     tintColor: Colors.ORANGE,
                     resizeMode: 'contain',
                   }}
                 />
-                <RText textStyle={{ paddingLeft: 12 }}>{item?.title}</RText>
+                <RText textStyle={{paddingLeft: 12}}>{'Rút tiền'}</RText>
               </View>
-              {item.id === 12 && (
-                <Switch
-                  trackColor={{ false: '#767577', true: Colors.GRAY_5 }}
-                  thumbColor={isEnabled ? Colors.ORANGE : Colors.GRAY_4}
-                  onValueChange={toggleSwitch}
-                  value={isEnabled}
-                  style={{ transform: [{ scaleX: 0.6 }, { scaleY: 0.6 }] }}
-                />
-              )}
+              <View style={{height: 1, backgroundColor: '#E5E5E5'}} />
             </TouchableOpacity>
-          );
-        })}
+          )}
+        {options
+          .filter(item => {
+            if (
+              item.id === 15 &&
+              shopName?.includes('NA') &&
+              (lenderType?.includes('Gold') ||
+                lenderType?.includes('Gold Plus'))
+            ) {
+              return false;
+            }
+            return true;
+          })
+          .map((item: Option) => {
+            return (
+              <TouchableOpacity
+                onPress={() => handleNavigate(item.id)}
+                key={item?.id}
+                style={{
+                  flex: 1,
+                  borderBottomWidth: 1,
+                  borderColor: '#E5E5E5',
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                  justifyContent: 'space-between',
+                }}>
+                <View style={styles.optionItems}>
+                  <Image
+                    source={item.icon}
+                    style={{
+                      width: actuatedNormalize(18),
+                      height: actuatedNormalize(18),
+                      tintColor: Colors.ORANGE,
+                      resizeMode: 'contain',
+                    }}
+                  />
+                  <RText textStyle={{paddingLeft: 12}}>{item?.title}</RText>
+                </View>
+                {item.id === 12 && (
+                  <Switch
+                    trackColor={{false: '#767577', true: Colors.GRAY_5}}
+                    thumbColor={isEnabled ? Colors.ORANGE : Colors.GRAY_4}
+                    onValueChange={toggleSwitch}
+                    value={isEnabled}
+                    style={{transform: [{scaleX: 0.6}, {scaleY: 0.6}]}}
+                  />
+                )}
+              </TouchableOpacity>
+            );
+          })}
       </ScrollView>
       <ModalPickShop
         isVisible={openPickShop}
@@ -369,6 +385,7 @@ export const Optional = ({ navigation }: any) => {
           console.log('value', value);
 
           setShopName(value?.lenderName);
+          setLenderType(value?.lenderTypeName);
           setOpenPickShop(false);
           // navigation.navigate(Screens.HomePage);
         }}
@@ -381,8 +398,7 @@ export const Optional = ({ navigation }: any) => {
             fontSize: 12,
             paddingTop: actuatedNormalize(8),
             paddingBottom: actuatedNormalize(8),
-          }}
-        >{`Phiên bản: ${DeviceInfo.getVersion()}`}</RText>
+          }}>{`Phiên bản: ${DeviceInfo.getVersion()}`}</RText>
       </View> */}
       {isLoading && <Loading />}
     </Container>

package/src/screens/SignContractGpayTima/ConfirmContact.tsx

@@ -32,7 +32,6 @@ import { verifyGpayOnboarding } from '../../components/Features/Lender/lenderSli
 import Screens from '../../components/Navigation/Screens';
 import { selectLoading } from '../../components/Redux/selector';
 import { AppDispatch } from '../../components/Redux/store';
-import { load } from '../../components/Storage/storage';
 import useGetUser from '../../hooks/useGetUser';
 
 const CELL_COUNT = 4;
@@ -44,28 +43,31 @@ const logoView: ImageStyle = {
   resizeMode: 'cover',
 };
 
-export default function ConfirmContact({ navigation, route }: any) {
+export default function ConfirmContact({navigation, route}: any) {
   const dispatch = useDispatch<AppDispatch>();
+  const reference_id = route?.params?.data;
   const userInfo = useGetUser();
   const isLoading = useSelector(selectLoading);
   const [showSuccess, setShowSuccess] = useState(false);
   const [expire_time, setExpireTime] = useState(180);
   const [value, setValue] = useState('');
-  const ref = useBlurOnFulfill({ value, cellCount: CELL_COUNT });
-  const [ref_id, setRef_id] = useState('');
+  const ref = useBlurOnFulfill({value, cellCount: CELL_COUNT});
+  // const [ref_id, setRef_id] = useState('');
   const [props, getCellOnLayoutHandler] = useClearByFocusCell({
     value,
     setValue,
   });
 
-  useEffect(() => {
-    loadRefID();
-  }, []);
+  // useEffect(() => {
+  //   loadRefID();
+  // }, []);
 
-  const loadRefID = async () => {
-    const data = await load('reference_id');
-    setRef_id(data);
-  };
+  // const loadRefID = async () => {
+  //   const data = await load('reference_id');
+  //   setRef_id(data);
+  // };
+
+  // console.log('refID: ', ref_id);
 
   useEffect(() => {
     let interval = setInterval(() => {
@@ -81,7 +83,7 @@ export default function ConfirmContact({ navigation, route }: any) {
   const onSubmit = async () => {
     const params = {
       otp: value,
-      reference_id: ref_id,
+      reference_id,
     };
     const resp: any = await dispatch(verifyGpayOnboarding(params));
     console.log('resp', resp);
@@ -103,7 +105,7 @@ export default function ConfirmContact({ navigation, route }: any) {
   };
 
   return (
-    <View style={{ flex: 1 }}>
+    <View style={{flex: 1}}>
       <StatusBar barStyle={'light-content'} />
       <Image
         source={require('../../assets/images/Optional/Group1.png')}
@@ -116,8 +118,7 @@ export default function ConfirmContact({ navigation, route }: any) {
             alignItems: 'center',
             justifyContent: 'center',
             marginTop: 5,
-          }}
-        >
+          }}>
           <TouchableOpacity
             onPress={() => navigation.goBack()}
             style={{
@@ -127,8 +128,7 @@ export default function ConfirmContact({ navigation, route }: any) {
               height: 40,
               justifyContent: 'center',
               alignItems: 'center',
-            }}
-          >
+            }}>
             <IoIcon name="chevron-back" size={26} color="white" />
           </TouchableOpacity>
           <RText
@@ -136,16 +136,14 @@ export default function ConfirmContact({ navigation, route }: any) {
               color: 'white',
               fontSize: 16,
               fontWeight: 'bold',
-            }}
-          >
+            }}>
             Xác thực OTP
           </RText>
         </View>
       </SafeAreaView>
       <View
-        style={{ alignItems: 'center', justifyContent: 'center', padding: 24 }}
-      >
-        <RText style={{ textAlign: 'center', color: 'white' }}>
+        style={{alignItems: 'center', justifyContent: 'center', padding: 24}}>
+        <RText style={{textAlign: 'center', color: 'white'}}>
           Mã xác thực OTP của bạn sẽ được gửi vào số điện thoại{' '}
           {userInfo?.phone}, vui lòng nhập mã để hoàn thành ký hợp đồng.
         </RText>
@@ -163,7 +161,7 @@ export default function ConfirmContact({ navigation, route }: any) {
         }}
         keyboardType="numeric"
         textContentType="jobTitle"
-        renderCell={({ index, symbol, isFocused }) => (
+        renderCell={({index, symbol, isFocused}) => (
           <View
             // Make sure that you pass onLayout={getCellOnLayoutHandler(index)} prop to root component of "Cell"
             onLayout={getCellOnLayoutHandler(index)}
@@ -176,22 +174,20 @@ export default function ConfirmContact({ navigation, route }: any) {
               backgroundColor: '#EFEFEF',
               marginHorizontal: 4,
               borderRadius: actuatedNormalize(8),
-            }}
-          >
+            }}>
             <Text
               style={{
                 color: '#000',
                 fontSize: 24,
                 textAlign: 'center',
                 fontWeight: '700',
-              }}
-            >
+              }}>
               {symbol || (isFocused ? <Cursor /> : null)}
             </Text>
           </View>
         )}
       />
-      <View style={{ flexDirection: 'row', justifyContent: 'center' }}>
+      <View style={{flexDirection: 'row', justifyContent: 'center'}}>
         <TouchableOpacity
           onPress={() => onSubmit()}
           style={{
@@ -201,12 +197,11 @@ export default function ConfirmContact({ navigation, route }: any) {
             backgroundColor: 'white',
             paddingHorizontal: 46,
             borderRadius: 6,
-          }}
-        >
-          <Text style={{ color: '#333333' }}>Xác nhận</Text>
+          }}>
+          <Text style={{color: '#333333'}}>Xác nhận</Text>
         </TouchableOpacity>
       </View>
-      <Text style={{ textAlign: 'center', marginTop: 10, color: 'white' }}>
+      <Text style={{textAlign: 'center', marginTop: 10, color: 'white'}}>
         Gửi lại mã OTP sau ({moment.utc(expire_time * 1000).format('mm:ss')})
       </Text>
       {isLoading ? <Loading /> : <View />}
@@ -229,8 +224,7 @@ export default function ConfirmContact({ navigation, route }: any) {
                 fontWeight: 'bold',
                 fontSize: 16,
                 marginTop: 16,
-              }}
-            >
+              }}>
               Ký hợp đồng thành công !
             </RText>
           </View>