@tima2025/react-native-timalender 1.1.1 → 1.1.3

package/src/components/Navigation/index.tsx

@@ -1,113 +1,7 @@
 //@ts-nocheck
-import React, { useEffect } from 'react';
-import { showMessage } from 'react-native-flash-message';
-import { useDispatch, useSelector } from 'react-redux';
-import Colors from '../../common/Colors';
-import {
-  ChangeToken,
-  logOut,
-  setUserLogin,
-} from '../../components/Features/user/userSlice';
-import Screens from '../../components/Navigation/Screens';
-import { AppDispatch } from '../../components/Redux/store';
-import { setClientToken } from '../../controllers/Client';
-import Users from '../../controllers/Users';
-import { userInfor } from '../Redux/selector';
+import React from 'react';
 import AppNavigator from './AppNavigator';
-
 const Navigation = (props: any) => {
-  const navigation = props?.navigation;
-  const dispatch = useDispatch<AppDispatch>();
-
-  const userData = useSelector(userInfor);
-  // if (userData && !access_token) {
-  //   setClientToken(userData?.accessToken);
-  // }
-
-  const changeToken = async (shop: any) => {
-    const resp: any = await dispatch(ChangeToken({ shop_id: shop?.shopId }));
-    console.log('resp change token---', resp);
-    switch (resp.payload.meta.errCode) {
-      case 403:
-        // WToastShowError('Bạn không có quyền truy cập');
-        showMessage({
-          message: 'Thông báo',
-          description: 'Bạn không có quyền truy cập',
-          type: 'danger',
-          icon: 'warning',
-          backgroundColor: Colors.DANGER,
-        });
-        break;
-      case 401:
-        // WToastShowError('Vui lòng đăng nhập lại');
-        showMessage({
-          message: 'Thông báo',
-          description: 'Vui lòng đăng nhập lại',
-          type: 'danger',
-          icon: 'warning',
-          backgroundColor: Colors.DANGER,
-        });
-        break;
-      case 200:
-        dataShop.accessToken = resp.payload.data;
-        dataShop.regFromApp = shop.regFromApp;
-        dataShop.shop = shop;
-        dispatch(setUserLogin(dataShop));
-        break;
-      default:
-        break;
-    }
-  };
-
-  const validateToken = async () => {
-    try {
-      console.log('token:::', props.route?.params?.token);
-      const res = await Users.ValidateToken();
-      console.log('ValidateToken: ', JSON.stringify(res));
-      const data = JSON.parse(res);
-
-      switch (data.meta.errCode) {
-        case 200:
-          dispatch(setUserLogin(data?.data));
-          if (data.data.shops !== undefined && data.data.shops !== null) {
-            if (data.data.shops.length > 0) {
-              setClientToken(data.data.accessToken);
-              // setDataShop(data?.data);
-              changeToken(data?.data?.shops[0]);
-              // data.data.shop = data?.data.shops[0];
-              // navigation.replace(Screens.MainTab);
-              return;
-            }
-          }
-          break;
-        case 222:
-          // WToastShowError('Có lỗi xảy ra,vui lòng thử lại sau!');
-          showMessage({
-            message: 'Thông báo',
-            description: 'Có lỗi xảy ra,vui lòng thử lại sau!',
-            type: 'danger',
-            icon: 'warning',
-            backgroundColor: Colors.DANGER,
-          });
-          break;
-      }
-      navigation.replace(Screens.SignUp);
-    } catch (e) {
-      console.log(e);
-    }
-  };
-
-  useEffect(() => {
-    dispatch(setUserLogin({}));
-    setClientToken(props.route?.params?.token);
-    validateToken();
-
-    return () => {
-      console.log('logout');
-      dispatch(logOut());
-    };
-  }, []);
   return <AppNavigator {...props} />;
 };
-
 export default Navigation;

package/src/screens/Intro/index.tsx

@@ -1,78 +1,18 @@
 /* eslint-disable react-native/no-inline-styles */
-import React from 'react';
-import {
-  ImageBackground,
-  SafeAreaView,
-  TouchableOpacity,
-  View,
-} from 'react-native';
+import React, { useEffect } from 'react';
+import { ImageBackground } from 'react-native';
 import IntroImages from '../../assets/images/Splash';
-import BSubmit from '../../common/BSubmit/BSubmit';
-import Colors from '../../common/Colors';
-import FlexRow from '../../common/FlexRow';
-import { actuatedNormalize } from '../../common/Metrics';
-import RText from '../../common/RText';
 import Screens from '../../components/Navigation/Screens';
-import { save } from '../../components/Storage/storage';
-
 export const Intro = ({ navigation }: any) => {
-  // const isLogin = route?.params?.isLogin || false;
-
-  // const handleGoHome = () => {
-  //   isLogin ? navigation.goBack() : navigation.navigate(Screens.SignIn);
-  //   save('next_intro', 'true');
-  // };
-
-  const onNavigate = async () => {
-    await save('next_intro', 'true');
-    navigation.navigate(Screens.SignUp);
-  };
-
-  const onLogin = async () => {
-    await save('next_intro', 'true');
-    navigation.navigate(Screens.SignIn);
-  };
-
+  useEffect(() => {
+    setTimeout(() => {
+      navigation.navigate(Screens.MainTab);
+    }, 800);
+  }, []);
   return (
-    <ImageBackground source={IntroImages.bg_intro} style={{ flex: 1 }}>
-      <SafeAreaView
-        style={{
-          flex: 1,
-          justifyContent: 'flex-end',
-        }}
-      >
-        <View>
-          <BSubmit
-            text={'Nhận tư vấn đầu tư'}
-            onPress={onNavigate}
-            buttonStyle={{
-              alignSelf: 'center',
-              width: '90%',
-            }}
-          />
-
-          <FlexRow
-            style={{ alignSelf: 'center', marginBottom: 24, marginTop: 16 }}
-          >
-            <RText>Bạn đã có tài khoản ?</RText>
-            <TouchableOpacity
-              onPress={onLogin}
-              style={{
-                marginLeft: 6,
-              }}
-            >
-              <RText
-                textStyle={{
-                  color: Colors.ORANGE,
-                  fontSize: actuatedNormalize(18),
-                }}
-              >
-                Đăng nhập
-              </RText>
-            </TouchableOpacity>
-          </FlexRow>
-        </View>
-      </SafeAreaView>
-    </ImageBackground>
+    <ImageBackground
+      source={IntroImages.bg_intro}
+      style={{ flex: 1 }}
+    ></ImageBackground>
   );
 };

package/src/screens/Optional/index.tsx

@@ -31,11 +31,7 @@ import { load, save } from '../../components/Storage/storage';
 import { setClientToken } from '../../controllers/Client';
 import useGetUser from '../../hooks/useGetUser';
 import { Option } from '../../interface/index';
-import {
-  checkPermission,
-  subscribeTopicNotification,
-  unSubscribeTopicFCM,
-} from '../../utils/notification';
+import { checkPermission } from '../../utils/notification';
 import styles from './styles';
 
 const options: Option[] = [
@@ -105,31 +101,31 @@ const options: Option[] = [
     title: 'Hướng dẫn',
     icon: imageOptions.guide,
   },
-  {
-    id: 6,
-    title: 'Đổi mật khẩu',
-    icon: imageOptions.password,
-  },
+  // {
+  //   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,
-  },
+  // {
+  //   id: 8,
+  //   title: 'Đăng xuất',
+  //   icon: imageOptions.logout,
+  // },
 ];
 
-export const Optional = ({navigation}: any) => {
+export const Optional = ({ navigation }: any) => {
   const dispatch = useDispatch<AppDispatch>();
   const _userInfo = useGetUser();
   const isLoading = useSelector(selectLoading);
   const userData = useSelector(userInfor);
   const [openPickShop, setOpenPickShop] = useState(false);
   const [shopName, setShopName] = useState<string>(
-    userData?.shops[0]?.name || userData?.shop?.name,
+    userData?.shops[0]?.name || userData?.shop?.name
   );
   const [lenderType, setLenderType] = useState<string | null>(null);
   const [isEnabled, setIsEnabled] = useState(false);
@@ -159,9 +155,9 @@ export const Optional = ({navigation}: any) => {
       setIsEnabled(!isEnabled);
       save('enable_notifications', !isEnabled);
       if (isEnabled) {
-        unSubscribeTopicFCM(userData?.phone);
+        // unSubscribeTopicFCM(userData?.phone);
       } else {
-        subscribeTopicNotification(userData?.phone);
+        // subscribeTopicNotification(userData?.phone);
       }
     } else {
       // WToastShowError('Chức năng chỉ dành cho NĐT có mã "NA"');
@@ -195,25 +191,25 @@ export const Optional = ({navigation}: any) => {
       case 5:
         navigation.navigate(Screens.Guide);
         break;
-      case 6:
-        navigation.navigate(Screens.ChangePassword);
-        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 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;
@@ -251,8 +247,8 @@ 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}));
+  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,
@@ -272,7 +268,7 @@ export const Optional = ({navigation}: any) => {
             text: 'Đồng ý',
             onPress: () => dispatch(logOut()),
           },
-        ],
+        ]
       );
     }
   };
@@ -303,7 +299,7 @@ export const Optional = ({navigation}: any) => {
         </TouchableOpacity>
       </View>
       <View style={styles.redLine} />
-      <ScrollView style={{paddingHorizontal: actuatedNormalize(16)}}>
+      <ScrollView style={{ paddingHorizontal: actuatedNormalize(16) }}>
         {shopName?.includes('DT') &&
           (lenderType?.includes('Gold') ||
             lenderType?.includes('Gold Plus')) && (
@@ -311,7 +307,8 @@ export const Optional = ({navigation}: any) => {
               onPress={() => navigation.navigate(Screens.WithDraw)}
               style={{
                 flex: 1,
-              }}>
+              }}
+            >
               <View style={styles.optionItems}>
                 <Image
                   source={imageOptions.withdraw}
@@ -322,13 +319,13 @@ export const Optional = ({navigation}: any) => {
                     resizeMode: 'contain',
                   }}
                 />
-                <RText textStyle={{paddingLeft: 12}}>{'Rút tiền'}</RText>
+                <RText textStyle={{ paddingLeft: 12 }}>{'Rút tiền'}</RText>
               </View>
-              <View style={{height: 1, backgroundColor: '#E5E5E5'}} />
+              <View style={{ height: 1, backgroundColor: '#E5E5E5' }} />
             </TouchableOpacity>
           )}
         {options
-          .filter(item => {
+          .filter((item) => {
             if (
               item.id === 15 &&
               shopName?.includes('NA') &&
@@ -351,7 +348,8 @@ export const Optional = ({navigation}: any) => {
                   flexDirection: 'row',
                   alignItems: 'center',
                   justifyContent: 'space-between',
-                }}>
+                }}
+              >
                 <View style={styles.optionItems}>
                   <Image
                     source={item.icon}
@@ -362,15 +360,15 @@ export const Optional = ({navigation}: any) => {
                       resizeMode: 'contain',
                     }}
                   />
-                  <RText textStyle={{paddingLeft: 12}}>{item?.title}</RText>
+                  <RText textStyle={{ paddingLeft: 12 }}>{item?.title}</RText>
                 </View>
                 {item.id === 12 && (
                   <Switch
-                    trackColor={{false: '#767577', true: Colors.GRAY_5}}
+                    trackColor={{ false: '#767577', true: Colors.GRAY_5 }}
                     thumbColor={isEnabled ? Colors.ORANGE : Colors.GRAY_4}
                     onValueChange={toggleSwitch}
                     value={isEnabled}
-                    style={{transform: [{scaleX: 0.6}, {scaleY: 0.6}]}}
+                    style={{ transform: [{ scaleX: 0.6 }, { scaleY: 0.6 }] }}
                   />
                 )}
               </TouchableOpacity>

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

@@ -30,7 +30,6 @@ import { AppDispatch } from '../../components/Redux/store';
 import { load, save, SECURITY } from '../../components/Storage/storage';
 import KeyboardSpacer from '../../components/keyboardspacer';
 import { setClientToken } from '../../controllers/Client';
-import { subscribeTopicFCM } from '../../utils/notification';
 
 export const SignIn = ({ navigation }: any) => {
   const dispatch = useDispatch<AppDispatch>();
@@ -67,7 +66,7 @@ export const SignIn = ({ navigation }: any) => {
       switch (res.payload.meta.errCode) {
         case 200:
           dispatch(setUserLogin(res?.payload?.data));
-          subscribeTopicFCM(phone);
+          // subscribeTopicFCM(phone);
           // if (res?.payload?.data?.typeDisbursement === 'NA') {
           //   subscribeTopicNotification(phone);
           //   save('enable_notifications', true);