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

package/src/screens/Automate/AddNewAction/SelectMonitorDevices.js

@@ -1,16 +1,22 @@
-import React, { useCallback, useEffect, useState } from 'react';
 import { useNavigation } from '@react-navigation/native';
+import React, { useCallback, useEffect, useState } from 'react';
 
+import { API } from '../../../configs';
+import { AUTOMATE_TYPE } from '../../../configs/Constants';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { fetchWithCache } from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
 import Routes from '../../../utils/Route';
 import SelectDevices from './Components/SelectDevices';
-import { AUTOMATE_TYPE } from '../../../configs/Constants';
 
 const SelectMonitorDevices = ({ route }) => {
   const t = useTranslations();
-  const { automate = {}, isCreateNewAction, closeScreen } = route?.params || {};
+  const {
+    automate = {},
+    isCreateNewAction,
+    closeScreen,
+    multiUnit = {},
+  } = route.params || {};
+  const { type, unit, sensor_id } = automate;
 
   const [stations, setStations] = useState([]);
   const [listStation, setListStation] = useState([]);
@@ -22,11 +28,11 @@ const SelectMonitorDevices = ({ route }) => {
 
   const fetchDetails = useCallback(async () => {
     const configs = { params: {} };
-    if (automate?.type === AUTOMATE_TYPE.EVENT) {
+    if (type === AUTOMATE_TYPE.EVENT) {
       configs.params.type = 'event';
     }
     await fetchWithCache(
-      API.UNIT.DEVICE_SENSOR(automate?.unit),
+      API.UNIT.DEVICE_SENSOR(unit || multiUnit.id),
       configs,
       (response) => {
         const { success, data } = response;
@@ -46,17 +52,17 @@ const SelectMonitorDevices = ({ route }) => {
       }
     );
     setLoading(false);
-  }, [automate?.type, automate?.unit]);
+  }, [multiUnit.id, type, unit]);
 
   useEffect(() => {
-    if (!automate?.sensor_id) {
+    if (!sensor_id) {
       return;
     }
     let selectSensor = {};
     let found = false;
     for (let i = 0; i < stations.length; i++) {
       for (let j = 0; j < stations[i].sensors.length; j++) {
-        if (stations[i].sensors[j].id === automate.sensor_id) {
+        if (stations[i].sensors[j].id === sensor_id) {
           selectSensor = stations[i].sensors[j];
           found = true;
           break;
@@ -67,7 +73,7 @@ const SelectMonitorDevices = ({ route }) => {
       }
     }
     setDefaultSelectedDevice(selectSensor);
-  }, [automate?.sensor_id, stations]);
+  }, [sensor_id, stations]);
 
   useEffect(() => {
     fetchDetails();
@@ -86,6 +92,7 @@ const SelectMonitorDevices = ({ route }) => {
         stationName: stations[indexStation]?.name,
         isCreateNewAction,
         closeScreen,
+        unitId: automate?.unit,
       });
     },
     [navigate, automate, stations, isCreateNewAction, closeScreen]

package/src/screens/Automate/AddNewAction/SetupConfigCondition.js

@@ -43,7 +43,7 @@ const SetupConfigCondition = () => {
   const t = useTranslations();
   const { navigate } = useNavigation();
   const { params = {} } = useRoute();
-  const { config, automate, closeScreen } = params;
+  const { config, automate, closeScreen, unitId } = params;
   const [selectedCondition, setSelectedCondition] = useState(undefined);
   const [customCondition, setCustomCondition] = useState(undefined);
   const [isShowModal, setIsShowModal] = useState(false);
@@ -88,6 +88,7 @@ const SetupConfigCondition = () => {
     navigate(Routes.ValueChangeName, {
       automate,
       closeScreen,
+      unitId,
     });
   };
 
@@ -180,7 +181,11 @@ const SetupConfigCondition = () => {
                 return;
               }
               setIsShowModal(false);
-              navigate(Routes.ValueChangeName, { automate, closeScreen });
+              navigate(Routes.ValueChangeName, {
+                automate,
+                closeScreen,
+                unitId,
+              });
             }}
             style={styles.buttonContinue}
             textSemiBold={false}

package/src/screens/Automate/AddNewAction/SetupScriptDelay.js

@@ -40,7 +40,7 @@ const SetupScriptDelay = ({ route }) => {
         params: { saveAt: moment().valueOf() },
       });
     } else {
-      ToastBottomHelper.error(t('text_done'));
+      ToastBottomHelper.error(t('error_please_try_later'));
     }
   }, [automateId, navigate, delay, t]);
 

package/src/screens/Automate/AddNewAction/SetupScriptNotify.js

@@ -17,9 +17,9 @@ import moment from 'moment';
 const SetupScriptNotify = ({ route }) => {
   const t = useTranslations();
   const { goBack, navigate } = useNavigation();
-  const { automate = {}, unitId } = route?.params || {};
+  const { automate = {}, unitId, multiUnit } = route.params || {};
   const { id: automateId } = automate;
-  const [notify, setNotify] = useState({ unit: unitId });
+  const [notify, setNotify] = useState({ unit: unitId || multiUnit.id });
 
   const onChangeTitle = (value) => {
     setNotify((state) => ({
@@ -47,7 +47,7 @@ const SetupScriptNotify = ({ route }) => {
         params: { saveAt: moment().valueOf() },
       });
     } else {
-      ToastBottomHelper.error(t('text_done'));
+      ToastBottomHelper.error(t('error_please_try_later'));
     }
   }, [automateId, navigate, notify, t]);
 

package/src/screens/Automate/AddNewAction/__test__/SetupScriptNotify.test.js

@@ -69,6 +69,35 @@ describe('Test SetupScriptNotify', () => {
     expect(spyToast).toHaveBeenCalled();
   });
 
+  it('SetupScriptNotify onPress create script notify success with multi unit', async () => {
+    route.params.unitId = null;
+    route.params.multiUnit = { id: 1 };
+    const spyToast = jest.spyOn(ToastBottomHelper, 'success');
+    mock.onPost(API.AUTOMATE.ADD_SCRIPT_NOTIFY(1)).reply(200);
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const inputs = instance.findAllByType(_TextInput);
+    expect(inputs).toHaveLength(2);
+
+    await act(async () => {
+      inputs[0].props.onChange('Title');
+    });
+    const touchable = instance.findAllByType(TouchableWithoutFeedback);
+    await act(async () => {
+      touchable[0].props.onPress();
+    });
+    await act(async () => {
+      inputs[1].props.onChange('Message');
+    });
+    const button = instance.findByType(BottomButtonView);
+    await act(async () => {
+      button.props.onPressMain();
+    });
+    expect(spyToast).toHaveBeenCalled();
+  });
+
   it('SetupScriptNotify onPress create script notify error', async () => {
     const spyToast = jest.spyOn(ToastBottomHelper, 'error');
     mock.onPost(API.AUTOMATE.ADD_SCRIPT_NOTIFY(1)).reply(400);

package/src/screens/Automate/AddNewAutoSmart/AddTypeSmart.js

@@ -7,16 +7,16 @@ import Text from '../../../commons/Text';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import Routes from '../../../utils/Route';
 import styles from './styles/AddNewAutoSmartStyles';
+import { AUTOMATE_TYPE } from '../../../configs/Constants';
 
 const AddTypeSmart = ({ smartTypes, route }) => {
   const t = useTranslations();
   const { navigate, goBack } = useNavigation();
   const { automate = {}, closeScreen } = route?.params || {};
+  const { id, unit, type } = automate;
 
   const [selectedIndex, setSelectedIndex] = useState(
-    automate?.id
-      ? smartTypes.findIndex((obj) => obj.type === automate.type)
-      : -1
+    id ? smartTypes.findIndex((obj) => obj.type === type) : -1
   );
 
   const handleOnContinue = useCallback(
@@ -27,18 +27,18 @@ const AddTypeSmart = ({ smartTypes, route }) => {
           ...automate,
           type: dataAutomate?.type,
         },
-        unitId: automate?.unit,
+        unitId: unit,
         closeScreen: closeScreen,
       };
 
-      if (!automate?.unit) {
+      if (!unit && dataAutomate.type !== AUTOMATE_TYPE.SCHEDULE) {
         navigate(Routes.SelectUnit, params);
         return;
       }
 
       navigate(dataAutomate.route, params);
     },
-    [smartTypes, automate, closeScreen, navigate]
+    [smartTypes, automate, unit, closeScreen, navigate]
   );
 
   const onSelectType = (index) => {
@@ -51,7 +51,7 @@ const AddTypeSmart = ({ smartTypes, route }) => {
       <HeaderCustom isShowClose onClose={goBack} />
       <View style={styles.container}>
         <Text semibold type={'H2'} style={styles.titleCreate}>
-          {automate?.id ? t('update_smart') : t('create_smart')}
+          {id ? t('update_smart') : t('create_smart')}
         </Text>
         <Text type={'Body'} style={styles.titleChoose}>
           {t('choose_the_automation_method_you_want')}

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

@@ -11,7 +11,7 @@ import Event from '../../../../../assets/images/Event.svg';
 import Notify from '../../../../../assets/images/Notify.svg';
 import Delay from '../../../../../assets/images/Delay.svg';
 import { TouchableOpacity } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { Text } from '../../../../commons';
 import Routes from '../../../../utils/Route';
 import AccessibilityLabel from '../../../../configs/AccessibilityLabel';
@@ -40,6 +40,7 @@ const AddActionScript = memo(
               closeScreen: currentScreenName,
               numberActionCanAdd:
                 max_actions_per_automation - numberActionAdded,
+              routeName: unit ? null : Routes.SelectControlDevices,
             };
 
             navigate(
@@ -54,10 +55,17 @@ const AddActionScript = memo(
           image: <Notify />,
           onClick: () => {
             setIsVisible(false);
-            navigate(Routes.SetupScriptNotify, {
-              automate,
-              unitId: unit,
-            });
+            if (unit) {
+              navigate(Routes.SetupScriptNotify, {
+                automate,
+                unitId: unit,
+              });
+            } else {
+              navigate(Routes.SelectUnit, {
+                automate,
+                routeName: Routes.SetupScriptNotify,
+              });
+            }
           },
         },
         {
@@ -109,7 +117,7 @@ const AddActionScript = memo(
                   <View style={styles.wapItem}>
                     <View style={styles.imageItem}>{item.image}</View>
                     <Text style={styles.textItem}>{item.text}</Text>
-                    <AntDesign name="right" />
+                    <IconOutline name="right" />
                   </View>
                 </TouchableOpacity>
               </View>

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

@@ -308,6 +308,8 @@ describe('Test ScriptDetail', () => {
         unitId: route.params.preAutomate.unit,
         automateId: route.params.preAutomate.id,
         numberActionCanAdd: 2,
+        closeScreen: undefined,
+        routeName: null,
       }
     );
     mockedNavigate.mockClear();

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

@@ -7,7 +7,7 @@ import React, {
 } from 'react';
 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 { IconFill, IconOutline } from '@ant-design/icons-react-native';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 
 import { useIsFocused, useNavigation } from '@react-navigation/native';
@@ -479,9 +479,9 @@ const ButtonStar = ({ automate }) => {
       accessibilityLabel={AccessibilityLabel.HEADER_SCRIPT_DETAIL_BUTTON_STAR}
     >
       {isStarred ? (
-        <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} />
       )}
     </PreventDoubleTouch>
   );

package/src/screens/Automate/Styles/indexStyles.js

@@ -65,9 +65,9 @@ export default StyleSheet.create({
     width: (Constants.width - 40) / 2,
   },
   automatesRow: {
+    display: 'flex',
     flexDirection: 'row',
     marginTop: 8,
     overflow: 'hidden',
-    alignSelf: 'center',
   },
 });

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();
@@ -164,29 +164,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 +213,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/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

@@ -3,8 +3,6 @@ import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { Alert, ScrollView } from 'react-native';
 import { act, create } from 'react-test-renderer';
-
-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';
@@ -19,6 +17,7 @@ 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',

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/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/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/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>