@eohjsc/react-native-smart-city 0.3.90 → 0.3.91

package/src/commons/OneTapTemplate/StatesGridActionTemplate.js

@@ -44,13 +44,13 @@ const ActionItem = ({
   );
 };
 
-const StatesGridActionTemplate = ({ device, data, onSelectAction }) => {
+const StatesGridActionTemplate = ({ device, item, onSelectAction }) => {
   const t = useTranslations();
   const [visible, setVisible] = useState(false);
   const [actionName, setActionName] = useState(null);
   const onClose = useCallback(() => setVisible(false), []);
   const onPress = useCallback(() => setVisible(true), []);
-  const { title, configuration, template } = data;
+  const { title, configuration, template } = item;
   const { options } = configuration;
 
   return (
@@ -68,9 +68,9 @@ const StatesGridActionTemplate = ({ device, data, onSelectAction }) => {
       >
         <View style={styles.popoverStyle}>
           <View style={styles.modalContent}>
-            {options.map((item, index) => (
+            {options.map((option, index) => (
               <ActionItem
-                item={item}
+                item={option}
                 key={index}
                 setActionName={setActionName}
                 onSelectAction={onSelectAction}

package/src/commons/OneTapTemplate/__test__/NumberUpDownActionTemplate.test.js

@@ -11,10 +11,10 @@ import SelectActionCard from '../../SelectActionCard';
 
 const mockOnSelectAction = jest.fn();
 
-const wrapComponent = (data) => (
+const wrapComponent = (item) => (
   <SCProvider initState={mockSCStore({})}>
     <NumberUpDownActionTemplate
-      data={data}
+      item={item}
       onSelectAction={mockOnSelectAction}
     />
   </SCProvider>

package/src/commons/OneTapTemplate/__test__/OptionsDropdownActionTemplate.test.js

@@ -14,7 +14,7 @@ const mockOnSelectAction = jest.fn();
 const wrapComponent = (data) => (
   <SCProvider initState={mockSCStore({})}>
     <OptionsDropdownActionTemplate
-      data={data}
+      item={data}
       onSelectAction={mockOnSelectAction}
     />
   </SCProvider>

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

@@ -10,9 +10,9 @@ import SelectActionCard from '../../SelectActionCard';
 
 const mockOnSelectAction = jest.fn();
 
-const wrapComponent = (data) => (
+const wrapComponent = (item) => (
   <SCProvider initState={mockSCStore({})}>
-    <StatesGridActionTemplate data={data} onSelectAction={mockOnSelectAction} />
+    <StatesGridActionTemplate item={item} onSelectAction={mockOnSelectAction} />
   </SCProvider>
 );
 

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

@@ -7,7 +7,7 @@ describe('Test RowUser', () => {
   let tree;
   it('create RowUser', async () => {
     await act(async () => {
-      tree = renderer.create(<RowItem text="Text" type="primary" />);
+      tree = await renderer.create(<RowItem text="Text" type="primary" />);
     });
     const instance = tree.root;
     const buttons = instance.findAllByType(TouchableOpacity);

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

@@ -7,7 +7,7 @@ describe('Test RowUser', () => {
   let tree;
   it('create RowUser', async () => {
     await act(async () => {
-      tree = renderer.create(<RowUser text="Text" type="disable" />);
+      tree = await renderer.create(<RowUser text="Text" type="disable" />);
     });
     const instance = tree.root;
     const buttons = instance.findAllByType(TouchableWithoutFeedback);

package/src/commons/Section/Section.test.js

@@ -14,7 +14,7 @@ describe('Section', () => {
       </Section>
     );
     await act(async () => {
-      tree = renderer.create(component);
+      tree = await renderer.create(component);
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
@@ -29,7 +29,7 @@ describe('Section', () => {
       </Section>
     );
     await act(async () => {
-      tree = renderer.create(component);
+      tree = await renderer.create(component);
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);

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

@@ -94,7 +94,7 @@ describe('Test SelectSubUnit', () => {
   it('test ViewButtonBottom leftClick', async () => {
     const route = { params: { addType: 'AddNewGateway' } };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const viewButtonBottom = instance.findByType(ViewButtonBottom);

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

@@ -46,7 +46,7 @@ describe('test single SelectUnit', () => {
     };
     mock.onGet(API.SHARE.UNITS()).reply(200, response.data);
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const unitName = instance.findAll(
@@ -80,7 +80,7 @@ describe('test single SelectUnit', () => {
     Platform.OS = 'ios';
     mock.onGet(500);
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
 
     const instance = tree.root;
@@ -102,7 +102,7 @@ describe('test single SelectUnit', () => {
 
   it('click goBack', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
 
     const instance = tree.root;

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

@@ -9,7 +9,7 @@ describe('BtnRemoveMember', () => {
   it('BtnRemoveMember snapshot', async () => {
     const component = <BtnRemoveMember />;
     await act(async () => {
-      tree = renderer.create(component);
+      tree = await renderer.create(component);
     });
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);

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

@@ -26,7 +26,7 @@ describe('Test DevicePermissionsCheckbox', () => {
   const mockFunction = jest.fn();
   it('test create DevicePermissionsCheckbox', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent(sensor, mockFunction));
+      tree = await renderer.create(wrapComponent(sensor, mockFunction));
     });
     const instance = tree.root;
     const dropdownButtons = instance.findAllByType(TouchableOpacity);

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

@@ -25,7 +25,7 @@ describe('MemberList', () => {
   it('MemberList snapshot id dataMember === ownerId', async () => {
     const dataMember = [{ id: 1, name: 'CEO' }];
     await act(async () => {
-      tree = renderer.create(wrapComponent(dataMember, 1, 2, mockFunc));
+      tree = await renderer.create(wrapComponent(dataMember, 1, 2, mockFunc));
     });
     const instance = tree.root;
     const rowMember = instance.findByType(RowMember);
@@ -38,7 +38,9 @@ describe('MemberList', () => {
   it('MemberList snapshot id dataMember !== ownerId', async () => {
     const dataMember = [{ id: 1, name: 'CEO' }];
     await act(async () => {
-      tree = renderer.create(wrapComponent(dataMember, 2, null, mockFunc));
+      tree = await renderer.create(
+        wrapComponent(dataMember, 2, null, mockFunc)
+      );
     });
     const instance = tree.root;
     const rowMember = instance.findByType(RowMember);
@@ -51,7 +53,7 @@ describe('MemberList', () => {
   it('MemberList snapshot id dataMember === currentUserId', async () => {
     const dataMember = [{ id: 1, name: 'CEO' }];
     await act(async () => {
-      tree = renderer.create(wrapComponent(dataMember, 2, 1, mockFunc));
+      tree = await renderer.create(wrapComponent(dataMember, 2, 1, mockFunc));
     });
     const instance = tree.root;
     const rowMembers = instance.findAllByType(RowMember);
@@ -61,7 +63,7 @@ describe('MemberList', () => {
   it('MemberList dataMember null', async () => {
     const dataMember = [];
     await act(async () => {
-      tree = renderer.create(wrapComponent(dataMember));
+      tree = await renderer.create(wrapComponent(dataMember));
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(RowMember);

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

@@ -22,7 +22,7 @@ describe('RowMember', () => {
   it('RowMember owner have name', async () => {
     const dataMember = { id: 1, name: 'CEO' };
     await act(async () => {
-      tree = renderer.create(wrapComponent(dataMember, 1, 1, mockFunc));
+      tree = await renderer.create(wrapComponent(dataMember, 1, 1, mockFunc));
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
@@ -31,7 +31,7 @@ describe('RowMember', () => {
   it('RowMember owner dont have name show start of email ', async () => {
     const dataMember = { id: 1, name: '', email: 'abc@gmail.com' };
     await act(async () => {
-      tree = renderer.create(wrapComponent(dataMember, 1, 1, mockFunc));
+      tree = await renderer.create(wrapComponent(dataMember, 1, 1, mockFunc));
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);

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

@@ -28,7 +28,7 @@ describe('StationDevicePermission', () => {
       ],
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(dataStation));
+      tree = await renderer.create(wrapComponent(dataStation));
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(TouchableOpacity);
@@ -56,7 +56,7 @@ describe('StationDevicePermission', () => {
       ],
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(dataStation));
+      tree = await renderer.create(wrapComponent(dataStation));
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(TouchableOpacity);
@@ -75,7 +75,7 @@ describe('StationDevicePermission', () => {
       ],
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(dataStation));
+      tree = await renderer.create(wrapComponent(dataStation));
     });
 
     const instance = tree.root;

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

@@ -9,7 +9,9 @@ describe('WrapHeaderScrollable', () => {
   it('WrapHeaderScrollable scroll to end', async () => {
     const loadMore = jest.fn();
     await act(async () => {
-      tree = renderer.create(<WrapHeaderScrollable onLoadMore={loadMore} />);
+      tree = await renderer.create(
+        <WrapHeaderScrollable onLoadMore={loadMore} />
+      );
     });
     const root = tree.root;
     const scrollView = root.findByType(Animated.ScrollView);
@@ -22,7 +24,7 @@ describe('WrapHeaderScrollable', () => {
   it('WrapHeaderScrollable loadMore null', async () => {
     const loadMore = jest.fn();
     await act(async () => {
-      tree = renderer.create(<WrapHeaderScrollable />);
+      tree = await renderer.create(<WrapHeaderScrollable />);
     });
     const root = tree.root;
     const scrollView = root.findByType(Animated.ScrollView);

package/src/commons/SubUnit/OneTap/__test__/SubUnitAutomate.test.js

@@ -14,6 +14,7 @@ import { mockSCStore } from '../../../../context/mockStore';
 import Routes from '../../../../utils/Route';
 import api from '../../../../utils/Apis/axios';
 import { API } from '../../../../configs';
+import { useNavigation } from '@react-navigation/native';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -30,16 +31,6 @@ jest.mock('react-redux', () => {
   };
 });
 
-const mockedNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-    }),
-  };
-});
-
 let tree;
 let data = {
   isOwner: true,
@@ -65,6 +56,7 @@ let data = {
 };
 
 describe('test Item', () => {
+  const mockedNavigate = useNavigation().navigate;
   beforeEach(() => {
     mockedNavigate.mockClear();
   });

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

@@ -5,7 +5,7 @@ import { Section } from '../..';
 import ItemAddNew from '../../Device/ItemAddNew';
 import ItemOneTap from './ItemOneTap';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
-import { useNavigation } from '@react-navigation/native';
+import { useNavigation, useRoute } from '@react-navigation/native';
 import Routes from '../../../utils/Route/index.js';
 import { AUTOMATE_TYPE, AccessibilityLabel } from '../../../configs/Constants';
 import Text from '../../Text/index.js';
@@ -17,6 +17,7 @@ const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
   const { navigate } = useNavigation();
   const [automates, setAutomates] = useState(listAutomate[0]);
   const [indexAutomate, setIndexAutomate] = useState(0);
+  const { name: currentScreen } = useRoute();
   const handleOnAddNew = () => {
     switch (automates.type) {
       case AUTOMATE_TYPE.ONE_TAP:
@@ -26,6 +27,7 @@ const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
         navigate(Routes.AddNewAutoSmart, {
           type: AUTOMATE_TYPE.VALUE_CHANGE,
           unit,
+          closeScreen: currentScreen,
         });
         break;
     }

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

@@ -8,7 +8,7 @@ describe('create TextButton component', () => {
   it('create button auth', async () => {
     const mockFunc = jest.fn();
     await act(async () => {
-      tree = renderer.create(
+      tree = await renderer.create(
         <TextButton
           key={'item_1'}
           primary={'primary'}
@@ -28,7 +28,7 @@ describe('create TextButton component', () => {
   it('create button ActivityIndicator', async () => {
     const mockFunc = jest.fn();
     await act(async () => {
-      tree = renderer.create(
+      tree = await renderer.create(
         <TextButton
           loading={true}
           showIndicator={true}

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

@@ -16,7 +16,7 @@ describe('Test Today', () => {
   it('create Today', async () => {
     Date.now = jest.fn(() => new Date('2021-01-24T12:00:00.000Z'));
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);

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

@@ -8,7 +8,7 @@ describe('Test TouchableScale', () => {
   const mockFunc = jest.fn();
   it('create TouchableScale onPress', async () => {
     await act(async () => {
-      tree = renderer.create(<TouchableScale onPress={mockFunc} />);
+      tree = await renderer.create(<TouchableScale onPress={mockFunc} />);
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(TouchableOpacity);

package/src/commons/UnitSummary/AirQuality/index.js

@@ -6,7 +6,7 @@ import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { Colors } from '../../../configs';
 import { Section } from '../../../commons/index';
 import Text from '../../../commons/Text';
-import ConfigHistoryChart from '../ConfigHistoryChart';
+import VisualChart from '../../../screens/Device/components/VisualChart';
 
 import SegmentedRoundDisplay from './SegmentedRoundDisplay';
 import { AccessibilityLabel } from '../../../configs/Constants';
@@ -166,7 +166,7 @@ const AirQuality = memo(({ summaryDetail }) => {
       )}
       {showBoxHistory && (
         <Section type={'border'}>
-          <ConfigHistoryChart configs={configs} />
+          <VisualChart item={{ configuration: { configs } }} />
         </Section>
       )}
     </View>

package/src/commons/UnitSummary/ConfigHistoryChart/index.js

@@ -6,12 +6,6 @@ import HistoryChart from '../../../commons/Device/HistoryChart';
 import { axiosGet } from '../../../utils/Apis/axios';
 import { getPusher } from '../../../utils/Pusher';
 
-export const dateTimeType = {
-  date: 'date',
-  time: 'time',
-  dateTime: 'datetime',
-};
-
 const fetchDataS3 = async (url) => {
   const { data } = await axiosGet(url, {
     // todo Bang try not to use axiosGet

package/src/commons/UnitSummary/__test__/TotalPowerBox.test.js

@@ -8,7 +8,7 @@ describe('Test Total Power Box', () => {
 
   it('render Total Power Box', async () => {
     await act(async () => {
-      tree = renderer.create(<TotalPowerBox title={'titleTest'} />);
+      tree = await renderer.create(<TotalPowerBox title={'titleTest'} />);
     });
     const instance = tree.root;
     const item = instance.find(

package/src/commons/UnitSummary/__test__/TotalPowerConsumption.test.js

@@ -20,7 +20,7 @@ describe('Test Total Power Consumption', () => {
 
   it('render Total Power Consumption', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const item = instance.find(

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

@@ -8,7 +8,7 @@ describe('Test TouchableScale', () => {
   const mockFunc = jest.fn();
   it('create TouchableScale onPress', async () => {
     await act(async () => {
-      tree = renderer.create(
+      tree = await renderer.create(
         <ViewButtonBottom
           leftTitle={'leftTitle'}
           onLeftClick={mockFunc}

package/src/configs/API.js

@@ -6,7 +6,6 @@ const API = {
     SHARED_UNITS: () => '/property_manager/shared_units/',
     CREATE_UNIT: () => '/property_manager/iot_dashboard/dev_mode/units/',
     UNIT_DETAIL: (id) => `/property_manager/units/${id}/`,
-    UNITS_PUBLIC: () => '/property_manager/units/public/',
     UNIT_SUMMARY: (id) => `/property_manager/units/${id}/summary/`,
     UNIT_SUMMARY_DETAIL: (id, id2) =>
       `/property_manager/units/${id}/summary_detail/${id2}/`,
@@ -52,35 +51,25 @@ const API = {
     },
   },
   DEVICE: {
-    SENSOR_DETAIL: (id) => `/property_manager/sensors/${id}/`,
+    SENSOR_DETAIL: (id) => `/property_manager/devices/${id}/`,
     DISPLAY: (id) => `/property_manager/devices/${id}/display/`,
     SIDE_MENU_DETAIL: (id, 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) =>
-      `/property_manager/sensors/${id}/display_history/`,
+      `/property_manager/devices/${id}/display_values_v2/`,
+    DISPLAY_HISTORY: (id) => `/property_manager/devices/${id}/display_history/`,
     REMOTE_CONTROL_OPTIONS: (id) =>
-      `/property_manager/sensors/${id}/remote_control_options/`,
-    TRIGGER_ACTION: (id) => `/property_manager/sensors/${id}/quick_action/`,
+      `/property_manager/devices/${id}/remote_control_options/`,
+    TRIGGER_ACTION: (id) => `/property_manager/devices/${id}/quick_action/`,
     SETUP: (id) => `/property_manager/devices/${id}/setup/`,
-    CHECK_CONNECTION: (id) =>
-      `/property_manager/sensors/${id}/check_connection/`,
-    UPDATE_SENSOR: (unit_id, station_id, id) =>
-      `/property_manager/${unit_id}/sub_units/${station_id}/devices/${id}/`,
-    ACTIVITY_LOG: () => SCConfig.apiRoot + '/chip_manager/action_log',
-    DISPLAY_ACTIONS: (id) =>
-      SCConfig.apiRoot + `/property_manager/sensors/${id}/display_actions/`,
-    DISPLAY_EVENTS: (id) =>
-      SCConfig.apiRoot + `/property_manager/sensors/${id}/display_events/`,
+    ACTIVITY_LOG: () => '/chip_manager/action_log',
+    DISPLAY_ACTIONS: (id) => `/property_manager/devices/${id}/display_actions/`,
     CHANGE_SUB_UNIT: (unit_id, station_id, id) =>
       `/property_manager/${unit_id}/sub_units/${station_id}/devices/${id}/change_sub_unit/`,
     ADD_TO_FAVOURITES: (id) =>
-      SCConfig.apiRoot + `/property_manager/devices/${id}/add_to_favourites/`,
+      `/property_manager/devices/${id}/add_to_favourites/`,
     REMOVE_FROM_FAVOURITES: (id) =>
-      SCConfig.apiRoot +
       `/property_manager/devices/${id}/remove_from_favourites/`,
-    END_DEVICE_DETAIL: (id) => `/property_manager/devices/${id}/`,
   },
   SHARED_SENSOR: {
     ACCESS: (id) => `/property_manager/shared_sensors/${id}/access/`,
@@ -104,8 +93,7 @@ const API = {
     UNSTAR_SCRIPT: (id) => `/property_manager/automate/${id}/unstar_script/`,
     GET_SMART: () => '/property_manager/automate/smart/',
     GET_ALL_UNITS: () => '/property_manager/units/all_unit/',
-    GET_SENSOR_CONFIG: (id) =>
-      `/property_manager/sensors/${id}/display_configs/`,
+    DISPLAY_CONFIGS: (id) => `/property_manager/devices/${id}/display_configs/`,
     GET_MULTI_UNITS: () => '/property_manager/automate/multi_unit/',
     ACTIVITY_LOG: (id) => `/property_manager/automate/${id}/logs/`,
     STARRED_SCRIPTS: () => '/property_manager/automate/starred_scripts/',
@@ -229,19 +217,10 @@ const API = {
         `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/`,
       CONFIG_PINS: (gatewayId, deviceId) =>
         `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/pins/`,
-      CONFIG_PIN_DETAIL: (gatewayId, deviceId, configPinId) =>
-        `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/pins/${configPinId}/`,
       ACTION: (gatewayId, deviceId) =>
         `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/actions/`,
-      ACTION_DETAIL: (gatewayId, deviceId, actionId) =>
-        `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/actions/${actionId}/`,
     },
     ZIGBEE: {
-      DETAIL: (id) => `/iot/modules/zigbee/gateways/${id}/`,
-      SEARCH_DEVICE: (id) => `/iot/modules/zigbee/chips/${id}/search_device/`,
-      DEVICE_CONFIGURATION: (id, deviceId) =>
-        `/iot/modules/zigbee/chips/${id}/sensors/${deviceId}/configuration/`,
-      CONFIGURATION: (id) => `/iot/modules/zigbee/chips/${id}/configuration/`,
       DEVICE: (gatewayId) =>
         `/iot/modules/zigbee/gateways/${gatewayId}/devices/`,
       DEVICE_DETAIL: (gatewayId, deviceId) =>
@@ -261,8 +240,6 @@ const API = {
         `/iot/modules/modbus/gateways/${gatewayId}/devices/${deviceId}/registers/`,
       ACTION: (gatewayId, deviceId) =>
         `/iot/modules/modbus/gateways/${gatewayId}/devices/${deviceId}/actions/`,
-      ACTION_DETAIL: (gatewayId, deviceId, actionId) =>
-        `/iot/modules/modbus/gateways/${gatewayId}/devices/${deviceId}/actions/${actionId}/`,
     },
   },
 };

package/src/configs/Constants.js

@@ -149,36 +149,6 @@ export const SMART_TIVI_BUTTON = {
   CHANNEL_BUTTON: 'Channel',
 };
 
-export const AUTOMATE_SELECT = {
-  SELECT_DEVICE: 'select_device',
-  SELECT_SENSOR: 'select_sensor',
-};
-
-export const CONDITION_TYPES = {
-  IS: 'IS',
-  IS_BELOW: 'IS_BELOW',
-  IS_ABOVE: 'IS_ABOVE',
-};
-
-export const STATE_VALUE_SENSOR_TYPES = [
-  {
-    type: 'smoke',
-    stateValue: ['not_detected', 'detected'],
-  },
-  {
-    type: 'fire',
-    stateValue: ['not_detected', 'detected'],
-  },
-  {
-    type: 'sos',
-    stateValue: ['not_activated', 'activated'],
-  },
-  {
-    type: 'door',
-    stateValue: ['close', 'open'],
-  },
-];
-
 export const AUTOMATES = {
   one_tap: {
     value: AUTOMATE_TYPE.ONE_TAP,
@@ -301,4 +271,6 @@ export const PROBLEM_CODE = {
 
 export const DATE_TIME_FORMAT = {
   YMD: 'YYYY-MM-DD',
+  DMY: 'DD-MM-YYYY',
+  DMY_HM: 'DD-MM-YYYY HH:mm',
 };

package/src/context/reducer.ts

@@ -411,7 +411,9 @@ export const reducer = (currentState: ContextData, action: Action) => {
         valueEvaluations: _.reduce(
           data,
           (dict, item) => {
-            dict[item.config] = item;
+            item.configs.map((configId) => {
+              dict[configId] = item;
+            });
             return dict;
           },
           currentState.valueEvaluations

package/src/hoc/__test__/withRemoteControl.test.js

@@ -11,7 +11,7 @@ describe('Test withRemoteControl', () => {
     const Component = () => <></>;
     const WrappedComponent = withRemoteControl(Component);
     await act(async () => {
-      tree = renderer.create(
+      tree = await renderer.create(
         <SCProvider initState={mockSCStore({})}>
           <WrappedComponent />
         </SCProvider>