@eohjsc/react-native-smart-city 0.7.3-rc1 → 0.7.3-rc11

package/src/screens/Automate/OneTap/__test__/AddNewOneTap.test.js

@@ -1,16 +1,16 @@
-import React from 'react';
 import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
 import { Platform, TextInput, TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 
-import AddNewOneTap from '../index';
+import { useNavigation, useRoute } from '@react-navigation/native';
+import { API } from '../../../../configs';
 import { AccessibilityLabel } from '../../../../configs/Constants';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
-import Routes from '../../../../utils/Route';
 import api from '../../../../utils/Apis/axios';
-import { API } from '../../../../configs';
-import { useNavigation, useRoute } from '@react-navigation/native';
+import Routes from '../../../../utils/Route';
+import AddNewOneTap from '../index';
 
 const wrapComponent = (route) => {
   useRoute.mockReturnValue(route);
@@ -114,7 +114,7 @@ describe('test OneTap', () => {
     await act(async () => {
       await item[0].props.onPress();
     });
-    expect(global.mockedNavigate).not.toBeCalled();
+    expect(global.mockedNavigate).not.toHaveBeenCalled();
   });
 
   it('test onClose have automateId', async () => {
@@ -122,8 +122,13 @@ describe('test OneTap', () => {
     let route = {
       params: {
         closeScreen: Routes.ScriptDetail,
+        automate: {
+          unit: 1,
+        },
+        unitId: 1,
       },
     };
+
     mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(400);
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -136,6 +141,10 @@ describe('test OneTap', () => {
     await act(async () => {
       header.props.onPress();
     });
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
+      unitId: 1,
+      automate: { unit: 1 },
+      closeScreen: Routes.ScriptDetail,
+    });
   });
 });

package/src/screens/Automate/Scenario/__test__/AddNewOneTap.test.js

@@ -1,16 +1,16 @@
-import React from 'react';
 import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
 import { Platform, TextInput, TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 
-import ScenarioName from '../ScenarioName';
+import { useNavigation, useRoute } from '@react-navigation/native';
+import { API } from '../../../../configs';
 import { AccessibilityLabel } from '../../../../configs/Constants';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
-import Routes from '../../../../utils/Route';
 import api from '../../../../utils/Apis/axios';
-import { API } from '../../../../configs';
-import { useNavigation, useRoute } from '@react-navigation/native';
+import Routes from '../../../../utils/Route';
+import ScenarioName from '../ScenarioName';
 
 const wrapComponent = (route) => {
   useRoute.mockReturnValue(route);
@@ -103,7 +103,7 @@ describe('test OneTap', () => {
     await act(async () => {
       await item[0].props.onPress();
     });
-    expect(global.mockedNavigate).not.toBeCalled();
+    expect(global.mockedNavigate).not.toHaveBeenCalled();
   });
 
   it('test onClose have automateId', async () => {
@@ -111,6 +111,10 @@ describe('test OneTap', () => {
     let route = {
       params: {
         closeScreen: Routes.ScriptDetail,
+        automate: {
+          unit: 1,
+        },
+        unitId: 1,
       },
     };
     mock.onPost(API.AUTOMATE.CREATE_AUTOMATE()).reply(400);
@@ -125,6 +129,10 @@ describe('test OneTap', () => {
     await act(async () => {
       header.props.onPress();
     });
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
+      unitId: 1,
+      automate: { unit: 1 },
+      closeScreen: 'ScriptDetail',
+    });
   });
 });

package/src/screens/Automate/ScriptDetail/Components/RenameScript.js

@@ -14,14 +14,11 @@ const RenameScript = ({ automate, setAutomate, isVisible, setIsVisible }) => {
   const transY = useKeyboardAnimated();
 
   const renameScript = useCallback(async () => {
-    const { success, data: script } = await axiosPatch(
-      API.AUTOMATE.SCRIPT(automate.id),
-      {
-        name: inputName,
-      }
-    );
+    const { success } = await axiosPatch(API.AUTOMATE.SCRIPT(automate.id), {
+      name: inputName,
+    });
     if (success) {
-      setAutomate((prev) => ({ ...prev, name: script.name }));
+      setAutomate((prev) => ({ ...prev, name: inputName }));
       ToastBottomHelper.success(t('rename_successfully'));
     } else {
       ToastBottomHelper.error(t('rename_failed'));

package/src/screens/Automate/ScriptDetail/__test__/index.test.js

@@ -344,7 +344,7 @@ describe('Test ScriptDetail', () => {
     const instance = tree.root;
     const switchButton = instance.findByType(Switch);
     await act(async () => {
-      await switchButton.props.onChange(false);
+      await switchButton.props.onValueChange(false);
     });
     const buttonAddScript = instance.findAll(
       (el) =>

package/src/screens/Automate/ScriptDetail/__test__/useStarredScript.test.js

@@ -1,12 +1,12 @@
-import React from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
-import { SCProvider } from '../../../../context';
-import { mockSCStore } from '../../../../context/mockStore';
-import { useStarredScript } from '../hooks/useStarredScript';
 import MockAdapter from 'axios-mock-adapter';
-import api from '../../../../utils/Apis/axios';
+import React from 'react';
 import { API } from '../../../../configs';
+import { SCProvider } from '../../../../context';
 import { Action } from '../../../../context/actionType';
+import { mockSCStore } from '../../../../context/mockStore';
+import api from '../../../../utils/Apis/axios';
+import { useStarredScript } from '../hooks/useStarredScript';
 
 const mockedSetAction = jest.fn();
 const mock = new MockAdapter(api.axiosInstance);
@@ -42,6 +42,6 @@ describe('Test useStarredScript', () => {
     await act(async () => {
       await result.current.unstarScript();
     });
-    expect(mockedSetAction).toBeCalledWith(Action.UNSTAR_SCRIPTS, [2]);
+    expect(mockedSetAction).toHaveBeenCalledWith(Action.UNSTAR_SCRIPTS, [2]);
   });
 });

package/src/screens/Automate/ScriptDetail/index.js

@@ -5,35 +5,35 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import { Image, Platform, TouchableOpacity, View, Switch } from 'react-native';
+import { Image, Platform, Switch, TouchableOpacity, View } from 'react-native';
 import { PopoverMode } from 'react-native-popover-view';
 import AntDesign from 'react-native-vector-icons/AntDesign';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 
-import { useTranslations } from '../../../hooks/Common/useTranslations';
-import styles from './Styles/indexStyles';
-import Text from '../../../commons/Text';
-import WrapHeaderScrollable from '../../../commons/Sharing/WrapHeaderScrollable';
-import { API, Colors } from '../../../configs';
-import { usePopover } from '../../../hooks/Common';
-import { useStarredScript } from './hooks/useStarredScript';
-import MenuActionMore from '../../../commons/MenuActionMore';
+import { useIsFocused, useNavigation } from '@react-navigation/native';
 import Add from '../../../../assets/images/Add.svg';
-import Notify from '../../../../assets/images/Notify.svg';
 import Delay from '../../../../assets/images/Delay.svg';
-import { useIsFocused, useNavigation } from '@react-navigation/native';
-import { axiosGet, axiosPost } from '../../../utils/Apis/axios';
-import Routes from '../../../utils/Route';
-import { ToastBottomHelper } from '../../../utils/Utils';
+import Notify from '../../../../assets/images/Notify.svg';
 import ItemAutomate from '../../../commons/Automate/ItemAutomate';
+import IconComponent from '../../../commons/IconComponent';
+import MenuActionMore from '../../../commons/MenuActionMore';
+import WrapHeaderScrollable from '../../../commons/Sharing/WrapHeaderScrollable';
+import Text from '../../../commons/Text';
 import withPreventDoubleClick from '../../../commons/WithPreventDoubleClick';
+import { API, Colors } from '../../../configs';
 import { AccessibilityLabel, AUTOMATE_TYPE } from '../../../configs/Constants';
-import RenameScript from './Components/RenameScript';
-import DeleteScript from './Components/DeleteScript';
 import Images from '../../../configs/Images';
+import { usePopover } from '../../../hooks/Common';
+import { useTranslations } from '../../../hooks/Common/useTranslations';
+import { axiosGet, axiosPost } from '../../../utils/Apis/axios';
 import { useBackendPermission } from '../../../utils/Permission/backend';
-import IconComponent from '../../../commons/IconComponent';
+import Routes from '../../../utils/Route';
+import { ToastBottomHelper } from '../../../utils/Utils';
 import AddActionScript from './Components/AddActionScript';
+import DeleteScript from './Components/DeleteScript';
+import RenameScript from './Components/RenameScript';
+import { useStarredScript } from './hooks/useStarredScript';
+import styles from './Styles/indexStyles';
 
 const PreventDoubleTouch = withPreventDoubleClick(TouchableOpacity);
 
@@ -228,7 +228,7 @@ const ScriptDetail = ({ route }) => {
               <Text type="H3" semibold>
                 {t('enable_this_script')}
               </Text>
-              <Switch checked={enableScript} onChange={onChangeSwitch} />
+              <Switch value={enableScript} onValueChange={onChangeSwitch} />
             </View>
           )}
           <Text type="H3" semibold>

package/src/screens/Automate/SetSchedule/__test__/SelectWeekday.test.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import { create, act } from 'react-test-renderer';
+import { TouchableOpacity } from 'react-native';
+import { act, create } from 'react-test-renderer';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
-import { TouchableOpacity } from 'react-native';
 import SelectWeekday from '../components/SelectWeekday';
 
 const wrapComponent = (props) => (
@@ -28,7 +28,7 @@ it('test select', async () => {
   await act(async () => {
     await items[0].props.onPress();
   });
-  expect(mockSetWeekday).toBeCalledWith(['1']);
+  expect(mockSetWeekday).toHaveBeenCalledWith(['1']);
 
   mockSetWeekday.mockClear();
   props = {
@@ -44,5 +44,5 @@ it('test select', async () => {
   await act(async () => {
     await items[0].props.onPress();
   });
-  expect(mockSetWeekday).toBeCalledWith(['0', '1']);
+  expect(mockSetWeekday).toHaveBeenCalledWith(['0', '1']);
 });

package/src/screens/Automate/SetSchedule/__test__/index.test.js

@@ -1,34 +1,37 @@
+import { useNavigation, useRoute } from '@react-navigation/native';
+import moment from 'moment';
 import React from 'react';
 import { act, create } from 'react-test-renderer';
+import BottomButtonView from '../../../../commons/BottomButtonView';
+import Calendar from '../../../../commons/Calendar';
+import WheelDateTimePicker from '../../../../commons/WheelDateTimePicker';
+import AccessibilityLabel from '../../../../configs/AccessibilityLabel';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
-import SetSchedule from '../index';
-import RowItem from '../components/RowItem';
-import WheelDateTimePicker from '../../../../commons/WheelDateTimePicker';
+import Routes from '../../../../utils/Route';
 import RepeatOptionsPopup, {
   REPEAT_OPTIONS,
 } from '../components/RepeatOptionsPopup';
-import Calendar from '../../../../commons/Calendar';
-import BottomButtonView from '../../../../commons/BottomButtonView';
-import Routes from '../../../../utils/Route';
+import RowItem from '../components/RowItem';
 import SelectWeekday from '../components/SelectWeekday';
-import moment from 'moment';
-import { useNavigation } from '@react-navigation/native';
-import AccessibilityLabel from '../../../../configs/AccessibilityLabel';
+import SetSchedule from '../index';
 
-const wrapComponent = (route) => (
-  <SCProvider initState={mockSCStore({})}>
-    <SetSchedule route={route} />
-  </SCProvider>
-);
+const wrapComponent = (route) => {
+  useRoute.mockReturnValue(route);
+  return (
+    <SCProvider initState={mockSCStore({})}>
+      <SetSchedule route={route} />
+    </SCProvider>
+  );
+};
 
 describe('Test SetSchedule', () => {
   let tree;
   let route = {
     params: {
-      type: 'schedule',
-      unit: { id: 1 },
-      isAutomateTab: true,
+      automate: { type: 'schedule', unit: 1 },
+      unitId: 1,
+      closeScreen: 'UnitDetail',
     },
   };
 
@@ -70,7 +73,11 @@ describe('Test SetSchedule', () => {
     await act(async () => {
       await header.props.onPress();
     });
-    expect(global.mockedNavigate).toBeCalledWith(undefined);
+    expect(global.mockedNavigate).toHaveBeenCalledWith('UnitDetail', {
+      automate: { type: 'schedule', unit: 1 },
+      closeScreen: 'UnitDetail',
+      unitId: 1,
+    });
   });
 
   it('test repeat options popup', async () => {
@@ -137,7 +144,10 @@ describe('Test SetSchedule', () => {
         repeat: 'once',
         time_repeat: '12:00:00',
         weekday_repeat: [],
+        type: 'schedule',
+        unit: 1,
       },
+      closeScreen: 'UnitDetail',
     });
   });
 });

package/src/screens/Automate/SetSchedule/components/RowItem.js

@@ -1,9 +1,9 @@
+import { IconOutline } from '@ant-design/icons-react-native';
 import React from 'react';
-import { View, TouchableOpacity } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { TouchableOpacity, View } from 'react-native';
 import Text from '../../../../commons/Text';
-import styles from '../styles/RowItemStyles';
 import { Colors } from '../../../../configs';
+import styles from '../styles/RowItemStyles';
 
 const RowItem = ({ title, value, icon = null, arrow = false, onPress }) => {
   return (
@@ -17,8 +17,8 @@ const RowItem = ({ title, value, icon = null, arrow = false, onPress }) => {
         </Text>
       </View>
       <View style={[styles.itemRight, arrow && styles.center]}>
-        {arrow && <AntDesign name="right" color={Colors.Gray7} />}
-        {icon && <AntDesign name={icon} size={17} color={Colors.Black} />}
+        {arrow && <IconOutline name="right" color={Colors.Gray7} />}
+        {icon && <IconOutline name={icon} size={17} color={Colors.Black} />}
       </View>
     </TouchableOpacity>
   );

package/src/screens/Automate/SetSchedule/index.js

@@ -1,19 +1,19 @@
-import React, { memo, useCallback, useState } from 'react';
-import { ScrollView } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import moment from 'moment';
-import WheelDateTimePicker from '../../../commons/WheelDateTimePicker';
+import React, { memo, useCallback, useState } from 'react';
+import { ScrollView } from 'react-native';
 import Calendar from '../../../commons/Calendar';
+import WheelDateTimePicker from '../../../commons/WheelDateTimePicker';
+import { useBoolean } from '../../../hooks/Common';
+import { useTranslations } from '../../../hooks/Common/useTranslations';
+import Routes from '../../../utils/Route';
+import NewActionWrapper from '../AddNewAction/NewActionWrapper';
 import RepeatOptionsPopup, {
   REPEAT_OPTIONS,
 } from './components/RepeatOptionsPopup';
 import RowItem from './components/RowItem';
 import SelectWeekday from './components/SelectWeekday';
-import { useBoolean } from '../../../hooks/Common';
-import { useTranslations } from '../../../hooks/Common/useTranslations';
 import styles from './styles/indexStyles';
-import Routes from '../../../utils/Route';
-import NewActionWrapper from '../AddNewAction/NewActionWrapper';
 
 const SetSchedule = ({ route }) => {
   const t = useTranslations();

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

@@ -1,16 +1,16 @@
-import React from 'react';
-import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
 import { useRoute } from '@react-navigation/native';
+import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
 import DraggableFlatList from 'react-native-draggable-flatlist';
+import { act, create } from 'react-test-renderer';
 
 import ChangePosition from '../';
+import BottomButtonView from '../../../commons/BottomButtonView';
+import { API } from '../../../configs';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
 import { ToastBottomHelper } from '../../../utils/Utils';
-import BottomButtonView from '../../../commons/BottomButtonView';
 
 const mock = new MockAdapter(api.axiosInstance);
 const mockSetDisplay = jest.fn();
@@ -60,6 +60,6 @@ describe('Test ChangePosition', () => {
     expect(global.mockedGoBack).toHaveBeenCalled();
     expect(mockFetchData).toHaveBeenCalled();
     expect(mockSetDisplay).toHaveBeenCalled();
-    expect(spyToastSuccess).toBeCalledWith('Updated widget successfully');
+    expect(spyToastSuccess).toHaveBeenCalledWith('Updated widget successfully');
   });
 });

package/src/screens/ChangePosition/index.js

@@ -49,7 +49,8 @@ const ChangePosition = () => {
     }
   };
 
-  const renderItem = ({ item, index, drag, isActive }) => {
+  const renderItem = ({ item, getIndex, drag, isActive }) => {
+    const index = getIndex();
     return (
       <View style={styles.widgetItem}>
         <View style={[styles.itemOrder, isActive ? styles.isDragging : {}]}>

package/src/screens/Device/EditDevice/__test__/EditDevice.test.js

@@ -1,18 +1,18 @@
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { TouchableOpacity } from 'react-native';
-import { create, act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
+import { act, create } from 'react-test-renderer';
 
-import { SCProvider } from '../../../../context';
-import { mockSCStore } from '../../../../context/mockStore';
+import { useRoute } from '@react-navigation/native';
+import Toast from 'react-native-toast-message';
 import EditDevice from '..';
 import AlertAction from '../../../../commons/AlertAction';
 import _TextInput from '../../../../commons/Form/TextInput';
-import { AccessibilityLabel } from '../../../../configs/Constants';
 import { API } from '../../../../configs';
-import { useRoute } from '@react-navigation/native';
+import { AccessibilityLabel } from '../../../../configs/Constants';
+import { SCProvider } from '../../../../context';
+import { mockSCStore } from '../../../../context/mockStore';
 import api from '../../../../utils/Apis/axios';
-import Toast from 'react-native-toast-message';
 import { getTranslate } from '../../../../utils/I18n';
 
 const wrapComponent = (route) => (
@@ -96,7 +96,7 @@ describe('Test EditDevice', () => {
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(Toast.show).toBeCalledWith({
+    expect(Toast.show).toHaveBeenCalledWith({
       type: 'error',
       position: 'bottom',
       text1: getTranslate('en', 'rename_failed'),
@@ -148,7 +148,7 @@ describe('Test EditDevice', () => {
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(Toast.show).toBeCalledWith({
+    expect(Toast.show).toHaveBeenCalledWith({
       type: 'error',
       position: 'bottom',
       text1: getTranslate('en', 'remove_failed'),

package/src/screens/Device/__test__/detail.test.js

@@ -1,24 +1,24 @@
+import { NavigationContext, useNavigation } from '@react-navigation/native';
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { Alert, ScrollView } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-import { NavigationContext, useNavigation } from '@react-navigation/native';
 
-import DeviceDetail from '../detail';
-import { API } from '../../../configs';
+import AntDesign from 'react-native-vector-icons/AntDesign';
+import { AlertAction, ButtonPopup, MenuActionMore } from '../../../commons';
+import CurrentRainSensor from '../../../commons/Device/RainningSensor/CurrentRainSensor';
 import { AlertSendConfirm } from '../../../commons/EmergencyButton/AlertSendConfirm';
 import { AlertSent } from '../../../commons/EmergencyButton/AlertSent';
-import { AlertAction, ButtonPopup, MenuActionMore } from '../../../commons';
-import { AccessibilityLabel } from '../../../configs/Constants';
 import Text from '../../../commons/Text';
-import AntDesign from 'react-native-vector-icons/AntDesign';
-import CurrentRainSensor from '../../../commons/Device/RainningSensor/CurrentRainSensor';
-import { getTranslate } from '../../../utils/I18n';
+import { API } from '../../../configs';
+import { AccessibilityLabel } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import Routes from '../../../utils/Route';
-import api from '../../../utils/Apis/axios';
 import { useWatchConfigs } from '../../../hooks/IoT';
+import api from '../../../utils/Apis/axios';
+import { getTranslate } from '../../../utils/I18n';
+import Routes from '../../../utils/Route';
+import DeviceDetail from '../detail';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -755,7 +755,7 @@ describe('test DeviceDetail', () => {
     await act(async () => {
       await create(wrapComponent(store, account, route));
     });
-    expect(mockAlertShow).not.toBeCalled();
+    expect(mockAlertShow).not.toHaveBeenCalled();
   });
 
   it('Test fetchUnitDetail', async () => {

package/src/screens/Device/__test__/mqttDetail.test.js

@@ -1,22 +1,22 @@
+import { NavigationContext } from '@react-navigation/native';
+import MockAdapter from 'axios-mock-adapter';
+import mqtt from 'precompiled-mqtt/dist/mqtt.browser';
 import React from 'react';
 import { Alert } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-import mqtt from 'precompiled-mqtt/dist/mqtt.browser';
-import { NavigationContext } from '@react-navigation/native';
 
-import DeviceDetail from '../detail';
+import QualityIndicatorItem from '../../../commons/Device/WaterQualitySensor/QualityIndicatorsItem';
 import { API } from '../../../configs';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { watchMultiConfigs } from '../../../iot/Monitor';
+import { setConfigGlobalState } from '../../../iot/states';
 import api from '../../../utils/Apis/axios';
 import {
-  gatewayDataFactory,
   configDataFactory,
+  gatewayDataFactory,
 } from '../../../utils/FactoryGateway';
-import QualityIndicatorItem from '../../../commons/Device/WaterQualitySensor/QualityIndicatorsItem';
-import { watchMultiConfigs } from '../../../iot/Monitor';
-import { setConfigGlobalState } from '../../../iot/states';
+import DeviceDetail from '../detail';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -194,7 +194,7 @@ describe('test DeviceDetail', () => {
     await act(async () => {
       tree.unmount();
     });
-    expect(client.end).toBeCalled();
+    expect(client.end).toHaveBeenCalled();
   });
 
   const _receiveDataOnDeviceDetail = async (widgetConfigs, topic, message) => {

package/src/screens/Device/components/SensorDisplayItem.js

@@ -13,19 +13,19 @@ import ListQualityIndicator from '../../../commons/Device/WaterQualitySensor/Lis
 import Compass from '../../../commons/Device/WindDirection/Compass';
 import Anemometer from '../../../commons/Device/WindSpeed/Anemometer';
 import MediaPlayerDetail from '../../../commons/MediaPlayerDetail';
+import IFrame from '../../../commons/Widgets/IFrame/IFrame';
+import IFrameWithConfig from '../../../commons/Widgets/IFrameWithConfig/IFrameWithConfig';
+import { Device } from '../../../configs';
 import { AccessibilityLabel, WIDGET_TYPE } from '../../../configs/Constants';
 import { useSCContextSelector } from '../../../context';
 import { useRemoteControl } from '../../../hooks/IoT';
 import { useConfigGlobalState } from '../../../iot/states';
 import SmartIr from '../../../screens/SmartIr';
+import { standardizeCameraScreenSize } from '../../../utils/Utils';
 import { useEvaluateValue } from '../hooks/useEvaluateValue';
 import styles from '../styles';
-import VisualChart from './VisualChart';
-import { standardizeCameraScreenSize } from '../../../utils/Utils';
-import { Device } from '../../../configs';
 import DonutCharts from './DonutChart';
-import IFrame from '../../../commons/Widgets/IFrame/IFrame';
-import IFrameWithConfig from '../../../commons/Widgets/IFrameWithConfig/IFrameWithConfig';
+import VisualChart from './VisualChart';
 
 const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
   Device.screenWidth - 32

package/src/screens/Drawer/Drawer.test.js

@@ -1,10 +1,10 @@
+import { useNavigation } from '@react-navigation/native';
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import AccessibilityLabel from '../../configs/AccessibilityLabel';
 import { SCProvider } from '../../context';
 import { mockSCStore } from '../../context/mockStore';
 import Drawer, { Row } from './index';
-import { useNavigation } from '@react-navigation/native';
 
 const wrapComponent = (initState = mockSCStore({})) => (
   <SCProvider initState={initState}>
@@ -35,7 +35,7 @@ describe('Drawer', () => {
     await act(async () => {
       await rows[2].props.onPress();
     });
-    expect(dispatch).toBeCalledWith({
+    expect(dispatch).toHaveBeenCalledWith({
       payload: { index: 0, routes: [{ name: 'Main' }] },
       type: 'RESET',
     });

package/src/screens/EmergencyContacts/__test__/EmergencyContactsSelectContacts.test.js

@@ -1,16 +1,16 @@
-import React from 'react';
-import { act, create } from 'react-test-renderer';
 import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
 import Toast from 'react-native-toast-message';
+import { act, create } from 'react-test-renderer';
 
-import { EmergencyContactsSelectContacts } from '../EmergencyContactsSelectContacts';
+import { ViewButtonBottom } from '../../../commons';
+import { API } from '../../../configs';
 import { AccessibilityLabel } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { API } from '../../../configs';
-import { ViewButtonBottom } from '../../../commons';
 import api from '../../../utils/Apis/axios';
 import { getTranslate } from '../../../utils/I18n';
+import { EmergencyContactsSelectContacts } from '../EmergencyContactsSelectContacts';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -79,7 +79,7 @@ describe('test EmergencyContactsSelectContacts', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(Toast.show).toBeCalledWith({
+    expect(Toast.show).toHaveBeenCalledWith({
       type: 'success',
       position: 'bottom',
       text1: getTranslate('en', 'saving_contact_successful'),
@@ -98,7 +98,7 @@ describe('test EmergencyContactsSelectContacts', () => {
     await act(async () => {
       viewButtonBottom.props.onRightClick();
     });
-    expect(Toast.show).toBeCalledWith({
+    expect(Toast.show).toHaveBeenCalledWith({
       type: 'error',
       position: 'bottom',
       text1: getTranslate('en', 'create_contact_failed'),