@eohjsc/react-native-smart-city 0.2.75 → 0.2.76

package/index.js

@@ -1,4 +1,4 @@
-import { SCContext, SCProvider } from './src/context';
+import { SCContext, SCProvider, SCWrapper } from './src/context';
 import { AddDeviceStack } from './src/navigations/AddDeviceStack';
 import { AddGatewayStack } from './src/navigations/AddGatewayStack';
 import { AddMemberStack } from './src/navigations/AddMemberStack';
@@ -35,4 +35,5 @@ export {
   MyPinnedSharedUnit,
   SharedUnit,
   MyUnit,
+  SCWrapper,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.2.75",
+  "version": "0.2.76",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -182,7 +182,7 @@
     "react-native-snap-carousel": "4.0.0-beta.5",
     "react-native-super-grid": "^4.0.3",
     "react-native-svg": "^12.1.0",
-    "react-native-toast-message": "^1.3.2",
+    "react-native-toast-message": "^2.1.1",
     "react-native-udp": "^4.1.3",
     "react-native-unimodules": "^0.11.0",
     "react-native-version-check": "^3.4.2",

package/src/commons/ActionGroup/SmartTiviActionTemplate/component/ControlPlayStyles.js

@@ -1,5 +1,5 @@
 import { StyleSheet } from 'react-native';
-import { Colors, Device } from '../../../../configs';
+import { Device } from '../../../../configs';
 
 const widthMonitor = Device.screenWidth;
 const centerRowItem = {
@@ -21,8 +21,4 @@ export default StyleSheet.create({
     width: widthMonitor - 130,
     ...betweenRowItem,
   },
-  iconStop: {
-    fontStyle: 'Bold',
-    color: Colors.Gray9,
-  },
 });

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

@@ -60,7 +60,7 @@ describe('Test TimerActionTemplate success with config value', () => {
     const instance = wrapper.root;
 
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(6);
+    expect(texts).toHaveLength(8);
     expect(texts[0].props.children).toEqual('Timer');
     expect(texts[1].props.children).toEqual('Setting at 18:30');
 

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

@@ -62,7 +62,7 @@ describe('Test TimerActionTemplate without config value', () => {
     const instance = wrapper.root;
 
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(5);
+    expect(texts).toHaveLength(7);
     expect(texts[0].props.children).toEqual('Timer');
 
     const switchButton = instance.findByType(Switch);

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

@@ -332,8 +332,8 @@ describe('Test ActionGroup', () => {
       wrapper = renderer.create(wrapComponent(actionGroup, mockDoAction, {}));
     });
     const instance = wrapper.root;
-    const text = instance.findByType(Text);
-    expect(text.props.children).toEqual('28 *C');
+    const text = instance.findAllByType(Text);
+    expect(text[0].props.children).toEqual('28 *C');
 
     const touchs = instance.findAllByType(TouchableOpacity);
     expect(touchs).toHaveLength(2);
@@ -418,7 +418,7 @@ describe('Test ActionGroup', () => {
     const instance = wrapper.root;
 
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(5);
+    expect(texts).toHaveLength(7);
     expect(texts[0].props.children).toEqual('Timer');
 
     const switchButton = instance.findByType(Switch);

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

@@ -77,11 +77,11 @@ describe('Test ActionTemplate', () => {
     const instance = tree.root;
 
     const selectActionCard = instance.findByType(SelectActionCard);
-    const modal = instance.findByType(Modal);
+    const modal = instance.findAllByType(Modal);
     act(() => {
       selectActionCard.props.onPress();
     });
-    expect(modal.props.isVisible).toBe(true);
+    expect(modal[0].props.isVisible).toBe(true);
   });
   test('test onPressSelectAction', () => {
     act(() => {

package/src/commons/Automate/__test__/ItemAutomate.test.js

@@ -19,6 +19,6 @@ describe('Test ItemAutomate', () => {
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(2);
+    expect(texts).toHaveLength(4);
   });
 });

package/src/commons/Dashboard/MyPinnedSharedUnit/__test__/MyPinnedSharedUnit.test.js

@@ -49,7 +49,7 @@ describe('Test MyPinnedSharedUnit', () => {
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(2);
+    expect(texts).toHaveLength(4);
     expect(texts[0].props.children).toEqual(
       getTranslate('en', 'text_shared_units')
     );

package/src/commons/Device/ItemDevice.js

@@ -8,8 +8,10 @@ import {
 import Routes from '../../utils/Route';
 import { IconFill, IconOutline } from '@ant-design/icons-react-native';
 import { useNavigation } from '@react-navigation/native';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 import ItemQuickAction from '../../commons/Action/ItemQuickAction';
 import Text from '../../commons/Text';
+import { isDeviceConnected } from '../../iot/RemoteControl/Bluetooth';
 
 import { Colors, Constants } from '../../configs';
 import { TESTID } from '../../configs/Constants';
@@ -29,8 +31,10 @@ const ItemDevice = memo(
     unit,
     station,
     isGGHomeConnected,
+    status,
     wrapStyle,
   }) => {
+    const t = useTranslations();
     const navigation = useNavigation();
 
     const goToSensorDisplay = useCallback(() => {
@@ -52,10 +56,20 @@ const ItemDevice = memo(
       );
     };
 
+    const isNetworkConnected =
+      status === undefined ? sensor.is_connected : status.is_connected;
+    const isBLEConnected = isDeviceConnected(
+      sensor?.remote_control_options?.bluetooth?.address
+    );
+    const isConnected =
+      isNetworkConnected || isGGHomeConnected || isBLEConnected;
+    const borderColor = isConnected ? Colors.Gray4 : Colors.Red6;
+    const textConnected = isConnected ? t('connected') : t('disconnected');
+
     return (
       <TouchableWithoutFeedback onPress={goToSensorDisplay}>
         <View
-          style={[styles.container, wrapStyle]}
+          style={[styles.container, wrapStyle, { borderColor }]}
           testID={TESTID.SUB_UNIT_DEVICES}
         >
           <View style={styles.boxIcon}>
@@ -82,7 +96,7 @@ const ItemDevice = memo(
                 color={Colors.Gray8}
                 style={styles.lineHeight20}
               >
-                {description}
+                {description || textConnected}
               </Text>
               <IconOutline name="right" size={12} />
             </View>
@@ -112,6 +126,7 @@ const styles = StyleSheet.create({
     backgroundColor: Colors.White,
     justifyContent: 'space-between',
     marginBottom: 8,
+    borderWidth: 1,
   },
   boxIcon: {
     flexDirection: 'row',

package/src/commons/Device/WindDirection/Compass/Compass.test.js

@@ -37,7 +37,7 @@ describe('Test Compass', () => {
       });
       const instance = tree.root;
       const textInputs = instance.findAllByType(Text);
-      expect(textInputs.length).toEqual(1);
+      expect(textInputs.length).toEqual(3);
       expect(textInputs[0].props.children).toEqual(list_result[index]);
     });
   });
@@ -48,6 +48,6 @@ describe('Test Compass', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toEqual(1);
+    expect(textInputs.length).toEqual(3);
   });
 });

package/src/commons/Device/__test__/ConnectedViewHeader.test.js

@@ -28,7 +28,7 @@ describe('Test ConnectedViewHeader', () => {
     });
     const isntance = tree.root;
     const texts = isntance.findAllByType(Text);
-    expect(texts).toHaveLength(1);
+    expect(texts).toHaveLength(3);
   });
 
   test('render ConnectedViewHeader no last updated', async () => {
@@ -37,6 +37,6 @@ describe('Test ConnectedViewHeader', () => {
     });
     const isntance = tree.root;
     const texts = isntance.findAllByType(Text);
-    expect(texts).toHaveLength(1);
+    expect(texts).toHaveLength(3);
   });
 });

package/src/commons/Device/__test__/DisconnectedView.test.js

@@ -21,7 +21,7 @@ describe('Test DisconnectedView', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(10);
+    expect(Views).toHaveLength(15);
   });
 
   test('render DisconnectedView icon sensor', () => {
@@ -31,7 +31,7 @@ describe('Test DisconnectedView', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(10);
+    expect(Views).toHaveLength(15);
   });
 
   test('render DisconnectedView icon barrier', () => {
@@ -41,7 +41,7 @@ describe('Test DisconnectedView', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(10);
+    expect(Views).toHaveLength(15);
   });
 
   test('render DisconnectedView icon wind', () => {
@@ -51,7 +51,7 @@ describe('Test DisconnectedView', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(10);
+    expect(Views).toHaveLength(15);
   });
 
   test('render DisconnectedView icon test', () => {
@@ -61,6 +61,6 @@ describe('Test DisconnectedView', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(10);
+    expect(Views).toHaveLength(15);
   });
 });

package/src/commons/Explore/__test__/HeaderExplore.test.js

@@ -20,6 +20,6 @@ describe('Test HeaderExplore', () => {
     });
     const instance = tree.root;
     const button = instance.findAllByType(Text);
-    expect(button.length).toBe(1);
+    expect(button.length).toBe(3);
   });
 });

package/src/commons/MediaPlayerDetail/__test__/MediaPlayerDetail.test.js

@@ -32,7 +32,7 @@ describe('Test MediaPlayerDetail', () => {
     });
 
     const texts = instance.findAllByType(Text);
-    expect(texts.length).toEqual(2);
+    expect(texts.length).toEqual(4);
     expect(texts[1].props.children).toEqual('cameraName');
 
     const pauseIcon = instance.findAllByType(PauseIcon);

package/src/commons/Modal/__test__/ModalBottom.test.js

@@ -25,7 +25,7 @@ describe('Test ModalBottom', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(5);
+    expect(Views).toHaveLength(10);
   });
 
   it('Test render without isVisible', async () => {
@@ -34,6 +34,6 @@ describe('Test ModalBottom', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(5);
+    expect(Views).toHaveLength(10);
   });
 });

package/src/commons/Sharing/__test__/MemberList.test.js

@@ -27,7 +27,7 @@ describe('MemberList', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toBe(2);
+    expect(textInputs.length).toBe(4);
   });
   test('MemberList snapshot id dataMember !== ownerId', () => {
     const dataMember = [{ id: 1, name: 'CEO' }];
@@ -36,7 +36,7 @@ describe('MemberList', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toBe(1);
+    expect(textInputs.length).toBe(3);
   });
   test('MemberList snapshot id dataMember === currentUserId', () => {
     const dataMember = [{ id: 1, name: 'CEO' }];
@@ -45,7 +45,7 @@ describe('MemberList', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toBe(2);
+    expect(textInputs.length).toBe(4);
   });
   test('MemberList dataMember null', () => {
     const dataMember = [];

package/src/commons/Sharing/__test__/RowMember.test.js

@@ -26,7 +26,7 @@ describe('RowMember', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toBe(2);
+    expect(textInputs.length).toBe(4);
     expect(textInputs[0].props.children).toEqual('CEO');
   });
   test('RowMember owner dont have name show start of email ', () => {
@@ -36,7 +36,7 @@ describe('RowMember', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toBe(2);
+    expect(textInputs.length).toBe(4);
     expect(textInputs[0].props.children).toEqual('abc');
   });
 });

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

@@ -1,12 +1,15 @@
-import React from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { View } from 'react-native';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
+import { useIsFocused } from '@react-navigation/native';
 
 import { Section } from '../../Section';
 import ItemDevice from '../../Device/ItemDevice';
 import ItemOneTap from '../OneTap/ItemOneTap';
 import ItemAddNew from '../../Device/ItemAddNew';
 import styles from './styles';
+import { API } from '../../../configs';
+import { axiosGet } from '../../../utils/Apis/axios';
 
 const SubUnitFavorites = ({
   unit,
@@ -16,6 +19,33 @@ const SubUnitFavorites = ({
   wrapItemStyle,
 }) => {
   const t = useTranslations();
+  const isFocused = useIsFocused();
+  const intervalSensorStatus = useRef();
+  const [sensorsStatus, setSensorsStatus] = useState([]);
+
+  useEffect(() => {
+    if (isFocused) {
+      const getSensorsStatus = async () => {
+        const params = new URLSearchParams();
+        if (favorites?.devices?.length > 0) {
+          favorites.devices.forEach((sensor) => {
+            params.append('sensors', sensor.id);
+          });
+          const { success, data } = await axiosGet(API.SENSOR.STATUS(), {
+            params: params,
+          });
+          if (success) {
+            setSensorsStatus(data);
+          }
+        }
+      };
+      const updateInterval = setInterval(getSensorsStatus, 5000);
+      intervalSensorStatus.current = updateInterval;
+      return () => clearInterval(updateInterval);
+    } else {
+      clearInterval(intervalSensorStatus.current);
+    }
+  }, [isFocused, favorites?.devices]);
 
   const handleOnAddNew = () => {
     alert(t('feature_under_development'));
@@ -39,6 +69,7 @@ const SubUnitFavorites = ({
               unit={unit}
               station={sensor.station}
               isGGHomeConnected={isGGHomeConnected}
+              status={sensorsStatus.find((s) => s.id === sensor.id)}
               wrapStyle={wrapItemStyle}
             />
           ))}

package/src/commons/SubUnit/ShortDetail.js

@@ -1,9 +1,9 @@
-import React from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { StyleSheet, View } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
+import { useNavigation, useIsFocused } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
-import { Images, Device } from '../../configs';
+import { Images, Device, API } from '../../configs';
 import { SubUnitName, TESTID } from '../../configs/Constants';
 import { Section } from '../Section';
 import Text from '../Text';
@@ -13,6 +13,7 @@ import { standardizeCameraScreenSize } from '../../utils/Utils';
 import Routes from '../../utils/Route';
 import FastImage from 'react-native-fast-image';
 import MediaPlayerDetail from '../MediaPlayerDetail';
+import { axiosGet } from '../../utils/Apis/axios';
 
 const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
   Device.screenWidth - 32
@@ -20,7 +21,35 @@ const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
 
 const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
   const t = useTranslations();
+  const isFocused = useIsFocused();
   const { navigate } = useNavigation();
+  const intervalSensorStatus = useRef();
+
+  const [sensorsStatus, setSensorsStatus] = useState([]);
+
+  useEffect(() => {
+    if (isFocused) {
+      const getSensorsStatus = async () => {
+        const params = new URLSearchParams();
+        if (station?.sensors?.length > 0) {
+          station.sensors.forEach((sensor) => {
+            params.append('sensors', sensor.id);
+          });
+          const { success, data } = await axiosGet(API.SENSOR.STATUS(), {
+            params: params,
+          });
+          if (success) {
+            setSensorsStatus(data);
+          }
+        }
+      };
+      const updateInterval = setInterval(getSensorsStatus, 5000);
+      intervalSensorStatus.current = updateInterval;
+      return () => clearInterval(updateInterval);
+    } else {
+      clearInterval(intervalSensorStatus.current);
+    }
+  }, [isFocused, station?.sensors]);
 
   const renderCamera = () => {
     if (station?.camera) {
@@ -115,6 +144,7 @@ const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
               unit={unit}
               station={station}
               isGGHomeConnected={isGGHomeConnected}
+              status={sensorsStatus.find((s) => s.id === sensor.id)}
             />
           ))}
         <ItemAddNew title={itemAddNewTitle} onAddNew={handleOnAddNew} />

package/src/commons/SubUnit/__test__/Favorites.test.js

@@ -27,6 +27,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockNavigate,
     }),
+    useIsFocused: () => true,
   };
 });
 

package/src/commons/SubUnit/__test__/ShortDetail.test.js

@@ -22,6 +22,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockedNavigate,
     }),
+    useIsFocused: () => true,
   };
 });
 

package/src/commons/Today/__test__/Today.test.js

@@ -20,6 +20,6 @@ describe('Test Today', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(1);
+    expect(Views).toHaveLength(6);
   });
 });

package/src/configs/API.js

@@ -87,6 +87,7 @@ const API = {
     CHANGE_SUB_UNIT: (unit_id, station_id, id) =>
       SCConfig.apiRoot +
       `/property_manager/${unit_id}/sub_units/${station_id}/devices/${id}/change_sub_unit/`,
+    STATUS: () => SCConfig.apiRoot + '/property_manager/sensors/status/',
   },
   SHARED_SENSOR: {
     ACCESS: (id) =>

package/src/context/SCContext.tsx

@@ -1,4 +1,6 @@
 import React, { useContext, useReducer } from 'react';
+import { StyleSheet, View } from 'react-native';
+import Toast from 'react-native-toast-message';
 
 import {
   ActionDataMap,
@@ -10,6 +12,18 @@ import {
 import { initialState, Action, ContextData, reducer } from './reducer';
 import { setConfigGlobalState } from '../iot/states.js';
 import { setAxiosDefaultLanguage } from '../utils/Utils';
+import { Alert } from '../commons';
+import { Colors } from '../configs';
+import Text from '../commons/Text';
+
+const toastConfig = {
+  // only for error for now
+  error: (internalState) => (
+    <View style={styles.toastContainer}>
+      <Text style={styles.textWhite}>{internalState.text1}</Text>
+    </View>
+  ),
+};
 
 type SCContextType = {
   stateData: ContextData;
@@ -68,15 +82,34 @@ export const SCProvider = ({ children, initState = initialState }) => {
   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)} />
     </SCContext.Provider>
   );
 };
 
+export const SCWrapper = (props) => {
+  return (
+    <>
+      <SCProvider {...props} />
+      <Toast config={toastConfig} ref={(ref) => Toast.setRef(ref)} />
+    </>
+  );
+};
+
 export const useSCContextSelector = (
   selector: (contextData: ContextData) => unknown
 ) => {
   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/index.ts

@@ -1 +1,6 @@
-export { useSCContextSelector, SCContext, SCProvider } from './SCContext';
+export {
+  useSCContextSelector,
+  SCContext,
+  SCProvider,
+  SCWrapper,
+} from './SCContext';

package/src/screens/ActivityLog/__test__/index.test.js

@@ -101,50 +101,49 @@ describe('Test Activity log', () => {
     });
     const instance = tree.root;
     const dateTimeRangeChange = instance.findByType(DateTimeRangeChange);
-    const filterPopup = instance.findByType(Modal);
+    const filterPopup = instance.findAllByType(Modal);
     const datePicker = instance.findByType(DateTimePickerModal);
     const filterButton = instance.find(
       (el) =>
         el.props.testID === TESTID.FILTER_BUTTON && el.type === TouchableOpacity
     );
     // open popup
-    expect(filterPopup.props.isVisible).toBeFalsy();
+    expect(filterPopup[0].props.isVisible).toBeFalsy();
     await act(async () => {
       await filterButton.props.onPress();
     });
-    expect(filterPopup.props.isVisible).toBeTruthy();
+    expect(filterPopup[0].props.isVisible).toBeTruthy();
     // pick start date
     await act(async () => {
       await dateTimeRangeChange.props.onStart();
-      await filterPopup.props.onModalHide();
+      await filterPopup[0].props.onModalHide();
     });
-    expect(filterPopup.props.isVisible).toBeFalsy();
-    expect(datePicker.props.isVisible).toBeTruthy();
+    expect(filterPopup[0].props.isVisible).toBeFalsy();
     // cancel
     await act(async () => {
       await datePicker.props.onCancel();
       await datePicker.props.onHide();
     });
-    expect(filterPopup.props.isVisible).toBeTruthy();
+    expect(filterPopup[0].props.isVisible).toBeTruthy();
     expect(datePicker.props.isVisible).toBeFalsy();
     // open popup
     await act(async () => {
       await filterButton.props.onPress();
     });
-    expect(filterPopup.props.isVisible).toBeTruthy();
+    expect(filterPopup[0].props.isVisible).toBeTruthy();
     // pick end date
     await act(async () => {
       await dateTimeRangeChange.props.onEnd();
-      await filterPopup.props.onModalHide();
+      await filterPopup[0].props.onModalHide();
     });
-    expect(filterPopup.props.isVisible).toBeFalsy();
+    expect(filterPopup[0].props.isVisible).toBeFalsy();
     expect(datePicker.props.isVisible).toBeTruthy();
     // confirm
     await act(async () => {
       await datePicker.props.onConfirm();
       await datePicker.props.onHide();
     });
-    expect(filterPopup.props.isVisible).toBeTruthy();
+    expect(filterPopup[0].props.isVisible).toBeTruthy();
     expect(datePicker.props.isVisible).toBeFalsy();
   });
 });

package/src/screens/AddNewAction/Device/__test__/index.test.js

@@ -31,11 +31,11 @@ describe('Test SelectDevice', () => {
     });
 
     const instance = tree.root;
-    const touchableWithoutFeedback = instance.findByType(
+    const touchableWithoutFeedback = instance.findAllByType(
       TouchableWithoutFeedback
     );
     act(() => {
-      touchableWithoutFeedback.props.onPress();
+      touchableWithoutFeedback[0].props.onPress();
     });
     expect(mockFuntion).toHaveBeenCalledWith(sensor);
   });

package/src/screens/AddNewDevice/__test__/ConnectingDevices.test.js

@@ -53,7 +53,7 @@ describe('Test ConnectingDevices', () => {
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(2);
+    expect(texts).toHaveLength(4);
     expect(texts[0].props.children).toEqual(
       getTranslate('en', 'connecting_your_device')
     );

package/src/screens/AddNewGateway/PlugAndPlay/__test__/FirstWarning.test.js

@@ -37,7 +37,7 @@ describe('Test FirstWarning', () => {
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(8);
+    expect(texts).toHaveLength(10);
     expect(texts[1].props.children).toEqual(
       getTranslate('en', 'warning_beta_test_feature')
     );

package/src/screens/AddNewGateway/PlugAndPlay/__test__/GatewayWifiList.test.js

@@ -28,7 +28,7 @@ describe('Test GatewayWifiList', () => {
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(8);
+    expect(texts).toHaveLength(10);
     expect(texts[1].props.children).toEqual(getTranslate('en', 'set_network'));
     expect(texts[3].props.children).toEqual('eoh@io');
   });

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

@@ -53,7 +53,7 @@ describe('Test ConnectingGateway', () => {
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(6);
+    expect(texts).toHaveLength(8);
     expect(texts[0].props.children).toEqual(
       getTranslate('en', 'connecting_your_gateway')
     );

package/src/screens/PlayBackCamera/__test__/index.test.js

@@ -34,6 +34,6 @@ describe('Test PlayBackCamera', () => {
     });
     const instance = tree.root;
     const HeaderCustoms = instance.findAllByType(ModalCustom);
-    expect(HeaderCustoms).toHaveLength(1);
+    expect(HeaderCustoms).toHaveLength(2);
   });
 });

package/src/screens/Unit/__test__/Detail.test.js

@@ -74,6 +74,7 @@ describe('Test UnitDetail', () => {
 
   const detailUnitApiUrl = API.UNIT.UNIT_DETAIL(1);
   const summaryUnitApiUrl = API.UNIT.UNIT_SUMMARY(1);
+  const sensorStatusApiUrl = API.SENSOR.STATUS();
 
   let tree;
 
@@ -318,6 +319,11 @@ describe('Test UnitDetail', () => {
           status: 200,
           data: [],
         };
+      } else if (url === sensorStatusApiUrl) {
+        return {
+          status: 200,
+          data: [],
+        };
       }
 
       return {
@@ -396,7 +402,7 @@ describe('Test UnitDetail', () => {
       );
     });
     await act(async () => {
-      await jest.runAllTimers();
+      await jest.runOnlyPendingTimers();
     });
     // TODO Called but can not expect
     // expect(axios.get).toHaveBeenCalledWith(API.IOT.LG.DEVICE_STATUS(2));

package/src/screens/Unit/components/__test__/Header.test.js

@@ -22,11 +22,11 @@ describe('Test Header', () => {
       tree = renderer.create(wrapComponent());
     });
     const instance = tree.root;
-    const modal = instance.findByType(Modal);
+    const modal = instance.findAllByType(Modal);
     act(() => {
-      modal.props.onBackButtonPress();
+      modal[0].props.onBackButtonPress();
     });
-    expect(modal.props.isVisible).toBe(false);
+    expect(modal[0].props.isVisible).toBe(false);
   });
 
   test('test onItemClick', () => {
@@ -34,12 +34,12 @@ describe('Test Header', () => {
       tree = renderer.create(wrapComponent());
     });
     const instance = tree.root;
-    const modal = instance.findByType(Modal);
+    const modal = instance.findAllByType(Modal);
     const imageButton = instance.findByType(ImageButton);
     act(() => {
       imageButton.props.onPress(Routes.Sharing);
     });
-    expect(modal.props.isVisible).toBe(false);
+    expect(modal[0].props.isVisible).toBe(false);
   });
 
   test('test Popover Close Menu', () => {

package/src/screens/Unit/components/__test__/MyUnitDevice.test.js

@@ -22,7 +22,7 @@ describe('Test MyUnitDevice', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(5);
+    expect(Views).toHaveLength(10);
   });
 
   it('Test render without status', async () => {
@@ -31,6 +31,6 @@ describe('Test MyUnitDevice', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(5);
+    expect(Views).toHaveLength(10);
   });
 });

package/src/screens/UnitSummary/components/PowerConsumption/index.js

@@ -91,8 +91,10 @@ const PowerConsumption = memo(({ summaryDetail }) => {
       let params = new URLSearchParams();
       params.append('config', listConfigs.total_power);
       params.append('group_by', groupBy);
-      params.append('date_from', moment(startDate).format('YYYY-MM-DD'));
-      params.append('date_to', moment(endDate).format('YYYY-MM-DD'));
+      if (groupBy === 'date') {
+        params.append('date_from', moment(startDate).format('YYYY-MM-DD'));
+        params.append('date_to', moment(endDate).format('YYYY-MM-DD'));
+      }
       const { success, data } = await axiosGet(
         API.POWER_CONSUME.DISPLAY_HISTORY(),
         {