@eohjsc/react-native-smart-city 0.7.3-rc7 → 0.7.3-rc9

package/src/commons/Header/__test__/HeaderCT.test.js

@@ -1,6 +1,6 @@
+import { act } from '@testing-library/react-hooks';
 import React from 'react';
 import { TouchableOpacity } from 'react-native';
-import { act } from '@testing-library/react-hooks';
 import { create } from 'react-test-renderer';
 import { HeaderCustom } from '..';
 import { SCProvider } from '../../../context';
@@ -44,11 +44,11 @@ describe('Test HeaderCustom', () => {
     await act(async () => {
       TouchableOpacityElement[1].props.onPress();
     });
-    expect(mockOnRefresh).toBeCalled();
+    expect(mockOnRefresh).toHaveBeenCalled();
     await act(async () => {
       TouchableOpacityElement[2].props.onPress();
     });
-    expect(mockShowPopoverWithRef).toBeCalled();
+    expect(mockShowPopoverWithRef).toHaveBeenCalled();
   });
 
   it('Test render without props', async () => {

package/src/commons/IconComponent/index.js

@@ -30,7 +30,7 @@ const IconComponent = memo(
         } else if (newIcon.includes('TwoTone')) {
           newIcon = newIcon.substring(0, newIcon.length - 'TwoTone'.length);
         }
-        newIcon = newIcon.replace(/[A-Z]/g, (m) => '-' + m.toLowerCase());
+        newIcon = newIcon.replace(/[A-Z]/g, (m) => m.toLowerCase());
       }
       return newIcon;
     }, [icon]);

package/src/commons/ImagePicker/__test__/ImagePicker.test.js

@@ -2,10 +2,10 @@ import React from 'react';
 import { Platform } from 'react-native';
 import { act, create } from 'react-test-renderer';
 
-import ImagePicker from '../index';
-import ButtonPopup from '../../ButtonPopup';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import ButtonPopup from '../../ButtonPopup';
+import ImagePicker from '../index';
 
 const mockSetImageUrl = jest.fn();
 const mockSetShowImagePicker = jest.fn();
@@ -56,7 +56,7 @@ describe('Test ImagePicker', () => {
     await act(async () => {
       textInputs[0].props.onPressMain();
     });
-    expect(mockSetImageUrl).toBeCalledWith({ path: 'path_from_camera' });
+    expect(mockSetImageUrl).toHaveBeenCalledWith({ path: 'path_from_camera' });
   });
 
   it('create ImagePicker onChooseFile', async () => {
@@ -69,7 +69,7 @@ describe('Test ImagePicker', () => {
     await act(async () => {
       buttonPopup.props.onPressSecondary();
     });
-    expect(mockSetImageUrl).toBeCalledWith({
+    expect(mockSetImageUrl).toHaveBeenCalledWith({
       path: 'file:///data/user/0/com.eohjsc.eohmobile/cache/Camera/80fbbd4b-926d-425f-a081-e21b13f2f7d0.jpg',
     });
   });
@@ -84,6 +84,6 @@ describe('Test ImagePicker', () => {
     await act(async () => {
       await buttonPopup.props.onClose();
     });
-    expect(mockSetShowImagePicker).toBeCalledWith(false);
+    expect(mockSetShowImagePicker).toHaveBeenCalledWith(false);
   });
 });

package/src/commons/MediaPlayerDetail/__test__/MediaPlayerDetail.test.js

@@ -1,12 +1,12 @@
 import React from 'react';
+import { Text, TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import { TouchableOpacity, Text } from 'react-native';
-import MediaPlayerDetail from '../index';
 import PauseIcon from '../../../assets/images/Common/Pause.svg';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { ToastBottomHelper } from '../../../utils/Utils';
 import { getTranslate } from '../../../utils/I18n';
+import { ToastBottomHelper } from '../../../utils/Utils';
+import MediaPlayerDetail from '../index';
 
 const wrapComponent = (uri) => (
   <SCProvider initState={mockSCStore({})}>
@@ -53,6 +53,8 @@ describe('Test MediaPlayerDetail', () => {
     await act(async () => {
       wrapper = await create(wrapComponent(uri));
     });
-    expect(spyToastError).toBeCalledWith(getTranslate('en', 'uri_invalid'));
+    expect(spyToastError).toHaveBeenCalledWith(
+      getTranslate('en', 'uri_invalid')
+    );
   });
 });

package/src/commons/Popover/__test__/index.test.js

@@ -1,9 +1,9 @@
 import React from 'react';
-import { create, act } from 'react-test-renderer';
+import Popover from 'react-native-popover-view';
+import { act, create } from 'react-test-renderer';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import PopoverComponent from '../index';
-import Popover from 'react-native-popover-view';
 
 const wrapComponent = (data) => (
   <SCProvider initState={mockSCStore({})}>
@@ -26,6 +26,6 @@ describe('Test PopoverComponent', () => {
       popover.props.onCloseComplete();
     });
     expect(popover.props.isVisible).toEqual(true);
-    expect(mockOnCloseComplete).toBeCalled();
+    expect(mockOnCloseComplete).toHaveBeenCalled();
   });
 });

package/src/commons/Processing/__test__/Connecting.test.js

@@ -1,12 +1,12 @@
 import React from 'react';
-import { act, create } from 'react-test-renderer';
-import * as Progress from 'react-native-progress';
-import Processing from '../index';
 import { Text } from 'react-native';
+import * as Progress from 'react-native-progress';
+import { act, create } from 'react-test-renderer';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import { getPusher } from '../../../utils/Pusher';
 import ViewButtonBottom from '../../ViewButtonBottom';
+import Processing from '../index';
 
 const wrapComponent = (props) => (
   <SCProvider initState={mockSCStore({})}>
@@ -73,7 +73,7 @@ describe('Test Processing', () => {
       tree = await create(wrapComponent({ onReady: setChannelName }));
       await tree.unmount();
     });
-    expect(getPusher().unsubscribe).toBeCalledWith(channelName);
+    expect(getPusher().unsubscribe).toHaveBeenCalledWith(channelName);
   });
 
   it('test click ok', async () => {

package/src/commons/SelectUnit/__test__/SelectUnit.test.js

@@ -1,15 +1,15 @@
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
-import renderer, { act } from 'react-test-renderer';
 import { Platform } from 'react-native';
-import MockAdapter from 'axios-mock-adapter';
+import renderer, { act } from 'react-test-renderer';
 
-import SelectUnit from '../index';
 import Text from '../../../commons/Text';
+import { API } from '../../../configs';
 import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
+import SelectUnit from '../index';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -103,6 +103,6 @@ describe('test single SelectUnit', () => {
     await act(async () => {
       goBack.props.onPress();
     });
-    expect(global.mockedGoBack).toBeCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 });

package/src/commons/SubUnit/__test__/ShortDetail.test.js

@@ -1,19 +1,19 @@
 import React from 'react';
 import { Image, View } from 'react-native';
-import { act, create } from 'react-test-renderer';
 import mock from 'react-native-permissions/mock';
+import { act, create } from 'react-test-renderer';
 import { AccessibilityLabel } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import ShortDetailSubUnit from '../ShortDetail';
-import ItemAddNew from '../../Device/ItemAddNew';
-import Routes from '../../../utils/Route';
+import { watchMultiConfigs } from '../../../iot/Monitor';
 import { keyPermission } from '../../../utils/Permission/common';
-import ItemDevice from '../../Device/ItemDevice';
-import { DeviceTemplate } from '../DeviceTemplate/DeviceTemplate';
+import Routes from '../../../utils/Route';
 import ItemHanetDevice from '../../Device/Hanet/ItemHanetDevice';
-import { watchMultiConfigs } from '../../../iot/Monitor';
+import ItemAddNew from '../../Device/ItemAddNew';
+import ItemDevice from '../../Device/ItemDevice';
 import Text from '../../Text';
+import { DeviceTemplate } from '../DeviceTemplate/DeviceTemplate';
+import ShortDetailSubUnit from '../ShortDetail';
 
 jest.mock('../../../iot/Monitor');
 
@@ -179,7 +179,7 @@ describe('test ShortDetail Subunit', () => {
       tree = await create(wrapComponent(props));
     });
     jest.runOnlyPendingTimers();
-    expect(watchMultiConfigs).toBeCalledWith([1]);
+    expect(watchMultiConfigs).toHaveBeenCalledWith([1]);
   });
 
   ['ConfigAndEvaluation', 'ConfigValue', 'EvaluationOverConfig'].forEach(

package/src/commons/Widgets/IFrame/__tests__/IFrame.test.js

@@ -63,7 +63,7 @@ describe('Test IFrame', () => {
 
     // expect(mockReload).toHaveBeenCalledTimes(1);
 
-    // conflict with at current (node_modules/react-native/Libraries/Utilities/useRefEffect.js:36:20)
+    // conflict with current (node_modules/react-native/Libraries/Utilities/useRefEffect.js:36:20)
 
     // if current = null, conflict with
     // at __restoreDefaultValues (node_modules/react-native/Libraries/Animated/useAnimatedProps.js:160:16)

package/src/hooks/Common/__test__/useAndroidTranslucentStatusBar.test.js

@@ -1,10 +1,10 @@
+import { useNavigation } from '@react-navigation/native';
+import { renderHook } from '@testing-library/react-hooks';
 import React from 'react';
 import { Platform } from 'react-native';
-import { renderHook } from '@testing-library/react-hooks';
-import { useAndroidTranslucentStatusBar } from '../index';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { useNavigation } from '@react-navigation/native';
+import { useAndroidTranslucentStatusBar } from '../index';
 
 const mockedSetAction = jest.fn();
 
@@ -28,7 +28,7 @@ describe('test useAndroidTranslucentStatusBar', () => {
         wrapper,
       }
     );
-    expect(addListener).not.toBeCalled();
+    expect(addListener).not.toHaveBeenCalled();
   });
 
   it('test useAndroidTranslucentStatusBar ios', async () => {
@@ -39,6 +39,6 @@ describe('test useAndroidTranslucentStatusBar', () => {
         wrapper,
       }
     );
-    expect(addListener).not.toBeCalled();
+    expect(addListener).not.toHaveBeenCalled();
   });
 });

package/src/hooks/IoT/__test__/useHomeAssistantConnection.test.js

@@ -1,13 +1,13 @@
-import React from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
-import { createConnection, getStates } from 'home-assistant-js-websocket';
 import MockAdapter from 'axios-mock-adapter';
-import api from '../../../utils/Apis/axios';
-import { useHomeAssistantConnection } from '../index';
+import { createConnection, getStates } from 'home-assistant-js-websocket';
+import React from 'react';
+import { API } from '../../../configs';
 import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
 import { Action } from '../../../context/actionType';
-import { API } from '../../../configs';
+import { mockSCStore } from '../../../context/mockStore';
+import api from '../../../utils/Apis/axios';
+import { useHomeAssistantConnection } from '../index';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -124,7 +124,7 @@ describe('Test useHomeAssistantConnection', () => {
     await act(async () => {
       await result.current.connectHomeAssistant(options);
     });
-    expect(mockedSetAction).toBeCalledWith(
+    expect(mockedSetAction).toHaveBeenCalledWith(
       Action.SET_HOME_ASSISTANT_CONNECTIONS,
       conns
     );
@@ -145,7 +145,7 @@ describe('Test useHomeAssistantConnection', () => {
     await act(async () => {
       await result.current.connectHomeAssistant(options);
     });
-    expect(mockedSetAction).toBeCalledWith(
+    expect(mockedSetAction).toHaveBeenCalledWith(
       Action.SET_HOME_ASSISTANT_CONNECTIONS,
       conns
     );
@@ -167,12 +167,12 @@ describe('Test useHomeAssistantConnection', () => {
     await act(async () => {
       await result.current.connectHomeAssistant(options);
     });
-    expect(mockedSetAction).toBeCalledTimes(2);
-    expect(mockedSetAction).toBeCalledWith(
+    expect(mockedSetAction).toHaveBeenCalledTimes(2);
+    expect(mockedSetAction).toHaveBeenCalledWith(
       Action.SET_HOME_ASSISTANT_CONNECTIONS,
       conns
     );
-    expect(mockedSetAction).toBeCalledWith(Action.LIST_DEVICE_TYPES, {
+    expect(mockedSetAction).toHaveBeenCalledWith(Action.LIST_DEVICE_TYPES, {
       chipId: options[0].chip_id,
       sentEmail: true,
     });
@@ -190,7 +190,7 @@ describe('Test useHomeAssistantConnection', () => {
     await act(async () => {
       await result.current.disconnectHomeAssistant(conns, options);
     });
-    expect(mockedSetAction).toBeCalledWith(
+    expect(mockedSetAction).toHaveBeenCalledWith(
       Action.SET_HOME_ASSISTANT_CONNECTIONS,
       {}
     );

package/src/hooks/IoT/__test__/useWatchConfigs.test.js

@@ -1,9 +1,9 @@
-import React, { useContext } from 'react';
 import { renderHook } from '@testing-library/react-hooks';
+import React, { useContext } from 'react';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { unwatchMultiConfigs, watchMultiConfigs } from '../../../iot/Monitor';
 import { useWatchConfigs } from '../index';
-import { watchMultiConfigs, unwatchMultiConfigs } from '../../../iot/Monitor';
 
 const mockedSetAction = jest.fn();
 
@@ -27,6 +27,6 @@ describe('Test useWatchConfigs', () => {
       wrapper,
     });
     jest.runOnlyPendingTimers();
-    expect(watchMultiConfigs).toBeCalledWith([1]);
+    expect(watchMultiConfigs).toHaveBeenCalledWith([1]);
   });
 });

package/src/iot/RemoteControl/__test__/Internet.test.js

@@ -1,8 +1,8 @@
-import Toast from 'react-native-toast-message';
 import MockAdapter from 'axios-mock-adapter';
-import { sendCommandOverInternet } from '../Internet';
-import api from '../../../utils/Apis/axios';
+import Toast from 'react-native-toast-message';
 import { API } from '../../../configs';
+import api from '../../../utils/Apis/axios';
+import { sendCommandOverInternet } from '../Internet';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -14,24 +14,24 @@ describe('Test IOT Remote Control Internet', () => {
   it('Trigger action via request POST', async () => {
     mock.onPost(API.DEVICE.TRIGGER_ACTION()).reply(200);
     await sendCommandOverInternet({}, {}, 'internet');
-    expect(Toast.show).toBeCalledTimes(2);
+    expect(Toast.show).toHaveBeenCalledTimes(2);
   });
 
   it('Trigger action via request POST with data isInteger', async () => {
     mock.onPost(API.DEVICE.TRIGGER_ACTION()).reply(200);
     await sendCommandOverInternet({}, {}, 1);
-    expect(Toast.show).toBeCalledTimes(2);
+    expect(Toast.show).toHaveBeenCalledTimes(2);
   });
 
   it('Trigger action via request POST with data is null', async () => {
     mock.onPost(API.DEVICE.TRIGGER_ACTION()).reply(200);
     await sendCommandOverInternet({}, {}, null);
-    expect(Toast.show).toBeCalledTimes(2);
+    expect(Toast.show).toHaveBeenCalledTimes(2);
   });
 
   it('Trigger action fail show error', async () => {
     mock.onPost(API.DEVICE.TRIGGER_ACTION()).reply(400);
     await sendCommandOverInternet({}, {}, 'internet');
-    expect(Toast.show).toBeCalled();
+    expect(Toast.show).toHaveBeenCalled();
   });
 });

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

@@ -1,22 +1,22 @@
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { Alert } from 'react-native';
-import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-import RNP from 'react-native-permissions';
 import RNAndroidLocationEnabler from 'react-native-android-location-enabler';
+import RNP from 'react-native-permissions';
+import { act, create } from 'react-test-renderer';
 
-import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
-import AddLocationMaps from '../index';
+import { useNavigation } from '@react-navigation/native';
+import { RESULTS } from 'react-native-permissions';
 import { API } from '../../../configs';
 import { AccessibilityLabel } from '../../../configs/Constants';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
 import {
   GEOLOCATION_ERROR,
   OpenSetting,
 } from '../../../utils/Permission/common';
-import { RESULTS } from 'react-native-permissions';
-import { useNavigation } from '@react-navigation/native';
+import AddLocationMaps from '../index';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -171,7 +171,7 @@ describe('Test SelectAddress', () => {
     });
     expect(
       RNAndroidLocationEnabler.promptForEnableLocationIfNeeded
-    ).toBeCalled();
+    ).toHaveBeenCalled();
 
     RNAndroidLocationEnabler.promptForEnableLocationIfNeeded.mockClear();
 
@@ -184,7 +184,7 @@ describe('Test SelectAddress', () => {
     });
     expect(
       RNAndroidLocationEnabler.promptForEnableLocationIfNeeded
-    ).toBeCalled();
+    ).toHaveBeenCalled();
   });
 
   it('test get current location failed location not enabled ios', async () => {
@@ -233,7 +233,7 @@ describe('Test SelectAddress', () => {
     await act(async () => {
       await button.props.onPress();
     });
-    expect(OpenSetting).toBeCalledTimes(0);
+    expect(OpenSetting).toHaveBeenCalledTimes(0);
     OpenSetting.mockClear();
   });
 
@@ -249,6 +249,6 @@ describe('Test SelectAddress', () => {
     await act(async () => {
       await button.props.onPress();
     });
-    expect(navigate).toBeCalled();
+    expect(navigate).toHaveBeenCalled();
   });
 });

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

@@ -1,17 +1,17 @@
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
 
-import AddNewGateway from '../index';
+import { useNavigation } from '@react-navigation/native';
+import { TextInput } from 'react-native';
+import { ViewButtonBottom } from '../../../commons';
 import GroupCheckBox from '../../../commons/GroupCheckBox';
 import { AccessibilityLabel } from '../../../configs/Constants';
-import { ViewButtonBottom } from '../../../commons';
-import { TextInput } from 'react-native';
-import { getTranslate } from '../../../utils/I18n';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
-import { useNavigation } from '@react-navigation/native';
+import { getTranslate } from '../../../utils/I18n';
+import AddNewGateway from '../index';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -147,6 +147,6 @@ describe('Test AddNewGateway', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(global.mockedNavigate).not.toBeCalled();
+    expect(global.mockedNavigate).not.toHaveBeenCalled();
   });
 });

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

@@ -1,17 +1,17 @@
+import NetInfo from '@react-native-community/netinfo';
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { Alert } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-import NetInfo from '@react-native-community/netinfo';
 
-import ConnectingWifiDevice from '../ConnectingWifiDevice';
+import { useNavigation } from '@react-navigation/native';
+import Processing from '../../../commons/Processing';
+import { API } from '../../../configs';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 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';
+import ConnectingWifiDevice from '../ConnectingWifiDevice';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -59,7 +59,7 @@ describe('Test connecting wifi device', () => {
     await act(async () => {
       jest.runAllTimers();
     });
-    expect(NetInfo.addEventListener).toBeCalled();
+    expect(NetInfo.addEventListener).toHaveBeenCalled();
   };
 
   it('onReady call api scan chip', async () => {
@@ -81,6 +81,6 @@ describe('Test connecting wifi device', () => {
     await act(async () => {
       Alert.alert.mock.calls[1][2][0].onPress();
     });
-    expect(goBack).toBeCalled();
+    expect(goBack).toHaveBeenCalled();
   });
 });

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

@@ -1,14 +1,14 @@
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
+import { Alert } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-import { getPusher } from '../../../utils/Pusher';
-import Routes from '../../../utils/Route';
-import ConnectingZigbeeDevice from '../ConnectingZigbeeDevice';
+import Processing from '../../../commons/Processing';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
-import Processing from '../../../commons/Processing';
-import { Alert } from 'react-native';
+import { getPusher } from '../../../utils/Pusher';
+import Routes from '../../../utils/Route';
+import ConnectingZigbeeDevice from '../ConnectingZigbeeDevice';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -61,7 +61,7 @@ describe('Test connecting modbus device', () => {
     await act(async () => {
       jest.runOnlyPendingTimers();
     });
-    expect(Alert.alert).toBeCalled();
+    expect(Alert.alert).toHaveBeenCalled();
   });
 
   it('receive sensor-id from channel then rename sensor-id', async () => {

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

@@ -1,18 +1,18 @@
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
 
-import RenameNewDevices from '../RenameNewDevices';
+import { useNavigation } from '@react-navigation/native';
+import _TextInput from '../../../commons/Form/TextInput';
+import Text from '../../../commons/Text';
+import AccessibilityLabel from '../../../configs/AccessibilityLabel';
+import API from '../../../configs/API';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
-import AccessibilityLabel from '../../../configs/AccessibilityLabel';
-import Text from '../../../commons/Text';
-import _TextInput from '../../../commons/Form/TextInput';
-import API from '../../../configs/API';
 import { CheckBoxCustom } from '../../Sharing/Components';
-import { useNavigation } from '@react-navigation/native';
+import RenameNewDevices from '../RenameNewDevices';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -61,7 +61,7 @@ describe('Test rename new devices', () => {
     }
   };
   const mockedDispatchNavigate = () => {
-    expect(global.mockedDispatch).toBeCalledWith({
+    expect(global.mockedDispatch).toHaveBeenCalledWith({
       payload: {
         index: 0,
         routes: [

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

@@ -1,14 +1,14 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 
-import ScanGatewayQR from '../ScanGatewayQR';
+import { useNavigation } from '@react-navigation/native';
+import { ViewButtonBottom } from '../../../commons';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import QRScan from '../../ScanChipQR/components/QRScan';
 import { getTranslate } from '../../../utils/I18n';
 import Routes from '../../../utils/Route';
-import { ViewButtonBottom } from '../../../commons';
-import { useNavigation } from '@react-navigation/native';
+import QRScan from '../../ScanChipQR/components/QRScan';
+import ScanGatewayQR from '../ScanGatewayQR';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -62,7 +62,7 @@ describe('test scan gateway device QR', () => {
     await act(async () => {
       await buttonBottom.props.onLeftClick();
     });
-    expect(goBack).toBeCalled();
+    expect(goBack).toHaveBeenCalled();
   });
 
   it('on scan correct QR code', async () => {

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

@@ -1,13 +1,13 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 
-import SelectDeviceUnit from '../SelectDeviceUnit';
+import { useNavigation } from '@react-navigation/native';
+import MockAdapter from 'axios-mock-adapter';
 import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { useNavigation } from '@react-navigation/native';
-import MockAdapter from 'axios-mock-adapter';
 import api from '../../../utils/Apis/axios';
+import SelectDeviceUnit from '../SelectDeviceUnit';
 
 new MockAdapter(api.axiosInstance);
 
@@ -41,6 +41,6 @@ describe('test single SelectUnit', () => {
     await act(async () => {
       goBack.props.onPress();
     });
-    expect(global.mockedNavigate).toBeCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
   });
 });