@tima2025/react-native-timalender 1.1.3 → 1.1.5

package/src/screens/DetailLoanApplication/index.tsx

@@ -4,11 +4,11 @@ import React from 'react';
 import { FlatList, TouchableOpacity, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import InvestNewImages from '../../assets/images/InvestNew';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
 import formatNumber from '../../common/FormatNumber';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import LazyImage from '../../common/LazyImage';
 import { actuatedNormalize, Shadow } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -57,12 +57,13 @@ const DetailLoanApplication = ({ navigation, route }: any) => {
 
   return (
     <Container>
-      <AppHeader
+      {/* <AppHeader
         title=""
         backColor={Colors.WHITE}
         iconColor={Colors.BLACK}
         titleStyle={{ color: Colors.BLACK }}
-      />
+      /> */}
+      <BackHeader title="" onPress={() => navigation.navigate('MyBank.Main')} />
       <RText
         textStyle={{
           fontWeight: '600',

package/src/screens/DetailNotification/index.tsx

@@ -1,16 +1,24 @@
+//@ts-nocheck
 /* eslint-disable react-native/no-inline-styles */
+import { useNavigation } from '@react-navigation/native';
 import React from 'react';
 import { ScrollView } from 'react-native';
-import AppHeader from '../../common/AppHeader';
 import Container from '../../common/Container';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import { timeDifference } from '../../common/Metrics';
 import RText from '../../common/RText';
 
 export const DetailNotification = ({ route }: any) => {
+  const navigation = useNavigation();
   const item = route?.params?.item || '';
+
   return (
     <Container isStatusBar>
-      <AppHeader title={'Chi tiết thông báo'.toUpperCase()} />
+      {/* <AppHeader title={'Chi tiết thông báo'.toUpperCase()} /> */}
+      <BackHeader
+        title={'Chi tiết thông báo'.toUpperCase()}
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <ScrollView style={{ flex: 1, backgroundColor: 'white' }}>
         <RText
           style={{

package/src/screens/EKYC/Screens/NationalIDBack.tsx

@@ -4,10 +4,10 @@ import React, { useEffect, useState } from 'react';
 import { Dimensions, ScrollView } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import EImages from '../../../assets/images/EKYC';
-import AppHeader from '../../../common/AppHeader';
 import BSubmit from '../../../common/BSubmit/BSubmit';
 import Colors from '../../../common/Colors';
 import Container from '../../../common/Container';
+import BackHeader from '../../../common/HeaderClose/BackHeader';
 import { actuatedNormalize } from '../../../common/Metrics';
 import RText from '../../../common/RText';
 import SpaceBetween from '../../../common/SpaceBetween';
@@ -38,7 +38,11 @@ export const NationalIDBack = ({ navigation }: any) => {
 
   return (
     <Container style={{ backgroundColor: Colors.BLACK }}>
-      <AppHeader title="EKYC" backColor={Colors.BLACK} />
+      {/* <AppHeader title="EKYC" backColor={Colors.BLACK} /> */}
+      <BackHeader
+        title="EKYC"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <ScrollView>
         <RText
           textStyle={{

package/src/screens/EKYC/Screens/Selfie.tsx

@@ -4,10 +4,10 @@ import React, { useEffect, useState } from 'react';
 import { Dimensions, ScrollView } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import EImages from '../../../assets/images/EKYC';
-import AppHeader from '../../../common/AppHeader';
 import BSubmit from '../../../common/BSubmit/BSubmit';
 import Colors from '../../../common/Colors';
 import Container from '../../../common/Container';
+import BackHeader from '../../../common/HeaderClose/BackHeader';
 import { actuatedNormalize } from '../../../common/Metrics';
 import RText from '../../../common/RText';
 import SpaceBetween from '../../../common/SpaceBetween';
@@ -42,7 +42,11 @@ const Selfie = ({ navigation }: any) => {
 
   return (
     <Container style={{ backgroundColor: Colors.BLACK }}>
-      <AppHeader title="Xác thực khách hàng" backColor={Colors.BLACK} />
+      {/* <AppHeader title="Xác thực khách hàng" backColor={Colors.BLACK} /> */}
+      <BackHeader
+        title="Xác thực khách hàng"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <ScrollView>
         <RText
           textStyle={{

package/src/screens/EKYC/index.tsx

@@ -4,10 +4,10 @@ import React, { useEffect, useState } from 'react';
 import { Dimensions, ScrollView } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import EImages from '../../assets/images/EKYC';
-import AppHeader from '../../common/AppHeader';
 import BSubmit from '../../common/BSubmit/BSubmit';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import { actuatedNormalize } from '../../common/Metrics';
 import RText from '../../common/RText';
 import Screens from '../../components/Navigation/Screens';
@@ -40,7 +40,11 @@ export const Ekyc = ({ navigation }: any) => {
 
   return (
     <Container style={{ backgroundColor: Colors.BLACK }}>
-      <AppHeader title="EKYC" backColor={Colors.BLACK} />
+      {/* <AppHeader title="EKYC" backColor={Colors.BLACK} /> */}
+      <BackHeader
+        title="EKYC"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <ScrollView>
         <RText
           textStyle={{

package/src/screens/EkycLiveness/EkycCamera.tsx

@@ -11,9 +11,9 @@ import {
 } from 'react-native';
 import { RNCamera } from 'react-native-camera';
 import { useSelector } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import Loading from '../../common/Loading';
 import RText from '../../common/RText';
 import Screens from '../../components/Navigation/Screens';
@@ -68,7 +68,11 @@ export const EkycCamera = ({ navigation }) => {
   };
   return (
     <Container style={{ backgroundColor: Colors.BLACK }}>
-      <AppHeader title="Chụp ảnh khuôn mặt" backColor={Colors.BLACK} />
+      {/* <AppHeader title="Chụp ảnh khuôn mặt" backColor={Colors.BLACK} /> */}
+      <BackHeader
+        title="Chụp ảnh khuôn mặt"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <View
         style={[
           {

package/src/screens/ExtendContract/index.tsx

@@ -5,11 +5,11 @@ import { TouchableOpacity, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import Pdf from 'react-native-pdf';
 import { useSelector } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 import Button from '../../common/Button';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import Loading from '../../common/Loading';
 import { actuatedNormalize } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -46,7 +46,11 @@ const ExtendContract = ({ navigation, route }: any) => {
 
   return (
     <Container>
-      <AppHeader title="Phụ lục gia hạn" />
+      {/* <AppHeader title="Phụ lục gia hạn" /> */}
+      <BackHeader
+        title="Phụ lục gia hạn"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
 
       <Pdf
         showsVerticalScrollIndicator={false}

package/src/screens/ForgotPassword/index.tsx

@@ -4,7 +4,6 @@ import React, { useState } from 'react';
 import {
   ActivityIndicator,
   Alert,
-  ImageBackground,
   SafeAreaView,
   ScrollView,
   StatusBar,
@@ -16,7 +15,6 @@ import LinearGradient from 'react-native-linear-gradient';
 import Icon from 'react-native-vector-icons/Ionicons';
 import { useDispatch, useSelector } from 'react-redux';
 import { ForgotPasswordIcon } from '../../assets/icons';
-import IntroImages from '../../assets/images/Splash';
 import Container from '../../common/Container';
 import { actuatedNormalize } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -65,101 +63,101 @@ export const ForgotPassword = ({ navigation }: any) => {
   return (
     <Container>
       <StatusBar barStyle="light-content" />
-      <ImageBackground source={IntroImages.splash} style={{ flex: 1 }}>
-        <SafeAreaView
+      {/* <ImageBackground source={IntroImages.splash} style={{ flex: 1 }}> */}
+      <SafeAreaView
+        style={{
+          backgroundColor: 'white',
+          // marginTop: actuatedNormalize(48),
+          flex: 1,
+          borderTopLeftRadius: 30,
+          borderTopRightRadius: 30,
+        }}
+      >
+        <View
           style={{
-            backgroundColor: 'white',
-            marginTop: actuatedNormalize(48),
-            flex: 1,
-            borderTopLeftRadius: 30,
-            borderTopRightRadius: 30,
+            flexDirection: 'row',
+            alignItems: 'center',
+            justifyContent: 'center',
+            paddingVertical: 16,
           }}
         >
-          <View
+          <TouchableOpacity
+            onPress={() => navigation.goBack()}
             style={{
-              flexDirection: 'row',
-              alignItems: 'center',
+              position: 'absolute',
+              left: 6,
+              width: 40,
+              height: 40,
               justifyContent: 'center',
-              paddingVertical: 16,
+              alignItems: 'center',
             }}
           >
-            <TouchableOpacity
-              onPress={() => navigation.goBack()}
-              style={{
-                position: 'absolute',
-                left: 6,
-                width: 40,
-                height: 40,
-                justifyContent: 'center',
-                alignItems: 'center',
-              }}
-            >
-              <Icon name="chevron-back" size={26} color="#BDBDBD" />
-            </TouchableOpacity>
-            <RText
-              style={{
-                color: '#333333',
-                fontSize: 16,
-                fontWeight: 'bold',
-              }}
-            >
-              Quên mật khẩu
-            </RText>
-          </View>
-          <ScrollView style={{ paddingHorizontal: actuatedNormalize(16) }}>
-            <ForgotPasswordIcon />
-            <RText
-              style={{
-                textAlign: 'center',
-                color: '#333333',
-                fontWeight: 'bold',
-                marginTop: 16,
-              }}
-            >
-              Vui lòng nhập số điện thoại đã đăng ký để nhận lại mật khẩu đăng
-              nhập mới
-            </RText>
-            <TextInput
-              placeholder="Số điện thoại đã đăng ký"
-              style={{
-                marginTop: 32,
-                borderWidth: 1,
-                borderRadius: 8,
-                borderColor: '#E0E0E0',
-                paddingVertical: 10,
-                paddingHorizontal: 10,
-                color: '#333333',
-                fontWeight: 'bold',
-              }}
-              value={phone}
-              onChangeText={(text: string) => setPhone(text)}
-              keyboardType="numeric"
-            />
-            <KeyboardSpacer />
-          </ScrollView>
-          <TouchableOpacity
-            disabled={!phone}
-            style={{ marginVertical: 20, marginHorizontal: 16 }}
-            onPress={() => onSubmit()}
-          >
-            <LinearGradient
-              colors={['#FF8E4F', '#EF592E']}
-              style={{
-                height: 40,
-                borderRadius: 30,
-                alignItems: 'center',
-                justifyContent: 'center',
-              }}
-            >
-              {isLoading ? (
-                <ActivityIndicator color={'white'} size={'small'} />
-              ) : (
-                <RText style={{ color: 'white' }}>Tiếp tục</RText>
-              )}
-            </LinearGradient>
+            <Icon name="chevron-back" size={26} color="#BDBDBD" />
           </TouchableOpacity>
-        </SafeAreaView>
-      </ImageBackground>
+          <RText
+            style={{
+              color: '#333333',
+              fontSize: 16,
+              fontWeight: 'bold',
+            }}
+          >
+            Quên mật khẩu
+          </RText>
+        </View>
+        <ScrollView style={{ paddingHorizontal: actuatedNormalize(16) }}>
+          <ForgotPasswordIcon />
+          <RText
+            style={{
+              textAlign: 'center',
+              color: '#333333',
+              fontWeight: 'bold',
+              marginTop: 16,
+            }}
+          >
+            Vui lòng nhập số điện thoại đã đăng ký để nhận lại mật khẩu đăng
+            nhập mới
+          </RText>
+          <TextInput
+            placeholder="Số điện thoại đã đăng ký"
+            style={{
+              marginTop: 32,
+              borderWidth: 1,
+              borderRadius: 8,
+              borderColor: '#E0E0E0',
+              paddingVertical: 10,
+              paddingHorizontal: 10,
+              color: '#333333',
+              fontWeight: 'bold',
+            }}
+            value={phone}
+            onChangeText={(text: string) => setPhone(text)}
+            keyboardType="numeric"
+          />
+          <KeyboardSpacer />
+        </ScrollView>
+        <TouchableOpacity
+          disabled={!phone}
+          style={{ marginVertical: 20, marginHorizontal: 16 }}
+          onPress={() => onSubmit()}
+        >
+          <LinearGradient
+            colors={['#FF8E4F', '#EF592E']}
+            style={{
+              height: 40,
+              borderRadius: 30,
+              alignItems: 'center',
+              justifyContent: 'center',
+            }}
+          >
+            {isLoading ? (
+              <ActivityIndicator color={'white'} size={'small'} />
+            ) : (
+              <RText style={{ color: 'white' }}>Tiếp tục</RText>
+            )}
+          </LinearGradient>
+        </TouchableOpacity>
+      </SafeAreaView>
+      {/* </ImageBackground> */}
     </Container>
   );
 };

package/src/screens/ForgotPasswordOTP/index.tsx

@@ -3,9 +3,9 @@
 import React, { useState } from 'react';
 import { Alert, ScrollView, TextInput } from 'react-native';
 import { useDispatch } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 import Button from '../../common/Button';
 import Container from '../../common/Container';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import { actuatedNormalize } from '../../common/Metrics';
 import RText from '../../common/RText';
 import { ValidateOTP } from '../../components/Features/user/userSlice';
@@ -34,7 +34,11 @@ export const ForgotPasswordOTP = ({ route, navigation }: any) => {
 
   return (
     <Container isStatusBar>
-      <AppHeader title={'Nhập mã xác thực'.toUpperCase()} />
+      {/* <AppHeader title={'Nhập mã xác thực'.toUpperCase()} /> */}
+      <BackHeader
+        title={'Nhập mã xác thực'.toUpperCase()}
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <ScrollView
         scrollEnabled={false}
         style={{ paddingHorizontal: actuatedNormalize(16) }}

package/src/screens/GpayInfor/Gpay.tsx

@@ -4,7 +4,6 @@ import React from 'react';
 import { Image, TouchableOpacity, View } from 'react-native';
 import Icon from 'react-native-vector-icons/Ionicons';
 import imageOptions from '../../assets/images/Optional';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import RText from '../../common/RText';
@@ -13,10 +12,10 @@ import Screens from '../../components/Navigation/Screens';
 export const Gpay = ({ navigation }: any) => {
   return (
     <Container style={{ backgroundColor: '#FFF8F2' }}>
-      <AppHeader
+      {/* <AppHeader
         title="Ví điện tử Gpay"
         goBack={() => navigation.navigate(Screens.Optional)}
-      />
+      /> */}
       <View
         style={{
           padding: 16,

package/src/screens/GpayInfor/index.tsx

@@ -10,9 +10,9 @@ import {
 import Feather from 'react-native-vector-icons/Feather';
 import { useDispatch } from 'react-redux';
 import imageOptions from '../../assets/images/Optional';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import { actuatedNormalize, numberWithCommas } from '../../common/Metrics';
 import RText from '../../common/RText';
 import { getGpayInfor } from '../../components/Features/user/userSlice';
@@ -35,7 +35,11 @@ export const GpayInfor = ({ navigation }: any) => {
 
   return (
     <Container style={{ backgroundColor: '#FFF8F2' }}>
-      <AppHeader title="Thông tin Gpay" />
+      {/* <AppHeader title="Thông tin Gpay" /> */}
+      <BackHeader
+        title="Thông tin Gpay"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <View style={{ padding: 8 }}>
         <ImageBackground
           source={imageOptions.card_gpay_infor}

package/src/screens/InputBank/index.tsx

@@ -11,11 +11,11 @@ import {
 import { showMessage } from 'react-native-flash-message';
 import Icon from 'react-native-vector-icons/Ionicons';
 import { useDispatch, useSelector } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 import Button from '../../common/Button';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import Loading from '../../common/Loading';
 import { actuatedNormalize, replaceAccent } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -183,7 +183,11 @@ export const InputBank = ({ route, navigation }: any) => {
 
   return (
     <Container isStatusBar>
-      <AppHeader title={getTitle()} />
+      {/* <AppHeader title={getTitle()} /> */}
+      <BackHeader
+        title={getTitle()}
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       {data.bankAlias === 'VIB' ? (
         <ScrollView
           scrollEnabled={false}

package/src/screens/InterestFine/index.tsx

@@ -4,10 +4,10 @@ import moment from 'moment';
 import React, { useEffect, useState } from 'react';
 import { FlatList, TouchableOpacity, View } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 import constant from '../../common/constants/index';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import Loading from '../../common/Loading';
 import { numberWithCommas } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -15,7 +15,7 @@ import { interestFine } from '../../components/Features/Loans/loanSlice';
 import { selectLoading } from '../../components/Redux/selector';
 import { AppDispatch } from '../../components/Redux/store';
 
-export const InterestFine = ({ _navigation }: any) => {
+export const InterestFine = ({ navigation }: any) => {
   const isLoading = useSelector(selectLoading);
   const dispatch = useDispatch<AppDispatch>();
   const [interestSum, setInterestSum] = useState(0);
@@ -99,7 +99,11 @@ export const InterestFine = ({ _navigation }: any) => {
 
   return (
     <Container isStatusBar>
-      <AppHeader title={'lợi nhuận Thực thu lũy kế'.toUpperCase()} />
+      {/* <AppHeader title={'lợi nhuận Thực thu lũy kế'.toUpperCase()} /> */}
+      <BackHeader
+        title={'lợi nhuận Thực thu lũy kế'.toUpperCase()}
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <View style={{ flex: 1, backgroundColor: '#E5E5E5' }}>
         <View
           style={{

package/src/screens/InterestReceived/index.tsx

@@ -5,8 +5,8 @@ import React, { useEffect, useState } from 'react';
 import { ScrollView, View } from 'react-native';
 import Icon from 'react-native-vector-icons/MaterialIcons';
 import { useDispatch, useSelector } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 import Container from '../../common/Container';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import Loading from '../../common/Loading';
 import { numberWithCommas } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -33,7 +33,7 @@ const listTitle = [
   },
 ];
 
-export const InterestReceived = ({ _navigation, _route }: any) => {
+export const InterestReceived = ({ navigation, _route }: any) => {
   const isLoading = useSelector(selectLoading);
   const dispatch = useDispatch<AppDispatch>();
   const [listPaymentSchudule, setListPaymentSchudule] = useState([]);
@@ -69,7 +69,11 @@ export const InterestReceived = ({ _navigation, _route }: any) => {
   };
   return (
     <Container>
-      <AppHeader title="LÃI ĐÃ NHẬN" />
+      {/* <AppHeader title="LÃI ĐÃ NHẬN" /> */}
+      <BackHeader
+        title="LÃI ĐÃ NHẬN"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <ScrollView>
         <View
           style={{