@eohjsc/react-native-smart-city 0.3.90 → 0.3.92

package/src/screens/Notification/__test__/Notification.test.js

@@ -10,6 +10,7 @@ import Notification from '../index';
 import NotificationItem from '../components/NotificationItem';
 import { API } from '../../../configs';
 import api from '../../../utils/Apis/axios';
+import { WrapHeaderScrollable } from '../../../commons';
 
 const wrapComponent = () => (
   <SCProvider initState={mockSCStore({})}>
@@ -48,33 +49,30 @@ describe('test Notification', () => {
 
   it('test render', async () => {
     const response = {
-      status: 200,
-      data: {
-        results: [
-          {
-            content_code: 'NOTIFY_INVITE_MEMBER',
-            created_at: '2021-10-07T08:57:09.370286Z',
-            icon: 'https://eoh-gateway-backend.eoh.io/Rectangle_65.png',
-            id: 12905,
-            is_read: true,
-            params: "{'unit_owner_name': 'Canh', 'unit_name': 'EoH Office'}",
-            type: 'NEWS',
-          },
-          {
-            content_code: 'PARKING_COMPLETED',
-            created_at: '2021-07-26T07:30:00.558123Z',
-            icon: 'https://eoh-gateway-backend.eoh.io/2021-07-01_00-21_1.png',
-            id: 11621,
-            is_read: true,
-            params: "{'booking_id': 4736}",
-            type: 'NEWS',
-          },
-        ],
-      },
+      results: [
+        {
+          content_code: 'NOTIFY_INVITE_MEMBER',
+          created_at: '2021-10-07T08:57:09.370286Z',
+          icon: 'https://eoh-gateway-backend.eoh.io/Rectangle_65.png',
+          id: 12905,
+          is_read: true,
+          params: "{'unit_owner_name': 'Canh', 'unit_name': 'EoH Office'}",
+          type: 'NEWS',
+        },
+        {
+          content_code: 'PARKING_COMPLETED',
+          created_at: '2021-07-26T07:30:00.558123Z',
+          icon: 'https://eoh-gateway-backend.eoh.io/2021-07-01_00-21_1.png',
+          id: 11621,
+          is_read: true,
+          params: "{'booking_id': 4736}",
+          type: 'NEWS',
+        },
+      ],
     };
     mock
       .onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1, ''))
-      .reply(200, response.data);
+      .reply(200, response);
     await act(async () => {
       tree = await create(wrapComponent());
     });
@@ -86,73 +84,66 @@ describe('test Notification', () => {
 
   it('test handleOnLoadMore', async () => {
     const response = {
-      status: 200,
-      data: {
-        results: [
-          {
-            content_code: 'NOTIFY_INVITE_MEMBER',
-            created_at: '2021-10-07T08:57:09.370286Z',
-            icon: 'https://eoh-gateway-backend.eoh.io/Rectangle_65.png',
-            id: 12905,
-            is_read: true,
-            params: "{'unit_owner_name': 'Canh', 'unit_name': 'EoH Office'}",
-            type: 'NEWS',
-          },
-          {
-            content_code: 'PARKING_COMPLETED',
-            created_at: '2021-07-26T07:30:00.558123Z',
-            icon: 'https://eoh-gateway-backend.eoh.io/2021-07-01_00-21_1.png',
-            id: 11621,
-            is_read: true,
-            params: "{'booking_id': 4736}",
-            type: 'NEWS',
-          },
-        ],
-      },
+      count: 13,
+      results: [],
     };
+    for (let index = 0; index < 10; index++) {
+      response.results.push({
+        content_code: 'NOTIFY_INVITE_MEMBER',
+        created_at: '2021-10-07T08:57:09.370286Z',
+        icon: 'https://eoh-gateway-backend.eoh.io/Rectangle_65.png',
+        id: 12905,
+        is_read: true,
+        params: "{'unit_owner_name': 'Canh', 'unit_name': 'EoH Office'}",
+        type: 'NEWS',
+      });
+    }
     mock
       .onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1, ''))
-      .reply(200, response.data);
+      .reply(200, response);
     await act(async () => {
       tree = await create(wrapComponent());
     });
     const instance = tree.root;
+    const wrapHeaderScrollable = instance.findByType(WrapHeaderScrollable);
+    expect(wrapHeaderScrollable.props.disableLoadMore).toEqual(false);
+
     const scrollView = instance.findByType(Animated.ScrollView);
+    mock
+      .onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(2, ''))
+      .reply(200, response);
     await act(async () => {
       scrollView.props.onMomentumScrollEnd();
     });
-    expect(scrollView).toBeDefined();
+    expect(wrapHeaderScrollable.props.disableLoadMore).toEqual(true);
   });
 
   it('test onRefresh', async () => {
     const response = {
-      status: 200,
-      data: {
-        results: [
-          {
-            content_code: 'NOTIFY_INVITE_MEMBER',
-            created_at: '2021-10-07T08:57:09.370286Z',
-            icon: 'https://eoh-gateway-backend.eoh.io/Rectangle_65.png',
-            id: 12905,
-            is_read: true,
-            params: "{'unit_owner_name': 'Canh', 'unit_name': 'EoH Office'}",
-            type: 'NEWS',
-          },
-          {
-            content_code: 'PARKING_COMPLETED',
-            created_at: '2021-07-26T07:30:00.558123Z',
-            icon: 'https://eoh-gateway-backend.eoh.io/2021-07-01_00-21_1.png',
-            id: 11621,
-            is_read: true,
-            params: "{'booking_id': 4736}",
-            type: 'NEWS',
-          },
-        ],
-      },
+      results: [
+        {
+          content_code: 'NOTIFY_INVITE_MEMBER',
+          created_at: '2021-10-07T08:57:09.370286Z',
+          icon: 'https://eoh-gateway-backend.eoh.io/Rectangle_65.png',
+          id: 12905,
+          is_read: true,
+          params: "{'unit_owner_name': 'Canh', 'unit_name': 'EoH Office'}",
+          type: 'NEWS',
+        },
+        {
+          content_code: 'PARKING_COMPLETED',
+          created_at: '2021-07-26T07:30:00.558123Z',
+          icon: 'https://eoh-gateway-backend.eoh.io/2021-07-01_00-21_1.png',
+          id: 11621,
+          is_read: true,
+          params: "{'booking_id': 4736}",
+          type: 'NEWS',
+        },
+      ],
     };
     mock
       .onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1, ''))
-      .reply(200, response.data);
+      .reply(200, response);
     await act(async () => {
       tree = await create(wrapComponent());
     });

package/src/screens/Notification/index.js

@@ -17,10 +17,9 @@ import { useSCContextSelector } from '../../context';
 import { notImplemented } from '../../utils/Utils';
 import { useReceiveNotifications } from '../../hooks';
 
-let page = 1;
-
 const Notification = memo(() => {
   const t = useTranslations();
+  const [page, setPage] = useState(1);
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const [notifications, setNotifications] = useState([]);
   const [maxPageNotification, setMaxPageNotification] = useState(1);
@@ -60,27 +59,21 @@ const Notification = memo(() => {
     }
   }, []);
 
-  useFocusEffect(
-    useCallback(() => {
-      fetchNotifications(1);
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [])
-  );
-
   const handleOnLoadMore = useCallback(() => {
-    page += 1;
-    if (page <= maxPageNotification) {
-      fetchNotifications(page);
+    setPage((preState) => preState + 1);
+    if (page < maxPageNotification) {
+      fetchNotifications(page + 1);
     }
-  }, [maxPageNotification, fetchNotifications]);
+  }, [page, maxPageNotification, fetchNotifications]);
 
   const onRefresh = useCallback(async () => {
-    page = 1;
+    setPage(1);
     const { success, data } = await axiosGet(
       API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1, '')
     );
     if (success) {
       setNotifications(data.results);
+      setMaxPageNotification(Math.ceil(data.count / 10));
     }
   }, []);
 
@@ -91,6 +84,13 @@ const Notification = memo(() => {
     return () => unwatchNotificationData(user);
   }, [user, onRefresh]);
 
+  useFocusEffect(
+    useCallback(() => {
+      onRefresh();
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [])
+  );
+
   return (
     <View style={styles.wrap}>
       <WrapHeaderScrollable

package/src/screens/PlayBackCamera/index.js

@@ -11,7 +11,7 @@ import { Colors, Images } from '../../configs';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import Text from '../../commons/Text';
 import Timer from './Timer';
-import { useStatusBarPreview } from '../../hooks/Common/useStatusBar';
+import { setStatusBarPreview } from '../../hooks/Common/useStatusBar';
 import MediaPlayerFull from '../../commons/MediaPlayerDetail/MediaPlayerFull';
 import { DATE_TIME_FORMAT, AccessibilityLabel } from '../../configs/Constants';
 
@@ -173,8 +173,7 @@ const PlayBackCamera = () => {
   }, [selected, getHourWithTimeZone]);
 
   useEffect(() => {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useStatusBarPreview(
+    setStatusBarPreview(
       isShowDate ? Colors.BlackTransparent4 : Colors.TextTransparent
     );
   }, [isShowDate]);

package/src/screens/SelectUnit/__test__/index.test.js

@@ -59,7 +59,6 @@ describe('Test Select unit screen', () => {
         isAutomateTab: true,
         isMultiUnits: true,
         routeName: 'test',
-        isCreateNewAction: false,
       },
     });
     const response = {
@@ -96,7 +95,6 @@ describe('Test Select unit screen', () => {
         isAutomateTab: true,
         isMultiUnits: true,
         routeName: 'test',
-        isCreateNewAction: false,
       },
     });
 
@@ -119,7 +117,6 @@ describe('Test Select unit screen', () => {
     useRoute.mockReturnValue({
       params: {
         automateId: 1,
-        isCreateNewAction: true,
         scriptName: '1',
         title: 'select_device',
         type: 'value_change',
@@ -162,7 +159,6 @@ describe('Test Select unit screen', () => {
     useRoute.mockReturnValue({
       params: {
         automateId: 1,
-        isCreateNewAction: true,
         scriptName: '1',
         title: 'select_device',
         type: 'value_change',
@@ -189,7 +185,6 @@ describe('Test Select unit screen', () => {
     expect(mockNavigate).toBeCalledWith(Routes.ScriptDetail, {
       id: 1,
       havePermission: true,
-      isCreateNewAction: true,
       isMultiUnits: undefined,
       name: '1',
       type: undefined,

package/src/screens/SelectUnit/index.js

@@ -67,11 +67,10 @@ const SelectUnit = () => {
 
   const onContinue = useCallback(() => {
     navigate(
-      isCreateNewAction || !routeName ? Routes.SelectSensorDevices : routeName,
+      isCreateNewAction || !routeName ? Routes.SelectMonitorDevices : routeName,
       {
         ...params,
         automate,
-        title,
         selectedItem,
         type,
         isAutomateTab,

package/src/screens/SharedUnit/index.js

@@ -1,19 +1,20 @@
-import React, { useEffect, useCallback, useState, useMemo } from 'react';
-import { View, TouchableOpacity, FlatList, RefreshControl } from 'react-native';
-import { useNavigation, useIsFocused } from '@react-navigation/native';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { FlatList, RefreshControl, TouchableOpacity, View } from 'react-native';
+import { useIsFocused, useNavigation } from '@react-navigation/native';
 
 import { axiosGet } from '../../utils/Apis/axios';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { API } from '../../configs';
 import Text from '../../commons/Text';
 import SharedUnit from '../../commons/Unit/SharedUnit';
-import { useTitleHeader, useBlockBackAndroid } from '../../hooks/Common';
+import { useBlockBackAndroid } from '../../hooks/Common';
 import { AccessibilityLabel } from '../../configs/Constants';
 
 import styles from './styles';
 import TabHeader from './TabHeader';
 import { useSCContextSelector } from '../../context';
 import { ModalCustom } from '../../commons/Modal';
+import useTitleHeader from '../../hooks/Common/useTitleHeader';
 
 const Shared = () => {
   useBlockBackAndroid();

package/src/screens/Sharing/Components/TitleCheckBox.js

@@ -1,4 +1,4 @@
-import React, { memo, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { View, Text } from 'react-native';
 import { CheckBoxCustom } from '.';
 import t from '../../../hooks/Common/useTranslations';
@@ -48,4 +48,4 @@ const TitleCheckBox = ({
   );
 };
 
-export default memo(TitleCheckBox);
+export default TitleCheckBox;

package/src/screens/Sharing/SelectUser.js

@@ -125,7 +125,7 @@ const SelectUser = ({ route }) => {
             </View>
 
             {users.length > 0 && (
-              <View style={styles.constainerUsers}>
+              <View style={styles.containerUsers}>
                 <View style={styles.padding}>
                   <Text
                     accessibilityLabel={
@@ -201,7 +201,7 @@ const styles = StyleSheet.create({
     ...Theme.whiteBoxRadius,
     marginTop: 8,
   },
-  constainerUsers: {
+  containerUsers: {
     marginTop: 24,
     flex: 1,
   },

package/src/screens/Sharing/__test__/MemberList.test.js

@@ -7,6 +7,11 @@ import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import { TouchableOpacity } from 'react-native';
 import Routes from '../../../utils/Route';
+import MockAdapter from 'axios-mock-adapter';
+import api from '../../../utils/Apis/axios';
+import { useNavigation } from '@react-navigation/native';
+
+new MockAdapter(api.axiosInstance);
 
 jest.mock('../../../hooks/Common', () => {
   return {
@@ -14,21 +19,6 @@ jest.mock('../../../hooks/Common', () => {
   };
 });
 
-const mockedNavigate = jest.fn();
-const mockUseIsFocused = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-    }),
-    useIsFocused: () => ({
-      isFocused: mockUseIsFocused,
-    }),
-  };
-});
-
 const wrapComponent = (route, state) => (
   <SCProvider initState={mockSCStore({})}>
     <MemberList route={route} />
@@ -47,7 +37,11 @@ describe('test MemberList', () => {
     },
   };
 
+  const mockedNavigate = useNavigation().navigate;
+
   beforeEach(() => {
+    mockedNavigate.mockClear();
+
     route = {
       params: {
         unitId: 1,

package/src/screens/Sharing/__test__/MemberList2.test.js

@@ -7,6 +7,9 @@ import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import { TouchableOpacity } from 'react-native';
 import Routes from '../../../utils/Route';
+import { useNavigation } from '@react-navigation/native';
+import MockAdapter from 'axios-mock-adapter';
+import api from '../../../utils/Apis/axios';
 
 jest.mock('../../../hooks/Common', () => {
   return {
@@ -14,27 +17,14 @@ jest.mock('../../../hooks/Common', () => {
   };
 });
 
-const mockedNavigate = jest.fn();
-const mockUseIsFocused = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-    }),
-    useIsFocused: () => ({
-      isFocused: mockUseIsFocused,
-    }),
-  };
-});
-
 const wrapComponent = (route, state) => (
   <SCProvider initState={mockSCStore({})}>
     <MemberList route={route} />
   </SCProvider>
 );
 
+new MockAdapter(api.axiosInstance);
+
 describe('test MemberList', () => {
   let route;
   let localState = {
@@ -46,6 +36,7 @@ describe('test MemberList', () => {
       },
     },
   };
+  const mockedNavigate = useNavigation().navigate;
 
   beforeEach(() => {
     route = {
@@ -58,6 +49,7 @@ describe('test MemberList', () => {
         },
       },
     };
+    mockedNavigate.mockReset();
   });
 
   it('AlertAction rightButtonClick', async () => {
@@ -71,7 +63,9 @@ describe('test MemberList', () => {
       alertAction.props.rightButtonClick();
     });
     const MemberListButtons = instance.findAllByType(TouchableOpacity);
-    await MemberListButtons[1].props.onPress();
+    await act(async () => {
+      await MemberListButtons[1].props.onPress();
+    });
     expect(mockedNavigate).not.toBeCalledWith(Routes.AddMemberStack, {
       screen: Routes.SharingSelectPermission,
       params: { unit: { id: 1 } },

package/src/screens/Sharing/__test__/SelectUser.test.js

@@ -160,7 +160,7 @@ describe('test SelectUser container', () => {
     });
     mock.onPost(API.SHARE.SHARE()).reply(200, {
       user: {
-        id: 2,
+        id: 3,
         name: 'user add',
         phone_number: '0909123456',
       },
@@ -168,14 +168,18 @@ describe('test SelectUser container', () => {
     await act(async () => {
       await button.props.onPress();
     });
+    expect(textInput.props.errorText).toEqual('');
+    accountList = instance.findAllByType(AccountList);
+    expect(accountList).toHaveLength(1);
+    expect(accountList[0].props.accounts).toHaveLength(1);
+
     await act(async () => {
       await textInput.props.onChange('test123@gmail.com');
     });
-    expect(textInput.props.errorText).toEqual('');
+    mock.onPost(API.SHARE.SHARE()).reply(400);
     await act(async () => {
       await button.props.onPress();
     });
-    accountList = instance.findAllByType(AccountList);
-    expect(accountList).toHaveLength(1);
+    expect(accountList[0].props.accounts).toHaveLength(1);
   });
 });

package/src/screens/SideMenuDetail/SideMenuDetailStyles.js

@@ -19,7 +19,7 @@ export default StyleSheet.create({
     bottom: 0,
     left: 0,
     right: 0,
-    paddingBottom: getBottomSpace() > 0 ? getBottomSpace() : 32,
+    paddingBottom: getBottomSpace() || 32,
     paddingTop: 24,
     backgroundColor: Colors.White,
     borderColor: Colors.ShadownTransparent,

package/src/screens/SmartAccount/SuccessfullyConnected/__test__/SuccessfullyConnected.test.js

@@ -86,7 +86,7 @@ describe('Test SuccessfullyConnected', () => {
       ],
     });
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     await flushPromises();
     const instance = tree.root;
@@ -101,7 +101,7 @@ describe('Test SuccessfullyConnected', () => {
 
   it('render function handleContinue ', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const handleContinue = instance.find(
@@ -123,7 +123,7 @@ describe('Test SuccessfullyConnected', () => {
   });
   it('render function handleFinish ', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
 

package/src/screens/SmartAccount/__test__/Connecting.test.js

@@ -44,7 +44,7 @@ describe('Test Connecting', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);

package/src/screens/SmartAccount/__test__/SmartAccount.test.js

@@ -38,7 +38,7 @@ describe('Test SmartAccount', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const scrollView = instance.findAllByType(ScrollView);
@@ -58,7 +58,7 @@ describe('Test SmartAccount', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const touchableOpacity = instance.find(
@@ -229,7 +229,7 @@ describe('Test SmartAccount', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const touchSupplierItem = instance.findAll(

package/src/screens/SmartAccount/index.js

@@ -118,6 +118,7 @@ const SmartAccount = ({ route }) => {
         <View style={styles.logocontainer}>
           {supplierItems.map((item, index) => (
             <TouchableOpacity
+              key={index}
               style={[styles.logo]}
               onPress={() => handleSelectSupplier(index)}
               accessibilityLabel={AccessibilityLabel.TOUCH_SUPPLIER_ITEM}

package/src/screens/SmartIr/__test__/ButtonsBottom.test.js

@@ -16,7 +16,7 @@ describe('Test ButtonsBottom', () => {
 
   it('render ButtonsBottom', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const touchableOpacity = instance.findAllByType(TouchableOpacity);

package/src/screens/SmartIr/__test__/GroupButtonByType.test.js

@@ -37,7 +37,7 @@ describe('Test GroupButtonByType', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const bottomButton = instance.findAllByType(ButtonsBottom)[0];
@@ -70,7 +70,7 @@ describe('Test GroupButtonByType', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const bottomButton = instance.findAllByType(ButtonsBottom)[0];
@@ -88,7 +88,7 @@ describe('Test GroupButtonByType', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const bottomButton = instance.findAllByType(ButtonsBottom)[0];
@@ -106,7 +106,7 @@ describe('Test GroupButtonByType', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
 
     const instance = tree.root;
@@ -129,7 +129,7 @@ describe('Test GroupButtonByType', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
 
     const instance = tree.root;

package/src/screens/SmartIr/__test__/SelectBrand.test.js

@@ -31,7 +31,7 @@ describe('Test SelectBrand', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const scrollView = instance.findAllByType(ScrollView);
@@ -45,7 +45,7 @@ describe('Test SelectBrand', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const scrollView = instance.findAllByType(ScrollView);