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

package/src/screens/GuestInfo/index.js

@@ -7,7 +7,7 @@ import RowGuestInfo from './components/RowGuestInfo';
 import HeaderGuestInfo from './components/HeaderGuestInfo';
 import AccessScheduleSheet from './components/AccessScheduleSheet';
 import { CircleView } from '../../commons/CircleView';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import Text from '../../commons/Text';
 import { useBoolean } from '../../hooks/Common';
 import { axiosGet, axiosPut } from '../../utils/Apis/axios';
@@ -113,7 +113,7 @@ const GuestInfo = ({ route }) => {
                   />
                 ) : (
                   <CircleView size={88} center style={styles.avatar}>
-                    <AntDesign name="user" size={44} color={Colors.Pink1} />
+                    <IconOutline name="user" size={44} color={Colors.Pink1} />
                   </CircleView>
                 )}
                 <Text type="H3" bold>

package/src/screens/HanetCamera/ManageAccess.js

@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo } from 'react';
 import { View, TouchableOpacity, Image, FlatList } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { HeaderCustom } from '../../commons/Header';
 import Text from '../../commons/Text';
 import RequestFaceIDPopup from './components/RequestFaceIDPopup';
@@ -74,7 +74,7 @@ const HanetManageAccess = ({ route }) => {
             {' '}
             {item.name}
           </Text>
-          <AntDesign name="right" size={20} color={Colors.Gray6} />
+          <IconOutline name="right" size={20} color={Colors.Gray6} />
         </TouchableOpacity>
       );
     },
@@ -89,7 +89,7 @@ const HanetManageAccess = ({ route }) => {
           onPress={setShowAddMemberModal}
           accessibilityLabel={AccessibilityLabel.HANET_MANAGE_ACCESS_ADD_BUTTON}
         >
-          <AntDesign name={'plus'} size={27} color={Colors.Black} />
+          <IconOutline name={'plus'} size={27} color={Colors.Black} />
         </TouchableOpacity>
       </View>
     ),

package/src/screens/HanetCamera/MemberInfo.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { View, TouchableOpacity, Image } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 
 import { HeaderCustom } from '../../commons/Header';
 import { AlertAction, FullLoading } from '../../commons';
@@ -173,7 +173,7 @@ const HanetMemberInfo = ({ route }) => {
         onPress={setShowSetFaceIDModal}
         style={[styles.row, !!error && { borderBottomColor: Colors.Red6 }]}
       >
-        <AntDesign name="camera" size={27} color={Colors.Primary} />
+        <IconOutline name="camera" size={27} color={Colors.Primary} />
         <Text
           type="Body"
           bold

package/src/screens/HanetCamera/__test__/Detail.test.js

@@ -1,18 +1,18 @@
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { FlatList } from 'react-native';
-import { create, act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
+import { act, create } from 'react-test-renderer';
 
+import moment from 'moment';
+import { MenuActionMore } from '../../../commons';
+import Calendar from '../../../commons/Calendar';
+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 HanetCameraDetail from '../Detail';
 import CheckinHeader from '../components/CheckinHeader';
-import moment from 'moment';
-import { AccessibilityLabel } from '../../../configs/Constants';
-import Calendar from '../../../commons/Calendar';
-import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
-import { MenuActionMore } from '../../../commons';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -103,7 +103,7 @@ describe('Test HanetCameraDetail', () => {
     expect(textCountStranger.props.children).toBe(1);
     const MenuActionMores = instance.findByType(MenuActionMore);
     await MenuActionMores.props.onItemClick({ data: 'test' });
-    expect(global.mockedNavigate).toBeCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
   });
 
   it('Test change date', async () => {

package/src/screens/HanetCamera/__test__/MemberInfo.test.js

@@ -1,19 +1,19 @@
+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 HanetMemberInfo from '../MemberInfo';
+import { useNavigation } from '@react-navigation/native';
 import { AlertAction } from '../../../commons';
-import TextInput from '../../../commons/Form/TextInput';
 import BottomButtonView from '../../../commons/BottomButtonView';
 import BottomSheet from '../../../commons/BottomSheet';
+import TextInput from '../../../commons/Form/TextInput';
+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 { API } from '../../../configs';
-import { useNavigation } from '@react-navigation/native';
+import HanetMemberInfo from '../MemberInfo';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -113,7 +113,7 @@ describe('Test HanetMemberInfo', () => {
     await chooseSetFaceIDOption(instance, 0);
 
     expect(bottomSheet.props.isVisible).toBe(false);
-    expect(navigate).toBeCalled(); // navigate to HanetCaptureFaceID
+    expect(navigate).toHaveBeenCalled(); // navigate to HanetCaptureFaceID
   });
 
   it('Test set photo id choose file', async () => {
@@ -176,6 +176,6 @@ describe('Test HanetMemberInfo', () => {
     await act(async () => {
       await bottomButton.props.onPressMain();
     });
-    expect(navigate).toBeCalled();
+    expect(navigate).toHaveBeenCalled();
   });
 });

package/src/screens/HanetCamera/components/RequestFaceIDPopup.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { TouchableOpacity, StyleSheet } from 'react-native';
 import ImagePicker from 'react-native-image-crop-picker';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import Text from '../../../commons/Text';
 import BottomSheet from '../../../commons/BottomSheet';
 import { Colors } from '../../../configs';
@@ -19,7 +19,7 @@ const RequestFaceIDPopup = ({
   const t = useTranslations();
   const options = [
     {
-      icon: <AntDesign name="camera" color={Colors.Gray9} size={27} />,
+      icon: <IconOutline name="camera" color={Colors.Gray9} size={27} />,
       text: t('capture_image'),
       onChoose: () => {
         setHide();

package/src/screens/ManageAccess/index.js

@@ -9,7 +9,7 @@ import {
 import { useNavigation, useIsFocused } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { HeaderCustom } from '../../commons/Header';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import styles from './styles/ManageAccessStyles';
 import { Colors } from '../../configs';
 import Text from '../../commons/Text';
@@ -75,7 +75,7 @@ const ManageAccessScreen = memo(({ route }) => {
                             // accessibilityLabel={AccessibilityLabel.SIDE_MENU_AVATAR_USER}
                           />
                         ) : (
-                          <AntDesign
+                          <IconOutline
                             name="user"
                             size={20}
                             color={Colors.White}
@@ -90,7 +90,7 @@ const ManageAccessScreen = memo(({ route }) => {
                       subtext={item.schedule}
                       onPress={() => goToGuestInfo(item.id)}
                       rightComponent={
-                        <AntDesign
+                        <IconOutline
                           name="right"
                           size={20}
                           color={Colors.Gray6}

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

@@ -1,17 +1,17 @@
-import React from 'react';
-import MockAdapter from 'axios-mock-adapter';
-import { create } from 'react-test-renderer';
 import { act } from '@testing-library/react-hooks';
+import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
 import { TouchableOpacity } from 'react-native';
+import { create } from 'react-test-renderer';
 
-import { AccessibilityLabel } from '../../../configs/Constants';
-import { API } from '../../../configs';
+import { useNavigation } from '@react-navigation/native';
 import MoveToAnotherSubUnit from '../';
+import BottomButtonView from '../../../commons/BottomButtonView';
+import { API } from '../../../configs';
+import { AccessibilityLabel } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import BottomButtonView from '../../../commons/BottomButtonView';
 import api from '../../../utils/Apis/axios';
-import { useNavigation } from '@react-navigation/native';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -128,7 +128,7 @@ describe('Test Render ListSubUnit', () => {
       await bottomButtonView.props.onPressMain();
     });
 
-    expect(global.mockedNavigate).toBeCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
     const touchableOpacities = instance.findAllByType(TouchableOpacity);
     await act(async () => {
       await touchableOpacities[2].props.onPress();
@@ -140,6 +140,6 @@ describe('Test Render ListSubUnit', () => {
     await act(async () => {
       await bottomButtonView.props.onPressMain();
     });
-    expect(global.mockedNavigate).not.toBeCalled();
+    expect(global.mockedNavigate).not.toHaveBeenCalled();
   });
 });

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

@@ -1,19 +1,19 @@
-import React from 'react';
-import { act, create } from 'react-test-renderer';
+import { NavigationContext } from '@react-navigation/native';
 import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
 import { Animated, RefreshControl } from 'react-native';
-import { NavigationContext } from '@react-navigation/native';
+import { act, create } from 'react-test-renderer';
 
+import { WrapHeaderScrollable } from '../../../commons';
+import { API } from '../../../configs';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import Notification from '../index';
-import NotificationItem from '../components/NotificationItem';
-import { API } from '../../../configs';
 import api from '../../../utils/Apis/axios';
-import { WrapHeaderScrollable } from '../../../commons';
+import NotificationItem from '../components/NotificationItem';
+import Notification from '../index';
 
-import { getPusher } from '../../../utils/Pusher';
 import { NOTIFICATION_TYPES } from '../../../configs/Constants';
+import { getPusher } from '../../../utils/Pusher';
 
 const wrapComponent = () => (
   <SCProvider initState={mockSCStore({})}>
@@ -155,7 +155,7 @@ describe('test Notification', () => {
       tree = await create(wrapComponent());
       await tree.unmount();
     });
-    expect(getPusher().unsubscribe).toBeCalledWith('private-user-1');
+    expect(getPusher().unsubscribe).toHaveBeenCalledWith('private-user-1');
   });
   it('test render trigger script notification', async () => {
     const response = {

package/src/screens/Notification/components/NotificationItem.js

@@ -3,6 +3,7 @@ import moment from 'moment';
 import React, { memo, useCallback, useState } from 'react';
 import { Image, TouchableOpacity, View } from 'react-native';
 
+import Notify from '../../../../assets/images/Notify.svg';
 import IconComponent from '../../../commons/IconComponent';
 import Text from '../../../commons/Text';
 import { API, Colors, SCConfig } from '../../../configs';
@@ -16,7 +17,6 @@ import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { axiosPost } from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
 import styles from '../styles/NotificationItemStyles';
-import Notify from '../../../../assets/images/Notify.svg';
 
 const NotificationItem = memo(({ item }) => {
   const t = useTranslations();
@@ -72,8 +72,7 @@ const NotificationItem = memo(({ item }) => {
           },
           iconContent: (
             <IconComponent
-              icon={'usergroup-add'}
-              outlined
+              icon="usergroup-add"
               style={styles.backgroundSummer}
             />
           ),
@@ -439,7 +438,7 @@ const NotificationItem = memo(({ item }) => {
             navigation.navigate(Routes.UnitStack, {
               screen: Routes.ScriptDetail,
               params: {
-                id: automate_id,
+                preAutomate: { id: automate_id },
               },
             });
           },

package/src/screens/Notification/index.js

@@ -1,6 +1,6 @@
 import React, { memo, useMemo, useState, useCallback, useEffect } from 'react';
 import { View, TouchableOpacity } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { useFocusEffect } from '@react-navigation/native';
 
 import styles from './styles/indexStyles';
@@ -33,7 +33,7 @@ const Notification = memo(() => {
             notImplemented(t);
           }}
         >
-          <AntDesign name={'plus'} size={27} color={Colors.Black} />
+          <IconOutline name={'plus'} size={27} color={Colors.Black} />
         </TouchableOpacity>
 
         <TouchableOpacity
@@ -41,7 +41,7 @@ const Notification = memo(() => {
             notImplemented(t);
           }}
         >
-          <AntDesign name={'search1'} size={27} color={Colors.Black} />
+          <IconOutline name={'search'} size={27} color={Colors.Black} />
         </TouchableOpacity>
       </View>
     ),

package/src/screens/Notification/styles/NotificationItemStyles.js

@@ -31,7 +31,6 @@ export default StyleSheet.create({
     lineHeight: 23,
   },
   backgroundSummer: {
-    width: '46%',
     color: Colors.Summer,
   },
   logo: {

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

@@ -5,11 +5,11 @@ import { Calendar } from 'react-native-calendars';
 
 import { act, create } from 'react-test-renderer';
 import PlayBackCamera from '..';
+import MediaPlayerFull from '../../../commons/MediaPlayerDetail/MediaPlayerFull';
 import Text from '../../../commons/Text';
 import { AccessibilityLabel } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import MediaPlayerFull from '../../../commons/MediaPlayerDetail/MediaPlayerFull';
 import Timer from '../Timer';
 
 const wrapComponent = () => (

package/src/screens/ScanChipQR/components/QRScan/__test__/QRScan.test.js

@@ -48,6 +48,6 @@ describe('Test QRScan', () => {
     await act(async () => {
       RNCam.props.onBarCodeRead(e);
     });
-    expect(mockedOnScan).toBeCalled();
+    expect(mockedOnScan).toHaveBeenCalled();
   });
 });

package/src/screens/ScanChipQR/components/QRScan/index.js

@@ -7,7 +7,7 @@ import {
   Dimensions,
   TouchableOpacity,
 } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { RNCamera } from 'react-native-camera';
 import { getStatusBarHeight } from 'react-native-iphone-x-helper';
 import { useTranslations } from '../../../../hooks/Common/useTranslations';
@@ -36,7 +36,7 @@ const VerifyingQRCode = memo(() => {
     <View style={styles.maskOuter}>
       <TouchableOpacity style={[styles.viewVerifying, styles.buttonShadow]}>
         <Loading
-          icon={<AntDesign name={'sync'} color={Colors.Green6} size={16} />}
+          icon={<IconOutline name={'sync'} color={Colors.Green6} size={16} />}
         />
         <Text type={'Body'} style={styles.text}>
           {t('verify_qr_code')}
@@ -117,7 +117,7 @@ const QRScan = ({ isScanReady = true, onScan }) => {
               borderColor={Colors.Gray4}
               style={styles.buttonClose}
             >
-              <AntDesign name={'close'} size={24} co />
+              <IconOutline name={'close'} size={24} co />
             </CircleButton>
             {loading && <VerifyingQRCode />}
           </View>

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

@@ -1,17 +1,17 @@
+import { useRoute } from '@react-navigation/native';
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { TouchableOpacity } from 'react-native';
-import { useRoute } from '@react-navigation/native';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
 
 import SelectUnit from '../';
+import BottomButtonView from '../../../commons/BottomButtonView';
+import { API } from '../../../configs';
+import { AccessibilityLabel } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { AccessibilityLabel } from '../../../configs/Constants';
-import Routes from '../../../utils/Route';
 import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
-import BottomButtonView from '../../../commons/BottomButtonView';
+import Routes from '../../../utils/Route';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -157,8 +157,8 @@ describe('Test Select unit screen', () => {
     await act(async () => {
       await iconClose[0].props.onPress();
     });
-    expect(global.mockedNavigate).toBeCalledWith(Routes.ScriptDetail, {
-      id: 1,
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
+      automate: { id: 1 },
       havePermission: true,
       isMultiUnits: undefined,
       name: '1',

package/src/screens/SelectUnit/index.js

@@ -1,6 +1,6 @@
 import React, { useMemo, useState, useCallback, useEffect } from 'react';
 import { View, TouchableOpacity, FlatList } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
 import { API, Colors } from '../../configs';
 import Text from '../../commons/Text';
@@ -50,7 +50,7 @@ const SelectUnit = () => {
   const handleOnGoBackAndClose = useCallback(() => {
     if (automateId) {
       navigate(Routes.ScriptDetail, {
-        id: automateId,
+        automate: { id: automateId },
         name: scriptName,
         type: oldType,
         havePermission: true,
@@ -76,7 +76,7 @@ const SelectUnit = () => {
         isAutomateTab,
         isMultiUnits,
         routeName,
-        unit: selectedItem,
+        multiUnit: selectedItem,
         automateId,
         scriptName,
         oldType,
@@ -132,7 +132,7 @@ const SelectUnit = () => {
         accessibilityLabel={AccessibilityLabel.ICON_CLOSE}
       >
         <View style={styles.buttonClose}>
-          <AntDesign name={'close'} size={24} color={Colors.Black} />
+          <IconOutline name={'close'} size={24} color={Colors.Black} />
         </View>
       </TouchableOpacity>
     ),

package/src/screens/SharedUnit/TabHeader.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { View, TouchableOpacity } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import Text from '../../commons/Text';
@@ -54,7 +54,7 @@ const TabHeader = ({ current, getCurrentTab, showModal, textFilter }) => {
           <Text style={styles.sortBy}>
             {t('sort_by') + ': '} {textFilter}
           </Text>
-          <AntDesign name="arrowdown" size={10} />
+          <IconOutline name="arrowdown" size={10} />
         </TouchableOpacity>
       </View>
     </View>

package/src/screens/Sharing/Components/EndDevice.js

@@ -1,6 +1,6 @@
 import React, { memo, useMemo, useState } from 'react';
 import { View, Text, TouchableOpacity } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { Colors } from '../../../configs';
 import styles from './Styles/DeviceItemStyles';
 import { AccessibilityLabel } from '../../../configs/Constants';
@@ -71,11 +71,11 @@ const EndDevice = ({
             {name}
           </Text>
           {checked && (
-            <AntDesign name={'check'} color={Colors.Primary} size={20} />
+            <IconOutline name={'check'} color={Colors.Primary} size={20} />
           )}
 
           {dataConfig.length > 0 && (
-            <AntDesign
+            <IconOutline
               onPress={() => toggleExpandEndDevice()}
               name={isItemExpanded ? 'up' : 'down'}
               size={20}

package/src/screens/Sharing/UnitMemberList.js

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import { useNavigation, useIsFocused } from '@react-navigation/native';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
@@ -83,7 +83,7 @@ const UnitMemberList = ({ route }) => {
       style={styles.rightHeader}
     >
       {isOwner ? (
-        <AntDesign name={'plus'} size={27} color={Colors.Black} />
+        <IconOutline name={'plus'} size={27} color={Colors.Black} />
       ) : (
         <MaterialIcons name={'more-vert'} size={27} color={Colors.Black} />
       )}

package/src/screens/Sharing/__test__/UpdateShareDevice.test.js

@@ -1,15 +1,15 @@
 import { act } from '@testing-library/react-hooks';
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { Alert } from 'react-native';
 import { create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
 import { ViewButtonBottom } from '../../../commons';
+import AccessibilityLabel from '../../../configs/AccessibilityLabel';
+import API from '../../../configs/API';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import API from '../../../configs/API';
 import api from '../../../utils/Apis/axios';
 import UpdateShareDevice from '../UpdateShareDevice';
-import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 
 const mock = new MockAdapter(api.axiosInstance);
 jest.spyOn(Alert, 'alert').mockImplementation(() => {});
@@ -151,7 +151,7 @@ describe('Test UpdateShareDevice', () => {
     await act(async () => {
       ViewButtonBottomElement[0].props.onRightClick();
     });
-    expect(global.mockedGoBack).toBeCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
     expect(mock.history.post[0].data).toEqual(
       JSON.stringify({
         phone: '0901234567',
@@ -185,7 +185,7 @@ describe('Test UpdateShareDevice', () => {
     await act(async () => {
       ViewButtonBottomElement[0].props.onRightClick();
     });
-    expect(global.mockedGoBack).toBeCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
     expect(mock.history.post[0].data).toEqual(
       JSON.stringify({
         phone: '',
@@ -217,7 +217,7 @@ describe('Test UpdateShareDevice', () => {
     await act(async () => {
       ViewButtonBottomElement[0].props.onRightClick();
     });
-    expect(global.mockedGoBack).not.toBeCalled();
+    expect(global.mockedGoBack).not.toHaveBeenCalled();
     expect(mock.history.post[0].data).toEqual(
       JSON.stringify({
         phone: '',
@@ -274,7 +274,7 @@ describe('Test UpdateShareDevice', () => {
     await act(async () => {
       ViewButtonBottomElement[0].props.onLeftClick();
     });
-    expect(global.mockedGoBack).toBeCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 
   it('user not choose device click button next', async () => {

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

@@ -1,17 +1,17 @@
-import React from 'react';
 import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
 import { act, create } from 'react-test-renderer';
 
 import { AccessibilityLabel } from '../../../configs/Constants';
 
-import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
-import SideMenuDetail from '../index';
-import { API } from '../../../configs';
 import { TouchableOpacity } from 'react-native';
 import { ModalCustom } from '../../../commons/Modal';
-import { ToastBottomHelper } from '../../../utils/Utils';
+import { API } from '../../../configs';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
+import { ToastBottomHelper } from '../../../utils/Utils';
+import SideMenuDetail from '../index';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -158,7 +158,7 @@ describe('Test SideMenuDetail', () => {
     const instance = tree.root;
     await chooseUser(instance);
     await onPressSubmitData(instance);
-    expect(spyToastError).toBeCalled();
+    expect(spyToastError).toHaveBeenCalled();
 
     await enterPasscode(instance);
     await onPressSubmitData(instance);
@@ -174,6 +174,6 @@ describe('Test SideMenuDetail', () => {
         },
       })
     );
-    expect(spyToastSuccess).toBeCalled();
+    expect(spyToastSuccess).toHaveBeenCalled();
   });
 });

package/src/screens/SmartAccount/Connecting/index.js

@@ -1,14 +1,14 @@
-import React, { useEffect, useCallback, useContext } from 'react';
-import { View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
+import React, { useCallback, useContext, useEffect } from 'react';
+import { View } from 'react-native';
 import * as Progress from 'react-native-progress';
 
 import Text from '../../../commons/Text';
-import { useTranslations } from '../../../hooks/Common/useTranslations';
-import { Action } from '../../../context/actionType';
+import { API, Colors, Constants } from '../../../configs';
 import { SCContext, useSCContextSelector } from '../../../context';
+import { Action } from '../../../context/actionType';
+import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { axiosPost } from '../../../utils/Apis/axios';
-import { API, Colors, Constants } from '../../../configs';
 import Routes from '../../../utils/Route';
 import styles from './style';