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

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

@@ -13,18 +13,6 @@ import _TextInput from '../../../../commons/Form/TextInput';
 import { flushPromises } from '../../../AllGateway/test-utils';
 
 const mock = new MockAdapter(api.axiosInstance);
-const mockedNavigate = jest.fn();
-const mockedDispatch = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      dispatch: mockedDispatch,
-    }),
-    useIsFocused: () => true,
-  };
-});
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -57,7 +45,6 @@ describe('Test SuccessfullyConnected', () => {
   };
   beforeEach(() => {
     mock.reset();
-    mockedNavigate.mockClear();
   });
   it('render SuccessfullyConnected', async () => {
     mock.onGet(API.CHIP.RENAME_DEVICES(1)).reply(200, {
@@ -113,13 +100,16 @@ describe('Test SuccessfullyConnected', () => {
     await act(async () => {
       handleContinue.props.onPress();
     });
-    expect(mockedNavigate).toBeCalledWith(Routes.ListDeviceSmartAccount, {
-      smart_account_id: 1,
-      username: 'textEoh@gmail.com',
-      brand: 'test brand',
-      unit_id: 1,
-      chipId: 1,
-    });
+    expect(global.mockedNavigate).toBeCalledWith(
+      Routes.ListDeviceSmartAccount,
+      {
+        smart_account_id: 1,
+        username: 'textEoh@gmail.com',
+        brand: 'test brand',
+        unit_id: 1,
+        chipId: 1,
+      }
+    );
   });
   it('render function handleFinish ', async () => {
     await act(async () => {
@@ -135,7 +125,7 @@ describe('Test SuccessfullyConnected', () => {
     await act(async () => {
       handleFinish.props.onPress();
     });
-    expect(mockedDispatch).toBeCalledWith({
+    expect(global.mockedDispatch).toBeCalledWith({
       payload: {
         index: 0,
         routes: [

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

@@ -1,8 +1,7 @@
 import React, { memo, useCallback, useEffect, useState } from 'react';
-import { View, ScrollView } from 'react-native';
+import { View, ScrollView, ActivityIndicator } from 'react-native';
 import { useNavigation, CommonActions } from '@react-navigation/native';
-import { IconOutline } from '@ant-design/icons-react-native';
-import { ActivityIndicator } from '@ant-design/react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 
 import _TextInput from '../../../commons/Form/TextInput';
 import Text from '../../../commons/Text';
@@ -135,7 +134,7 @@ const SuccessfullyConnected = memo(({ route }) => {
       <View style={styles.wrap}>
         <ScrollView>
           <View style={styles.body}>
-            <IconOutline name="check-circle" size={28} color={Colors.Green6} />
+            <AntDesign name="check-circle" size={28} color={Colors.Green6} />
             <Text bold style={styles.connectingText}>
               {t('successfully_connected')}
             </Text>

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

@@ -17,22 +17,10 @@ const wrapComponent = (route) => (
     <SmartAccountConnecting route={route} />
   </SCProvider>
 );
-const mockedNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-    }),
-  };
-});
 
 describe('Test Connecting', () => {
   let tree;
-  afterEach(() => {
-    mockedNavigate.mockClear();
-  });
+
   it('render Connecting', async () => {
     const route = {
       params: {
@@ -65,7 +53,7 @@ describe('Test Connecting', () => {
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
-    expect(mockedNavigate).toBeCalledWith(Routes.SmartAccount, {
+    expect(global.mockedNavigate).toBeCalledWith(Routes.SmartAccount, {
       params: {},
     });
   });
@@ -85,7 +73,7 @@ describe('Test Connecting', () => {
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
-    expect(mockedNavigate).not.toHaveBeenCalled();
+    expect(global.mockedNavigate).not.toHaveBeenCalled();
   });
 
   it('render connecting sync smartAccount success', async () => {
@@ -120,14 +108,17 @@ describe('Test Connecting', () => {
       await jest.advanceTimersByTime(1000);
     });
 
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.ListDeviceSmartAccount, {
-      username: 'abc',
-      brand: '',
-      device_data: undefined,
-      unit_id: 1,
-      smart_account_id_from_backend: undefined,
-      chipId: undefined,
-    });
+    expect(global.mockedNavigate).toHaveBeenCalledWith(
+      Routes.ListDeviceSmartAccount,
+      {
+        username: 'abc',
+        brand: '',
+        device_data: undefined,
+        unit_id: 1,
+        smart_account_id_from_backend: undefined,
+        chipId: undefined,
+      }
+    );
 
     // Clear the timers
     jest.useRealTimers();
@@ -162,19 +153,22 @@ describe('Test Connecting', () => {
       await jest.advanceTimersByTime(1000);
     });
 
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.SuccessfullyConnected, {
-      nameSubUnit: undefined,
-      listDeviceIds: true,
-      listSelectDevice: undefined,
-      smart_account_id: undefined,
-      smart_account_id_from_backend: undefined,
-      unit_id: 1,
-      unitName: undefined,
-      stationId: undefined,
-      username: 'abc',
-      brand: '',
-      chipId: 1,
-    });
+    expect(global.mockedNavigate).toHaveBeenCalledWith(
+      Routes.SuccessfullyConnected,
+      {
+        nameSubUnit: undefined,
+        listDeviceIds: true,
+        listSelectDevice: undefined,
+        smart_account_id: undefined,
+        smart_account_id_from_backend: undefined,
+        unit_id: 1,
+        unitName: undefined,
+        stationId: undefined,
+        username: 'abc',
+        brand: '',
+        chipId: 1,
+      }
+    );
 
     // Clear the timers
     jest.useRealTimers();

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

@@ -15,22 +15,10 @@ const wrapComponent = (route) => (
     <SmartAccount route={route} />
   </SCProvider>
 );
-const mockedNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-    }),
-  };
-});
 
 describe('Test SmartAccount', () => {
   let tree;
-  afterEach(() => {
-    mockedNavigate.mockClear();
-  });
+
   it('render SmartAccount', async () => {
     const route = {
       params: {
@@ -164,12 +152,15 @@ describe('Test SmartAccount', () => {
     await act(async () => {
       await touchableOpacity.props.onPress();
     });
-    expect(mockedNavigate).toBeCalledWith(Routes.SmartAccountConnecting, {
-      brand: 'google_home',
-      password: '1234567',
-      unit_id: 1,
-      username: 'eoh.dienquang@gmail.com',
-    });
+    expect(global.mockedNavigate).toBeCalledWith(
+      Routes.SmartAccountConnecting,
+      {
+        brand: 'google_home',
+        password: '1234567',
+        unit_id: 1,
+        username: 'eoh.dienquang@gmail.com',
+      }
+    );
   });
 
   it('render handle sync item DienQuang from screen dashboard', async () => {
@@ -215,7 +206,7 @@ describe('Test SmartAccount', () => {
     await act(async () => {
       await touchableOpacity.props.onPress();
     });
-    expect(mockedNavigate).toBeCalledWith(Routes.AddDeviceStack, {
+    expect(global.mockedNavigate).toBeCalledWith(Routes.AddDeviceStack, {
       screen: 'AddCommonSelectUnit',
       params: {
         addType: 'AddHassioDevice',
@@ -245,7 +236,7 @@ describe('Test SmartAccount', () => {
       await touchSupplierItem[1].props.onPress();
     });
     expect(touchSupplierItem).toBeDefined();
-    expect(mockedNavigate).toBeCalledWith(Routes.Browser, {
+    expect(global.mockedNavigate).toBeCalledWith(Routes.Browser, {
       // eslint-disable-next-line max-len
       link: 'https://qt-vn.m.lgaccount.com/emp/v2/authorize?client_id=2b85aee334f046848341547894bb7c4e&redirect_uri=app://eoh/sync-lg-device&response_type=code&state=1',
     });

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

@@ -9,7 +9,8 @@ import { AccessibilityLabel } from '../../../configs/Constants';
 import TextInput from '../../../commons/Form/TextInput';
 import { ModalCustom } from '../../../commons/Modal';
 import { TouchableOpacity } from 'react-native';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
+import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -17,16 +18,6 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-const mockNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockNavigate,
-    }),
-  };
-});
-
 describe('Test GroupButtonByType', () => {
   let tree;
   it('render GroupButtonByType', async () => {
@@ -139,15 +130,15 @@ describe('Test GroupButtonByType', () => {
           AccessibilityLabel.HEADER_BUTTON_TYPE_RELOAD &&
         el.type === TouchableOpacity
     );
-    const iconOutline = instance.find(
+    const icon = instance.find(
       (el) =>
         el.props.accessibilityLabel ===
-          AccessibilityLabel.ICON_OUTLINE_TYPE_RELOAD && el.type === IconOutline
+          AccessibilityLabel.ICON_OUTLINE_TYPE_RELOAD && el.type === AntDesign
     );
     await act(async () => {
       await touch.props.onPress();
     });
-    expect(iconOutline.props.name).toEqual('reload');
+    expect(icon.props.name).toEqual('reload1');
 
     const touch2 = instance.find(
       (el) =>
@@ -155,14 +146,14 @@ describe('Test GroupButtonByType', () => {
           AccessibilityLabel.HEADER_BUTTON_TYPE_MORE &&
         el.type === TouchableOpacity
     );
-    const iconOutline2 = instance.find(
+    const moreIcon = instance.find(
       (el) =>
         el.props.accessibilityLabel ===
-          AccessibilityLabel.ICON_OUTLINE_TYPE_MORE && el.type === IconOutline
+          AccessibilityLabel.ICON_OUTLINE_TYPE_MORE && el.type === MaterialIcons
     );
     await act(async () => {
       await touch2.props.onPress();
     });
-    expect(iconOutline2.props.name).toEqual('more');
+    expect(moreIcon.props.name).toEqual('more-vert');
   });
 });

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

@@ -12,16 +12,6 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-const mockNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockNavigate,
-    }),
-  };
-});
-
 describe('Test SelectBrand', () => {
   let tree;
   it('render SelectBrand', async () => {
@@ -55,6 +45,6 @@ describe('Test SelectBrand', () => {
     await act(async () => {
       rowItem[0].props.onPress();
     });
-    expect(mockNavigate).toHaveBeenCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
   });
 });

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

@@ -11,17 +11,6 @@ const wrapComponent = () => (
   </SCProvider>
 );
 
-const mockNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockNavigate,
-    }),
-  };
-});
-
 describe('Test SelectIrDeviceType', () => {
   let tree;
 
@@ -47,6 +36,6 @@ describe('Test SelectIrDeviceType', () => {
     await act(async () => {
       itemDevice.props.onPress();
     });
-    expect(mockNavigate).toHaveBeenCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
   });
 });

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

@@ -11,19 +11,11 @@ const wrapComponent = (item) => (
     <SmartIr item={item} />
   </SCProvider>
 );
-const mockNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockNavigate,
-    }),
-  };
-});
+
 describe('Test SmartIr', () => {
   let tree;
   beforeEach(() => {
-    mockNavigate.mockClear();
+    global.mockedNavigate.mockClear();
   });
   it('render SmartIr', async () => {
     const item = {
@@ -65,6 +57,6 @@ describe('Test SmartIr', () => {
     await act(async () => {
       itemAddNew.props.onPress();
     });
-    expect(mockNavigate).toHaveBeenCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
   });
 });

package/src/screens/SmartIr/components/GroupButtonByType/GroupButtonByType.js

@@ -5,7 +5,8 @@ import { useTranslations } from '../../../../hooks/Common/useTranslations';
 import SmartTiviActionTemplate from '../../../../commons/ActionGroup/SmartTiviActionTemplate/SmartTiviActionTemplate';
 import Text from '../../../../commons/Text';
 import { ModalCustom } from '../../../../commons/Modal';
-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 { Colors } from '../../../../configs';
 import TextInput from '../../../../commons/Form/TextInput';
 import { ButtonsBottom } from './ButtonsBottom';
@@ -57,8 +58,8 @@ const GroupButtonByType = memo(({ route }) => {
               style={[styles.headerButton]}
               accessibilityLabel={AccessibilityLabel.HEADER_BUTTON_TYPE_RELOAD}
             >
-              <IconOutline
-                name={'reload'}
+              <AntDesign
+                name={'reload1'}
                 size={27}
                 color={Colors.Black}
                 accessibilityLabel={AccessibilityLabel.ICON_OUTLINE_TYPE_RELOAD}
@@ -69,8 +70,8 @@ const GroupButtonByType = memo(({ route }) => {
               style={[styles.headerButton]}
               accessibilityLabel={AccessibilityLabel.HEADER_BUTTON_TYPE_MORE}
             >
-              <IconOutline
-                name={'more'}
+              <MaterialIcons
+                name={'more-vert'}
                 size={27}
                 color={Colors.Black}
                 accessibilityLabel={AccessibilityLabel.ICON_OUTLINE_TYPE_MORE}

package/src/screens/SmartIr/components/SelectBrand.js

@@ -5,7 +5,7 @@ import { HeaderCustom } from '../../../commons/Header';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import Routes from '../../../utils/Route';
 import { RowItem } from '../../../commons/RowItem';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import { Colors } from '../../../configs';
 
 import styles from './SelectBrandStyles';
@@ -47,7 +47,7 @@ const SelectDeviceType = memo(({ route }) => {
                   key={index.toString()}
                   isShowSubText={false}
                   rightComponent={
-                    <IconOutline name="right" size={20} color={Colors.Gray7} />
+                    <AntDesign name="right" size={20} color={Colors.Gray7} />
                   }
                 />
               );

package/src/screens/SubUnit/AddSubUnit.js

@@ -100,6 +100,7 @@ const AddSubUnit = ({ route }) => {
             headers: { 'Content-Type': 'multipart/form-data' },
           }
         );
+
         if (success) {
           ToastBottomHelper.success(t('text_create_sub_unit_success'));
           if (addType === 'AddHassiDevice') {

package/src/screens/SubUnit/EditSubUnit.js

@@ -18,7 +18,7 @@ import AlertAction from '../../commons/AlertAction';
 import _TextInput from '../../commons/Form/TextInput';
 import Text from '../../commons/Text';
 import { AccessibilityLabel } from '../../configs/Constants';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import { useEmeragencyContacts } from './hooks/useEmergencyContacts';
 import useKeyboardAnimated from '../../hooks/Explore/useKeyboardAnimated';
 import styles from './EditSubUnitStyles';
@@ -114,6 +114,7 @@ const EditSubUnit = ({ route }) => {
     const { success } = await axiosDelete(
       API.SUB_UNIT.REMOVE_SUB_UNIT(unit.id, station.id)
     );
+
     if (success) {
       //dispatch(removeSubUnit(station.id));
       ToastBottomHelper.success(t('text_remove_sub_unit_success'));
@@ -206,7 +207,7 @@ const EditSubUnit = ({ route }) => {
                 <Text type={'H4'} color={Colors.Gray9}>
                   {t('emergency_contacts')}
                 </Text>
-                <IconOutline name={'right'} size={20} color={Colors.Gray8} />
+                <AntDesign name={'right'} size={20} color={Colors.Gray8} />
               </TouchableOpacity>
               <Text
                 type={'Body'}

package/src/screens/SubUnit/ManageSubUnit.js

@@ -14,8 +14,8 @@ import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
 import Text from '../../commons/Text';
 
 import styles from './ManageSubUnitStyles';
-import { IconOutline } from '@ant-design/icons-react-native';
-import { Icon } from '@ant-design/react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
+import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import Routes from '../../utils/Route';
 import { RowItem } from '../../commons/RowItem';
 import NoSubUnitImage from '../../../assets/images/Illustrations.svg';
@@ -54,14 +54,14 @@ const ManageSubUnit = ({ route }) => {
           onPress={addSubUnit}
           style={styles.headerButton}
         >
-          <Icon name={'plus'} size={27} color={Colors.Black} />
+          <AntDesign name={'plus'} size={27} color={Colors.Black} />
         </TouchableOpacity>
         <TouchableOpacity
           // onPress={handleShowMenuAction}
           // ref={refMenuAction}
           style={[styles.headerButton, styles.moreButton]}
         >
-          <Icon name={'more'} size={27} color={Colors.Black} />
+          <MaterialIcons name={'more-vert'} size={27} color={Colors.Black} />
         </TouchableOpacity>
       </View>
     ),
@@ -112,7 +112,7 @@ const ManageSubUnit = ({ route }) => {
                       }  devices`}
                       onPress={() => goToEditSubUnit(item, unit)}
                       rightComponent={
-                        <IconOutline
+                        <AntDesign
                           name="right"
                           size={20}
                           color={Colors.Gray6}

package/src/screens/SubUnit/__test__/AddSubUnit.test.js

@@ -22,30 +22,10 @@ const wrapComponent = (route, storeData = {}) => (
   </SCProvider>
 );
 
-const mockedNavigate = jest.fn();
-const mockedGoBack = jest.fn();
-
 const mock = new MockAdapter(api.axiosInstance);
 jest.mock('react-native-toast-message');
 jest.mock('react-native-image-resizer');
 
-const mockNavigationDispatch = jest.fn();
-const mockReplace = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-      dispatch: mockNavigationDispatch,
-    }),
-    StackActions: {
-      replace: () => mockReplace,
-    },
-  };
-});
-
 describe('Test AddSubUnit', () => {
   let route;
 
@@ -61,8 +41,6 @@ describe('Test AddSubUnit', () => {
         },
       },
     };
-    mockedNavigate.mockClear();
-    mockNavigationDispatch.mockClear();
     Toast.show.mockClear();
     mock.reset();
   });
@@ -139,7 +117,7 @@ describe('Test AddSubUnit', () => {
       await viewButtonBottom.props.onLeftClick();
     });
 
-    expect(mockedGoBack).toHaveBeenCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 
   it('validateData then send api success', async () => {
@@ -201,7 +179,7 @@ describe('Test AddSubUnit', () => {
     await act(async () => {
       await viewButtonBottom.props.onRightClick();
     });
-    expect(mockNavigationDispatch).toBeCalledWith(mockReplace);
+    expect(global.mockedDispatch).toBeCalled();
   });
 
   it('test choose Location', async () => {
@@ -223,7 +201,7 @@ describe('Test AddSubUnit', () => {
     await act(async () => {
       buttonChooseLocation.props.onPress();
     });
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.AddLocationMaps);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.AddLocationMaps);
   });
 
   it('test create Unit Fail', async () => {
@@ -265,7 +243,7 @@ describe('Test AddSubUnit', () => {
     await act(async () => {
       await viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).toHaveBeenCalledWith('UnitDetail', {
+    expect(global.mockedNavigate).toHaveBeenCalledWith('UnitDetail', {
       params: {
         isAddSubUnit: true,
         routeName: 'DashboardStack',
@@ -308,7 +286,7 @@ describe('Test AddSubUnit', () => {
     await act(async () => {
       await viewButtonBottom.props.onRightClick();
     });
-    expect(mockNavigationDispatch).toBeCalledWith(mockReplace);
+    expect(global.mockedDispatch).toBeCalled();
   });
 
   it('test no permission create fail sub-unit is out side Unit', async () => {
@@ -347,7 +325,7 @@ describe('Test AddSubUnit', () => {
       '',
       7000
     );
-    expect(mockNavigationDispatch).not.toBeCalled();
+    expect(global.mockedDispatch).not.toBeCalled();
   });
 
   it('test create sub-unit type AddHassiDevice', async () => {
@@ -355,7 +333,7 @@ describe('Test AddSubUnit', () => {
       ...route.params,
       addType: 'AddHassiDevice',
     };
-    mock.onPost(API.SUB_UNIT.CREATE_SUB_UNIT()).reply(200, {});
+    mock.onPost(API.SUB_UNIT.CREATE_SUB_UNIT(1)).reply(200, {});
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -364,7 +342,7 @@ describe('Test AddSubUnit', () => {
     await act(async () => {
       await viewButtonBottom.props.onRightClick();
     });
-    expect(mockedGoBack).toHaveBeenCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 
   it('test create sub-unit type AddNewGateway', async () => {
@@ -381,7 +359,7 @@ describe('Test AddSubUnit', () => {
     await act(async () => {
       await viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).not.toHaveBeenCalledWith(
+    expect(global.mockedNavigate).not.toHaveBeenCalledWith(
       Routes.AddCommonSelectSubUnit,
       {
         ...route.params,