react-native-timacare 2.0.19 → 2.0.21

package/lib/typescript/screens/otp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screens/otp/index.tsx"],"names":[],"mappings":"AA+BA,eAAO,MAAM,GAAG,KA+Yd,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screens/otp/index.tsx"],"names":[],"mappings":"AAgCA,eAAO,MAAM,GAAG,KA0Xd,CAAC"}

package/lib/typescript/screens/register/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screens/register/index.tsx"],"names":[],"mappings":"AA4CA,eAAO,MAAM,QAAQ,KA+UnB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screens/register/index.tsx"],"names":[],"mappings":"AA6CA,eAAO,MAAM,QAAQ,KAgVnB,CAAC"}

package/lib/typescript/screens/setPassword/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screens/setPassword/index.tsx"],"names":[],"mappings":"AAsBA,eAAO,MAAM,WAAW,KA2KtB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screens/setPassword/index.tsx"],"names":[],"mappings":"AAuBA,eAAO,MAAM,WAAW,KAmKtB,CAAC"}

package/lib/typescript/screens/splash/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screens/splash/index.tsx"],"names":[],"mappings":"AA4BA,eAAO,MAAM,MAAM,KAkFjB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screens/splash/index.tsx"],"names":[],"mappings":"AA4BA,eAAO,MAAM,MAAM,KAmFjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-timacare",
-  "version": "2.0.19",
+  "version": "2.0.21",
   "description": "SDK Tima Care",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/components/MHeader.tsx

@@ -38,18 +38,20 @@ export default function MHeader({ title, onBack }: IProps) {
             alignItems: 'center',
           }}
         >
-          <TouchableOpacity
-            onPress={() => {
-              appStore.callback();
-            }}
-            style={{
-              width: 32,
-              height: 32,
-              justifyContent: 'center',
-            }}
-          >
-            <IconBackWhite />
-          </TouchableOpacity>
+          {onBack && (
+            <TouchableOpacity
+              onPress={() => {
+                if (onBack) onBack();
+              }}
+              style={{
+                width: 32,
+                height: 32,
+                justifyContent: 'center',
+              }}
+            >
+              <IconBackWhite />
+            </TouchableOpacity>
+          )}
           <MText
             style={{
               fontWeight: 'bold',

package/src/screens/forgotPassword/index.tsx

@@ -12,6 +12,7 @@ import * as yup from 'yup';
 import { useNavigation } from '@react-navigation/native';
 import registerStore from '../register/Store';
 import { ScreenNames } from '../../navigation';
+import MHeader from '../../components/MHeader';
 
 export const ForgotPassword = observer(function ForgotPassword() {
   const navigation = useNavigation();
@@ -30,17 +31,9 @@ export const ForgotPassword = observer(function ForgotPassword() {
 
   return (
     <View style={[commonStyles.fill, commonStyles.backgroundWhite]}>
+      <MHeader title="Quên mật khẩu" onBack={() => navigation.goBack()} />
       <SafeAreaView style={{ flex: 1 }}>
         <View style={{ margin: 16 }}>
-          <MText
-            style={{
-              fontSize: 24,
-              color: color.primary,
-              fontWeight: '600',
-            }}
-          >
-            Quên mật khẩu
-          </MText>
           <MText style={{ color: '#4F4F4F' }}>
             Mật khẩu mới sẽ gửi về số điện thoại của bạn.
           </MText>

package/src/screens/loginWithPassword/index.tsx

@@ -26,6 +26,7 @@ import homeStore from '../home/Store';
 import LinearGradient from 'react-native-linear-gradient';
 import { save } from '../../utils/keychain';
 import appStore from '../../AppStore';
+import MHeader from '../../components/MHeader';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -65,53 +66,6 @@ export const LoginWithPassword = observer(function LoginWithPassword(
           save(props.route.params.Phone, values.password);
         }
         navigation.push(ScreenNames.Main);
-        // homeStore.getListLoanPending((loanData) => {
-        //   if (loanData) {
-        //     homeStore.getCheckEKYC({ loanBriefId: loanData.id });
-        //     qualifyStore.checkQualify(
-        //       loanData.id,
-        //       (data) => {
-        //         if (data?.verify === true) {
-        //           navigation.dispatch(
-        //             CommonActions.reset({
-        //               index: 1,
-        //               routes: [
-        //                 {
-        //                   name: ScreenNames.Qualify,
-        //                   params: { loan: loanData },
-        //                 },
-        //               ],
-        //             })
-        //           );
-        //         } else {
-        //           navigation.push(ScreenNames.Main);
-        //           // navigation.dispatch(
-        //           //   Stack
-        //           //   CommonActions.reset({
-        //           //     index: 1,
-        //           //     routes: [{ name: ScreenNames.Main }],
-        //           //   })
-        //           // );
-        //         }
-        //       },
-        //       () => {
-        //         navigation.dispatch(
-        //           CommonActions.reset({
-        //             index: 1,
-        //             routes: [{ name: ScreenNames.Main }],
-        //           })
-        //         );
-        //       }
-        //     );
-        //   } else {
-        //     navigation.dispatch(
-        //       CommonActions.reset({
-        //         index: 1,
-        //         routes: [{ name: ScreenNames.Main }],
-        //       })
-        //     );
-        //   }
-        // });
       },
       () => {
         navigation.dispatch(
@@ -133,31 +87,10 @@ export const LoginWithPassword = observer(function LoginWithPassword(
 
   return (
     <View style={[commonStyles.fill, commonStyles.backgroundWhite]}>
+      <MHeader title="Nhập mã bảo mật" onBack={() => navigation.goBack()} />
       <Image source={require('./bg.png')} style={logoView} />
+
       <SafeAreaView style={{ flex: 1 }}>
-        <View style={[commonStyles.row, commonStyles.alignCenter, {}]}>
-          <MButton
-            //@ts-ignore
-            onPress={() => navigation.goBack()}
-            style={[
-              commonStyles.alignCenter,
-              commonStyles.justifyCenter,
-              commonStyles.row,
-              { height: 48, paddingLeft: 16 },
-            ]}
-          >
-            <IconBack width={14} height={14} fill={color.textHeader} />
-            <MText
-              style={[
-                commonStyles.textNormalBold,
-                { color: color.textHeader, paddingLeft: 4 },
-              ]}
-            >
-              Nhập mã bảo mật
-            </MText>
-          </MButton>
-          <View style={commonStyles.fill} />
-        </View>
         <Formik
           initialValues={{
             password: props.route?.params?.passcode

package/src/screens/otp/index.tsx

@@ -28,6 +28,7 @@ import registerStore from '../register/Store';
 import { IconBack, SMSOTP, VOICEOTP, ZALOOTP } from '../../assets/icons';
 import homeStore from '../home/Store';
 import qualifyStore from '../qualify/Store';
+import MHeader from '../../components/MHeader';
 
 export const OTP = observer(function OTP(props: any) {
   const navigation = useNavigation();
@@ -97,6 +98,7 @@ export const OTP = observer(function OTP(props: any) {
 
   return (
     <View style={[commonStyles.fill, commonStyles.backgroundWhite]}>
+      <MHeader title="Nhập mã OTP" onBack={() => navigation.goBack()} />
       <Image
         source={require('./rightBottom.png')}
         style={{
@@ -109,28 +111,6 @@ export const OTP = observer(function OTP(props: any) {
         }}
       />
       <SafeAreaView style={commonStyles.fill}>
-        <View style={[commonStyles.row, commonStyles.alignCenter, {}]}>
-          <MButton
-            //@ts-ignore
-            onPress={() => {
-              //@ts-ignore
-              navigation.pop();
-              registerStore.type = 2;
-            }}
-            style={[
-              commonStyles.alignCenter,
-              commonStyles.justifyCenter,
-              commonStyles.row,
-              { height: 48, paddingLeft: 16 },
-            ]}
-          >
-            <IconBack width={14} height={14} fill={color.textHeader} />
-            <MText style={{ fontSize: 16, fontWeight: '600', marginLeft: 10 }}>
-              Nhập mã OTP
-            </MText>
-          </MButton>
-        </View>
-
         <ScrollView
           keyboardShouldPersistTaps={'always'}
           style={commonStyles.fill}

package/src/screens/register/index.tsx

@@ -34,6 +34,7 @@ import {
   RESULTS,
 } from 'react-native-permissions';
 import { load } from '../../utils/keychain';
+import MHeader from '../../components/MHeader';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -173,6 +174,7 @@ export const Register = observer(function Register() {
 
   return (
     <View style={{ flex: 1, backgroundColor: 'white' }}>
+      <MHeader />
       <Image source={require('./bg.png')} style={logoView} />
       <SafeAreaView style={{ flex: 1 }}>
         <ScrollView style={{ flex: 1 }}>

package/src/screens/setPassword/index.tsx

@@ -19,23 +19,16 @@ import homeStore from '../home/Store';
 import qualifyStore from '../qualify/Store';
 import setPasswordStore from './store';
 import appStore from '../../AppStore';
+import MHeader from '../../components/MHeader';
 
 export const SetPassword = observer(function SetPassword(props: any) {
   const navigation = useNavigation();
 
   return (
     <View style={[commonStyles.fill, commonStyles.backgroundWhite]}>
+      <MHeader title="Đặt mã bảo mật" onBack={() => navigation.goBack()} />
       <SafeAreaView style={{ flex: 1 }}>
         <View style={{ margin: 16 }}>
-          <MText
-            style={{
-              fontSize: 24,
-              color: color.primary,
-              fontWeight: '600',
-            }}
-          >
-            Đặt mã bảo mật
-          </MText>
           <MText style={{ color: '#4F4F4F', marginTop: 5 }}>
             *Lưu ý: Mật khẩu có chứa 6 ký tự là số, vui lòng không công khai mật
             khẩu với bất kì ai. VD: 686868

package/src/screens/splash/index.tsx

@@ -31,20 +31,21 @@ export const Splash = observer(function Splash() {
   const [downloading, setDownloading] = useState(false);
 
   const goLogin = async () => {
-    const token = await load('TOKEN_TIMACARE');
-    if (token) {
-      Api.getInstance().changeAuth(token);
-      setTimeout(() => {
-        navigation.dispatch(
-          CommonActions.reset({
-            index: 1,
-            routes: [{ name: ScreenNames.Main }],
-          })
-        );
-      }, 300);
-    } else {
-      navigation.push(ScreenNames.Register);
-    }
+    // const token = await load('TOKEN_TIMACARE');
+    // if (token) {
+    //   Api.getInstance().changeAuth(token);
+    //   setTimeout(() => {
+    //     navigation.dispatch(
+    //       CommonActions.reset({
+    //         index: 1,
+    //         routes: [{ name: ScreenNames.Main }],
+    //       })
+    //     );
+    //   }, 300);
+    // } else {
+    //   navigation.push(ScreenNames.Register);
+    // }
+    navigation.push(ScreenNames.Register);
   };
 
   useEffect(() => {