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

package/src/screens/AddCommon/__test__/SelectSubUnit.test.js

@@ -15,19 +15,6 @@ import Routes from '../../../utils/Route';
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockedGoBack = jest.fn();
-const mockedNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-    useIsFocused: () => ({}),
-  };
-});
-
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <AddCommonSelectSubUnit route={route} />
@@ -35,10 +22,6 @@ const wrapComponent = (route) => (
 );
 
 describe('Test SelectSubUnit', () => {
-  beforeEach(() => {
-    mockedNavigate.mockClear();
-    mockedGoBack.mockClear();
-  });
   let tree;
 
   it('test ViewButtonBottom onRightClick', async () => {
@@ -51,14 +34,14 @@ describe('Test SelectSubUnit', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).toHaveBeenCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
   });
 });
 
 describe('Test SelectSubUnit container', () => {
   beforeEach(() => {
-    mockedNavigate.mockClear();
-    mockedGoBack.mockClear();
+    global.mockedNavigate.mockClear();
+    global.mockedGoBack.mockClear();
   });
   let tree;
   const list_type = ['AddHassiDevice'];
@@ -109,7 +92,7 @@ describe('Test SelectSubUnit container', () => {
 
       switch (type) {
         case 'AddHassiDevice':
-          expect(mockedNavigate).toHaveBeenCalledWith(
+          expect(global.mockedNavigate).toHaveBeenCalledWith(
             Routes.SmartAccountStack,
             {
               screen: Routes.SmartAccountConnecting,

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

@@ -14,18 +14,6 @@ import SelectUnit from '../../../commons/SelectUnit';
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockedGoBack = jest.fn();
-const mockedNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-  };
-});
-
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <AddCommonSelectUnit route={route} />
@@ -34,8 +22,8 @@ const wrapComponent = (route) => (
 
 describe('Test SelectUnit container', () => {
   beforeEach(() => {
-    mockedNavigate.mockClear();
-    mockedGoBack.mockClear();
+    global.mockedNavigate.mockClear();
+    global.mockedGoBack.mockClear();
   });
 
   beforeEach(() => {
@@ -115,12 +103,12 @@ describe('Test SelectUnit container', () => {
 
       switch (type) {
         case 'AddSubUnit':
-          expect(mockedNavigate).toBeCalledWith('AddSubUnit', {
+          expect(global.mockedNavigate).toBeCalledWith('AddSubUnit', {
             unit: { id: 1, name: 'Unit 1' },
           });
           break;
         case 'AddDevice':
-          expect(mockedNavigate).toBeCalledWith('AddGatewayStack', {
+          expect(global.mockedNavigate).toBeCalledWith('AddGatewayStack', {
             screen: 'SelectDeviceType',
             params: {
               unit: {
@@ -131,12 +119,12 @@ describe('Test SelectUnit container', () => {
           });
           break;
         case 'AddMember':
-          expect(mockedNavigate).toBeCalledWith('SelectShareDevice', {
+          expect(global.mockedNavigate).toBeCalledWith('SelectShareDevice', {
             unit: { id: 1, name: 'Unit 1' },
           });
           break;
         case 'AddLGDevice':
-          expect(mockedNavigate).toBeCalledWith('AddLGDevice', {
+          expect(global.mockedNavigate).toBeCalledWith('AddLGDevice', {
             code: 'CODE',
             backend_url: 'https://doamin.com/',
             unit_id: 1,
@@ -237,6 +225,6 @@ describe('test single SelectUnit', () => {
     await act(async () => {
       goBack.props.onPress();
     });
-    expect(mockedGoBack).toBeCalled();
+    expect(global.mockedGoBack).toBeCalled();
   });
 });

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

@@ -16,6 +16,7 @@ import {
   OpenSetting,
 } from '../../../utils/Permission/common';
 import { RESULTS } from 'react-native-permissions';
+import { useNavigation } from '@react-navigation/native';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -25,18 +26,6 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockNavigate = jest.fn();
-const mockGoBack = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockNavigate,
-      goBack: mockGoBack,
-    }),
-  };
-});
-
 jest.mock('react-native-maps', () => {
   const { forwardRef } = require('react');
   const { View } = require('react-native');
@@ -83,6 +72,7 @@ jest.mock('react-native-permissions', () => {
 describe('Test SelectAddress', () => {
   let tree, route, Platform;
   const mockUpdateLocation = jest.fn();
+  const { navigate } = useNavigation();
 
   beforeAll(() => {
     Platform = require('react-native').Platform;
@@ -259,6 +249,6 @@ describe('Test SelectAddress', () => {
     await act(async () => {
       await button.props.onPress();
     });
-    expect(mockNavigate).toBeCalled();
+    expect(navigate).toBeCalled();
   });
 });

package/src/screens/AddLocationMaps/index.js

@@ -2,7 +2,8 @@ import React, { memo, useState, useCallback, useRef, useEffect } from 'react';
 import { View, ScrollView, TouchableOpacity } from 'react-native';
 import MapView, { Marker, Circle, PROVIDER_GOOGLE } from 'react-native-maps';
 import { useNavigation } from '@react-navigation/native';
-import { IconOutline, IconFill } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
+import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import { check, RESULTS } from 'react-native-permissions';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
@@ -204,7 +205,11 @@ const AddLocationMaps = memo(() => {
                   style={styles.button}
                   accessibilityLabel={AccessibilityLabel.BUTTON_YOUR_LOCATION}
                 >
-                  <IconOutline name="aim" size={27} color={Colors.Primary} />
+                  <MaterialIcons
+                    name="my-location"
+                    size={27}
+                    color={Colors.Primary}
+                  />
                   <Text
                     type="Body"
                     color={Colors.Gray9}
@@ -220,8 +225,8 @@ const AddLocationMaps = memo(() => {
                   style={styles.button}
                   accessibilityLabel={AccessibilityLabel.BUTTON_CHOOSE_ON_MAP}
                 >
-                  <IconFill
-                    name="environment"
+                  <AntDesign
+                    name="enviroment"
                     size={27}
                     color={Colors.Primary}
                   />
@@ -269,8 +274,8 @@ const AddLocationMaps = memo(() => {
                   }}
                   tracksViewChanges={false}
                 >
-                  <IconFill
-                    name="environment"
+                  <AntDesign
+                    name="enviroment"
                     size={27}
                     color={Colors.Blue10}
                   />

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

@@ -22,27 +22,10 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockedNavigate = jest.fn();
-const mockedGoBack = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-  };
-});
-
 describe('Test AddNewDevice', () => {
   let tree;
   let route;
 
-  afterEach(() => {
-    mockedNavigate.mockClear();
-  });
-
   beforeEach(() => {
     route = {
       params: {
@@ -145,7 +128,7 @@ describe('Test AddNewDevice', () => {
     await act(async () => {
       viewButtonBottom.props.onLeftClick();
     });
-    expect(mockedGoBack).toHaveBeenCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 
   it('ViewButtonBottom onRightClick without select stationId', async () => {
@@ -157,7 +140,7 @@ describe('Test AddNewDevice', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).toHaveBeenCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
   });
 
   it('ViewButtonBottom onRightClick with stationId', async () => {
@@ -181,7 +164,7 @@ describe('Test AddNewDevice', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.ScanSensorQR, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScanSensorQR, {
       station_id: 2,
       unit_id: 1,
       unit_name: 'Unit name',

package/src/screens/AddNewGateway/PlugAndPlay/__test__/FirstWarning.test.js

@@ -9,19 +9,6 @@ import { mockSCStore } from '../../../../context/mockStore';
 import { ViewButtonBottom } from '../../../../commons';
 import Routes from '../../../../utils/Route';
 
-const mockedGoBack = jest.fn();
-const mockedNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-    useIsFocused: () => ({}),
-  };
-});
-
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <FirstWarning route={route} />
@@ -32,7 +19,7 @@ describe('Test FirstWarning', () => {
   let tree;
 
   beforeEach(async () => {
-    mockedNavigate.mockClear();
+    global.mockedNavigate.mockClear();
   });
 
   it('create', async () => {
@@ -58,21 +45,27 @@ describe('Test FirstWarning', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).toHaveBeenCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
   };
 
   it('test ViewButtonBottom onRightClick from dashboard', async () => {
     await rightClick({});
-    expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.SelectDeviceUnit);
+    expect(global.mockedNavigate.mock.calls[0][0]).toEqual(
+      Routes.SelectDeviceUnit
+    );
   });
 
   it('test ViewButtonBottom onRightClick from unit', async () => {
     await rightClick({ unitId: 1 });
-    expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.SelectDeviceType);
+    expect(global.mockedNavigate.mock.calls[0][0]).toEqual(
+      Routes.SelectDeviceType
+    );
   });
 
   it('test ViewButtonBottom onRightClick from sub-unit', async () => {
     await rightClick({ unitId: 1, stationId: 1 });
-    expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.SelectDeviceType);
+    expect(global.mockedNavigate.mock.calls[0][0]).toEqual(
+      Routes.SelectDeviceType
+    );
   });
 });

package/src/screens/AddNewGateway/PlugAndPlay/__test__/ZigbeeDeviceConnectGuide.test.js

@@ -8,19 +8,7 @@ import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
 import { ViewButtonBottom } from '../../../../commons';
 import Routes from '../../../../utils/Route';
-
-const mockedGoBack = jest.fn();
-const mockedNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-    useIsFocused: () => ({}),
-  };
-});
+import { useNavigation } from '@react-navigation/native';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -30,10 +18,7 @@ const wrapComponent = (route) => (
 
 describe('Test ZigbeeDeviceConnectGuide', () => {
   let tree;
-
-  beforeEach(async () => {
-    mockedNavigate.mockClear();
-  });
+  const { navigate } = useNavigation();
 
   it('create', async () => {
     await act(async () => {
@@ -58,13 +43,11 @@ describe('Test ZigbeeDeviceConnectGuide', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).toHaveBeenCalled();
+    expect(navigate).toHaveBeenCalled();
   };
 
   it('test click next', async () => {
     await rightClick();
-    expect(mockedNavigate.mock.calls[0][0]).toEqual(
-      Routes.ConnectingZigbeeDevice
-    );
+    expect(navigate.mock.calls[0][0]).toEqual(Routes.ConnectingZigbeeDevice);
   });
 });

package/src/screens/AddNewGateway/RenameNewDevices.js

@@ -1,6 +1,6 @@
 import React, { memo, useCallback, useEffect, useState, useMemo } from 'react';
 import { ScrollView, TouchableOpacity, View } from 'react-native';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import { CommonActions, useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { Colors } from '../../configs';
@@ -357,7 +357,7 @@ const RenameNewDevices = memo(({ route }) => {
       />
       <View style={styles.content}>
         <View style={styles.viewIconSuccess}>
-          <IconOutline name="check-circle" size={28} color={Colors.Green6} />
+          <AntDesign name="check-circle" size={28} color={Colors.Green6} />
           <Text
             semibold
             color={Colors.Black}

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

@@ -112,7 +112,7 @@ describe('Test AddNewGateway', () => {
     await act(async () => {
       viewButtonBottom.props.onLeftClick();
     });
-    expect(mockedGoBack).toHaveBeenCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 
   it('ViewButtonBottom onRightClick without select stationId', async () => {
@@ -124,7 +124,7 @@ describe('Test AddNewGateway', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).not.toHaveBeenCalled();
+    expect(global.mockedNavigate).not.toHaveBeenCalled();
   });
 
   it('ViewButtonBottom onRightClick with stationId', async () => {
@@ -147,6 +147,6 @@ describe('Test AddNewGateway', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).not.toBeCalled();
+    expect(global.mockedNavigate).not.toBeCalled();
   });
 });

package/src/screens/AddNewGateway/__test__/ConnectingModbusDevice.test.js

@@ -15,27 +15,10 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockedNavigate = jest.fn();
-const mockedGoBack = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-  };
-});
-
 describe('Test connecting modbus device', () => {
   let tree;
   let route;
 
-  afterEach(() => {
-    mockedNavigate.mockClear();
-  });
-
   beforeEach(() => {
     route = {
       params: {

package/src/screens/AddNewGateway/__test__/ConnectingWifiDevice.test.js

@@ -11,6 +11,7 @@ import api from '../../../utils/Apis/axios';
 import Processing from '../../../commons/Processing';
 import ConnectingDevice from '../ConnectingDevice';
 import { API } from '../../../configs';
+import { useNavigation } from '@react-navigation/native';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -20,31 +21,15 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 jest.spyOn(Alert, 'alert').mockImplementation(() => {});
-const mockedNavigate = jest.fn();
-const mockedGoBack = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-  };
-});
 
 describe('Test connecting wifi device', () => {
   let tree;
   let route;
+  const { goBack } = useNavigation();
 
-  afterEach(() => {
-    mockedNavigate.mockClear();
-    mockedGoBack.mockClear();
+  beforeEach(() => {
     Alert.alert.mockReset();
     mock.reset();
-  });
-
-  beforeEach(() => {
     jest.useFakeTimers();
     route = {
       params: {
@@ -96,6 +81,6 @@ describe('Test connecting wifi device', () => {
     await act(async () => {
       Alert.alert.mock.calls[1][2][0].onPress();
     });
-    expect(mockedGoBack).toBeCalled();
+    expect(goBack).toBeCalled();
   });
 });

package/src/screens/AddNewGateway/__test__/ConnectingWifiGuide.test.js

@@ -10,19 +10,7 @@ import ConnectingWifiGuide from '../ConnectingWifiGuide';
 import InteractSmartphoneIcon from '../../../../assets/images/AddNewDevice/interact-smartphone-icon.svg';
 import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 
-const mockedGoBack = jest.fn();
-const mockedNavigate = jest.fn();
 jest.spyOn(Alert, 'alert').mockImplementation(() => {});
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-    useIsFocused: () => true,
-  };
-});
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -146,7 +134,7 @@ describe('test share wifi password', () => {
     await act(async () => {
       Alert.alert.mock.calls[0][2][0].onPress();
     });
-    expect(mockedGoBack).toBeCalled();
+    expect(global.mockedGoBack).toBeCalled();
   });
 
   it('fail connect to wifi android show error push retry', async () => {
@@ -244,7 +232,7 @@ describe('test share wifi password', () => {
     });
     // todo Bang should test wifi display
     expect(socket.close).toBeCalled();
-    expect(mockedNavigate).toBeCalledWith(
+    expect(global.mockedNavigate).toBeCalledWith(
       'ShareWifiPassword',
       expect.objectContaining({
         qrData: {
@@ -262,7 +250,7 @@ describe('test share wifi password', () => {
       })
     );
 
-    // expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.ShareWifiPassword);
+    // expect(global.mockedNavigate.mock.calls[0][0]).toEqual(Routes.ShareWifiPassword);
   });
 
   it('got error while request wifi list from device', async () => {

package/src/screens/AddNewGateway/__test__/ConnectingZigbeeDevice.test.js

@@ -18,38 +18,12 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-jest.mock('react-native', () => {
-  const RN = jest.requireActual('react-native');
-  return Object.setPrototypeOf(
-    {
-      Alert: {
-        ...RN.Alert,
-        alert: jest.fn(),
-      },
-    },
-    RN
-  );
-});
-
-const mockedNavigate = jest.fn();
-const mockedGoBack = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-  };
-});
-
 describe('Test connecting modbus device', () => {
   let tree;
   let route;
 
   beforeEach(() => {
     getPusher().resetMock();
-    mockedNavigate.mockClear();
   });
 
   beforeEach(() => {
@@ -108,18 +82,21 @@ describe('Test connecting modbus device', () => {
     await act(async () => {
       await channel.trigger('progress', { success: 1 });
     });
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.RenameNewDevices, {
-      addDeviceType: undefined,
-      unit: {
-        id: 1,
-      },
-      subUnit: {
-        id: 2,
-        station: 'Station 2',
-      },
-      chipId: 3,
-      sensorId: 1,
-    });
+    expect(global.mockedNavigate).toHaveBeenCalledWith(
+      Routes.RenameNewDevices,
+      {
+        addDeviceType: undefined,
+        unit: {
+          id: 1,
+        },
+        subUnit: {
+          id: 2,
+          station: 'Station 2',
+        },
+        chipId: 3,
+        sensorId: 1,
+      }
+    );
   });
 
   it('receive sensor from channel after rejoin zigbee', async () => {
@@ -142,18 +119,21 @@ describe('Test connecting modbus device', () => {
     await act(async () => {
       await channel.trigger('progress', { success: 1 });
     });
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.RenameNewDevices, {
-      addDeviceType: undefined,
-      unit: {
-        id: 1,
-      },
-      subUnit: {
-        id: 2,
-        station: 'Station 2',
-      },
-      chipId: 3,
-      sensorId: 1,
-      isRejoin: true,
-    });
+    expect(global.mockedNavigate).toHaveBeenCalledWith(
+      Routes.RenameNewDevices,
+      {
+        addDeviceType: undefined,
+        unit: {
+          id: 1,
+        },
+        subUnit: {
+          id: 2,
+          station: 'Station 2',
+        },
+        chipId: 3,
+        sensorId: 1,
+        isRejoin: true,
+      }
+    );
   });
 });