@tima2025/react-native-timalender 1.1.2 → 1.1.5

package/src/screens/Sign-up/index.tsx

@@ -4,7 +4,6 @@
 // import dynamicLinks from '@react-native-firebase/dynamic-links';
 import React, { useState } from 'react';
 import {
-  ImageBackground,
   SafeAreaView,
   ScrollView,
   StatusBar,
@@ -16,7 +15,6 @@ import {
 import { showMessage } from 'react-native-flash-message';
 import LinearGradient from 'react-native-linear-gradient';
 import { useDispatch } from 'react-redux';
-import IntroImages from '../../assets/images/Splash';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
@@ -87,171 +85,171 @@ export const SignUp = ({ navigation }: any) => {
   return (
     <Container>
       <StatusBar barStyle="light-content" />
-      <ImageBackground source={IntroImages.splash} style={{ flex: 1 }}>
-        <SafeAreaView
-          style={{
-            backgroundColor: 'white',
-            marginTop: actuatedNormalize(48),
-            flex: 1,
-            borderTopLeftRadius: 30,
-            borderTopRightRadius: 30,
-          }}
-        >
-          <ScrollView style={{ flex: 1 }}>
-            <RText
-              style={{
-                fontSize: 24,
-                fontWeight: 'bold',
-                textAlign: 'center',
-                marginVertical: actuatedNormalize(16),
-              }}
-            >
-              Đăng ký
-            </RText>
+      {/* <ImageBackground source={IntroImages.splash} style={{ flex: 1 }}> */}
+      <SafeAreaView
+        style={{
+          backgroundColor: 'white',
+          // marginTop: actuatedNormalize(48),
+          flex: 1,
+          borderTopLeftRadius: 30,
+          borderTopRightRadius: 30,
+        }}
+      >
+        <ScrollView style={{ flex: 1 }}>
+          <RText
+            style={{
+              fontSize: 24,
+              fontWeight: 'bold',
+              textAlign: 'center',
+              marginVertical: actuatedNormalize(16),
+            }}
+          >
+            Đăng ký
+          </RText>
+          <View
+            style={{
+              flex: 1,
+              paddingHorizontal: actuatedNormalize(16),
+            }}
+          >
             <View
-              style={{
-                flex: 1,
-                paddingHorizontal: actuatedNormalize(16),
-              }}
-            >
-              <View
-                style={[
-                  {
-                    paddingHorizontal: 16,
-                    paddingVertical: 8,
-                    borderRadius: 8,
-                    backgroundColor: 'white',
-                    shadowColor: '#000000',
-                    shadowOffset: {
-                      width: 1,
-                      height: 1,
-                    },
-                    shadowOpacity: 0.2,
-                    elevation: 4,
+              style={[
+                {
+                  paddingHorizontal: 16,
+                  paddingVertical: 8,
+                  borderRadius: 8,
+                  backgroundColor: 'white',
+                  shadowColor: '#000000',
+                  shadowOffset: {
+                    width: 1,
+                    height: 1,
                   },
-                ]}
-              >
-                <RText style={{ color: '#4F4F4F' }}>Họ và tên *</RText>
-                <TextInput
-                  style={[styleCustoms.input]}
-                  value={fullName}
-                  onChangeText={(text: string) => setFullName(text)}
-                />
-              </View>
-              <View
-                style={[
-                  {
-                    paddingHorizontal: 16,
-                    paddingVertical: 8,
-                    borderRadius: 8,
-                    backgroundColor: 'white',
-                    shadowColor: '#000000',
-                    shadowOffset: {
-                      width: 1,
-                      height: 1,
-                    },
-                    shadowOpacity: 0.2,
-                    elevation: 4,
-                    marginTop: actuatedNormalize(16),
+                  shadowOpacity: 0.2,
+                  elevation: 4,
+                },
+              ]}
+            >
+              <RText style={{ color: '#4F4F4F' }}>Họ và tên *</RText>
+              <TextInput
+                style={[styleCustoms.input]}
+                value={fullName}
+                onChangeText={(text: string) => setFullName(text)}
+              />
+            </View>
+            <View
+              style={[
+                {
+                  paddingHorizontal: 16,
+                  paddingVertical: 8,
+                  borderRadius: 8,
+                  backgroundColor: 'white',
+                  shadowColor: '#000000',
+                  shadowOffset: {
+                    width: 1,
+                    height: 1,
                   },
-                ]}
-              >
-                <RText style={{ color: '#4F4F4F' }}>Số điện thoại *</RText>
-                <TextInput
-                  style={styleCustoms.input}
-                  value={phone}
-                  keyboardType="numeric"
-                  onChangeText={(text: string) => setPhone(text)}
-                />
-              </View>
-              <View
-                style={[
-                  {
-                    paddingHorizontal: 16,
-                    paddingVertical: 8,
-                    borderRadius: 8,
-                    backgroundColor: 'white',
-                    shadowColor: '#000000',
-                    shadowOffset: {
-                      width: 1,
-                      height: 1,
-                    },
-                    shadowOpacity: 0.2,
-                    elevation: 4,
-                    marginTop: actuatedNormalize(16),
+                  shadowOpacity: 0.2,
+                  elevation: 4,
+                  marginTop: actuatedNormalize(16),
+                },
+              ]}
+            >
+              <RText style={{ color: '#4F4F4F' }}>Số điện thoại *</RText>
+              <TextInput
+                style={styleCustoms.input}
+                value={phone}
+                keyboardType="numeric"
+                onChangeText={(text: string) => setPhone(text)}
+              />
+            </View>
+            <View
+              style={[
+                {
+                  paddingHorizontal: 16,
+                  paddingVertical: 8,
+                  borderRadius: 8,
+                  backgroundColor: 'white',
+                  shadowColor: '#000000',
+                  shadowOffset: {
+                    width: 1,
+                    height: 1,
                   },
-                ]}
-              >
-                <RText style={{ color: '#4F4F4F' }}>Email nhà đầu tư *</RText>
-                <TextInput
-                  style={styleCustoms.input}
-                  value={email}
-                  onChangeText={(text: string) => setEmail(text)}
-                />
-              </View>
-              <View
-                style={[
-                  {
-                    paddingHorizontal: 16,
-                    paddingVertical: 8,
-                    borderRadius: 8,
-                    backgroundColor: 'white',
-                    shadowColor: '#000000',
-                    shadowOffset: {
-                      width: 1,
-                      height: 1,
-                    },
-                    shadowOpacity: 0.2,
-                    elevation: 4,
-                    marginTop: actuatedNormalize(16),
-                    marginBottom: actuatedNormalize(16),
+                  shadowOpacity: 0.2,
+                  elevation: 4,
+                  marginTop: actuatedNormalize(16),
+                },
+              ]}
+            >
+              <RText style={{ color: '#4F4F4F' }}>Email nhà đầu tư *</RText>
+              <TextInput
+                style={styleCustoms.input}
+                value={email}
+                onChangeText={(text: string) => setEmail(text)}
+              />
+            </View>
+            <View
+              style={[
+                {
+                  paddingHorizontal: 16,
+                  paddingVertical: 8,
+                  borderRadius: 8,
+                  backgroundColor: 'white',
+                  shadowColor: '#000000',
+                  shadowOffset: {
+                    width: 1,
+                    height: 1,
                   },
-                ]}
-              >
-                <RText style={{ color: '#4F4F4F' }}>
-                  Số điện thoại người giới thiệu
-                </RText>
-                <TextInput
-                  style={styleCustoms.input}
-                  value={refPhone}
-                  keyboardType="numeric"
-                  onChangeText={(text: string) => setRefPhone(text)}
-                />
-              </View>
+                  shadowOpacity: 0.2,
+                  elevation: 4,
+                  marginTop: actuatedNormalize(16),
+                  marginBottom: actuatedNormalize(16),
+                },
+              ]}
+            >
+              <RText style={{ color: '#4F4F4F' }}>
+                Số điện thoại người giới thiệu
+              </RText>
+              <TextInput
+                style={styleCustoms.input}
+                value={refPhone}
+                keyboardType="numeric"
+                onChangeText={(text: string) => setRefPhone(text)}
+              />
             </View>
-          </ScrollView>
-          <TouchableOpacity style={{ margin: 16 }} onPress={() => onRegister()}>
-            <LinearGradient
-              colors={['#FF8E4F', '#EF592E']}
-              style={{
-                height: 40,
-                borderRadius: 30,
-                alignItems: 'center',
-                justifyContent: 'center',
+          </View>
+        </ScrollView>
+        <TouchableOpacity style={{ margin: 16 }} onPress={() => onRegister()}>
+          <LinearGradient
+            colors={['#FF8E4F', '#EF592E']}
+            style={{
+              height: 40,
+              borderRadius: 30,
+              alignItems: 'center',
+              justifyContent: 'center',
+            }}
+          >
+            <RText style={{ color: 'white' }}>Đăng ký</RText>
+          </LinearGradient>
+        </TouchableOpacity>
+        <FlexRow style={{ alignSelf: 'center', marginBottom: 32 }}>
+          <RText>Bạn đã có tài khoản ?</RText>
+          <TouchableOpacity
+            onPress={() => navigation.navigate(Screens.SignIn)}
+            style={{
+              marginLeft: 6,
+            }}
+          >
+            <RText
+              textStyle={{
+                color: Colors.ORANGE,
               }}
             >
-              <RText style={{ color: 'white' }}>Đăng ký</RText>
-            </LinearGradient>
+              Đăng nhập
+            </RText>
           </TouchableOpacity>
-          <FlexRow style={{ alignSelf: 'center', marginBottom: 32 }}>
-            <RText>Bạn đã có tài khoản ?</RText>
-            <TouchableOpacity
-              onPress={() => navigation.navigate(Screens.SignIn)}
-              style={{
-                marginLeft: 6,
-              }}
-            >
-              <RText
-                textStyle={{
-                  color: Colors.ORANGE,
-                }}
-              >
-                Đăng nhập
-              </RText>
-            </TouchableOpacity>
-          </FlexRow>
-        </SafeAreaView>
-      </ImageBackground>
+        </FlexRow>
+      </SafeAreaView>
+      {/* </ImageBackground> */}
     </Container>
   );
 };

package/src/screens/SignContractGpayTima/SignContract.tsx

@@ -11,15 +11,15 @@ import LinearGradient from 'react-native-linear-gradient';
 import Pdf from 'react-native-pdf';
 import Icon from 'react-native-vector-icons/Ionicons';
 import { useDispatch, 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 RText from '../../common/RText';
 import Screens from '../../components/Navigation/Screens';
 import { selectLoading } from '../../components/Redux/selector';
 import { AppDispatch } from '../../components/Redux/store';
 
-export default function SignContract({navigation, route}: any) {
+export default function SignContract({ navigation, route }: any) {
   const dispatch = useDispatch<AppDispatch>();
   const isLoading = useSelector(selectLoading);
   const [check, setCheck] = useState(false);
@@ -60,9 +60,13 @@ export default function SignContract({navigation, route}: any) {
 
   return (
     <Container>
-      <AppHeader title="Hợp đồng Tima - Gpay - Lender" />
+      {/* <AppHeader title="Hợp đồng Tima - Gpay - Lender" /> */}
+      <BackHeader
+        title="Hợp đồng Tima - Gpay - Lender"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
 
-      <View style={{flex: 1}}>
+      <View style={{ flex: 1 }}>
         <Pdf
           source={source}
           onLoadComplete={(numberOfPages, filePath) => {
@@ -71,10 +75,10 @@ export default function SignContract({navigation, route}: any) {
           onPageChanged={(page, numberOfPages) => {
             console.log(`Current page: ${page}`);
           }}
-          onError={error => {
+          onError={(error) => {
             console.log(error);
           }}
-          onPressLink={uri => {
+          onPressLink={(uri) => {
             console.log(`Link pressed: ${uri}`);
             Linking.openURL(uri);
           }}
@@ -91,18 +95,20 @@ export default function SignContract({navigation, route}: any) {
             backgroundColor: 'white',
             marginVertical: 16,
             paddingHorizontal: 16,
-          }}>
-          <View style={{flexDirection: 'row'}}>
+          }}
+        >
+          <View style={{ flexDirection: 'row' }}>
             <TouchableOpacity
-              style={{marginLeft: 8}}
-              onPress={() => setCheck(!check)}>
+              style={{ marginLeft: 8 }}
+              onPress={() => setCheck(!check)}
+            >
               {check ? (
                 <Icon name="checkbox" size={24} color={Colors.ORANGE} />
               ) : (
                 <Icon name="square-outline" size={24} color="#BDBDBD" />
               )}
             </TouchableOpacity>
-            <RText style={{color: '#333333', paddingLeft: 10}}>
+            <RText style={{ color: '#333333', paddingLeft: 10 }}>
               Tôi đồng ý với tất cả những điều kiện trong{'\n'} hợp đồng.
             </RText>
           </View>
@@ -117,11 +123,12 @@ export default function SignContract({navigation, route}: any) {
                 marginBottom: 16,
                 alignItems: 'center',
                 marginTop: 40,
-              }}>
+              }}
+            >
               {isLoading ? (
                 <ActivityIndicator color={'white'} />
               ) : (
-                <RText style={{color: 'white', fontSize: 16}}>
+                <RText style={{ color: 'white', fontSize: 16 }}>
                   Ký hợp đồng
                 </RText>
               )}

package/src/screens/SignContractGpayTima/index.tsx

@@ -4,12 +4,12 @@ import React, { useEffect, useState } from 'react';
 import { Alert, Image, TouchableOpacity, View } from 'react-native';
 import { useSelector } from 'react-redux';
 import imageOptions from '../../assets/images/Optional';
-import AppHeader from '../../common/AppHeader';
 import BSubmit from '../../common/BSubmit/BSubmit';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import EmptyView from '../../common/EmptyView';
 import FlexRow from '../../common/FlexRow';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import Loading from '../../common/Loading';
 import { Shadow, actuatedNormalize } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -45,9 +45,13 @@ export const SignContractGpayTima = ({ navigation }: any) => {
   }, [navigation]);
   return (
     <Container>
-      <AppHeader
+      {/* <AppHeader
         title="HỢP ĐỒNG TIMA - GPAY - LENDER"
         goBack={() => navigation.navigate(Screens.Gpay)}
+      /> */}
+      <BackHeader
+        title="HỢP ĐỒNG TIMA - GPAY - LENDER"
+        onPress={() => navigation.navigate('MyBank.Main')}
       />
       <View style={{ padding: actuatedNormalize(16) }}>
         {data ? (

package/src/screens/SignDebtContract/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';
@@ -137,11 +137,15 @@ const SignDebtContract = ({ route, navigation }: any) => {
 
   return (
     <Container>
-      <AppHeader
+      {/* <AppHeader
         title={type === 0 ? 'Hợp đồng mua nợ' : 'Hợp đồng bán nợ'}
         backColor={Colors.WHITE}
         iconColor={Colors.BLACK}
         titleStyle={{ color: Colors.BLACK }}
+      /> */}
+      <BackHeader
+        title={type === 0 ? 'Hợp đồng mua nợ' : 'Hợp đồng bán nợ'}
+        onPress={() => navigation.navigate('MyBank.Main')}
       />
       <View
         style={{

package/src/screens/Support/index.tsx

@@ -2,7 +2,6 @@
 /* eslint-disable react-native/no-inline-styles */
 import React from 'react';
 import Icon from 'react-native-vector-icons/Ionicons';
-import AppHeader from '../../common/AppHeader';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
 import FlexRow from '../../common/FlexRow';
@@ -12,7 +11,7 @@ import RText from '../../common/RText';
 export const Support = () => {
   return (
     <Container isStatusBar>
-      <AppHeader title="HỖ TRỢ" />
+      {/* <AppHeader title="HỖ TRỢ" /> */}
       <FlexRow
         style={{ alignSelf: 'center', paddingTop: actuatedNormalize(150) }}
       >

package/src/screens/TransferSuccess/index.tsx

@@ -2,9 +2,9 @@
 import React from 'react';
 import { Image, View } from 'react-native';
 import imageBanks from '../../assets/images/Banks';
-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 Screens from '../../components/Navigation/Screens';
@@ -12,7 +12,11 @@ import Screens from '../../components/Navigation/Screens';
 export const TransferSuccess = ({ navigation }: any) => {
   return (
     <Container isStatusBar>
-      <AppHeader title="CHUYỂN KHOẢN" />
+      {/* <AppHeader title="CHUYỂN KHOẢN" /> */}
+      <BackHeader
+        title="CHUYỂN KHOẢN"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <View
         style={{
           backgroundColor: 'white',