react-native-timacare 0.0.35 → 0.0.37

package/src/screens/full-submit/update-document.tsx

@@ -19,7 +19,7 @@ import { color } from '../../theme';
 import LinearGradient from 'react-native-linear-gradient';
 import { CommonActions, useNavigation } from '@react-navigation/native';
 import { ScreenNames } from '../../navigation';
-import CIMBLoading from '../../components/CIMBLoading';
+import Loading from '../../components/Loading';
 
 interface IProps {
   loan: any;
@@ -41,6 +41,7 @@ export const UpdateDocument = observer(function UpdateDocument({
     { uri: 'https://unsplash.it/400/400?image=1' },
   ]);
   const [visible, setIsVisible] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
   const [data, setData] = useState<any[]>();
 
   const takePhoto = async (typId) => {
@@ -65,15 +66,23 @@ export const UpdateDocument = observer(function UpdateDocument({
       });
   };
   const handleSubmit = () => {
-    FullSubmitStore.confirmData(loan?.id, () => {
-      FullSubmitStore.tab = 1;
-      navigation.dispatch(
-        CommonActions.reset({
-          index: 1,
-          routes: [{ name: ScreenNames.Main }],
-        })
-      );
-    });
+    setIsLoading(true);
+    FullSubmitStore.confirmData(
+      loan?.id,
+      () => {
+        setIsLoading(false);
+        FullSubmitStore.tab = 1;
+        navigation.dispatch(
+          CommonActions.reset({
+            index: 1,
+            routes: [{ name: ScreenNames.Main }],
+          })
+        );
+      },
+      () => {
+        setIsLoading(false);
+      }
+    );
   };
 
   return (
@@ -348,7 +357,7 @@ export const UpdateDocument = observer(function UpdateDocument({
         visible={visible}
         onRequestClose={() => setIsVisible(false)}
       />
-      <CIMBLoading isLoading={FullSubmitStore.loadingButton} />
+      <Loading isLoading={isLoading} />
     </View>
   );
 });

package/src/screens/full-submit/update-info.tsx

@@ -30,7 +30,7 @@ import {
 import { commonStyles } from '../CommonStyles';
 import * as yup from 'yup';
 import FullSubmitStore from './store';
-import CIMBLoading from '../../components/CIMBLoading';
+import Loading from '../../components/Loading';
 import LinearGradient from 'react-native-linear-gradient';
 import appStore from '../../AppStore';
 
@@ -46,6 +46,8 @@ export const UpdateInfo = observer(function UpdateInfo({
   const navigation = useNavigation();
   const ref = useRef(null);
   const [data, setData] = useState(null);
+  const [isLoading, setIsLoading] = useState(false);
+
   useEffect(() => {
     if (loan) {
       FullSubmitStore.getDetailLoan(loan?.id, (res) => {
@@ -125,6 +127,7 @@ export const UpdateInfo = observer(function UpdateInfo({
   }, [loan]);
 
   const onSubmit = (values: any) => {
+    setIsLoading(true);
     const body = {
       Id: data?.id,
       LoanAmount: data?.loanAmount,
@@ -152,10 +155,17 @@ export const UpdateInfo = observer(function UpdateInfo({
       positionCIMBId: values.jobTitle.id,
     };
 
-    FullSubmitStore.fullSubmit(body, () => {
-      FullSubmitStore.tab = 2;
-      callback(2);
-    });
+    FullSubmitStore.fullSubmit(
+      body,
+      () => {
+        setIsLoading(false);
+        FullSubmitStore.tab = 2;
+        callback(2);
+      },
+      () => {
+        setIsLoading(false);
+      }
+    );
   };
 
   return (
@@ -922,7 +932,7 @@ export const UpdateInfo = observer(function UpdateInfo({
           </Formik>
         </ScrollView>
       )}
-      <CIMBLoading isLoading={FullSubmitStore.loadingButton} />
+      <Loading isLoading={isLoading} />
     </View>
   );
 });

package/src/screens/home/Store.tsx

@@ -171,16 +171,19 @@ class Store {
         Alert.alert('Thông báo', response.data.meta.errorMessage, [
           { text: 'Đồng ý' },
         ]);
+        if (onFailure) onFailure();
       } else {
         Alert.alert('Thông báo', response.data.meta.errorMessage, [
           { text: 'Đồng ý' },
         ]);
         this.listLoanPending = null;
+        if (onFailure) onFailure();
       }
     } else {
       this.isLoading = false;
       Alert.alert('Thông báo', 'Có lỗi xảy ra. Vui lòng thử lại sau!');
       this.listLoanPending = null;
+      if (onFailure) onFailure();
     }
   }
 }

package/src/screens/home/index.tsx

@@ -79,28 +79,42 @@ export const Home = observer(function Home() {
   const [showModal2, setShowModal2] = useState(false);
   const [loan, setLoan] = useState(null);
   const [checkEKYC, setCheckEKYC] = useState(null);
+  const [isLoading, setIsLoading] = useState(false);
 
   const onRefresh = () => {
+    setIsLoading(true);
     homeStore.getListLoan();
-    homeStore.getListLoanPending(async (loan) => {
-      setLoan(loan);
-      homeStore.getCheckEKYC({ loanBriefId: loan.id }, (data) => {
-        setCheckEKYC(!data);
-      });
-      if (
-        loan.messageErrorCIMB !== '' &&
-        loan?.messageErrorCIMB &&
-        loan?.isCimbApproveFull === null
-      ) {
-        setShowModal(true);
-      }
-      if (loan?.typeLoan === 4 && loan?.isCimbApproveFull !== null) {
-        const checkShow = await load(`SHOW_${loan?.id}`);
-        if (!checkShow || checkShow !== true) {
-          setShowModal2(true);
+    homeStore.getListLoanPending(
+      async (loan) => {
+        setLoan(loan);
+        homeStore.getCheckEKYC(
+          { loanBriefId: loan.id },
+          (data) => {
+            setCheckEKYC(!data);
+            setIsLoading(false);
+          },
+          () => {
+            setIsLoading(false);
+          }
+        );
+        if (
+          loan.messageErrorCIMB !== '' &&
+          loan?.messageErrorCIMB &&
+          loan?.isCimbApproveFull === null
+        ) {
+          setShowModal(true);
+        }
+        if (loan?.typeLoan === 4 && loan?.isCimbApproveFull !== null) {
+          const checkShow = await load(`SHOW_${loan?.id}`);
+          if (!checkShow || checkShow !== true) {
+            setShowModal2(true);
+          }
         }
+      },
+      () => {
+        setIsLoading(false);
       }
-    });
+    );
   };
 
   useEffect(() => {
@@ -303,10 +317,7 @@ export const Home = observer(function Home() {
       </LinearGradient>
       <ScrollView
         refreshControl={
-          <RefreshControl
-            refreshing={homeStore.isLoading}
-            onRefresh={onRefresh}
-          />
+          <RefreshControl refreshing={false} onRefresh={onRefresh} />
         }
         style={{ flex: 1, marginBottom: 16 }}
       >
@@ -638,18 +649,30 @@ export const Home = observer(function Home() {
                                   paddingHorizontal: 16,
                                 }}
                               >
-                                <View style={{ flexDirection: 'row' }}>
-                                  <Image
-                                    source={require('./error.png')}
-                                    style={{ width: 16, height: 16 }}
-                                  />
-                                  <MText style={{ marginLeft: 5 }}>
-                                    Đơn vay của bạn gặp gián đoạn, vui lòng liên
-                                    hệ{'\n'}
-                                    <MText style={{ fontWeight: 'bold' }}>
-                                      tổng đài 1900633688
+                                <View
+                                  style={{
+                                    flexDirection: 'row',
+                                    justifyContent: 'space-between',
+                                    alignItems: 'center',
+                                  }}
+                                >
+                                  <View
+                                    style={{
+                                      flex: 1,
+                                      flexDirection: 'row',
+                                      paddingRight: 20,
+                                    }}
+                                  >
+                                    <Image
+                                      source={require('./error.png')}
+                                      style={{ width: 16, height: 16 }}
+                                    />
+                                    <MText style={{ marginLeft: 5 }}>
+                                      Đơn vay của bạn gặp gián đoạn, vui lòng
+                                      liên hệ tổng đài 1900633688
                                     </MText>
-                                  </MText>
+                                  </View>
+
                                   <TouchableOpacity
                                     onPress={() => {
                                       Linking.openURL(`tel:1900633688`);
@@ -658,17 +681,20 @@ export const Home = observer(function Home() {
                                     <LinearGradient
                                       colors={['#FF8E4F', '#EF592E']}
                                       style={{
-                                        paddingHorizontal: 20,
+                                        paddingHorizontal: 10,
                                         height: 30,
                                         borderRadius: 30,
                                         justifyContent: 'center',
                                         alignItems: 'center',
+                                        flexDirection: 'row',
                                       }}
                                     >
+                                      <Call />
                                       <MText
                                         style={{
                                           color: 'white',
                                           fontSize: 12,
+                                          marginLeft: 5,
                                         }}
                                       >
                                         Liên hệ
@@ -1718,7 +1744,7 @@ export const Home = observer(function Home() {
           </View>
         </SafeAreaView>
       </Modal>
-      <Observer>{() => <Loading isLoading={homeStore.isLoading} />}</Observer>
+      <Observer>{() => <Loading isLoading={isLoading} />}</Observer>
     </View>
   );
 });

package/src/screens/nationalID/Store.tsx

@@ -121,11 +121,13 @@ class Store {
         Alert.alert('Thông báo', response.data.meta.errorMessage, [
           { text: 'Đồng ý' },
         ]);
+        if (onFailure) onFailure();
       }
     } else {
       this.isLoading = false;
       this.isError = false;
       Alert.alert('Thông báo', 'Có lỗi xảy ra. Vui lòng thử lại sau!');
+      if (onFailure) onFailure();
     }
   }
 }

package/src/screens/nationalID/index.tsx

@@ -55,11 +55,13 @@ const logoView: ImageStyle = {
 
 export const NationalID = observer(function NationalID(props: any) {
   const navigation = useNavigation();
+  const [isLoading, setIsLoading] = useState(false);
   const [photo, setPhoto] = useState(null);
   const [base64, setBase64] = useState(null);
   const loan = toJS(props.route.params?.loan);
 
   const nextStep = () => {
+    setIsLoading(true);
     const form = new FormData();
     form.append('image', {
       uri: photo,
@@ -72,12 +74,19 @@ export const NationalID = observer(function NationalID(props: any) {
     form.append('UploadFrom', 3);
     form.append('SubTypeId', 1);
 
-    nationalIDStore.uploadImage(form, () => {
-      nationalIDStore.photo = photo;
-      navigation.dispatch(
-        StackActions.push(ScreenNames.NationalIDBack, { loan })
-      );
-    });
+    nationalIDStore.uploadImage(
+      form,
+      () => {
+        setIsLoading(false);
+        nationalIDStore.photo = photo;
+        navigation.dispatch(
+          StackActions.push(ScreenNames.NationalIDBack, { loan })
+        );
+      },
+      () => {
+        setIsLoading(false);
+      }
+    );
   };
 
   const takePhoto = () => {
@@ -292,7 +301,7 @@ export const NationalID = observer(function NationalID(props: any) {
         )}
         <KeyboardSpacer />
       </SafeAreaView>
-      <Loading isLoading={appStore.isLoading || nationalIDStore.isLoading} />
+      <Loading isLoading={isLoading} />
     </View>
   );
 });

package/src/screens/nationalIDBack/Store.tsx

@@ -71,7 +71,7 @@ class Store {
   }
 
   @action
-  async uploadImage(body, onSuccess?) {
+  async uploadImage(body, onSuccess?, onError?) {
     this.isLoading = true;
     const response = await Api.getInstance().uploadDocument(body);
     this.isLoading = false;
@@ -84,6 +84,7 @@ class Store {
           onSuccess(response.data.data);
         }
       } else {
+        if (onError) onError();
         Alert.alert('Thông báo', response.data.meta.errorMessage, [
           { text: 'Đồng ý' },
         ]);
@@ -91,6 +92,7 @@ class Store {
     } else {
       this.isLoading = false;
       this.isError = false;
+      if (onError) onError();
       Alert.alert('Thông báo', 'Có lỗi xảy ra. Vui lòng thử lại sau', [
         { text: 'Đồng ý' },
       ]);

package/src/screens/nationalIDBack/index.tsx

@@ -42,14 +42,10 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
   const [photo, setPhoto] = useState(null);
   const loan = props.route.params?.loan;
   const [base64, setBase64] = useState(null);
+  const [isLoading, setIsLoading] = useState(false);
 
   const nextStep = (values) => {
-    // const form = new FormData()
-    // form.append("image", {
-    //   uri: photo,
-    //   type: "image/jpg",
-    //   name: "image.jpg",
-    // })
+    setIsLoading(true);
     const form2 = new FormData();
     form2.append('image', {
       uri: photo,
@@ -60,21 +56,16 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
     form2.append('TypeDocumentId', 311);
     form2.append('UploadFrom', 3);
     form2.append('SubTypeId', 2);
-
-    // appStore.checkQualityImage(
-    //   base64,
-    //   () => {
-    //     nationalIDStore.uploadImage(form2, () => {
-    //       navigation.dispatch(StackActions.push(ScreenNames.Selfie, { loan }))
-    //     })
-    //   },
-    //   () => {
-    //     Alert.alert("Thông báo", "Ảnh chất lượng thấp. Vui lòng chụp lại!")
-    //   },
-    // )
-    nationalIDStore.uploadImage(form2, () => {
-      navigation.dispatch(StackActions.push(ScreenNames.Selfie, { loan }));
-    });
+    nationalIDStore.uploadImage(
+      form2,
+      () => {
+        setIsLoading(false);
+        navigation.dispatch(StackActions.push(ScreenNames.Selfie, { loan }));
+      },
+      () => {
+        setIsLoading(false);
+      }
+    );
   };
 
   const takePhoto = () => {
@@ -291,7 +282,7 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
         )}
         <KeyboardSpacer />
       </SafeAreaView>
-      <Loading isLoading={nationalIDStore.isLoading || appStore.isLoading} />
+      <Loading isLoading={isLoading} />
     </View>
   );
 });

package/src/screens/quick-submit/index.tsx

@@ -40,93 +40,105 @@ export const QuickSubmit = observer(function QuickSubmit(props: any) {
   const [loan, setLoan] = useState(null);
   const [showDatePicker, setShowDatePicker] = useState(false);
   const [typePicker, setTypePicker] = useState(0);
+  const [isLoading, setIsLoading] = useState(false);
 
   useEffect(() => {
+    setIsLoading(true);
     QuickSubmitStore.getBrandProduct();
     QuickSubmitStore.getProvinces();
-    QuickSubmitStore.getDetailLoan(props?.route?.params?.loan?.id, (data) => {
-      setLoan(data);
-      ref.current.setFieldValue(
-        'fullName',
-        data?.fullName ? data?.fullName : ''
-      );
-      ref.current.setFieldValue('dob', data?.dob ? data?.dob : '');
-      ref.current.setFieldValue('phone', data?.phone ? data?.phone : '');
-      ref.current.setFieldValue(
-        'nationalCard',
-        data?.nationalId ? data?.nationalId : ''
-      );
-      ref.current.setFieldValue(
-        'nationalCardDate',
-        data?.dateNationalId ? data?.dateNationalId : ''
-      );
-      ref.current.setFieldValue('email', data?.email ? data?.email : '');
-      ref.current.setFieldValue(
-        'loanAmount',
-        data?.loanAmount ? data?.loanAmount : 0
-      );
-      ref.current.setFieldValue(
-        'loanTime',
-        data?.loanTime ? data?.loanTime : ''
-      );
-      ref.current.setFieldValue(
-        'salary',
-        data?.totalIncome ? data?.totalIncome : 0
-      );
-      ref.current.setFieldValue(
-        'province',
-        data?.provinceId
-          ? { id: data?.provinceId, name: data?.provinceName }
-          : null
-      );
-      ref.current.setFieldValue(
-        'brand',
-        data?.brandId ? { id: data?.brandId, name: data?.brandName } : null
-      );
-      if (data?.brandId) {
-        QuickSubmitStore.getYearProduct(data?.brandId);
-      }
-      ref.current.setFieldValue(
-        'year',
-        data?.yearProductBrand
-          ? {
-              id: data?.yearProductBrand,
-              name: `Năm ${data?.yearProductBrand}`,
-            }
-          : null
-      );
-      if (data?.yearProductBrand) {
-        QuickSubmitStore.getModelProduct(data?.brandId, data?.yearProductBrand);
-      }
-      ref.current.setFieldValue(
-        'model',
-        data?.productBrandId
-          ? { id: data?.productBrandId, name: data?.productBrandName }
-          : null
-      );
-      ref.current.setFieldValue(
-        'occupation',
-        data?.jobNameCIMB
-          ? {
-              id: data?.jobCIMBId,
-              name: data?.jobNameCIMB,
-            }
-          : null
-      );
-      ref.current.setFieldValue('productId', data?.productId),
+    QuickSubmitStore.getDetailLoan(
+      props?.route?.params?.loan?.id,
+      (data) => {
+        setLoan(data);
         ref.current.setFieldValue(
-          'vehiclesCar',
-          data?.vehiclesCar ? data?.vehiclesCar : ''
-        ),
+          'fullName',
+          data?.fullName ? data?.fullName : ''
+        );
+        ref.current.setFieldValue('dob', data?.dob ? data?.dob : '');
+        ref.current.setFieldValue('phone', data?.phone ? data?.phone : '');
         ref.current.setFieldValue(
-          'yearCar',
-          data?.yearCar ? String(data?.yearCar) : ''
-        ),
+          'nationalCard',
+          data?.nationalId ? data?.nationalId : ''
+        );
         ref.current.setFieldValue(
-          'brandCar',
-          data?.brandCar ? data?.brandCar : ''
+          'nationalCardDate',
+          data?.dateNationalId ? data?.dateNationalId : ''
         );
-    });
+        ref.current.setFieldValue('email', data?.email ? data?.email : '');
+        ref.current.setFieldValue(
+          'loanAmount',
+          data?.loanAmount ? data?.loanAmount : 0
+        );
+        ref.current.setFieldValue(
+          'loanTime',
+          data?.loanTime ? data?.loanTime : ''
+        );
+        ref.current.setFieldValue(
+          'salary',
+          data?.totalIncome ? data?.totalIncome : 0
+        );
+        ref.current.setFieldValue(
+          'province',
+          data?.provinceId
+            ? { id: data?.provinceId, name: data?.provinceName }
+            : null
+        );
+        ref.current.setFieldValue(
+          'brand',
+          data?.brandId ? { id: data?.brandId, name: data?.brandName } : null
+        );
+        if (data?.brandId) {
+          QuickSubmitStore.getYearProduct(data?.brandId);
+        }
+        ref.current.setFieldValue(
+          'year',
+          data?.yearProductBrand
+            ? {
+                id: data?.yearProductBrand,
+                name: `Năm ${data?.yearProductBrand}`,
+              }
+            : null
+        );
+        if (data?.yearProductBrand) {
+          QuickSubmitStore.getModelProduct(
+            data?.brandId,
+            data?.yearProductBrand
+          );
+        }
+        ref.current.setFieldValue(
+          'model',
+          data?.productBrandId
+            ? { id: data?.productBrandId, name: data?.productBrandName }
+            : null
+        );
+        ref.current.setFieldValue(
+          'occupation',
+          data?.jobNameCIMB
+            ? {
+                id: data?.jobCIMBId,
+                name: data?.jobNameCIMB,
+              }
+            : null
+        );
+        ref.current.setFieldValue('productId', data?.productId),
+          ref.current.setFieldValue(
+            'vehiclesCar',
+            data?.vehiclesCar ? data?.vehiclesCar : ''
+          ),
+          ref.current.setFieldValue(
+            'yearCar',
+            data?.yearCar ? String(data?.yearCar) : ''
+          ),
+          ref.current.setFieldValue(
+            'brandCar',
+            data?.brandCar ? data?.brandCar : ''
+          );
+        setIsLoading(false);
+      },
+      () => {
+        setIsLoading(false);
+      }
+    );
   }, []);
 
   const onSubmit = (values: any) => {
@@ -1051,7 +1063,7 @@ export const QuickSubmit = observer(function QuickSubmit(props: any) {
           </Formik>
         </ScrollView>
       </SafeAreaView>
-      <CIMBLoading isLoading={QuickSubmitStore.isLoading} />
+      <CIMBLoading isLoading={isLoading} />
     </View>
   );
 });

package/src/screens/quick-submit/store.tsx

@@ -137,7 +137,7 @@ class Store {
   }
 
   @action
-  async getDetailLoan(id, onSuccess?) {
+  async getDetailLoan(id, onSuccess?, onError?) {
     this.isLoading = true;
     try {
       const response = await Api.getInstance().getDetailLoan(id);
@@ -148,13 +148,16 @@ class Store {
           if (onSuccess) onSuccess(response.data.data);
         } else {
           Alert.alert('Thông báo', response.data.meta.errorMessage);
+          if (onError) onError();
         }
       } else {
         Alert.alert('Thông báo', 'Không thể lấy thông tin đơn vay');
+        if (onError) onError();
       }
     } catch (error) {
       this.isLoading = false;
       console.log(error);
+      if (onError) onError();
     }
   }
 

package/src/screens/uploadVideo/index.tsx

@@ -47,31 +47,7 @@ export const Video = observer(function Video(props: any) {
       Platform.OS === 'ios'
         ? [PERMISSIONS.IOS.CAMERA, PERMISSIONS.IOS.MICROPHONE]
         : [PERMISSIONS.ANDROID.CAMERA, PERMISSIONS.ANDROID.RECORD_AUDIO]
-    ).then((statuses) => {
-      console.log(statuses);
-
-      // if (Platform.OS === 'android') {
-      //   if (
-      //     statuses[PERMISSIONS.ANDROID.CAMERA] !== 'granted' ||
-      //     statuses[PERMISSIONS.ANDROID.RECORD_AUDIO] !== 'granted'
-      //   ) {
-      //     requestMultiple([
-      //       PERMISSIONS.ANDROID.CAMERA,
-      //       PERMISSIONS.ANDROID.RECORD_AUDIO,
-      //     ]).then((statuses) => {});
-      //   }
-      // } else {
-      //   if (
-      //     statuses[PERMISSIONS.IOS.CAMERA] !== 'granted' ||
-      //     statuses[PERMISSIONS.IOS.MICROPHONE] !== 'granted'
-      //   ) {
-      //     requestMultiple([
-      //       PERMISSIONS.IOS.CAMERA,
-      //       PERMISSIONS.IOS.MICROPHONE,
-      //     ]).then((statuses) => {});
-      //   }
-      // }
-    });
+    ).then((statuses) => {});
   };
 
   useEffect(() => {