@eohjsc/react-native-smart-city 0.7.3 → 0.7.5

package/src/navigations/UnitStack.js

@@ -1,78 +1,76 @@
-import React, { memo, useContext, useEffect } from 'react';
-import { AppState, View } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import { BleManager } from 'react-native-ble-plx';
+import { IconOutline } from '@ant-design/icons-react-native';
 import NetInfo from '@react-native-community/netinfo';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { get } from 'lodash';
+import React, { memo, useContext, useEffect } from 'react';
+import { AppState, View } from 'react-native';
 
 import Text from '../commons/Text';
+import { API, Colors, Device } from '../configs';
+import { SCContext } from '../context';
+import { Action } from '../context/actionType';
 import { useTranslations } from '../hooks/Common/useTranslations';
 import { unwatchAllConfigs } from '../iot/Monitor';
-import { API, Colors, Device } from '../configs';
-import Route from '../utils/Route';
 import ActivityLogScreen from '../screens/ActivityLog';
+import Route from '../utils/Route';
 import { screenOptions } from './utils';
-import { SCContext } from '../context';
-import { Action } from '../context/actionType';
 
+import { useBluetoothConnection } from '../hooks/IoT';
+import { realScanBluetoothDevices } from '../iot/RemoteControl/Bluetooth';
+import AllCamera from '../screens/AllCamera';
+import AllGateway from '../screens/AllGateway';
 import AQIGuide from '../screens/AQIGuide';
-import DeviceDetail from '../screens/Device/detail';
+import ChooseAction from '../screens/Automate/AddNewAction/ChooseAction';
+import ChooseConfig from '../screens/Automate/AddNewAction/ChooseConfig';
+import SelectControlDevices from '../screens/Automate/AddNewAction/SelectControlDevices';
+import SelectMonitorDevices from '../screens/Automate/AddNewAction/SelectMonitorDevices';
+import SetupConfigCondition from '../screens/Automate/AddNewAction/SetupConfigCondition';
+import SetupScriptDelay from '../screens/Automate/AddNewAction/SetupScriptDelay';
+import SetupScriptNotify from '../screens/Automate/AddNewAction/SetupScriptNotify';
+import AddAutomationTypeSmart from '../screens/Automate/AddNewAutoSmart/AddAutomationTypeSmart';
+import AddUnknownTypeSmart from '../screens/Automate/AddNewAutoSmart/AddUnknownTypeSmart';
+import EditActionsList from '../screens/Automate/EditActionsList';
+import UpdateActionScript from '../screens/Automate/EditActionsList/UpdateActionScript';
+import AddNewOneTap from '../screens/Automate/OneTap';
+import ScenarioName from '../screens/Automate/Scenario/ScenarioName';
+import ScriptDetail from '../screens/Automate/ScriptDetail';
+import SetSchedule from '../screens/Automate/SetSchedule';
+import ValueChangeName from '../screens/Automate/ValueChange/ValueChangeName';
 import ChangePosition from '../screens/ChangePosition';
+import ConfirmUnitDeletion from '../screens/ConfirmUnitDeletion';
+import DeviceDetail from '../screens/Device/detail';
+import EditDevice from '../screens/Device/EditDevice/index';
+import DeviceInfo from '../screens/DeviceInfo';
+import EmergencySetting from '../screens/EmergencySetting';
+import EnterPassword from '../screens/EnterPassword';
+import GuestInfo from '../screens/GuestInfo';
+import ManageAccessScreen from '../screens/ManageAccess';
+import MoveToAnotherSubUnit from '../screens/MoveToAnotherSubUnit';
+import PlaybackCamera from '../screens/PlayBackCamera';
+import SelectUnit from '../screens/SelectUnit';
+import InfoMemberUnit from '../screens/Sharing/InfoMemberUnit';
 import UnitMemberList from '../screens/Sharing/UnitMemberList';
+import SideMenuDetail from '../screens/SideMenuDetail';
+import EditSubUnit from '../screens/SubUnit/EditSubUnit';
 import ManageSubUnit from '../screens/SubUnit/ManageSubUnit';
-import SelectAddress from '../screens/Unit/SelectAddress';
+import TDSGuide from '../screens/TDSGuide';
 import ChooseLocation from '../screens/Unit/ChooseLocation';
+import UnitDetail from '../screens/Unit/Detail';
 import ManageUnit from '../screens/Unit/ManageUnit';
+import SelectAddress from '../screens/Unit/SelectAddress';
+import SelectAddToFavorites from '../screens/Unit/SelectAddToFavorites';
 import ListSmartAccount from '../screens/Unit/SmartAccount';
-import UnitDetail from '../screens/Unit/Detail';
 import UnitSummary from '../screens/UnitSummary';
 import UVIndexGuide from '../screens/UVIndexGuide';
-import TDSGuide from '../screens/TDSGuide';
 import WaterQualityGuide from '../screens/WaterQualityGuide';
-import DeviceInfo from '../screens/DeviceInfo';
-import AddNewOneTap from '../screens/Automate/OneTap';
-import AddUnknownTypeSmart from '../screens/Automate/AddNewAutoSmart/AddUnknownTypeSmart';
-import PlaybackCamera from '../screens/PlayBackCamera';
-import AllCamera from '../screens/AllCamera';
-import ManageAccessScreen from '../screens/ManageAccess';
-import MoveToAnotherSubUnit from '../screens/MoveToAnotherSubUnit';
-import GuestInfo from '../screens/GuestInfo';
-import ScriptDetail from '../screens/Automate/ScriptDetail';
-import EditActionsList from '../screens/Automate/EditActionsList';
-import SelectUnit from '../screens/SelectUnit';
-import SetSchedule from '../screens/Automate/SetSchedule';
-import SelectMonitorDevices from '../screens/Automate/AddNewAction/SelectMonitorDevices';
-import EditSubUnit from '../screens/SubUnit/EditSubUnit';
-import SetupConfigCondition from '../screens/Automate/AddNewAction/SetupConfigCondition';
-import EditDevice from '../screens/Device/EditDevice/index';
-import EmergencySetting from '../screens/EmergencySetting';
-import ConfirmUnitDeletion from '../screens/ConfirmUnitDeletion';
-import InfoMemberUnit from '../screens/Sharing/InfoMemberUnit';
-import EnterPassword from '../screens/EnterPassword';
-import AllGateway from '../screens/AllGateway';
-import SelectAddToFavorites from '../screens/Unit/SelectAddToFavorites';
-import { HanetCameraStack } from './HanetCameraStack';
 import { axiosGet, fetchWithCache } from '../utils/Apis/axios';
-import SideMenuDetail from '../screens/SideMenuDetail';
-import { styles } from './UnitStackStyles';
-import { useBluetoothConnection } from '../hooks/IoT';
-import { realScanBluetoothDevices } from '../iot/RemoteControl/Bluetooth';
 import { ToastBottomHelper } from '../utils/Utils';
-import ChooseConfig from '../screens/Automate/AddNewAction/ChooseConfig';
-import SelectControlDevices from '../screens/Automate/AddNewAction/SelectControlDevices';
-import ChooseAction from '../screens/Automate/AddNewAction/ChooseAction';
-import ScenarioName from '../screens/Automate/Scenario/ScenarioName';
-import ValueChangeName from '../screens/Automate/ValueChange/ValueChangeName';
-import AddAutomationTypeSmart from '../screens/Automate/AddNewAutoSmart/AddAutomationTypeSmart';
-import SetupScriptNotify from '../screens/Automate/AddNewAction/SetupScriptNotify';
-import SetupScriptDelay from '../screens/Automate/AddNewAction/SetupScriptDelay';
-import UpdateActionScript from '../screens/Automate/EditActionsList/UpdateActionScript';
+import { HanetCameraStack } from './HanetCameraStack';
+import { styles } from './UnitStackStyles';
+import { bleManager } from '../utils/bluetooth';
 
 const Stack = createNativeStackNavigator();
 
-const bleManager = new BleManager();
-
 export const UnitStack = memo((props) => {
   const t = useTranslations();
   const { setAction } = useContext(SCContext);
@@ -173,7 +171,7 @@ export const UnitStack = memo((props) => {
         ...screenOptions,
         headerTitleAlign: 'center',
         headerBackImage: () => (
-          <AntDesign
+          <IconOutline
             name="left"
             size={27}
             color={Colors.Black}
@@ -186,7 +184,8 @@ export const UnitStack = memo((props) => {
           borderBottomWidth: Device.isIOS === 'android' ? 1 : 0,
           borderColor: Colors.Gray4,
         },
-        headerBackTitle: true,
+        headerTintColor: Colors.Black,
+        headerBackTitleVisible: false,
       }}
     >
       <Stack.Screen
@@ -286,28 +285,28 @@ export const UnitStack = memo((props) => {
         name={Route.UVIndexGuide}
         component={UVIndexGuide}
         options={{
-          title: t('UV Index Guide'),
+          headerTitle: t('uv_index_guide'),
         }}
       />
       <Stack.Screen
         name={Route.TDSGuide}
         component={TDSGuide}
         options={{
-          title: t('tds_information'),
+          headerTitle: t('tds_information'),
         }}
       />
       <Stack.Screen
         name={Route.AQIGuide}
         component={AQIGuide}
         options={{
-          title: t('AQI Guide'),
+          headerTitle: t('aqi_guide'),
         }}
       />
       <Stack.Screen
         name={Route.WaterQualityGuide}
         component={WaterQualityGuide}
         options={{
-          title: t('water_quality_guide'),
+          headerTitle: t('water_quality_guide'),
         }}
       />
       <Stack.Screen

package/src/screens/AQIGuide/index.js

@@ -4,7 +4,6 @@ import { getBottomSpace } from 'react-native-iphone-x-helper';
 
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { Colors, Theme } from '../../configs';
-import useTitleHeader from '../../hooks/Common/useTitleHeader';
 import { AccessibilityLabel } from '../../configs/Constants';
 import Text from '../../commons/Text';
 import SvgSmile from '../../../assets/images/Feeling/smile.svg';
@@ -16,7 +15,6 @@ import { useSCContextSelector } from '../../context';
 
 const AQIGuide = memo(() => {
   const t = useTranslations();
-  useTitleHeader(t('AQI Guide'));
   const language = useSCContextSelector((state) => state.language);
   const data = useMemo(
     () => ({

package/src/screens/ActivityLog/index.js

@@ -7,7 +7,7 @@ import {
   TouchableOpacity,
 } from 'react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { Colors } from '../../configs';
 import { HeaderCustom } from '../../commons/Header';
 import ItemLog from './ItemLog';
@@ -83,7 +83,7 @@ const ActivityLogScreen = ({ route }) => {
         onPress={setShowFilterPopup}
         accessibilityLabel={AccessibilityLabel.FILTER_BUTTON}
       >
-        <AntDesign name={'filter'} size={27} color={Colors.Black} />
+        <IconOutline name={'filter'} size={27} color={Colors.Black} />
       </TouchableOpacity>
     ),
     [setShowFilterPopup]

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/AddLocationMaps/index.js

@@ -1,32 +1,32 @@
-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 { IconOutline } from '@ant-design/icons-react-native';
 import { useNavigation } from '@react-navigation/native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
-import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
+import React, { memo, useCallback, useEffect, useRef, useState } from 'react';
+import { ScrollView, TouchableOpacity, View } from 'react-native';
+import MapView, { Circle, Marker, PROVIDER_GOOGLE } from 'react-native-maps';
 import { check, RESULTS } from 'react-native-permissions';
+import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
-import Text from '../../commons/Text';
 import { FullLoading } from '../../commons';
+import BottomButtonView from '../../commons/BottomButtonView';
 import SearchBarLocation from '../../commons/SearchLocation';
 import RowLocation from '../../commons/SearchLocation/RowLocation';
-import { axiosGet } from '../../utils/Apis/axios';
+import Text from '../../commons/Text';
 import { API, Colors, SCConfig } from '../../configs';
 import {
   AccessibilityLabel,
-  MAP_INITIAL_REGION,
   EOH_LOCATION,
+  MAP_INITIAL_REGION,
 } from '../../configs/Constants';
-import styles from './indexStyle';
-import Routes from '../../utils/Route';
+import { axiosGet } from '../../utils/Apis/axios';
 import {
   GEOLOCATION_ERROR,
   keyPermission,
   OpenSetting,
 } from '../../utils/Permission/common';
+import Routes from '../../utils/Route';
 import { openPromptEnableLocation } from '../../utils/Setting/Location';
-import BottomButtonView from '../../commons/BottomButtonView';
+import styles from './indexStyle';
 
 navigator.geolocation = require('@react-native-community/geolocation');
 
@@ -180,12 +180,9 @@ const AddLocationMaps = memo(() => {
   return (
     <View style={styles.container}>
       <Text color={Colors.Gray9} size={24} semibold style={styles.textHeader}>
-        {t('geolocation')}
+        {t('location')}
       </Text>
       <View style={styles.content}>
-        <Text color={Colors.Gray8} size={12} style={styles.textExplain}>
-          {t('text_explain_add_geolocation')}
-        </Text>
         <View style={styles.searchLocation}>
           <SearchBarLocation
             input={input?.description || input}
@@ -225,8 +222,8 @@ const AddLocationMaps = memo(() => {
                   style={styles.button}
                   accessibilityLabel={AccessibilityLabel.BUTTON_CHOOSE_ON_MAP}
                 >
-                  <AntDesign
-                    name="enviroment"
+                  <IconOutline
+                    name="environment"
                     size={27}
                     color={Colors.Primary}
                   />
@@ -274,8 +271,8 @@ const AddLocationMaps = memo(() => {
                   }}
                   tracksViewChanges={false}
                 >
-                  <AntDesign
-                    name="enviroment"
+                  <IconOutline
+                    name="environment"
                     size={27}
                     color={Colors.Blue10}
                   />

package/src/screens/AddLocationMaps/indexStyle.js

@@ -10,6 +10,7 @@ export default StyleSheet.create({
     paddingTop: getStatusBarHeight() + 16,
   },
   textHeader: {
+    textAlign: 'center',
     marginHorizontal: 16,
   },
   content: {

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 AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 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}>
-          <AntDesign name="check-circle" size={28} color={Colors.Green6} />
+          <IconOutline name="check-circle" size={28} color={Colors.Green6} />
           <Text
             semibold
             color={Colors.Black}

package/src/screens/AddNewGateway/SelectDeviceType.js

@@ -192,7 +192,7 @@ const SelectDeviceType = ({ route }) => {
   useEffect(() => {
     const fetchCountSummary = async () => {
       const { success, data } = await axiosGet(API.DEV_MODE.GATEWAY.COUNT(), {
-        unit: unit?.id,
+        params: { unit: unit?.id },
       });
       if (success) {
         setUnitCountSummary(data);

package/src/screens/AddNewGateway/ShareWifiPassword.js

@@ -1,37 +1,37 @@
+import NetInfo from '@react-native-community/netinfo';
+import { useIsFocused, useNavigation } from '@react-navigation/native';
+import LottieView from 'lottie-react-native';
 import React, {
   useCallback,
-  useRef,
-  useState,
   useEffect,
   useMemo,
+  useRef,
+  useState,
 } from 'react';
 import {
   Alert,
-  TouchableOpacity,
-  View,
   FlatList,
   Platform,
+  TouchableOpacity,
+  View,
 } from 'react-native';
 import dgram from 'react-native-udp';
-import { useNavigation, useIsFocused } from '@react-navigation/native';
-import LottieView from 'lottie-react-native';
 import { v4 as uuidv4 } from 'uuid';
-import NetInfo from '@react-native-community/netinfo';
 
-import { ToastBottomHelper } from '../../utils/Utils';
-import { useTranslations } from '../../hooks/Common/useTranslations';
-import { HeaderCustom } from '../../commons/Header';
-import Text from '../../commons/Text';
 import WifiIcon from '../../../assets/images/wifi.svg';
 import ButtonPopup from '../../commons/ButtonPopup';
-import AccessibilityLabel from '../../configs/AccessibilityLabel';
-import { Colors } from '../../configs';
 import TextInputPassword from '../../commons/Form/TextInputPassword';
-import styles from './ShareWifiPasswordStyles';
-import Routes from '../../utils/Route';
 import FullLoading from '../../commons/FullLoading';
+import { HeaderCustom } from '../../commons/Header';
+import Text from '../../commons/Text';
+import { Colors } from '../../configs';
+import AccessibilityLabel from '../../configs/AccessibilityLabel';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 import LoadingCircle from '../../Images/Common/loading-circle.json';
+import Routes from '../../utils/Route';
+import { ToastBottomHelper } from '../../utils/Utils';
 import { useWifiManage } from './hooks/useWifiManage';
+import styles from './ShareWifiPasswordStyles';
 
 let socket;
 let wifiOrGatewaySSID;
@@ -112,6 +112,7 @@ const ShareWifiPassword = ({ route }) => {
           '192.168.27.1',
           undefined
         );
+
         if (i > 0) {
           shareWifiToDevice(socket, i);
           clearTimeout(timeoutSendConnect);

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();
   });
 });