@eohjsc/react-native-smart-city 0.2.96 → 0.2.97

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.2.96",
+  "version": "0.2.97",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -81,10 +81,11 @@
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-react-native": "^3.10.0",
     "factory-girl": "^5.0.4",
+    "husky": "^8.0.1",
     "jest": "^26.6.3",
     "jest-circus": "^26.6.3",
     "jetifier": "^1.6.6",
-    "lint-staged": "^8.2.1",
+    "lint-staged": "^12.4.1",
     "metro-react-native-babel-preset": "^0.66.2",
     "node-html-parser": "^2.0.2",
     "react": "17.0.2",
@@ -97,6 +98,7 @@
   "dependencies": {
     "@ant-design/icons-react-native": "^2.2.1",
     "@ant-design/react-native": "^4.0.5",
+    "@babel/helper-environment-visitor": "^7.16.7",
     "@eohjsc/highcharts": "^1.0.8",
     "@eohjsc/react-native-keyboard-aware-scroll-view": "^0.9.5",
     "@formatjs/intl-getcanonicallocales": "^1.4.5",
@@ -209,5 +211,15 @@
   "bugs": {
     "url": "https://github.com/github_account/react-native-smart-city/issues"
   },
-  "homepage": "https://github.com/github_account/react-native-smart-city#readme"
+  "homepage": "https://github.com/github_account/react-native-smart-city#readme",
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.{js, ts}": [
+      "yarn lint"
+    ]
+  }
 }

package/src/commons/ConnectingProcess/index.js

@@ -10,7 +10,7 @@ import { axiosPost } from '../../utils/Apis/axios';
 import { API, Colors } from '../../configs';
 import styles from './styles';
 import DeviceItem from './DeviceItem/DeviceItem';
-import Connecting from '../Connecting ';
+import Connecting from '../Connecting';
 import { useSCContextSelector } from '../../context';
 
 const ConnectingProcess = ({ route }) => {

package/src/commons/Device/HistoryChart.js

@@ -234,7 +234,7 @@ const HistoryChart = memo(
         )}
         <DateTimePickerModal
           isVisible={eventPicker.showModalStart}
-          date={eventPicker.startTime.toDate()}
+          date={eventPicker.startTime.valueOf()}
           mode={formatType || 'datetime'}
           onConfirm={onConfirmStart}
           onCancel={onCancel}
@@ -242,7 +242,7 @@ const HistoryChart = memo(
         />
         <DateTimePickerModal
           isVisible={eventPicker.showModalEnd}
-          date={eventPicker.endTime.toDate()}
+          date={eventPicker.endTime.valueOf()}
           mode={formatType || 'datetime'}
           onConfirm={onConfirmEnd}
           onCancel={onCancel}

package/src/commons/PreventAccess/index.js

@@ -0,0 +1,59 @@
+import React, { memo, useCallback, useMemo } from 'react';
+import { View } from 'react-native';
+import Modal from 'react-native-modal';
+import { useNavigation } from '@react-navigation/native';
+
+import t from '../../hooks/Common/useTranslations';
+import Text from '../Text';
+import { Colors } from '../../configs';
+import { styles } from './styles';
+
+const PreventAccess = memo(({ headerBodyText, visible, hidePreventAccess }) => {
+  const { goBack } = useNavigation();
+
+  const dataText = useMemo(() => {
+    return {
+      headerText: t('note'),
+      bodyText: t('This {name} was removed!', {
+        name: headerBodyText ? headerBodyText : '',
+      }),
+      endOfText: t('back'),
+    };
+  }, [headerBodyText]);
+
+  const handleBackPress = useCallback(() => {
+    hidePreventAccess();
+    goBack();
+  }, [goBack, hidePreventAccess]);
+
+  const handleDonePopup = useCallback(() => {
+    goBack();
+    hidePreventAccess();
+  }, [goBack, hidePreventAccess]);
+
+  return (
+    <Modal
+      isVisible={visible}
+      transparent={true}
+      onBackButtonPress={handleBackPress}
+      style={styles.container}
+    >
+      <View style={styles.popoverStyle}>
+        <View style={styles.actionTextWrap}>
+          <Text size={17} bold color={Colors.Gray9} style={styles.textHeader}>
+            {dataText?.headerText}
+          </Text>
+          <Text type="H4" color={Colors.Gray8} style={styles.textNotification}>
+            {dataText?.bodyText}
+          </Text>
+        </View>
+        <View style={styles.endOfText}>
+          <Text size={16} bold color={Colors.Primary} onPress={handleDonePopup}>
+            {dataText?.endOfText}
+          </Text>
+        </View>
+      </View>
+    </Modal>
+  );
+});
+export default PreventAccess;

package/src/commons/PreventAccess/styles.js

@@ -0,0 +1,33 @@
+import { StyleSheet } from 'react-native';
+
+import { Colors } from '../../configs';
+
+export const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  popoverStyle: {
+    flex: 1,
+    width: '100%',
+    backgroundColor: Colors.White,
+    position: 'absolute',
+    borderRadius: 10,
+  },
+  actionTextWrap: {
+    marginTop: 14,
+    marginHorizontal: 20,
+  },
+  textHeader: {
+    marginVertical: 10,
+  },
+  textNotification: {
+    lineHeight: 20,
+  },
+  endOfText: {
+    flexDirection: 'row',
+    justifyContent: 'flex-end',
+    marginTop: 5,
+    marginBottom: 20,
+    marginRight: 20,
+  },
+});

package/src/iot/RemoteControl/GoogleHome.js

@@ -201,8 +201,22 @@ function getServiceName(message) {
   return serviceSplit.join('_');
 }
 
+async function sendCommandSingleAction(connection, ghAction, data) {
+  const { message } = ghAction || {};
+  const name = getServiceName(message);
+
+  if (name && data) {
+    message.service_data[name] = data;
+  }
+
+  await connection.sendMessagePromise(message);
+}
+
 export async function sendCommandOverGoogleHome(sensor, action, data) {
-  if (!action.googlehome_actions || !action.googlehome_actions.length) {
+  if (
+    !(action.googlehome_actions && action.googlehome_actions.length) &&
+    !action.googlehome_action
+  ) {
     return;
   }
 
@@ -212,20 +226,19 @@ export async function sendCommandOverGoogleHome(sensor, action, data) {
     return;
   }
 
-  for (let i = 0; i < action.googlehome_actions.length; i++) {
-    const ghAction = action.googlehome_actions[i];
-    const { message } = ghAction;
-    const name = getServiceName(ghAction.message);
-
-    if (name && data) {
-      message.service_data[name] = data;
+  if (action.googlehome_actions) {
+    for (let i = 0; i < action.googlehome_actions.length; i++) {
+      await sendCommandSingleAction(
+        connection,
+        action.googlehome_actions[i],
+        data
+      );
     }
-
-    await connection.sendMessagePromise(message);
+  } else if (action.googlehome_action) {
+    await sendCommandSingleAction(connection, action.googlehome_action, data);
   }
 
   const { success } = await axiosPost(API.SENSOR.ACTIVITY_LOG(), {
-    sensor_id: sensor.id,
     action_id: action.id,
     message: 'Trigger by user action with google home',
   });

package/src/iot/RemoteControl/__test__/GoogleHome.test.js

@@ -75,6 +75,9 @@ describe('Remote Control Google Home', () => {
         message: 'message',
       },
     ],
+    googlehome_action: {
+      message: 'message',
+    },
   };
 
   const response = {
@@ -223,6 +226,35 @@ describe('Remote Control Google Home', () => {
     });
   });
 
+  it('Send command over google home action googlehome_action one to one', async () => {
+    action.googlehome_actions = null;
+    action.googlehome_action.message = {
+      type: 'call_service',
+      domain: 'climate',
+      service: 'set_temperature',
+      service_data: {
+        temperature: 0,
+        entity_id: 'climate.dqsmart_0108f6cdde',
+      },
+      id: 20,
+    };
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
+    await googleHomeConnect(options);
+    await sendCommandOverGoogleHome(sensor, action, 19);
+
+    action.googlehome_action.message.service_data.temperature = 19;
+    expect(connection.sendMessagePromise).toBeCalledWith(
+      action.googlehome_action.message
+    );
+    expect(axios.post).toHaveBeenCalledWith(API.SENSOR.ACTIVITY_LOG(), {
+      action_id: 1,
+      message: 'Trigger by user action with google home',
+    });
+  });
+
   it('Send command over google home that not connected', async () => {
     await googleHomeConnect(options);
     await sendCommandOverGoogleHome({ chip_id: 2 }, action);

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -37,6 +37,7 @@ const SelectSensorDevices = memo(({ route }) => {
   const [selectedDevice, setSelectedDevice] = useState();
   const { navigate, dispatch, goBack } = useNavigation();
   const isSelectSensor = title === AUTOMATE_SELECT.SELECT_SENSOR;
+  const [loading, setLoading] = useState(true);
 
   const onSnapToItem = useCallback(
     (item, index) => {
@@ -83,6 +84,7 @@ const SelectSensorDevices = memo(({ route }) => {
         }
       }
     );
+    setLoading(false);
   }, [automate.sensor_id, isSelectSensor, unit]);
 
   useEffect(() => {
@@ -162,6 +164,9 @@ const SelectSensorDevices = memo(({ route }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [route.params]
   );
+  if (loading) {
+    return null;
+  }
 
   return (
     <View style={styles.wrap}>
@@ -175,7 +180,7 @@ const SelectSensorDevices = memo(({ route }) => {
           {t(title)}
         </Text>
 
-        {listStation ? (
+        {listStation.length ? (
           <NavBar
             listStation={listStation}
             listMenuItem={listMenuItem}

package/src/screens/AddNewAction/__test__/SelectSensorDevices.test.js

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import axios from 'axios';
 
@@ -25,12 +25,10 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-const mockSetState = jest.fn();
 jest.mock('react', () => {
   return {
     ...jest.requireActual('react'),
     memo: (x) => x,
-    useState: jest.fn((init) => [init, mockSetState]),
   };
 });
 
@@ -49,28 +47,27 @@ describe('Test SelectSensorDevices', () => {
       scriptName: 'scriptName test',
     },
   };
+  const response = {
+    status: 200,
+    success: true,
+    data: [
+      {
+        id: 1,
+        name: 'Device 1',
+        sensors: [
+          { id: 1, name: 'sensor' },
+          { id: 2, name: 'sensor' },
+        ],
+      },
+    ],
+  };
 
   beforeEach(() => {
     axios.get.mockClear();
     mockedNavigate.mockClear();
-    mockSetState.mockClear();
   });
 
   test('fetch Device success', async () => {
-    const response = {
-      status: 200,
-      success: true,
-      data: [
-        {
-          id: 1,
-          name: 'Device 1',
-          sensors: [
-            { id: 1, name: 'sensor' },
-            { id: 2, name: 'sensor' },
-          ],
-        },
-      ],
-    };
     axios.get.mockImplementation(async () => {
       return response;
     });
@@ -78,12 +75,17 @@ describe('Test SelectSensorDevices', () => {
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
+    const instance = tree.root;
+    const navBar = instance.findByType(NavBar);
 
     expect(axios.get).toHaveBeenCalledWith(API.UNIT.DEVICE_CONTROL(1), {});
-    expect(mockSetState).toHaveBeenCalledTimes(3);
+    expect(navBar.props.listStation).toHaveLength(1);
   });
 
   test('onPress continue', async () => {
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -97,23 +99,9 @@ describe('Test SelectSensorDevices', () => {
   });
 
   test('test onPressDevice', async () => {
-    const data = [
-      {
-        id: 1,
-        name: 'Device 1',
-        sensors: [
-          { id: 1, name: 'sensor' },
-          { id: 2, name: 'sensor' },
-        ],
-      },
-    ];
-    const mockSetSelectedDevice = jest.fn();
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [data, mockSetState]);
-    useState.mockImplementationOnce((init) => [false, mockSetSelectedDevice]);
-
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -124,67 +112,18 @@ describe('Test SelectSensorDevices', () => {
     act(() => {
       device[0].props.onPress({ id: 1, name: 'sensor' });
     });
-    expect(mockSetSelectedDevice).toHaveBeenCalledWith({
-      id: 1,
-      name: 'sensor',
-    });
-  });
-
-  test('test onPressDevice false', async () => {
-    const data = [
-      {
-        id: 1,
-        name: 'Device 1',
-        sensors: [
-          { id: 1, name: 'sensor' },
-          { id: 2, name: 'sensor' },
-        ],
-      },
-    ];
-    const mockSetSelectedDevice = jest.fn();
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [data, mockSetState]);
-    useState.mockImplementationOnce((init) => [
-      { id: 1, name: 'sensor' },
-      mockSetSelectedDevice,
-    ]);
-
-    await act(async () => {
-      tree = renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const device = instance.findAllByType(Device);
-    expect(device).toHaveLength(2);
+    expect(device[0].props.isSelectDevice).toEqual(true);
 
     act(() => {
       device[0].props.onPress({ id: 1, name: 'sensor' });
     });
-    expect(mockSetSelectedDevice).toHaveBeenCalledWith(false);
+    expect(device[0].props.isSelectDevice).toEqual(false);
   });
 
   test('test onSnapItem', async () => {
-    const data = [
-      {
-        id: 1,
-        name: 'Device 1',
-        sensors: [
-          { id: 1, name: 'sensor' },
-          { id: 2, name: 'sensor' },
-        ],
-      },
-    ];
-    const listMenu = data.map((item, index) => ({
-      text: item.name,
-      station: item,
-      index: index,
-    }));
-    const mockSetIndexStation = jest.fn();
-    useState.mockImplementationOnce((init) => [listMenu, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetIndexStation]);
-    useState.mockImplementationOnce((init) => [data, mockSetState]);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
@@ -195,10 +134,13 @@ describe('Test SelectSensorDevices', () => {
     act(() => {
       navBar.props.onSnapToItem({ id: 1, name: 'sensor' }, 0);
     });
-
-    expect(mockSetIndexStation).toBeCalledWith(0);
+    expect(navBar.props.indexStation).toEqual(0);
   });
+
   test('test onPressClose user already has an automateId', async () => {
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });

package/src/screens/AddNewGateway/PlugAndPlay/ConnectWifiWarning.js

@@ -26,7 +26,7 @@ import Routes from '../../../utils/Route';
 import { SCContext } from '../../../context';
 import { Action } from '../../../context/actionType';
 import { TESTID } from '../../../configs/Constants';
-import Connecting from '../../../commons/Connecting ';
+import Connecting from '../../../commons/Connecting';
 
 const isIos = Platform.OS === 'ios';
 const isAndroid = Platform.OS === 'android';

package/src/screens/Device/detail.js

@@ -47,6 +47,7 @@ import { EmergencyCountdown } from './components/EmergencyCountdown';
 import { SensorConnectStatusViewHeader } from './components/SensorConnectStatusViewHeader';
 import { useDisconnectedDevice } from './hooks/useDisconnectedDevice';
 import { Card } from '../../commons/CardShadow';
+import PreventAccess from '../../commons/PreventAccess';
 
 const DeviceDetail = ({ route }) => {
   const t = useTranslations();
@@ -73,6 +74,8 @@ const DeviceDetail = ({ route }) => {
   const { isOwner } = useIsOwnerOfUnit(unit?.user_id);
   const [sensorName, setSensorName] = useState(sensor?.name);
   const [lockShowing, acquireLockShowing, releaseLockShowing] = useBoolean();
+  const [showPreventAccess, setShowPreventAccess, setHidePreventAccess] =
+    useBoolean(false);
   const [showWindDirection, setShowWindDirection] = useState(false);
   const [loading, setLoading] = useState({
     isConnected: true,
@@ -142,7 +145,9 @@ const DeviceDetail = ({ route }) => {
   }, [currentUserId, unit]);
 
   const fetchUnitDetail = useCallback(async () => {
-    const { success, data } = await axiosGet(API.UNIT.UNIT_DETAIL(unitId));
+    const { success, data } = await axiosGet(API.UNIT.UNIT_DETAIL(unitId), {
+      headers: { 'Cache-Control': 'no-cache' },
+    });
     if (success) {
       setUnit(data);
     }
@@ -155,15 +160,17 @@ const DeviceDetail = ({ route }) => {
   }, [fetchUnitDetail, unitId, unitData]);
 
   const fetchSensorDetail = useCallback(async () => {
-    const { success, data } = await axiosGet(
+    const { success, data, resp_status } = await axiosGet(
       API.SENSOR.SENSOR_DETAIL(sensorId)
     );
     if (success) {
       setSensor(data);
       setSensorName(data.name);
       setStation(data.station);
+    } else if (resp_status === 404) {
+      setShowPreventAccess();
     }
-  }, [sensorId]);
+  }, [sensorId, setShowPreventAccess]);
 
   useEffect(() => {
     if (sensorId && !sensorData) {
@@ -500,6 +507,7 @@ const DeviceDetail = ({ route }) => {
     return isFlag;
   }, [display]);
   // replace isConnected=True to see template
+
   const renderSensorConnected = () => {
     return (
       <SensorConnectStatusViewHeader
@@ -691,6 +699,11 @@ const DeviceDetail = ({ route }) => {
           unit={unit}
           station={sensor?.station}
         />
+        <PreventAccess
+          visible={showPreventAccess}
+          hidePreventAccess={setHidePreventAccess}
+          headerBodyText={'device'}
+        />
       </WrapHeaderScrollable>
       {isShowEmergencyResolve && (
         <BottomButtonView

package/src/screens/Unit/Detail.js

@@ -47,6 +47,7 @@ import {
   watchNotificationData,
   unwatchNotificationData,
 } from '../../utils/Monitor';
+import PreventAccess from '../../commons/PreventAccess';
 
 const UnitDetail = ({ route }) => {
   const t = useTranslations();
@@ -63,14 +64,17 @@ const UnitDetail = ({ route }) => {
 
   const isFocused = useIsFocused();
   const { stateData, setAction } = useContext(SCContext);
-  const { navigate } = useNavigation();
+  const { navigate, goBack } = useNavigation();
   const RouterHardware = useCallback(
     (routeHardware) => () => {
       navigate(routeHardware);
     },
     [navigate]
   );
-  useBlockBackAndroid(RouterHardware(Routes.Dashboard));
+
+  useBlockBackAndroid(
+    isSuccessfullyConnected ? RouterHardware(Routes.Dashboard) : goBack
+  );
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const isLavidaSource = useSCContextSelector(
     (state) => state.app.isLavidaSource
@@ -84,6 +88,8 @@ const UnitDetail = ({ route }) => {
   const [station, setStation] = useState({});
   const [indexStation, setIndexStation] = useState(0);
   const [showAdd, setShowAdd, setHideAdd] = useBoolean();
+  const [showPreventAccess, setShowPreventAccess, setHidePreventAccess] =
+    useBoolean(false);
   const [isFullScreen, setIsFullScreen] = useState(false);
   const [dataFullScreen, setDataFullScreen] = useState();
   const appState = useRef(AppState.currentState);
@@ -122,16 +128,18 @@ const UnitDetail = ({ route }) => {
 
   const fetchDetails = useCallback(async () => {
     getAutomates();
-    const { success, data } = await axiosGet(
+    const { success, data, resp_status } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unitId),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {
       prepareData(data);
       setUnit(data);
+    } else if (resp_status === 404) {
+      setShowPreventAccess();
     }
-  }, [setUnit, unitId, prepareData, getAutomates]);
+  }, [getAutomates, unitId, prepareData, setShowPreventAccess]);
 
   const getAutomates = useCallback(async () => {
     await fetchWithCache(
@@ -395,6 +403,11 @@ const UnitDetail = ({ route }) => {
         modalStyles={styles.modal}
         onClose={onClose}
       />
+      <PreventAccess
+        visible={showPreventAccess}
+        hidePreventAccess={setHidePreventAccess}
+        headerBodyText={'unit'}
+      />
     </WrapParallaxScrollView>
   );
 };

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

@@ -96,7 +96,11 @@ describe('Test UnitDetail', () => {
       await renderer.create(wrapComponent(route));
     });
 
-    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {});
+    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {
+      headers: {
+        'Cache-Control': 'no-cache',
+      },
+    });
   });
 
   test('fetch unit detail no network then load from cache', async () => {
@@ -118,7 +122,11 @@ describe('Test UnitDetail', () => {
       await renderer.create(wrapComponent(route, account));
     });
 
-    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {});
+    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {
+      headers: {
+        'Cache-Control': 'no-cache',
+      },
+    });
   });
 
   test('fetch unit detail no network and fail load from cache', async () => {
@@ -129,7 +137,11 @@ describe('Test UnitDetail', () => {
       await renderer.create(wrapComponent(route, account));
     });
 
-    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {});
+    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {
+      headers: {
+        'Cache-Control': 'no-cache',
+      },
+    });
   });
 
   test('fetch unit summary empty', async () => {
@@ -193,7 +205,11 @@ describe('Test UnitDetail', () => {
       await renderer.create(wrapComponent(route, account));
     });
 
-    expect(axios.get).not.toHaveBeenCalledWith(summaryUnitApiUrl, {});
+    expect(axios.get).not.toHaveBeenCalledWith(summaryUnitApiUrl, {
+      headers: {
+        'Cache-Control': 'no-cache',
+      },
+    });
   });
 
   test('fetch unit detail when refresh', async () => {
@@ -206,7 +222,11 @@ describe('Test UnitDetail', () => {
     await act(async () => {
       refreshControl.props.onRefresh();
     });
-    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {});
+    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {
+      headers: {
+        'Cache-Control': 'no-cache',
+      },
+    });
   });
 
   test('when unit has google home action then connect to google home', async () => {

package/src/screens/UnitSummary/components/3PPowerConsumption/index.js

@@ -207,7 +207,7 @@ const ThreePhasePowerConsumption = memo(({ summaryDetail }) => {
       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.VALUE_CONSUME.DISPLAY_HISTORY,
+        API.VALUE_CONSUME.DISPLAY_HISTORY(),
         {
           params,
         }

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

@@ -982,5 +982,8 @@
   "saving_contact_successful" : "Saving contact successful",
   "maxmium_contacts": "Maxmium contacts",
   "enter_password": "Enter Your Password",
-  "you_need_to_enter_password": "You need to enter password to perform this action"
+  "you_need_to_enter_password": "You need to enter password to perform this action",
+  "note": "Note",
+  "back": "Back",
+  "This {name} was removed!" : "This {name} was removed!"
 }

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

@@ -982,5 +982,8 @@
   "search": "Tìm kiếm",
   "connect_home_wifi" : "Kết nối Wifi của gia đình",
   "saving_contact_successful" : "Lưu liên hệ thành công",
-  "maxmium_contacts": "Địa chỉ liên hệ tối đa"
+  "maxmium_contacts": "Địa chỉ liên hệ tối đa",
+  "note": "Lưu ý ",
+  "back": "Quay lại",
+  "This {name} was removed!" : "{Name} này đã bị xóa!"
 }