@eohjsc/react-native-smart-city 0.7.3-rc6 → 0.7.3-rc8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.7.3-rc6",
+  "version": "0.7.3-rc8",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -148,7 +148,7 @@
     "react-native-dash": "^0.0.11",
     "react-native-deep-linking": "^2.2.0",
     "react-native-device-info": "^10.3.0",
-    "react-native-draggable-flatlist": "^2.6.2",
+    "react-native-draggable-flatlist": "^4.0.1",
     "react-native-fast-image": "^8.6.3",
     "react-native-geocoder": "^0.5.0",
     "react-native-gesture-handler": "^2.17.1",
@@ -159,7 +159,7 @@
     "react-native-iphone-x-helper": "^1.2.1",
     "react-native-linear-gradient": "^2.5.6",
     "react-native-localize": "^1.4.1",
-    "react-native-maps": "^1.17.3",
+    "react-native-maps": "1.17.3",
     "react-native-modal": "^13.0.1",
     "react-native-modal-datetime-picker": "^17.1.0",
     "react-native-new-snap-carousel": "^3.9.3",

package/src/commons/Action/__test__/ItemQuickAction.test.js

@@ -1,13 +1,13 @@
+import { factory } from 'factory-girl';
 import React from 'react';
 import { TouchableOpacity } from 'react-native';
+import Toast from 'react-native-toast-message';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import { act, create } from 'react-test-renderer';
-import ItemQuickAction from '../ItemQuickAction';
 import { Colors } from '../../../configs';
 import { AccessibilityLabel } from '../../../configs/Constants';
-import { factory } from 'factory-girl';
 import IconComponent from '../../IconComponent';
-import Toast from 'react-native-toast-message';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import ItemQuickAction from '../ItemQuickAction';
 class Sensor {}
 
 factory.define('Sensor', Sensor, {});
@@ -256,7 +256,7 @@ describe('Test ItemQuickAction', () => {
     await act(async () => {
       await buttonOnActionPress.props.onPress();
     });
-    expect(Toast.show).not.toBeCalled();
+    expect(Toast.show).not.toHaveBeenCalled();
   });
   it('test config value 0 on_state_values 0', async () => {
     sensor.quick_action.on_state_values = [0];

package/src/commons/ActionGroup/OnOffSmartLock/PasscodeList/__test__/index.test.js

@@ -1,13 +1,13 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
 
-import { mockSCStore } from '../../../../../context/mockStore';
+import { useNavigation } from '@react-navigation/native';
+import { TouchableOpacity } from 'react-native';
 import { AccessibilityLabel } from '../../../../../configs/Constants';
 import { SCProvider } from '../../../../../context';
-import PasscodeList from '../index';
-import { TouchableOpacity } from 'react-native';
+import { mockSCStore } from '../../../../../context/mockStore';
 import Routes from '../../../../../utils/Route';
-import { useNavigation } from '@react-navigation/native';
+import PasscodeList from '../index';
 
 const wrapComponent = () => (
   <SCProvider initState={mockSCStore({})}>
@@ -41,7 +41,7 @@ describe('Test SetupGeneratePasscode', () => {
     await act(async () => {
       await passcode_list[0].props.onPress();
     });
-    expect(global.mockedNavigate).toBeCalledWith(Routes.SmartLockStack, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.SmartLockStack, {
       screen: Routes.ItemPasscode,
       params: {
         item: { code: 123361, name: 'Do Loi' },

package/src/commons/ActionGroup/ThreeButtonTemplate/__test__/ThreeButtonCircle.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import renderer, { act } from 'react-test-renderer';
 import { TouchableOpacity } from 'react-native';
+import renderer, { act } from 'react-test-renderer';
 
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
@@ -47,6 +47,6 @@ describe('Test ThreeButtonCircle', () => {
     await act(async () => {
       touchableOpacities[0].props.onPress();
     });
-    expect(mockOnButton1Press).toBeCalled();
+    expect(mockOnButton1Press).toHaveBeenCalled();
   });
 });

package/src/commons/ActionGroup/ThreeButtonTemplate/__test__/ThreeButtonDefault.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import renderer, { act } from 'react-test-renderer';
 import { TouchableOpacity } from 'react-native';
+import renderer, { act } from 'react-test-renderer';
 
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
@@ -47,6 +47,6 @@ describe('Test ThreeButtonDefault', () => {
     await act(async () => {
       touchableOpacities[0].props.onPress();
     });
-    expect(mockOnButton1Press).toBeCalled();
+    expect(mockOnButton1Press).toHaveBeenCalled();
   });
 });

package/src/commons/ActionGroup/__test__/ColorPickerTemplate.test.js

@@ -1,13 +1,12 @@
-import { watchMultiConfigs } from '../../../iot/Monitor';
 import React, { useContext } from 'react';
+import ColorPicker from 'react-native-wheel-color-picker';
 import { act, create } from 'react-test-renderer';
-import ColorPickerTemplate from '../ColorPickerTemplate';
-import { WheelColorPicker } from '../ColorPickerTemplate';
+import { DEVICE_TYPE } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { watchMultiConfigs } from '../../../iot/Monitor';
 import { useConfigGlobalState } from '../../../iot/states';
-import ColorPicker from 'react-native-wheel-color-picker';
-import { DEVICE_TYPE } from '../../../configs/Constants';
+import ColorPickerTemplate, { WheelColorPicker } from '../ColorPickerTemplate';
 
 const mockSetAction = jest.fn();
 
@@ -106,7 +105,7 @@ describe('Test ColorPickerTemplate', () => {
     await act(async () => {
       await wheelpicker.props.onStart();
     });
-    expect(mockSetAction).toBeCalled();
+    expect(mockSetAction).toHaveBeenCalled();
   });
 
   it('test WheelColorPicker onChangeColorComplete', async () => {
@@ -123,13 +122,13 @@ describe('Test ColorPickerTemplate', () => {
     await act(async () => {
       await wheelpicker.props.onStart();
     });
-    expect(mockSetAction).toBeCalledTimes(1);
-    expect(mockDoAction).toBeCalledTimes(0);
+    expect(mockSetAction).toHaveBeenCalledTimes(1);
+    expect(mockDoAction).toHaveBeenCalledTimes(0);
 
     await act(async () => {
       await wheelpicker.props.onChangeColorComplete('#ffffff');
     });
-    expect(mockSetAction).toBeCalledTimes(2);
-    expect(mockDoAction).toBeCalledTimes(1);
+    expect(mockSetAction).toHaveBeenCalledTimes(2);
+    expect(mockDoAction).toHaveBeenCalledTimes(1);
   });
 });

package/src/commons/ActionGroup/__test__/OnOffSmartLock.test.js

@@ -1,11 +1,11 @@
-import { AccessibilityLabel } from '../../../configs/Constants';
-import { watchMultiConfigs } from '../../../iot/Monitor';
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import OnOffSmartLock from '../OnOffSmartLock/OnOffSmartLock';
+import { AccessibilityLabel } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { watchMultiConfigs } from '../../../iot/Monitor';
 import { useConfigGlobalState } from '../../../iot/states';
+import OnOffSmartLock from '../OnOffSmartLock/OnOffSmartLock';
 
 jest.mock('../../../iot/Monitor');
 const mockDoAction = jest.fn();
@@ -76,7 +76,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await button.props.onPress();
     });
-    expect(mockDoAction).toBeCalledWith(actionOnData, '{"door_lock":0}');
+    expect(mockDoAction).toHaveBeenCalledWith(actionOnData, '{"door_lock":0}');
   });
 
   it('render with template OnOffSmartLockActionTemplate doAction unlock', async () => {
@@ -96,6 +96,6 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await button.props.onPress();
     });
-    expect(mockDoAction).toBeCalledWith(actionOffData, '{"door_lock":1}');
+    expect(mockDoAction).toHaveBeenCalledWith(actionOffData, '{"door_lock":1}');
   });
 });

package/src/commons/ActionGroup/__test__/OnOffTemplate.test.js

@@ -2,12 +2,12 @@ import React from 'react';
 import { act, create } from 'react-test-renderer';
 
 import { DEVICE_TYPE } from '../../../configs/Constants';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
 import { watchMultiConfigs } from '../../../iot/Monitor';
 import OnOffTemplate from '../OnOffTemplate';
 import OnOffButtonTemplate from '../OnOffTemplate/OnOffButtonTemplate';
 import OnOffSimpleTemplate from '../OnOffTemplate/OnOffSimpleTemplate';
-import { mockSCStore } from '../../../context/mockStore';
-import { SCProvider } from '../../../context';
 
 const wrapComponent = (item, mockDoAction, sensor) => (
   <SCProvider initState={mockSCStore({})}>
@@ -118,7 +118,7 @@ describe('Test OnOffTemplate', () => {
     const instance = tree.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
     expect(template).toHaveLength(1);
-    expect(watchMultiConfigs).toBeCalledTimes(0);
+    expect(watchMultiConfigs).toHaveBeenCalledTimes(0);
   });
 
   it('template OnOffSimpleActionTemplate doAction with is_on_value, match configValue', async () => {
@@ -135,7 +135,7 @@ describe('Test OnOffTemplate', () => {
       await template.props.triggerAction();
     });
     expect(mockDoAction).toHaveBeenCalledWith(actionOffData, undefined, false);
-    expect(watchMultiConfigs).toBeCalledTimes(0);
+    expect(watchMultiConfigs).toHaveBeenCalledTimes(0);
   });
 
   it('template OnOffSimpleActionTemplate doAction with is_on_value, not match configValue', async () => {
@@ -167,7 +167,7 @@ describe('Test OnOffTemplate', () => {
       await template.props.triggerAction();
     });
     expect(mockDoAction).toHaveBeenCalledWith(actionOffData, undefined, false);
-    expect(watchMultiConfigs).toBeCalledTimes(0);
+    expect(watchMultiConfigs).toHaveBeenCalledTimes(0);
   });
 
   it('render with template OnOffSimpleActionTemplate with just action_data', async () => {

package/src/commons/ActionGroup/__test__/OptionsDropdownTemplate.test.js

@@ -1,17 +1,17 @@
-import OptionsDropdownActionTemplate from '../../../commons/ActionGroup/OptionsDropdownActionTemplate';
 import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import Text from '../../../commons/Text';
-import { watchMultiConfigs } from '../../../iot/Monitor';
 import { AlertAction, RadioCircle } from '../../../commons';
-import { DEVICE_TYPE, AccessibilityLabel } from '../../../configs/Constants';
-import { getTranslate } from '../../../utils/I18n';
+import OptionsDropdownActionTemplate from '../../../commons/ActionGroup/OptionsDropdownActionTemplate';
+import Text from '../../../commons/Text';
+import { AccessibilityLabel, DEVICE_TYPE } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { watchMultiConfigs } from '../../../iot/Monitor';
+import { getTranslate } from '../../../utils/I18n';
 
-import SvgDoorState from '../../../../assets/images/Device/door-state.svg';
 import SvgCurrentState from '../../../../assets/images/Device/current-state.svg';
+import SvgDoorState from '../../../../assets/images/Device/door-state.svg';
 import SvgWindStrength from '../../../../assets/images/Device/wind-strength.svg';
 
 const wrapComponent = (item, mockDoAction, sensor) => (
@@ -190,8 +190,8 @@ describe('Test OptionsDropdownActionTemplate', () => {
       value: 1,
     });
     is_managed_by_backend
-      ? expect(watchMultiConfigs).not.toBeCalled()
-      : expect(watchMultiConfigs).not.toBeCalled();
+      ? expect(watchMultiConfigs).not.toHaveBeenCalled()
+      : expect(watchMultiConfigs).not.toHaveBeenCalled();
 
     expect(texts[1].props.children).toEqual('Level2'); // TODO: should be Level1, configValues make change again
   };

package/src/commons/ActionGroup/__test__/StatesGridActionTemplate.test.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
+import { DEVICE_TYPE } from '../../../configs/Constants';
 import Text from '../../Text';
 import StatesGridActionTemplate from '../StatesGridActionTemplate';
-import { DEVICE_TYPE } from '../../../configs/Constants';
 
 const mockDoAction = jest.fn();
 const mockActionData = jest.fn();
@@ -74,7 +74,7 @@ describe('Test StatesGridActionTemplate', () => {
     await act(async () => {
       await touchableOpacities[0].props.onPress();
     });
-    expect(mockDoAction).toBeCalledWith(mockActionData, null);
+    expect(mockDoAction).toHaveBeenCalledWith(mockActionData, null);
   });
 
   it('test trigger special action', async () => {
@@ -96,7 +96,7 @@ describe('Test StatesGridActionTemplate', () => {
     await act(async () => {
       await touchableOpacities[0].props.onPress();
     });
-    expect(mockDoAction).toBeCalledWith(
+    expect(mockDoAction).toHaveBeenCalledWith(
       mockActionData,
       JSON.stringify({ config_id: 1, config_value: undefined })
     );

package/src/commons/ActionGroup/__test__/TimerActionTemplate.test.js

@@ -1,15 +1,15 @@
 import React from 'react';
 import { Switch, TouchableOpacity } from 'react-native';
-import { act, create } from 'react-test-renderer';
-import TimerActionTemplate from '../TimerActionTemplate';
 import DateTimePickerModal from 'react-native-modal-datetime-picker';
 import ScrollPicker from 'react-native-wheel-scrollview-picker';
+import { act, create } from 'react-test-renderer';
+import TimerActionTemplate from '../TimerActionTemplate';
 
 import moment from 'moment';
-import Text from '../../Text';
-import { watchMultiConfigs } from '../../../iot/Monitor';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { watchMultiConfigs } from '../../../iot/Monitor';
+import Text from '../../Text';
 
 jest.mock('../../../iot/Monitor');
 
@@ -81,7 +81,7 @@ describe('Test TimerActionTemplate success with config value', () => {
     await act(async () => {
       await switchButton.props.onValueChange();
     });
-    expect(mockDoAction).toBeCalled();
+    expect(mockDoAction).toHaveBeenCalled();
 
     const touchableOpacities = instance.findAllByType(TouchableOpacity);
     await act(async () => {
@@ -128,6 +128,6 @@ describe('Test TimerActionTemplate success with config value', () => {
     await act(async () => {
       await touchableOpacities[2].props.onPress(3);
     });
-    expect(mockDoAction).toBeCalled();
+    expect(mockDoAction).toHaveBeenCalled();
   });
 });

package/src/commons/ActionGroup/__test__/TwoButtonTemplate.test.js

@@ -123,7 +123,7 @@ describe('Test TwoButtonTemplate', () => {
     expect(touchableOpacities.length).toEqual(2);
     await touchableOpacities[0].props.onPress();
     await touchableOpacities[1].props.onPress();
-    expect(mockDoAction).toBeCalled();
+    expect(mockDoAction).toHaveBeenCalled();
   });
 
   it('render TouchableOpacity TwoButtonTemplate without is_on_value', async () => {

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

@@ -1,14 +1,14 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 
+import Modal from 'react-native-modal';
 import ActionTemplate from '..';
+import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import SelectActionCard from '../../SelectActionCard';
-import Modal from 'react-native-modal';
-import ThreeButtonAction from '../ThreeButtonAction';
-import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 import Text from '../../Text';
+import ThreeButtonAction from '../ThreeButtonAction';
 import { showAllCards } from './utils';
 
 const mockOnSelectAction = jest.fn();
@@ -81,7 +81,7 @@ describe('Test ActionTemplate', () => {
         template: 'three_button_action_template',
       });
     });
-    expect(mockOnSelectAction).toBeCalledWith({
+    expect(mockOnSelectAction).toHaveBeenCalledWith({
       action: '94ae262d-46e3-42ff-9d10-516831ecc830',
       action_name: 'OPEN',
       data: null,

package/src/commons/Automate/__test__/ItemAutomate.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { act, create } 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';
@@ -41,6 +41,6 @@ describe('Test ItemAutomate', () => {
     await act(async () => {
       touchableOpacities[0].props.onPress();
     });
-    expect(mockOnPress).toBeCalledTimes(1);
+    expect(mockOnPress).toHaveBeenCalledTimes(1);
   });
 });

package/src/commons/ChartAggregationOption/__test__/FourButtonFilterHistory.test.js

@@ -1,9 +1,9 @@
 import React from 'react';
+import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ChartAggregationOption from '../index';
-import { TouchableOpacity } from 'react-native';
 
 const wrapComponent = (props) => (
   <SCProvider initState={mockSCStore({})}>
@@ -31,7 +31,7 @@ it('test', async () => {
     await act(async () => {
       await buttons[index].props.onPress();
     });
-    expect(mockSetGroupBy).toBeCalledWith(data);
+    expect(mockSetGroupBy).toHaveBeenCalledWith(data);
   };
 
   await clickButton(0, 'date');

package/src/commons/Dashboard/MyPinnedSharedUnit/__test__/MyPinnedSharedUnit.test.js

@@ -1,18 +1,17 @@
+import MockAdapter from 'axios-mock-adapter';
 import React, { useContext } from 'react';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
 
-import MyPinnedSharedUnit from '../index';
-import { Text } from 'react-native';
-import { getTranslate } from '../../../../utils/I18n';
+import { Text, TouchableOpacity } from 'react-native';
+import { API } from '../../../../configs';
+import { AccessibilityLabel } from '../../../../configs/Constants';
 import { SCProvider } from '../../../../context';
+import { Action } from '../../../../context/actionType';
 import { mockSCStore } from '../../../../context/mockStore';
-import { AccessibilityLabel } from '../../../../configs/Constants';
-import { API } from '../../../../configs';
-import { TouchableOpacity } from 'react-native';
 import api from '../../../../utils/Apis/axios';
+import { getTranslate } from '../../../../utils/I18n';
 import SharedUnit from '../../../Unit/SharedUnit';
-import { Action } from '../../../../context/actionType';
+import MyPinnedSharedUnit from '../index';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -61,7 +60,7 @@ describe('Test MyPinnedSharedUnit', () => {
       goToAllSharedUnits.props.onPress();
     });
     expect(global.mockedNavigate).toHaveBeenCalled();
-    expect(mockSetAction).toBeCalledWith(
+    expect(mockSetAction).toHaveBeenCalledWith(
       Action.IS_CHECK_CLEAR_CACHE_UNITS,
       false
     );

package/src/commons/Dashboard/MyUnit/__test__/MyUnit.test.js

@@ -1,17 +1,17 @@
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
 
+import FastImage from 'react-native-fast-image';
 import MyUnit from '..';
-import MyUnitDevice from '../../../../screens/Unit/components/MyUnitDevice';
+import { API } from '../../../../configs';
 import { AccessibilityLabel } from '../../../../configs/Constants';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
+import { flushPromises } from '../../../../screens/AllGateway/test-utils';
+import MyUnitDevice from '../../../../screens/Unit/components/MyUnitDevice';
 import api from '../../../../utils/Apis/axios';
-import { API } from '../../../../configs';
 import Routes from '../../../../utils/Route';
-import { flushPromises } from '../../../../screens/AllGateway/test-utils';
-import FastImage from 'react-native-fast-image';
 import { removeMultiple, STORAGE_KEY } from '../../../../utils/Storage';
 
 const mock = new MockAdapter(api.axiosInstance);
@@ -103,7 +103,7 @@ describe('Test MyUnit', () => {
     await act(async () => {
       await button.props.onPress(data[0]);
     });
-    expect(global.mockedNavigate).toBeCalledWith(Routes.UnitStack, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
       params: { unitId: 1 },
       screen: Routes.UnitDetail,
     });
@@ -123,7 +123,7 @@ describe('Test MyUnit', () => {
     await act(async () => {
       await button.props.onPress(data[1]);
     });
-    expect(global.mockedNavigate).toBeCalledWith('UnitStack', {
+    expect(global.mockedNavigate).toHaveBeenCalledWith('UnitStack', {
       params: { unitId: 2 },
       screen: 'UnitDetail',
     });

package/src/commons/Device/Emergency/__test__/EmergencyButton.test.js

@@ -43,6 +43,6 @@ describe('Test EmergencyButton', () => {
       emergencyButton.props.onLongPress();
     });
 
-    expect(mockFunction).toBeCalled();
+    expect(mockFunction).toHaveBeenCalled();
   });
 });

package/src/commons/Device/Hanet/ItemHanetDevice.test.js

@@ -1,10 +1,10 @@
+import { useNavigation } from '@react-navigation/native';
 import React from 'react';
 import { TouchableWithoutFeedback } from 'react-native';
 import renderer, { act } from 'react-test-renderer';
-import ItemHanetDevice from './ItemHanetDevice';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { useNavigation } from '@react-navigation/native';
+import ItemHanetDevice from './ItemHanetDevice';
 
 const wrapComponent = (props) => (
   <SCProvider initState={mockSCStore({})}>
@@ -35,7 +35,7 @@ describe('Test ItemHanetDevice', () => {
     await act(async () => {
       tree = touches[0].props.onPress();
     });
-    expect(navigate).toBeCalled();
+    expect(navigate).toHaveBeenCalled();
   });
 
   it('render ItemHanetDevice sensor has icon', async () => {

package/src/commons/FieldTemplate/PasscodeField/__test__/index.test.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
 import { AccessibilityLabel } from '../../../../configs/Constants';
-import { mockSCStore } from '../../../../context/mockStore';
 import { SCProvider } from '../../../../context';
+import { mockSCStore } from '../../../../context/mockStore';
 import PasscodeField from '../index';
 
 const mockSetDataForm = jest.fn();
@@ -59,7 +59,7 @@ describe('Test PasscodeField', () => {
     await act(async () => {
       await inputPasscode.props.onChangeText('123');
     });
-    expect(mockSetDataForm).toBeCalledWith([
+    expect(mockSetDataForm).toHaveBeenCalledWith([
       {
         key: 'passcode',
         type: 'passcode',
@@ -74,7 +74,7 @@ describe('Test PasscodeField', () => {
     await act(async () => {
       await inputPasscode.props.onChangeText('123456');
     });
-    expect(mockSetDataForm).toBeCalledWith([
+    expect(mockSetDataForm).toHaveBeenCalledWith([
       {
         key: 'passcode',
         type: 'passcode',

package/src/commons/FieldTemplate/ScheduleField/__test__/index.test.js

@@ -1,10 +1,10 @@
 import React from 'react';
+import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import { mockSCStore } from '../../../../context/mockStore';
+import { AccessibilityLabel } from '../../../../configs/Constants';
 import { SCProvider } from '../../../../context';
+import { mockSCStore } from '../../../../context/mockStore';
 import ScheduleField from '../index';
-import { AccessibilityLabel } from '../../../../configs/Constants';
-import { TouchableOpacity } from 'react-native';
 
 const mockSetDataForm = jest.fn();
 
@@ -69,7 +69,7 @@ describe('Test ScheduleField', () => {
     await act(async () => {
       await recurring.props.onPress();
     });
-    expect(mockSetDataForm).toBeCalledWith([
+    expect(mockSetDataForm).toHaveBeenCalledWith([
       {
         key: 'schedule',
         type: 'schedule',
@@ -99,7 +99,7 @@ describe('Test ScheduleField', () => {
       await schedule.props.onPress();
     });
 
-    expect(mockSetDataForm).toBeCalledWith([
+    expect(mockSetDataForm).toHaveBeenCalledWith([
       {
         key: 'schedule',
         type: 'schedule',
@@ -152,7 +152,7 @@ describe('Test ScheduleField', () => {
     await act(async () => {
       tree = await create(wrapComponent());
     });
-    expect(mockSetDataForm).toBeCalledWith([
+    expect(mockSetDataForm).toHaveBeenCalledWith([
       {
         key: 'schedule',
         type: 'schedule',

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

@@ -1,10 +1,10 @@
 import React from 'react';
-import renderer, { act } from 'react-test-renderer';
 import DraggableFlatList from 'react-native-draggable-flatlist';
+import renderer, { act } from 'react-test-renderer';
 
-import FlatListDnD from '../index';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import FlatListDnD from '../index';
 
 const wrapComponent = ({ ...rest }) => (
   <SCProvider initState={mockSCStore({})}>
@@ -31,7 +31,7 @@ describe('Test FlatListDnD', () => {
     await act(async () => {
       draggableFlatList[0].props.onDragEnd({ data: [{ id: 2 }, { id: 1 }] });
     });
-    expect(setData).toBeCalledWith([{ id: 2 }, { id: 1 }]);
+    expect(setData).toHaveBeenCalledWith([{ id: 2 }, { id: 1 }]);
   });
 
   it('render FlatListDnD onDragEnd', async () => {
@@ -44,6 +44,6 @@ describe('Test FlatListDnD', () => {
     await act(async () => {
       draggableFlatList[0].props.onDragEnd({ data: [{ id: 2 }, { id: 1 }] });
     });
-    expect(setData).toBeCalledWith([{ id: 2 }, { id: 1 }]);
+    expect(setData).toHaveBeenCalledWith([{ id: 2 }, { id: 1 }]);
   });
 });

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

@@ -1,9 +1,9 @@
 import React from 'react';
-import { act, create } from 'react-test-renderer';
 import { TouchableOpacity } from 'react-native';
+import { act, create } from 'react-test-renderer';
 
-import { AccessibilityLabel } from '../../../configs/Constants';
 import GroupCheckBox from '..';
+import { AccessibilityLabel } from '../../../configs/Constants';
 
 describe('Test Group CheckBox', () => {
   let tree;
@@ -59,7 +59,7 @@ describe('Test Group CheckBox', () => {
     await act(async () => {
       buttons[0].props.onPress();
     });
-    expect(mockFunc).toBeCalledTimes(2);
+    expect(mockFunc).toHaveBeenCalledTimes(2);
   });
 
   it('render Group CheckBox with foundIndex === -1 multiple false', async () => {