diff --git a/src/components/Search/FilterDropdowns/DropdownButton.tsx b/src/components/Search/FilterDropdowns/DropdownButton.tsx index d1cc21dd32d3..bcffc03c9e06 100644 --- a/src/components/Search/FilterDropdowns/DropdownButton.tsx +++ b/src/components/Search/FilterDropdowns/DropdownButton.tsx @@ -1,5 +1,6 @@ import React, {useMemo, useRef, useState} from 'react'; import type {View} from 'react-native'; +import {useOnyx} from 'react-native-onyx'; import Button from '@components/Button'; import CaretWrapper from '@components/CaretWrapper'; import PopoverWithMeasuredContent from '@components/PopoverWithMeasuredContent'; @@ -10,6 +11,7 @@ import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; import useWindowDimensions from '@hooks/useWindowDimensions'; import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; type PopoverComponentProps = { closeOverlay: () => void; @@ -51,6 +53,8 @@ function DropdownButton({label, value, viewportOffsetTop, PopoverComponent}: Dro vertical: 0, }); + const [willAlertModalBecomeVisible] = useOnyx(ONYXKEYS.MODAL, {selector: (modal) => modal?.willAlertModalBecomeVisible, canBeMissing: true}); + const onTriggerLayout = () => { triggerRef.current?.measureInWindow((x, y, _, height) => { setPopoverTriggerPosition({ @@ -65,7 +69,13 @@ function DropdownButton({label, value, viewportOffsetTop, PopoverComponent}: Dro * position of the trigger */ const toggleOverlay = () => { - setIsOverlayVisible((previousValue) => !previousValue); + setIsOverlayVisible((previousValue) => { + if (!previousValue && willAlertModalBecomeVisible) { + return false; + } + + return !previousValue; + }); }; /**