react-native-timacare 3.3.22 → 3.3.24

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

@@ -32,6 +32,7 @@ import { color } from '../../theme';
 import { createThumbnail } from 'react-native-create-thumbnail';
 import appStore from '../../AppStore';
 import { logEvent, logEventFb } from '../../utils';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 const { width: windowWidth } = Dimensions.get('window');
 
@@ -44,7 +45,7 @@ const PREVIEW_RECT = {
 };
 export const LivenessV2 = observer(function LivenessV2(props: any) {
   const loan = props.route.params?.loan;
-
+  const insets = useSafeAreaInsets();
   const navigation = useNavigation();
   const cameraRef = useRef<any>(null);
   const interval = useRef<any>(null);
@@ -267,7 +268,11 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
   const uploadLiveness = async (template: any) => {
     setIsLoading(true);
     try {
-      if (loan?.typeLoan === 5 || loan?.typeLoan === 6) {
+      if (
+        loan?.typeLoan === 5 ||
+        loan?.typeLoan === 6 ||
+        loan?.typeLoan === 4
+      ) {
         await livenessStore.verifyLiveness2(
           loan?.id,
           template,
@@ -413,7 +418,7 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
         style={{
           position: 'absolute',
           left: 16,
-          top: DeviceInfo.hasNotch() ? 70 : 16,
+          top: insets.top + 16,
           width: 40,
           height: 40,
           zIndex: 1000,
@@ -421,7 +426,7 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
       >
         <IconBackWhite />
       </TouchableOpacity>
-      <View style={styles.topOverlay}>
+      <View style={[{ top: insets.top + 16 }, styles.topOverlay]}>
         <MText
           style={{
             color: 'white',
@@ -513,10 +518,10 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
             livenessStore.listAction.length === 3
               ? 0
               : livenessStore.listAction.length === 2
-              ? 100 / 3
-              : livenessStore.listAction.length === 1
-              ? (2 / 3) * 100
-              : 100
+                ? 100 / 3
+                : livenessStore.listAction.length === 1
+                  ? (2 / 3) * 100
+                  : 100
           }
           radius={PREVIEW_SIZE / 2}
           inActiveStrokeOpacity={0.5}
@@ -657,7 +662,7 @@ const styles = StyleSheet.create({
   },
   topOverlay: {
     position: 'absolute',
-    top: DeviceInfo.hasNotch() ? 70 : 16,
+
     right: 0,
     left: 0,
     justifyContent: 'center',

package/src/screens/motobike/InfoLoanMotobike.tsx

@@ -124,7 +124,7 @@ export default function InfoLoanMotobike(props: any) {
         Alert.alert(
           'Thông báo',
           response?.data?.meta?.errorMessage ||
-            'Có lỗi xảy ra, vui lòng thử lại sau'
+          'Có lỗi xảy ra, vui lòng thử lại sau'
         );
       }
     } catch (error) {
@@ -279,7 +279,6 @@ export default function InfoLoanMotobike(props: any) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           fontFamily: 'BeVietnamPro-Medium',
                         },
@@ -304,7 +303,6 @@ export default function InfoLoanMotobike(props: any) {
                           <MText
                             style={{
                               color: '#333333',
-                              fontSize: 16,
                               fontWeight: '500',
                               fontFamily: 'BeVietnamPro-Medium',
                             }}
@@ -333,16 +331,16 @@ export default function InfoLoanMotobike(props: any) {
                           <MText
                             style={{
                               color: '#333333',
-                              fontSize: 16,
                               fontWeight: '500',
+                              fontFamily: 'BeVietnamPro-Medium',
                               flex: 1,
                             }}
                           >
                             {values.gender === 0
                               ? 'Nam'
                               : values.gender === 1
-                              ? 'Nữ'
-                              : ''}
+                                ? 'Nữ'
+                                : ''}
                           </MText>
                           <DropDown2 />
                         </TouchableOpacity>
@@ -361,8 +359,8 @@ export default function InfoLoanMotobike(props: any) {
                             $textInput,
                             {
                               color: '#333333',
-                              fontSize: 16,
                               fontWeight: '500',
+                              fontFamily: 'BeVietnamPro-Medium',
                             },
                           ]}
                           value={values.nationalCard}
@@ -388,8 +386,8 @@ export default function InfoLoanMotobike(props: any) {
                                 values.dateNationalId !== ''
                                   ? '#333333'
                                   : '#BDBDBD',
-                              fontSize: 16,
                               fontWeight: '500',
+                              fontFamily: 'BeVietnamPro-Medium',
                               flex: 1,
                             }}
                           >
@@ -433,7 +431,6 @@ export default function InfoLoanMotobike(props: any) {
                             numberOfLines={1}
                             style={{
                               color: '#333333',
-                              fontSize: 16,
                               fontWeight: '500',
                               flex: 1,
                               fontFamily: 'BeVietnamPro-Medium',
@@ -469,8 +466,8 @@ export default function InfoLoanMotobike(props: any) {
                             numberOfLines={1}
                             style={{
                               color: '#333333',
-                              fontSize: 16,
                               fontWeight: '500',
+                              fontFamily: 'BeVietnamPro-Medium',
                               flex: 1,
                             }}
                           >
@@ -501,7 +498,6 @@ export default function InfoLoanMotobike(props: any) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -522,8 +518,8 @@ export default function InfoLoanMotobike(props: any) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.address}

package/src/screens/motobike/ReviewLoanMotobike.tsx

@@ -183,8 +183,8 @@ export default function ReviewLoanMotobike(props) {
                         $textInput,
                         {
                           color: '#EF592E',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={formatMoney(values.loanAmount)}
@@ -219,7 +219,6 @@ export default function ReviewLoanMotobike(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -256,7 +255,6 @@ export default function ReviewLoanMotobike(props) {
                     numberOfLines={1}
                     style={{
                       color: '#333333',
-                      fontSize: 16,
                       fontWeight: '500',
                       flex: 1,
                       fontFamily: 'BeVietnamPro-Medium',

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

@@ -412,7 +412,6 @@ export default function ReviewInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           fontFamily: 'BeVietnamPro-Medium',
                         },
@@ -436,7 +435,6 @@ export default function ReviewInformation(props) {
                           <MText
                             style={{
                               color: '#333333',
-                              fontSize: 16,
                               fontWeight: '500',
                               fontFamily: 'BeVietnamPro-Medium',
                             }}
@@ -473,8 +471,8 @@ export default function ReviewInformation(props) {
                             {values.gender === 0
                               ? 'Nam'
                               : values.gender === 1
-                              ? 'Nữ'
-                              : ''}
+                                ? 'Nữ'
+                                : ''}
                           </MText>
                           <DropDown2 />
                         </TouchableOpacity>
@@ -493,8 +491,8 @@ export default function ReviewInformation(props) {
                             $textInput,
                             {
                               color: '#333333',
-                              fontSize: 16,
                               fontWeight: '500',
+                              fontFamily: 'BeVietnamPro-Medium',
                             },
                           ]}
                           value={values.nationalCard}
@@ -520,9 +518,9 @@ export default function ReviewInformation(props) {
                                 values.dateNationalId !== ''
                                   ? '#333333'
                                   : '#BDBDBD',
-                              fontSize: 16,
                               fontWeight: '500',
                               flex: 1,
+                              fontFamily: 'BeVietnamPro-Medium',
                             }}
                           >
                             {values.dateNationalId !== ''
@@ -543,8 +541,8 @@ export default function ReviewInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.phone}
@@ -591,7 +589,6 @@ export default function ReviewInformation(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -613,8 +610,8 @@ export default function ReviewInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.bankAccountName}
@@ -633,8 +630,8 @@ export default function ReviewInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.bankAccountNumber}
@@ -675,7 +672,6 @@ export default function ReviewInformation(props) {
                             numberOfLines={1}
                             style={{
                               color: '#333333',
-                              fontSize: 16,
                               fontWeight: '500',
                               flex: 1,
                               fontFamily: 'BeVietnamPro-Medium',
@@ -716,7 +712,6 @@ export default function ReviewInformation(props) {
                             numberOfLines={1}
                             style={{
                               color: '#333333',
-                              fontSize: 16,
                               fontWeight: '500',
                               flex: 1,
                               fontFamily: 'BeVietnamPro-Medium',
@@ -751,7 +746,6 @@ export default function ReviewInformation(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -773,8 +767,8 @@ export default function ReviewInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.houseHoldAddress}
@@ -945,7 +939,6 @@ export default function ReviewInformation(props) {
                             numberOfLines={1}
                             style={{
                               color: '#333333',
-                              fontSize: 16,
                               fontWeight: '500',
                               flex: 1,
                               fontFamily: 'BeVietnamPro-Medium',
@@ -1013,7 +1006,6 @@ export default function ReviewInformation(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -1034,7 +1026,6 @@ export default function ReviewInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                         },
                       ]}

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

@@ -342,7 +342,6 @@ export default function ReviewInformationOther(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -365,8 +364,8 @@ export default function ReviewInformationOther(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={formatMoney(values.totalIncome)}
@@ -387,8 +386,8 @@ export default function ReviewInformationOther(props) {
                     $textInput,
                     {
                       color: '#333333',
-                      fontSize: 16,
                       fontWeight: '500',
+                      fontFamily: 'BeVietnamPro-Medium',
                     },
                   ]}
                   value={values.companyName}
@@ -407,8 +406,8 @@ export default function ReviewInformationOther(props) {
                     $textInput,
                     {
                       color: '#333333',
-                      fontSize: 16,
                       fontWeight: '500',
+                      fontFamily: 'BeVietnamPro-Medium',
                     },
                   ]}
                   value={values.description}
@@ -452,7 +451,6 @@ export default function ReviewInformationOther(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -488,7 +486,6 @@ export default function ReviewInformationOther(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -521,7 +518,6 @@ export default function ReviewInformationOther(props) {
                     numberOfLines={1}
                     style={{
                       color: '#333333',
-                      fontSize: 16,
                       fontWeight: '500',
                       flex: 1,
                       fontFamily: 'BeVietnamPro-Medium',
@@ -584,7 +580,6 @@ export default function ReviewInformationOther(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -607,8 +602,8 @@ export default function ReviewInformationOther(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.phone1}
@@ -626,8 +621,8 @@ export default function ReviewInformationOther(props) {
                     $textInput,
                     {
                       color: '#333333',
-                      fontSize: 16,
                       fontWeight: '500',
+                      fontFamily: 'BeVietnamPro-Medium',
                     },
                   ]}
                   value={values.fullName1}
@@ -675,7 +670,6 @@ export default function ReviewInformationOther(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -698,8 +692,8 @@ export default function ReviewInformationOther(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.phone2}
@@ -717,8 +711,8 @@ export default function ReviewInformationOther(props) {
                     $textInput,
                     {
                       color: '#333333',
-                      fontSize: 16,
                       fontWeight: '500',
+                      fontFamily: 'BeVietnamPro-Medium',
                     },
                   ]}
                   value={values.fullName2}

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

@@ -200,7 +200,7 @@ export default function ReviewLoan(props: any) {
           Alert.alert('Thông báo', response.data?.meta?.errorMessage);
         }
       } else {
-        //   Alert.alert('Thông báo', 'Có lỗi xảy ra trong quá trình lấy dữ liệu');
+        Alert.alert('Thông báo', 'Có lỗi xảy ra trong quá trình lấy dữ liệu');
       }
     } catch (error) {
       setIsLoading(false);
@@ -296,8 +296,8 @@ export default function ReviewLoan(props: any) {
                         $textInput,
                         {
                           color: '#EF592E',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={formatMoney(values.loanAmount)}
@@ -333,7 +333,7 @@ export default function ReviewLoan(props: any) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
+
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -377,7 +377,7 @@ export default function ReviewLoan(props: any) {
                     numberOfLines={1}
                     style={{
                       color: '#333333',
-                      fontSize: 16,
+
                       fontWeight: '500',
                       flex: 1,
                       fontFamily: 'BeVietnamPro-Medium',
@@ -410,7 +410,7 @@ export default function ReviewLoan(props: any) {
                     numberOfLines={1}
                     style={{
                       color: '#333333',
-                      fontSize: 16,
+
                       fontWeight: '500',
                       flex: 1,
                       fontFamily: 'BeVietnamPro-Medium',

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

@@ -240,7 +240,6 @@ export default function TopupLoanInfo(props) {
                       $textInput,
                       {
                         color: '#333333',
-                        fontSize: 16,
                         fontWeight: '500',
                         fontFamily: 'BeVietnamPro-Medium',
                         backgroundColor: '#EAEAEA',
@@ -261,7 +260,6 @@ export default function TopupLoanInfo(props) {
                         <MText
                           style={{
                             color: '#333333',
-                            fontSize: 16,
                             fontWeight: '500',
                             fontFamily: 'BeVietnamPro-Medium',
                           }}
@@ -279,16 +277,16 @@ export default function TopupLoanInfo(props) {
                         <MText
                           style={{
                             color: '#333333',
-                            fontSize: 16,
                             fontWeight: '500',
+                            fontFamily: 'BeVietnamPro-Medium',
                             flex: 1,
                           }}
                         >
                           {values.gender === 0
                             ? 'Nam'
                             : values.gender === 1
-                            ? 'Nữ'
-                            : ''}
+                              ? 'Nữ'
+                              : ''}
                         </MText>
                         <DropDown2 />
                       </TouchableOpacity>
@@ -305,8 +303,8 @@ export default function TopupLoanInfo(props) {
                           $textInput,
                           {
                             color: '#333333',
-                            fontSize: 16,
                             fontWeight: '500',
+                            fontFamily: 'BeVietnamPro-Medium',
                             backgroundColor: '#EAEAEA',
                           },
                         ]}
@@ -377,7 +375,6 @@ export default function TopupLoanInfo(props) {
                       numberOfLines={1}
                       style={{
                         color: '#333333',
-                        fontSize: 16,
                         fontWeight: '500',
                         flex: 1,
                         fontFamily: 'BeVietnamPro-Medium',
@@ -399,8 +396,8 @@ export default function TopupLoanInfo(props) {
                       $textInput,
                       {
                         color: '#333333',
-                        fontSize: 16,
                         fontWeight: '500',
+                        fontFamily: 'BeVietnamPro-Medium',
                       },
                     ]}
                     value={values.bankAccountName}

package/src/screens/v3/AssetInformation.tsx

@@ -96,7 +96,7 @@ export const AssetInformation = observer(function AssetInformation(props) {
         Alert.alert(
           'Thông báo',
           response.data?.meta?.errorMessage ||
-            'Có lỗi xảy ra. Vui lòng thử lại sau!'
+          'Có lỗi xảy ra. Vui lòng thử lại sau!'
         );
       }
     } catch (error) {
@@ -262,7 +262,6 @@ export const AssetInformation = observer(function AssetInformation(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -296,7 +295,6 @@ export const AssetInformation = observer(function AssetInformation(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -328,7 +326,6 @@ export const AssetInformation = observer(function AssetInformation(props) {
                     numberOfLines={1}
                     style={{
                       color: '#333333',
-                      fontSize: 16,
                       fontWeight: '500',
                       flex: 1,
                       fontFamily: 'BeVietnamPro-Medium',
@@ -352,8 +349,8 @@ export const AssetInformation = observer(function AssetInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.plateNumber}
@@ -373,8 +370,8 @@ export const AssetInformation = observer(function AssetInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.motobikeCertificateNumber}
@@ -396,8 +393,8 @@ export const AssetInformation = observer(function AssetInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       placeholder="DD/MM/YYYY"
@@ -419,8 +416,8 @@ export const AssetInformation = observer(function AssetInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       placeholder="DD/MM/YYYY"
@@ -448,8 +445,8 @@ export const AssetInformation = observer(function AssetInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.chassis}
@@ -469,8 +466,8 @@ export const AssetInformation = observer(function AssetInformation(props) {
                         $textInput,
                         {
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
+                          fontFamily: 'BeVietnamPro-Medium',
                         },
                       ]}
                       value={values.engine}
@@ -488,8 +485,8 @@ export const AssetInformation = observer(function AssetInformation(props) {
                     $textInput,
                     {
                       color: '#333333',
-                      fontSize: 16,
                       fontWeight: '500',
+                      fontFamily: 'BeVietnamPro-Medium',
                     },
                   ]}
                   placeholder="Nhập họ tên chủ xe"
@@ -519,7 +516,6 @@ export const AssetInformation = observer(function AssetInformation(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',
@@ -555,7 +551,6 @@ export const AssetInformation = observer(function AssetInformation(props) {
                         numberOfLines={1}
                         style={{
                           color: '#333333',
-                          fontSize: 16,
                           fontWeight: '500',
                           flex: 1,
                           fontFamily: 'BeVietnamPro-Medium',