@@ -386,13 +386,6 @@ function MoneyReportHeader({
386386 const [ isDuplicateActive , temporarilyDisableDuplicateAction ] = useThrottledButtonState ( ) ;
387387 const dropdownMenuRef = useRef < ButtonWithDropdownMenuRef > ( null ) ;
388388
389- useEffect ( ( ) => {
390- if ( ! isDuplicateActive ) {
391- return ;
392- }
393- dropdownMenuRef . current ?. setIsMenuVisible ( false ) ;
394- } , [ isDuplicateActive ] ) ;
395-
396389 const [ isHoldMenuVisible , setIsHoldMenuVisible ] = useState ( false ) ;
397390 const [ paymentType , setPaymentType ] = useState < PaymentMethodType > ( ) ;
398391 const [ requestType , setRequestType ] = useState < ActionHandledType > ( ) ;
@@ -457,6 +450,19 @@ function MoneyReportHeader({
457450 ( isArchivedReport || isChatReportArchived || ( activePolicyExpenseChat && ( isDM ( chatReport ) || isSelfDM ( chatReport ) ) ) )
458451 ) ;
459452
453+ const shouldDuplicateCloseModalOnSelect =
454+ isDistanceExpenseUnsupportedForDuplicating ||
455+ isPerDiemRequestOnNonDefaultWorkspace ||
456+ hasCustomUnitOutOfPolicyViolation ||
457+ activePolicyExpenseChat ?. iouReportID === moneyRequestReport ?. reportID ;
458+
459+ useEffect ( ( ) => {
460+ if ( ! isDuplicateActive || shouldDuplicateCloseModalOnSelect ) {
461+ return ;
462+ }
463+ dropdownMenuRef . current ?. setIsMenuVisible ( false ) ;
464+ } , [ isDuplicateActive , shouldDuplicateCloseModalOnSelect ] ) ;
465+
460466 const [ duplicateDistanceErrorModalVisible , setDuplicateDistanceErrorModalVisible ] = useState ( false ) ;
461467 const [ rateErrorModalVisible , setRateErrorModalVisible ] = useState ( false ) ;
462468 const [ isDownloadErrorModalVisible , setIsDownloadErrorModalVisible ] = useState ( false ) ;
@@ -1557,11 +1563,7 @@ function MoneyReportHeader({
15571563
15581564 duplicateExpenseTransaction ( [ transaction ] ) ;
15591565 } ,
1560- shouldCloseModalOnSelect :
1561- isDistanceExpenseUnsupportedForDuplicating ||
1562- isPerDiemRequestOnNonDefaultWorkspace ||
1563- hasCustomUnitOutOfPolicyViolation ||
1564- activePolicyExpenseChat ?. iouReportID === moneyRequestReport ?. reportID ,
1566+ shouldCloseModalOnSelect : shouldDuplicateCloseModalOnSelect ,
15651567 } ,
15661568 [ CONST . REPORT . SECONDARY_ACTIONS . DUPLICATE_REPORT ] : {
15671569 text : translate ( 'common.duplicateReport' ) ,
0 commit comments