@eohjsc/react-native-smart-city 0.7.3-rc2 → 0.7.3-rc20

package/src/screens/Automate/index.js

@@ -1,3 +1,9 @@
+import { IconFill } from '@ant-design/icons-react-native';
+import {
+  useIsFocused,
+  useNavigation,
+  useRoute,
+} from '@react-navigation/native';
 import React, {
   useCallback,
   useEffect,
@@ -6,27 +12,21 @@ import React, {
   useState,
 } from 'react';
 import { FlatList, Image, TouchableOpacity, View } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
-import {
-  useIsFocused,
-  useNavigation,
-  useRoute,
-} from '@react-navigation/native';
 import { useSCContextSelector } from '../../context';
 
-import styles from './Styles/indexStyles';
+import ItemAddNew from '../../commons/Device/ItemAddNew';
+import ItemOneTap from '../../commons/SubUnit/OneTap/ItemOneTap';
+import Text from '../../commons/Text';
 import { API, Colors, Images } from '../../configs';
+import { AccessibilityLabel, UNIT_TYPES } from '../../configs/Constants';
+import { useGetIdUser } from '../../hooks/Common';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 import { axiosGet } from '../../utils/Apis/axios';
-import Text from '../../commons/Text';
-import ItemOneTap from '../../commons/SubUnit/OneTap/ItemOneTap';
+import { useBackendPermission } from '../../utils/Permission/backend';
 import Routes from '../../utils/Route';
-import Loading from './Components/Loading';
-import ItemAddNew from '../../commons/Device/ItemAddNew';
-import { useTranslations } from '../../hooks/Common/useTranslations';
-import { useGetIdUser } from '../../hooks/Common';
-import { AccessibilityLabel, UNIT_TYPES } from '../../configs/Constants';
 import { keyExtractor, ToastBottomHelper } from '../../utils/Utils';
-import { useBackendPermission } from '../../utils/Permission/backend';
+import Loading from './Components/Loading';
+import styles from './Styles/indexStyles';
 
 const Automate = () => {
   const t = useTranslations();
@@ -75,7 +75,6 @@ const Automate = () => {
       navigate(Routes.UnitStack, {
         screen: Routes.ScriptDetail,
         params: {
-          id: item?.id,
           closeScreen: currentRouteName,
           preAutomate: item, // pre-loaded automate data
         },
@@ -164,29 +163,32 @@ const Automate = () => {
               <Image source={Images.arrowBack} style={styles.arrowRight} />
             </TouchableOpacity>
           </View>
-          {!!automates?.length && (
-            <View style={styles.automatesRow}>
-              <ItemOneTap
-                isOwner={isOwner}
-                automate={automates[0]}
-                wrapSyles={styles.wrapAutomateItem}
-                onPressItem={() =>
-                  onPressItem(automates[0], unit_id, type, isOwner)
-                }
-              />
-              {!!automates[1] && (
+          <View style={styles.automatesRow}>
+            {!!automates?.length && (
+              <>
                 <ItemOneTap
                   isOwner={isOwner}
-                  automate={automates[1]}
+                  automate={automates[0]}
                   wrapSyles={styles.wrapAutomateItem}
                   onPressItem={() =>
-                    onPressItem(automates[1], unit_id, type, isOwner)
+                    onPressItem(automates[0], unit_id, type, isOwner)
                   }
                 />
-              )}
-            </View>
-          )}
-          {!automates?.length && renderListFooterComponent(unit_id, automates)}
+                {!!automates[1] && (
+                  <ItemOneTap
+                    isOwner={isOwner}
+                    automate={automates[1]}
+                    wrapSyles={styles.wrapAutomateItem}
+                    onPressItem={() =>
+                      onPressItem(automates[1], unit_id, type, isOwner)
+                    }
+                  />
+                )}
+              </>
+            )}
+            {(!automates?.length || automates.length === 1) &&
+              renderListFooterComponent(unit_id, automates)}
+          </View>
         </View>
       );
     },
@@ -210,7 +212,7 @@ const Automate = () => {
       /* istanbul ignore next */
       headerRight: () => (
         <TouchableOpacity style={styles.buttonAdd}>
-          <AntDesign name={'pluscircle'} size={28} color={Colors.Orange} />
+          <IconFill name={'plus-circle'} size={28} color={Colors.Orange} />
         </TouchableOpacity>
       ),
     });

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

@@ -2,7 +2,7 @@ import React, { memo, useState, useCallback } from 'react';
 import { View, TouchableOpacity } from 'react-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 { Colors } from '../../../configs';
 import Text from '../../../commons/Text';
 import { useRoute } from '@react-navigation/native';
@@ -92,7 +92,7 @@ const EditDevice = memo(() => {
             <Text type="Body" Reugular color={Colors.Grey7}>
               {sensorName}
             </Text>
-            <AntDesign
+            <IconOutline
               name="right"
               size={18}
               color={Colors.Gray7}

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

@@ -1,24 +1,23 @@
+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 { 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';
+import { IconOutline } from '@ant-design/icons-react-native';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -352,7 +351,8 @@ describe('test DeviceDetail', () => {
     const buttonPopupIcon = instance.find(
       (el) =>
         el.props.accessibilityLabel ===
-          AccessibilityLabel.BUTTON_POPUP_RESOLVED_ICON && el.type === AntDesign
+          AccessibilityLabel.BUTTON_POPUP_RESOLVED_ICON &&
+        el.type === IconOutline
     );
     expect(buttonPopupTitle.props.children).toEqual([
       'Unit name',
@@ -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/Device/detail.js

@@ -8,7 +8,7 @@ import React, {
 } from 'react';
 import { View, TouchableOpacity, Platform } from 'react-native';
 import { useNavigation, useFocusEffect } from '@react-navigation/native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconFill, IconOutline } from '@ant-design/icons-react-native';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import moment from 'moment';
 
@@ -685,9 +685,9 @@ const DeviceDetail = ({ route }) => {
         >
           <View style={styles.buttonStar}>
             {isFavorite ? (
-              <AntDesign name="star" size={25} color={Colors.Yellow6} />
+              <IconFill name="star" size={25} color={Colors.Yellow6} />
             ) : (
-              <AntDesign name="staro" size={25} />
+              <IconOutline name="star" size={25} />
             )}
           </View>
         </TouchableOpacity>
@@ -695,7 +695,7 @@ const DeviceDetail = ({ route }) => {
         {isShowSetupEmergencyContact && (
           <TouchableOpacity onPress={onPressSetting}>
             <View style={styles.button}>
-              <AntDesign name="setting" size={25} color={Colors.Black} />
+              <IconOutline name="setting" size={25} color={Colors.Black} />
             </View>
           </TouchableOpacity>
         )}
@@ -792,7 +792,7 @@ const DeviceDetail = ({ route }) => {
             <BottomButtonView
               style={styles.bottomButtonEmergencyContact}
               mainIcon={
-                <AntDesign name="plus" size={16} color={Colors.Primary} />
+                <IconOutline name="plus" size={16} color={Colors.Primary} />
               }
               mainTitle={t('setup_my_emergency_contact')}
               onPressMain={onSetupContacts}
@@ -827,7 +827,7 @@ const DeviceDetail = ({ route }) => {
       {isShowEmergencyResolve && !isEmergencyPopupScreen && (
         <BottomButtonView
           style={styles.bottomButtonEmergencyResolve}
-          mainIcon={<AntDesign name="tool" size={15} color={Colors.Gray6} />}
+          mainIcon={<IconOutline name="tool" size={15} color={Colors.Gray6} />}
           mainTitle={t('resolve_situation')}
           onPressMain={onPressResolveSituationConfirm}
           topComponent={
@@ -867,7 +867,7 @@ const DeviceDetail = ({ route }) => {
           >
             {unit?.name} - {sensor?.station?.name}
           </Text>
-          <AntDesign
+          <IconOutline
             accessibilityLabel={AccessibilityLabel.BUTTON_POPUP_RESOLVED_ICON}
             name="check-circle"
             size={42}

package/src/screens/Device/hooks/useEvaluateValue.js

@@ -129,7 +129,7 @@ export const useGetEvaluateValue = (configId, unitId) => {
   if (configId && valueEvaluations[configId] === undefined) {
     (async () => {
       const { success, data } = await axiosGet(API.VALUE_EVALUATIONS(), {
-        configs__id: configId,
+        params: { configs__id: configId },
       });
       if (success) {
         setAction(Action.INIT_VALUE_EVALUATIONS, {

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

@@ -1,4 +1,4 @@
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import React, { useCallback, useContext } from 'react';
 import {
   Image,
@@ -59,7 +59,7 @@ const DrawerContainer = () => {
                 style={styles.avatar}
                 accessibilityLabel={AccessibilityLabel.SIDE_MENU_AVATAR_USER}
               >
-                <AntDesign name={'user'} size={27} />
+                <IconOutline name={'user'} size={27} />
               </View>
             )}
             <View style={styles.textContainer}>
@@ -116,7 +116,7 @@ export const Row = ({
       ]}
       accessibilityLabel={accessibilityLabel}
     >
-      <AntDesign name={image} size={24} />
+      <IconOutline name={image} size={24} />
 
       <View style={styles.wrapText}>
         <Text style={[styles.text]}>{name}</Text>

package/src/screens/EmergencyContacts/EmergencyContactsList.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { useIsFocused, useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { AlertAction, MenuActionList, Section } from '../../commons';
@@ -99,7 +99,7 @@ export const EmergencyContactsList = ({ route }) => {
                 : 'disable'
             }
             leftIcon={
-              <AntDesign name={'plus'} size={20} color={Colors.White} />
+              <IconOutline name={'plus'} size={20} color={Colors.White} />
             }
             text={t('add_new')}
             subtext={t('emergency_max_contacts', {
@@ -113,7 +113,7 @@ export const EmergencyContactsList = ({ route }) => {
                 key={contact.id}
                 index={index}
                 leftIcon={
-                  <AntDesign name={'user'} size={20} color={Colors.White} />
+                  <IconOutline name={'user'} size={20} color={Colors.White} />
                 }
                 text={contact.name}
                 subtext={contact.phone_number}
@@ -122,7 +122,11 @@ export const EmergencyContactsList = ({ route }) => {
                     style={styles.buttonRemove}
                     onPress={onPressRemoveContact(contact)}
                   >
-                    <AntDesign name={'minus'} size={20} color={Colors.Gray8} />
+                    <IconOutline
+                      name={'minus'}
+                      size={20}
+                      color={Colors.Gray8}
+                    />
                   </TouchableOpacity>
                 }
               />

package/src/screens/EmergencyContacts/EmergencyContactsSelectContacts.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { Section, ViewButtonBottom } from '../../commons';
@@ -81,7 +81,7 @@ export const EmergencyContactsSelectContacts = ({ route }) => {
               }
               index={index}
               leftIcon={
-                <AntDesign name={'user'} size={20} color={Colors.White} />
+                <IconOutline name={'user'} size={20} color={Colors.White} />
               }
               text={contact.name}
               subtext={contact.phone_number}
@@ -91,7 +91,7 @@ export const EmergencyContactsSelectContacts = ({ route }) => {
                   {currentContacts.some(
                     (item) => item?.name === contact?.name
                   ) && (
-                    <AntDesign
+                    <IconOutline
                       name={'check-circle'}
                       size={20}
                       color={Colors.Primary}

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'),

package/src/screens/EmergencySetting/components/DropDownItem.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useState } 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 Text from '../../../commons/Text';
 import styles from '../styles/DropDownItem';
@@ -29,7 +29,7 @@ const DropDownItem = ({ label, data, onSelectItem, isOpen, onOpen, index }) => {
       <View style={styles.dropDownContainer}>
         <TouchableOpacity style={styles.dropDownStyle} onPress={handleOnOpen}>
           <Text>{selecteValue?.label}</Text>
-          <AntDesign name="caretdown" size={18} color={Colors.Gray8} />
+          <IconOutline name="caret-down" size={18} color={Colors.Gray8} />
         </TouchableOpacity>
 
         {isOpen && (

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

@@ -1,15 +1,15 @@
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
-import { create, act } from 'react-test-renderer';
 import { TouchableOpacity } from 'react-native';
-import MockAdapter from 'axios-mock-adapter';
+import { act, create } from 'react-test-renderer';
 
+import { useNavigation } from '@react-navigation/native';
+import { API } from '../../../configs';
+import { AccessibilityLabel } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import EnterPassword from '../index';
-import { AccessibilityLabel } from '../../../configs/Constants';
-import { API } from '../../../configs';
 import api from '../../../utils/Apis/axios';
-import { useNavigation } from '@react-navigation/native';
+import EnterPassword from '../index';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -103,7 +103,7 @@ describe('Test EnterPassword', () => {
     await act(async () => {
       await button[0].props.onPress();
     });
-    expect(navigate).toBeCalled();
+    expect(navigate).toHaveBeenCalled();
   });
 
   it('test EnterPassword button failure', async () => {
@@ -125,6 +125,6 @@ describe('Test EnterPassword', () => {
     await act(async () => {
       await button[0].props.onPress();
     });
-    expect(navigate).not.toBeCalled();
+    expect(navigate).not.toHaveBeenCalled();
   });
 });

package/src/screens/GuestInfo/components/RowGuestInfo.js

@@ -1,6 +1,6 @@
 import React 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 Text from '../../../commons/Text';
 import styles from '../styles/indexStyles';
 
@@ -19,7 +19,7 @@ const RowGuestInfo = ({
         <View style={styles.rowRight}>
           <Text type="Body">{textRight}</Text>
           {rightArrow && (
-            <AntDesign name="right" size={20} style={styles.icon} />
+            <IconOutline name="right" size={20} style={styles.icon} />
           )}
         </View>
       </View>