Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@ import {
} from '@libs/ReportActionsUtils';
import {canUserPerformWriteAction, chatIncludesChronosWithID, getReportLastVisibleActionCreated} from '@libs/ReportUtils';
import isSearchTopmostFullScreenRoute from '@navigation/helpers/isSearchTopmostFullScreenRoute';
import Navigation from '@navigation/Navigation';
import FloatingMessageCounter from '@pages/home/report/FloatingMessageCounter';
import ReportActionsListItemRenderer from '@pages/home/report/ReportActionsListItemRenderer';
import shouldDisplayNewMarkerOnReportAction from '@pages/home/report/shouldDisplayNewMarkerOnReportAction';
import {openReport, readNewestAction, subscribeToNewActionEvent} from '@userActions/Report';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type * as OnyxTypes from '@src/types/onyx';
import {useMoneyRequestReportContext} from './MoneyRequestReportContext';
import MoneyRequestReportTransactionList from './MoneyRequestReportTransactionList';
Expand Down Expand Up @@ -370,7 +368,6 @@ function MoneyRequestReportActionsList({report, policy, reportActions = [], tran
setIsFloatingMessageCounterVisible(false);

if (!hasNewestReportAction) {
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
openReport(report.reportID);
reportScrollManager.scrollToEnd();
return;
Expand Down Expand Up @@ -417,7 +414,7 @@ function MoneyRequestReportActionsList({report, policy, reportActions = [], tran
useLayoutEffect(parseFSAttributes, []);

return (
<View style={[styles.flex1]}>
<View style={[styles.flex1, styles.pv4]}>
{shouldUseNarrowLayout && !!selectionMode?.isEnabled && (
<>
<ButtonWithDropdownMenu
Expand All @@ -441,7 +438,6 @@ function MoneyRequestReportActionsList({report, policy, reportActions = [], tran
}
}}
/>

<PressableWithFeedback
style={[styles.userSelectNone, styles.alignItemsCenter]}
onPress={() => {
Expand All @@ -466,7 +462,6 @@ function MoneyRequestReportActionsList({report, policy, reportActions = [], tran
isActive={isFloatingMessageCounterVisible}
onClick={scrollToBottomAndMarkReportAsRead}
/>

{isEmpty(visibleReportActions) && isEmpty(transactions) ? (
<>
<MoneyRequestViewReportFields
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ function MoneyRequestReportTransactionList({report, transactions, reportActions,
return !isEmpty(transactions) ? (
<>
{!displayNarrowVersion && (
<View style={[styles.dFlex, styles.flexRow, styles.pl5, styles.pr8, styles.pv3, StyleUtils.getPaddingBottom(6), styles.justifyContentCenter, styles.alignItemsCenter]}>
<View style={[styles.dFlex, styles.flexRow, styles.pl5, styles.pr8, StyleUtils.getPaddingBottom(6), styles.justifyContentCenter, styles.alignItemsCenter]}>
<View style={[styles.pv2, styles.pr4, StyleUtils.getPaddingLeft(variables.w12)]}>
<Checkbox
onPress={() => {
Expand Down Expand Up @@ -209,8 +209,7 @@ function MoneyRequestReportTransactionList({report, transactions, reportActions,
/>
</View>
)}

<View style={[listHorizontalPadding, styles.gap2, styles.pb4, displayNarrowVersion && !selectionMode?.isEnabled && styles.pt4]}>
<View style={[listHorizontalPadding, styles.gap2, styles.pb4]}>
{sortedTransactions.map((transaction) => {
return (
<PressableWithFeedback
Expand Down Expand Up @@ -251,8 +250,8 @@ function MoneyRequestReportTransactionList({report, transactions, reportActions,
<TransactionItemRow
transactionItem={transaction}
isSelected={isTransactionSelected(transaction.transactionID)}
shouldShowTooltip
dateColumnSize={dateColumnSize}
shouldShowTooltip
shouldUseNarrowLayout={displayNarrowVersion}
shouldShowChatBubbleComponent
onCheckboxPress={toggleTransaction}
Expand Down
Loading