Skip to content

Commit 71a4eb6

Browse files
authored
Merge pull request #88941 from callstack-internal/remove-NavigationDeferredMount-from-secondary-actions
[CP Staging] remove deferred mount
2 parents b94739a + 0ce3fe2 commit 71a4eb6

1 file changed

Lines changed: 8 additions & 38 deletions

File tree

src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ import {delegateEmailSelector, isUserValidatedSelector} from '@selectors/Account
22
import {hasSeenTourSelector} from '@selectors/Onboarding';
33
import truncate from 'lodash/truncate';
44
import React, {useContext, useEffect} from 'react';
5-
import {InteractionManager, View} from 'react-native';
5+
import {InteractionManager} from 'react-native';
66
import type {ValueOf} from 'type-fest';
7-
import Button from '@components/Button';
87
import type {ButtonWithDropdownMenuRef} from '@components/ButtonWithDropdownMenu/types';
98
import {useDelegateNoAccessActions, useDelegateNoAccessState} from '@components/DelegateNoAccessModalProvider';
109
import {KYCWallContext} from '@components/KYCWall/KYCWallContext';
1110
import MoneyReportHeaderKYCDropdown from '@components/MoneyReportHeaderKYCDropdown';
1211
import {useMoneyReportHeaderModals} from '@components/MoneyReportHeaderModalsContext';
13-
import NavigationDeferredMount from '@components/NavigationDeferredMount';
1412
import {usePaymentAnimationsContext} from '@components/PaymentAnimationsContext';
1513
import type {PopoverMenuItem} from '@components/PopoverMenu';
1614
import {useSearchStateContext} from '@components/Search/SearchContext';
@@ -32,10 +30,7 @@ import usePaymentOptions from '@hooks/usePaymentOptions';
3230
import usePermissions from '@hooks/usePermissions';
3331
import usePolicy from '@hooks/usePolicy';
3432
import useReportIsArchived from '@hooks/useReportIsArchived';
35-
import useResponsiveLayout from '@hooks/useResponsiveLayout';
3633
import useSearchShouldCalculateTotals from '@hooks/useSearchShouldCalculateTotals';
37-
import useStyleUtils from '@hooks/useStyleUtils';
38-
import useThemeStyles from '@hooks/useThemeStyles';
3934
import useTransactionsAndViolationsForReport from '@hooks/useTransactionsAndViolationsForReport';
4035
import {generateDefaultWorkspaceName} from '@libs/actions/Policy/Policy';
4136
import {search} from '@libs/actions/Search';
@@ -399,40 +394,15 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
399394
);
400395
}
401396

402-
function MoneyReportHeaderSecondaryActionsPlaceholder({primaryAction}: {primaryAction: ValueOf<typeof CONST.REPORT.PRIMARY_ACTIONS> | ''}) {
403-
const styles = useThemeStyles();
404-
const StyleUtils = useStyleUtils();
405-
const {translate} = useLocalize();
406-
const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
407-
const icons = useMemoizedLazyExpensifyIcons(['DownArrow']);
408-
const shouldDisplayNarrowVersion = shouldUseNarrowLayout || isMediumScreenWidth;
409-
const wrapperStyle = shouldDisplayNarrowVersion && !primaryAction ? styles.flex1 : undefined;
410-
// Match the inner styles the real ButtonWithDropdownMenu applies when isSplitButton=false so text placement stays put on swap.
411-
const innerStyles = [StyleUtils.getDropDownButtonHeight(CONST.DROPDOWN_BUTTON_SIZE.MEDIUM), styles.dropDownButtonCartIconView];
412-
return (
413-
<View style={wrapperStyle}>
414-
<Button
415-
text={translate('common.more')}
416-
iconRight={icons.DownArrow}
417-
shouldShowRightIcon
418-
innerStyles={innerStyles}
419-
onPress={() => {}}
420-
/>
421-
</View>
422-
);
423-
}
424-
425397
function MoneyReportHeaderSecondaryActions({reportID, primaryAction, isReportInSearch, backTo, dropdownMenuRef}: MoneyReportHeaderSecondaryActionsProps) {
426398
return (
427-
<NavigationDeferredMount placeholder={<MoneyReportHeaderSecondaryActionsPlaceholder primaryAction={primaryAction} />}>
428-
<MoneyReportHeaderSecondaryActionsInner
429-
reportID={reportID}
430-
primaryAction={primaryAction}
431-
isReportInSearch={isReportInSearch}
432-
backTo={backTo}
433-
dropdownMenuRef={dropdownMenuRef}
434-
/>
435-
</NavigationDeferredMount>
399+
<MoneyReportHeaderSecondaryActionsInner
400+
reportID={reportID}
401+
primaryAction={primaryAction}
402+
isReportInSearch={isReportInSearch}
403+
backTo={backTo}
404+
dropdownMenuRef={dropdownMenuRef}
405+
/>
436406
);
437407
}
438408

0 commit comments

Comments
 (0)