react-native-timacare 3.3.11 → 3.3.13

package/src/screens/nationalID/index.tsx

@@ -57,6 +57,7 @@ const logoView: ImageStyle = {
 const { width: screenWidth, height: screenHeight } = Dimensions.get('window');
 const frameWidth = screenWidth * 0.85;
 const frameHeight = frameWidth * 0.63; // tỷ lệ giống CCCD
+const frameAspectRatio = frameWidth / frameHeight;
 
 export const NationalID = observer(function NationalID(props: any) {
   const navigation = useNavigation();
@@ -99,7 +100,7 @@ export const NationalID = observer(function NationalID(props: any) {
       (data) => {
         if (data === 1) {
           navigation.push(ScreenNames.CCCDCameraScreen, {
-            front: false,
+            front: true,
             callback: (photo) => {
               setPhoto(photo);
             },
@@ -163,7 +164,7 @@ export const NationalID = observer(function NationalID(props: any) {
               <View
                 style={{
                   width: '100%',
-                  height: frameHeight,
+                  aspectRatio: frameAspectRatio,
                   borderWidth: 8,
                   borderRadius: 6,
                   borderColor: '#FFFFFF',
@@ -179,6 +180,7 @@ export const NationalID = observer(function NationalID(props: any) {
                   style={{
                     width: '100%',
                     height: '100%',
+                    resizeMode: 'cover',
                   }}
                 />
               </View>

package/src/screens/nationalIDBack/index.tsx

@@ -42,6 +42,7 @@ const logoView: ImageStyle = {
 const { width: screenWidth, height: screenHeight } = Dimensions.get('window');
 const frameWidth = screenWidth * 0.85;
 const frameHeight = frameWidth * 0.63; // tỷ lệ giống CCCD
+const frameAspectRatio = frameWidth / frameHeight;
 
 export const NationalIDBack = observer(function NationalIDBack(props: any) {
   const navigation = useNavigation();
@@ -143,7 +144,7 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
               <View
                 style={{
                   width: '100%',
-                  height: frameHeight,
+                  aspectRatio: frameAspectRatio,
                   borderWidth: 8,
                   borderRadius: 6,
                   borderColor: '#FFFFFF',
@@ -159,6 +160,7 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
                   style={{
                     width: '100%',
                     height: '100%',
+                    resizeMode: 'cover',
                   }}
                 />
               </View>

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

@@ -50,10 +50,12 @@ import DeviceInfo from 'react-native-device-info';
 import { IconUpload } from '../../assets/svgs';
 import ImagePicker from 'react-native-image-crop-picker';
 import { launchImageLibrary } from 'react-native-image-picker';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 const { NFCReader } = NativeModules;
 
 export const OCR = observer(function OCR(props: any) {
+  const insets = useSafeAreaInsets();
   const isFocused = useIsFocused();
   const [isLoading, setIsLoading] = useState(false);
   const navigation = useNavigation();
@@ -379,7 +381,7 @@ export const OCR = observer(function OCR(props: any) {
         style={{
           alignItems: 'center',
           position: 'absolute',
-          top: DeviceInfo.hasNotch() ? 70 : 24,
+          top: insets.top + 16,
           left: 0,
           right: 0,
           zIndex: 100,

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

@@ -222,7 +222,7 @@ export default function ReviewLoan(props: any) {
 
   return (
     <View style={{ flex: 1 }}>
-      <MHeader title="Vay trực tuyến 24/7" />
+      <MHeader title="Vay Online 24/7" />
       <View style={commonStyles.fill}>
         <View style={$h} />
         <View style={$bg}>
@@ -653,380 +653,6 @@ export default function ReviewLoan(props: any) {
                     </MText>
                   </View>
                 </View>
-
-                {/* <MText style={[$title2, { marginTop: 10 }]}>
-                  2.2 Thông tin giải ngân
-                </MText>
-                <MText style={$label}>Ngân hàng</MText>
-                <TouchableOpacity
-                  style={$select}
-                  onPress={() => {
-                    navigation.push(ScreenNames.CommonSelect, {
-                      title: 'Chọn ngân hàng',
-                      data: ttsStore.listBank,
-                      callback: (value) => {
-                        setFieldValue('bankName', value.name);
-                        setFieldValue('bankId', value.id);
-                      },
-                    });
-                  }}
-                >
-                  <MText
-                    numberOfLines={1}
-                    style={{
-                      color: '#333333',
-                      fontSize: 16,
-                      fontWeight: '500',
-                      flex: 1,
-                      fontFamily: 'BeVietnamPro-Medium',
-                    }}
-                  >
-                    {values.bankName}
-                  </MText>
-                  <DropDown2 />
-                </TouchableOpacity>
-                {errors && errors.bankName && (
-                  <MText style={$error}>{errors.bankName}</MText>
-                )}
-                <MText style={[$label, { marginTop: 16 }]}>
-                  Tên số tài khoản
-                </MText>
-                <TextInput
-                  numberOfLines={1}
-                  style={[
-                    $textInput,
-                    {
-                      color: '#333333',
-                      fontSize: 16,
-                      fontWeight: '500',
-                    },
-                  ]}
-                  value={values.bankAccountName}
-                  onChangeText={handleChange('bankAccountName')}
-                />
-                {errors && errors.bankAccountName && (
-                  <MText style={$error}>{errors.bankAccountName}</MText>
-                )}
-                <MText style={[$label, { marginTop: 16 }]}>Số tài khoản</MText>
-                <TextInput
-                  keyboardType="number-pad"
-                  numberOfLines={1}
-                  style={[
-                    $textInput,
-                    {
-                      color: '#333333',
-                      fontSize: 16,
-                      fontWeight: '500',
-                    },
-                  ]}
-                  value={values.bankAccountNumber}
-                  onChangeText={handleChange('bankAccountNumber')}
-                />
-                {errors && errors.bankAccountNumber && (
-                  <MText style={$error}>{errors.bankAccountNumber}</MText>
-                )}
-
-                <MText style={[$title2, { marginTop: 10 }]}>
-                  2.3 Thông tin tài sản
-                </MText>
-                <View style={$row}>
-                  <View style={{ flex: 1 }}>
-                    <MText style={$label}>Hãng xe</MText>
-                    <TouchableOpacity
-                      style={$select}
-                      onPress={() => {
-                        navigation.push(ScreenNames.CommonSelect, {
-                          title: 'Hãng xe',
-                          data: ttsStore.listBrand,
-                          callback: (value) => {
-                            setFieldValue('brand', value.name);
-                            setFieldValue('yearCar', null);
-                            setFieldValue('vehicles', null);
-                            ttsStore.getListYearCar(value.name);
-                          },
-                        });
-                      }}
-                    >
-                      <MText
-                        numberOfLines={1}
-                        style={{
-                          color: '#333333',
-                          fontSize: 16,
-                          fontWeight: '500',
-                          flex: 1,
-                          fontFamily: 'BeVietnamPro-Medium',
-                        }}
-                      >
-                        {values?.brand}
-                      </MText>
-                      <DropDown2 />
-                    </TouchableOpacity>
-                    {errors && errors.brand && (
-                      <MText style={$error}>{errors.brand}</MText>
-                    )}
-                  </View>
-                  <View style={{ flex: 1 }}>
-                    <MText style={$label}>Năm sản xuất</MText>
-                    <TouchableOpacity
-                      style={$select}
-                      onPress={() => {
-                        navigation.push(ScreenNames.CommonSelect, {
-                          title: 'Năm sản xuất',
-                          data: ttsStore.listYear,
-                          callback: (value) => {
-                            setFieldValue('yearCar', value.name);
-                            setFieldValue('vehicles', null);
-                            ttsStore.getListCar(values.brand, value.name);
-                          },
-                        });
-                      }}
-                    >
-                      <MText
-                        numberOfLines={1}
-                        style={{
-                          color: '#333333',
-                          fontSize: 16,
-                          fontWeight: '500',
-                          flex: 1,
-                          fontFamily: 'BeVietnamPro-Medium',
-                        }}
-                      >
-                        {values?.yearCar}
-                      </MText>
-                      <DropDown2 />
-                    </TouchableOpacity>
-                    {errors && errors.yearCar && (
-                      <MText style={$error}>{errors.yearCar}</MText>
-                    )}
-                  </View>
-                </View>
-                <MText style={$label}>Tên xe/ Phiên bản xe</MText>
-                <TouchableOpacity
-                  style={$select}
-                  onPress={() => {
-                    navigation.push(ScreenNames.CommonSelect, {
-                      title: 'Tên xe/ Phiên bản xe',
-                      data: ttsStore.listCar,
-                      callback: (value) => {
-                        setFieldValue('vehicles', value.name);
-                      },
-                    });
-                  }}
-                >
-                  <MText
-                    numberOfLines={1}
-                    style={{
-                      color: '#333333',
-                      fontSize: 16,
-                      fontWeight: '500',
-                      flex: 1,
-                      fontFamily: 'BeVietnamPro-Medium',
-                    }}
-                  >
-                    {values.vehicles}
-                  </MText>
-                  <DropDown2 />
-                </TouchableOpacity>
-                {errors && errors.vehicles && (
-                  <MText style={$error}>{errors.vehicles}</MText>
-                )}
-
-                <MText style={[$label, { marginTop: 16 }]}>Số khung</MText>
-                <TextInput
-                  numberOfLines={1}
-                  style={[
-                    $textInput,
-                    {
-                      color: '#333333',
-                      fontSize: 16,
-                      fontWeight: '500',
-                    },
-                  ]}
-                  value={values.chassis}
-                  onChangeText={handleChange('chassis')}
-                />
-                {errors && errors.chassis && (
-                  <MText style={$error}>{errors.chassis}</MText>
-                )}
-
-                <View style={[$row, { marginTop: 16 }]}>
-                  <View style={{ flex: 1 }}>
-                    <MText style={$label}>Biển số xe</MText>
-                    <TextInput
-                      numberOfLines={1}
-                      style={[
-                        $textInput,
-                        {
-                          color: '#333333',
-                          fontSize: 16,
-                          fontWeight: '500',
-                        },
-                      ]}
-                      value={values.plateNumber}
-                      onChangeText={handleChange('plateNumber')}
-                    />
-                    {errors && errors.plateNumber && (
-                      <MText style={$error}>{errors.plateNumber}</MText>
-                    )}
-                  </View>
-                  <View style={{ flex: 1 }}>
-                    <MText style={$label}>Số máy</MText>
-                    <TextInput
-                      numberOfLines={1}
-                      style={[
-                        $textInput,
-                        {
-                          color: '#333333',
-                          fontSize: 16,
-                          fontWeight: '500',
-                        },
-                      ]}
-                      value={values.engine}
-                      onChangeText={handleChange('engine')}
-                    />
-                    {errors && errors.engine && (
-                      <MText style={$error}>{errors.engine}</MText>
-                    )}
-                  </View>
-                </View>
-
-                <MText style={$label}>Họ tên chủ xe</MText>
-                <TextInput
-                  numberOfLines={1}
-                  style={[
-                    $textInput,
-                    {
-                      color: '#333333',
-                      fontSize: 16,
-                      fontWeight: '500',
-                    },
-                  ]}
-                  value={values.ownerFullName}
-                  onChangeText={handleChange('ownerFullName')}
-                />
-                {errors && errors.ownerFullName && (
-                  <MText style={$error}>{errors.ownerFullName}</MText>
-                )}
-
-                <View style={[$row, { marginTop: 16 }]}>
-                  <View style={{ flex: 1 }}>
-                    <MText style={$label}>Số đăng ký xe</MText>
-                    <TextInput
-                      numberOfLines={1}
-                      style={[
-                        $textInput,
-                        {
-                          color: '#333333',
-                          fontSize: 16,
-                          fontWeight: '500',
-                        },
-                      ]}
-                      value={values.motobikeCertificateNumber}
-                      onChangeText={handleChange('motobikeCertificateNumber')}
-                    />
-                    {errors && errors.motobikeCertificateNumber && (
-                      <MText style={$error}>
-                        {errors.motobikeCertificateNumber}
-                      </MText>
-                    )}
-                  </View>
-                  <View style={{ flex: 1 }}>
-                    <MText style={$label}>Ngày đăng ký</MText>
-                    <TextInput
-                      numberOfLines={1}
-                      style={[
-                        $textInput,
-                        {
-                          color: '#333333',
-                          fontSize: 16,
-                          fontWeight: '500',
-                        },
-                      ]}
-                      placeholder="DD/MM/YYYY"
-                      placeholderTextColor="#BDBDBD"
-                      value={values.motobikeCertificateDate}
-                      onChangeText={handleChange('motobikeCertificateDate')}
-                    />
-                    {errors && errors.motobikeCertificateDate && (
-                      <MText style={$error}>
-                        {errors.motobikeCertificateDate}
-                      </MText>
-                    )}
-                  </View>
-                </View>
-                <View style={[$row]}>
-                  <View style={{ flex: 1 }}>
-                    <MText style={$label}>Loại tài sản</MText>
-                    <TouchableOpacity
-                      style={$select}
-                      onPress={() => {
-                        navigation.push(ScreenNames.MSelect, {
-                          title: 'Loại tài sản',
-                          data: EnumTypeAsset,
-                          callback: (value) => {
-                            setFieldValue('typeLoanBrief', value.id);
-                          },
-                        });
-                      }}
-                    >
-                      <MText
-                        numberOfLines={1}
-                        style={{
-                          color: '#333333',
-                          fontSize: 16,
-                          fontWeight: '500',
-                          flex: 1,
-                          fontFamily: 'BeVietnamPro-Medium',
-                        }}
-                      >
-                        {
-                          EnumTypeAsset.find(
-                            (x) => x.id === values.typeLoanBrief
-                          )?.name
-                        }
-                      </MText>
-                      <DropDown2 />
-                    </TouchableOpacity>
-                    {errors && errors.typeLoanBrief && (
-                      <MText style={$error}>{errors.typeLoanBrief}</MText>
-                    )}
-                  </View>
-                  <View style={{ flex: 1 }}>
-                    <MText style={$label}>Loại xe</MText>
-                    <TouchableOpacity
-                      style={$select}
-                      onPress={() => {
-                        navigation.push(ScreenNames.MSelect, {
-                          title: 'Loại xe',
-                          data: EnumTypeCar,
-                          callback: (value) => {
-                            setFieldValue('carTypeId', value.id);
-                          },
-                        });
-                      }}
-                    >
-                      <MText
-                        numberOfLines={1}
-                        style={{
-                          color: '#333333',
-                          fontSize: 16,
-                          fontWeight: '500',
-                          flex: 1,
-                          fontFamily: 'BeVietnamPro-Medium',
-                        }}
-                      >
-                        {
-                          EnumTypeCar.find((x) => x.id === values.carTypeId)
-                            ?.name
-                        }
-                      </MText>
-                      <DropDown2 />
-                    </TouchableOpacity>
-                    {errors && errors.carTypeId && (
-                      <MText style={$error}>{errors.carTypeId}</MText>
-                    )}
-                  </View>
-                </View> */}
               </ScrollView>
             )}
           </Formik>

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

@@ -47,18 +47,21 @@ export const TTSNationalIDFront = observer(function TTSNationalIDFront(props) {
   const [photo, setPhoto] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
 
-  useEffect(async () => {
+  useEffect(() => {
     if (props?.route?.params?.uri) {
       setPhoto(props?.route?.params?.uri);
     }
-    await logEvent('cccd_started', {
-      event: 'cccd_started',
-      createdAt: new Date(),
-      deviceId: appStore.deviceId,
-      loanId: String(props.route?.params?.loan?.id),
-      utmSource: props.route?.params?.loan?.utmSource,
-    });
-    logEventFb('cccd_started');
+    const trackEvent = async () => {
+      await logEvent('cccd_started', {
+        event: 'cccd_started',
+        createdAt: new Date(),
+        deviceId: appStore.deviceId,
+        loanId: String(props.route?.params?.loan?.id),
+        utmSource: props.route?.params?.loan?.utmSource,
+      });
+      logEventFb('cccd_started');
+    };
+    trackEvent();
   }, []);
 
   const takePhoto = () => {

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

@@ -124,16 +124,19 @@ export default function TTSSelfie(props: any) {
     });
   };
 
-  useEffect(async () => {
+  useEffect(() => {
     requestPermissions();
-    await logEvent('cccd_completed', {
-      event: 'cccd_completed',
-      createdAt: new Date(),
-      deviceId: appStore.deviceId,
-      loanId: String(props?.route?.params?.loan?.id),
-      utmSource: props?.route?.params?.loan?.utmSource,
-    });
-    logEventFb('cccd_completed');
+    const trackEvent = async () => {
+      await logEvent('cccd_completed', {
+        event: 'cccd_completed',
+        createdAt: new Date(),
+        deviceId: appStore.deviceId,
+        loanId: String(props?.route?.params?.loan?.id),
+        utmSource: props?.route?.params?.loan?.utmSource,
+      });
+      logEventFb('cccd_completed');
+    };
+    trackEvent();
   }, []);
 
   useEffect(() => {
@@ -176,7 +179,10 @@ export default function TTSSelfie(props: any) {
       setIsLoading(false);
       if (response.kind === 'ok') {
         if (response.data?.meta.errorCode === 200) {
-          if (props?.route?.params?.loan?.typeLoan === 6) {
+          if (
+            props?.route?.params?.loan?.typeLoan === 6 ||
+            props?.route?.params?.loan?.typeLoan === 4
+          ) {
             navigation.push(ScreenNames.TopupLoanInfo, {
               loan: props?.route?.params?.loan,
             });

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

@@ -65,23 +65,26 @@ export default function TTSSignLoan(props) {
     }
   };
 
-  useEffect(async () => {
+  useEffect(() => {
     if (loan) {
       getContract();
-      await logEvent('kyhopdong_started', {
-        event: 'kyhopdong_started',
-        createdAt: new Date(),
-        deviceId: appStore.deviceId,
-        loanId: String(props?.route?.params?.loan?.id),
-        utmSource: props?.route?.params?.loan?.utmSource,
-      });
-      logEventFb('kyhopdong_started', {
-        event: 'kyhopdong_started',
-        createdAt: new Date(),
-        deviceId: appStore.deviceId,
-        loanId: props?.route?.params?.loan?.id,
-        utmSource: props?.route?.params?.loan?.utmSource,
-      });
+      const trackEvent = async () => {
+        await logEvent('kyhopdong_started', {
+          event: 'kyhopdong_started',
+          createdAt: new Date(),
+          deviceId: appStore.deviceId,
+          loanId: String(props?.route?.params?.loan?.id),
+          utmSource: props?.route?.params?.loan?.utmSource,
+        });
+        logEventFb('kyhopdong_started', {
+          event: 'kyhopdong_started',
+          createdAt: new Date(),
+          deviceId: appStore.deviceId,
+          loanId: props?.route?.params?.loan?.id,
+          utmSource: props?.route?.params?.loan?.utmSource,
+        });
+      };
+      trackEvent();
     }
   }, []);
 

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

@@ -153,7 +153,7 @@ export default function TopupLoanInfo(props) {
 
   return (
     <View style={{ flex: 1 }}>
-      <MHeader title="Vay trực tuyến 24/7" />
+      <MHeader title="Vay Online 24/7" />
       <View style={commonStyles.fill}>
         <View style={$h} />
         <View style={$bg}>

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

@@ -50,6 +50,13 @@ const frameTop = ((screenWidth * 4) / 3 - frameHeight) / 2;
 
 export default function VehicleCamera(props: any) {
   const isFocused = useIsFocused();
+  const [cameraKey, setCameraKey] = useState(0);
+
+  useEffect(() => {
+    if (isFocused) {
+      setCameraKey((prev) => prev + 1);
+    }
+  }, [isFocused]);
   const [shouldRenderCamera, setShouldRenderCamera] = useState(false);
   const navigation = useNavigation();
   const [showModal, setShowModal] = useState(false);
@@ -191,7 +198,6 @@ export default function VehicleCamera(props: any) {
 
   useEffect(() => {
     let timeout: NodeJS.Timeout;
-
     if (isFocused) {
       // Delay mounting camera to give Android time to release the previous one
       timeout = setTimeout(() => {
@@ -257,6 +263,7 @@ export default function VehicleCamera(props: any) {
       {passPermission && shouldRenderCamera ? (
         <View style={{ flex: 1 }}>
           <RNCamera
+            key={cameraKey}
             ref={myCamera}
             defaultVideoQuality={RNCamera.Constants.VideoQuality['720p']}
             style={{

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

@@ -39,26 +39,29 @@ export default function VehicleRegistration(props) {
   const [photo, setPhoto] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
 
-  useEffect(async () => {
+  useEffect(() => {
     if (props?.route?.params?.uri) {
       setPhoto(props?.route?.params?.uri);
     }
-    await logEvent('dangky_completed', {
-      event: 'dangky_completed',
-      createdAt: new Date(),
-      deviceId: appStore.deviceId,
-      loanId: String(props?.route?.params?.loan?.id),
-      utmSource: props?.route?.params?.loan?.utmSource,
-    });
-    logEventFb('dangky_completed');
-    await logEvent('dangkiem_started', {
-      event: 'dangkiem_started',
-      createdAt: new Date(),
-      deviceId: appStore.deviceId,
-      loanId: String(props?.route?.params?.loan?.id),
-      utmSource: props?.route?.params?.loan?.utmSource,
-    });
-    logEventFb('dangkiem_started');
+    const trackStarted = async () => {
+      await logEvent('dangky_completed', {
+        event: 'dangky_completed',
+        createdAt: new Date(),
+        deviceId: appStore.deviceId,
+        loanId: String(props?.route?.params?.loan?.id),
+        utmSource: props?.route?.params?.loan?.utmSource,
+      });
+      logEventFb('dangky_completed');
+      await logEvent('dangkiem_started', {
+        event: 'dangkiem_started',
+        createdAt: new Date(),
+        deviceId: appStore.deviceId,
+        loanId: String(props?.route?.params?.loan?.id),
+        utmSource: props?.route?.params?.loan?.utmSource,
+      });
+      logEventFb('dangkiem_started');
+    };
+    trackStarted();
   }, []);
 
   const takePhoto = () => {