@eohjsc/react-native-smart-city 0.3.23 → 0.3.24

package/package.json

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

package/src/commons/ActionGroup/CurtainButtonTemplate.js

@@ -9,11 +9,8 @@ import { Colors, Images } from '../../configs';
 const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const { configuration } = actionGroup;
   const {
-    text_open,
     open_action_data,
-    text_stop,
     stop_action_data,
-    text_close,
     close_action_data,
     action_off_data,
     action_on_data,
@@ -26,31 +23,26 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const [lock, setLock] = useState(false);
 
   const onButtonOpenPress = useCallback(() => {
-    const actionName = `${sensor?.name} ${text_open?.toLowerCase()}`;
-    doAction(open_action_data, null, actionName);
-  }, [open_action_data, text_open, doAction, sensor?.name]);
+    doAction(open_action_data, null);
+  }, [open_action_data, doAction]);
 
   const onButtonStopPress = useCallback(() => {
-    const actionName = `${sensor?.name} ${text_stop?.toLowerCase()}`;
-    doAction(stop_action_data, null, actionName);
-  }, [stop_action_data, text_stop, doAction, sensor?.name]);
+    doAction(stop_action_data, null);
+  }, [stop_action_data, doAction]);
 
   const onButtonClosePress = useCallback(() => {
-    const actionName = `${sensor?.name} ${text_close?.toLowerCase()}`;
-    doAction(close_action_data, null, actionName);
-  }, [close_action_data, text_close, doAction, sensor?.name]);
+    doAction(close_action_data, null);
+  }, [close_action_data, doAction]);
 
   const onChangeSwitch = useCallback(() => {
     if (lock) {
-      const actionName = `${sensor?.name} unlock`;
       setLock(false);
-      doAction(action_off_data, null, actionName);
+      doAction(action_off_data, null);
       return;
     }
-    const actionName = `${sensor?.name} lock`;
-    doAction(action_on_data, null, actionName);
+    doAction(action_on_data, null);
     setLock(true);
-  }, [action_off_data, action_on_data, doAction, lock, sensor?.name]);
+  }, [action_off_data, action_on_data, doAction, lock]);
 
   const RenderThreeButtonActions = () => {
     const buttons = [

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -39,7 +39,7 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
   }, [JSON.stringify(configValues)]);
 
   const doActionAndWatchConfig = useCallback(
-    async (actionData, actionValue, actionName) => {
+    async (actionData, actionValue) => {
       let data = actionValue;
       if (sensor.device_type !== DEVICE_TYPE.GOOGLE_HOME) {
         data = { temperature: actionValue };
@@ -49,7 +49,7 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
         }
         data = JSON.stringify(data);
       }
-      await doAction(actionData, data, actionName);
+      await doAction(actionData, data);
       if (!sensor?.is_managed_by_backend) {
         return;
       }
@@ -73,18 +73,16 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
   useUnwatchLGDeviceConfigControl(sensor, [config]);
 
   const doActionUp = useCallback(async () => {
-    const actionName = `${sensor?.name} temp up`;
     const newValue = checkMinMax(value + 1);
-    doActionAndWatchConfig(action_data, newValue, actionName);
+    doActionAndWatchConfig(action_data, newValue);
     setValue(newValue);
-  }, [sensor?.name, checkMinMax, value, doActionAndWatchConfig, action_data]);
+  }, [checkMinMax, value, doActionAndWatchConfig, action_data]);
 
   const doActionDown = useCallback(async () => {
-    const actionName = `${sensor?.name} temp down`;
     const newValue = checkMinMax(value - 1);
-    doActionAndWatchConfig(action_data, newValue, actionName);
+    doActionAndWatchConfig(action_data, newValue);
     setValue(newValue);
-  }, [sensor?.name, checkMinMax, value, doActionAndWatchConfig, action_data]);
+  }, [checkMinMax, value, doActionAndWatchConfig, action_data]);
 
   const checkMinMax = useCallback(
     (tempValue) => {

package/src/commons/ActionGroup/OnOffSmartLock/OnOffSmartLock.js

@@ -21,19 +21,11 @@ const OnOffSmartLock = memo(({ actionGroup, doAction, sensor }) => {
   const handleActionSmartLock = useCallback(async () => {
     if (action_on_data && action_off_data) {
       if (isUnlock) {
-        let actionName = `${
-          sensor?.name
-        } ${actionGroup?.title?.toLowerCase()} lock`;
-        actionName = actionName.replace(/\s+/g, ' ').trim();
         const dataLock = { door_lock: 0 };
-        await doAction(action_on_data, JSON.stringify(dataLock), actionName);
+        await doAction(action_on_data, JSON.stringify(dataLock));
       } else {
-        let actionName = `${
-          sensor?.name
-        } ${actionGroup?.title?.toLowerCase()} unlock`;
-        actionName = actionName.replace(/\s+/g, ' ').trim();
         const dataUnlock = { door_lock: 1 };
-        await doAction(action_off_data, JSON.stringify(dataUnlock), actionName);
+        await doAction(action_off_data, JSON.stringify(dataUnlock));
       }
       if (sensor?.is_managed_by_backend) {
         configuration.config &&
@@ -42,15 +34,13 @@ const OnOffSmartLock = memo(({ actionGroup, doAction, sensor }) => {
       }
     }
   }, [
-    actionGroup?.title,
     action_off_data,
     action_on_data,
     doAction,
     isUnlock,
-    sensor?.name,
     configuration,
     sensor?.is_managed_by_backend,
-    sensor?.device_type,
+    sensor.device_type,
   ]);
 
   useUnwatchLGDeviceConfigControl(sensor, [configuration.config]);

package/src/commons/ActionGroup/OnOffTemplate/index.js

@@ -45,32 +45,14 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
     }, 2500);
   };
 
-  const actionName = useCallback(
-    (text) => {
-      const actionNameType = `${
-        sensor?.name
-      } ${actionGroup?.title?.toLowerCase()} ${text}`;
-      return actionNameType.replace(/\s+/g, ' ').trim();
-    },
-    [actionGroup?.title, sensor?.name]
-  );
-
   const triggerAction = useCallback(async () => {
     switch (sensor?.device_type) {
       case DEVICE_TYPE.ZIGBEE:
         if (action_on_data && action_off_data) {
           if (isOn) {
-            await doAction(
-              action_off_data,
-              JSON.stringify({ state: 0 }),
-              actionName('off')
-            );
+            await doAction(action_off_data, JSON.stringify({ state: 0 }));
           } else {
-            await doAction(
-              action_on_data,
-              JSON.stringify({ state: 1 }),
-              actionName('on')
-            );
+            await doAction(action_on_data, JSON.stringify({ state: 1 }));
           }
         }
         break;
@@ -90,9 +72,9 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
         }
         if (action_on_data && action_off_data) {
           if (isOn) {
-            await doAction(action_off_data, null, actionName('off'));
+            await doAction(action_off_data, null);
           } else {
-            await doAction(action_on_data, null, actionName('on'));
+            await doAction(action_on_data, null);
           }
         }
         break;
@@ -104,7 +86,6 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
         watchMultiConfigs([configuration?.config]);
     }
   }, [
-    actionName,
     action_data,
     action_off_data,
     action_on_data,

package/src/commons/ActionGroup/OneBigButtonTemplate.js

@@ -11,9 +11,8 @@ const OneBigButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const { text, action_data } = configuration || {};
 
   const onPressDoAction = useCallback(() => {
-    const actionName = `${sensor?.name} ${text?.toLowerCase()}`;
-    doAction(action_data, null, actionName);
-  }, [action_data, text, doAction, sensor?.name]);
+    doAction(action_data, null);
+  }, [action_data, doAction]);
 
   return (
     <>

package/src/commons/ActionGroup/OptionsDropdownActionTemplate.js

@@ -60,15 +60,13 @@ const OptionsDropdownActionTemplate = ({ actionGroup, doAction, sensor }) => {
   const onDone = useCallback(() => {
     const newOption = options[selectedIndex];
     const value = getOptionValue(newOption);
-    let actionName = `${sensor?.name} ${title?.toLowerCase()} ${value}`;
-    actionName = actionName.replace(/\s+/g, ' ').trim();
 
     let data = JSON.stringify({ level: value, key_code: newOption?.value_int });
     if (sensor.device_type === DEVICE_TYPE.GOOGLE_HOME) {
       data = value;
     }
 
-    doAction(action_data, data, actionName);
+    doAction(action_data, data);
     if (sensor?.is_managed_by_backend) {
       configuration.config &&
         sensor.device_type === DEVICE_TYPE.LG_THINQ &&
@@ -83,9 +81,7 @@ const OptionsDropdownActionTemplate = ({ actionGroup, doAction, sensor }) => {
     options,
     selectedIndex,
     sensor?.is_managed_by_backend,
-    sensor?.name,
-    sensor?.device_type,
-    title,
+    sensor.device_type,
   ]);
 
   useUnwatchLGDeviceConfigControl(sensor, [configuration.config]);

package/src/commons/ActionGroup/SliderRangeTemplate.js

@@ -33,11 +33,9 @@ const SliderRangeTemplate = memo(({ actionGroup, doAction, sensor }) => {
     const { config } = configuration;
     const configValue = configValues[config];
     let valueBrness = configValue?.value;
-    let valueTemp = valueBrness;
-    if (valueBrness > 0) {
-      valueTemp = Math.round((valueBrness / 254) * 100);
+    if (valueBrness >= 0) {
+      setValueBrightness(valueBrness);
     }
-    setValueBrightness(valueTemp);
   }, [configuration.config, configValues, configuration]);
 
   return (

package/src/commons/ActionGroup/StatesGridActionTemplate.js

@@ -40,26 +40,14 @@ const GridItem = ({ item, index, length, doAction, sensor, title }) => {
 
   const doActionAndWatchConfig = useCallback(
     (actionData) => {
-      let actionName = `${
-        sensor?.name
-      } ${title?.toLowerCase()} ${text?.toLowerCase()}`;
-      actionName = actionName.replace(/\s+/g, ' ').trim();
-      doAction(actionData, null, actionName);
+      doAction(actionData, null);
       if (sensor?.is_managed_by_backend) {
         config &&
           sensor.device_type === DEVICE_TYPE.LG_THINQ &&
           watchMultiConfigs([config]);
       }
     },
-    [
-      config,
-      doAction,
-      sensor?.is_managed_by_backend,
-      sensor?.name,
-      sensor?.device_type,
-      text,
-      title,
-    ]
+    [config, doAction, sensor?.is_managed_by_backend, sensor.device_type]
   );
 
   useUnwatchLGDeviceConfigControl(sensor, [config]);

package/src/commons/ActionGroup/ThreeButtonTemplate.js

@@ -30,19 +30,16 @@ const ThreeButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
     );
   };
   const onButton1Press = useCallback(() => {
-    const actionName = `${sensor?.name} ${text1?.toLowerCase()}`;
-    doAction(action1_data, null, actionName);
-  }, [action1_data, text1, doAction, sensor?.name]);
+    doAction(action1_data, null);
+  }, [action1_data, doAction]);
 
   const onButton2Press = useCallback(() => {
-    const actionName = `${sensor?.name} ${text2?.toLowerCase()}`;
-    doAction(action2_data, null, actionName);
-  }, [action2_data, text2, doAction, sensor?.name]);
+    doAction(action2_data, null);
+  }, [action2_data, doAction]);
 
   const onButton3Press = useCallback(() => {
-    const actionName = `${sensor?.name} ${text3?.toLowerCase()}`;
-    doAction(action3_data, null, actionName);
-  }, [action3_data, text3, doAction, sensor?.name]);
+    doAction(action3_data, null);
+  }, [action3_data, doAction]);
 
   const onChangeSwitch = useCallback(() => {
     if (lock) {

package/src/commons/ActionGroup/TwoButtonTemplate/index.js

@@ -18,22 +18,12 @@ const TwoButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const [configValues] = useConfigGlobalState('configValues');
   const isLight = false;
 
-  const actionName = useCallback(
-    (text) => {
-      const actionNameType = `${
-        sensor?.name
-      } ${actionGroup?.title?.toLowerCase()} ${text}`;
-      return actionNameType.replace(/\s+/g, ' ').trim();
-    },
-    [actionGroup?.title, sensor?.name]
-  );
-
   const triggerAction1 = useCallback(async () => {
     if (button1?.action_on_data && button1?.action_off_data) {
       if (isOn) {
-        await doAction(button1?.action_off_data, null, actionName('off'));
+        await doAction(button1?.action_off_data, null);
       } else {
-        await doAction(button1?.action_on_data, null, actionName('on'));
+        await doAction(button1?.action_on_data, null);
       }
     }
     if (sensor?.is_managed_by_backend) {
@@ -42,21 +32,20 @@ const TwoButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
         watchMultiConfigs([configuration.config]);
     }
   }, [
-    actionName,
     button1,
     configuration.config,
     doAction,
     isOn,
     sensor?.is_managed_by_backend,
-    sensor?.device_type,
+    sensor.device_type,
   ]);
 
   const triggerAction2 = useCallback(async () => {
     if (button2?.action_on_data && button2?.action_off_data) {
       if (isStart) {
-        await doAction(button2?.action_off_data, null, actionName('stop'));
+        await doAction(button2?.action_off_data, null);
       } else {
-        await doAction(button2?.action_on_data, null, actionName('start'));
+        await doAction(button2?.action_on_data, null);
       }
     }
     if (
@@ -66,14 +55,13 @@ const TwoButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
       configuration.config && watchMultiConfigs([configuration.config]);
     }
   }, [
-    actionName,
     button2?.action_off_data,
     button2?.action_on_data,
     configuration.config,
     doAction,
     isStart,
     sensor?.is_managed_by_backend,
-    sensor?.device_type,
+    sensor.device_type,
   ]);
 
   useUnwatchLGDeviceConfigControl(sensor, [configuration.config]);

package/src/commons/ActionGroup/__test__/CurtainButtonTemplate.test.js

@@ -97,25 +97,13 @@ describe('Test CurtainButtonTemplate', () => {
     await touchableOpacities[0].props.onPress();
     await touchableOpacities[1].props.onPress();
     await touchableOpacities[2].props.onPress();
-    expect(mockDoAction).toBeCalledWith(
-      mockCloseActionData,
-      null,
-      sensor?.name + ' undefined'
-    );
+    expect(mockDoAction).toBeCalledWith(mockCloseActionData, null);
 
     const Switchs = instance.findAllByType(Switch);
     expect(Switchs).toHaveLength(1);
     await Switchs[0].props.onValueChange();
-    expect(mockDoAction).toBeCalledWith(
-      mockActionOnData,
-      null,
-      `${sensor.name} lock`
-    );
+    expect(mockDoAction).toBeCalledWith(mockActionOnData, null);
     await Switchs[0].props.onValueChange();
-    expect(mockDoAction).toBeCalledWith(
-      mockActionOffData,
-      null,
-      `${sensor.name} unlock`
-    );
+    expect(mockDoAction).toBeCalledWith(mockActionOffData, null);
   });
 });

package/src/commons/ActionGroup/__test__/NumberUpDownTemplate.test.js

@@ -399,8 +399,7 @@ describe('Test NumberUpDownActionTemplate', () => {
         id: 20,
         key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
       },
-      26,
-      'Device temp up'
+      26
     );
   });
 });

package/src/commons/ActionGroup/__test__/OnOffSmartLock.test.js

@@ -87,11 +87,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await button.props.onPress();
     });
-    expect(mockDoAction).toBeCalledWith(
-      action_on_data,
-      '{"door_lock":0}',
-      'Sensor smartlock lock'
-    );
+    expect(mockDoAction).toBeCalledWith(action_on_data, '{"door_lock":0}');
   });
 
   test('render with template OnOffSmartLockActionTemplate doAction unlock', async () => {
@@ -111,10 +107,6 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await button.props.onPress();
     });
-    expect(mockDoAction).toBeCalledWith(
-      action_off_data,
-      '{"door_lock":1}',
-      'Sensor smartlock unlock'
-    );
+    expect(mockDoAction).toBeCalledWith(action_off_data, '{"door_lock":1}');
   });
 });

package/src/commons/ActionGroup/__test__/OnOffTemplate.test.js

@@ -164,11 +164,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(
-      action_off_data,
-      null,
-      'Sensor turn on / off off'
-    );
+    expect(mockDoAction).toHaveBeenCalledWith(action_off_data, null);
     expect(watchMultiConfigs).toBeCalledTimes(0);
   });
 
@@ -185,11 +181,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(
-      action_on_data,
-      null,
-      'Sensor turn on / off on'
-    );
+    expect(mockDoAction).toHaveBeenCalledWith(action_on_data, null);
   });
 
   test('template OnOffSimpleActionTemplate doAction with is_on_value and is_managed_by_backend', async () => {
@@ -204,11 +196,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(
-      action_off_data,
-      null,
-      'Sensor turn on / off off'
-    );
+    expect(mockDoAction).toHaveBeenCalledWith(action_off_data, null);
     expect(watchMultiConfigs).toBeCalledTimes(0);
   });
 

package/src/commons/ActionGroup/__test__/OneBigButtonTemplate.test.js

@@ -69,6 +69,6 @@ describe('Test OneBigButtonTemplate', () => {
     });
 
     expect(mockDoAction).toHaveBeenCalledTimes(1);
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, null, 'Sensor up');
+    expect(mockDoAction).toHaveBeenCalledWith(action_data, null);
   });
 });

package/src/commons/ActionGroup/__test__/OptionsDropdownTemplate.test.js

@@ -159,8 +159,7 @@ describe('Test OptionsDropdownActionTemplate', () => {
 
     expect(mockDoAction).toHaveBeenCalledWith(
       action_data,
-      JSON.stringify({ level: 1, key_code: 1 }),
-      'Sensor name fan speed 1'
+      JSON.stringify({ level: 1, key_code: 1 })
     );
     is_managed_by_backend
       ? expect(watchMultiConfigs).not.toBeCalled()
@@ -228,8 +227,7 @@ describe('Test OptionsDropdownActionTemplate', () => {
 
     expect(mockDoAction).toHaveBeenCalledWith(
       action_data,
-      JSON.stringify({ level: 'level-1', key_code: 1 }),
-      'Sensor name fan speed level-1'
+      JSON.stringify({ level: 'level-1', key_code: 1 })
     ); // doAction with text instead of int
 
     expect(texts[1].props.children).toEqual('Level2');
@@ -303,10 +301,6 @@ describe('Test OptionsDropdownActionTemplate', () => {
     });
     expect(alertAction.props.visible).toBeFalsy();
 
-    expect(mockDoAction).toHaveBeenCalledWith(
-      action_data,
-      'level-1',
-      'Sensor name fan speed level-1'
-    ); // doAction with text instead of int
+    expect(mockDoAction).toHaveBeenCalledWith(action_data, 'level-1'); // doAction with text instead of int
   });
 });

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

@@ -73,12 +73,6 @@ describe('Test StatesGridActionTemplate', () => {
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);
     expect(TouchableOpacities).toHaveLength(2);
     await TouchableOpacities[0].props.onPress();
-    expect(mockDoAction).toBeCalledWith(
-      mockActionData,
-      null,
-      `${sensor.name} ${actionGroup.title.toLowerCase()} ${
-        actionGroup.configuration.options[0].text
-      }`
-    );
+    expect(mockDoAction).toBeCalledWith(mockActionData, null);
   });
 });

package/src/commons/ActionGroup/__test__/TwoButtonTemplate.test.js

@@ -81,7 +81,11 @@ describe('Test TwoButtonTemplate', () => {
     const mockDoAction = jest.fn();
     act(() => {
       wrapper = create(
-        <TwoButtonTemplate actionGroup={actionGroup} doAction={mockDoAction} />
+        <TwoButtonTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={sensor}
+        />
       );
     });
 
@@ -101,7 +105,11 @@ describe('Test TwoButtonTemplate', () => {
     const mockDoAction = jest.fn();
     act(() => {
       wrapper = create(
-        <TwoButtonTemplate actionGroup={actionGroup} doAction={mockDoAction} />
+        <TwoButtonTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={sensor}
+        />
       );
     });
 

package/src/commons/ActionGroup/__test__/index.test.js

@@ -183,8 +183,7 @@ describe('Test ActionGroup', () => {
     expect(mockDoAction).toHaveBeenCalledTimes(1);
     expect(mockDoAction).toHaveBeenCalledWith(
       actionGroup.configuration.action1_data,
-      null,
-      'Sensor name up'
+      null
     );
     act(() => {
       buttons[1].props.onPress();
@@ -192,8 +191,7 @@ describe('Test ActionGroup', () => {
     expect(mockDoAction).toHaveBeenCalledTimes(2);
     expect(mockDoAction).toHaveBeenCalledWith(
       actionGroup.configuration.action2_data,
-      null,
-      'Sensor name stop'
+      null
     );
     act(() => {
       buttons[2].props.onPress();
@@ -201,8 +199,7 @@ describe('Test ActionGroup', () => {
     expect(mockDoAction).toHaveBeenCalledTimes(3);
     expect(mockDoAction).toHaveBeenCalledWith(
       actionGroup.configuration.action3_data,
-      null,
-      'Sensor name down'
+      null
     );
   });
 
@@ -257,8 +254,7 @@ describe('Test ActionGroup', () => {
     expect(mockDoAction).toHaveBeenCalledTimes(1);
     expect(mockDoAction).toHaveBeenCalledWith(
       actionGroup.configuration.action1_data,
-      null,
-      'Sensor name up'
+      null
     );
     act(() => {
       buttons[1].props.onPress();
@@ -266,8 +262,7 @@ describe('Test ActionGroup', () => {
     expect(mockDoAction).toHaveBeenCalledTimes(2);
     expect(mockDoAction).toHaveBeenCalledWith(
       actionGroup.configuration.action2_data,
-      null,
-      'Sensor name stop'
+      null
     );
     act(() => {
       buttons[2].props.onPress();
@@ -275,8 +270,7 @@ describe('Test ActionGroup', () => {
     expect(mockDoAction).toHaveBeenCalledTimes(3);
     expect(mockDoAction).toHaveBeenCalledWith(
       actionGroup.configuration.action3_data,
-      null,
-      'Sensor name down'
+      null
     );
   });
 
@@ -316,11 +310,7 @@ describe('Test ActionGroup', () => {
       buttons[0].props.onPress();
     });
     expect(mockDoAction).toHaveBeenCalledTimes(1);
-    expect(mockDoAction).toHaveBeenCalledWith(
-      action_data,
-      null,
-      'Sensor name up'
-    );
+    expect(mockDoAction).toHaveBeenCalledWith(action_data, null);
   });
 
   test('render ActionGroup on_off_button_action_template', async () => {

package/src/commons/ConnectingProcess/index.js

@@ -12,7 +12,6 @@ import styles from './styles';
 import DeviceItem from './DeviceItem/DeviceItem';
 import Connecting from '../Connecting';
 import { useSCContextSelector } from '../../context';
-import { ToastBottomHelper } from '../../utils/Utils';
 
 const ConnectingSuccess = ({
   unit,
@@ -76,7 +75,6 @@ const ConnectingProcess = ({ route }) => {
           setSensor(data);
           setNewName(data?.name);
         } else {
-          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
 
@@ -96,7 +94,6 @@ const ConnectingProcess = ({ route }) => {
           setSensor(data);
           setNewName(data?.name);
         } else {
-          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
         break;
@@ -113,7 +110,6 @@ const ConnectingProcess = ({ route }) => {
           setSensor(data);
           setNewName(data?.name || gateway?.model);
         } else {
-          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
         break;
@@ -136,36 +132,21 @@ const ConnectingProcess = ({ route }) => {
   ]);
 
   const handleDone = useCallback(async () => {
-    let result, message;
     switch (devicePrefixName) {
       case 'SENSOR': {
-        const { success, data } = await axiosPatch(
-          API.SENSOR.SENSOR_DETAIL(sensor?.id),
-          {
-            name: newName,
-          }
-        );
-        result = success;
-        message = data;
+        await axiosPatch(API.SENSOR.SENSOR_DETAIL(sensor?.id), {
+          name: newName,
+        });
         break;
       }
       case 'ROBOT':
       case 'LITE': {
-        const { success, data } = await axiosPatch(
-          API.CHIP.CHIP_DETAIL(sensor?.id),
-          {
-            name: newName,
-          }
-        );
-        result = success;
-        message = data;
+        await axiosPatch(API.CHIP.CHIP_DETAIL(sensor?.id), {
+          name: newName,
+        });
         break;
       }
     }
-
-    if (!result) {
-      ToastBottomHelper.error(JSON.stringify(message));
-    }
     navigate(Routes.UnitStack, {
       screen: Routes.UnitDetail,
       params: {

package/src/commons/Device/HistoryChart.js

@@ -76,7 +76,7 @@ const HistoryChart = memo(
             return {
               ...state,
               showModalStart: false,
-              startTime: moment(date),
+              startTime: date ? moment(date) : moment().valueOf(),
             };
           } else {
             setStartDate(moment(date));
@@ -84,8 +84,8 @@ const HistoryChart = memo(
             return {
               ...state,
               showModalStart: false,
-              startTime: moment(date),
-              endTime: moment(date).add(1, 'day'),
+              startTime: date ? moment(date) : moment().valueOf(),
+              endTime: date ? moment(date).add(1, 'day') : moment().valueOf(),
             };
           }
         });
@@ -105,7 +105,7 @@ const HistoryChart = memo(
             return {
               ...state,
               showModalEnd: false,
-              endTime: moment(date),
+              endTime: date ? moment(date) : moment().valueOf(),
             };
           } else {
             setStartDate(moment(date).add(-1, 'day'));
@@ -113,8 +113,10 @@ const HistoryChart = memo(
             return {
               ...state,
               showModalEnd: false,
-              startTime: moment(date).add(-1, 'day'),
-              endTime: moment(date),
+              startTime: date
+                ? moment(date).add(-1, 'day')
+                : moment().valueOf(),
+              endTime: date ? moment(date) : moment().valueOf(),
             };
           }
         });

package/src/commons/RowItem/styles.js

@@ -9,7 +9,6 @@ export default StyleSheet.create({
   columeFlex: {
     paddingLeft: 16,
     flexDirection: 'column',
-    width: '75%',
   },
   rowFlex: {
     flexDirection: 'row',

package/src/commons/SubUnit/ShortDetail.js

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -48,6 +48,17 @@ const ShortDetailSubUnit = ({ unit, station }) => {
 
   useWatchConfigs(configsNeedWatching);
 
+  const goToPlayBack = useCallback(() => {
+    navigate(Routes.PlaybackCamera, {
+      item: {
+        configuration: station?.camera,
+        thumbnail: {
+          uri: station?.background,
+        },
+      },
+    });
+  }, [navigate, station?.background, station?.camera]);
+
   const renderCamera = () => {
     if (station?.camera) {
       return (
@@ -70,6 +81,7 @@ const ShortDetailSubUnit = ({ unit, station }) => {
             cameraName={station?.camera?.name}
             width={standardizeWidth}
             height={standardizeHeight}
+            goToPlayBack={goToPlayBack}
           />
         </View>
       );

package/src/configs/API.js

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

package/src/context/actionType.ts

@@ -20,6 +20,7 @@ export const Action = {
   SET_GOOGLE_HOME_CONNECTIONS: 'SET_GOOGLE_HOME_CONNECTIONS',
   CHANGE_GOOGLE_HOME_CONN_STATE: 'CHANGE_GOOGLE_HOME_CONN_STATE',
   UPDATE_VALUE_EVALUATIONS: 'UPDATE_VALUE_EVALUATIONS',
+  NEED_UPDATE_VALUE_EVALUATIONS: 'NEED_UPDATE_VALUE_EVALUATIONS',
   ON_RECEIVE_NOTIFICATION: 'ON_RECEIVE_NOTIFICATION',
   SET_DEVICES_STATUS: 'SET_DEVICES_STATUS',
 };

package/src/context/reducer.ts

@@ -323,6 +323,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
           currentState.valueEvaluations
         ),
       };
+    case Action.NEED_UPDATE_VALUE_EVALUATIONS:
+      return {
+        ...currentState,
+        fetchedValueEvaluationUnits:
+          currentState.fetchedValueEvaluationUnits.filter(
+            // eslint-disable-next-line no-shadow
+            (unitId) => unitId !== payload
+          ),
+      };
 
     case Action.ON_RECEIVE_NOTIFICATION:
       return {

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

@@ -28,7 +28,7 @@ const mockUseContext = jest.fn().mockImplementation(() => ({
 React.useContext = mockUseContext;
 
 describe('Test useRemoteControl', () => {
-  let sensor, action, data, userId, actionName;
+  let sensor, action, data, userId;
 
   beforeEach(() => {
     sendCommandOverBluetooth.mockClear();
@@ -51,7 +51,6 @@ describe('Test useRemoteControl', () => {
     };
     data = null;
     userId = 1;
-    actionName = 'action name';
   });
 
   it('test send remote command action null', async () => {
@@ -60,7 +59,7 @@ describe('Test useRemoteControl', () => {
       wrapper,
     });
     act(() => {
-      sendRemoteCommand.current(sensor, action, data, userId, actionName);
+      sendRemoteCommand.current(sensor, action, data, userId);
     });
     expect(sendCommandOverInternet).not.toBeCalled();
     expect(sendCommandOverGoogleHome).not.toBeCalled();
@@ -75,7 +74,7 @@ describe('Test useRemoteControl', () => {
 
     sendCommandOverBluetooth.mockImplementation(async () => true);
     act(() => {
-      sendRemoteCommand.current(sensor, action, data, userId, actionName);
+      sendRemoteCommand.current(sensor, action, data, userId);
     });
     expect(sendCommandOverBluetooth).toBeCalledWith(
       sensor,
@@ -98,7 +97,7 @@ describe('Test useRemoteControl', () => {
     });
     sendCommandOverInternet.mockImplementation(async () => true);
     act(() => {
-      sendRemoteCommand.current(sensor, action, data, userId, actionName);
+      sendRemoteCommand.current(sensor, action, data, userId);
     });
     expect(sendCommandOverBluetooth).toBeCalledWith(
       sensor,
@@ -110,8 +109,7 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      'bluetooth',
-      actionName
+      'bluetooth'
     );
     expect(sendCommandOverInternet).toBeCalledTimes(1);
     expect(sendCommandOverGoogleHome).not.toBeCalled();
@@ -128,7 +126,7 @@ describe('Test useRemoteControl', () => {
     });
     sendCommandOverInternet.mockImplementation(async () => true);
     act(() => {
-      sendRemoteCommand.current(sensor, action, data, userId, actionName);
+      sendRemoteCommand.current(sensor, action, data, userId);
     });
     expect(sendCommandOverBluetooth).toBeCalledWith(
       sensor,
@@ -150,7 +148,7 @@ describe('Test useRemoteControl', () => {
 
     sendCommandOverInternet.mockImplementation(async () => true);
     act(() => {
-      sendRemoteCommand.current(sensor, action, data, userId, actionName);
+      sendRemoteCommand.current(sensor, action, data, userId);
     });
     expect(sendCommandOverInternet).toBeCalledWith(
       sensor,
@@ -172,7 +170,7 @@ describe('Test useRemoteControl', () => {
 
     sendCommandOverGoogleHome.mockImplementation(async () => true);
     act(() => {
-      sendRemoteCommand.current(sensor, action, data, userId, actionName);
+      sendRemoteCommand.current(sensor, action, data, userId);
     });
     expect(sendCommandOverGoogleHome).toBeCalledWith({}, sensor, action, data);
     expect(sendCommandOverBluetooth).not.toBeCalled();
@@ -189,7 +187,7 @@ describe('Test useRemoteControl', () => {
 
     sendCommandOverLGThinq.mockImplementation(async () => true);
     act(() => {
-      sendRemoteCommand.current(sensor, action, data, userId, actionName);
+      sendRemoteCommand.current(sensor, action, data, userId);
     });
     expect(sendCommandOverBluetooth).not.toBeCalled();
     expect(sendCommandOverGoogleHome).not.toBeCalled();

package/src/hooks/IoT/useRemoteControl.js

@@ -15,7 +15,7 @@ const useRemoteControl = () => {
   );
 
   const sendRemoteCommand = useCallback(
-    async (sensor, action, data, userId, actionName) => {
+    async (sensor, action, data, userId) => {
       // No action, raise not authorized
       let result = false;
 
@@ -36,8 +36,7 @@ const useRemoteControl = () => {
               sensor,
               action,
               data,
-              'bluetooth',
-              actionName
+              'bluetooth'
             );
           } else {
             throw err;

package/src/iot/RemoteControl/Internet.js

@@ -4,13 +4,7 @@ import { ToastBottomHelper } from '../../utils/Utils';
 import { axiosPost } from '../../utils/Apis/axios';
 import { API } from '../../configs';
 
-export const sendCommandOverInternet = async (
-  sensor,
-  action,
-  data,
-  source,
-  actionName
-) => {
+export const sendCommandOverInternet = async (sensor, action, data, source) => {
   if (data !== null) {
     if (Number.isInteger(data)) {
       data = data.toString(16).toUpperCase();
@@ -21,7 +15,6 @@ export const sendCommandOverInternet = async (
     key: action.key,
     data,
     source,
-    action_name: actionName,
   });
   if (success) {
     ToastBottomHelper.success(t('Command is sent to device via internet'));

package/src/navigations/UnitStack.js

@@ -120,6 +120,17 @@ export const UnitStack = memo((props) => {
     };
   }, []);
 
+  useEffect(() => {
+    return () => {
+      const id = unitId || unitData?.id;
+      if (!id) {
+        return;
+      }
+      setAction(Action.NEED_UPDATE_VALUE_EVALUATIONS, id);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   return (
     <Stack.Navigator
       screenOptions={{

package/src/screens/Device/components/SensorDisplayItem.js

@@ -44,8 +44,8 @@ export const SensorDisplayItem = ({
   const sendRemoteCommand = useRemoteControl();
 
   const doAction = useCallback(
-    (action, data, actionName) => {
-      sendRemoteCommand(sensor, action, data, userId, actionName);
+    (action, data) => {
+      sendRemoteCommand(sensor, action, data, userId);
     },
     [sensor, userId, sendRemoteCommand]
   );

package/src/screens/Device/detail.js

@@ -363,13 +363,6 @@ const DeviceDetail = ({ route }) => {
         text: t('auto_lock'),
       });
     }
-    menuItems.push({
-      route: Routes.SmartLockStack,
-      data: {
-        screen: Routes.SetupGeneratePasscode,
-      },
-      text: t('setup_generate_passcode'),
-    });
     if (isOwner && isShowSetUpSmartLock) {
       menuItems.push({
         route: Routes.SmartLockStack,

package/src/screens/PlayBackCamera/index.js

@@ -62,6 +62,16 @@ const PlayBackCamera = () => {
     dateTemp = date;
   }, [selected]);
 
+  const getHourWithTimeZone = useCallback(
+    // eslint-disable-next-line no-shadow
+    (hour) => {
+      const hourWithTimezone =
+        parseInt(hour, 10) + parseInt(item?.configuration?.time_zone || 0, 10);
+      return hourWithTimezone < 10 ? '0' + hourWithTimezone : hourWithTimezone;
+    },
+    [item?.configuration?.time_zone]
+  );
+
   const onChangeValue = useCallback(
     (value, selectedTime) => {
       if (!isFirstTime) {
@@ -87,7 +97,7 @@ const PlayBackCamera = () => {
           setUri(
             `${playback.split('=')[0]}=${date[0]}${date[1]}${
               date[2]
-            }T${h}${m}${s}Z`
+            }T${getHourWithTimeZone(h)}${m}${s}Z`
           );
         }
         const to = setTimeout(() => {
@@ -96,7 +106,13 @@ const PlayBackCamera = () => {
         }, 100);
       }
     },
-    [arrHourTemp, item?.configuration, now]
+    [
+      arrHourTemp,
+      getHourWithTimeZone,
+      item?.configuration?.playback,
+      item?.configuration?.uri,
+      now,
+    ]
   );
 
   useEffect(() => {
@@ -111,9 +127,9 @@ const PlayBackCamera = () => {
       setUri(item?.configuration?.uri);
     } else {
       setUri(
-        `${playback.split('=')[0]}=${date[0]}${date[1]}${date[2]}T${hour.h}${
-          hour.m
-        }${hour.s}Z`
+        `${playback.split('=')[0]}=${date[0]}${date[1]}${
+          date[2]
+        }T${getHourWithTimeZone(hour.h)}${hour.m}${hour.s}Z`
       );
     }
     const to = setTimeout(() => {
@@ -121,7 +137,7 @@ const PlayBackCamera = () => {
       clearTimeout(to);
     }, 100);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selected]);
+  }, [selected, getHourWithTimeZone]);
 
   useEffect(() => {
     // eslint-disable-next-line react-hooks/rules-of-hooks

package/src/screens/Unit/components/MyUnitDevice/index.js

@@ -67,7 +67,7 @@ const styles = StyleSheet.create({
     borderRadius: 16,
     justifyContent: 'center',
     alignItems: 'center',
-    marginLeft: 10,
+    marginLeft: 5,
   },
   nameDevice: {
     fontSize: 14,
@@ -81,6 +81,7 @@ const styles = StyleSheet.create({
   roomDevicePart: {
     fontSize: 12,
     lineHeight: 20,
+    width: '100%',
   },
   rowCenter: {
     flexDirection: 'row',