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

package/src/commons/NavBar/index.js

@@ -1,5 +1,5 @@
 import React, { useRef } from 'react';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { View, TouchableOpacity } from 'react-native';
 
 import styles from './NavBarStyles';
@@ -40,7 +40,7 @@ const NavBar = ({
           ref={refMenuAction}
           accessibilityLabel={idLabelIconBars}
         >
-          <AntDesign name={'bars'} size={19} color={Colors.Black} />
+          <IconOutline name={'bars'} size={19} color={Colors.Black} />
         </TouchableOpacity>
       </View>
       <MenuActionMore

package/src/commons/OneTapTemplate/NumberUpDownActionTemplate.js

@@ -1,6 +1,6 @@
 import React, { memo, 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 { useTranslations } from '../../hooks/Common/useTranslations';
 import styles from './NumberUpDownActionTemplateStyles';
@@ -118,7 +118,7 @@ const NumberUpDownActionTemplate = ({ device, item = {}, onSelectAction }) => {
                   AccessibilityLabel.NUMBER_UP_DOWN_ACTION_DOWN
                 }
               >
-                <AntDesign name="down" size={32} color={Colors.Primary} />
+                <IconOutline name="down" size={32} color={Colors.Primary} />
               </TouchableOpacity>
               <Text
                 type="H2"
@@ -134,7 +134,7 @@ const NumberUpDownActionTemplate = ({ device, item = {}, onSelectAction }) => {
                 onPress={onPressUp}
                 accessibilityLabel={AccessibilityLabel.NUMBER_UP_DOWN_ACTION_UP}
               >
-                <AntDesign name="up" size={32} color={Colors.Primary} />
+                <IconOutline name="up" size={32} color={Colors.Primary} />
               </TouchableOpacity>
             </View>
             <View style={styles.wrapButton}>

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

@@ -27,7 +27,7 @@ describe('Test StatesGridActionTemplate', () => {
           config: 1024,
           is_on_value: 1,
           action: '800ff454-4e2a-4a38-bad6-1bded728193e',
-          icon: 'upcircle',
+          icon: 'up-circle',
           icon_kit: 41,
           text: 'Auto',
         },
@@ -35,7 +35,7 @@ describe('Test StatesGridActionTemplate', () => {
           config: 1024,
           is_on_value: 2,
           action: '4e43da81-469e-4d23-a66b-2656db7cf196',
-          icon: 'upcircle',
+          icon: 'up-circle',
           icon_kit: 42,
           text: 'Cool',
         },
@@ -43,7 +43,7 @@ describe('Test StatesGridActionTemplate', () => {
           config: 1024,
           is_on_value: 3,
           action: '63f1bbfa-0e42-4401-9ea2-4aa07327ff26',
-          icon: 'upcircle',
+          icon: 'up-circle',
           icon_kit: 44,
           text: 'Dry',
         },
@@ -51,7 +51,7 @@ describe('Test StatesGridActionTemplate', () => {
           config: 1024,
           is_on_value: 4,
           action: '8ba3e471-dd84-478b-87f3-6008aead8804',
-          icon: 'upcircle',
+          icon: 'up-circle',
           icon_kit: 43,
           text: 'Fan Only',
         },

package/src/commons/SearchLocation/index.js

@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
 import { View, TextInput } 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';
@@ -10,8 +10,8 @@ const SearchBarLocation = memo(({ input, onTextInput }) => {
   const t = useTranslations();
   return (
     <View style={styles.container}>
-      <AntDesign
-        name="search1"
+      <IconOutline
+        name="search"
         size={24}
         color={Colors.Gray6}
         accessibilityLabel="icon-search"

package/src/commons/SelectActionCard/index.js

@@ -1,6 +1,6 @@
 import React, { memo } 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 { Card } from '../CardShadow';
 import Text from '../Text';
@@ -20,7 +20,7 @@ const SelectActionCard = memo(({ title, action, onPress }) => {
               {action}
             </Text>
           </View>
-          <AntDesign name="right" size={20} />
+          <IconOutline name="right" size={20} />
         </View>
       </TouchableOpacity>
     </Card>

package/src/commons/SelectSubUnit/index.js

@@ -2,7 +2,7 @@ import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { useIsFocused, useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { ScrollView, TouchableOpacity, View } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 
 import { API, Colors } from '../../configs';
 import { RadioCircle, Section, ViewButtonBottom } from '../../commons';
@@ -98,7 +98,11 @@ const SelectSubUnit = ({ unitId, title, subTitle, onPressNext, route }) => {
               />
             ))}
             <TouchableOpacity style={styles.rowContainer} onPress={addSubUnit}>
-              <AntDesign name="plus-circle" size={20} color={Colors.Primary} />
+              <IconOutline
+                name="plus-circle"
+                size={20}
+                color={Colors.Primary}
+              />
               <View style={styles.row}>
                 <Text type="H4" color={Colors.Primary}>
                   {t('add_new_sub_unit')}

package/src/commons/Sharing/BtnRemoveMember.js

@@ -1,6 +1,6 @@
 import React, { memo, useCallback } 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 { Colors } from '../../configs';
 
 const BtnRemoveMember = memo(({ member, onPressRemove }) => {
@@ -9,7 +9,7 @@ const BtnRemoveMember = memo(({ member, onPressRemove }) => {
   }, [member, onPressRemove]);
   return (
     <TouchableOpacity style={styles.buttonRemove} onPress={onPress}>
-      <AntDesign name={'minus'} size={20} color={Colors.Gray8} />
+      <IconOutline name={'minus'} size={20} color={Colors.Gray8} />
     </TouchableOpacity>
   );
 });

package/src/commons/Sharing/StationDevicePermissions.js

@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import { View, StyleSheet, 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 { Colors } from '../../configs';
 import Text from '../../commons/Text';
@@ -86,7 +86,7 @@ const StationDevicePermissions = ({ dataStation, onselectSensor }) => {
           <View style={styles.infoContainer}>
             <Text style={styles.text}>{sensor.name}</Text>
             <View style={styles.rightImage}>
-              <AntDesign
+              <IconOutline
                 name={expandedIndex === index ? 'up' : 'down'}
                 size={20}
                 color={Colors.Gray6}

package/src/commons/SubUnit/DeviceTemplate/ConfigAndEvaluation/ConfigAndEvaluation.js

@@ -5,7 +5,7 @@ import Text from '../../../Text';
 import LastUpdatedText from '../../../Device/LastUpdatedText';
 import { EvaluationConfigWrapper } from '../EvaluationOverConfig/EvaluationOverConfig';
 import IconComponent from '../../../IconComponent';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 
 const ConfigAndEvaluationDisplay = memo(
   ({ device, valueEvaluation, stationItem, configValue }) => {
@@ -44,7 +44,7 @@ const ConfigAndEvaluationDisplay = memo(
               lastUpdated={configValue?.last_updated}
               format={'DDMMYYYY'}
             />
-            <AntDesign style={styles.marginTop10} name="right" size={12} />
+            <IconOutline style={styles.marginTop10} name="right" size={12} />
           </View>
         )}
       </>

package/src/commons/SubUnit/DeviceTemplate/ConfigValue/ConfigValue.js

@@ -5,7 +5,7 @@ import Text from '../../../Text';
 import { useConfigGlobalState } from '../../../../iot/states';
 import LastUpdatedText from '../../../Device/LastUpdatedText';
 import IconComponent from '../../../IconComponent';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 
 const ConfigValue = ({ device, stationItem }) => {
   const [configValues] = useConfigGlobalState('configValues');
@@ -40,7 +40,7 @@ const ConfigValue = ({ device, stationItem }) => {
               lastUpdated={configValue?.last_updated}
               format={'DDMMYYYY'}
             />
-            <AntDesign style={styles.marginTop10} name="right" size={12} />
+            <IconOutline style={styles.marginTop10} name="right" size={12} />
           </View>
         )}
       </View>

package/src/commons/SubUnit/DeviceTemplate/EvaluationOverConfig/EvaluationOverConfig.js

@@ -9,7 +9,7 @@ import {
 } from '../../../../screens/Device/hooks/useEvaluateValue';
 import LastUpdatedText from '../../../Device/LastUpdatedText';
 import IconComponent from '../../../IconComponent';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 
 export const EvaluationConfigWrapper = memo(
   ({ device, stationItem, Child }) => {
@@ -69,7 +69,7 @@ const EvaluationOverConfigDisplay = memo(
                 lastUpdated={configValue?.last_updated}
                 format={'DDMMYYYY'}
               />
-              <AntDesign style={styles.marginTop10} name="right" size={12} />
+              <IconOutline style={styles.marginTop10} name="right" size={12} />
             </View>
           )}
         </View>

package/src/commons/SubUnit/OneTap/ItemOneTap.js

@@ -1,6 +1,6 @@
 import React, { memo, useCallback } from 'react';
 import { TouchableOpacity, TouchableWithoutFeedback, View } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import moment from 'moment';
 import Text from '../../Text';
 import { API, Colors } from '../../../configs';
@@ -27,10 +27,9 @@ const ItemOneTap = memo(({ automate = {}, wrapSyles, onPressItem }) => {
 
   const goToDetail = useCallback(() => {
     navigate(Routes.ScriptDetail, {
-      id,
       preAutomate: automate,
     });
-  }, [automate, navigate, id]);
+  }, [automate, navigate]);
 
   const handleScriptAction = useCallback(async () => {
     const { success } = await axiosPost(API.AUTOMATE.ACTION_ONE_TAP(id));
@@ -107,7 +106,7 @@ const ItemOneTap = memo(({ automate = {}, wrapSyles, onPressItem }) => {
             >
               {activateAt && t('activated_time', { time: activateAt })}
             </Text>
-            <AntDesign name="right" size={12} />
+            <IconOutline name="right" size={12} />
           </View>
         </TouchableOpacity>
       </View>

package/src/commons/SubUnit/OneTap/__test__/SubUnitAutomate.test.js

@@ -107,7 +107,6 @@ describe('test Item', () => {
       await goDetail[0].props.onPress();
     });
     expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
-      id: 1,
       preAutomate: data.listAutomate[0].data[0],
     });
 
@@ -194,7 +193,6 @@ describe('test Item', () => {
       await goDetail[0].props.onPress();
     });
     expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
-      id: 1,
       preAutomate: data.listAutomate[0].data[0],
     });
   });

package/src/commons/SubUnit/OneTap/index.js

@@ -7,22 +7,22 @@ import React, {
 } from 'react';
 import { TouchableOpacity, View } from 'react-native';
 
-import { Section } from '../..';
-import ItemAddNew from '../../Device/ItemAddNew';
-import ItemOneTap from './ItemOneTap';
-import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { useNavigation, useRoute } from '@react-navigation/native';
-import Routes from '../../../utils/Route/index.js';
+import { Section } from '../..';
 import {
-  AUTOMATE_TYPE,
   AccessibilityLabel,
   AUTOMATE_TABS,
+  AUTOMATE_TYPE,
 } from '../../../configs/Constants';
+import { useTranslations } from '../../../hooks/Common/useTranslations';
+import Routes from '../../../utils/Route/index.js';
+import ItemAddNew from '../../Device/ItemAddNew';
 import Text from '../../Text/index.js';
+import ItemOneTap from './ItemOneTap';
 
-import styles from './OneTapStyles.js';
-import { ToastBottomHelper } from '../../../utils/Utils';
 import { useBackendPermission } from '../../../utils/Permission/backend';
+import { ToastBottomHelper } from '../../../utils/Utils';
+import styles from './OneTapStyles.js';
 
 const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
   const t = useTranslations();
@@ -57,6 +57,7 @@ const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
             type: AUTOMATE_TYPE.ONE_TAP,
             unit: unit?.id,
           },
+          unitId: unit?.id,
           closeScreen: currentScreen,
         });
         break;

package/src/commons/Unit/HeaderUnit/index.js

@@ -1,6 +1,6 @@
 import React, { memo, useCallback, useMemo, useRef } from 'react';
 import { StatusBar, StyleSheet, TouchableOpacity, View } from 'react-native';
-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, useRoute } from '@react-navigation/native';
 import { getStatusBarHeight } from 'react-native-iphone-x-helper';
@@ -53,7 +53,7 @@ const HeaderUnit = memo(({ transparent, unit }) => {
         onPress={handleGoBack}
       >
         <View style={styles.btnLeft}>
-          <AntDesign name={'left'} size={27} color={colorHeader} />
+          <IconOutline name={'left'} size={27} color={colorHeader} />
         </View>
       </TouchableOpacity>
       {!transparent && (
@@ -71,7 +71,7 @@ const HeaderUnit = memo(({ transparent, unit }) => {
             onPress={setShowAdd}
           >
             <View style={styles.btnAdd}>
-              <AntDesign name={'plus'} size={27} color={colorHeader} />
+              <IconOutline name={'plus'} size={27} color={colorHeader} />
             </View>
           </TouchableOpacity>
         )}

package/src/commons/Unit/SharedUnit.js

@@ -1,7 +1,7 @@
 import React, { Fragment, useCallback } from 'react';
 import { View, Image, TouchableOpacity } from 'react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconFill, IconOutline } from '@ant-design/icons-react-native';
 
 import { API, Colors, Images } from '../../configs';
 import Text from '../../commons/Text';
@@ -91,7 +91,7 @@ const SharedUnit = ({
         {isOptions && (
           <Fragment>
             {item.is_pin ? (
-              <AntDesign
+              <IconFill
                 name="pushpin"
                 size={20}
                 color={Colors.Blue10}
@@ -99,15 +99,15 @@ const SharedUnit = ({
                 accessibilityLabel={`${AccessibilityLabel.ICON_REMOVE_PIN_SHARED_UNIT}-${item.id}`}
               />
             ) : (
-              <AntDesign
-                name="pushpino"
+              <IconOutline
+                name="pushpin"
                 size={20}
                 onPress={addPinSharedUnit}
                 accessibilityLabel={`${AccessibilityLabel.ICON_ADD_PIN_SHARED_UNIT}-${item.id}`}
               />
             )}
             {item.is_star ? (
-              <AntDesign
+              <IconFill
                 name="star"
                 size={20}
                 color={Colors.Yellow6}
@@ -115,8 +115,8 @@ const SharedUnit = ({
                 accessibilityLabel={`${AccessibilityLabel.ICON_REMOVE_STAR_SHARED_UNIT}-${item.id}`}
               />
             ) : (
-              <AntDesign
-                name="staro"
+              <IconOutline
+                name="star"
                 size={20}
                 onPress={addStarSharedUnit}
                 accessibilityLabel={`${AccessibilityLabel.ICON_ADD_STAR_SHARED_UNIT}-${item.id}`}

package/src/commons/Widgets/IFrameWithConfig/IFrameWithConfig.js

@@ -9,16 +9,10 @@ import { useFetchConfigHistory } from '../../UnitSummary/ConfigHistoryChart';
 import API from '../../../configs/API';
 import WebView from 'react-native-webview';
 import { TouchableOpacity, View } from 'react-native';
-import { useRemoteControl } from '../../../hooks/IoT';
-import { useSCContextSelector } from '../../../context';
 
 const IFrameWithConfig = memo(
-  ({ item = {}, widgetStyle, isWidgetBox, isSetting, isEditing }) => {
+  ({ item = {}, widgetStyle, isWidgetBox, isSetting, isEditing, doAction }) => {
     const ref = useRef();
-    const sendRemoteCommand = useRemoteControl();
-    const userId = useSCContextSelector(
-      (state) => state?.auth?.account?.user?.id
-    );
 
     const { configuration } = item;
     const { url } = configuration || {};
@@ -73,7 +67,7 @@ const IFrameWithConfig = memo(
     }, [item?.id, url]);
 
     const triggerAction = useCallback(
-      async ({ actionKey, actionIndex, data }) => {
+      async ({ actionKey, actionIndex, data, interrupted = false, silent }) => {
         let action = null;
         if (!configuration?.actions) {
           return;
@@ -90,14 +84,9 @@ const IFrameWithConfig = memo(
         if (!action) {
           return;
         }
-        await sendRemoteCommand(
-          action.action_data.end_device,
-          action.action_data,
-          data,
-          userId
-        );
+        await doAction(action.action_data, data, interrupted, silent);
       },
-      [configuration?.actions, sendRemoteCommand, userId]
+      [configuration?.actions, doAction]
     );
 
     const onMessage = useCallback(

package/src/commons/Widgets/IFrameWithConfig/__tests__/IFrameWithConfig.test.js

@@ -12,13 +12,6 @@ import { TouchableOpacity, View } from 'react-native';
 import { refFunctions } from '../../../../../__mocks__/react-native-webview';
 
 const mockDoAction = jest.fn();
-jest.mock('../../../../hooks/IoT', () => {
-  return {
-    ...jest.requireActual('../../../../hooks/IoT'),
-    useRemoteControl: () => mockDoAction,
-  };
-});
-
 jest.mock('../../../../iot/states', () => {
   return {
     ...jest.requireActual('../../../../iot/states'),
@@ -48,7 +41,9 @@ describe('Test IFrame With Config', () => {
   });
 
   test('test with widget box', async () => {
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig doAction={mockDoAction} isWidgetBox item={item} />
+    );
 
     const iframes = root.findAllByType(WebView);
     expect(iframes).toHaveLength(1);
@@ -60,7 +55,9 @@ describe('Test IFrame With Config', () => {
 
   test('test with query string', async () => {
     item.configuration.url = 'http://localhost:3000/?test=1';
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
 
     const iframes = root.findAllByType(WebView);
     expect(iframes).toHaveLength(1);
@@ -71,7 +68,9 @@ describe('Test IFrame With Config', () => {
   });
 
   test('test reload', async () => {
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
 
     const buttons = root.findAllByType(TouchableOpacity);
     expect(buttons).toHaveLength(1);
@@ -84,7 +83,9 @@ describe('Test IFrame With Config', () => {
   });
 
   test('test iframe is ready', async () => {
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -129,7 +130,9 @@ describe('Test IFrame With Config', () => {
   });
 
   test('test iframe request more height', async () => {
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -151,7 +154,9 @@ describe('Test IFrame With Config', () => {
   });
 
   test('test iframe receive message from unexpected origin', async () => {
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -187,7 +192,9 @@ describe('Test IFrame With Config', () => {
     item.configuration.history_configs = [{ id: 1 }];
     item.configuration.realtime_configs = [];
 
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -226,7 +233,9 @@ describe('Test IFrame With Config', () => {
     item.configuration.history_configs = [{ id: 1 }];
     item.configuration.realtime_configs = [];
 
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -303,7 +312,9 @@ describe('Test IFrame With Config', () => {
     ]
   ) => {
     item.configuration.actions = actions;
-    const { root } = await render(<IFrameWithConfig isWidgetBox item={item} />);
+    const { root } = await render(
+      <IFrameWithConfig isWidgetBox doAction={mockDoAction} item={item} />
+    );
     const webview = root.findByType(WebView);
 
     await act(async () => {
@@ -324,9 +335,9 @@ describe('Test IFrame With Config', () => {
   test('test iframe trigger action', async () => {
     await triggerAction({ actionKey: 'xxx' });
     expect(mockDoAction).toHaveBeenCalledWith(
-      item.configuration.actions[0].action_data.end_device,
       item.configuration.actions[0].action_data,
       undefined,
+      false,
       undefined
     );
   });
@@ -334,9 +345,9 @@ describe('Test IFrame With Config', () => {
   test('test iframe trigger by index', async () => {
     await triggerAction({ actionIndex: 0 });
     expect(mockDoAction).toHaveBeenCalledWith(
-      item.configuration.actions[0].action_data.end_device,
       item.configuration.actions[0].action_data,
       undefined,
+      false,
       undefined
     );
   });

package/src/configs/API.js

@@ -54,7 +54,7 @@ const API = {
     JSON_CONFIGURATION: '/chip_manager/chips/json_configuration/',
   },
   DEVICE: {
-    SENSOR_DETAIL: (id) => `/property_manager/devices/${id}/`,
+    DEVICE_DETAIL: (id) => `/property_manager/devices/${id}/`,
     DISPLAY: (id) => `/property_manager/devices/${id}/display/`,
     SIDE_MENU_DETAIL: (id, side_menu_id) =>
       `/property_manager/devices/${id}/display/side_menu/${side_menu_id}/`,

package/src/configs/AccessibilityLabel.js

@@ -239,6 +239,7 @@ export default {
   BUTTON_ADD_SCRIPT_ACTION: 'BUTTON_ADD_SCRIPT_ACTION',
   ICON_CLOSE: 'ICON_CLOSE',
   ICON_MORE: 'ICON_MORE',
+  ICON_MENU_POPUP: 'ICON_MENU_POPUP',
   ICON_ARROW_RIGHT: 'ICON_ARROW_RIGHT',
   TEXT_AUTOMATE_NAME: 'TEXT_AUTOMATE_NAME',
   AUTOMATE_LIST_SCRIPT_ACTION: 'AUTOMATE_LIST_SCRIPT_ACTION',

package/src/configs/Theme.js

@@ -86,7 +86,7 @@ export default StyleSheet.create({
     alignItems: 'center',
   },
   menuIcon: {
-    paddingLeft: 16,
+    paddingRight: 10,
     height: '100%',
     justifyContent: 'center',
   },

package/src/hooks/IoT/__test__/useRemoteControl.test.js

@@ -81,7 +81,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverInternet).not.toBeCalled();
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
@@ -106,13 +107,15 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverInternet).toBeCalledWith(
       sensor,
       action,
       data,
-      'bluetooth'
+      'bluetooth',
+      false
     );
     expect(sendCommandOverInternet).toBeCalledTimes(1);
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
@@ -143,7 +146,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverInternet).not.toBeCalled();
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
@@ -181,7 +185,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
   });
@@ -202,7 +207,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      'internet'
+      'internet',
+      false
     );
     expect(sendCommandOverInternet).toBeCalledTimes(1);
     expect(sendCommandOverBluetooth).not.toBeCalled();
@@ -303,7 +309,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      'bluetooth'
+      'bluetooth',
+      false
     );
     expect(sendCommandOverBluetooth).toBeCalledTimes(6);
     expect(sendCommandOverInternet).toBeCalledTimes(1);