@eohjsc/react-native-smart-city 0.3.77 → 0.3.79

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.77",
+  "version": "0.3.79",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/ActionGroup/OptionsDropdownActionTemplate.js

@@ -105,7 +105,7 @@ const OptionsDropdownActionTemplate = ({
     if (!config) {
       return t('not_available');
     }
-    return selectedOption.text;
+    return selectedOption?.text;
   }, [config, selectedOption?.text, t]);
 
   const iconSvg = useMemo(() => {
@@ -190,7 +190,7 @@ const OptionsDropdownActionTemplate = ({
                     setSelectedIndex(index);
                   }}
                 >
-                  <Text style={styles.text}>{item.text}</Text>
+                  <Text style={styles.text}>{item?.text}</Text>
                 </TouchableOpacity>
               </View>
             ))}

package/src/commons/ActionGroup/TimerActionTemplate.js

@@ -214,6 +214,7 @@ const TimerActionTemplate = ({ actionGroup = {}, doAction, sensor = {} }) => {
         onConfirm={onConfirmTime}
         onCancel={onHideTime}
         display="spinner"
+        headerTextIOS={t('pick_a_date')}
         cancelTextIOS={t('cancel')}
         confirmTextIOS={t('confirm')}
       />

package/src/commons/Device/FlatListItems.js

@@ -49,7 +49,7 @@ const FlatListItems = memo(({ data, style, title, offsetTitle }) => {
         key={item?.id}
         standard={item.standard}
         value={item.value}
-        measure={item.measure}
+        measure={item.unit}
         evaluate={item.evaluate}
         style={styles.boxStatus}
         descriptionScreen={Routes.TDSGuide}

package/src/commons/Device/HistoryChart.js

@@ -241,6 +241,7 @@ const HistoryChart = memo(
           onConfirm={onConfirmStart}
           onCancel={onCancel}
           display="spinner"
+          headerTextIOS={t('pick_a_date')}
           cancelTextIOS={t('cancel')}
           confirmTextIOS={t('confirm')}
         />
@@ -251,6 +252,7 @@ const HistoryChart = memo(
           onConfirm={onConfirmEnd}
           onCancel={onCancel}
           display="spinner"
+          headerTextIOS={t('pick_a_date')}
           cancelTextIOS={t('cancel')}
           confirmTextIOS={t('confirm')}
         />

package/src/commons/Device/PMSensor/PMSensorIndicator.js

@@ -21,7 +21,7 @@ const PMSensorIndicator = memo(({ data = [], style }) => {
           standard={item.standard}
           value={getValue}
           evaluate={item.evaluate}
-          measure={item.measure}
+          measure={item.unit}
           style={style}
         />
       );

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

@@ -17,7 +17,7 @@ const ListQualityIndicator = ({ data, style }) => {
         standard={item.standard}
         value={getValue}
         evaluate={item.evaluate}
-        measure={item.measure}
+        measure={item.unit}
       />
     );
   }, []);

package/src/configs/API.js

@@ -53,7 +53,7 @@ const API = {
   },
   DEVICE: {
     SENSOR_DETAIL: (id) => `/property_manager/sensors/${id}/`,
-    DISPLAY: (id) => `/property_manager/sensors/${id}/display/`,
+    DISPLAY: (id) => `/property_manager/devices/${id}/display/`,
     SIDE_MENU_DETAIL: (id, side_menu_id) =>
       `/property_manager/devices/${id}/display/side_menu/${side_menu_id}/`,
     DISPLAY_VALUES_V2: (id) =>

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useRemoteControl } from '../index';
 import {
+  BLUETOOOH_DEVICE_UNSTABLE,
   sendCommandOverBluetooth,
   SEND_COMMAND_OVER_BLUETOOTH_FAIL,
 } from '../../../iot/RemoteControl/Bluetooth';
@@ -91,7 +92,7 @@ describe('Test useRemoteControl', () => {
     });
 
     sendCommandOverBluetooth.mockImplementation(() => {
-      throw SEND_COMMAND_OVER_BLUETOOTH_FAIL;
+      return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
     });
     sendCommandOverInternet.mockImplementation(async () => true);
     await act(async () => {
@@ -109,7 +110,7 @@ describe('Test useRemoteControl', () => {
       data,
       'bluetooth'
     );
-    expect(sendCommandOverInternet).toBeCalledTimes(6);
+    expect(sendCommandOverInternet).toBeCalledTimes(1);
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
   });
 
@@ -127,7 +128,7 @@ describe('Test useRemoteControl', () => {
     });
 
     sendCommandOverBluetooth.mockImplementation(() => {
-      throw SEND_COMMAND_OVER_BLUETOOTH_FAIL;
+      return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
     });
     sendCommandOverInternet.mockImplementation(async () => true);
     await act(async () => {
@@ -176,7 +177,6 @@ describe('Test useRemoteControl', () => {
       data,
       userId
     );
-    expect(sendCommandOverInternet).toBeCalled();
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
   });
 
@@ -244,4 +244,57 @@ describe('Test useRemoteControl', () => {
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
     expect(sendCommandOverBluetooth).not.toBeCalled();
   });
+
+  it('test send remote command via bluetooth case when bluetooh device unstable', async () => {
+    action.command_prefer_over_bluetooth = true;
+    action.command_prefer_over_internet = false;
+    const { result: sendRemoteCommand } = renderHook(() => useRemoteControl(), {
+      wrapper,
+    });
+
+    sendCommandOverBluetooth.mockImplementation(() => {
+      return BLUETOOOH_DEVICE_UNSTABLE;
+    });
+    await act(async () => {
+      await sendRemoteCommand.current(sensor, action, data, userId);
+    });
+    expect(sendCommandOverBluetooth).toBeCalledWith(
+      sensor,
+      action,
+      data,
+      userId
+    );
+    expect(sendCommandOverBluetooth).toBeCalledTimes(6);
+  });
+
+  // eslint-disable-next-line max-len
+  it('test send remote command via bluetooth case when bluetooh device unstable 5 times will switch send internet', async () => {
+    action.command_prefer_over_bluetooth = true;
+    action.command_prefer_over_internet = false;
+    const { result: sendRemoteCommand } = renderHook(() => useRemoteControl(), {
+      wrapper,
+    });
+
+    sendCommandOverBluetooth.mockImplementation(() => {
+      return BLUETOOOH_DEVICE_UNSTABLE;
+    });
+    sendCommandOverInternet.mockImplementation(async () => true);
+    await act(async () => {
+      await sendRemoteCommand.current(sensor, action, data, userId);
+    });
+    expect(sendCommandOverBluetooth).toBeCalledWith(
+      sensor,
+      action,
+      data,
+      userId
+    );
+    expect(sendCommandOverInternet).toBeCalledWith(
+      sensor,
+      action,
+      data,
+      'bluetooth'
+    );
+    expect(sendCommandOverBluetooth).toBeCalledTimes(6);
+    expect(sendCommandOverInternet).toBeCalledTimes(1);
+  });
 });

package/src/hooks/IoT/useRemoteControl.js

@@ -6,18 +6,25 @@ import { sendCommandOverInternet } from '../../iot/RemoteControl/Internet';
 import {
   sendCommandOverBluetooth,
   SEND_COMMAND_OVER_BLUETOOTH_FAIL,
+  BLUETOOOH_DEVICE_UNSTABLE,
 } from '../../iot/RemoteControl/Bluetooth';
 import { ToastBottomHelper } from '../../utils/Utils';
 import { t } from 'i18n-js';
 import NetInfo from '@react-native-community/netinfo';
 
-let count = 0;
-
-const onRetry = (callback) => {
-  const to = setTimeout(() => {
-    callback;
-    clearTimeout(to);
-  }, 200);
+const handleReconnectionDeviceBle = async (device, action, data, userId) => {
+  for (let i = 0; i < 5; i++) {
+    let promise = new Promise((resolve) =>
+      setTimeout(() => {
+        resolve(sendCommandOverBluetooth(device, action, data, userId));
+      }, 200)
+    );
+    const resultPromise = await promise;
+    if (resultPromise === true) {
+      return resultPromise;
+    }
+  }
+  return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
 };
 
 const useRemoteControl = () => {
@@ -36,47 +43,31 @@ const useRemoteControl = () => {
         return result;
       }
 
-      if (action.command_prefer_over_bluetooth && count < 5) {
-        count++;
-        try {
-          const res = await sendCommandOverBluetooth(
-            device,
-            action,
-            data,
-            userId
-          );
-          if (res) {
-            count = 0;
-            return res;
-          } else {
-            onRetry(sendRemoteCommand(device, action, data, userId));
-          }
-        } catch (err) {
-          onRetry(sendRemoteCommand(device, action, data, userId));
+      if (action.command_prefer_over_bluetooth) {
+        let res = await sendCommandOverBluetooth(device, action, data, userId);
+        if (res === BLUETOOOH_DEVICE_UNSTABLE) {
+          res = await handleReconnectionDeviceBle(device, action, data, userId);
+        }
+        if (res === SEND_COMMAND_OVER_BLUETOOTH_FAIL) {
           const netState = await NetInfo.fetch();
           if (netState.isConnected) {
             result = false;
-
-            if (err === SEND_COMMAND_OVER_BLUETOOTH_FAIL) {
-              // Checking only bluetooth: not force internet
-              if (!action.is_only_bluetooth) {
-                result = await sendCommandOverInternet(
-                  device,
-                  action,
-                  data,
-                  'bluetooth'
-                );
-              }
-              return result;
-            } else {
-              throw err;
+            // Checking only bluetooth: not force internet
+            if (!action.is_only_bluetooth) {
+              result = await sendCommandOverInternet(
+                device,
+                action,
+                data,
+                'bluetooth'
+              );
             }
+            return result;
           } else {
             return false;
           }
         }
+        return res;
       }
-      count = 0;
       // Checking only bluetooth: not other options
       if (action.is_only_bluetooth) {
         ToastBottomHelper.error(

package/src/iot/RemoteControl/Bluetooth.js

@@ -15,6 +15,8 @@ let isScanning = false;
 export const SEND_COMMAND_OVER_BLUETOOTH_FAIL =
   'SEND_COMMAND_OVER_BLUETOOTH_FAIL';
 
+export const BLUETOOOH_DEVICE_UNSTABLE = 'BLUETOOOH_DEVICE_UNSTABLE';
+
 export const clearNeedToScanDevices = () => {
   needToScanDevices.length = 0;
 };
@@ -144,7 +146,7 @@ export const sendDataOverBluetooth = async (
   keepConnect = false
 ) => {
   if (!device) {
-    throw SEND_COMMAND_OVER_BLUETOOTH_FAIL;
+    return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
   }
 
   ToastBottomHelper.error(t('Sending command via bluetooth'));
@@ -155,6 +157,20 @@ export const sendDataOverBluetooth = async (
 
   try {
     connectedDevice = await device.connect();
+  } catch (e) {
+    const BLE_ERROR = {
+      DEVICE_IS_NOT_ALREADY_CONNECTED: 201,
+      DEVICE_WAS_DISCONNECTED: 203,
+    };
+    if (
+      e?.errorCode === BLE_ERROR.DEVICE_IS_NOT_ALREADY_CONNECTED ||
+      BLE_ERROR.DEVICE_WAS_DISCONNECTED
+    ) {
+      await bleManager.cancelDeviceConnection(device.id);
+      return BLUETOOOH_DEVICE_UNSTABLE;
+    }
+  }
+  try {
     fullDataDevice =
       await connectedDevice.discoverAllServicesAndCharacteristics();
     await fullDataDevice.monitorCharacteristicForService(
@@ -170,8 +186,10 @@ export const sendDataOverBluetooth = async (
             await connectedDevice.cancelConnection();
           }
         } else if (notify === BLE.BLE_RESPONSE_FAILED) {
+          await connectedDevice.cancelConnection();
           ToastBottomHelper.error(t('control_device_via_bluetooth_failed'));
         }
+        await bleManager.cancelTransaction(BLE.BLE_LISTER_RESPONSE_CONTROL);
       },
       BLE.BLE_LISTER_RESPONSE_CONTROL
     );
@@ -184,7 +202,7 @@ export const sendDataOverBluetooth = async (
   } catch (e) {
     await connectedDevice.cancelConnection();
     ToastBottomHelper.error(t('command_is_fail_to_send_via_bluetooth'));
-    throw SEND_COMMAND_OVER_BLUETOOTH_FAIL;
+    return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
   }
 
   if (keepConnect) {

package/src/screens/ActivityLog/FilterPopup.js

@@ -257,6 +257,7 @@ const FilterPopup = ({
         onCancel={onPickerCancel}
         onHide={releaseLockShowing}
         display="spinner"
+        headerTextIOS={t('pick_a_date')}
         cancelTextIOS={t('cancel')}
         confirmTextIOS={t('confirm')}
       />

package/src/screens/AddNewAction/SelectAction.js

@@ -169,7 +169,7 @@ const SelectAction = memo(({ route }) => {
       Alert.alert('', t('choose_only_one'));
       return;
     }
-    if (isSelectSensor || isSetupEvent) {
+    if (isSelectSensor || sensorData?.length > 0) {
       await checkConditionToContinue();
     } else {
       if (automateId) {

package/src/screens/AddNewGateway/ConnectingDevice.js

@@ -52,7 +52,7 @@ const ConnectingDevice = ({
 
   useEffect(() => {
     timeout = setTimeout(() => {
-      Alert.alert(t('continue_to_wait'), t('it_has_been_5_minutes'), [
+      Alert.alert(t('continue_to_wait'), t('it_has_been_2_minutes'), [
         {
           text: t('back'),
           onPress: goBack,

package/src/screens/AddNewGateway/RenameNewDevices.js

@@ -2,8 +2,6 @@ import React, { memo, useCallback, useEffect, useState, useMemo } from 'react';
 import { ScrollView, TouchableOpacity, View } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { CommonActions, useNavigation } from '@react-navigation/native';
-import debounce from 'lodash.debounce';
-
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { Colors } from '../../configs';
 import Text from '../../commons/Text';
@@ -16,6 +14,8 @@ import { axiosGet, axiosPost } from '../../utils/Apis/axios';
 import API from '../../configs/API';
 import { HeaderCustom } from '../../commons/Header';
 import IconComponent from '../../commons/IconComponent';
+import FullLoading from '../../commons/FullLoading';
+import { ToastBottomHelper } from '../../utils/Utils';
 
 const RenameNewDevices = memo(({ route }) => {
   const t = useTranslations();
@@ -26,6 +26,9 @@ const RenameNewDevices = memo(({ route }) => {
   const [selectedItem, setSelectedItem] = useState({});
   const [isCanRename, setIsCanRename] = useState(false);
   const [info, setInfo] = useState({});
+  const [loading, setLoading] = useState(false);
+  const [isChangedName, setIsChangedName] = useState(false);
+  const [isDisabled, setIsDisabled] = useState(false);
 
   const renameLabel = AccessibilityLabel.CONNECTED_DEVICE_RENAME_DEVICE;
 
@@ -50,40 +53,55 @@ const RenameNewDevices = memo(({ route }) => {
     return baseHeight + contentItems * 25;
   }, [addDeviceType, info.sensors]);
 
-  const callApiRenameDevices = useCallback(async () => {
-    const { success } = await axiosPost(API.CHIP.RENAME_DEVICES(info.id), info);
-    if (success) {
-      const resetAction = CommonActions.reset({
-        index: 0,
-        routes: [
-          {
-            name: Routes.Main,
+  const goBackUnitDetail = useCallback(() => {
+    const resetAction = CommonActions.reset({
+      index: 0,
+      routes: [
+        {
+          name: Routes.Main,
+          params: {
+            screen: Routes.DashboardStack,
             params: {
-              screen: Routes.DashboardStack,
-              params: {
-                screen: Routes.Dashboard,
-              },
+              screen: Routes.Dashboard,
             },
           },
-          {
-            name: Routes.UnitStack,
+        },
+        {
+          name: Routes.UnitStack,
+          params: {
+            screen: Routes.UnitDetail,
             params: {
-              screen: Routes.UnitDetail,
-              params: {
-                unitId: unit?.id,
-                stationId: subUnit?.id,
-                isSuccessfullyConnected: true,
-                routeName: Routes.DashboardStack,
-              },
+              unitId: unit?.id,
+              stationId: subUnit?.id,
+              isSuccessfullyConnected: true,
+              routeName: Routes.DashboardStack,
             },
           },
-        ],
-      });
-      dispatch(resetAction);
-    }
-  }, [dispatch, info, subUnit?.id, unit?.id]);
+        },
+      ],
+    });
+    dispatch(resetAction);
+  }, [dispatch, subUnit?.id, unit?.id]);
 
-  const onPressDone = debounce(() => callApiRenameDevices(), 2000);
+  const onPressDone = useCallback(async () => {
+    if (!isChangedName) {
+      setIsDisabled(true);
+      const clear = setTimeout(() => {
+        setIsDisabled(false);
+        clearTimeout(clear);
+      }, 3000);
+      goBackUnitDetail();
+      return;
+    }
+    setLoading(true);
+    const { success } = await axiosPost(API.CHIP.RENAME_DEVICES(info.id), info);
+    if (success) {
+      goBackUnitDetail();
+    } else {
+      ToastBottomHelper.error(t('rename_device_fail'));
+    }
+    setLoading(false);
+  }, [goBackUnitDetail, info, isChangedName, t]);
 
   useEffect(() => {
     (async () => {
@@ -104,6 +122,7 @@ const RenameNewDevices = memo(({ route }) => {
   }, [chipId, sensorId, subUnit]);
 
   const updateItemName = (type, sensor_index, end_device_index) => (value) => {
+    setIsChangedName(!!value);
     setInfo((currentInfo) => {
       if (type === 'chip') {
         return { ...currentInfo, name: value };
@@ -260,10 +279,12 @@ const RenameNewDevices = memo(({ route }) => {
           </Text>
         </View>
       </View>
+      {loading && <FullLoading />}
       <TouchableOpacity
         style={styles.btnDone}
         onPress={onPressDone}
         accessibilityLabel={AccessibilityLabel.BUTTON_DONE}
+        disabled={isDisabled}
       >
         <Text semibold size={16} color={Colors.Primary}>
           {t('done')}

package/src/screens/AddNewGateway/__test__/RenameNewDevices.test.js

@@ -24,8 +24,6 @@ const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 const mockedDispatch = jest.fn();
 
-jest.mock('lodash.debounce', () => jest.fn((fn) => fn));
-
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
@@ -47,6 +45,62 @@ describe('Test rename new devices', () => {
         `${AccessibilityLabel.CONNECTED_DEVICE_RENAME_DEVICE}_LIST_ITEM_RENAME`
     );
   };
+  const routeTree = (type) => {
+    switch (type) {
+      case 'wifi':
+        route = {
+          params: {
+            unitId: 1,
+            sensorId: 1,
+            stationId: 2,
+            chipId: 3,
+            qrData: {},
+            addDeviceType: 'wifi',
+          },
+        };
+        break;
+      case 'gateway':
+        route = {
+          params: {
+            unitId: 1,
+            stationId: 2,
+            chipId: 3,
+            qrData: {},
+            addDeviceType: 'gateway',
+          },
+        };
+        break;
+    }
+  };
+  const mockedDispatchNavigate = () => {
+    expect(mockedDispatch).toBeCalledWith({
+      payload: {
+        index: 0,
+        routes: [
+          {
+            name: 'Main',
+            params: {
+              params: { screen: 'Dashboard' },
+              screen: 'DashboardStack',
+            },
+          },
+          {
+            name: 'UnitStack',
+            params: {
+              params: {
+                isSuccessfullyConnected: true,
+                routeName: 'DashboardStack',
+                stationId: undefined,
+                unitId: undefined,
+              },
+              screen: 'UnitDetail',
+            },
+          },
+        ],
+      },
+      type: 'RESET',
+    });
+  };
   const onPressToRename = async (instance) => {
     const button = instance.findAll(
       (el) =>
@@ -77,15 +131,7 @@ describe('Test rename new devices', () => {
   });
 
   it('rendering base', async () => {
-    route = {
-      params: {
-        unitId: 1,
-        stationId: 2,
-        chipId: 3,
-        qrData: {},
-        addDeviceType: 'gateway',
-      },
-    };
+    routeTree('gateway');
     mock.onGet().reply(200, {
       id: 1,
       name: 'chip',
@@ -126,16 +172,7 @@ describe('Test rename new devices', () => {
   });
 
   it('rendering one end device', async () => {
-    route = {
-      params: {
-        unitId: 1,
-        sensorId: 1,
-        stationId: 2,
-        chipId: 3,
-        qrData: {},
-        addDeviceType: 'wifi',
-      },
-    };
+    routeTree('wifi');
     mock.onGet().reply(200, {
       id: 1,
       name: 'chip',
@@ -162,16 +199,7 @@ describe('Test rename new devices', () => {
   });
 
   it('rendering two end device', async () => {
-    route = {
-      params: {
-        unitId: 1,
-        sensorId: 1,
-        stationId: 2,
-        chipId: 3,
-        qrData: {},
-        addDeviceType: 'wifi',
-      },
-    };
+    routeTree('wifi');
     mock.onGet().reply(200, {
       id: 1,
       name: 'chip',
@@ -202,16 +230,7 @@ describe('Test rename new devices', () => {
   });
 
   it('rendering three end device', async () => {
-    route = {
-      params: {
-        unitId: 1,
-        sensorId: 1,
-        stationId: 2,
-        chipId: 3,
-        qrData: {},
-        addDeviceType: 'wifi',
-      },
-    };
+    routeTree('wifi');
     mock.onGet().reply(200, {
       id: 1,
       name: 'chip',
@@ -251,15 +270,7 @@ describe('Test rename new devices', () => {
       id: 1,
       name: 'chip',
     });
-    route = {
-      params: {
-        unitId: 1,
-        stationId: 2,
-        chipId: 3,
-        qrData: {},
-        addDeviceType: 'gateway',
-      },
-    };
+    routeTree('gateway');
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -289,15 +300,7 @@ describe('Test rename new devices', () => {
       id: 1,
       can_rename: true,
     });
-    route = {
-      params: {
-        unitId: 1,
-        stationId: 2,
-        chipId: 3,
-        qrData: {},
-        addDeviceType: 'gateway',
-      },
-    };
+    routeTree('gateway');
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -396,32 +399,43 @@ describe('Test rename new devices', () => {
         ],
       })
     );
-    expect(mockedDispatch).toBeCalledWith({
-      payload: {
-        index: 0,
-        routes: [
-          {
-            name: 'Main',
-            params: {
-              params: { screen: 'Dashboard' },
-              screen: 'DashboardStack',
-            },
-          },
-          {
-            name: 'UnitStack',
-            params: {
-              params: {
-                isSuccessfullyConnected: true,
-                routeName: 'DashboardStack',
-                stationId: undefined,
-                unitId: undefined,
-              },
-              screen: 'UnitDetail',
+    mockedDispatchNavigate();
+  });
+
+  it('onPressDone and goto detail not rename', async () => {
+    jest.useFakeTimers();
+    mock.onGet().reply(200, {
+      id: 1,
+      can_rename: true,
+      sensors: [
+        {
+          id: 1,
+          name: 'sensor',
+          end_devices: [
+            {
+              id: 1,
+              name: 'end_device',
             },
-          },
-        ],
-      },
-      type: 'RESET',
+          ],
+        },
+      ],
+    });
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const doneButton = instance.find(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.BUTTON_DONE &&
+        el.type === TouchableOpacity
+    );
+    await act(async () => {
+      doneButton.props.onPress();
+      jest.advanceTimersByTime(3000);
     });
+
+    expect(mock.history.post).toHaveLength(0);
+    mockedDispatchNavigate();
   });
 });

package/src/screens/AllGateway/DetailConfigActionZigbee/index.js

@@ -27,12 +27,18 @@ const DetailConfigActionZigbee = () => {
           (isAction && itemActionConfig?.control_payload) ||
           '--',
       },
+      {
+        id: 2,
+        title: (isConfig && 'release_time') || '',
+        data: isConfig && itemActionConfig?.config?.release_time,
+      },
     ],
     [
       isAction,
       isConfig,
       itemActionConfig?.action?.name,
       itemActionConfig?.config?.name,
+      itemActionConfig?.config?.release_time,
       itemActionConfig?.control_payload,
       itemActionConfig?.key,
     ]

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

@@ -491,6 +491,7 @@ describe('test DeviceDetail', () => {
                   standard: 'Temperature',
                   measure: '°C',
                   color: 'red',
+                  unit: '°C',
                 },
               ],
             },

package/src/screens/ScriptDetail/index.js

@@ -419,7 +419,7 @@ const ScriptDetail = ({ route }) => {
       [AUTOMATE_TYPE.EVENT, AUTOMATE_TYPE.EVENT_ACTION].includes(type)
     ) {
       const { action, end_device_name, config_name, sensor_type, value } =
-        automate?.event;
+        automate?.event || automate?.event_action || automate?.event_sensor;
       let textEvent = '';
       if (config_name) {
         const stateConditionData = STATE_VALUE_SENSOR_TYPES.find(

package/src/utils/I18n/translations/en.json

@@ -700,6 +700,7 @@
   "command_homeassistant_ready": "Home Assistant is connected",
   "command_homeassistant_lost": "Home Assistant is disconnection. Reconnecting...",
   "confirm": "Confirm",
+  "pick_a_date": "Pick a date",
   "car_validate_warning": "Please enter a right format of your license plate number \nEx:%{example}",
   "are_you_sure_this_resolved": "Are you sure this emergency situation has been resolved? All members in this unit will be notified.",
   "resolve_emergency": "Resolve",
@@ -1097,7 +1098,7 @@
   "no_zigbee_device_join_timeout": "No zigbee device join network after 2 minutes",
   "read_config_permission_error": "You don't have permission to read this config",
   "continue_to_wait": "Continue to wait?",
-  "it_has_been_5_minutes": "It has been 5 minutes...",
+  "it_has_been_2_minutes": "It has been 2 minutes...",
   "click_here_to_setup_device": "Click here to setup device",
   "text_under_development": "This feature is under development.",
   "text_working_hard": "We are working hard to get this running",
@@ -1115,5 +1116,7 @@
   "config_type": "Config type",
   "pin": "PIN",
   "pin_mode": "PIN mode",
+  "rename_device_fail": "Rename device fail",
+  "release_time": "Release time",
   "data_address": "Data address"
 }

package/src/utils/I18n/translations/vi.json

@@ -715,6 +715,7 @@
   "command_homeassistant_ready": "Home Assistant kết nối thành công",
   "command_homeassistant_lost": "Home Assistant bị mất kết nối. Đang kết nối lại...",
   "confirm": "Xác nhận",
+  "pick_a_date": "Chọn ngày",
   "car_validate_warning": "Vui lòng nhập đúng định dạng biển số xe \nVD: %{example}",
   "are_you_sure_this_resolved": "Bạn có chắc tình huống khẩn cấp này đã được xử lý xong? Các thành viên thuộc địa điểm này cũng sẽ nhận được thông báo.",
   "resolve_emergency": "Xử lý tình huống khẩn cấp",
@@ -1096,7 +1097,7 @@
   "no_zigbee_device_join_timeout": "Không có thiết bị zigbee nào được thêm vào sau 2 phút",
   "read_config_permission_error": "Bạn không có quyền đọc cấu hình này",
   "continue_to_wait": "Bạn có muốn đợi tiếp?",
-  "it_has_been_5_minutes": "Đã 5 phút trôi qua...",
+  "it_has_been_2_minutes": "Đã 2 phút trôi qua...",
   "click_here_to_setup_device": "Chọn thiết bị thêm vào phòng",
   "text_alert_modal_popup_ct": "Đây là một hành động quan trọng và không thể hoàn tác.",
   "text_understand_modal_popup_ct": "Tôi hoàn toàn hiểu rằng hành động này là quan trọng và sẽ dẫn đến mất dữ liệu.",
@@ -1114,5 +1115,7 @@
   "config_type": "Loại cấu hình",
   "pin": "PIN",
   "pin_mode": "Chế độ mã PIN",
+  "rename_device_fail": "Đổi tên thiết bị thất bại",
+  "release_time": "Thời gian nhả trạng thái",
   "data_address": "Địa chỉ dữ liệu"
 }