react-native-timacare 3.1.30-production → 3.1.32-production

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-timacare",
-  "version": "3.1.30-production",
+  "version": "3.1.32-production",
   "description": "SDK Tima Care",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -88,6 +88,7 @@
     "react-native-geolocation-service": "*",
     "react-native-gesture-handler": "*",
     "react-native-image-crop-picker": "*",
+    "react-native-image-picker": "*",
     "react-native-image-pan-zoom": "*",
     "react-native-image-slider-box": "*",
     "react-native-image-viewing": "*",

package/src/screens/home/index.tsx

@@ -644,32 +644,6 @@ export const Home = observer(function Home() {
                                   </View>
                                 </View>
                               )}
-                            {/* <View
-                              style={{
-                                flexDirection: 'row',
-                                alignItems: 'center',
-                              }}
-                            >
-                              <Contract />
-                              <View style={{ flex: 1, paddingLeft: 8 }}>
-                                <MText style={commonStyles.textNormalBold}>
-                                  Mã Đơn vay-{item?.id}
-                                </MText>
-                                <MText style={commonStyles.textNormal}>
-                                  Số tiền vay (VND):{' '}
-                                  {item?.loanAmount
-                                    ? formatMoney(item?.loanAmount)
-                                    : 'Chưa xác định'}
-                                </MText>
-                              </View>
-                            </View>
-                            <View
-                              style={{
-                                height: 1,
-                                backgroundColor: '#E0E0E0',
-                                marginVertical: 16,
-                              }}
-                            /> */}
 
                             <View
                               style={{
@@ -1057,7 +1031,11 @@ export const Home = observer(function Home() {
                                       key={index}
                                       style={{
                                         marginTop: 8,
-                                        borderBottomWidth: 1,
+                                        borderBottomWidth:
+                                          index + 1 ===
+                                          item?.listLoanAllAutoDE.length
+                                            ? 0
+                                            : 1,
                                         borderColor: '#E0E0E0',
                                         paddingBottom: 8,
                                       }}

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

@@ -14,7 +14,7 @@ import {
   Dimensions,
   StyleSheet,
   Alert,
-  PermissionsAndroid,
+  Platform,
 } from 'react-native';
 import { MText } from '../../components/MText';
 import { load, OCR_V1, save } from '../../utils/storage';
@@ -49,6 +49,7 @@ import Loading from '../../components/Loading';
 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';
 
 const { NFCReader } = NativeModules;
 
@@ -149,7 +150,6 @@ export const OCR = observer(function OCR(props: any) {
 
   useEffect(() => {
     let timeout: NodeJS.Timeout;
-
     if (isFocused) {
       // Delay mounting camera to give Android time to release the previous one
       timeout = setTimeout(() => {
@@ -319,78 +319,55 @@ export const OCR = observer(function OCR(props: any) {
     }
   };
 
-  const hasAndroidPermission = async () => {
-    const getCheckPermissionPromise = () => {
-      if (Number(Platform.Version) >= 33) {
-        return Promise.all([
-          PermissionsAndroid.check(
-            PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES
-          ),
-          PermissionsAndroid.check(
-            PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO
-          ),
-        ]).then(
-          ([hasReadMediaImagesPermission, hasReadMediaVideoPermission]) =>
-            hasReadMediaImagesPermission && hasReadMediaVideoPermission
-        );
-      } else {
-        return PermissionsAndroid.check(
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE
-        );
-      }
-    };
-    const hasPermission = await getCheckPermissionPromise();
-    if (hasPermission) {
-      return true;
-    }
-
-    const getRequestPermissionPromise = () => {
-      if (Number(Platform.Version) >= 33) {
-        return PermissionsAndroid.requestMultiple([
-          PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES,
-          PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO,
-        ]).then(
-          (statuses) =>
-            statuses[PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES] ===
-              PermissionsAndroid.RESULTS.GRANTED &&
-            statuses[PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO] ===
-              PermissionsAndroid.RESULTS.GRANTED
-        );
-      } else {
-        return PermissionsAndroid.request(
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE
-        ).then((status) => status === PermissionsAndroid.RESULTS.GRANTED);
-      }
-    };
-
-    return await getRequestPermissionPromise();
-  };
-
   const pickImageFromGallery = async () => {
-    await hasAndroidPermission();
-    ImagePicker.openPicker({}).then((image) => {
-      if (props?.route?.params?.front && !props.route?.params?.callback) {
-        navigation.push(ScreenNames.TTSNationalIDFront, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      } else if (
-        !props?.route?.params?.front &&
-        !props.route?.params?.callback
-      ) {
-        navigation.push(ScreenNames.TTSNationalIDBack, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      } else {
-        navigation.goBack();
-        props.route?.params?.callback(
-          Platform.OS === 'android' ? image?.path : 'file://' + image?.path
-        );
+    if (Platform.OS === 'android') {
+      const result = await launchImageLibrary({
+        mediaType: 'photo',
+      });
+      if (result.assets) {
+        if (props?.route?.params?.front && !props.route?.params?.callback) {
+          navigation.push(ScreenNames.TTSNationalIDFront, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (
+          !props?.route?.params?.front &&
+          !props.route?.params?.callback
+        ) {
+          navigation.push(ScreenNames.TTSNationalIDBack, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        } else {
+          navigation.goBack();
+          props.route?.params?.callback(result.assets[0]?.uri);
+        }
       }
-    });
+    } else {
+      ImagePicker.openPicker({}).then((image) => {
+        if (props?.route?.params?.front && !props.route?.params?.callback) {
+          navigation.push(ScreenNames.TTSNationalIDFront, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (
+          !props?.route?.params?.front &&
+          !props.route?.params?.callback
+        ) {
+          navigation.push(ScreenNames.TTSNationalIDBack, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        } else {
+          navigation.goBack();
+          props.route?.params?.callback(
+            Platform.OS === 'android' ? image?.path : 'file://' + image?.path
+          );
+        }
+      });
+    }
   };
 
   return (

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

@@ -5,7 +5,6 @@ import {
   Dimensions,
   Image,
   ImageStyle,
-  PermissionsAndroid,
   Platform,
   SafeAreaView,
   TextStyle,
@@ -41,6 +40,7 @@ import { ScreenNames } from '../../navigation';
 import DeviceInfo from 'react-native-device-info';
 import ImagePicker from 'react-native-image-crop-picker';
 import { IconUpload } from '../../assets/svgs';
+import { launchImageLibrary } from 'react-native-image-picker';
 
 export default function RegisterCamera(props: any) {
   const isFocused = useIsFocused();
@@ -189,75 +189,49 @@ export default function RegisterCamera(props: any) {
     }
   };
 
-  const hasAndroidPermission = async () => {
-    const getCheckPermissionPromise = () => {
-      if (Number(Platform.Version) >= 33) {
-        return Promise.all([
-          PermissionsAndroid.check(
-            PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES
-          ),
-          PermissionsAndroid.check(
-            PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO
-          ),
-        ]).then(
-          ([hasReadMediaImagesPermission, hasReadMediaVideoPermission]) =>
-            hasReadMediaImagesPermission && hasReadMediaVideoPermission
-        );
-      } else {
-        return PermissionsAndroid.check(
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE
-        );
-      }
-    };
-    const hasPermission = await getCheckPermissionPromise();
-    if (hasPermission) {
-      return true;
-    }
-
-    const getRequestPermissionPromise = () => {
-      if (Number(Platform.Version) >= 33) {
-        return PermissionsAndroid.requestMultiple([
-          PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES,
-          PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO,
-        ]).then(
-          (statuses) =>
-            statuses[PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES] ===
-              PermissionsAndroid.RESULTS.GRANTED &&
-            statuses[PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO] ===
-              PermissionsAndroid.RESULTS.GRANTED
-        );
-      } else {
-        return PermissionsAndroid.request(
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE
-        ).then((status) => status === PermissionsAndroid.RESULTS.GRANTED);
-      }
-    };
-
-    return await getRequestPermissionPromise();
-  };
-
   const pickImageFromGallery = async () => {
-    await hasAndroidPermission();
-    ImagePicker.openPicker({}).then((image) => {
-      if (props?.route?.params?.front) {
-        navigation.push(ScreenNames.VehicleRegistration, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      } else if (props.route?.params?.callback) {
-        navigation.goBack();
-        props.route?.params?.callback(
-          Platform.OS === 'android' ? image?.path : 'file://' + image?.path
-        );
-      } else {
-        navigation.push(ScreenNames.RegisterBack, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
+    if (Platform.OS === 'android') {
+      const result = await launchImageLibrary({
+        mediaType: 'photo',
+      });
+      if (result.assets) {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistration, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(result.assets[0]?.uri);
+        } else {
+          navigation.push(ScreenNames.RegisterBack, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        }
       }
-    });
+    } else {
+      ImagePicker.openPicker({}).then((image) => {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistration, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(
+            Platform.OS === 'android' ? image?.path : 'file://' + image?.path
+          );
+        } else {
+          navigation.push(ScreenNames.RegisterBack, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        }
+      });
+    }
   };
   return (
     <View
@@ -279,7 +253,7 @@ export default function RegisterCamera(props: any) {
           <View
             style={{
               marginVertical: 16,
-              marginTop: DeviceInfo.hasNotch() ? 70 : 0,
+              marginTop: DeviceInfo.hasNotch() ? 70 : 8,
             }}
           >
             <TouchableOpacity
@@ -383,7 +357,7 @@ export default function RegisterCamera(props: any) {
                 <View
                   style={{
                     alignItems: 'center',
-                    marginVertical: 24,
+                    marginVertical: DeviceInfo.hasNotch() ? 24 : 16,
                   }}
                 >
                   <MButton

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

@@ -100,7 +100,10 @@ export default function ReviewInformation(props) {
               ? formatDDMMYYY(response?.data?.data?.dob)
               : ''
           );
-          formRef.current.setFieldValue('gender', response?.data?.data?.gender);
+          formRef.current.setFieldValue(
+            'gender',
+            response?.data?.data?.gender ?? null
+          );
           formRef.current.setFieldValue(
             'nationalCard',
             response?.data?.data?.nationalCard
@@ -297,7 +300,7 @@ export default function ReviewInformation(props) {
             initialValues={{
               fullName: '',
               dob: '',
-              gender: 0,
+              gender: null,
               nationalCard: '',
               dateNationalId: '',
               phone: '',
@@ -426,7 +429,11 @@ export default function ReviewInformation(props) {
                               flex: 1,
                             }}
                           >
-                            {values.gender === 0 ? 'Nam' : 'Nữ'}
+                            {values.gender === 0
+                              ? 'Nam'
+                              : values.gender === 1
+                              ? 'Nữ'
+                              : ''}
                           </MText>
                           <DropDown2 />
                         </TouchableOpacity>

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

@@ -256,17 +256,17 @@ export default function ReviewInformationOther(props) {
               districtName: yup.string().required('Vui lòng nhập quận/huyện'),
               wardName: yup.string().required('Vui lòng nhập phường/xã'),
               address: yup.string().required('Vui lòng nhập địa chỉ'),
-              fullName1: yup.string().required('Vui lòng nhập tên'),
+              fullName1: yup.string().required('Vui lòng nhập họ tên'),
               phone1: yup.string().required('Vui lòng nhập số điện thoại'),
               relationshipType1: yup
                 .object()
-                .required('Vui lòng chọn')
+                .required('Vui lòng chọn mối quan hệ')
                 .nullable(),
-              fullName2: yup.string().required('Vui lòng nhập tên'),
+              fullName2: yup.string().required('Vui lòng nhập họ tên'),
               phone2: yup.string().required('Vui lòng nhập số điện thoại'),
               relationshipType2: yup
                 .object()
-                .required('Vui lòng chọn')
+                .required('Vui lòng chọn mối quan hệ')
                 .nullable(),
             })}
             innerRef={formRef}

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

@@ -355,9 +355,14 @@ export default function ReviewLoan(props: any) {
             }}
             validationSchema={yup.object().shape({
               loanAmount: yup.string().required('Số tiền là bắt buộc'),
-              rateTypeId: yup.number().required('Vui lòng chọn').nullable(),
-              loanTime: yup.number().required('Vui lòng chọn').nullable(),
-              firstPaymentDate: yup.string().required('Vui lòng chọn'),
+              rateTypeId: yup.number().required('HTTT là bắt buộc').nullable(),
+              loanTime: yup
+                .number()
+                .required('Thời gian vay là bắt buộc')
+                .nullable(),
+              firstPaymentDate: yup
+                .string()
+                .required('Ngày thanh toán đầu kỳ là bắt buộc'),
               bankName: yup.string().required('Vui lòng chọn ngân hàng'),
               bankAccountName: yup.string().required('Vui lòng nhập chủ thẻ'),
               bankAccountNumber: yup

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

@@ -5,7 +5,6 @@ import {
   Dimensions,
   Image,
   ImageStyle,
-  PermissionsAndroid,
   Platform,
   SafeAreaView,
   TextStyle,
@@ -40,6 +39,7 @@ import { ScreenNames } from '../../navigation';
 import { load, OCR_V2, save } from '../../utils/storage';
 import { IconUpload } from '../../assets/svgs';
 import ImagePicker from 'react-native-image-crop-picker';
+import { launchImageLibrary } from 'react-native-image-picker';
 
 export default function VehicleCamera(props: any) {
   const isFocused = useIsFocused();
@@ -197,75 +197,49 @@ export default function VehicleCamera(props: any) {
     return () => clearTimeout(timeout);
   }, [isFocused]);
 
-  const hasAndroidPermission = async () => {
-    const getCheckPermissionPromise = () => {
-      if (Number(Platform.Version) >= 33) {
-        return Promise.all([
-          PermissionsAndroid.check(
-            PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES
-          ),
-          PermissionsAndroid.check(
-            PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO
-          ),
-        ]).then(
-          ([hasReadMediaImagesPermission, hasReadMediaVideoPermission]) =>
-            hasReadMediaImagesPermission && hasReadMediaVideoPermission
-        );
-      } else {
-        return PermissionsAndroid.check(
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE
-        );
-      }
-    };
-    const hasPermission = await getCheckPermissionPromise();
-    if (hasPermission) {
-      return true;
-    }
-
-    const getRequestPermissionPromise = () => {
-      if (Number(Platform.Version) >= 33) {
-        return PermissionsAndroid.requestMultiple([
-          PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES,
-          PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO,
-        ]).then(
-          (statuses) =>
-            statuses[PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES] ===
-              PermissionsAndroid.RESULTS.GRANTED &&
-            statuses[PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO] ===
-              PermissionsAndroid.RESULTS.GRANTED
-        );
-      } else {
-        return PermissionsAndroid.request(
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE
-        ).then((status) => status === PermissionsAndroid.RESULTS.GRANTED);
-      }
-    };
-
-    return await getRequestPermissionPromise();
-  };
-
   const pickImageFromGallery = async () => {
-    await hasAndroidPermission();
-    ImagePicker.openPicker({}).then((image) => {
-      if (props?.route?.params?.front) {
-        navigation.push(ScreenNames.VehicleRegistrationFront, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      } else if (props.route?.params?.callback) {
-        navigation.goBack();
-        props.route?.params?.callback(
-          Platform.OS === 'android' ? image?.path : 'file://' + image?.path
-        );
-      } else {
-        navigation.push(ScreenNames.VehicleRegistrationBack, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
+    if (Platform.OS === 'android') {
+      const result = await launchImageLibrary({
+        mediaType: 'photo',
+      });
+      if (result.assets) {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistrationFront, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(result.assets[0]?.uri);
+        } else {
+          navigation.push(ScreenNames.VehicleRegistrationBack, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        }
       }
-    });
+    } else {
+      ImagePicker.openPicker({}).then((image) => {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistrationFront, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(
+            Platform.OS === 'android' ? image?.path : 'file://' + image?.path
+          );
+        } else {
+          navigation.push(ScreenNames.VehicleRegistrationBack, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        }
+      });
+    }
   };
 
   return (