react-native-timacare 3.1.3-beta → 3.1.5-beta

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

@@ -44,6 +44,7 @@ const PREVIEW_RECT = {
 };
 export const LivenessV2 = observer(function LivenessV2(props: any) {
   const loan = props.route.params?.loan;
+
   const navigation = useNavigation();
   const cameraRef = useRef<any>(null);
   const interval = useRef<any>(null);
@@ -266,22 +267,41 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
   const uploadLiveness = async (template: any) => {
     setIsLoading(true);
     try {
-      await livenessStore.verifyLiveness(
-        loan?.id,
-        template,
-        () => {
-          setTimeout(() => {
-            startLiveness();
-          }, 2000);
-          setIsLoading(false);
-        },
-        () => {
-          setTimeout(() => {
-            startLiveness();
-          }, 2000);
-          setIsLoading(false);
-        }
-      );
+      if (loan?.typeLoan === 5) {
+        await livenessStore.verifyLiveness2(
+          loan?.id,
+          template,
+          () => {
+            setTimeout(() => {
+              startLiveness();
+            }, 2000);
+            setIsLoading(false);
+          },
+          () => {
+            setTimeout(() => {
+              startLiveness();
+            }, 2000);
+            setIsLoading(false);
+          }
+        );
+      } else {
+        await livenessStore.verifyLiveness(
+          loan?.id,
+          template,
+          () => {
+            setTimeout(() => {
+              startLiveness();
+            }, 2000);
+            setIsLoading(false);
+          },
+          () => {
+            setTimeout(() => {
+              startLiveness();
+            }, 2000);
+            setIsLoading(false);
+          }
+        );
+      }
     } catch (error) {
       setIsLoading(false);
       console.log(error);

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

@@ -0,0 +1,373 @@
+//@ts-nocheck
+import React from 'react';
+import { ScrollView, TextStyle, View, ViewStyle } from 'react-native';
+import { commonStyles } from '../CommonStyles';
+import MHeader from '../../components/MHeader';
+import { MText } from '../../components/MText';
+import { CommonActions, useNavigation } from '@react-navigation/native';
+import { formatMoney } from '../../utils';
+import { IconNotify } from '../../assets/svgs';
+import MButton from '../../components/MButton';
+import LinearGradient from 'react-native-linear-gradient';
+import { ScreenNames } from '../../navigation';
+
+export default function LoanInterestRate(props) {
+  const loan = props?.route?.params?.loan;
+
+  const navigation = useNavigation();
+
+  return (
+    <View style={commonStyles.fill}>
+      <MHeader title="Vay nhanh 24/7" />
+      <View style={commonStyles.fill}>
+        <View style={$h} />
+        <View style={$bg}>
+          <MText style={$title}>Bảng biểu lãi phí đơn vay</MText>
+          <ScrollView>
+            <View
+              style={{
+                borderWidth: 1,
+                borderColor: '#FF8E4F',
+                borderRadius: 8,
+                paddingHorizontal: 16,
+                paddingVertical: 12,
+                marginHorizontal: 16,
+              }}
+            >
+              <View
+                style={{
+                  flexDirection: 'row',
+                  justifyContent: 'space-between',
+                  alignItems: 'center',
+                }}
+              >
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#333333',
+                  }}
+                >
+                  Mã HĐ giải ngân
+                </MText>
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#333333',
+                    fontWeight: 'bold',
+                  }}
+                >
+                  HD-{loan?.id}
+                </MText>
+              </View>
+              <MText
+                ellipsizeMode="clip"
+                numberOfLines={1}
+                style={{
+                  flex: 1,
+                  color: '#D1D1D6',
+                  textAlign: 'center',
+                }}
+              >
+                --------------------------------------------------------------------------------------------------------
+              </MText>
+              <View
+                style={{
+                  flexDirection: 'row',
+                  justifyContent: 'space-between',
+                  alignItems: 'center',
+                }}
+              >
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#333333',
+                  }}
+                >
+                  Số tiền vay (1)+(2)
+                </MText>
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#EF592E',
+                    fontWeight: 'bold',
+                  }}
+                >
+                  {formatMoney(loan?.loanAmount)} đ
+                </MText>
+              </View>
+              <View
+                style={{
+                  flexDirection: 'row',
+                  justifyContent: 'space-between',
+                  alignItems: 'center',
+                  marginTop: 5,
+                }}
+              >
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#999999',
+                    marginLeft: 24,
+                  }}
+                >
+                  Số tiền giải ngân (1)
+                </MText>
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#333333',
+                  }}
+                >
+                  {formatMoney(loan?.loanAmount)} đ
+                </MText>
+              </View>
+              <View
+                style={{
+                  flexDirection: 'row',
+                  justifyContent: 'space-between',
+                  alignItems: 'center',
+                  marginTop: 4,
+                }}
+              >
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#999999',
+                    marginLeft: 24,
+                  }}
+                >
+                  Số tiền bảo hiểm (2)
+                </MText>
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#333333',
+                  }}
+                >
+                  {formatMoney(loan?.loanAmount)} đ
+                </MText>
+              </View>
+              <MText
+                ellipsizeMode="clip"
+                numberOfLines={1}
+                style={{
+                  flex: 1,
+                  color: '#D1D1D6',
+                  textAlign: 'center',
+                }}
+              >
+                --------------------------------------------------------------------------------------------------------
+              </MText>
+              <View
+                style={{
+                  flexDirection: 'row',
+                  justifyContent: 'space-between',
+                  alignItems: 'center',
+                }}
+              >
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#333333',
+                  }}
+                >
+                  Thời hạn
+                </MText>
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#333333',
+                    fontWeight: 'bold',
+                  }}
+                >
+                  12 tháng
+                </MText>
+              </View>
+              <View
+                style={{
+                  flexDirection: 'row',
+                  justifyContent: 'space-between',
+                  alignItems: 'center',
+                  marginTop: 8,
+                }}
+              >
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#333333',
+                  }}
+                >
+                  Ngày dự kiến giải ngân
+                </MText>
+                <MText
+                  style={{
+                    fontSize: 12,
+                    color: '#333333',
+                    fontWeight: 'bold',
+                  }}
+                >
+                  16/05/2023
+                </MText>
+              </View>
+            </View>
+            <View
+              style={{
+                backgroundColor: '#FFF3E9',
+                marginTop: 16,
+                flexDirection: 'row',
+                paddingHorizontal: 16,
+                paddingVertical: 10,
+              }}
+            >
+              <MText
+                style={{
+                  fontSize: 10,
+                  color: '#333333',
+                  width: '25%',
+                  textAlign: 'center',
+                }}
+              >
+                Ngày thanh toán
+              </MText>
+              <MText
+                style={{
+                  fontSize: 10,
+                  color: '#333333',
+                  width: '25%',
+                  textAlign: 'center',
+                }}
+              >
+                Gốc trả kỳ
+              </MText>
+              <MText
+                style={{
+                  fontSize: 10,
+                  color: '#333333',
+                  width: '25%',
+                  textAlign: 'center',
+                }}
+              >
+                Tổng lãi phí
+              </MText>
+              <MText
+                style={{
+                  fontSize: 10,
+                  color: '#333333',
+                  width: '25%',
+                  textAlign: 'center',
+                }}
+              >
+                Tổng trả kỳ
+              </MText>
+            </View>
+
+            <MText style={$des}>
+              <MText style={{ fontSize: 10, color: '#E40010' }}>*</MText> Đây là
+              lãi suất áp dụng cho khách hàng có điểm tín dụng tốt. Lãi suất
+              thực tế sẽ hiển thị sau khi hoàn thiện vay
+            </MText>
+            <View
+              style={{
+                backgroundColor: '#FFF8F2',
+                borderRadius: 8,
+                paddingHorizontal: 12,
+                paddingVertical: 8,
+                marginHorizontal: 16,
+                marginTop: 16,
+              }}
+            >
+              <View
+                style={{
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                  gap: 5,
+                }}
+              >
+                <IconNotify />
+                <MText
+                  style={{
+                    color: '#EF592E',
+                    fontWeight: 'bold',
+                  }}
+                >
+                  Bước cuối cùng rồi!!!
+                </MText>
+              </View>
+              <MText
+                style={{
+                  color: '#828282',
+                  marginTop: 10,
+                }}
+              >
+                Vui lòng eKYC - hoàn thiện xác thực khuôn mặt và ký hợp đồng để
+                được giải ngân nhanh nhất!
+              </MText>
+            </View>
+
+            <MButton
+              onPress={() => {
+                navigation.push(ScreenNames.LivenessV2, { loan });
+              }}
+              style={{
+                marginVertical: 24,
+                marginHorizontal: 16,
+              }}
+            >
+              <LinearGradient
+                start={{ x: 1, y: 0 }}
+                end={{ x: 0, y: 1 }}
+                style={{
+                  height: 40,
+                  marginVertical: 16,
+                  borderRadius: 30,
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                }}
+                colors={['#FF7A00', '#EF4123']}
+              >
+                <MText
+                  style={{
+                    color: 'white',
+                    fontSize: 16,
+                  }}
+                >
+                  Đi tới eKYC
+                </MText>
+              </LinearGradient>
+            </MButton>
+          </ScrollView>
+        </View>
+      </View>
+    </View>
+  );
+}
+
+const $des: TextStyle = {
+  fontSize: 10,
+  color: '#828282',
+  paddingHorizontal: 16,
+  fontStyle: 'italic',
+  marginTop: 16,
+};
+
+const $title: TextStyle = {
+  fontSize: 16,
+  fontWeight: 'bold',
+  color: '#333333',
+  textAlign: 'center',
+  paddingVertical: 16,
+};
+
+const $h: ViewStyle = {
+  backgroundColor: '#EF592E',
+  position: 'absolute',
+  height: 30,
+  width: '100%',
+};
+
+const $bg: ViewStyle = {
+  borderTopLeftRadius: 30,
+  borderTopRightRadius: 30,
+  backgroundColor: 'white',
+  flex: 1,
+};

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

@@ -723,7 +723,7 @@ export default function ReviewInformation(props) {
                     ) : (
                       <RadioIcon />
                     )}
-                    <MText>Trùng với hiện tại</MText>
+                    <MText>Có trùng</MText>
                   </TouchableOpacity>
                   <TouchableOpacity
                     onPress={() => setFieldValue('residentType', 15)}

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

@@ -169,6 +169,7 @@ export default function ReviewInformationOther(props) {
           },
         ],
       };
+
       const response = await Api.getInstance().updateInfoJob(body);
       setIsLoading(false);
       if (response.kind === 'ok') {

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

@@ -19,7 +19,12 @@ import { MText } from '../../components/MText';
 import { Formik } from 'formik';
 import { CheckBox, CheckBoxActive, DropDown2, Tick2 } from '../../assets/icons';
 import { color } from '../../theme';
-import { formatDDMMYYY, formatMoney } from '../../utils';
+import {
+  EnumTypeAsset,
+  EnumTypeCar,
+  formatDDMMYYY,
+  formatMoney,
+} from '../../utils';
 import appStore from '../../AppStore';
 import { ScreenNames } from '../../navigation';
 import KeyboardSpacer from '../../components/keyboardspace';
@@ -63,6 +68,8 @@ export default function ReviewLoan(props: any) {
         ownerFullName: values?.ownerFullName,
         motobikeCertificateNumber: values?.motobikeCertificateNumber,
         motobikeCertificateDate: values?.motobikeCertificateDate,
+        typeLoanBrief: values?.typeLoanBrief,
+        carTypeId: values?.carTypeId,
       };
       const response = await Api.getInstance().updateInfoLoan(body);
       setIsLoading(false);
@@ -201,6 +208,15 @@ export default function ReviewLoan(props: any) {
               response.data?.data?.yearCar
             );
           }
+
+          formRef.current?.setFieldValue(
+            'typeLoanBrief',
+            response.data.data?.typeLoanBrief ?? null
+          );
+          formRef.current?.setFieldValue(
+            'carTypeId',
+            response.data.data?.carTypeId ?? null
+          );
         } else {
         }
       }
@@ -326,6 +342,8 @@ export default function ReviewLoan(props: any) {
               ownerFullName: '',
               motobikeCertificateNumber: '',
               motobikeCertificateDate: '',
+              typeLoanBrief: null,
+              carTypeId: null,
             }}
             validationSchema={yup.object().shape({
               loanAmount: yup.string().required('Số tiền là bắt buộc'),
@@ -352,6 +370,14 @@ export default function ReviewLoan(props: any) {
               motobikeCertificateDate: yup
                 .string()
                 .required('Vui lòng nhập ngày đăng ký'),
+              typeLoanBrief: yup
+                .number()
+                .required('Vui lòng chọn loại tài sản')
+                .nullable(),
+              carTypeId: yup
+                .number()
+                .required('Vui lòng chọn loại xe')
+                .nullable(),
             })}
           >
             {({
@@ -987,6 +1013,79 @@ export default function ReviewLoan(props: any) {
                     )}
                   </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: 'Be Vietnam Pro 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: 'Be Vietnam Pro Medium',
+                        }}
+                      >
+                        {
+                          EnumTypeCar.find((x) => x.id === values.carTypeId)
+                            ?.name
+                        }
+                      </MText>
+                      <DropDown2 />
+                    </TouchableOpacity>
+                    {errors && errors.carTypeId && (
+                      <MText style={$error}>{errors.carTypeId}</MText>
+                    )}
+                  </View>
+                </View>
                 <MButton
                   onPress={() => {
                     handleSubmit();