@tima2025/react-native-timalender 1.1.3 → 1.1.5

package/src/screens/Optional/index.tsx

@@ -1,13 +1,6 @@
 //@ts-nocheck
 import React, { useEffect, useState } from 'react';
-import {
-  Alert,
-  Image,
-  ScrollView,
-  Switch,
-  TouchableOpacity,
-  View,
-} from 'react-native';
+import { Alert, Image, ScrollView, TouchableOpacity, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import IoIcon from 'react-native-vector-icons/Ionicons';
 import { useDispatch, useSelector } from 'react-redux';
@@ -20,14 +13,13 @@ import { actuatedNormalize } from '../../common/Metrics';
 import RText from '../../common/RText';
 import {
   ChangeToken,
-  logOut,
   setUserLogin,
 } from '../../components/Features/user/userSlice';
 import ModalPickShop from '../../components/ModalPickShop/ModalPickShop';
 import Screens from '../../components/Navigation/Screens';
 import { selectLoading, userInfor } from '../../components/Redux/selector';
 import { AppDispatch } from '../../components/Redux/store';
-import { load, save } from '../../components/Storage/storage';
+import { load } from '../../components/Storage/storage';
 import { setClientToken } from '../../controllers/Client';
 import useGetUser from '../../hooks/useGetUser';
 import { Option } from '../../interface/index';
@@ -91,31 +83,16 @@ const options: Option[] = [
     title: 'Giới thiệu về TIMA',
     icon: imageOptions.about,
   },
-  {
-    id: 12,
-    title: 'Thông báo nhận đơn mới',
-    icon: imageOptions.notification,
-  },
+  // {
+  //   id: 12,
+  //   title: 'Thông báo nhận đơn mới',
+  //   icon: imageOptions.notification,
+  // },
   {
     id: 5,
     title: 'Hướng dẫn',
     icon: imageOptions.guide,
   },
-  // {
-  //   id: 6,
-  //   title: 'Đổi mật khẩu',
-  //   icon: imageOptions.password,
-  // },
-  // {
-  //   id: 7,
-  //   title: 'Kiểm tra bản cập nhật',
-  //   icon: imageOptions.refresh,
-  // },
-  // {
-  //   id: 8,
-  //   title: 'Đăng xuất',
-  //   icon: imageOptions.logout,
-  // },
 ];
 
 export const Optional = ({ navigation }: any) => {
@@ -138,7 +115,11 @@ export const Optional = ({ navigation }: any) => {
   };
 
   useEffect(() => {
-    getOneShop();
+    // getOneShop();
+    if (userData?.shops?.length > 0 || userData?.shop) {
+      // TODO check userData
+      getOneShop();
+    }
     if (userData?.typeDisbursement === 'NA') {
       loadEnableNotification();
     }
@@ -150,26 +131,26 @@ export const Optional = ({ navigation }: any) => {
     setIsEnabled(data);
   };
 
-  const toggleSwitch = () => {
-    if (userData?.typeDisbursement === 'NA') {
-      setIsEnabled(!isEnabled);
-      save('enable_notifications', !isEnabled);
-      if (isEnabled) {
-        // unSubscribeTopicFCM(userData?.phone);
-      } else {
-        // subscribeTopicNotification(userData?.phone);
-      }
-    } else {
-      // WToastShowError('Chức năng chỉ dành cho NĐT có mã "NA"');
-      showMessage({
-        message: 'Thông báo',
-        description: 'Chức năng chỉ dành cho NĐT có mã "NA"',
-        type: 'danger',
-        icon: 'warning',
-        backgroundColor: Colors.DANGER,
-      });
-    }
-  };
+  // const toggleSwitch = () => {
+  //   if (userData?.typeDisbursement === 'NA') {
+  //     setIsEnabled(!isEnabled);
+  //     save('enable_notifications', !isEnabled);
+  //     if (isEnabled) {
+  //       // unSubscribeTopicFCM(userData?.phone);
+  //     } else {
+  //       // subscribeTopicNotification(userData?.phone);
+  //     }
+  //   } else {
+  //     // WToastShowError('Chức năng chỉ dành cho NĐT có mã "NA"');
+  //     showMessage({
+  //       message: 'Thông báo',
+  //       description: 'Chức năng chỉ dành cho NĐT có mã "NA"',
+  //       type: 'danger',
+  //       icon: 'warning',
+  //       backgroundColor: Colors.DANGER,
+  //     });
+  //   }
+  // };
 
   const handleNavigate = (id: number) => {
     switch (id) {
@@ -191,25 +172,8 @@ export const Optional = ({ navigation }: any) => {
       case 5:
         navigation.navigate(Screens.Guide);
         break;
-      // case 6:
-      //   navigation.navigate(Screens.ChangePassword);
-      //   break;
       case 7:
         break;
-      // case 8:
-      //   Alert.alert('Thông báo', 'Bạn có chắc chắn muốn đăng xuất?', [
-      //     {
-      //       text: 'Huỷ',
-      //     },
-      //     {
-      //       text: 'Đồng ý',
-      //       onPress: () => {
-      //         // unSubscribeTopicFCM(userData?.phone);
-      //         dispatch(logOut());
-      //       },
-      //     },
-      //   ]);
-      //   break;
       case 9:
         navigation.navigate(Screens.Gpay);
         break;
@@ -247,29 +211,54 @@ export const Optional = ({ navigation }: any) => {
     setOpenPickShop(true);
   };
 
-  const changeToken = async (shop: { shopId: any; regFromApp: any }) => {
-    const resp: any = await dispatch(ChangeToken({ shop_id: shop?.shopId }));
-    if (resp && resp.payload && resp?.payload?.meta?.errCode === 200) {
-      const obj = {
-        ...userData,
-        accessToken: resp?.payload?.data,
-        regFromApp: shop?.regFromApp,
-        shop: shop,
-      };
-      setClientToken(resp.payload.data);
-      dispatch(setUserLogin(obj));
-    } else {
-      // WToastShowError('Vui lòng đăng nhập lại');
-      Alert.alert(
-        'Thông báo',
-        'Lấy token shop không thành công\nVui lòng đăng nhập lại!',
-        [
+  const handleLogOut = () => {
+    // dispatch(logOut());
+    // navigation.dispatch(
+    //   CommonActions.reset({
+    //     index: 0,
+    //     routes: [{ name: Screens.Auth }],
+    //   })
+    // );
+  };
+
+  const changeToken = async (shop: any) => {
+    try {
+      if (!shop?.shopId) {
+        Alert.alert('Thông báo', 'Shop không hợp lệ!', [
           {
             text: 'Đồng ý',
-            onPress: () => dispatch(logOut()),
+            onPress: handleLogOut,
           },
-        ]
-      );
+        ]);
+      }
+
+      const resp: any = await dispatch(ChangeToken({ shop_id: shop.shopId }));
+      const token = resp?.payload?.data;
+      const code = resp?.payload?.meta?.errCode;
+      console.log('Optional change token: ', JSON.stringify(resp));
+
+      if (code === 200 && token) {
+        const obj = {
+          ...userData,
+          accessToken: token,
+          regFromApp: shop?.regFromApp,
+          shop: shop,
+        };
+        setClientToken(token);
+        dispatch(setUserLogin(obj));
+      } else {
+        Alert.alert(
+          'Thông báo',
+          'Lấy token shop không thành công\nVui lòng đăng nhập lại!'
+        );
+      }
+    } catch (err) {
+      console.log('changeToken error: ', err);
+      // Alert.alert(
+      //   'Thông báo',
+      //   'Lấy token shop không thành công\nVui lòng đăng nhập lại!',
+      //   [{ text: 'Đồng ý', onPress: () => dispatch(logOut()) }]
+      // );
     }
   };
 
@@ -362,7 +351,7 @@ export const Optional = ({ navigation }: any) => {
                   />
                   <RText textStyle={{ paddingLeft: 12 }}>{item?.title}</RText>
                 </View>
-                {item.id === 12 && (
+                {/* {item.id === 12 && (
                   <Switch
                     trackColor={{ false: '#767577', true: Colors.GRAY_5 }}
                     thumbColor={isEnabled ? Colors.ORANGE : Colors.GRAY_4}
@@ -370,7 +359,7 @@ export const Optional = ({ navigation }: any) => {
                     value={isEnabled}
                     style={{ transform: [{ scaleX: 0.6 }, { scaleY: 0.6 }] }}
                   />
-                )}
+                )} */}
               </TouchableOpacity>
             );
           })}

package/src/screens/PassCode/index.tsx

@@ -3,7 +3,6 @@
 import React, { useEffect, 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 { actuatedNormalize } from '../../common/Metrics';
@@ -80,7 +79,7 @@ export const PassCode = ({ navigation }: any) => {
 
   return (
     <Container isStatusBar>
-      <AppHeader title="NHẬP PASSCODE KÝ SỐ" />
+      {/* <AppHeader title="NHẬP PASSCODE KÝ SỐ" /> */}
       <ScrollView style={{ padding: actuatedNormalize(20) }}>
         <RText
           style={{

package/src/screens/PendingLoan/index.tsx

@@ -6,10 +6,10 @@ import React, { useEffect, useRef, useState } from 'react';
 import { FlatList, ScrollView, TouchableOpacity, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import { useDispatch, useSelector } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 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, Shadow } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -172,12 +172,16 @@ export const PendingLoan = ({ route, _navigation }: any) => {
 
   return (
     <Container>
-      <AppHeader
+      {/* <AppHeader
         title={'Số tiền chờ nhận'}
         backColor={Colors.WHITE}
         iconColor={Colors.BLACK}
         titleStyle={{ color: Colors.BLACK }}
         // renderRight={() => <ButtonIcon iconName="information-circle-outline" />}
+      /> */}
+      <BackHeader
+        title={'Số tiền chờ nhận'}
+        onPress={() => navigation.navigate('MyBank.Main')}
       />
       <ScrollView>
         <View>

package/src/screens/PendingMoney/index.tsx

@@ -3,10 +3,10 @@
 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 { numberWithCommas } from '../../common/Metrics';
 import RText from '../../common/RText';
 import { statisticsPending } from '../../components/Features/Loans/loanSlice';
@@ -87,7 +87,11 @@ export const PendingMoney = ({ navigation }: any) => {
 
   return (
     <Container isStatusBar>
-      <AppHeader title={'Số tiền Nhà đầu tư chờ nhận'.toUpperCase()} />
+      {/* <AppHeader title={'Số tiền Nhà đầu tư chờ nhận'.toUpperCase()} /> */}
+      <BackHeader
+        title={'Số tiền Nhà đầu tư chờ nhận'.toUpperCase()}
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <View style={{ flex: 1 }}>
         {userDataInfor.regFromApp ? (
           <View

package/src/screens/ReceivedLoan/index.tsx

@@ -5,10 +5,10 @@ import React, { useEffect, useRef, useState } from 'react';
 import { FlatList, ScrollView, TouchableOpacity, View } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import { useSelector } from 'react-redux';
-import AppHeader from '../../common/AppHeader';
 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, Shadow } from '../../common/Metrics';
 import RText from '../../common/RText';
@@ -213,12 +213,16 @@ const ReceivedLoan = ({ route, navigation }: any) => {
 
   return (
     <Container>
-      <AppHeader
+      {/* <AppHeader
         title={'Số tiền đã thanh toán'}
         backColor={Colors.WHITE}
         iconColor={Colors.BLACK}
         titleStyle={{ color: Colors.BLACK }}
         // renderRight={() => <ButtonIcon iconName="information-circle-outline" />}
+      /> */}
+      <BackHeader
+        title={'Số tiền đã thanh toán'}
+        onPress={() => navigation.navigate('MyBank.Main')}
       />
       <ScrollView style={{ paddingTop: actuatedNormalize(16) }}>
         <View>

package/src/screens/SellDebt/index.tsx

@@ -2,9 +2,9 @@
 /* eslint-disable react-native/no-inline-styles */
 import React, { memo, useState } from 'react';
 import { FlatList, TouchableOpacity, View } from 'react-native';
-import AppHeader from '../../common/AppHeader';
 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';
@@ -34,11 +34,15 @@ const SellDebt = ({ navigation, route }: any) => {
 
   return (
     <Container style={{ position: 'relative' }}>
-      <AppHeader
+      {/* <AppHeader
         backColor={Colors.WHITE}
         iconColor={Colors.BLACK}
         titleStyle={{ color: Colors.BLACK }}
         title="Bán nợ"
+      /> */}
+      <BackHeader
+        title="Bán nợ"
+        onPress={() => navigation.navigate('MyBank.Main')}
       />
 
       <View

package/src/screens/SetPassword/index.tsx

@@ -7,10 +7,10 @@ import { Animated, Dimensions, ScrollView, TextInput } from 'react-native';
 import { showMessage } from 'react-native-flash-message';
 import { useDispatch } from 'react-redux';
 import Images from '../../assets/images/Logo';
-import AppHeader from '../../common/AppHeader';
 import Button from '../../common/Button';
 import Colors from '../../common/Colors';
 import Container from '../../common/Container';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 import { ConfirmPassword } from '../../components/Features/user/userSlice';
 import Screens from '../../components/Navigation/Screens';
 import { AppDispatch } from '../../components/Redux/store';
@@ -71,7 +71,11 @@ export const SetPassword = ({ navigation }: any) => {
 
   return (
     <Container isStatusBar>
-      <AppHeader title="ĐẶT MẬT KHẨU MỚI" />
+      {/* <AppHeader title="ĐẶT MẬT KHẨU MỚI" /> */}
+      <BackHeader
+        title="ĐẶT MẬT KHẨU MỚI"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <ScrollView scrollEnabled={false} style={{ paddingHorizontal: 20 }}>
         <Animated.Image
           source={Images.logo}

package/src/screens/ShowBuyDue/index.tsx

@@ -3,15 +3,19 @@
 import React from 'react';
 import { View } from 'react-native';
 import Pdf from 'react-native-pdf';
-import AppHeader from '../../common/AppHeader';
 import Container from '../../common/Container';
+import BackHeader from '../../common/HeaderClose/BackHeader';
 
-export const ShowBuyDue = ({ route }: any) => {
+export const ShowBuyDue = ({ route, navigation }: any) => {
   const filePath = route?.params?.filePath;
 
   return (
     <Container>
-      <AppHeader title="Hợp đồng" />
+      {/* <AppHeader title="Hợp đồng" /> */}
+      <BackHeader
+        title="Hợp đồng"
+        onPress={() => navigation.navigate('MyBank.Main')}
+      />
       <View
         style={{
           width: '100%',