react-native-timacare 3.1.65 → 3.1.67

package/src/screens/mySignViettel/index.tsx

@@ -0,0 +1,278 @@
+//@ts-nocheck
+import React from 'react';
+import {
+  Image,
+  Linking,
+  SafeAreaView,
+  ScrollView,
+  TextStyle,
+  TouchableOpacity,
+  View,
+} from 'react-native';
+import { MText } from '../../components/MText';
+import { IconHome } from '../../assets/v3';
+import { useNavigation } from '@react-navigation/native';
+import { ScreenNames } from '../../navigation';
+import LinearGradient from 'react-native-linear-gradient';
+
+export default function MySignViettel(props: any) {
+  const navigation = useNavigation();
+  const url = props?.route?.params?.url;
+  return (
+    <View style={{ flex: 1, backgroundColor: '#FFFFFF' }}>
+      <SafeAreaView style={{ flex: 1, backgroundColor: '#FFFFFF' }}>
+        <View
+          style={{
+            paddingVertical: 16,
+            flexDirection: 'row',
+            alignItems: 'center',
+            paddingHorizontal: 16,
+            borderBottomWidth: 1,
+            borderColor: '#F2F2F2',
+          }}
+        >
+          <TouchableOpacity
+            style={{ zIndex: 10000 }}
+            onPress={() => {
+              navigation.navigate(ScreenNames.Main);
+            }}
+          >
+            <IconHome />
+          </TouchableOpacity>
+
+          <MText style={$header}>Chữ ký số</MText>
+        </View>
+
+        <ScrollView>
+          <View
+            style={{
+              paddingHorizontal: 16,
+              flexDirection: 'row',
+              alignItems: 'center',
+              justifyContent: 'space-between',
+              borderBottomWidth: 1,
+              borderColor: '#F2F2F2',
+              paddingVertical: 10,
+            }}
+          >
+            <MText
+              style={{
+                color: '#828282',
+              }}
+            >
+              Trạng thái
+            </MText>
+            <View
+              style={{
+                backgroundColor: '#FFEDED',
+                paddingHorizontal: 8,
+                paddingVertical: 10,
+                borderRadius: 4,
+              }}
+            >
+              <MText
+                style={{
+                  color: '#EE595C',
+                  fontSize: 12,
+                  fontWeight: 'bold',
+                }}
+              >
+                Chưa ký
+              </MText>
+            </View>
+          </View>
+          <View
+            style={{
+              flexDirection: 'column',
+              alignItems: 'center',
+              marginTop: 24,
+            }}
+          >
+            <Image
+              source={require('./Layer_3.png')}
+              style={{
+                width: '100%',
+                height: 120,
+                resizeMode: 'contain',
+              }}
+            />
+            <MText
+              style={{
+                textAlign: 'center',
+                fontWeight: 'bold',
+                marginTop: 24,
+                paddingHorizontal: 24,
+              }}
+            >
+              Quý khách vui lòng nhấn “Đi đến ký hợp đồng” hoặc kiểm tra
+              email/SMS để thực hiện ký số hợp đồng điện tử
+            </MText>
+            <TouchableOpacity
+              onPress={() => {
+                if (url) {
+                  Linking.openURL(url);
+                }
+              }}
+              style={{
+                marginTop: 16,
+              }}
+            >
+              <LinearGradient
+                start={{ x: 1, y: 0 }}
+                end={{ x: 0, y: 1 }}
+                style={{
+                  height: 40,
+                  marginVertical: 16,
+                  borderRadius: 30,
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  paddingHorizontal: 24,
+                }}
+                colors={['#FF7A00', '#EF4123']}
+              >
+                <MText
+                  style={{
+                    color: 'white',
+                    fontSize: 16,
+                  }}
+                >
+                  Đi đến ký hợp đồng
+                </MText>
+              </LinearGradient>
+            </TouchableOpacity>
+          </View>
+
+          <MText
+            style={{
+              color: '#828282',
+              fontSize: 12,
+              paddingHorizontal: 16,
+            }}
+          >
+            Để thực hiện ký số, Quý khách vui lòng thực hiện theo một trong hai
+            cách sau đây:
+          </MText>
+          <MText
+            style={{
+              fontSize: 12,
+              paddingHorizontal: 16,
+              marginTop: 16,
+              fontWeight: 'bold',
+            }}
+          >
+            Cách 1: Ký bằng chứng thư số qua Ứng dụng Mysign Viettel
+          </MText>
+          <TouchableOpacity
+            onPress={() => {
+              Linking.openURL(
+                'https://cdn.tima.vn/file-pdf/viettel_mysign.pdf'
+              );
+            }}
+            style={{
+              paddingHorizontal: 16,
+              marginTop: 5,
+            }}
+          >
+            <MText
+              style={{
+                color: '#0079E9',
+                fontSize: 12,
+                fontWeight: 'bold',
+              }}
+            >
+              Hướng dẫn ký số qua Ứng dụng Mysign
+            </MText>
+          </TouchableOpacity>
+          <MText
+            style={{
+              fontSize: 12,
+              paddingHorizontal: 16,
+              marginTop: 16,
+              fontWeight: 'bold',
+            }}
+          >
+            Cách 2: Ký 1 lần bằng OTP
+          </MText>
+          <TouchableOpacity
+            onPress={() => {
+              Linking.openURL('https://cdn.tima.vn/file-pdf/viettel_otp.pdf');
+            }}
+            style={{
+              paddingHorizontal: 16,
+              marginTop: 5,
+            }}
+          >
+            <MText
+              style={{
+                color: '#0079E9',
+                fontSize: 12,
+                fontWeight: 'bold',
+              }}
+            >
+              Hướng dẫn ký số bằng OTP
+            </MText>
+          </TouchableOpacity>
+
+          <View
+            style={{
+              marginTop: 24,
+              marginHorizontal: 16,
+              backgroundColor: '#FFEDED',
+              borderRadius: 8,
+              paddingHorizontal: 10,
+              paddingVertical: 16,
+            }}
+          >
+            <MText
+              style={{
+                color: '#EE595C',
+                fontSize: 12,
+                fontWeight: 'bold',
+              }}
+            >
+              Lưu ý:{' '}
+              <MText
+                style={{
+                  fontSize: 12,
+                  fontWeight: '400',
+                }}
+              >
+                Để bảo mật thông tin cá nhân, hợp đồng sẽ được ký tại Viettel
+                (Ứng dụng MySign, Website hopdongdientu.viettel.vn,...)
+              </MText>
+            </MText>
+          </View>
+
+          <View
+            style={{
+              marginTop: 10,
+              marginHorizontal: 16,
+              backgroundColor: '#F1FFEF',
+              borderRadius: 8,
+              paddingHorizontal: 10,
+              paddingVertical: 16,
+            }}
+          >
+            <MText
+              style={{
+                fontSize: 12,
+                fontWeight: '400',
+              }}
+            >
+              Tima hợp tác với Viettel cung cấp dịch vụ chữ ký số từ xa cho
+              khách hàng của Tima.
+            </MText>
+          </View>
+        </ScrollView>
+      </SafeAreaView>
+    </View>
+  );
+}
+const $header: TextStyle = {
+  fontSize: 16,
+  fontWeight: 'bold',
+  textAlign: 'center',
+  position: 'absolute',
+  left: 0,
+  right: 0,
+};

package/src/screens/sign-tima/ViewContract.tsx

@@ -23,6 +23,7 @@ export const ViewContract = observer(function ViewContract(props: any) {
   const navigation = useNavigation();
   const [source, setSource] = useState({});
   const [check, setCheck] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
 
   useEffect(() => {
     SignTimaStore.getContract(props.route.params.loan.id, (data) => {
@@ -31,48 +32,61 @@ export const ViewContract = observer(function ViewContract(props: any) {
   }, []);
 
   const sign = async () => {
-    const response = await Api.getInstance().sign_viettel_for_borrower_cimb({
-      loanBriefId: props.route.params.loan.id,
-      isTermesEtConditions: true,
-    });
-
-    if (response.kind === 'ok' && response.data?.meta?.errorCode === 200) {
-      Alert.alert(
-        'Thông báo',
-        'Vui lòng kiểm tra tin nhắn hoặc email để xác nhận ký hợp đồng',
-        [
-          {
-            text: 'OK',
-            onPress: () => {
-              navigation.dispatch(
-                CommonActions.reset({
-                  index: 1,
-                  routes: [{ name: ScreenNames.Main }],
-                })
-              );
-            },
-          },
-        ]
-      );
-    } else {
-      Alert.alert(
-        'Thông báo',
-        response.data?.meta?.errorMessage ||
-          'Có lỗi xảy ra, vui lòng thử lại sau',
-        [
-          {
-            text: 'OK',
-            onPress: () => {
-              navigation.dispatch(
-                CommonActions.reset({
-                  index: 1,
-                  routes: [{ name: ScreenNames.Main }],
-                })
-              );
+    try {
+      setIsLoading(true);
+      const response = await Api.getInstance().sign_viettel_for_borrower_cimb({
+        loanBriefId: props.route.params.loan.id,
+        isTermesEtConditions: true,
+      });
+      if (response.kind === 'ok' && response.data?.meta?.errorCode === 200) {
+        if (response.data?.data) {
+          navigation.push(ScreenNames.MySignViettel, {
+            url: response?.data?.data,
+          });
+        } else {
+          Alert.alert(
+            'Thông báo',
+            'Vui lòng kiểm tra tin nhắn hoặc email để xác nhận ký hợp đồng',
+            [
+              {
+                text: 'OK',
+                onPress: () => {
+                  navigation.dispatch(
+                    CommonActions.reset({
+                      index: 1,
+                      routes: [{ name: ScreenNames.Main }],
+                    })
+                  );
+                },
+              },
+            ]
+          );
+        }
+      } else {
+        Alert.alert(
+          'Thông báo',
+          response.data?.meta?.errorMessage ||
+            'Có lỗi xảy ra, vui lòng thử lại sau',
+          [
+            {
+              text: 'OK',
+              onPress: () => {
+                navigation.dispatch(
+                  CommonActions.reset({
+                    index: 1,
+                    routes: [{ name: ScreenNames.Main }],
+                  })
+                );
+              },
             },
-          },
-        ]
-      );
+          ]
+        );
+      }
+    } catch (error) {
+      console.log(error);
+      setIsLoading(false);
+    } finally {
+      setIsLoading(false);
     }
   };
   return (
@@ -132,7 +146,7 @@ export const ViewContract = observer(function ViewContract(props: any) {
             onPress={() => {
               sign();
             }}
-            disabled={!check}
+            disabled={!check || isLoading}
             style={{
               marginTop: 32,
               marginBottom: 16,
@@ -159,7 +173,7 @@ export const ViewContract = observer(function ViewContract(props: any) {
           </TouchableOpacity>
         </View>
       </SafeAreaView>
-      <Loading isLoading={SignTimaStore.isLoading} />
+      <Loading isLoading={isLoading} />
     </View>
   );
 });

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

@@ -387,7 +387,7 @@ export const OCR = observer(function OCR(props: any) {
       >
         <TouchableOpacity
           onPress={() => {
-            navigation.goBack();
+            navigation.navigate(ScreenNames.Main);
           }}
           style={{
             position: 'absolute',

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

@@ -60,14 +60,21 @@ export default function RegisterBack(props) {
         name: 'image.jpg',
       });
 
-      const response = await Api.getInstance().uploadImageOcr(formData);
+      const response = await Api.getInstance().uploadImageAutoDE(formData);
       setIsLoading(false);
       if (response.kind === 'ok') {
         if (response.data?.meta?.errorCode === 200) {
           navigation.dispatch(
             CommonActions.reset({
               index: 1,
-              routes: [{ name: ScreenNames.Main }],
+              routes: [
+                {
+                  name: ScreenNames.AssetInformation,
+                  params: {
+                    loan: props?.route?.params?.loan,
+                  },
+                },
+              ],
             })
           );
         } else {

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

@@ -59,15 +59,18 @@ export default function ReviewInformation(props) {
       HouseHoldDistrictId: values.houseHoldDistrictId,
       HouseHoldWardId: values.houseHoldWardId,
       HouseHoldAddress: values.houseHoldAddress,
+      bankId: values.bankId,
+      bankAccountName: values?.bankAccountName,
+      bankAccountNumber: values?.bankAccountNumber,
     };
 
     try {
       setIsLoading(true);
-      const response = await Api.getInstance().updateInfoCustomer(body);
+      const response = await Api.getInstance().updateInfoCustomerV2(body);
       setIsLoading(false);
       if (response.kind === 'ok') {
         if (response.data?.meta?.errorCode === 200) {
-          navigation.push(ScreenNames.ReviewLoan, {
+          navigation.push(ScreenNames.ReviewInformationOther, {
             loan: props.route?.params?.loan,
           });
         } else {
@@ -84,7 +87,7 @@ export default function ReviewInformation(props) {
   const getData = async () => {
     try {
       setIsLoading(true);
-      const response = await Api.getInstance().getInfoCustomer(
+      const response = await Api.getInstance().getInfoCustomerV2(
         props.route?.params?.loan?.id
       );
       setIsLoading(false);
@@ -234,6 +237,23 @@ export default function ReviewInformation(props) {
               ? response?.data?.data?.houseHoldAddress
               : ''
           );
+
+          formRef.current.setFieldValue(
+            'bankAccountName',
+            response?.data?.data?.bankAccountName ?? ''
+          );
+          formRef.current.setFieldValue(
+            'bankAccountNumber',
+            response?.data?.data?.bankAccountNumber ?? ''
+          );
+          formRef.current.setFieldValue(
+            'bankId',
+            response?.data?.data?.bankId ?? null
+          );
+          formRef.current.setFieldValue(
+            'bankName',
+            response?.data?.data?.bankName ?? ''
+          );
         } else {
         }
       }
@@ -300,9 +320,9 @@ export default function ReviewInformation(props) {
             >
               <IconBack />
             </TouchableOpacity>
-            <MText style={$title}>Thông tin chi tiết</MText>
+            <MText style={$title}>Thông tin cá nhân</MText>
           </View>
-          <StepIndicator steps={3} currentStep={0} />
+          {/* <StepIndicator steps={3} currentStep={0} /> */}
           <Formik
             innerRef={formRef}
             onSubmit={onSubmit}
@@ -330,6 +350,10 @@ export default function ReviewInformation(props) {
               houseHoldWardId: null,
               houseHoldWardName: '',
               houseHoldAddress: '',
+              bankId: null,
+              bankName: '',
+              bankAccountName: '',
+              bankAccountNumber: '',
             }}
             validationSchema={yup.object().shape({
               fullName: yup.string().required('Vui lòng nhập họ tên'),
@@ -359,6 +383,11 @@ export default function ReviewInformation(props) {
                 .required('Quận huyện là bắt buộc'),
               houseHoldWardName: yup.string().required('Phường xã là bắt buộc'),
               houseHoldAddress: yup.string().required('Địa chỉ 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
+                .string()
+                .required('Vui lòng nhập số tài khoản'),
             })}
           >
             {({
@@ -539,7 +568,81 @@ export default function ReviewInformation(props) {
                     /> */}
 
                     <MText style={[$title2, { marginTop: 16 }]}>
-                      1.2 Sổ hộ khẩu
+                      1.2 Thông tin giải ngân
+                    </MText>
+                    <MText style={$label}>Ngân hàng</MText>
+                    <TouchableOpacity
+                      style={$select}
+                      onPress={() => {
+                        navigation.push(ScreenNames.CommonSelect, {
+                          title: 'Chọn ngân hàng',
+                          data: ttsStore.listBank,
+                          callback: (value) => {
+                            setFieldValue('bankName', value.name);
+                            setFieldValue('bankId', value.id);
+                          },
+                        });
+                      }}
+                    >
+                      <MText
+                        numberOfLines={1}
+                        style={{
+                          color: '#333333',
+                          fontSize: 16,
+                          fontWeight: '500',
+                          flex: 1,
+                          fontFamily: 'BeVietnamPro-Medium',
+                        }}
+                      >
+                        {values.bankName}
+                      </MText>
+                      <DropDown2 />
+                    </TouchableOpacity>
+                    {errors && errors.bankName && (
+                      <MText style={$error}>{errors.bankName}</MText>
+                    )}
+                    <MText style={[$label, { marginTop: 16 }]}>
+                      Tên số tài khoản
+                    </MText>
+                    <TextInput
+                      numberOfLines={1}
+                      style={[
+                        $textInput,
+                        {
+                          color: '#333333',
+                          fontSize: 16,
+                          fontWeight: '500',
+                        },
+                      ]}
+                      value={values.bankAccountName}
+                      onChangeText={handleChange('bankAccountName')}
+                    />
+                    {errors && errors.bankAccountName && (
+                      <MText style={$error}>{errors.bankAccountName}</MText>
+                    )}
+                    <MText style={[$label, { marginTop: 16 }]}>
+                      Số tài khoản
+                    </MText>
+                    <TextInput
+                      keyboardType="number-pad"
+                      numberOfLines={1}
+                      style={[
+                        $textInput,
+                        {
+                          color: '#333333',
+                          fontSize: 16,
+                          fontWeight: '500',
+                        },
+                      ]}
+                      value={values.bankAccountNumber}
+                      onChangeText={handleChange('bankAccountNumber')}
+                    />
+                    {errors && errors.bankAccountNumber && (
+                      <MText style={$error}>{errors.bankAccountNumber}</MText>
+                    )}
+
+                    <MText style={[$title2, { marginTop: 16 }]}>
+                      1.3 Sổ hộ khẩu
                     </MText>
                     <View style={[$row]}>
                       <View style={[commonStyles.fill]}>
@@ -727,7 +830,7 @@ export default function ReviewInformation(props) {
                         </TouchableOpacity>
                       </View>
                     </View>
-                    <MText style={[$title2]}>1.3 Nơi ở hiện tại</MText>
+                    <MText style={[$title2]}>1.4 Nơi ở hiện tại</MText>
                     <MText
                       style={{
                         fontSize: 14,

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

@@ -42,7 +42,7 @@ export default function ReviewInformationOther(props) {
   const getData = async () => {
     try {
       setIsLoading(true);
-      const response = await Api.getInstance().getInfoJob(
+      const response = await Api.getInstance().getInfoJobV2(
         props.route?.params?.loan?.id
       );
       setIsLoading(false);
@@ -147,6 +147,7 @@ export default function ReviewInformationOther(props) {
   };
 
   useEffect(() => {
+    ttsStore.getRelationship();
     getData();
     ttsStore.getJob();
   }, []);
@@ -188,7 +189,7 @@ export default function ReviewInformationOther(props) {
                 ],
               };
 
-              const response = await Api.getInstance().updateInfoJob(body);
+              const response = await Api.getInstance().updateInfoJobV2(body);
               setIsLoading(false);
               if (response.kind === 'ok') {
                 if (response.data?.meta?.errorCode === 200) {
@@ -256,14 +257,14 @@ export default function ReviewInformationOther(props) {
                 zIndex: 1000,
               }}
               onPress={() => {
-                navigation.goBack();
+                navigation.navigate(ScreenNames.Main);
               }}
             >
               <IconBack />
             </TouchableOpacity>
-            <MText style={$title}>Thông tin chi tiết</MText>
+            <MText style={$title}>Thông tin cá nhân</MText>
           </View>
-          <StepIndicator steps={3} currentStep={2} />
+          {/* <StepIndicator steps={3} currentStep={2} /> */}
           <Formik
             onSubmit={onSubmit}
             validationSchema={yup.object().shape({
@@ -320,7 +321,7 @@ export default function ReviewInformationOther(props) {
               <ScrollView
                 style={[commonStyles.fill, { paddingHorizontal: 16 }]}
               >
-                <MText style={$title2}>3.1 Thông tin công việc</MText>
+                <MText style={$title2}>1.5 Thông tin công việc</MText>
                 <View style={$row}>
                   <View style={{ flex: 1 }}>
                     <MText style={$label}>Nghề nghiệp</MText>
@@ -554,7 +555,7 @@ export default function ReviewInformationOther(props) {
                 )}
 
                 <MText style={[$title2, { marginTop: 16 }]}>
-                  3.2 Tham chiếu
+                  1.6 Tham chiếu
                 </MText>
 
                 <MText
@@ -753,7 +754,7 @@ export default function ReviewInformationOther(props) {
                         fontSize: 16,
                       }}
                     >
-                      Xác nhận
+                      Hoàn thành cập nhật
                     </MText>
                   </LinearGradient>
                 </MButton>