react-native-timacare 3.1.13-beta → 3.1.15-beta

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

@@ -568,12 +568,16 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
               }}
               onPress={() => {
                 livenessStore.ekycSuccess = false;
-                navigation.dispatch(
-                  CommonActions.reset({
-                    index: 1,
-                    routes: [{ name: ScreenNames.Main }],
-                  })
-                );
+                if (loan?.typeLoan === 5) {
+                  navigation.push(ScreenNames.TTSSignLoan, { loan });
+                } else {
+                  navigation.dispatch(
+                    CommonActions.reset({
+                      index: 1,
+                      routes: [{ name: ScreenNames.Main }],
+                    })
+                  );
+                }
               }}
             >
               <MText style={[commonStyles.textNormalBold, { color: 'white' }]}>

package/src/screens/register/index.tsx

@@ -184,7 +184,7 @@ export const Register = observer(function Register() {
           <View style={{ marginTop: 50 }}>
             <Formik
               initialValues={{
-                phone: __DEV__ ? '0839621578' : '',
+                phone: __DEV__ ? '0339223176' : '',
                 terms: true,
               }}
               onSubmit={(values) => {

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

@@ -1,20 +1,53 @@
 //@ts-nocheck
-import React from 'react';
-import { ScrollView, TextStyle, View, ViewStyle } from 'react-native';
+import React, { useEffect } from 'react';
+import { Alert, 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 { formatDDMMYYY, formatMoney } from '../../utils';
 import { IconNotify } from '../../assets/svgs';
 import MButton from '../../components/MButton';
 import LinearGradient from 'react-native-linear-gradient';
 import { ScreenNames } from '../../navigation';
+import { Api } from '../../services/api';
+import Loading from '../../components/Loading';
 
 export default function LoanInterestRate(props) {
   const loan = props?.route?.params?.loan;
 
   const navigation = useNavigation();
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [data, setData] = React.useState(null);
+
+  const getData = async () => {
+    setIsLoading(true);
+    try {
+      const response = await Api.getInstance().getPaymentPlan(loan?.id);
+      setIsLoading(false);
+      if (response.kind === 'ok') {
+        if (response.data?.meta?.errorCode === 200) {
+          setData(response.data?.data);
+        } else {
+          Alert.alert(
+            'Thông báo',
+            response.data?.meta?.message ||
+              'Có lỗi xảy ra, vui lòng thử lại sau'
+          );
+        }
+      } else {
+        Alert.alert('Thông báo', 'Có lỗi xảy ra, vui lòng thử lại sau');
+      }
+    } catch (error) {
+      console.error('Error fetching data:', error);
+      setIsLoading(false);
+      Alert.alert('Thông báo', 'Có lỗi xảy ra, vui lòng thử lại sau');
+    }
+  };
+
+  useEffect(() => {
+    getData();
+  }, []);
 
   return (
     <View style={commonStyles.fill}>
@@ -56,7 +89,7 @@ export default function LoanInterestRate(props) {
                     fontWeight: 'bold',
                   }}
                 >
-                  HD-{loan?.id}
+                  HD-{data?.loanBriefId}
                 </MText>
               </View>
               <MText
@@ -92,7 +125,7 @@ export default function LoanInterestRate(props) {
                     fontWeight: 'bold',
                   }}
                 >
-                  {formatMoney(loan?.loanAmount)} đ
+                  {formatMoney(data?.totalMoney)} đ
                 </MText>
               </View>
               <View
@@ -118,7 +151,7 @@ export default function LoanInterestRate(props) {
                     color: '#333333',
                   }}
                 >
-                  {formatMoney(loan?.loanAmount)} đ
+                  {formatMoney(data?.totalLoanAmount)} đ
                 </MText>
               </View>
               <View
@@ -144,7 +177,7 @@ export default function LoanInterestRate(props) {
                     color: '#333333',
                   }}
                 >
-                  {formatMoney(loan?.loanAmount)} đ
+                  {formatMoney(data?.totalMoneyInsurance)} đ
                 </MText>
               </View>
               <MText
@@ -180,7 +213,7 @@ export default function LoanInterestRate(props) {
                     fontWeight: 'bold',
                   }}
                 >
-                  12 tháng
+                  {data?.loanTime} tháng
                 </MText>
               </View>
               <View
@@ -206,7 +239,7 @@ export default function LoanInterestRate(props) {
                     fontWeight: 'bold',
                   }}
                 >
-                  16/05/2023
+                  {formatDDMMYYY(data?.expectedDisbursementDate)}
                 </MText>
               </View>
             </View>
@@ -260,6 +293,60 @@ export default function LoanInterestRate(props) {
                 Tổng trả kỳ
               </MText>
             </View>
+            {data?.listPaymentSchedule?.map((item, index) => (
+              <View
+                key={index}
+                style={{
+                  flexDirection: 'row',
+                  paddingHorizontal: 16,
+                  paddingVertical: 16,
+                  borderBottomWidth: 1,
+                  borderBottomColor: '#F0F0F0',
+                }}
+              >
+                <MText
+                  style={{
+                    fontSize: 10,
+                    color: '#333333',
+                    width: '25%',
+                    textAlign: 'center',
+                  }}
+                >
+                  {item?.payDate}
+                </MText>
+                <MText
+                  style={{
+                    fontSize: 10,
+                    color: '#333333',
+                    width: '25%',
+                    textAlign: 'center',
+                  }}
+                >
+                  {formatMoney(item?.moneyOriginal)} đ
+                </MText>
+                <MText
+                  style={{
+                    fontSize: 10,
+                    color: '#333333',
+                    width: '25%',
+                    textAlign: 'center',
+                  }}
+                >
+                  {formatMoney(item?.totalInterest)} đ
+                </MText>
+                <MText
+                  style={{
+                    fontSize: 10,
+                    color: 'rgba(239, 89, 46, 1)',
+                    width: '25%',
+                    textAlign: 'center',
+                    fontWeight: 'bold',
+                  }}
+                >
+                  {formatMoney(item?.totalMoneyNeedPayment)} đ
+                </MText>
+              </View>
+            ))}
 
             <MText style={$des}>
               <MText style={{ fontSize: 10, color: '#E40010' }}>*</MText> Đây là
@@ -303,41 +390,41 @@ export default function LoanInterestRate(props) {
                 được giải ngân nhanh nhất!
               </MText>
             </View>
-
-            <MButton
-              onPress={() => {
-                navigation.push(ScreenNames.LivenessV2, { loan });
-              }}
+          </ScrollView>
+          <MButton
+            onPress={() => {
+              navigation.push(ScreenNames.LivenessV2, { loan });
+            }}
+            style={{
+              marginVertical: 24,
+              marginHorizontal: 16,
+            }}
+          >
+            <LinearGradient
+              start={{ x: 1, y: 0 }}
+              end={{ x: 0, y: 1 }}
               style={{
-                marginVertical: 24,
-                marginHorizontal: 16,
+                height: 40,
+                marginVertical: 16,
+                borderRadius: 30,
+                alignItems: 'center',
+                justifyContent: 'center',
               }}
+              colors={['#FF7A00', '#EF4123']}
             >
-              <LinearGradient
-                start={{ x: 1, y: 0 }}
-                end={{ x: 0, y: 1 }}
+              <MText
                 style={{
-                  height: 40,
-                  marginVertical: 16,
-                  borderRadius: 30,
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  color: 'white',
+                  fontSize: 16,
                 }}
-                colors={['#FF7A00', '#EF4123']}
               >
-                <MText
-                  style={{
-                    color: 'white',
-                    fontSize: 16,
-                  }}
-                >
-                  Đi tới eKYC
-                </MText>
-              </LinearGradient>
-            </MButton>
-          </ScrollView>
+                Đi tới eKYC
+              </MText>
+            </LinearGradient>
+          </MButton>
         </View>
       </View>
+      <Loading isLoading={isLoading} />
     </View>
   );
 }

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

@@ -264,12 +264,14 @@ export const OCR = observer(function OCR(props: any) {
   const takePhoto = async () => {
     setTaking(true);
     const options = {
-      width: 720,
+      // width: 720,
       base64: true,
       pauseAfterCapture: true,
       fixOrientation: false,
       forceUpOrientation: false,
       orientation: RNCamera.Constants.Orientation.portrait,
+      quality: 0.8,
+      pictureSize: '1280x720',
     };
     const data = await myCamera.current.takePictureAsync(options);
     setTaking(false);

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

@@ -143,7 +143,7 @@ export default function RegisterCamera(props: any) {
   const takePhoto = async () => {
     setTaking(true);
     const options = {
-      width: 720,
+      // width: 720,
       pauseAfterCapture: true,
       fixOrientation: false,
       forceUpOrientation: false,
@@ -252,6 +252,8 @@ export default function RegisterCamera(props: any) {
               buttonPositive: 'Ok',
               buttonNegative: 'Cancel',
             }}
+            quality={0.8}
+            pictureSize="1280x720"
           >
             {({ camera, status, recordAudioPermissionStatus }) => {
               if (status !== 'READY') return <ActivityIndicator />;