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

package/src/commons/Automate/ItemConditionScriptDetailStyles.js

@@ -0,0 +1,46 @@
+import { Platform, StyleSheet } from 'react-native';
+import { Colors } from '../../configs';
+
+export default StyleSheet.create({
+  wrap: {
+    height: 76,
+    backgroundColor: Colors.White,
+    paddingHorizontal: 16,
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    borderRadius: 8,
+    marginTop: 16,
+    shadowColor: Colors.Gray6,
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.5,
+    shadowRadius: 4,
+    elevation: 9,
+  },
+  col: {
+    alignItems: 'center',
+    flexDirection: 'row',
+  },
+  wrapIcon: {
+    justifyContent: 'center',
+    flexDirection: 'row',
+    width: 50,
+  },
+  wrapTitle: {
+    marginLeft: 10,
+  },
+  wrapStyle: {
+    borderRadius: 8,
+    borderBottomRightRadius: 8,
+    borderBottomLeftRadius: 8,
+    width: 160,
+    marginTop: Platform.select({
+      android: -25,
+      ios: 0,
+    }),
+    marginLeft: -10,
+  },
+});

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 
 import { SCProvider } from '../../../context';
@@ -23,24 +22,4 @@ describe('Test ItemAutomate', () => {
     const texts = instance.findAllByType(Text);
     expect(texts[0].props.children).toEqual('Launch One-Tap');
   });
-
-  it('Test render TouchableOpacity', async () => {
-    const mockOnPress = jest.fn();
-    await act(async () => {
-      tree = await create(
-        wrapComponent({
-          automate: {
-            type: 'one_tap',
-          },
-          onPress: mockOnPress,
-        })
-      );
-    });
-    const instance = tree.root;
-    const touchableOpacities = instance.findAllByType(TouchableOpacity);
-    await act(async () => {
-      touchableOpacities[0].props.onPress();
-    });
-    expect(mockOnPress).toHaveBeenCalledTimes(1);
-  });
 });

package/src/commons/BackDefault/index.js

@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
 import { TouchableOpacity, StyleSheet } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { AccessibilityLabel } from '../../configs/Constants';
 
 const BackDefault = memo(({ goBack, color, fixedHeight }) => {
@@ -10,7 +10,7 @@ const BackDefault = memo(({ goBack, color, fixedHeight }) => {
       onPress={goBack}
       style={[styles.wrap, fixedHeight && styles.noPaddingVertical]}
     >
-      <AntDesign name="left" size={27} color={color} />
+      <IconOutline name="left" size={27} color={color} />
     </TouchableOpacity>
   );
 });

package/src/commons/BottomButtonView/index.js

@@ -40,6 +40,7 @@ const BottomButtonView = memo(
     return (
       <Animated.View
         style={[
+          /* istanbul ignore next */
           typeMain === 'CardShadow'
             ? styleCustom.container1
             : styleCustom.container,

package/src/commons/ButtonPopup/index.js

@@ -1,6 +1,6 @@
 import React 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 { Colors, Device } from '../../configs';
 import { AccessibilityLabel } from '../../configs/Constants';
@@ -42,7 +42,7 @@ const ButtonPopup = ({
       <View style={styles.popoverStyle}>
         <View style={styles.modalWrapper}>
           {!hideClose && (
-            <AntDesign
+            <IconOutline
               name={'close'}
               color={Colors.Gray8}
               style={styles.close}
@@ -92,6 +92,7 @@ const styles = StyleSheet.create({
     position: 'relative',
     backgroundColor: Colors.White,
     borderRadius: 10,
+    /* istanbul ignore next */
     marginBottom: Device.isIphoneX ? 20 : 0,
   },
   modalHeader: {

package/src/commons/DateTimeRangeChange/DateTimeButton.js

@@ -1,13 +1,13 @@
 import React, { memo } from 'react';
 import { StyleSheet, TouchableOpacity } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { Colors } from '../../configs';
 
 const DateTimeButton = memo(({ onPress, style, children }) => {
   return (
     <TouchableOpacity style={[styles.dateSelect, style]} onPress={onPress}>
       {children}
-      <AntDesign style={styles.iconDateTime} name={'calendar'} />
+      <IconOutline style={styles.iconDateTime} name={'calendar'} />
     </TouchableOpacity>
   );
 });
@@ -25,7 +25,7 @@ const styles = StyleSheet.create({
     marginHorizontal: 8,
     flexDirection: 'row',
     justifyContent: 'space-between',
-    width: 150,
+    width: 130,
     alignItems: 'center',
   },
   txtTime: {

package/src/commons/Device/ConnectedViewHeader.js

@@ -1,6 +1,6 @@
 import React, { memo } 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 { useTranslations } from '../../hooks/Common/useTranslations';
 import { Colors } from '../../configs';
 import Text from '../../commons/Text';
@@ -30,7 +30,7 @@ const ConnectedViewHeader = memo(
     return (
       <View style={styles.statusContainer}>
         <View style={styles.connectStatus}>
-          <AntDesign name={'wifi'} color={Colors.Green6} size={16} />
+          <IconOutline name={'wifi'} color={Colors.Green6} size={16} />
           <DisplayTextConnected type={type} />
         </View>
         {isDisplayTime && (

package/src/commons/Device/Emergency/EmergencyDetail.js

@@ -6,7 +6,7 @@ import MediaPlayer from '../../MediaPlayer';
 import { standardizeCameraScreenSize } from '../../../utils/Utils';
 import { Colors, Device } from '../../../configs';
 import { RowUser } from '../../RowUser';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { useEmeragencyContacts } from '../../../screens/EmergencyContacts/hook';
 import { useIsFocused } from '@react-navigation/native';
 
@@ -49,12 +49,12 @@ const EmergencyDetail = memo(({ item }) => {
               key={contact.id.toString()}
               index={index}
               leftIcon={
-                <AntDesign name={'user'} size={20} color={Colors.White} />
+                <IconOutline name={'user'} size={20} color={Colors.White} />
               }
               text={contact.name}
               rightComponent={
                 <View style={styles.rightComponent}>
-                  <AntDesign
+                  <IconOutline
                     name={'phone'}
                     size={20}
                     color={Colors.Gray9}

package/src/commons/Device/FlatListItems.js

@@ -1,6 +1,6 @@
 import React, { memo, useCallback, useState } 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 { Colors, Constants } from '../../configs';
 import { AccessibilityLabel } from '../../configs/Constants';
 import { useBoolean } from '../../hooks/Common';
@@ -75,7 +75,7 @@ const FlatListItems = memo(({ data, style, title, offsetTitle }) => {
             style={styles.iconInfo}
             accessibilityLabel={AccessibilityLabel.TOUCH_INFO_FLAT_LIST_ITEM}
           >
-            <AntDesign name={'info-circle'} size={16} color={Colors.Gray8} />
+            <IconOutline name={'info-circle'} size={16} color={Colors.Gray8} />
           </TouchableOpacity>
         )}
       </View>
@@ -98,7 +98,7 @@ const FlatListItems = memo(({ data, style, title, offsetTitle }) => {
           onPress={() => setViewFull(true)}
         >
           <Text style={styles.textSeeMore}>{t('see_more')}</Text>
-          <AntDesign name={'caretdown'} color={Colors.Gray8} size={16} />
+          <IconOutline name={'caret-down'} color={Colors.Gray8} size={16} />
         </TouchableOpacity>
       )}
 

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

@@ -5,7 +5,7 @@ import {
   TouchableWithoutFeedback,
   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 Text from '../../Text';
@@ -35,7 +35,7 @@ const ItemHanetDevice = memo(
       return iconKit ? (
         <FImage source={{ uri: iconKit }} style={styles.iconSensor} />
       ) : (
-        <AntDesign name={svgMain} size={32} color={Colors.Red6} />
+        <IconOutline name={svgMain} size={32} color={Colors.Red6} />
       );
     };
 
@@ -58,7 +58,7 @@ const ItemHanetDevice = memo(
               {title}
             </Text>
             <View style={styles.row}>
-              <AntDesign name="right" size={12} />
+              <IconOutline name="right" size={12} />
             </View>
           </TouchableOpacity>
         </View>

package/src/commons/Device/HorizontalBarChart.js

@@ -1,11 +1,46 @@
-import React, { memo, useEffect, useMemo, useState } from 'react';
-import { View, StyleSheet } from 'react-native';
 import { isEmpty } from 'lodash';
+import React, { memo, useEffect, useMemo, useState } from 'react';
+import { StyleSheet, View } from 'react-native';
 
 import { Colors } from '../../configs';
 import { getMaxValueIndex } from '../../utils/chartHelper/getMaxValueIndex';
 import Highcharts from '../Highcharts';
 
+// https://github.com/facebook/hermes/issues/114#issuecomment-887106990
+// 'show source' unstable, work sometime, use this to generate formatter function
+
+// function formatter() {
+//   'show source';
+//   const { unit, price } = JSON.parse(this.series.name);
+//   const textColor =
+//     this.color === '#00979D'
+//       ? this.y === 0
+//         ? '#262626'
+//         : '#FFFFFF'
+//       : '#262626';
+//   const valueStyle = `color:${textColor};font-weight:normal;font-size:12px;`;
+//   const costStyle = valueStyle + 'font-weight:bold;';
+//   let label = `<span style="${valueStyle}">` + `${this.y}${unit}`;
+//   if (price === '' || price === null || isNaN(price)) {
+//     return label + '</span>';
+//   }
+//   const formatMoney = (number) => {
+//     const formatNumber = number.toFixed();
+//     return (
+//       parseInt(formatNumber, 10)
+//         .toFixed(0)
+//         .toString()
+//         .replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1.') + 'đ'
+//     );
+//   };
+//   return (
+//     label +
+//     `/<span style="${costStyle}">` +
+//     formatMoney(this.y * price) +
+//     '</span></span>'
+//   );
+// }
+
 const HorizontalBarChart = memo(({ datas, config }) => {
   const [chartOptions, setChartOptions] = useState({
     chart: {
@@ -57,38 +92,23 @@ const HorizontalBarChart = memo(({ datas, config }) => {
         dataLabels: {
           enabled: true,
           useHTML: true,
-          formatter: function () {
-            const { unit, price } = JSON.parse(this.series.name);
-            const textColor =
-              this.color === '#00979D'
-                ? this.y === 0
-                  ? '#262626'
-                  : '#FFFFFF'
-                : '#262626';
-            const valueStyle = `color:${textColor};font-weight:normal;font-size:12px;`;
-            const costStyle = valueStyle + 'font-weight:bold;';
-
-            let label = `<span style="${valueStyle}">` + `${this.y}${unit}`;
-            if (price === '' || price === null || isNaN(price)) {
-              return label + '</span>';
-            }
-
-            const formatMoney = (number) => {
-              const formatNumber = number.toFixed();
-              return (
-                parseInt(formatNumber, 10)
-                  .toFixed(0)
-                  .toString()
-                  .replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1.') + 'đ'
-              );
-            };
-            return (
-              label +
-              `/<span style="${costStyle}">` +
-              formatMoney(this.y * price) +
-              '</span></span>'
-            );
-          },
+          formatter: `function formatter() {
+    var _JSON$parse = JSON.parse(this.series.name),
+      unit = _JSON$parse.unit,
+      price = _JSON$parse.price;
+    var textColor = this.color === '#00979D' ? this.y === 0 ? '#262626' : '#FFFFFF' : '#262626';
+    var valueStyle = "color:" + textColor + ";font-weight:normal;font-size:12px;";
+    var costStyle = valueStyle + 'font-weight:bold;';
+    var label = "<span style=\\"" + valueStyle + "\\">" + ("" + this.y + unit);
+    if (price === '' || price === null || isNaN(price)) {
+      return label + '</span>';
+    }
+    var formatMoney = function formatMoney(number) {
+      var formatNumber = number.toFixed();
+      return parseInt(formatNumber, 10).toFixed(0).toString().replace(/(\\d)(?=(\\d\\d\\d)+(?!\\d))/g, '$1.') + 'đ';
+    };
+    return label + ("/<span style=\\"" + costStyle + "\\">") + formatMoney(this.y * price) + '</span></span>';
+  }`,
           align: 'right',
           inside: false,
         },

package/src/commons/Device/ItemAddNew/index.js

@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
 import { TouchableWithoutFeedback, View } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import Text from '../../Text';
 
 import { Colors } from '../../../configs';
@@ -16,7 +16,7 @@ const ItemAddNew = memo(({ title, onAddNew, wrapStyle }) => {
       <View style={[styles.container, wrapStyle]}>
         <View style={styles.boxIcon}>
           <View style={styles.buttonPlus}>
-            <AntDesign name="plus" size={22} color={Colors.Gray8} />
+            <IconOutline name="plus" size={22} color={Colors.Gray8} />
           </View>
         </View>
         <View>

package/src/commons/Device/ItemDevice.js

@@ -1,7 +1,7 @@
 import React, { memo, useCallback, useMemo } from 'react';
 import { Platform, StyleSheet, TouchableOpacity, View } from 'react-native';
 import Routes from '../../utils/Route';
-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 ItemQuickAction from '../../commons/Action/ItemQuickAction';
@@ -116,7 +116,7 @@ const ItemDevice = memo(
             >
               {description || textConnected}
             </Text>
-            <AntDesign name="right" size={12} />
+            <IconOutline name="right" size={12} />
           </View>
         </TouchableOpacity>
       </ItemDeviceWrapper>

package/src/commons/Device/SonosSpeaker/index.js

@@ -1,7 +1,7 @@
 import React, { memo, useState } from 'react';
 import { View, TouchableOpacity } from 'react-native';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { Slider } from '@miblanchard/react-native-slider';
 
 import Text from '../../Text';
@@ -44,7 +44,7 @@ const SonosSpeaker = memo(() => {
         </TouchableOpacity>
         <View style={styles.threeButton}>
           <TouchableOpacity style={styles.buttonLeft}>
-            <AntDesign name={'backward'} size={35} color={Colors.Black} />
+            <IconOutline name={'backward'} size={35} color={Colors.Black} />
           </TouchableOpacity>
           <TouchableOpacity
             style={styles.buttonCenter}
@@ -53,7 +53,7 @@ const SonosSpeaker = memo(() => {
             {active ? <SvgButtonPauseActive /> : <SvgButtonPauseNotActive />}
           </TouchableOpacity>
           <TouchableOpacity style={styles.buttonRight}>
-            <AntDesign name={'forward'} size={35} color={Colors.Black} />
+            <IconOutline name={'forward'} size={35} color={Colors.Black} />
           </TouchableOpacity>
         </View>
       </View>

package/src/commons/Device/WaterPurifierStatus/AlertStatusMachine.js

@@ -1,12 +1,12 @@
 import React, { memo } from 'react';
 import { View, StyleSheet } from 'react-native';
 import Text from '../../../commons/Text';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 
 const AlertStatusMachine = memo(({ message, style, icon }) => {
   return (
     <View style={[styles.container, style]}>
-      <AntDesign
+      <IconOutline
         name={icon}
         size={20}
         color={style.borderColor}

package/src/commons/Device/WaterQualitySensor/QualityIndicatorsItem.js

@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
 import { View, Dimensions, StyleSheet, TouchableOpacity } 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 { Colors } from '../../../configs';
@@ -35,7 +35,11 @@ const QualityIndicatorItem = memo(
               onPress={() => navigation.navigate(descriptionScreen)}
               style={styles.iconInfo}
             >
-              <AntDesign name={'info-circle'} size={18} color={Colors.Gray8} />
+              <IconOutline
+                name={'info-circle'}
+                size={18}
+                color={Colors.Gray8}
+              />
             </TouchableOpacity>
           )}
         </View>

package/src/commons/DisplayChecking/index.js

@@ -3,7 +3,7 @@ import { View, TouchableOpacity } from 'react-native';
 
 import { Colors } from '../../configs';
 import Text from '../../commons/Text';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import styles from './styles';
 import { ModalCustom } from '../Modal';
 import Loading from '../../screens/Automate/Components/Loading';
@@ -18,7 +18,7 @@ const LoadingMessage = memo(({ visible, onClose, message }) => {
           onPress={onClose}
         >
           <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}>
             {message}

package/src/commons/EmergencyButton/AlertSendConfirm.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, View } from 'react-native';
 import { ButtonPopup } from '../index';
 import { useTranslations } from '../../hooks/Common/useTranslations';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import Text from '../Text';
 import { Colors } from '../../configs';
 
@@ -29,7 +29,7 @@ const AlertSendConfirm = ({
       bodyStyle={styles.buttonPopupBody}
     >
       <View style={styles.firstInfo}>
-        <AntDesign name="clockcircleo" size={42} style={styles.clock} />
+        <IconOutline name="clock-circle" size={42} style={styles.clock} />
         <Text semibold type="H4" style={styles.textAlertWillBe}>
           {t('alert_will_be_sent_in')}
         </Text>

package/src/commons/FieldTemplate/ChooseUserField/index.js

@@ -1,5 +1,5 @@
 import React, { memo, useEffect, useState } from 'react';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { TouchableOpacity, View } from 'react-native';
 
 import styles from './ChooseFieldStyles';
@@ -47,7 +47,7 @@ const ChooseUserField = ({ unit, dataItem, index, setDataForm, dataForm }) => {
         onPress={setShowFilterPopup}
       >
         <Text style={styles.value}>{choose.name}</Text>
-        <AntDesign name="right" size={20} color={Colors.Gray8} />
+        <IconOutline name="right" size={20} color={Colors.Gray8} />
       </TouchableOpacity>
       <ChoosePopup
         isVisible={showFilterPopup}

package/src/commons/FlatListDnD/index.js

@@ -1,6 +1,7 @@
 import React, { memo } from 'react';
 import DraggableFlatList from 'react-native-draggable-flatlist';
 
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import styles from './styles';
 
 const FlatListDnD = memo(
@@ -23,15 +24,17 @@ const FlatListDnD = memo(
     };
 
     return (
-      <DraggableFlatList
-        showsVerticalScrollIndicator={showsVerticalScrollIndicator}
-        data={data}
-        renderItem={renderItem}
-        keyExtractor={keyExtractor}
-        onDragEnd={onDragEnd || handleOnDragEnd}
-        containerStyle={styles.containerStyle}
-        {...props}
-      />
+      <GestureHandlerRootView>
+        <DraggableFlatList
+          showsVerticalScrollIndicator={showsVerticalScrollIndicator}
+          data={data}
+          renderItem={renderItem}
+          keyExtractor={keyExtractor}
+          onDragEnd={onDragEnd || handleOnDragEnd}
+          containerStyle={styles.containerStyle}
+          {...props}
+        />
+      </GestureHandlerRootView>
     );
   }
 );

package/src/commons/Grid/GridItem.js

@@ -3,7 +3,15 @@ import { TouchableWithoutFeedback, View } from 'react-native';
 import styles from './GridItemStyles';
 
 const GridItem = memo(
-  ({ icon, accessibilityLabel, selected, onPress, item, children }) => {
+  ({
+    icon,
+    accessibilityLabel,
+    selected,
+    onPress,
+    item,
+    children,
+    style = {},
+  }) => {
     const isActive = selected && styles.active;
 
     return (
@@ -11,7 +19,7 @@ const GridItem = memo(
         onPress={() => onPress && onPress(item)}
         accessibilityLabel={accessibilityLabel}
       >
-        <View style={[styles.container, isActive]}>{children}</View>
+        <View style={[styles.container, style, isActive]}>{children}</View>
       </TouchableWithoutFeedback>
     );
   }

package/src/commons/Header/HeaderCustom.js

@@ -2,7 +2,7 @@ import React, { useCallback, useRef } from 'react';
 import { View, Text, TouchableOpacity, Image } from 'react-native';
 import Images from '../../configs/Images';
 import { Colors } from '../../configs';
-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 } from '@react-navigation/native';
 import styles from './Styles/HeaderCustomStyles';
@@ -111,7 +111,7 @@ const HeaderCustom = ({
         {isShowClose && (
           <TouchableOpacity onPress={handleClose}>
             <View style={styles.buttonAdd}>
-              <AntDesign name={'close'} size={24} color={Colors.Black} />
+              <IconOutline name={'close'} size={24} color={Colors.Black} />
             </View>
           </TouchableOpacity>
         )}

package/src/commons/HeaderAni/index.js

@@ -1,5 +1,5 @@
 import React, { memo, useCallback } from 'react';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { TouchableOpacity, StyleSheet, Animated, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { getStatusBarHeight } from 'react-native-iphone-x-helper';
@@ -95,7 +95,7 @@ const HeaderAni = memo(
             accessibilityLabel={AccessibilityLabel.ICON_BACK}
           >
             <View style={styles.btnBack}>
-              <AntDesign name={'left'} size={27} color={Colors.Gray9} />
+              <IconOutline name={'left'} size={27} color={Colors.Gray9} />
             </View>
           </TouchableOpacity>
           <View styles={styles.wrapRightComponent}>{rightComponent}</View>

package/src/commons/IconComponent/index.js

@@ -1,4 +1,4 @@
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconFill, IconOutline } from '@ant-design/icons-react-native';
 import React, { memo, useMemo } from 'react';
 import { StyleSheet } from 'react-native';
 import { Colors } from '../../configs';
@@ -30,7 +30,7 @@ const IconComponent = memo(
         } else if (newIcon.includes('TwoTone')) {
           newIcon = newIcon.substring(0, newIcon.length - 'TwoTone'.length);
         }
-        newIcon = newIcon.replace(/[A-Z]/g, (m) => m.toLowerCase());
+        newIcon = newIcon.replace(/[A-Z]/g, (m) => '-' + m.toLowerCase());
       }
       return newIcon;
     }, [icon]);
@@ -62,7 +62,7 @@ const IconComponent = memo(
       );
     } else if (icon.includes('Filled')) {
       return (
-        <AntDesign
+        <IconFill
           name={displayIcon}
           color={colorIcon}
           size={size}
@@ -76,7 +76,7 @@ const IconComponent = memo(
           ? 'poweroff'
           : displayIcon;
       return (
-        <AntDesign
+        <IconOutline
           name={iconCT}
           color={colorIcon}
           size={size}