@eohjsc/react-native-smart-city 0.4.94 → 0.4.95

package/README.md

@@ -132,7 +132,7 @@ const MyScreen = () => {
 };
 ```
 
-3. Trigger quick action
+3. Trigger quick action 
 
 ```javascript
 import React from 'react';

package/package.json

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

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

@@ -18,14 +18,14 @@ import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import Routes from '../../../utils/Route';
 import api from '../../../utils/Apis/axios';
-import { watchMultiConfigs } from '../../../iot/Monitor';
+import { useWatchConfigs } from '../../../hooks/IoT';
 
 const mock = new MockAdapter(api.axiosInstance);
 
-jest.mock('../../../iot/Monitor', () => {
+jest.mock('../../../hooks/IoT', () => {
   return {
-    ...jest.requireActual('../../../iot/Monitor'),
-    watchMultiConfigs: jest.fn(),
+    ...jest.requireActual('../../../hooks/IoT'),
+    useWatchConfigs: jest.fn(),
   };
 });
 
@@ -195,7 +195,7 @@ describe('test DeviceDetail', () => {
     useLayoutEffectSpy.mockImplementation(() => setState);
     mock.reset();
     mockedNavigate.mockClear();
-    watchMultiConfigs.mockReset();
+    useWatchConfigs.mockReset();
   });
 
   it('render DeviceDetail render SensorDisplayItem', async () => {
@@ -810,7 +810,7 @@ describe('test DeviceDetail', () => {
         el.props.accessibilityLabel === AccessibilityLabel.SENSOR_DISPLAY_ITEM
     );
     expect(sensorDisplayItem.length).toEqual(1);
-    expect(watchMultiConfigs).toHaveBeenCalledWith([]);
+    expect(useWatchConfigs).toHaveBeenCalledWith([]);
   });
 
   it('watch action config', async () => {
@@ -838,7 +838,7 @@ describe('test DeviceDetail', () => {
       tree = await create(wrapComponent(store, account, route));
     });
 
-    expect(watchMultiConfigs).toHaveBeenCalledWith([]);
+    expect(useWatchConfigs).toHaveBeenCalledWith([]);
   });
 
   it('watch stages grid action config', async () => {
@@ -869,6 +869,6 @@ describe('test DeviceDetail', () => {
       tree = await create(wrapComponent(store, account, route));
     });
 
-    expect(watchMultiConfigs).toHaveBeenCalledWith([]);
+    expect(useWatchConfigs).toHaveBeenCalledWith([]);
   });
 });

package/src/screens/Device/detail.js

@@ -32,6 +32,7 @@ import {
   useBluetoothDeviceConnected,
   useHomeAssistantDeviceConnected,
   useEoHBackendDeviceConnected,
+  useWatchConfigs,
 } from '../../hooks/IoT';
 import { useDisconnectedDevice } from './hooks/useDisconnectedDevice';
 import { useDeviceWatchConfigControl } from './hooks/useDeviceWatchConfigControl';
@@ -59,7 +60,6 @@ import { useReceiveNotifications } from '../../hooks';
 import useChipJsonConfiguration, {
   useConnectChipMqtt,
 } from '../../hooks/useMqtt';
-import { watchMultiConfigs } from '../../iot/Monitor';
 
 const DeviceDetail = ({ route }) => {
   const configIdsTemp = useRef([]);
@@ -67,9 +67,7 @@ const DeviceDetail = ({ route }) => {
   const t = useTranslations();
   const navigation = useNavigation();
   const token = useSCContextSelector((state) => state.auth.account.token);
-  const { isLockWhenPickColor, appState } = useSCContextSelector(
-    (state) => state.app
-  );
+  const { isLockWhenPickColor } = useSCContextSelector((state) => state.app);
 
   const { setAction } = useContext(SCContext);
   const [offsetTitle, setOffsetTitle] = useState(1);
@@ -612,6 +610,8 @@ const DeviceDetail = ({ route }) => {
     }, [display.items, isNetworkConnected, sensor, mqttConfigs])
   );
 
+  useWatchConfigs(configIdsTemp.current);
+
   const isShowEmergencyResolve =
     display.items.filter(
       (item) =>
@@ -719,10 +719,6 @@ const DeviceDetail = ({ route }) => {
     SCConfig.setCurrentSensorDisplay(sensor);
   }, [sensor]);
 
-  useEffect(() => {
-    appState === 'active' && watchMultiConfigs(configIdsTemp.current);
-  }, [appState]);
-
   const shouldRender =
     loading.displayTemplate === false &&
     loading.isConnected === false &&