Skip to content

[CP Staging] Fix: More menu staying open after duplicating expense #77307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marcochavezf wants to merge 1 commit into from
Closed

[CP Staging] Fix: More menu staying open after duplicating expense #77307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/components/MoneyReportHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import useSelectedTransactionsActions from '@hooks/useSelectedTransactionsAction
import useStrictPolicyRules from '@hooks/useStrictPolicyRules';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import useThrottledButtonState from '@hooks/useThrottledButtonState';
import useTransactionsAndViolationsForReport from '@hooks/useTransactionsAndViolationsForReport';
import useTransactionViolations from '@hooks/useTransactionViolations';
import {openOldDotLink} from '@libs/actions/Link';
Expand Down Expand Up @@ -235,7 +234,6 @@ function MoneyReportHeader({
'Feed',
'Close',
'Location',
'CheckmarkCircle',
'ReceiptMultiple',
] as const);
const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true});
Expand Down Expand Up @@ -323,7 +321,6 @@ function MoneyReportHeader({
const {isExpenseSplit} = getOriginalTransactionWithSplitInfo(transaction, originalTransaction);

const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true});
const [isDuplicateActive, temporarilyDisableDuplicateAction] = useThrottledButtonState();
const [isHoldMenuVisible, setIsHoldMenuVisible] = useState(false);
const [paymentType, setPaymentType] = useState<PaymentMethodType>();
const [requestType, setRequestType] = useState<ActionHandledType>();
Expand Down Expand Up @@ -1193,19 +1190,16 @@ function MoneyReportHeader({
},
},
[CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE]: {
text: isDuplicateActive ? translate('common.duplicate') : translate('common.duplicated'),
icon: isDuplicateActive ? expensifyIcons.ReceiptMultiple : expensifyIcons.CheckmarkCircle,
text: translate('common.duplicate'),
icon: expensifyIcons.ReceiptMultiple,
value: CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE,
onSelected: () => {
if (!isDuplicateActive || !transaction) {
if (!transaction) {
return;
}

temporarilyDisableDuplicateAction();

duplicateExpenseTransaction([transaction]);
},
shouldCloseModalOnSelect: false,
},
[CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE]: {
text: translate('iou.changeWorkspace'),
Expand Down
11 changes: 3 additions & 8 deletions src/components/MoneyRequestHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import useThrottledButtonState from '@hooks/useThrottledButtonState';
import useTransactionViolations from '@hooks/useTransactionViolations';
import {deleteTrackExpense, initSplitExpense, markRejectViolationAsResolved} from '@libs/actions/IOU';
import {setupMergeTransactionData} from '@libs/actions/MergeTransaction';
Expand Down Expand Up @@ -71,7 +70,7 @@
import HoldOrRejectEducationalModal from './HoldOrRejectEducationalModal';
import HoldSubmitterEducationalModal from './HoldSubmitterEducationalModal';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';

Check warning on line 73 in src/components/MoneyRequestHeader.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

'./Icon/Expensicons' import is restricted from being used by a pattern. Direct imports from Icon/Expensicons are deprecated. Please use lazy loading hooks instead. Use `useMemoizedLazyExpensifyIcons` from @hooks/useLazyAsset. See docs/LAZY_ICONS_AND_ILLUSTRATIONS.md for details
import LoadingBar from './LoadingBar';
import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusBar';
import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
Expand Down Expand Up @@ -119,7 +118,6 @@
const [rejectModalAction, setRejectModalAction] = useState<ValueOf<
typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD | typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT
> | null>(null);
const [isDuplicateActive, temporarilyDisableDuplicateAction] = useThrottledButtonState();
const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION, {canBeMissing: true});
const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {canBeMissing: true});
const shouldShowLoadingBar = useLoadingBarVisibility();
Expand Down Expand Up @@ -396,19 +394,16 @@
},
},
[CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE]: {
text: isDuplicateActive ? translate('common.duplicate') : translate('common.duplicated'),
icon: isDuplicateActive ? Expensicons.ReceiptMultiple : Expensicons.CheckmarkCircle,
text: translate('common.duplicate'),
icon: Expensicons.ReceiptMultiple,
value: CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE,
onSelected: () => {
if (!isDuplicateActive || !transaction) {
if (!transaction) {
return;
}

temporarilyDisableDuplicateAction();

duplicateTransaction([transaction]);
},
shouldCloseModalOnSelect: false,
},
[CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.VIEW_DETAILS]: {
value: CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS,
Expand Down
Loading