react-native-timacare 3.3.55 → 3.3.57-cccd

package/src/screens/nationalIDBack/index.tsx

@@ -1,70 +1,50 @@
 //@ts-nocheck
 import React, { useState } from 'react';
 import {
-  ActivityIndicator,
-  Alert,
-  Dimensions,
   Image,
-  ImageStyle,
   SafeAreaView,
   ScrollView,
-  TouchableOpacity,
+  StyleSheet,
   View,
 } from 'react-native';
 import { StackActions, useNavigation } from '@react-navigation/native';
-import { observer, Observer } from 'mobx-react-lite';
+import { observer } from 'mobx-react-lite';
 import { commonStyles } from '../CommonStyles';
 import KeyboardSpacer from '../../components/keyboardspace';
 import MButton from '../../components/MButton';
-import { color } from '../../theme';
 import { ScreenNames } from '../../navigation';
 import { MText } from '../../components/MText';
-import {
-  CIMBBank,
-  IconBackWhite,
-  TimaSmall,
-  TimaSmallWhite,
-} from '../../assets/icons';
-import appStore from '../../AppStore';
+import { CIMBBank, TimaSmall, TimaSmallWhite } from '../../assets/icons';
 import nationalIDStore from './Store';
 import Loading from '../../components/Loading';
 import LinearGradient from 'react-native-linear-gradient';
 import MHeader from '../../components/MHeader';
 import livenessStore from '../liveness/LivenessStore';
 
-const logoView: ImageStyle = {
-  position: 'absolute',
-  width: '100%',
-  height: '100%',
-  resizeMode: 'cover',
-};
-
-const { width: screenWidth, height: screenHeight } = Dimensions.get('window');
-const frameWidth = screenWidth * 0.85;
-const frameHeight = frameWidth * 0.63; // tỷ lệ giống CCCD
-const frameAspectRatio = frameWidth / frameHeight;
+// Khung ảnh có chiều cao = 0.63 * chiều rộng nên tỉ lệ W/H = 1 / 0.63 (giống CCCD)
+const frameAspectRatio = 1 / 0.63;
 
 export const NationalIDBack = observer(function NationalIDBack(props: any) {
   const navigation = useNavigation();
   const [photo, setPhoto] = useState(null);
-  const loan = props.route.params?.loan;
   const [base64, setBase64] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
+  const loan = props.route.params?.loan;
 
-  const nextStep = (values) => {
+  const nextStep = () => {
     setIsLoading(true);
-    const form2 = new FormData();
-    form2.append('image', {
+    const form = new FormData();
+    form.append('image', {
       uri: photo,
       type: 'image/jpg',
       name: 'image.jpg',
     });
-    form2.append('loanbriefId', loan.id);
-    form2.append('TypeDocumentId', 311);
-    form2.append('UploadFrom', 3);
-    form2.append('SubTypeId', 2);
+    form.append('loanbriefId', loan.id);
+    form.append('TypeDocumentId', 311);
+    form.append('UploadFrom', 3);
+    form.append('SubTypeId', 2);
     nationalIDStore.uploadImage(
-      form2,
+      form,
       () => {
         setIsLoading(false);
         navigation.dispatch(StackActions.push(ScreenNames.Selfie, { loan }));
@@ -76,210 +56,102 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
   };
 
   const takePhoto = () => {
-    livenessStore.getConfigOcr(
-      (data) => {
-        if (data === 1) {
-          navigation.push(ScreenNames.CCCDCameraScreen, {
-            front: false,
-            callback: (photo) => {
-              setPhoto(photo);
-            },
-          });
-        } else {
-          navigation.push(ScreenNames.Camera, {
-            front: false,
-            callback: (photo) => {
-              setPhoto(photo);
-            },
-            base64: (data) => {
-              setBase64(data);
-            },
-          });
-        }
-      },
-      () => {
-        navigation.push(ScreenNames.Camera, {
-          front: false,
-          callback: (photo) => {
-            setPhoto(photo);
-          },
-          base64: (data) => {
-            setBase64(data);
-          },
-        });
-      }
-    );
+    navigation.push(ScreenNames.CCCDCameraScreen, {
+      front: false,
+      callback: setPhoto,
+    });
   };
 
   return (
-    <View style={{ flex: 1 }}>
-      <Image source={require('../../assets/img/EKYC.png')} style={logoView} />
-      <MHeader
-        title="Xác thực khách hàng"
-        onBack={() => {
-          navigation.goBack();
-        }}
+    <View style={commonStyles.fill}>
+      <Image
+        source={require('../../assets/img/EKYC.png')}
+        style={styles.logo}
       />
+      <MHeader title="Xác thực khách hàng" onBack={() => navigation.goBack()} />
       <SafeAreaView style={commonStyles.fill}>
         <ScrollView style={commonStyles.fill}>
-          <View style={{}}>
-            <View style={{ paddingHorizontal: 16, paddingVertical: 16 }}>
-              <View
-                style={{
-                  flexDirection: 'row',
-                  alignItems: 'center',
-                  marginTop: 16,
-                }}
-              >
-                <TimaSmallWhite />
-                <MText
-                  style={[
-                    commonStyles.textNormalBold,
-                    { fontSize: 16, color: '#FFFFFF', marginLeft: 8 },
-                  ]}
-                >
-                  Chụp CMND/ CCCD mặt sau
+          <View style={styles.body}>
+            <View style={styles.frontRow}>
+              <TimaSmallWhite />
+              <MText style={[commonStyles.textNormalBold, styles.frontLabel]}>
+                Chụp CMND/ CCCD mặt sau
+              </MText>
+            </View>
+            <View style={styles.frame}>
+              <Image
+                source={
+                  photo
+                    ? { uri: photo }
+                    : require('../../assets/img/national_id_back.png')
+                }
+                style={styles.frameImage}
+              />
+            </View>
+            <View style={styles.noteSection}>
+              <MText style={[commonStyles.textNormalBold, styles.noteTitle]}>
+                Lưu ý chụp CMND/ CCCD
+              </MText>
+              <View style={styles.noteRow}>
+                <TimaSmall />
+                <MText style={styles.noteText}>
+                  Nên đặt CCCD/ CMND lên mặt phẳng để chụp
                 </MText>
               </View>
-              <View
-                style={{
-                  width: '100%',
-                  aspectRatio: frameAspectRatio,
-                  borderWidth: 8,
-                  borderRadius: 6,
-                  borderColor: '#FFFFFF',
-                  marginTop: 16,
-                }}
-              >
-                <Image
-                  source={
-                    photo
-                      ? { uri: photo }
-                      : require('../../assets/img/national_id_back.png')
-                  }
-                  style={{
-                    width: '100%',
-                    height: '100%',
-                    resizeMode: 'cover',
-                  }}
-                />
+              <View style={styles.noteRowTop}>
+                <TimaSmall style={styles.noteBulletTop} />
+                <MText style={styles.noteText}>
+                  Đặt CCCD/ CMND nằm gọn trong khung hình{'\n'}(Không quá nhỏ
+                  hay quá to làm mất chi tiết)
+                </MText>
               </View>
-              <View style={{ marginTop: 24 }}>
-                <MText style={[commonStyles.textNormalBold, { fontSize: 16 }]}>
-                  Lưu ý chụp CMND/ CCCD
+              <View style={styles.noteRow}>
+                <TimaSmall />
+                <MText style={styles.noteText}>
+                  Chọn nơi ánh sáng tốt, tránh lóa/ chói hình chụp
                 </MText>
-                <View
-                  style={{
-                    flexDirection: 'row',
-                    marginTop: 16,
-                    alignItems: 'center',
-                  }}
-                >
-                  <TimaSmall />
-                  <MText
-                    style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}
-                  >
-                    Nên đặt CCCD/ CMND lên mặt phẳng để chụp
-                  </MText>
-                </View>
-                <View style={{ flexDirection: 'row', marginTop: 8 }}>
-                  <TimaSmall style={{ marginTop: 5 }} />
-                  <MText
-                    style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}
-                  >
-                    Đặt CCCD/ CMND nằm gọn trong khung hình{'\n'}(Không quá nhỏ
-                    hay quá to làm mất chi tiết)
-                  </MText>
-                </View>
-                <View
-                  style={{
-                    flexDirection: 'row',
-                    marginTop: 8,
-                    alignItems: 'center',
-                  }}
-                >
-                  <TimaSmall />
-                  <MText
-                    style={{ color: '#333333', marginLeft: 8, fontSize: 12 }}
-                  >
-                    Chọn nơi ánh sáng tốt, tránh lóa/ chói hình chụp
-                  </MText>
-                </View>
               </View>
             </View>
           </View>
         </ScrollView>
-        <View
-          style={{
-            flexDirection: 'row',
-            paddingHorizontal: 16,
-            marginBottom: 30,
-          }}
-        >
+        <View style={styles.actions}>
           <MButton
-            onPress={() => {
-              takePhoto();
-            }}
+            onPress={takePhoto}
             disabled={isLoading}
             style={[
               commonStyles.row,
               commonStyles.alignCenter,
               commonStyles.justifyCenter,
-              {
-                backgroundColor: '#FFFFFF',
-                height: 40,
-                borderRadius: 30,
-                flex: 1,
-                marginRight: 8,
-                borderWidth: 1,
-                borderColor: '#EF4123',
-              },
+              styles.captureBtn,
             ]}
           >
-            <MText style={[commonStyles.textNormal, { color: '#F05123' }]}>
+            <MText style={[commonStyles.textNormal, styles.captureText]}>
               Chụp ảnh
             </MText>
           </MButton>
 
-          <Observer>
-            {() => (
-              <MButton
-                disabled={!photo || isLoading}
-                onPress={nextStep}
-                style={{ flex: 1 }}
-              >
-                <LinearGradient
-                  colors={['#FF7A00', '#EF4123']}
-                  style={[
-                    commonStyles.alignCenter,
-                    commonStyles.justifyCenter,
-                    {
-                      height: 40,
-                      borderRadius: 30,
-                      marginLeft: 8,
-                    },
-                  ]}
-                >
-                  <MText style={[commonStyles.textNormal, { color: 'white' }]}>
-                    Tiếp tục
-                  </MText>
-                </LinearGradient>
-              </MButton>
-            )}
-          </Observer>
+          <MButton
+            disabled={!photo || isLoading}
+            onPress={nextStep}
+            style={commonStyles.fill}
+          >
+            <LinearGradient
+              colors={['#FF7A00', '#EF4123']}
+              style={[
+                commonStyles.alignCenter,
+                commonStyles.justifyCenter,
+                styles.gradientBtn,
+              ]}
+            >
+              <MText style={[commonStyles.textNormal, styles.continueText]}>
+                Tiếp tục
+              </MText>
+            </LinearGradient>
+          </MButton>
         </View>
         {loan?.isPipelineCIMB && (
-          <View
-            style={{
-              marginBottom: 24,
-              marginTop: 8,
-              flexDirection: 'row',
-              justifyContent: 'center',
-            }}
-          >
-            <MText style={{ fontSize: 12, color: '#333333' }}>
-              Cung cấp bởi{' '}
-            </MText>
+          <View style={styles.cimbRow}>
+            <MText style={styles.cimbText}>Cung cấp bởi </MText>
             <CIMBBank />
           </View>
         )}
@@ -289,3 +161,50 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
     </View>
   );
 });
+
+const styles = StyleSheet.create({
+  logo: {
+    position: 'absolute',
+    width: '100%',
+    height: '100%',
+    resizeMode: 'cover',
+  },
+  body: { paddingHorizontal: 16, paddingVertical: 16 },
+  frontRow: { flexDirection: 'row', alignItems: 'center', marginTop: 16 },
+  frontLabel: { fontSize: 16, color: '#FFFFFF', marginLeft: 8 },
+  frame: {
+    width: '100%',
+    aspectRatio: frameAspectRatio,
+    borderWidth: 8,
+    borderRadius: 6,
+    borderColor: '#FFFFFF',
+    marginTop: 16,
+  },
+  frameImage: { width: '100%', height: '100%', resizeMode: 'cover' },
+  noteSection: { marginTop: 24 },
+  noteTitle: { fontSize: 16 },
+  noteRow: { flexDirection: 'row', marginTop: 16, alignItems: 'center' },
+  noteRowTop: { flexDirection: 'row', marginTop: 8 },
+  noteBulletTop: { marginTop: 5 },
+  noteText: { color: '#333333', marginLeft: 8, fontSize: 12 },
+  actions: { flexDirection: 'row', paddingHorizontal: 16, marginBottom: 30 },
+  captureBtn: {
+    backgroundColor: '#FFFFFF',
+    height: 40,
+    borderRadius: 30,
+    flex: 1,
+    marginRight: 8,
+    borderWidth: 1,
+    borderColor: '#EF4123',
+  },
+  captureText: { color: '#F05123' },
+  gradientBtn: { height: 40, borderRadius: 30, marginLeft: 8 },
+  continueText: { color: 'white' },
+  cimbRow: {
+    marginBottom: 24,
+    marginTop: 8,
+    flexDirection: 'row',
+    justifyContent: 'center',
+  },
+  cimbText: { fontSize: 12, color: '#333333' },
+});

package/src/screens/notification/ListLoanStore.tsx

@@ -2,7 +2,7 @@
 import { observable, action } from 'mobx';
 import { Api } from '../../services/api';
 import { myLog } from '../../utils/log';
-import { Alert } from 'react-native';
+import { AlertGlobal } from '../../components/ModalNotification/AlertGlobal';
 
 class ListLoanStore {
   @observable isLoading = false;
@@ -94,7 +94,12 @@ class ListLoanStore {
     } else {
       this.isLoading = false;
       this.isError = false;
-      Alert.alert('Lỗi', response.Messages);
+      AlertGlobal.show({
+        type: 'warning',
+        title: 'Lỗi',
+        message: response.Messages,
+        primaryText: 'Đóng',
+      });
     }
   }
 
@@ -119,7 +124,12 @@ class ListLoanStore {
     } else {
       this.isLoading = false;
       this.isError = false;
-      Alert.alert('Lỗi', response.Messages);
+      AlertGlobal.show({
+        type: 'warning',
+        title: 'Lỗi',
+        message: response.Messages,
+        primaryText: 'Đóng',
+      });
     }
   }
 
@@ -140,7 +150,12 @@ class ListLoanStore {
       }
     } else {
       this.statusError = false;
-      Alert.alert('Lỗi', response.Messages);
+      AlertGlobal.show({
+        type: 'warning',
+        title: 'Lỗi',
+        message: response.Messages,
+        primaryText: 'Đóng',
+      });
     }
   }
 }

package/src/screens/notification/index.tsx

@@ -1,7 +1,6 @@
 //@ts-nocheck
 import React, { useEffect, useState } from 'react';
 import {
-  Alert,
   SafeAreaView,
   ScrollView,
   TouchableOpacity,

package/src/screens/notification/store.tsx

@@ -1,7 +1,7 @@
 //@ts-nocheck
 import { action, observable } from 'mobx';
-import { Alert } from 'react-native';
 import { Api } from '../../services/api';
+import { AlertGlobal } from '../../components/ModalNotification/AlertGlobal';
 
 class Store {
   @observable isLoading = false;
@@ -17,7 +17,12 @@ class Store {
         if (response.data.meta.errorCode === 200) {
           this.data = response.data.data;
         } else {
-          Alert.alert('Thông báo', response.data.meta.errorMessage);
+          AlertGlobal.show({
+            type: 'warning',
+            title: 'Thông báo',
+            message: response.data.meta.errorMessage,
+            primaryText: 'Đóng',
+          });
         }
       } else {
         // Alert.alert("Thông báo", "Có lỗi xảy ra. Vui lòng thử lại sau")

package/src/screens/personal/index.tsx

@@ -3,7 +3,6 @@ import { CommonActions, useNavigation } from '@react-navigation/native';
 import { observer } from 'mobx-react-lite';
 import React from 'react';
 import {
-  Alert,
   Image,
   ImageStyle,
   SafeAreaView,
@@ -12,6 +11,7 @@ import {
   View,
 } from 'react-native';
 import { IconLogout, IconProfile } from '../../assets/icons';
+import { AlertGlobal } from '../../components/ModalNotification/AlertGlobal';
 import appStore from '../../AppStore';
 import { MText } from '../../components/MText';
 import { ScreenNames } from '../../navigation';
@@ -31,25 +31,27 @@ export const Personal = observer(function Personal() {
   const navigation = useNavigation();
 
   const logout = async () => {
-    Alert.alert('Thông báo', 'Bạn có chắc chắn muốn đăng xuất?', [
-      { text: 'Bỏ qua', onPress: (value) => {} },
-      {
-        text: 'Đồng ý',
-        onPress: async () => {
-          appStore.logout();
-          clear();
-          reset();
-          appStore.selectedTab = 'TAB1';
-          Api.getInstance().changeAuth();
-          navigation.dispatch(
-            CommonActions.reset({
-              index: 1,
-              routes: [{ name: ScreenNames.Splash }],
-            })
-          );
-        },
+    AlertGlobal.show({
+      type: 'confirm',
+      title: 'Thông báo',
+      message: 'Bạn có chắc chắn muốn đăng xuất?',
+      primaryText: 'Đồng ý',
+      onPrimaryPress: async () => {
+        appStore.logout();
+        clear();
+        reset();
+        appStore.selectedTab = 'TAB1';
+        Api.getInstance().changeAuth();
+        navigation.dispatch(
+          CommonActions.reset({
+            index: 1,
+            routes: [{ name: ScreenNames.Splash }],
+          })
+        );
       },
-    ]);
+      secondaryText: 'Bỏ qua',
+      onSecondaryPress: (value) => {},
+    });
   };
   return (
     <View style={[commonStyles.fill, { backgroundColor: 'white' }]}>

package/src/screens/qualify/Store.tsx

@@ -1,6 +1,5 @@
 //@ts-nocheck
 import { action, observable } from 'mobx';
-import { Alert } from 'react-native';
 import { Api } from '../../services/api';
 
 class Store {