react-native-timacare 2.0.14 → 2.0.16

package/src/screens/selfie/index.tsx

@@ -38,6 +38,7 @@ import nationalIDStore from '../nationalID/Store';
 import Loading from '../../components/Loading';
 import LinearGradient from 'react-native-linear-gradient';
 import livenessStore from '../liveness/LivenessStore';
+import MHeader from '../../components/MHeader';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -111,29 +112,8 @@ export const Selfie = observer(function Selfie(props: any) {
   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()} />
       <SafeAreaView style={commonStyles.fill}>
-        <View
-          style={[
-            commonStyles.alignCenter,
-            { alignItems: 'center', marginTop: 10 },
-          ]}
-        >
-          <MButton
-            //@ts-ignore
-            onPress={() => navigation.goBack()}
-            style={[{ position: 'absolute', left: 16 }]}
-          >
-            <IconBackWhite fill={'#FFFFFF'} />
-          </MButton>
-          <MText
-            style={[
-              commonStyles.textNormalBold,
-              { color: '#FFFFFF', fontSize: 16 },
-            ]}
-          >
-            Xác thực khách hàng
-          </MText>
-        </View>
         <ScrollView style={commonStyles.fill}>
           <View style={{ paddingHorizontal: 16, paddingVertical: 16 }}>
             <View

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

@@ -28,6 +28,7 @@ import { ScreenNames } from '../../navigation';
 import Loading from '../../components/Loading';
 import appStore from '../../AppStore';
 import moment from 'moment';
+import MHeader from '../../components/MHeader';
 
 const CELL_COUNT = 4;
 
@@ -87,36 +88,8 @@ export const ConfirmContract = observer(function ConfirmContract({
   return (
     <View style={{ flex: 1, backgroundColor: '#FFFFFF' }}>
       <Image source={require('../splash/Onboarding.png')} style={logoView} />
+      <MHeader title="Ký hợp đồng" onBack={() => navigation.goBack()} />
       <SafeAreaView style={{ flex: 1 }}>
-        <View
-          style={[
-            commonStyles.alignCenter,
-            { alignItems: 'center', height: 50, justifyContent: 'center' },
-          ]}
-        >
-          <TouchableOpacity
-            onPress={() => navigation.goBack()}
-            style={{
-              width: 40,
-              height: 40,
-              position: 'absolute',
-              left: 8,
-              alignItems: 'center',
-              justifyContent: 'center',
-            }}
-          >
-            <IconBack fill={color.textHeader} />
-          </TouchableOpacity>
-
-          <MText
-            style={[
-              commonStyles.textNormalBold,
-              { color: color.textHeader, fontSize: 16 },
-            ]}
-          >
-            Ký hợp đồng
-          </MText>
-        </View>
         <MText
           style={{
             marginTop: 24,

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

@@ -16,6 +16,7 @@ import { ScreenNames } from '../../navigation';
 import { color } from '../../theme';
 import { commonStyles } from '../CommonStyles';
 import SignTimaStore from './store';
+import MHeader from '../../components/MHeader';
 
 export const ViewContract = observer(function ViewContract(props: any) {
   const navigation = useNavigation();
@@ -30,43 +31,18 @@ export const ViewContract = observer(function ViewContract(props: any) {
 
   return (
     <View style={{ flex: 1, backgroundColor: '#FFFFFF' }}>
+      <MHeader
+        title="Hợp đồng dịch vụ"
+        onBack={() => {
+          navigation.dispatch(
+            CommonActions.reset({
+              index: 1,
+              routes: [{ name: ScreenNames.Main }],
+            })
+          );
+        }}
+      />
       <SafeAreaView style={{ flex: 1 }}>
-        <View
-          style={[
-            commonStyles.alignCenter,
-            { alignItems: 'center', height: 50, justifyContent: 'center' },
-          ]}
-        >
-          <TouchableOpacity
-            onPress={() =>
-              navigation.dispatch(
-                CommonActions.reset({
-                  index: 1,
-                  routes: [{ name: ScreenNames.Main }],
-                })
-              )
-            }
-            style={{
-              width: 40,
-              height: 40,
-              position: 'absolute',
-              left: 8,
-              alignItems: 'center',
-              justifyContent: 'center',
-            }}
-          >
-            <IconBack fill={color.textHeader} />
-          </TouchableOpacity>
-
-          <MText
-            style={[
-              commonStyles.textNormalBold,
-              { color: color.textHeader, fontSize: 16 },
-            ]}
-          >
-            Hợp đồng dịch vụ
-          </MText>
-        </View>
         <View style={{ flex: 1 }}>
           <Pdf
             source={source}

package/src/screens/terms/QuickTerm.tsx

@@ -9,6 +9,7 @@ import MButton from '../../components/MButton';
 import { MText } from '../../components/MText';
 import { color } from '../../theme';
 import { commonStyles } from '../CommonStyles';
+import MHeader from '../../components/MHeader';
 
 export const QuickTerm = observer(function QuickTerm(props: any) {
   const navigation = useNavigation();
@@ -21,31 +22,13 @@ export const QuickTerm = observer(function QuickTerm(props: any) {
 
   return (
     <View style={{ flex: 1, backgroundColor: 'white' }}>
+      <MHeader
+        title="T&C_Điều khoản và điều kiện"
+        onBack={() => {
+          navigation.goBack();
+        }}
+      />
       <SafeAreaView style={{ flex: 1 }}>
-        <View
-          style={[
-            commonStyles.alignCenter,
-            { alignItems: 'center', marginTop: 10 },
-          ]}
-        >
-          <MButton
-            //@ts-ignore
-            onPress={() => {
-              navigation.goBack();
-            }}
-            style={[{ position: 'absolute', left: 16 }]}
-          >
-            <IconBack fill={color.textHeader} />
-          </MButton>
-          <MText
-            style={[
-              commonStyles.textNormalBold,
-              { color: color.textHeader, fontSize: 16 },
-            ]}
-          >
-            T&C_Điều khoản và điều kiện
-          </MText>
-        </View>
         <Pdf
           trustAllCerts={false}
           source={

package/src/screens/terms/TermScreen.tsx

@@ -12,6 +12,7 @@ import { IconBack } from '../../assets/icons';
 import Pdf from 'react-native-pdf';
 import LinearGradient from 'react-native-linear-gradient';
 import livenessStore from '../liveness/LivenessStore';
+import MHeader from '../../components/MHeader';
 
 export const TermScreen = observer(function TermScreen(props) {
   const navigation = useNavigation();
@@ -26,48 +27,16 @@ export const TermScreen = observer(function TermScreen(props) {
 
   return (
     <View style={{ flex: 1, backgroundColor: 'white' }}>
+      <MHeader
+        title="Điều khoản"
+        onBack={() => {
+          back();
+        }}
+      />
       <SafeAreaView style={{ flex: 1 }}>
         <View style={{ flex: 1 }}>
-          <View
-            style={[
-              commonStyles.row,
-              commonStyles.alignCenter,
-              { paddingHorizontal: 16, height: 55 },
-            ]}
-          >
-            <MButton
-              onPress={() => {
-                back();
-              }}
-              style={{
-                width: 30,
-                height: 55,
-                justifyContent: 'center',
-                alignItems: 'center',
-              }}
-            >
-              <IconBack width={18} height={18} fill={'black'} />
-            </MButton>
-
-            <MText
-              style={{
-                marginRight: 30,
-                fontSize: 16,
-                paddingHorizontal: 4,
-                color: color.headerColor,
-                fontWeight: 'bold',
-                textAlign: 'center',
-                flex: 1,
-              }}
-            >
-              {'Điều khoản'}
-            </MText>
-          </View>
           <View style={{ backgroundColor: color.border }} />
-          {/* <WebView
-            source={{ uri: 'https://tima.vn/dieu-khoan.html' }}
-            style={{ flex: 1 }}
-          /> */}
+
           <Pdf
             source={{
               uri: 'https://cdn.tima.vn/file-pdf/20240509_DIEU_KHOAN_VA_DIEU_KIEN_TIMA.pdf',

package/src/screens/uploadVideo/index.tsx

@@ -25,6 +25,7 @@ import {
   RESULTS,
 } from 'react-native-permissions';
 import Loading from '../../components/Loading';
+import MHeader from '../../components/MHeader';
 
 export const Video = observer(function Video(props: any) {
   const navigation = useNavigation();
@@ -106,104 +107,102 @@ export const Video = observer(function Video(props: any) {
   };
 
   return (
-    <SafeAreaView style={{ flex: 1, backgroundColor: 'white' }}>
-      <View style={{ height: 50, paddingHorizontal: 10 }}>
-        <MButton
-          style={{ height: 50, width: 50, justifyContent: 'center' }}
-          onPress={() => navigation.goBack()}
-        >
-          <IconBack fill={'black'} width={16} height={16} />
-        </MButton>
-      </View>
-      <View style={{ flex: 1, justifyContent: 'center' }}>
-        {count === 0 && (
+    <View
+      style={{
+        flex: 1,
+      }}
+    >
+      <MHeader title="" onBack={() => navigation.goBack()} />
+      <SafeAreaView style={{ flex: 1, backgroundColor: 'white' }}>
+        <View style={{ flex: 1, justifyContent: 'center' }}>
+          {count === 0 && (
+            <View
+              style={{
+                position: 'absolute',
+                bottom: 100,
+                right: 0,
+                left: 0,
+                zIndex: 1,
+                paddingHorizontal: 10,
+                justifyContent: 'center',
+                backgroundColor: 'black',
+                paddingVertical: 10,
+              }}
+            >
+              <MText
+                style={{
+                  color: 'white',
+                  fontSize: 16,
+                }}
+              >
+                {content}
+              </MText>
+            </View>
+          )}
+          <RNCamera
+            ref={camera}
+            style={styles.preview}
+            type="front"
+            permissionDialogTitle={'Permission to use camera'}
+            permissionDialogMessage={
+              'We need your permission to use your camera phone'
+            }
+            androidCameraPermissionOptions={{
+              title: 'Permission to use camera',
+              message: 'We need your permission to use your camera',
+              buttonPositive: 'Ok',
+              buttonNegative: 'Cancel',
+            }}
+            androidRecordAudioPermissionOptions={{
+              title: 'Permission to use audio recording',
+              message: 'We need your permission to use your audio',
+              buttonPositive: 'Ok',
+              buttonNegative: 'Cancel',
+            }}
+          />
           <View
             style={{
+              backgroundColor: '#00000080',
+              justifyContent: 'center',
               position: 'absolute',
-              bottom: 100,
-              right: 0,
+              bottom: 0,
               left: 0,
-              zIndex: 1,
-              paddingHorizontal: 10,
-              justifyContent: 'center',
-              backgroundColor: 'black',
-              paddingVertical: 10,
+              right: 0,
             }}
           >
-            <MText
-              style={{
-                color: 'white',
-                fontSize: 16,
-              }}
-            >
-              {content}
-            </MText>
+            {isRecording ? (
+              <TouchableOpacity
+                style={{
+                  justifyContent: 'center',
+                  alignItems: 'center',
+                  marginBottom: 20,
+                }}
+                onPress={() => {
+                  stopRecording();
+                }}
+              >
+                <IconPause fill={'white'} width={60} height={60} />
+              </TouchableOpacity>
+            ) : (
+              <TouchableOpacity
+                style={{
+                  justifyContent: 'center',
+                  alignItems: 'center',
+                  marginBottom: 20,
+                }}
+                disabled={videoStore.isLoading}
+                onPress={() => {
+                  startVideo();
+                }}
+              >
+                <IconPlay fill={'white'} width={60} height={60} />
+              </TouchableOpacity>
+            )}
           </View>
-        )}
-
-        <RNCamera
-          ref={camera}
-          style={styles.preview}
-          type="front"
-          permissionDialogTitle={'Permission to use camera'}
-          permissionDialogMessage={
-            'We need your permission to use your camera phone'
-          }
-          androidCameraPermissionOptions={{
-            title: 'Permission to use camera',
-            message: 'We need your permission to use your camera',
-            buttonPositive: 'Ok',
-            buttonNegative: 'Cancel',
-          }}
-          androidRecordAudioPermissionOptions={{
-            title: 'Permission to use audio recording',
-            message: 'We need your permission to use your audio',
-            buttonPositive: 'Ok',
-            buttonNegative: 'Cancel',
-          }}
-        />
-        <View
-          style={{
-            backgroundColor: '#00000080',
-            justifyContent: 'center',
-            position: 'absolute',
-            bottom: 0,
-            left: 0,
-            right: 0,
-          }}
-        >
-          {isRecording ? (
-            <TouchableOpacity
-              style={{
-                justifyContent: 'center',
-                alignItems: 'center',
-                marginBottom: 20,
-              }}
-              onPress={() => {
-                stopRecording();
-              }}
-            >
-              <IconPause fill={'white'} width={60} height={60} />
-            </TouchableOpacity>
-          ) : (
-            <TouchableOpacity
-              style={{
-                justifyContent: 'center',
-                alignItems: 'center',
-                marginBottom: 20,
-              }}
-              disabled={videoStore.isLoading}
-              onPress={() => {
-                startVideo();
-              }}
-            >
-              <IconPlay fill={'white'} width={60} height={60} />
-            </TouchableOpacity>
-          )}
         </View>
-      </View>
-      <Loading isLoading={isLoading} />
-    </SafeAreaView>
+        <Loading isLoading={isLoading} />
+      </SafeAreaView>
+    </View>
   );
 });
 

package/src/services/api/api-config.ts

@@ -1,5 +1,5 @@
-// const API_URL = 'https://apiapplos.tima.vn/'
-const API_URL = 'https://apidevlos.tima.vn/'
+const API_URL = 'https://apiapplos.tima.vn/'
+// const API_URL = 'https://apidevlos.tima.vn/'
 export interface ApiConfig {
   url: string
   timeout: number