@eohjsc/react-native-smart-city 0.7.26 → 0.7.30

package/src/iot/mqtt.js

@@ -1,6 +1,5 @@
-import moment from 'moment';
 import { getObject, storeObject } from '../utils/Storage';
-import { updateGlobalValue } from './Monitor';
+import { getLastUpdated, updateGlobalValue } from './UpdateStates';
 import { Buffer } from 'buffer';
 
 const struct = require('python-struct');
@@ -87,6 +86,84 @@ const float_cdab = (bytes_str) => {
   return value_unpacked('>f', swapped);
 };
 
+const uint_64_abcd = (bytes_str) => {
+  return value_unpacked('>Q', bytes_str?.slice(0, 16));
+};
+
+const uint_64_dcba = (bytes_str) => {
+  return value_unpacked('<Q', bytes_str?.slice(0, 16));
+};
+
+const uint_64_badc = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('<Q', swapped);
+};
+
+const uint_64_cdab = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('>Q', swapped);
+};
+
+const int_64_abcd = (bytes_str) => {
+  return value_unpacked('>q', bytes_str?.slice(0, 16));
+};
+
+const int_64_dcba = (bytes_str) => {
+  return value_unpacked('<q', bytes_str?.slice(0, 16));
+};
+
+const int_64_badc = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('<q', swapped);
+};
+
+const int_64_cdab = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('>q', swapped);
+};
+
+const double_abcd = (bytes_str) => {
+  return value_unpacked('>d', bytes_str?.slice(0, 16));
+};
+
+const double_dcba = (bytes_str) => {
+  return value_unpacked('<d', bytes_str?.slice(0, 16));
+};
+
+const double_badc = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('<d', swapped);
+};
+
+const double_cdab = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('>d', swapped);
+};
+
 const range_value_converting = (
   raw_value,
   raw_min,
@@ -133,6 +210,18 @@ const mappingTransformer = {
   convert_ai: convert_ai,
   int_first4: int_first4,
   int_last4: int_last4,
+  double_abcd: double_abcd,
+  double_dcba: double_dcba,
+  double_badc: double_badc,
+  double_cdab: double_cdab,
+  uint_64_abcd: uint_64_abcd,
+  uint_64_dcba: uint_64_dcba,
+  uint_64_badc: uint_64_badc,
+  uint_64_cdab: uint_64_cdab,
+  int_64_abcd: int_64_abcd,
+  int_64_dcba: int_64_dcba,
+  int_64_badc: int_64_badc,
+  int_64_cdab: int_64_cdab,
 };
 
 const extract_config_value = (register, value_bytes) => {
@@ -227,7 +316,7 @@ const check_filter = (value, config) => {
   return value < low || value > high;
 };
 
-const updateGlobalValueMqtt = async (config, value) => {
+const updateGlobalValueMqtt = async (config, value, time) => {
   if (!config?.id) {
     return;
   }
@@ -235,9 +324,10 @@ const updateGlobalValueMqtt = async (config, value) => {
     return;
   }
 
-  const last_updated = moment().format('YYYY-MM-DDTHH:mm:ss.SSSSSS');
+  const { last_updated, last_updated_micro } = getLastUpdated(time);
+
   if (typeof value === 'string') {
-    updateGlobalValue(config.id, { value, last_updated });
+    updateGlobalValue(config.id, { value, last_updated, last_updated_micro });
     return;
   }
 
@@ -248,10 +338,18 @@ const updateGlobalValueMqtt = async (config, value) => {
     return;
   }
 
-  updateGlobalValue(config.id, { value, last_updated });
+  updateGlobalValue(config.id, { value, last_updated, last_updated_micro });
+};
+
+export const handleSelfSensorData = (chip, configsById, data, time) => {
+  chip?.self_sensor?.configs.forEach((config) => {
+    const configId = config.id;
+    const value = data?.[config.name];
+    updateGlobalValueMqtt(configsById[configId], value, time);
+  });
 };
 
-export const handleModbusData = (chip, configById, data) => {
+export const handleModbusData = (chip, configsById, data, time) => {
   const modbus_gateway = chip?.modbus_gateway;
   if (!modbus_gateway) {
     return;
@@ -269,16 +367,22 @@ export const handleModbusData = (chip, configById, data) => {
       sensor_data = new_sensor_data;
 
       const configId = register?.config;
-      updateGlobalValueMqtt(configById[configId], value);
+      updateGlobalValueMqtt(configsById[configId], value, time);
     });
   });
 };
 
-export const handleChipData = (configById, configId, data) => {
-  updateGlobalValueMqtt(configById[configId], data?.v);
+export const handleChipData = (configsById, configId, data, time) => {
+  updateGlobalValueMqtt(configsById[configId], data?.v, time);
 };
 
-export const handleZigbeeData = (chip, configById, ieee_address, data) => {
+export const handleZigbeeData = (
+  chip,
+  configsById,
+  ieee_address,
+  data,
+  time
+) => {
   const zigbee_gateway = chip?.zigbee_gateway;
   if (!zigbee_gateway) {
     return;
@@ -293,14 +397,20 @@ export const handleZigbeeData = (chip, configById, ieee_address, data) => {
   const device = zigbee_device_by_ieee[ieee_address];
   if (device) {
     (device.configs || []).forEach((config_map) => {
-      let value = data?.data[config_map?.key];
+      let value = data?.data?.[config_map?.key];
       const configId = config_map?.config;
-      updateGlobalValueMqtt(configById[configId], value);
+      updateGlobalValueMqtt(configsById[configId], value, time);
     });
   }
 };
 
-export const handleThirdPartyData = (chip, configById, device_uid, data) => {
+export const handleThirdPartyData = (
+  chip,
+  configsById,
+  device_uid,
+  data,
+  time
+) => {
   const third_party_gateway = chip?.third_party_gateway;
   if (!third_party_gateway) {
     return;
@@ -314,9 +424,9 @@ export const handleThirdPartyData = (chip, configById, device_uid, data) => {
 
   const device = third_party_device_by_uid[device_uid];
   device?.configs?.forEach((config_map) => {
-    const value = data[config_map?.key];
+    const value = data?.[config_map?.key];
     const configId = config_map?.config;
-    updateGlobalValueMqtt(configById[configId], value);
+    updateGlobalValueMqtt(configsById[configId], value, time);
   });
 };
 
@@ -325,13 +435,29 @@ export const handleMqttMessage = (
   payloadData,
   code,
   chip,
-  configById
+  configsById
 ) => {
+  if (topic === `eoh/chip/${code}/is_online`) {
+    // Online Status
+    // topic: eoh/chip/${code}/is_online
+    // payload: {ol: 1}
+    handleSelfSensorData(chip, configsById, { is_online: payloadData?.ol });
+    return;
+  }
+
+  if (topic === `eoh/chip/${code}/self_sensor`) {
+    // Self Sensor
+    // topic: eoh/chip/${code}/self_sensor
+    // payload: {is_battery: 1, temperature: 27.5, volt: 3.3, ...}
+    handleSelfSensorData(chip, configsById, payloadData, payloadData?.time);
+    return;
+  }
+
   if (topic === `eoh/chip/${code}/data`) {
     // Modbus
     // topic: eoh/chip/${code}/data
     // payload: {data: '01aa010a', 'ack':'1', 'chip_temperature':5333, 'rssi':-61}
-    handleModbusData(chip, configById, payloadData.data);
+    handleModbusData(chip, configsById, payloadData?.data, payloadData?.time);
   }
 
   const matchArduinoConfigValue = topic.match(/config\/(\d+)\/value/);
@@ -339,7 +465,29 @@ export const handleMqttMessage = (
     // Arduino
     // topic: eoh/chip/{code}/config/127363/value
     // payload: {v: 2130} or {v: 'on'}
-    handleChipData(configById, matchArduinoConfigValue[1], payloadData);
+    handleChipData(
+      configsById,
+      matchArduinoConfigValue[1],
+      payloadData,
+      payloadData?.time
+    );
+  }
+
+  const matchBatchConfigValue = topic.match(/config_value/);
+  if (matchBatchConfigValue) {
+    // Arduino
+    // topic: eoh/chip/{code}/config_value
+    // payload: {1: 2130, 2: 3000}
+    // This is a batch update for multiple configs
+    Object.keys(payloadData).forEach((key) => {
+      handleChipData(
+        configsById,
+        key,
+        { v: payloadData[key] },
+        payloadData.time
+      );
+    });
+    return;
   }
 
   const matchZigbeeConfigValue = topic.match(/zigbee\/(.+)\/data/);
@@ -347,7 +495,13 @@ export const handleMqttMessage = (
     // Zigbee
     // topic: eoh/chip/code-123/zigbee/IEEE-123/data
     // payload: {zigbee_data: 'aaa', 'data': {state: 1, state_0: 0}}
-    handleZigbeeData(chip, configById, matchZigbeeConfigValue[1], payloadData);
+    handleZigbeeData(
+      chip,
+      configsById,
+      matchZigbeeConfigValue[1],
+      payloadData,
+      payloadData?.time
+    );
   }
 
   const matchThirdPartyConfigValue = topic.match(/third_party\/(.+)\/data/);
@@ -357,9 +511,10 @@ export const handleMqttMessage = (
     // payload: {state: 1, temperature: 27.6}
     handleThirdPartyData(
       chip,
-      configById,
+      configsById,
       matchThirdPartyConfigValue[1],
-      payloadData
+      payloadData,
+      payloadData?.time
     );
   }
 };

package/src/navigations/UnitStack.js

@@ -29,6 +29,7 @@ import SetupScriptDelay from '../screens/Automate/AddNewAction/SetupScriptDelay'
 import SetupScriptNotify from '../screens/Automate/AddNewAction/SetupScriptNotify';
 import SetupScriptEmail from '../screens/Automate/AddNewAction/SetupScriptEmail';
 import SetupScriptReceiverEmail from '../screens/Automate/AddNewAction/SetupScriptReceiverEmail';
+import SetupScriptReceiverNotify from '../screens/Automate/AddNewAction/SetupScriptReceiverNotify';
 import AddAutomationTypeSmart from '../screens/Automate/AddNewAutoSmart/AddAutomationTypeSmart';
 import AddUnknownTypeSmart from '../screens/Automate/AddNewAutoSmart/AddUnknownTypeSmart';
 import EditActionsList from '../screens/Automate/EditActionsList';
@@ -44,6 +45,7 @@ import DeviceDetail from '../screens/Device/detail';
 import EditDevice from '../screens/Device/EditDevice/index';
 import DeviceInfo from '../screens/DeviceInfo';
 import EmergencySetting from '../screens/EmergencySetting';
+import CreatePassword from '../screens/CreatePassword';
 import EnterPassword from '../screens/EnterPassword';
 import GuestInfo from '../screens/GuestInfo';
 import ManageAccessScreen from '../screens/ManageAccess';
@@ -374,6 +376,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.CreatePassword}
+        component={CreatePassword}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.EnterPassword}
         component={EnterPassword}
@@ -465,6 +474,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.SetupScriptReceiverNotify}
+        component={SetupScriptReceiverNotify}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.UpdateReceiverEmailScript}
         component={UpdateReceiverEmailScript}

package/src/screens/ActivityLog/FilterPopup.js

@@ -1,6 +1,5 @@
 import React, { useState, useCallback } from 'react';
 import { View, ScrollView, TouchableOpacity } from 'react-native';
-import DateTimePickerModal from 'react-native-modal-datetime-picker';
 import moment from 'moment';
 
 import BottomButtonView from '../../commons/BottomButtonView';
@@ -8,7 +7,6 @@ import Text from '../../commons/Text';
 import RadioCircle from '../../commons/RadioCircle';
 import DateTimeRangeChange from '../../commons/DateTimeRangeChange';
 import { useTranslations } from '../../hooks/Common/useTranslations';
-import { useBoolean } from '../../hooks/Common';
 
 import { Colors } from '../../configs';
 import styles from './styles/filterPopupStyles';
@@ -42,21 +40,16 @@ const RowMember = ({ member, isSelected, onSelect }) => {
 const FilterPopup = ({
   isVisible,
   onHide,
-  onShow,
   members,
   filters,
   userFilterEnabled,
   onApply,
 }) => {
   const t = useTranslations();
-  const [lockShowing, acquireLockShowing, releaseLockShowing] =
-    useBoolean(false);
   const [selectedUsers, setSelectedUsers] = useState(filters.users);
   const [stateDatePicker, setStateDatePicker] = useState({
-    visible: false,
     startDate: filters.date_from,
     endDate: filters.date_to,
-    currentTimeChange: 'start',
   });
 
   const handleOnSelectUser = useCallback(
@@ -78,90 +71,38 @@ const FilterPopup = ({
     [selectedUsers, setSelectedUsers]
   );
 
-  const selectStart = useCallback(() => {
-    onHide();
-    acquireLockShowing();
-    setStateDatePicker((state) => ({
-      ...state,
-      visible: true,
-      currentTimeChange: 'start',
-    }));
-  }, [onHide, acquireLockShowing]);
-
-  const selectEnd = useCallback(() => {
-    onHide();
-    acquireLockShowing();
-    setStateDatePicker((state) => ({
-      ...state,
-      visible: true,
-      currentTimeChange: 'end',
-    }));
-  }, [onHide, acquireLockShowing]);
-
-  const onConfirmStartDate = useCallback((date) => {
+  const selectStart = useCallback((date) => {
     setStateDatePicker((state) => {
       if (moment(date).valueOf() < state.endDate) {
         return {
           ...state,
-          visible: false,
           startDate: moment(date).valueOf(),
         };
       }
       return {
         ...state,
-        visible: false,
         startDate: moment(date).valueOf(),
         endDate: moment(date).add(1, 'days').valueOf(),
       };
     });
   }, []);
 
-  const onConfirmEndDate = useCallback((date) => {
+  const selectEnd = useCallback((date) => {
     setStateDatePicker((state) => {
       if (moment(date).valueOf() > state.startDate) {
         return {
           ...state,
-          visible: false,
           endDate: moment(date).valueOf(),
         };
       }
       return {
         ...state,
-        visible: false,
         startDate: moment(date).add(-1, 'days').valueOf(),
         endDate: moment(date).valueOf(),
       };
     });
   }, []);
 
-  const onConfirmDate = useCallback(
-    (date) => {
-      if (stateDatePicker.currentTimeChange === 'start') {
-        onConfirmStartDate(date);
-      } else {
-        onConfirmEndDate(date);
-      }
-      onShow();
-      acquireLockShowing();
-    },
-    [
-      onConfirmStartDate,
-      onConfirmEndDate,
-      stateDatePicker,
-      acquireLockShowing,
-      onShow,
-    ]
-  );
-
-  const onPickerCancel = useCallback(() => {
-    setStateDatePicker((state) => ({
-      ...state,
-      visible: false,
-    }));
-    acquireLockShowing();
-    onShow();
-  }, [acquireLockShowing, onShow]);
-
   const handleOnApply = useCallback(() => {
     onApply({
       users: selectedUsers,
@@ -184,10 +125,9 @@ const FilterPopup = ({
   return (
     <>
       <ModalCustom
-        isVisible={isVisible && !lockShowing}
+        isVisible={isVisible}
         onBackButtonPress={handleOnCancel}
         onBackdropPress={handleOnCancel}
-        onModalHide={releaseLockShowing}
         useNativeDriver={true}
         useNativeDriverForBackdrop={true}
         animationIn={'zoomIn'}
@@ -211,6 +151,7 @@ const FilterPopup = ({
               selectStart={selectStart}
               selectEnd={selectEnd}
               formatType="date"
+              style={styles.datePicker}
               inline={true}
             />
             {userFilterEnabled && (
@@ -245,22 +186,6 @@ const FilterPopup = ({
           />
         </View>
       </ModalCustom>
-      <DateTimePickerModal
-        isVisible={stateDatePicker.visible && !lockShowing}
-        date={
-          stateDatePicker.currentTimeChange === 'start'
-            ? new Date(stateDatePicker.startDate)
-            : new Date(stateDatePicker.endDate)
-        }
-        mode={'date'}
-        onConfirm={onConfirmDate}
-        onCancel={onPickerCancel}
-        onHide={releaseLockShowing}
-        display="spinner"
-        headerTextIOS={t('pick_a_date')}
-        cancelTextIOS={t('cancel')}
-        confirmTextIOS={t('confirm')}
-      />
     </>
   );
 };

package/src/screens/ActivityLog/ItemLog.js

@@ -46,6 +46,7 @@ const DetailLog = ({ item }) => {
             ? `${item.action_name} ${t('by')} `
             : `${t('activated_by')} `}
           <Text style={styles.name}>{item.name || item.username}</Text>
+          <Text style={styles.text}>{'\n' + item.message}</Text>
         </Text>
       );
   }

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

@@ -8,7 +8,6 @@ import RadioCircle from '../../../commons/RadioCircle';
 import { AccessibilityLabel } from '../../../configs/Constants';
 import BottomButtonView from '../../../commons/BottomButtonView';
 import DateTimeRangeChange from '../../../commons/DateTimeRangeChange';
-import DateTimePickerModal from 'react-native-modal-datetime-picker';
 import moment from 'moment';
 
 const wrapComponent = (props) => (
@@ -125,7 +124,6 @@ it('test date picker pick valid and invalid date', async () => {
   });
   const instance = tree.root;
   const dateTimeRangeChange = instance.findByType(DateTimeRangeChange);
-  const datePicker = instance.findAllByType(DateTimePickerModal)[2];
 
   expect(dateTimeRangeChange.props.startTime).toBe(dateFrom.valueOf());
   expect(dateTimeRangeChange.props.endTime).toBe(dateTo.valueOf());
@@ -133,11 +131,9 @@ it('test date picker pick valid and invalid date', async () => {
   const _pickDateAndTest = async (timeChange) => {
     await act(async () => {
       if (timeChange === 'start') {
-        await dateTimeRangeChange.props.selectStart();
-        await datePicker.props.onConfirm(moment(dateFrom));
+        await dateTimeRangeChange.props.selectStart(dateFrom);
       } else {
-        await dateTimeRangeChange.props.selectEnd();
-        await datePicker.props.onConfirm(moment(dateTo));
+        await dateTimeRangeChange.props.selectEnd(dateTo);
       }
     });
     expect(dateTimeRangeChange.props.startTime).toBe(dateFrom.valueOf());

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

@@ -1,17 +1,20 @@
+import { act } from '@testing-library/react-hooks';
+import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import { SectionList, Text } from 'react-native';
 import { create } from 'react-test-renderer';
-import { act } from '@testing-library/react-hooks';
-import MockAdapter from 'axios-mock-adapter';
+import DateTimePickerModal from 'react-native-modal-datetime-picker';
+import moment from 'moment';
 
 import ActivityLog from '../';
 import { API, Constants } from '../../../configs';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ItemLog from '../ItemLog';
+import FilterPopup from '../FilterPopup';
+import BottomButtonView from '../../../commons/BottomButtonView';
 import DateTimeRangeChange from '../../../commons/DateTimeRangeChange';
-import DateTimePickerModal from 'react-native-modal-datetime-picker';
-import Modal from 'react-native-modal';
+import DateTimeButton from '../../../commons/DateTimeRangeChange/DateTimeButton';
 import { AUTOMATE_TYPE, AccessibilityLabel } from '../../../configs/Constants';
 import api from '../../../utils/Apis/axios';
 
@@ -88,13 +91,15 @@ describe('Test Activity log', () => {
     expect(items).toHaveLength(1);
   });
 
-  it('test open and close 2 modal', async () => {
+  it('test filter and date picker popup', async () => {
+    const dateFrom = moment('2025-08-18T10:00:00.000Z');
+    const dateTo = moment(dateFrom).add(7, 'days');
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const filterPopup = instance.findAllByType(Modal);
-    expect(filterPopup[0].props.isVisible).toBeFalsy();
+    const filterPopup = instance.findByType(FilterPopup);
+    expect(filterPopup.props.isVisible).toBeFalsy();
 
     const filterButton = instance.findByProps({
       accessibilityLabel: AccessibilityLabel.FILTER_BUTTON,
@@ -102,43 +107,60 @@ describe('Test Activity log', () => {
     await act(async () => {
       filterButton.props.onPress();
     });
-    expect(filterPopup[0].props.isVisible).toBeTruthy();
+    expect(filterPopup.props.isVisible).toBeTruthy();
 
     const dateTimeRangeChange = instance.findByType(DateTimeRangeChange);
-    const datePicker = instance.findAllByType(DateTimePickerModal)[2];
+    const datePickers = instance.findAllByType(DateTimePickerModal);
+    const buttonPickers = instance.findAllByType(DateTimeButton);
+
+    // open popup start date
+    await act(async () => {
+      await buttonPickers[0].props.onPress();
+    });
+    expect(datePickers[0].props.isVisible).toBeTruthy();
+    expect(filterPopup.props.isVisible).toBeTruthy();
 
     // pick start date
     await act(async () => {
-      await dateTimeRangeChange.props.selectStart();
-      await filterPopup[0].props.onModalHide();
+      await dateTimeRangeChange.props.selectStart(dateFrom);
     });
-    expect(filterPopup[0].props.isVisible).toBeFalsy();
-    // cancel
+    expect(datePickers[0].props.isVisible).toBeTruthy();
+    expect(filterPopup.props.isVisible).toBeTruthy();
+
+    // cancel start date
     await act(async () => {
-      await datePicker.props.onCancel();
-      await datePicker.props.onHide();
+      await datePickers[0].props.onCancel();
     });
-    expect(filterPopup[0].props.isVisible).toBeTruthy();
-    expect(datePicker.props.isVisible).toBeFalsy();
-    // open popup
+    expect(datePickers[0].props.isVisible).toBeFalsy();
+    expect(filterPopup.props.isVisible).toBeTruthy();
+
+    // open popup end date
     await act(async () => {
-      await filterButton.props.onPress();
+      await buttonPickers[1].props.onPress();
     });
-    expect(filterPopup[0].props.isVisible).toBeTruthy();
+    expect(datePickers[1].props.isVisible).toBeTruthy();
+    expect(filterPopup.props.isVisible).toBeTruthy();
+
     // pick end date
     await act(async () => {
-      await dateTimeRangeChange.props.selectEnd();
-      await filterPopup[0].props.onModalHide();
+      await dateTimeRangeChange.props.selectEnd(dateTo);
     });
-    expect(filterPopup[0].props.isVisible).toBeFalsy();
-    expect(datePicker.props.isVisible).toBeTruthy();
-    // confirm
+    expect(datePickers[1].props.isVisible).toBeTruthy();
+    expect(filterPopup.props.isVisible).toBeTruthy();
+
+    // confirm end date
+    await act(async () => {
+      await datePickers[1].props.onConfirm();
+    });
+    expect(datePickers[1].props.isVisible).toBeFalsy();
+    expect(filterPopup.props.isVisible).toBeTruthy();
+
+    // apply filter
+    const applyButton = instance.findByType(BottomButtonView);
     await act(async () => {
-      await datePicker.props.onConfirm();
-      await datePicker.props.onHide();
+      await applyButton.props.onPressMain();
     });
-    expect(filterPopup[0].props.isVisible).toBeTruthy();
-    expect(datePicker.props.isVisible).toBeFalsy();
+    expect(filterPopup.props.isVisible).toBeFalsy();
   });
 
   const setUpActionLogScreen = () => {

package/src/screens/ActivityLog/index.js

@@ -121,7 +121,6 @@ const ActivityLogScreen = ({ route }) => {
         <FilterPopup
           isVisible={showFilterPopup}
           onHide={setHideFilterPopup}
-          onShow={setShowFilterPopup}
           members={members}
           filters={filters}
           userFilterEnabled={filterEnabled.user}