@eohjsc/react-native-smart-city 0.2.21 → 0.2.27

package/src/configs/Constants.js

@@ -1,5 +1,8 @@
 import { Platform, Dimensions, StatusBar } from 'react-native';
 import { RFValue } from 'react-native-responsive-fontsize';
+import OneTap from '../../assets/images/OneTap.svg';
+import ValueChange from '../../assets/images/ValueChange.svg';
+import Schedule from '../../assets/images/Schedule.svg';
 
 const X_WIDTH = 375;
 const X_HEIGHT = 812;
@@ -67,6 +70,10 @@ export const Constants = {
   DEEP_LINK,
 };
 
+export const DEVICE_TYPE = {
+  LG_THINQ: 'LG_THINQ',
+};
+
 export const SCANNING_STATUS = {
   BOOKING_ACTIVATED: 'booking_activated',
   WRONG_SPOT: 'wrong_spot',
@@ -76,6 +83,42 @@ export const SCANNING_STATUS = {
   SPOT_DOES_NOT_EXIST: 'spot_does_not_exist',
 };
 
+export const SubUnitName = {
+  scenario: 'Kịch Bản',
+};
+
+export const AUTOMATE_TYPE = {
+  ONE_TAP: 'one_tap',
+  VALUE_CHANGE: 'value_change',
+  SCHEDULE: 'schedule',
+};
+
+export const AUTOMATE_SELECT = {
+  SELECT_DEVICES: 'select_devices',
+  SELECT_SENSOR: 'select_sensor',
+};
+
+export const AUTOMATES = {
+  one_tap: {
+    value: AUTOMATE_TYPE.ONE_TAP,
+    title: 'Launch One-Tap',
+    explanation: 'Do everything with just one button',
+    icon: OneTap,
+  },
+  value_change: {
+    value: AUTOMATE_TYPE.VALUE_CHANGE,
+    title: 'Value change',
+    explanation: 'Short Explanation',
+    icon: ValueChange,
+  },
+  schedule: {
+    value: AUTOMATE_TYPE.SCHEDULE,
+    title: 'Schedule',
+    explanation: 'Short Explanation',
+    icon: Schedule,
+  },
+};
+
 export const TESTID = {
   // Dashboard
   DASHBOARD_TAB_HOME: 'DASHBOARD_TAB_HOME',
@@ -115,6 +158,7 @@ export const TESTID = {
   MY_UNIT_NO_UNIT: 'MY_UNIT_NO_UNIT',
 
   // sub unit
+  SUB_UNIT_FULL_CAMERA: 'SUB_UNIT_FULL_CAMERA',
   SUB_UNIT_CAMERA_VIEW: 'SUB_UNIT_CAMERA_VIEW',
   SUB_UNIT_BACKGROUND: 'SUB_UNIT_BACKGROUND',
   SUB_UNIT_GO_TO_DETAIL: 'SUB_UNIT_GO_TO_DETAIL',
@@ -216,6 +260,11 @@ export const TESTID = {
   ITEM_TEXT_INPUT: 'ITEM_TEXT_INPUT',
   ITEM_TEXT_ERROR: 'ITEM_TEXT_ERROR',
   SEARCH_BAR_INPUT: 'SEARCH_BAR_INPUT',
+  GO_DETAIL: 'GO_DETAIL',
+
+  // Automate
+  AUTOMATE_SCRIPT_ACTION: 'AUTOMATE_SCRIPT_ACTION',
+  NAME_YOUR_BUTTON: 'NAME_YOUR_BUTTON',
 
   // Parking input maunaly spot
   PARKING_SPOT_INFO_BUTTON: 'PARKING_SPOT_INFO_BUTTON',
@@ -259,6 +308,7 @@ export const TESTID = {
   SENSOR_DISPLAY_ITEM: 'SENSOR_DISPLAY_ITEM',
   ITEM_QUICK_ACTION_PRESS: 'ITEM_QUICK_ACTION_PRESS',
   TIME_COUNT_DOWN_TEXT: 'TIME_COUNT_DOWN_TEXT',
+  ACTION_ITEM: 'ACTION_ITEM',
 
   // DeviceInfo
   DEVICE_INFO_BATTERY: 'DEVICE_INFO_BATTERY',
@@ -389,6 +439,7 @@ export const TESTID = {
     MANAGE_UNIT: 'MANAGE_UNIT',
     MANAGE_UNIT_ALERT: 'MANAGE_UNIT_ALERT',
     SELECT_UNIT: 'SELECT_UNIT',
+    BUTTON_ADD_AUTO_SMART: 'BUTTON_ADD_AUTO_SMART',
   },
 
   TERM_AND_POLICY_TITLE: 'TERM_AND_POLICY_TITLE',
@@ -475,4 +526,14 @@ export const TESTID = {
   // Add New Device LG
   ADD_NEW_DEVICE_LG_ADD: 'ADD_NEW_DEVICE_LG_ADD',
   ADD_NEW_DEVICE_LG_THEN_SELECT: 'ADD_NEW_DEVICE_LG_THEN_SELECT',
+
+  // WheelDateTimePicker
+  WHEEL_DATE_TIME_PICKER: 'WHEEL_DATE_TIME_PICKER',
+
+  // GuestInfo
+  SAVE_ACCESS_SCHEDULE: 'SAVE_ACCESS_SCHEDULE',
+  ACCESS_SCHEDULE_RADIO_BUTTON: 'ACCESS_SCHEDULE_RADIO_BUTTON',
+  ACCESS_SCHEDULE_SHEET: 'ACCESS_SCHEDULE_SHEET',
+  RECURRING_TEXT_BUTTON: 'RECURRING_TEXT_BUTTON',
+  TEMPORARY_TEXT_BUTTON: 'TEMPORARY_TEXT_BUTTON',
 };

package/src/configs/Images.js

@@ -5,4 +5,5 @@ export default {
   arrowLeft: require('../Images/Common/arrow-back.png'),
   fullscreen: require('../Images/Common/fullscreen.png'),
   file: require('../Images/Common/file.png'),
+  activeButton: require('../Images/Common/ActiveButton.png'),
 };

package/src/configs/SCConfig.js

@@ -90,6 +90,8 @@ const SCDefaultConfig = {
   LG_CLIENT_ID: '2b85aee334f046848341547894bb7c4e',
   LG_REDIRECT_URI_APP: 'app://eoh/sync-lg-device',
   LG_URL: 'https://qt-vn.m.lgaccount.com/emp/v2',
+  pusherAppKey: '9a591ae4a764acc08714',
+  pusherAppCluster: 'ap1',
 };
 
 export class SCConfig {
@@ -98,6 +100,8 @@ export class SCConfig {
   static LG_CLIENT_ID = SCDefaultConfig.LG_CLIENT_ID;
   static LG_REDIRECT_URI_APP = SCDefaultConfig.LG_REDIRECT_URI_APP;
   static LG_URL = SCDefaultConfig.LG_URL;
+  static pusherAppKey = SCDefaultConfig.pusherAppKey;
+  static pusherAppCluste = SCDefaultConfig.pusherAppCluster;
 }
 
 export const initSCConfig = (config) => {
@@ -109,4 +113,7 @@ export const initSCConfig = (config) => {
   SCConfig.LG_REDIRECT_URI_APP =
     config.LG_REDIRECT_URI_APP ?? SCDefaultConfig.LG_REDIRECT_URI_APP;
   SCConfig.LG_URL = config.LG_URL ?? SCDefaultConfig.LG_URL;
+  SCConfig.pusherAppKey = config.pusherAppKey ?? SCDefaultConfig.pusherAppKey;
+  SCConfig.pusherAppCluster =
+    config.pusherAppCluster ?? SCDefaultConfig.pusherAppCluster;
 };

package/src/configs/Theme.js

@@ -85,4 +85,24 @@ export default StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
+  menuIcon: {
+    paddingLeft: 16,
+    height: '100%',
+    justifyContent: 'center',
+  },
+  wrap: {
+    flex: 1,
+    backgroundColor: Colors.White,
+  },
+  shadowView: {
+    shadowColor: Colors.Gray7,
+    backgroundColor: Colors.White,
+    shadowOffset: {
+      width: 0,
+      height: 3,
+    },
+    shadowOpacity: 0.22,
+    shadowRadius: 3,
+    elevation: 3,
+  },
 });

package/src/context/SCContext.tsx

@@ -1,10 +1,5 @@
 import React, { useContext, useReducer } from 'react';
-import { StyleSheet, View, Text } from 'react-native';
-import Toast from 'react-native-toast-message';
 
-import { Alert } from '../commons';
-import { Colors } from '../configs';
-import { setLanguage, updateTranslation } from '../utils/I18n';
 import {
   ActionDataMap,
   ActionType,
@@ -13,22 +8,13 @@ import {
   StatusBar,
 } from './actionType';
 import { initialState, Action, ContextData, reducer } from './reducer';
-
-const toastConfig = {
-  // only for error for now
-  error: (internalState) => (
-    <View style={styles.toastContainer}>
-      <Text style={styles.textWhite}>{internalState.text1}</Text>
-    </View>
-  ),
-};
+import { setConfigGlobalState } from '../iot/states.js';
 
 type SCContextType = {
   stateData: ContextData;
   setAuth: (authData: AuthData) => void;
   setLocale: (language: Language) => void;
   setStatusBar: (statusBar: StatusBar) => void;
-  updateLocale: (langTranslate: any) => void;
   setAction: <T extends ActionType>(
     action: T,
     payload?: ActionDataMap[T]
@@ -43,27 +29,23 @@ type Reducer<StateData, Action> = (
   action: Action
 ) => StateData;
 
-export const SCProvider = ({ children }) => {
+export const SCProvider = ({ children, initState = initialState }) => {
   const [stateData, dispatch] = useReducer<Reducer<ContextData, Action>>(
     reducer,
-    initialState
+    initState
   );
 
   const setAuth = (authData: AuthData) => {
     setAction('UPDATE_AUTH', authData);
   };
 
-  const setLocale = (language: Language) => {
-    setLanguage(language);
-    setAction('UPDATE_LANGUAGE', language);
-  };
-
   const setStatusBar = (statusBar: StatusBar) => {
     setAction('STORE_STATUS_BAR', statusBar);
   };
 
-  const updateLocale = (langTranslate: any) => {
-    updateTranslation(langTranslate);
+  const setLocale = (language: Language) => {
+    setConfigGlobalState('lang', language);
+    setAction('UPDATE_LANGUAGE', language);
   };
 
   const setAction = <T extends ActionType>(
@@ -76,17 +58,16 @@ export const SCProvider = ({ children }) => {
   const providerValue = {
     stateData,
     setAuth,
-    setLocale,
     setAction,
+    setLocale,
     setStatusBar,
-    updateLocale,
   };
 
   return (
     <SCContext.Provider value={providerValue}>
       {children}
-      <Alert ref={(ref) => Alert.setRef(ref)} />
-      <Toast config={toastConfig} ref={(ref) => Toast.setRef(ref)} />
+      {/* <Alert ref={(ref) => Alert.setRef(ref)} />
+      <Toast config={toastConfig} ref={(ref) => Toast.setRef(ref)} /> */}
     </SCContext.Provider>
   );
 };
@@ -97,14 +78,3 @@ export const useSCContextSelector = (
   const { stateData } = useContext(SCContext);
   return selector(stateData);
 };
-
-const styles = StyleSheet.create({
-  toastContainer: {
-    borderRadius: 5,
-    padding: 10,
-    backgroundColor: Colors.Black,
-  },
-  textWhite: {
-    color: Colors.White,
-  },
-});

package/src/context/actionType.ts

@@ -3,6 +3,7 @@ export const Action = {
   UPDATE_LANGUAGE: 'UPDATE_LANGUAGE',
   STORE_STATUS_BAR: 'STORE_STATUS_BAR',
   LIST_DEVICE_TYPES: 'LIST_DEVICE_TYPES',
+  LIST_ACTION: 'LIST_ACTION',
 };
 
 export type AuthData = {
@@ -25,6 +26,15 @@ export type ListDevice = {
   sentEmail: boolean;
 };
 
+export type ListAction = {
+  action: string;
+  unit_name: string;
+  action_name: string;
+  sensor_name: string;
+  sensor_icon_kit: string;
+  station_name: string;
+}[];
+
 export type ActionType = keyof typeof Action;
 
 export type ActionDataMap = {
@@ -32,4 +42,5 @@ export type ActionDataMap = {
   UPDATE_LANGUAGE: Language;
   STORE_STATUS_BAR: StatusBar;
   LIST_DEVICE_TYPES: ListDevice;
+  LIST_ACTION: ListAction;
 };

package/src/context/mockStore.ts

@@ -0,0 +1,51 @@
+import { ContextData } from './reducer';
+
+export const mockDataStore: ContextData = {
+  auth: {
+    account: {
+      token: 'TOKEN',
+      user: {
+        avatar: null,
+        email: 'test@gmail.com',
+        id: 1,
+        is_using_social_avatar: false,
+        name: 'TEST',
+        org: 2,
+        phone_number: '012345678',
+        social_avatar_hash: '',
+      },
+    },
+  },
+  language: 'en',
+  listDevice: {
+    sentEmail: false,
+  },
+  statusBar: {
+    backgroundColor: '',
+    barStyle: '',
+  },
+  listAction: [],
+};
+
+export const mockSCStore = (data: ContextData): ContextData => {
+  return {
+    auth: {
+      account: {
+        ...mockDataStore.auth.account,
+        ...data.auth?.account,
+      },
+    },
+    language: data.language ? data.language : mockDataStore.language,
+    listDevice: {
+      ...mockDataStore.listDevice,
+      ...data.listDevice,
+    },
+    statusBar: {
+      backgroundColor:
+        data?.statusBar?.backgroundColor ||
+        mockDataStore?.statusBar?.backgroundColor,
+      barStyle: data?.statusBar?.barStyle || mockDataStore?.statusBar?.barStyle,
+    },
+    listAction: [...mockDataStore.listAction, ...(data?.listAction || [])],
+  };
+};

package/src/context/reducer.ts

@@ -6,12 +6,15 @@ import {
   StatusBar,
   Action,
   ListDevice,
+  ListAction,
 } from './actionType';
 
 export type ContextData = {
   auth: AuthData;
   language: Language;
   listDevice: ListDevice;
+  listAction: ListAction;
+  statusBar: StatusBar;
 };
 
 export type Action = {
@@ -31,6 +34,7 @@ export const initialState = {
   language: 'en' as Language,
   statusBar: {} as StatusBar,
   listDevice: {} as ListDevice,
+  listAction: [] as ListAction,
 };
 
 export const reducer = (currentState: ContextData, action: Action) => {
@@ -41,6 +45,8 @@ export const reducer = (currentState: ContextData, action: Action) => {
       return { ...currentState, auth: payload };
     case Action.STORE_STATUS_BAR:
       return { ...currentState, statusBar: payload };
+    case Action.UPDATE_LANGUAGE:
+      return { ...currentState, language: payload };
     case Action.LIST_DEVICE_TYPES:
       if (currentState.listDevice) {
         currentState.listDevice[action.payload.chipId] = {
@@ -60,6 +66,23 @@ export const reducer = (currentState: ContextData, action: Action) => {
         };
       }
 
+    case Action.LIST_ACTION:
+      let newListAction = [...currentState.listAction];
+
+      if (Object.keys(payload).length === 0) {
+        newListAction = [];
+      } else {
+        const order = newListAction.length + 1;
+
+        const isHaveAction = newListAction.findIndex(
+          (item) => item.action === payload.action
+        );
+        if (isHaveAction < 0) {
+          newListAction.push({ ...payload, order });
+        }
+      }
+
+      return { ...currentState, listAction: newListAction };
     default:
       return currentState;
   }

package/src/hooks/Common/__test__/useStatusbar.test.js

@@ -0,0 +1,28 @@
+import { useStatusBarPreview, useHiddenStatusBar } from '../useStatusBar';
+
+describe('test useStatusBarPreview', () => {
+  let Platform;
+  beforeEach(() => {
+    Platform = require('react-native').Platform;
+  });
+
+  it('test useStatusBarPreview on android', () => {
+    Platform.OS = 'ios';
+    useStatusBarPreview();
+  });
+
+  it('test useStatusBarPreview on iOS', () => {
+    Platform.OS = 'android';
+    useStatusBarPreview();
+  });
+
+  it('test useHiddenStatusBar on android', () => {
+    Platform.OS = 'ios';
+    useHiddenStatusBar(false);
+  });
+
+  it('test useHiddenStatusBar on iOS', () => {
+    Platform.OS = 'android';
+    useHiddenStatusBar(true);
+  });
+});

package/src/hooks/Common/__test__/useTranslations.test.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+import { useTranslations } from '../useTranslations';
+
+const mockedSetAction = jest.fn();
+
+const wrapper = ({ children }) => <SCProvider>{children}</SCProvider>;
+
+const mockUseContext = jest.fn().mockImplementation(() => ({
+  stateData: mockSCStore({}),
+  setAction: mockedSetAction,
+}));
+
+React.useContext = mockUseContext;
+
+describe('Test useTranslations', () => {
+  it('test useTranslations', () => {
+    // eslint-disable-next-line no-unused-vars
+    const { result } = renderHook(() => useTranslations(), { wrapper });
+  });
+});

package/src/hooks/Common/index.js

@@ -8,6 +8,7 @@ import useControllList from './useControllList';
 import { useBlockBackAndroid } from './useBlockBackAndroid';
 import { useIsOwnerOfUnit } from './useIsOwnerOfUnit';
 import { useStatusBar } from './useStatusBar';
+import { useGetIdUser } from './useGetIdUser';
 
 export {
   useAndroidTranslucentStatusBar,
@@ -20,4 +21,5 @@ export {
   useBlockBackAndroid,
   useIsOwnerOfUnit,
   useStatusBar,
+  useGetIdUser,
 };

package/src/hooks/Common/useGetIdUser.js

@@ -0,0 +1,9 @@
+import { useSCContextSelector } from '../../context';
+
+export const useGetIdUser = () => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const idUser = useSCContextSelector(
+    (state) => state?.auth?.account?.user?.id
+  );
+  return idUser;
+};

package/src/hooks/Common/useTranslations.ts

@@ -0,0 +1,34 @@
+import {
+  getTranslate,
+  InterPolateString,
+  Language,
+  TranslationString,
+} from '../../utils/I18n';
+import { useCallback } from 'react';
+import { useSCContextSelector } from '../../context';
+import { getConfigGlobalState } from '../../iot/states.js';
+
+export const useTranslations = () => {
+  const lang = useSCContextSelector((state) => state.language);
+
+  const language: Language = lang as Language;
+
+  const t = useCallback(
+    (translations: TranslationString, interpolateStr?: InterPolateString) =>
+      getTranslate(language, translations, interpolateStr),
+    [language]
+  );
+
+  return t;
+};
+
+const t = (
+  translations: TranslationString,
+  interpolateStr?: InterPolateString
+) => {
+  const lang = getConfigGlobalState('lang');
+  const language: Language = lang as Language;
+  return getTranslate(language, translations, interpolateStr);
+};
+
+export default t;

package/src/iot/Monitor.js

@@ -3,13 +3,14 @@ import { getConfigGlobalState, setConfigGlobalState } from './states';
 import _ from 'lodash';
 import Pusher from 'pusher-js/react-native';
 import { axiosPost } from '../utils/Apis/axios';
+import { SCConfig } from '../configs';
 
 Pusher.logToConsole = true;
 let pusher = null;
 
 const getPusher = () => {
   if (!pusher) {
-    pusher = new Pusher('8557fcc63959f564f1aa', {
+    pusher = new Pusher(SCConfig.pusherAppKey, {
       cluster: 'ap1',
       authorizer: function (channel, option) {
         return {

package/src/iot/RemoteControl/Bluetooth.js

@@ -1,7 +1,7 @@
 /* eslint-disable promise/prefer-await-to-then */
 /* eslint-disable promise/prefer-await-to-callbacks */
 import { BLE } from '../../configs';
-import { t } from 'i18n-js';
+import t from '../../hooks/Common/useTranslations';
 import base64 from 'react-native-base64';
 import { BleManager } from 'react-native-ble-plx';
 import { ToastBottomHelper } from '../../utils/Utils';
@@ -68,11 +68,7 @@ const realScanBluetoothDevices = () => {
     const index = needToScanDevices.indexOf(name);
     needToScanDevices.splice(index, 1);
 
-    ToastBottomHelper.success(
-      t('Found bluetooth %{name} for remote control', {
-        name,
-      })
-    );
+    ToastBottomHelper.success(t(`Found bluetooth ${name} for remote control`));
 
     bluetoothDevices[name] = device;
     if (!needToScanDevices.length) {

package/src/iot/RemoteControl/GoogleHome.js

@@ -1,5 +1,5 @@
 import { Auth, createConnection, getStates } from 'home-assistant-js-websocket';
-import { t } from 'i18n-js';
+import t from '../../hooks/Common/useTranslations';
 import { getConfigGlobalState, setConfigGlobalState } from '../states';
 import { ToastBottomHelper } from '../../utils/Utils';
 import { API } from '../../configs';

package/src/iot/RemoteControl/Internet.js

@@ -1,4 +1,4 @@
-import { t } from 'i18n-js';
+import t from '../../hooks/Common/useTranslations';
 
 import { ToastBottomHelper } from '../../utils/Utils';
 import { axiosPost } from '../../utils/Apis/axios';

package/src/iot/RemoteControl/LG.js

@@ -4,12 +4,19 @@ import { getConfigGlobalState, setConfigGlobalState } from '../states';
 import { sendCommandOverInternet } from './Internet';
 
 let deviceMaps = {};
-let propertyListMaps = {
+const propertyListMaps = {
   temperature: 'targetTemperature',
   doorStatus: 'doorState',
 };
+const propertyTimer = [
+  'absoluteHourToStart',
+  'absoluteMinuteToStart',
+  'absoluteHourToStop',
+  'absoluteMinuteToStop',
+];
 
 function updateConfigValues(device, configValues, name, value) {
+  // eslint-disable-next-line no-prototype-builtins
   if (device.hasOwnProperty(name)) {
     const [configId] = device[name];
     configValues[configId] = value;
@@ -17,16 +24,9 @@ function updateConfigValues(device, configValues, name, value) {
   return configValues;
 }
 
-export async function updateStateByLgThinq(device_id, data) {
-  const device = deviceMaps[device_id];
-
-  if (!device) {
-    return;
-  }
-
-  let configValues = getConfigGlobalState('configValues');
-  // eslint-disable-next-line no-unused-vars
+function parseData(configValues, device, data) {
   for (const [resource, property] of Object.entries(data)) {
+    // base on data
     if (Array.isArray(property)) {
       const valueName = propertyListMaps[resource];
       if (valueName) {
@@ -52,6 +52,41 @@ export async function updateStateByLgThinq(device_id, data) {
       );
     }
   }
+
+  // For timer, if there is not exist in data, set undefined
+  for (let i = 0; i < propertyTimer.length; i++) {
+    // base on device
+    const name = propertyTimer[i];
+    // eslint-disable-next-line no-prototype-builtins
+    if (device.hasOwnProperty(name)) {
+      const timer = data.timer;
+      const value = timer ? timer[name] : -1;
+      const [configId] = device[name];
+      configValues[configId] = value;
+    }
+  }
+
+  return configValues;
+}
+
+export async function updateStateByLgThinq(device_id, data) {
+  const device = deviceMaps[device_id];
+
+  if (!device) {
+    return;
+  }
+
+  let configValues = getConfigGlobalState('configValues');
+
+  if (Array.isArray(data)) {
+    for (let i = 0; i < data.length; i++) {
+      const dataItem = data[i];
+      configValues = parseData(configValues, device, dataItem);
+    }
+  } else {
+    configValues = parseData(configValues, device, data);
+  }
+
   setConfigGlobalState('configValues', { ...configValues });
 }
 
@@ -110,13 +145,21 @@ export const sendCommandOverLGThinq = async (sensor, action, data) => {
 
     const item = action.lg_actions[i];
     let new_message = {};
+    let isFirstResourceDone = false;
     for (const [key, value] of Object.entries(item.message)) {
       let new_property = {};
-      let index = 0;
-      for (const [key1, value1] of Object.entries(value)) {
-        new_property[key1] = data[index] ? data[index] : value1; // new or keep old one
-        index += 1;
+
+      if (!isFirstResourceDone) {
+        let index = 0;
+        for (const [key1, value1] of Object.entries(value)) {
+          new_property[key1] = data[index] ? data[index] : value1; // new or keep old one
+          index += 1;
+        }
+        isFirstResourceDone = true;
+      } else {
+        new_property = value; // from next resource, keep old one
       }
+
       new_message[key] = new_property;
     }
 
@@ -127,5 +170,4 @@ export const sendCommandOverLGThinq = async (sensor, action, data) => {
       'lg_thinq'
     );
   }
-  await fetchDeviceStatusLG(sensor);
 };