@eohjsc/react-native-smart-city 0.6.2-rc9 → 0.7.0

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

@@ -12,28 +12,6 @@ import { mockSCStore } from '../../../context/mockStore';
 import MediaPlayerFull from '../../../commons/MediaPlayerDetail/MediaPlayerFull';
 import Timer from '../Timer';
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      goBack: jest.fn(),
-    }),
-    useRoute: jest.fn().mockReturnValue({
-      params: {
-        item: {
-          configuration: {
-            time_zone: 0,
-            playback: '',
-            name: 'name',
-            uri: '',
-          },
-        },
-        thumbnail: {},
-      },
-    }),
-  };
-});
-
 const wrapComponent = () => (
   <SCProvider initState={mockSCStore({})}>
     <PlayBackCamera />
@@ -43,6 +21,19 @@ const wrapComponent = () => (
 describe('Test PlayBackCamera', () => {
   let tree;
   jest.useFakeTimers();
+  global.mockedUseRoute.mockReturnValue({
+    params: {
+      item: {
+        configuration: {
+          time_zone: 0,
+          playback: '',
+          name: 'name',
+          uri: '',
+        },
+      },
+      thumbnail: {},
+    },
+  });
 
   it('Test render', async () => {
     await act(async () => {

package/src/screens/PlayBackCamera/index.js

@@ -84,9 +84,9 @@ const PlayBackCamera = () => {
   }, [selected, updateCameraPlayback]);
 
   const getHourWithTimeZone = useCallback(
-    (hour) => {
+    (_hour) => {
       const hourWithTimezone =
-        parseInt(hour, 10) + parseInt(time_zone || 0, 10);
+        parseInt(_hour, 10) + parseInt(time_zone || 0, 10);
       if (hourWithTimezone < 0 || hourWithTimezone > 9) {
         return hourWithTimezone;
       }

package/src/screens/ScanChipQR/components/QRScan/__test__/QRScan.test.js

@@ -6,20 +6,9 @@ import { SCProvider } from '../../../../../context';
 import { mockSCStore } from '../../../../../context/mockStore';
 import QRScan from '../index';
 
-const mockedPop = jest.fn();
 const mockedOnScan = jest.fn();
 const mockedSetLoading = jest.fn();
 
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      pop: mockedPop,
-    }),
-    useIsFocused: jest.fn(),
-  };
-});
-
 const wrapComponent = (data) => (
   <SCProvider initState={mockSCStore({})}>
     <QRScan {...data} />

package/src/screens/ScanChipQR/components/QRScan/index.js

@@ -7,7 +7,7 @@ import {
   Dimensions,
   TouchableOpacity,
 } from 'react-native';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import { RNCamera } from 'react-native-camera';
 import { getStatusBarHeight } from 'react-native-iphone-x-helper';
 import { useTranslations } from '../../../../hooks/Common/useTranslations';
@@ -36,7 +36,7 @@ const VerifyingQRCode = memo(() => {
     <View style={styles.maskOuter}>
       <TouchableOpacity style={[styles.viewVerifying, styles.buttonShadow]}>
         <Loading
-          icon={<IconOutline name={'sync'} color={Colors.Green6} size={16} />}
+          icon={<AntDesign name={'sync'} color={Colors.Green6} size={16} />}
         />
         <Text type={'Body'} style={styles.text}>
           {t('verify_qr_code')}
@@ -117,7 +117,7 @@ const QRScan = ({ isScanReady = true, onScan }) => {
               borderColor={Colors.Gray4}
               style={styles.buttonClose}
             >
-              <IconOutline name={'close'} size={24} co />
+              <AntDesign name={'close'} size={24} co />
             </CircleButton>
             {loading && <VerifyingQRCode />}
           </View>

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

@@ -15,22 +15,6 @@ import BottomButtonView from '../../../commons/BottomButtonView';
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockDispatch = jest.fn();
-const mockGoBack = jest.fn();
-const mockNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useRoute: jest.fn(),
-    useNavigation: () => ({
-      goBack: mockGoBack,
-      dispatch: mockDispatch,
-      navigate: mockNavigate,
-    }),
-  };
-});
-
 const wrapComponent = () => (
   <SCProvider initState={mockSCStore({})}>
     <SelectUnit />
@@ -40,10 +24,6 @@ const wrapComponent = () => (
 describe('Test Select unit screen', () => {
   let tree;
 
-  beforeEach(() => {
-    mockNavigate.mockClear();
-  });
-
   it('Test render', async () => {
     useRoute.mockReturnValue({
       params: {
@@ -71,14 +51,14 @@ describe('Test Select unit screen', () => {
       tree = await create(wrapComponent());
     });
     const instance = tree.root;
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
     const bottomButtonView = instance.findByType(BottomButtonView);
 
     expect(bottomButtonView.props.typeMain).toEqual('disabled');
-    expect(TouchableOpacities).toHaveLength(4);
+    expect(touchableOpacities).toHaveLength(4);
     await act(async () => {
-      await TouchableOpacities[1].props.onPress();
-      await TouchableOpacities[2].props.onPress(response.data[0]);
+      await touchableOpacities[1].props.onPress();
+      await touchableOpacities[2].props.onPress(response.data[0]);
     });
     expect(bottomButtonView.props.typeMain).toEqual('primary');
   });
@@ -100,11 +80,11 @@ describe('Test Select unit screen', () => {
     });
 
     const instance = tree.root;
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(TouchableOpacities).toHaveLength(3);
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
+    expect(touchableOpacities).toHaveLength(3);
     await act(async () => {
-      await TouchableOpacities[1].props.onPress();
-      await TouchableOpacities[2].props.onPress();
+      await touchableOpacities[1].props.onPress();
+      await touchableOpacities[2].props.onPress();
     });
   });
 
@@ -177,7 +157,7 @@ describe('Test Select unit screen', () => {
     await act(async () => {
       await iconClose[0].props.onPress();
     });
-    expect(mockNavigate).toBeCalledWith(Routes.ScriptDetail, {
+    expect(global.mockedNavigate).toBeCalledWith(Routes.ScriptDetail, {
       id: 1,
       havePermission: true,
       isMultiUnits: undefined,

package/src/screens/SelectUnit/index.js

@@ -1,6 +1,6 @@
 import React, { useMemo, useState, useCallback, useEffect } from 'react';
 import { View, TouchableOpacity, FlatList } from 'react-native';
-import { Icon } from '@ant-design/react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
 import { API, Colors } from '../../configs';
 import Text from '../../commons/Text';
@@ -132,7 +132,7 @@ const SelectUnit = () => {
         accessibilityLabel={AccessibilityLabel.ICON_CLOSE}
       >
         <View style={styles.buttonClose}>
-          <Icon name={'close'} size={24} color={Colors.Black} />
+          <AntDesign name={'close'} size={24} color={Colors.Black} />
         </View>
       </TouchableOpacity>
     ),

package/src/screens/SharedUnit/TabHeader.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { View, TouchableOpacity } from 'react-native';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import Text from '../../commons/Text';
@@ -54,7 +54,7 @@ const TabHeader = ({ current, getCurrentTab, showModal, textFilter }) => {
           <Text style={styles.sortBy}>
             {t('sort_by') + ': '} {textFilter}
           </Text>
-          <IconOutline name="arrow-down" size={10} onPress={() => {}} />
+          <AntDesign name="arrowdown" size={10} />
         </TouchableOpacity>
       </View>
     </View>

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

@@ -1,6 +1,6 @@
 import React, { memo, useMemo, useState } from 'react';
 import { View, Text, TouchableOpacity } from 'react-native';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import { Colors } from '../../../configs';
 import styles from './Styles/DeviceItemStyles';
 import { AccessibilityLabel } from '../../../configs/Constants';
@@ -71,11 +71,11 @@ const EndDevice = ({
             {name}
           </Text>
           {checked && (
-            <IconOutline name={'check'} color={Colors.Primary} size={20} />
+            <AntDesign name={'check'} color={Colors.Primary} size={20} />
           )}
 
           {dataConfig.length > 0 && (
-            <IconOutline
+            <AntDesign
               onPress={() => toggleExpandEndDevice()}
               name={isItemExpanded ? 'up' : 'down'}
               size={20}

package/src/screens/Sharing/SelectUser.js

@@ -21,10 +21,11 @@ import { axiosPost } from '../../utils/Apis/axios';
 import { AccessibilityLabel } from '../../configs/Constants';
 import Text from '../../commons/Text';
 import { ToastBottomHelper } from '../../utils/Utils';
+import Routes from '../../utils/Route';
 
 const SharingInviteMembers = ({ route }) => {
   const t = useTranslations();
-  const navigation = useNavigation();
+  const { goBack, navigate } = useNavigation();
   const { unit, permissions } = route?.params || {};
   const [errorText, setErrorText] = useState('');
   const [content, setContent] = useState('');
@@ -70,8 +71,8 @@ const SharingInviteMembers = ({ route }) => {
   }, [content, sharePermissions, t]);
 
   const onPressNext = useCallback(() => {
-    navigation.dangerouslyGetParent().goBack();
-  }, [navigation]);
+    navigate(Routes.UnitDetail, { unitId: unit.id });
+  }, [navigate, unit?.id]);
 
   return (
     <View style={styles.wrapContainer}>
@@ -150,7 +151,7 @@ const SharingInviteMembers = ({ route }) => {
       <ViewButtonBottom
         disableKeyBoardAnimated={true}
         leftTitle={t('back')}
-        onLeftClick={() => navigation.goBack()}
+        onLeftClick={goBack}
         rightTitle={t('done')}
         rightDisabled={false}
         onRightClick={onPressNext}

package/src/screens/Sharing/UnitMemberList.js

@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
+import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import { useNavigation, useIsFocused } from '@react-navigation/native';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -81,11 +82,11 @@ const UnitMemberList = ({ route }) => {
       onPress={onPressRightHeader}
       style={styles.rightHeader}
     >
-      <IconOutline
-        name={isOwner ? 'plus' : 'more'}
-        size={30}
-        color={Colors.Black}
-      />
+      {isOwner ? (
+        <AntDesign name={'plus'} size={27} color={Colors.Black} />
+      ) : (
+        <MaterialIcons name={'more-vert'} size={27} color={Colors.Black} />
+      )}
     </TouchableOpacity>
   );
 

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

@@ -15,6 +15,7 @@ import ItemChangeRole from '../Components/ItemChangeRole';
 import ModalPopupCT from '../../../commons/ModalPopupCT';
 import Routes from '../../../utils/Route';
 import { useNavigation } from '@react-navigation/native';
+import RowGuestInfo from '../../GuestInfo/components/RowGuestInfo';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -164,7 +165,11 @@ describe('Test InfoMemberUnit', () => {
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    jest.runAllTimers();
+
+    await act(async () => {
+      jest.runAllTimers();
+    });
+
     expect(alertAction.props.visible).toEqual(false);
     expect(modalPopupCT.props.isVisible).toEqual(true);
 
@@ -175,7 +180,7 @@ describe('Test InfoMemberUnit', () => {
       await viewButtonBottom[1].props.onRightClick();
     });
     expect(modalPopupCT.props.isVisible).toEqual(false);
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.EnterPassword, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.EnterPassword, {
       dataParams: {
         unit_id: 1,
         member: {
@@ -200,11 +205,11 @@ describe('Test InfoMemberUnit', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const rows = instance.findAllByType(TouchableOpacity);
+    const rows = instance.findAllByType(RowGuestInfo);
 
     await act(async () => {
       await rows[rows.length - 1].props.onPress();
     });
-    expect(mockedNavigate).toBeCalled();
+    expect(global.mockedNavigate).toHaveBeenCalledTimes(1);
   });
 });

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

@@ -14,17 +14,6 @@ import Routes from '../../../utils/Route';
 
 const mock = new MockAdapter(api.axiosInstance);
 jest.spyOn(Alert, 'alert').mockImplementation(() => {});
-const mockNavigate = jest.fn();
-const mockGoBack = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockNavigate,
-      goBack: mockGoBack,
-    }),
-  };
-});
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -69,8 +58,6 @@ describe('Test SelectShareDevice', () => {
   afterEach(() => {
     Alert.alert.mockReset();
     mock.resetHistory();
-    mockNavigate.mockClear();
-    mockGoBack.mockClear();
   });
 
   const clickCheckBoxAllDevice = async (instance, statusCheckbox) => {
@@ -157,7 +144,7 @@ describe('Test SelectShareDevice', () => {
     await act(async () => {
       ViewButtonBottomElement[0].props.onRightClick();
     });
-    expect(mockNavigate).toBeCalledWith(Routes.SharingInviteMembers, {
+    expect(global.mockedNavigate).toBeCalledWith(Routes.SharingInviteMembers, {
       unit: { id: 1, name: 'unit 1' },
       permissions: {
         read_permissions: [
@@ -195,7 +182,7 @@ describe('Test SelectShareDevice', () => {
     await act(async () => {
       ViewButtonBottomElement[0].props.onLeftClick();
     });
-    expect(mockGoBack).toBeCalled();
+    expect(global.mockedGoBack).toBeCalled();
   });
 
   it('user not choose device click button next', async () => {

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

@@ -22,26 +22,6 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockedNavigate = jest.fn();
-const mockedGoBack = jest.fn();
-const mockedDangerouslyGetState = jest.fn();
-const mockedDangerouslyGetParentGoBack = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-      dangerouslyGetParent: () => ({
-        dangerouslyGetState: mockedDangerouslyGetState,
-        goBack: mockedDangerouslyGetParentGoBack,
-      }),
-    }),
-    useIsFocused: jest.fn(),
-  };
-});
-
 describe('test SharingInviteMembers container', () => {
   let tree;
   let route;
@@ -100,7 +80,7 @@ describe('test SharingInviteMembers container', () => {
     await act(async () => {
       viewButtonBottom.props.onLeftClick();
     });
-    expect(mockedGoBack).toHaveBeenCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 
   it('viewButtonBottom onRightClick', async () => {
@@ -112,7 +92,7 @@ describe('test SharingInviteMembers container', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(mockedDangerouslyGetParentGoBack).toHaveBeenCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
   });
 
   it('_TextInput onChange phone, invalidate and not call api sharedPermission', async () => {

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

@@ -70,7 +70,7 @@ describe('test MemberList', () => {
     await act(async () => {
       await memberListButtons[1].props.onPress();
     });
-    expect(mockedNavigate).toBeCalledWith(Routes.AddMemberStack, {
+    expect(global.mockedNavigate).toBeCalledWith(Routes.AddMemberStack, {
       screen: Routes.SelectShareDevice,
       params: { unit: { id: 1 } },
     });
@@ -99,7 +99,7 @@ describe('test MemberList', () => {
     await act(async () => {
       await memberListButtons[1].props.onPress();
     });
-    expect(mockedNavigate).not.toBeCalled();
+    expect(global.mockedNavigate).not.toBeCalled();
     expect(spyToastError).toBeCalledWith(
       getTranslate('en', 'reach_max_members_per_unit', { length: 0 }),
       '',

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

@@ -13,17 +13,6 @@ import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 
 const mock = new MockAdapter(api.axiosInstance);
 jest.spyOn(Alert, 'alert').mockImplementation(() => {});
-const mockNavigate = jest.fn();
-const mockGoBack = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockNavigate,
-      goBack: mockGoBack,
-    }),
-  };
-});
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -74,8 +63,6 @@ describe('Test UpdateShareDevice', () => {
   afterEach(() => {
     Alert.alert.mockReset();
     mock.resetHistory();
-    mockNavigate.mockClear();
-    mockGoBack.mockClear();
   });
 
   const clickCheckBoxAllDevice = async (instance, statusCheckbox) => {
@@ -164,7 +151,7 @@ describe('Test UpdateShareDevice', () => {
     await act(async () => {
       ViewButtonBottomElement[0].props.onRightClick();
     });
-    expect(mockGoBack).toBeCalled();
+    expect(global.mockedGoBack).toBeCalled();
     expect(mock.history.post[0].data).toEqual(
       JSON.stringify({
         phone: '0901234567',
@@ -198,7 +185,7 @@ describe('Test UpdateShareDevice', () => {
     await act(async () => {
       ViewButtonBottomElement[0].props.onRightClick();
     });
-    expect(mockGoBack).toBeCalled();
+    expect(global.mockedGoBack).toBeCalled();
     expect(mock.history.post[0].data).toEqual(
       JSON.stringify({
         phone: '',
@@ -230,7 +217,7 @@ describe('Test UpdateShareDevice', () => {
     await act(async () => {
       ViewButtonBottomElement[0].props.onRightClick();
     });
-    expect(mockGoBack).not.toBeCalled();
+    expect(global.mockedGoBack).not.toBeCalled();
     expect(mock.history.post[0].data).toEqual(
       JSON.stringify({
         phone: '',
@@ -287,7 +274,7 @@ describe('Test UpdateShareDevice', () => {
     await act(async () => {
       ViewButtonBottomElement[0].props.onLeftClick();
     });
-    expect(mockGoBack).toBeCalled();
+    expect(global.mockedGoBack).toBeCalled();
   });
 
   it('user not choose device click button next', async () => {

package/src/screens/Sharing/hooks/__test__/index.test.js

@@ -18,19 +18,8 @@ const mockUseContext = jest.fn().mockImplementation(() => ({
   stateData: mockSCStore({}),
   setAction: mockedSetAction,
 }));
-const mockNavigate = jest.fn();
-const mockGoBack = jest.fn();
 
 React.useContext = mockUseContext;
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      goBack: mockGoBack,
-      navigate: mockNavigate,
-    }),
-  };
-});
 
 describe('Test useDataMember', () => {
   it('render useDataMember', async () => {
@@ -44,7 +33,7 @@ describe('Test useDataMember', () => {
     await act(async () => {
       result.current.leaveUnit(1);
     });
-    expect(mockNavigate).toBeCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toBeCalledWith(Routes.Dashboard);
   });
 
   it('render useDataMember loadMembers', async () => {
@@ -75,6 +64,6 @@ describe('Test useDataMember', () => {
     await act(async () => {
       result.current.removeMember(1, 'json');
     });
-    expect(mockGoBack).toBeCalled();
+    expect(global.mockedGoBack).toBeCalled();
   });
 });

package/src/screens/SmartAccount/Connecting/index.js

@@ -10,7 +10,6 @@ import { SCContext, useSCContextSelector } from '../../../context';
 import { axiosPost } from '../../../utils/Apis/axios';
 import { API, Colors, Constants } from '../../../configs';
 import Routes from '../../../utils/Route';
-import { ToastBottomHelper } from '../../../utils/Utils';
 import styles from './style';
 
 const SmartAccountConnecting = ({ route }) => {
@@ -69,7 +68,6 @@ const SmartAccountConnecting = ({ route }) => {
       navigate(Routes.SmartAccount, {
         params: {},
       });
-      ToastBottomHelper.error(data[Object.keys(data)[0]][0]);
     }
     handleRefreshPercent();
     // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -11,25 +11,10 @@ import { API } from '../../../../configs';
 import Routes from '../../../../utils/Route';
 import MockAdapter from 'axios-mock-adapter';
 import AccessibilityLabel from '../../../../configs/AccessibilityLabel';
+import { useNavigation } from '@react-navigation/native';
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockedNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-    }),
-    useIsFocused: () => true,
-  };
-});
-
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  memo: (x) => x,
-}));
-
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <ListDevice route={route} />
@@ -38,8 +23,8 @@ const wrapComponent = (route) => (
 
 describe('Test ListDeviceSmartAccount', () => {
   let tree;
+  const { navigate } = useNavigation();
   beforeEach(() => {
-    mockedNavigate.mockClear();
     mock.reset();
   });
   it('render ListDeviceSmartAccount', async () => {
@@ -93,7 +78,7 @@ describe('Test ListDeviceSmartAccount', () => {
       await touchs[touchs.length - 1].props.onPress();
     });
 
-    expect(mockedNavigate).toBeCalledWith(Routes.AddDeviceStack, {
+    expect(navigate).toBeCalledWith(Routes.AddDeviceStack, {
       screen: Routes.AddCommonSelectSubUnit,
       params: {
         addType: 'AddHassiDevice',