react-native-timacare 3.1.29-production → 3.1.30-production

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

@@ -189,25 +189,55 @@ export default function RegisterCamera(props: any) {
     }
   };
 
-  const pickImageFromGallery = async () => {
-    if (Platform.OS === 'android') {
-      const granted = await PermissionsAndroid.request(
-        PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES ||
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE,
-        {
-          title: 'Permission to access photos',
-          message: 'App needs access to your photos to pick images.',
-          buttonNeutral: 'Ask Me Later',
-          buttonNegative: 'Cancel',
-          buttonPositive: 'OK',
-        }
-      );
-
-      if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
-        console.log('Permission denied');
-        return;
+  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, {

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

@@ -242,6 +242,7 @@ export default function ReviewInformation(props) {
   useEffect(() => {
     getData();
     ttsStore.getListBank();
+    ttsStore.getRelationship();
   }, []);
 
   return (

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

@@ -127,7 +127,7 @@ export default function ReviewInformationOther(props) {
             formRef.current.setFieldValue('relationshipType1', r);
           }
           if (response.data?.data?.listRelationships[1]?.relationshipType) {
-            let r = EnumRelationshipOption2.find(
+            let r = ttsStore.listRelationship?.find(
               (x) =>
                 x.id ===
                 response.data?.data?.listRelationships[1]?.relationshipType
@@ -644,7 +644,7 @@ export default function ReviewInformationOther(props) {
                       onPress={() => {
                         navigation.push(ScreenNames.MSelect, {
                           title: 'Mối quan hệ',
-                          data: EnumRelationshipOption2,
+                          data: ttsStore.listRelationship,
                           callback: (item) => {
                             setFieldValue('relationshipType2', item);
                           },

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

@@ -197,28 +197,56 @@ export default function VehicleCamera(props: any) {
     return () => clearTimeout(timeout);
   }, [isFocused]);
 
-  const pickImageFromGallery = async () => {
-    if (Platform.OS === 'android') {
-      const granted = await PermissionsAndroid.request(
-        PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES ||
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE,
-        {
-          title: 'Permission to access photos',
-          message: 'App needs access to your photos to pick images.',
-          buttonNeutral: 'Ask Me Later',
-          buttonNegative: 'Cancel',
-          buttonPositive: 'OK',
-        }
-      );
-
-      if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
-        console.log('Permission denied');
-        return;
+  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;
     }
-    ImagePicker.openPicker({}).then((image) => {
-      console.log(image);
 
+    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: