react-native-timacare 3.1.2 → 3.1.3-beta

package/src/navigation/primary-navigator.tsx

@@ -57,6 +57,19 @@ import { QrPayment } from '../screens/detail-loan/QrPayment';
 import { ShowQrCode } from '../screens/detail-loan/ShowQrCode';
 import { UpdateLoan } from '../screens/loan/UpdateLoan';
 import { PreviewSchedulePaymentTopup } from '../screens/loan/PreviewSchedulePaymentTopup';
+import { TTSNationalIDFront } from '../screens/toan-trinh-so/TTSNationalIDFront';
+import VehicleRegistration from '../screens/toan-trinh-so/VehicleRegistration';
+import VehicleRegistrationFront from '../screens/toan-trinh-so/VehicleRegistrationFront';
+import VehicleCamera from '../screens/toan-trinh-so/VehicleCamera';
+import VehicleRegistrationBack from '../screens/toan-trinh-so/VehicleRegistrationBack';
+import RegisterCamera from '../screens/toan-trinh-so/RegisterCamera';
+import { OCR } from '../screens/toan-trinh-so/OCR';
+import ReviewInformation from '../screens/toan-trinh-so/ReviewInformation';
+import ReviewLoan from '../screens/toan-trinh-so/ReviewLoan';
+import MSelect from '../components/MSelect';
+import ReviewInformationOther from '../screens/toan-trinh-so/ReviewInformationOther';
+import TTSNationalIDBack from '../screens/toan-trinh-so/TTSNationalIDBack';
+import TTSSelfie from '../screens/toan-trinh-so/TTSSelfie';
 
 export const ScreenNames = {
   Splash: 'Splash',
@@ -113,6 +126,19 @@ export const ScreenNames = {
   ShowQrCode: 'ShowQrCode',
   UpdateLoan: 'UpdateLoan',
   PreviewSchedulePaymentTopup: 'PreviewSchedulePaymentTopup',
+  TTSNationalIDFront: 'TTSNationalIDFront',
+  VehicleRegistration: 'VehicleRegistration',
+  VehicleRegistrationFront: 'VehicleRegistrationFront',
+  VehicleRegistrationBack: 'VehicleRegistrationBack',
+  VehicleCamera: 'VehicleCamera',
+  RegisterCamera: 'RegisterCamera',
+  OCR: 'OCR',
+  ReviewInformation: 'ReviewInformation',
+  ReviewLoan: 'ReviewLoan',
+  MSelect: 'MSelect',
+  ReviewInformationOther: 'ReviewInformationOther',
+  TTSNationalIDBack: 'TTSNationalIDBack',
+  TTSSelfie: 'TTSSelfie',
 };
 
 const Stack = createNativeStackNavigator();
@@ -129,6 +155,8 @@ export function PrimaryNavigator(props) {
       screenOptions={{
         headerShown: false,
         gestureEnabled: true,
+        statusBarStyle: 'light',
+        statusBarColor: '#FF8E4F',
       }}
     >
       <Stack.Screen name={ScreenNames.Splash} component={Splash} />
@@ -222,6 +250,46 @@ export function PrimaryNavigator(props) {
         name={ScreenNames.PreviewSchedulePaymentTopup}
         component={PreviewSchedulePaymentTopup}
       />
+      <Stack.Screen
+        name={ScreenNames.TTSNationalIDFront}
+        component={TTSNationalIDFront}
+      />
+      <Stack.Screen
+        name={ScreenNames.VehicleRegistration}
+        component={VehicleRegistration}
+      />
+      <Stack.Screen
+        name={ScreenNames.VehicleRegistrationFront}
+        component={VehicleRegistrationFront}
+      />
+      <Stack.Screen
+        name={ScreenNames.VehicleRegistrationBack}
+        component={VehicleRegistrationBack}
+      />
+      <Stack.Screen
+        name={ScreenNames.VehicleCamera}
+        component={VehicleCamera}
+      />
+      <Stack.Screen
+        name={ScreenNames.RegisterCamera}
+        component={RegisterCamera}
+      />
+      <Stack.Screen name={ScreenNames.OCR} component={OCR} />
+      <Stack.Screen
+        name={ScreenNames.ReviewInformation}
+        component={ReviewInformation}
+      />
+      <Stack.Screen name={ScreenNames.ReviewLoan} component={ReviewLoan} />
+      <Stack.Screen name={ScreenNames.MSelect} component={MSelect} />
+      <Stack.Screen
+        name={ScreenNames.ReviewInformationOther}
+        component={ReviewInformationOther}
+      />
+      <Stack.Screen
+        name={ScreenNames.TTSNationalIDBack}
+        component={TTSNationalIDBack}
+      />
+      <Stack.Screen name={ScreenNames.TTSSelfie} component={TTSSelfie} />
     </Stack.Navigator>
   );
 }

package/src/screens/camera/index.tsx

@@ -255,7 +255,7 @@ export const Camera = observer(function Camera(props: any) {
           style={[
             commonStyles.row,
             commonStyles.alignCenter,
-            { paddingHorizontal: 16 },
+            { paddingHorizontal: 16, marginTop: 16 },
           ]}
         >
           <MButton

package/src/screens/eSign/Store.tsx

@@ -127,14 +127,21 @@ class Store {
   }
 
   @action
-  async getPreviewContract(id, onSuccess, onError) {
+  async getPreviewContract(id, onSuccess, onError, callback) {
     try {
       const response = await Api.getInstance().previewContract(id);
       if (response.kind === 'ok') {
         if (response.data.meta.errorCode === 200) {
           if (onSuccess) onSuccess(response.data.data);
         } else {
-          Alert.alert('Thông báo', response.data.meta.errorMessage);
+          Alert.alert('Thông báo', response.data.meta.errorMessage, [
+            {
+              text: 'Đồng ý',
+              onPress: () => {
+                if (callback) callback();
+              },
+            },
+          ]);
           if (onError) onError();
         }
       } else {

package/src/screens/eSign/index.tsx

@@ -149,6 +149,9 @@ export const ESign = observer(function ESign(props: any) {
       },
       () => {
         setLoading(false);
+      },
+      () => {
+        navigation.goBack();
       }
     );
   }, []);
@@ -285,7 +288,7 @@ export const ESign = observer(function ESign(props: any) {
           >{`Nhập mã OTP`}</MText>
           <Formik
             initialValues={{
-              otp: __DEV__ ? '' : '',
+              otp: __DEV__ ? '1234' : '',
             }}
             onSubmit={(values, setFieldValue) => {}}
             validationSchema={yup.object().shape({

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

@@ -24,8 +24,11 @@ export const FullSubmit = observer(function FullSubmit(props: any) {
       <MHeader
         title="Hoàn thiện hồ sơ"
         onBack={() => {
-          navigation.goBack();
-          FullSubmitStore.tab = 1;
+          if (tab === 2) {
+            setTab(1);
+          } else {
+            navigation.goBack();
+          }
         }}
       />
       <SafeAreaView style={{ flex: 1 }}>
@@ -37,12 +40,10 @@ export const FullSubmit = observer(function FullSubmit(props: any) {
             borderRadius: 30,
             marginHorizontal: 16,
             marginTop: 16,
+            marginBottom: 16,
           }}
         >
-          <View
-            // onPress={() => setTab(1)}
-            style={{ flex: 1 }}
-          >
+          <View style={{ flex: 1 }}>
             <LinearGradient
               colors={
                 FullSubmitStore.tab === 1
@@ -65,7 +66,6 @@ export const FullSubmit = observer(function FullSubmit(props: any) {
             </LinearGradient>
           </View>
           <View
-            // onPress={() => setTab(2)}
             style={{
               flex: 1,
             }}

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

@@ -96,7 +96,7 @@ export const UpdateDocument = observer(function UpdateDocument({
       ) : (
         <View style={{ flex: 1 }}>
           <ScrollView style={{ flex: 1 }}>
-            <View style={{ margin: 16 }}>
+            <View style={{ marginHorizontal: 16, marginBottom: 16 }}>
               <MText style={[commonStyles.textNormalBold, { fontSize: 16 }]}>
                 UPLOAD CHỨNG TỪ
               </MText>

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

@@ -246,7 +246,7 @@ export const UpdateInfo = observer(function UpdateInfo({
             handleChange,
             isValid,
           }) => (
-            <View style={{ margin: 16 }}>
+            <View style={{ marginHorizontal: 16, marginBottom: 16 }}>
               <MText style={[commonStyles.textNormalBold, { fontSize: 16 }]}>
                 THÔNG TIN ĐƠN
               </MText>