From e07c906376d4e534b3f967cc0ed012901acd1da7 Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Wed, 17 Sep 2025 04:08:30 +0530 Subject: [PATCH 1/4] fix: Regressions from PR: 69198 Signed-off-by: krishna2323 --- .../MoneyRequestReportTransactionList.tsx | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 27d8211df95d..cc9e6e882875 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -9,6 +9,7 @@ import Checkbox from '@components/Checkbox'; import * as Expensicons from '@components/Icon/Expensicons'; import MenuItem from '@components/MenuItem'; import Modal from '@components/Modal'; +import OfflineWithFeedback from '@components/OfflineWithFeedback'; import {usePersonalDetails, useSession} from '@components/OnyxListItemProvider'; import {useSearchContext} from '@components/Search/SearchContext'; import type {SearchColumnType, SortOrder} from '@components/Search/types'; @@ -16,6 +17,7 @@ import Text from '@components/Text'; import useCopySelectionHelper from '@hooks/useCopySelectionHelper'; import useLocalize from '@hooks/useLocalize'; import useMobileSelectionMode from '@hooks/useMobileSelectionMode'; +import useReportIsArchived from '@hooks/useReportIsArchived'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -27,7 +29,7 @@ import {getThreadReportIDsForTransactions} from '@libs/MoneyRequestReportUtils'; import {navigationRef} from '@libs/Navigation/Navigation'; import Parser from '@libs/Parser'; import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils'; -import {canAddTransaction, getAddExpenseDropdownOptions, getMoneyRequestSpendBreakdown, isExpenseReport} from '@libs/ReportUtils'; +import {canAddTransaction, getAddExpenseDropdownOptions, getMoneyRequestSpendBreakdown, isCurrentUserSubmitter, isExpenseReport} from '@libs/ReportUtils'; import {compareValues, getColumnsToShow, isTransactionAmountTooLong, isTransactionTaxAmountTooLong} from '@libs/SearchUIUtils'; import {getAmount, getCategory, getCreated, getMerchant, getTag, getTransactionPendingAction, isTransactionPendingDelete} from '@libs/TransactionUtils'; import shouldShowTransactionYear from '@libs/TransactionUtils/shouldShowTransactionYear'; @@ -129,7 +131,8 @@ function MoneyRequestReportTransactionList({report, transactions, newTransaction const shouldShowBreakdown = !!nonReimbursableSpend && !!reimbursableSpend; const transactionsWithoutPendingDelete = useMemo(() => transactions.filter((t) => !isTransactionPendingDelete(t)), [transactions]); const session = useSession(); - + const isReportArchived = useReportIsArchived(report?.reportID); + const shouldShowAddExpenseButton = canAddTransaction(report, isReportArchived) && isCurrentUserSubmitter(report); const addExpenseDropdownOptions = useMemo(() => getAddExpenseDropdownOptions(report?.reportID, policy), [report?.reportID, policy]); const hasPendingAction = useMemo(() => { @@ -340,22 +343,24 @@ function MoneyRequestReportTransactionList({report, transactions, newTransaction })} - {canAddTransaction(report) && ( - {}} - shouldAlwaysShowDropdownMenu - customText={translate('iou.addExpense')} - options={addExpenseDropdownOptions} - isSplitButton={false} - buttonSize={CONST.DROPDOWN_BUTTON_SIZE.SMALL} - success={false} - anchorAlignment={{ - horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT, - vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP, - }} - /> + {shouldShowAddExpenseButton && ( + + {}} + shouldAlwaysShowDropdownMenu + customText={translate('iou.addExpense')} + options={addExpenseDropdownOptions} + isSplitButton={false} + buttonSize={CONST.DROPDOWN_BUTTON_SIZE.SMALL} + success={false} + anchorAlignment={{ + horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT, + vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP, + }} + /> + )} - + {shouldShowBreakdown && ( {[ From 9fc1ff8dfcde4a92e7107c5a06cc14c06b84e793 Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Wed, 17 Sep 2025 15:43:41 +0530 Subject: [PATCH 2/4] add min height to button and total container. Signed-off-by: krishna2323 --- .../MoneyRequestReportTransactionList.tsx | 2 +- src/styles/utils/spacing.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index cc9e6e882875..1d22201a7423 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -342,7 +342,7 @@ function MoneyRequestReportTransactionList({report, transactions, newTransaction ); })} - + {shouldShowAddExpenseButton && ( Date: Wed, 17 Sep 2025 21:25:04 +0530 Subject: [PATCH 3/4] fix total row overflow. Signed-off-by: krishna2323 --- .../MoneyRequestReportTransactionList.tsx | 22 +++++++++++++++---- src/styles/utils/sizing.ts | 6 +++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 1d22201a7423..cfd715ebf392 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -342,9 +342,23 @@ function MoneyRequestReportTransactionList({report, transactions, newTransaction ); })} - + {shouldShowAddExpenseButton && ( - + {}} shouldAlwaysShowDropdownMenu @@ -360,9 +374,9 @@ function MoneyRequestReportTransactionList({report, transactions, newTransaction /> )} - + {shouldShowBreakdown && ( - + {[ {text: 'cardTransactions.outOfPocket', value: formattedOutOfPocketAmount}, {text: 'cardTransactions.companySpend', value: formattedCompanySpendAmount}, diff --git a/src/styles/utils/sizing.ts b/src/styles/utils/sizing.ts index dab8e474abb6..e84abadf1057 100644 --- a/src/styles/utils/sizing.ts +++ b/src/styles/utils/sizing.ts @@ -142,9 +142,15 @@ export default { mw100: { maxWidth: '100%', }, + + mwFitContent: { + maxWidth: 'fit-content', + }, + wAuto: { width: 'auto', }, + wFitContent: { width: 'fit-content', }, From 4f58b41870e47a7a4e9a8be4fb19bdb78372dddf Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Wed, 17 Sep 2025 21:33:08 +0530 Subject: [PATCH 4/4] minor fix. Signed-off-by: krishna2323 --- .../MoneyRequestReportTransactionList.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index cfd715ebf392..ea801f01e8bc 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -346,11 +346,11 @@ function MoneyRequestReportTransactionList({report, transactions, newTransaction style={[ styles.dFlex, styles.flexRow, - styles.justifyContentBetween, + shouldShowAddExpenseButton ? styles.justifyContentBetween : styles.justifyContentEnd, styles.gap2, listHorizontalPadding, styles.mb2, - shouldShowAddExpenseButton ? styles.alignItemsStart : styles.alignItemsEnd, + styles.alignItemsStart, styles.minHeight7, ]} >