react-native-timacare 3.1.47 → 3.1.49

package/src/screens/home/index.tsx

@@ -154,7 +154,10 @@ export const Home = observer(function Home() {
                   }
                 }
               }
-              if (item?.typeLoan === 5 && item.step === 5) {
+              if (
+                (item?.typeLoan === 5 || item?.typeLoan === 6) &&
+                item.step === 5
+              ) {
                 setLoan(item);
                 setTimeout(() => {
                   setShowModal3(true);
@@ -172,52 +175,6 @@ export const Home = observer(function Home() {
       console.log(error);
       setIsLoading(false);
     }
-
-    // homeStore.getListLoanPending(
-    //   async (res) => {
-    //     setListLoan(res);
-    //     if (res) {
-    //       Promise.all(
-    //         res?.map(async (item) => {
-    //           homeStore.getCheckEKYC(
-    //             { loanBriefId: item.id },
-    //             (response) => {}
-    //           );
-    //           if (item?.productId !== 8) {
-    //             if (item?.messageErrorCIMB && item.messageErrorCIMB !== '') {
-    //               setLoanCimb(item);
-    //               setTimeout(() => {
-    //                 setShowModal(true);
-    //               }, 200);
-    //             }
-    //             if (
-    //               (item?.typeLoan === 4 || item?.typeLoan === 2) &&
-    //               item?.isCimbApproveFull !== null
-    //             ) {
-    //               const checkShow = await load(`SHOW_${item?.id}`);
-    //               if (!checkShow || checkShow !== true) {
-    //                 setLoanCimb(item);
-    //                 setTimeout(() => {
-    //                   setShowModal2(true);
-    //                 }, 200);
-    //               }
-    //             }
-    //           }
-    //           if (item?.typeLoan === 5 && item.step === 5) {
-    //             setLoan(item);
-    //             setTimeout(() => {
-    //               setShowModal3(true);
-    //             }, 300);
-    //           }
-    //         })
-    //       );
-    //     }
-    //     setIsLoading(false);
-    //   },
-    //   () => {
-    //     setIsLoading(false);
-    //   }
-    // );
   };
 
   useEffect(() => {

package/src/screens/liveness-v2/index.tsx

@@ -32,6 +32,7 @@ import { color } from '../../theme';
 import { createThumbnail } from 'react-native-create-thumbnail';
 import analytics from '@react-native-firebase/analytics';
 import { AppEventsLogger } from 'react-native-fbsdk-next';
+import appStore from '../../AppStore';
 
 const { width: windowWidth } = Dimensions.get('window');
 
@@ -391,8 +392,20 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
   };
 
   useEffect(async () => {
-    await analytics().logEvent('ekyc_started', {});
-    await AppEventsLogger().logEvent('ekyc_started', {});
+    await analytics().logEvent('ekyc_started', {
+      event: 'ekyc_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: loan?.id,
+      utmSource: loan?.utmSource,
+    });
+    await AppEventsLogger().logEvent('ekyc_started', {
+      event: 'ekyc_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: loan?.id,
+      utmSource: loan?.utmSource,
+    });
   }, []);
 
   return (
@@ -573,8 +586,20 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
                 justifyContent: 'center',
               }}
               onPress={async () => {
-                await analytics().logEvent('ekyc_completed', {});
-                await AppEventsLogger().logEvent('ekyc_completed', {});
+                await analytics().logEvent('ekyc_completed', {
+                  event: 'ekyc_completed',
+                  createdAt: new Date(),
+                  deviceId: appStore.deviceId,
+                  loanId: loan?.id,
+                  utmSource: loan?.utmSource,
+                });
+                await AppEventsLogger().logEvent('ekyc_completed', {
+                  event: 'ekyc_completed',
+                  createdAt: new Date(),
+                  deviceId: appStore.deviceId,
+                  loanId: loan?.id,
+                  utmSource: loan?.utmSource,
+                });
                 livenessStore.ekycSuccess = false;
                 if (loan?.typeLoan === 5) {
                   navigation.dispatch(

package/src/screens/toan-trinh-so/ReviewInformation.tsx

@@ -30,6 +30,7 @@ import Loading from '../../components/Loading';
 import moment from 'moment';
 import analytics from '@react-native-firebase/analytics';
 import { AppEventsLogger } from 'react-native-fbsdk-next';
+import appStore from '../../AppStore';
 
 export default function ReviewInformation(props) {
   const navigation = useNavigation();
@@ -248,8 +249,20 @@ export default function ReviewInformation(props) {
     getData();
     ttsStore.getListBank();
     ttsStore.getRelationship();
-    await analytics().logEvent('thongtinvay_started', {});
-    await AppEventsLogger().logEvent('thongtinvay_started', {});
+    await analytics().logEvent('thongtinvay_started', {
+      event: 'thongtinvay_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props.route?.params?.loan?.id,
+      utmSource: props.route?.params?.loan?.utmSource,
+    });
+    await AppEventsLogger().logEvent('thongtinvay_started', {
+      event: 'thongtinvay_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props.route?.params?.loan?.id,
+      utmSource: props.route?.params?.loan?.utmSource,
+    });
   }, []);
 
   return (

package/src/screens/toan-trinh-so/ReviewInformationOther.tsx

@@ -32,6 +32,7 @@ import Loading from '../../components/Loading';
 import * as yup from 'yup';
 import analytics from '@react-native-firebase/analytics';
 import { AppEventsLogger } from 'react-native-fbsdk-next';
+import appStore from '../../AppStore';
 
 export default function ReviewInformationOther(props) {
   const navigation = useNavigation();
@@ -191,10 +192,34 @@ export default function ReviewInformationOther(props) {
               setIsLoading(false);
               if (response.kind === 'ok') {
                 if (response.data?.meta?.errorCode === 200) {
-                  await analytics().logEvent('lead', {});
-                  await AppEventsLogger().logEvent('lead', {});
-                  await analytics().logEvent('thongtinvay_completed', {});
-                  await AppEventsLogger().logEvent('thongtinvay_completed', {});
+                  await analytics().logEvent('lead', {
+                    event: 'lead',
+                    createdAt: new Date(),
+                    deviceId: appStore.deviceId,
+                    loanId: props.route?.params?.loan?.id,
+                    utmSource: props.route?.params?.loan?.utmSource,
+                  });
+                  await AppEventsLogger().logEvent('lead', {
+                    event: 'lead',
+                    createdAt: new Date(),
+                    deviceId: appStore.deviceId,
+                    loanId: props.route?.params?.loan?.id,
+                    utmSource: props.route?.params?.loan?.utmSource,
+                  });
+                  await analytics().logEvent('thongtinvay_completed', {
+                    event: 'thongtinvay_completed',
+                    createdAt: new Date(),
+                    deviceId: appStore.deviceId,
+                    loanId: props.route?.params?.loan?.id,
+                    utmSource: props.route?.params?.loan?.utmSource,
+                  });
+                  await AppEventsLogger().logEvent('thongtinvay_completed', {
+                    event: 'thongtinvay_completed',
+                    createdAt: new Date(),
+                    deviceId: appStore.deviceId,
+                    loanId: props.route?.params?.loan?.id,
+                    utmSource: props.route?.params?.loan?.utmSource,
+                  });
                   Alert.alert('Thông báo', 'Cập nhật thông tin thành công', [
                     {
                       text: 'Đồng ý',

package/src/screens/toan-trinh-so/TTSNationalIDFront.tsx

@@ -30,6 +30,7 @@ import { Api } from '../../services/api';
 import Loading from '../../components/Loading';
 import analytics from '@react-native-firebase/analytics';
 import { AppEventsLogger } from 'react-native-fbsdk-next';
+import appStore from '../../AppStore';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -51,8 +52,20 @@ export const TTSNationalIDFront = observer(function TTSNationalIDFront(props) {
     if (props?.route?.params?.uri) {
       setPhoto(props?.route?.params?.uri);
     }
-    await analytics().logEvent('cccd_started', {});
-    await AppEventsLogger().logEvent('cccd_started', {});
+    await analytics().logEvent('cccd_started', {
+      event: 'cccd_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props.route?.params?.loan?.id,
+      utmSource: props.route?.params?.loan?.utmSource,
+    });
+    await AppEventsLogger().logEvent('cccd_started', {
+      event: 'cccd_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props.route?.params?.loan?.id,
+      utmSource: props.route?.params?.loan?.utmSource,
+    });
   }, []);
 
   const takePhoto = () => {

package/src/screens/toan-trinh-so/TTSOTP.tsx

@@ -25,6 +25,7 @@ import { ScreenNames } from '../../navigation';
 import { CommonActions, useNavigation } from '@react-navigation/native';
 import analytics from '@react-native-firebase/analytics';
 import { AppEventsLogger } from 'react-native-fbsdk-next';
+import appStore from '../../AppStore';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -118,8 +119,20 @@ export default function TTSOTP({ route }: any) {
         Api.getInstance().verifySign({
           loanBriefId: loan?.id,
         });
-        await analytics().logEvent('kyhopdong_completed', {});
-        await AppEventsLogger().logEvent('kyhopdong_completed', {});
+        await analytics().logEvent('kyhopdong_completed', {
+          event: 'kyhopdong_completed',
+          createdAt: new Date(),
+          deviceId: appStore.deviceId,
+          loanId: loan?.id,
+          utmSource: loan?.utmSource,
+        });
+        await AppEventsLogger().logEvent('kyhopdong_completed', {
+          event: 'kyhopdong_completed',
+          createdAt: new Date(),
+          deviceId: appStore.deviceId,
+          loanId: loan?.id,
+          utmSource: loan?.utmSource,
+        });
         Alert.alert('Thông báo', 'Ký hợp đồng thành công', [
           {
             text: 'Đồng ý',

package/src/screens/toan-trinh-so/TTSSelfie.tsx

@@ -29,6 +29,7 @@ import { ScreenNames } from '../../navigation';
 import DeviceInfo from 'react-native-device-info';
 import analytics from '@react-native-firebase/analytics';
 import { AppEventsLogger } from 'react-native-fbsdk-next';
+import appStore from '../../AppStore';
 
 export default function TTSSelfie(props: any) {
   const isFocused = useIsFocused();
@@ -126,8 +127,20 @@ export default function TTSSelfie(props: any) {
 
   useEffect(async () => {
     requestPermissions();
-    await analytics().logEvent('cccd_completed', {});
-    await AppEventsLogger().logEvent('cccd_completed', {});
+    await analytics().logEvent('cccd_completed', {
+      event: 'cccd_completed',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props?.route?.params?.loan?.id,
+      utmSource: props?.route?.params?.loan?.utmSource,
+    });
+    await AppEventsLogger().logEvent('cccd_completed', {
+      event: 'cccd_completed',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props?.route?.params?.loan?.id,
+      utmSource: props?.route?.params?.loan?.utmSource,
+    });
   }, []);
 
   useEffect(() => {

package/src/screens/toan-trinh-so/TTSSignLoan.tsx

@@ -53,9 +53,21 @@ export default function TTSSignLoan(props) {
   useEffect(async () => {
     if (loan) {
       getContract();
+      await analytics().logEvent('kyhopdong_started', {
+        event: 'kyhopdong_started',
+        createdAt: new Date(),
+        deviceId: appStore.deviceId,
+        loanId: props?.route?.params?.loan?.id,
+        utmSource: props?.route?.params?.loan?.utmSource,
+      });
+      await AppEventsLogger().logEvent('kyhopdong_started', {
+        event: 'kyhopdong_started',
+        createdAt: new Date(),
+        deviceId: appStore.deviceId,
+        loanId: props?.route?.params?.loan?.id,
+        utmSource: props?.route?.params?.loan?.utmSource,
+      });
     }
-    await analytics().logEvent('kyhopdong_started', {});
-    await AppEventsLogger().logEvent('kyhopdong_started', {});
   }, []);
 
   const signLoan = () => {

package/src/screens/toan-trinh-so/TopupLoanInfo.tsx

@@ -29,6 +29,8 @@ import MButton from '../../components/MButton';
 import LinearGradient from 'react-native-linear-gradient';
 import moment from 'moment';
 import * as yup from 'yup';
+import analytics from '@react-native-firebase/analytics';
+import { AppEventsLogger } from 'react-native-fbsdk-next';
 
 export default function TopupLoanInfo(props) {
   const navigation = useNavigation();
@@ -193,9 +195,23 @@ export default function TopupLoanInfo(props) {
     []
   );
 
-  useEffect(() => {
+  useEffect(async () => {
     getData();
     ttsStore.getFirstPayment(props.route?.params?.loan?.id);
+    await analytics().logEvent('thongtinvay_started', {
+      event: 'thongtinvay_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props.route?.params?.loan?.id,
+      utmSource: props.route?.params?.loan?.utmSource,
+    });
+    await AppEventsLogger().logEvent('thongtinvay_started', {
+      event: 'thongtinvay_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props.route?.params?.loan?.id,
+      utmSource: props.route?.params?.loan?.utmSource,
+    });
   }, []);
 
   const onSubmit = async (values) => {
@@ -223,7 +239,21 @@ export default function TopupLoanInfo(props) {
           Alert.alert('Thông báo', 'Cập nhật thông tin thành công', [
             {
               text: 'Đồng ý',
-              onPress: () => {
+              onPress: async () => {
+                await analytics().logEvent('thongtinvay_completed', {
+                  event: 'thongtinvay_completed',
+                  createdAt: new Date(),
+                  deviceId: appStore.deviceId,
+                  loanId: props.route?.params?.loan?.id,
+                  utmSource: props.route?.params?.loan?.utmSource,
+                });
+                await AppEventsLogger().logEvent('thongtinvay_completed', {
+                  event: 'thongtinvay_completed',
+                  createdAt: new Date(),
+                  deviceId: appStore.deviceId,
+                  loanId: props.route?.params?.loan?.id,
+                  utmSource: props.route?.params?.loan?.utmSource,
+                });
                 navigation.dispatch(
                   CommonActions.reset({
                     index: 1,

package/src/screens/toan-trinh-so/VehicleRegistration.tsx

@@ -26,6 +26,7 @@ import MButton from '../../components/MButton';
 import LinearGradient from 'react-native-linear-gradient';
 import analytics from '@react-native-firebase/analytics';
 import { AppEventsLogger } from 'react-native-fbsdk-next';
+import appStore from '../../AppStore';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -43,10 +44,34 @@ export default function VehicleRegistration(props) {
     if (props?.route?.params?.uri) {
       setPhoto(props?.route?.params?.uri);
     }
-    await analytics().logEvent('dangky_completed', {});
-    await AppEventsLogger().logEvent('dangky_completed', {});
-    await analytics().logEvent('dangkiem_started', {});
-    await AppEventsLogger().logEvent('dangkiem_started', {});
+    await analytics().logEvent('dangky_completed', {
+      event: 'dangky_completed',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props?.route?.params?.loan?.id,
+      utmSource: props?.route?.params?.loan?.utmSource,
+    });
+    await AppEventsLogger().logEvent('dangky_completed', {
+      event: 'dangky_completed',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props?.route?.params?.loan?.id,
+      utmSource: props?.route?.params?.loan?.utmSource,
+    });
+    await analytics().logEvent('dangkiem_started', {
+      event: 'dangkiem_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props?.route?.params?.loan?.id,
+      utmSource: props?.route?.params?.loan?.utmSource,
+    });
+    await AppEventsLogger().logEvent('dangkiem_started', {
+      event: 'dangkiem_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props?.route?.params?.loan?.id,
+      utmSource: props?.route?.params?.loan?.utmSource,
+    });
   }, []);
 
   const takePhoto = () => {

package/src/screens/toan-trinh-so/VehicleRegistrationFront.tsx

@@ -27,6 +27,7 @@ import { Api } from '../../services/api';
 import Loading from '../../components/Loading';
 import analytics from '@react-native-firebase/analytics';
 import { AppEventsLogger } from 'react-native-fbsdk-next';
+import appStore from '../../AppStore';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -44,8 +45,20 @@ export default function VehicleRegistrationFront(props: any) {
     if (props?.route?.params?.uri) {
       setPhoto(props?.route?.params?.uri);
     }
-    await analytics().logEvent('dangky_started', {});
-    await AppEventsLogger().logEvent('dangky_started', {});
+    await analytics().logEvent('dangky_started', {
+      event: 'dangky_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props?.route?.params?.loan?.id,
+      utmSource: props?.route?.params?.loan?.utmSource,
+    });
+    await AppEventsLogger().logEvent('dangky_started', {
+      event: 'dangky_started',
+      createdAt: new Date(),
+      deviceId: appStore.deviceId,
+      loanId: props?.route?.params?.loan?.id,
+      utmSource: props?.route?.params?.loan?.utmSource,
+    });
   }, []);
 
   const takePhoto = () => {