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 @@ -23,7 +23,7 @@ type DynamicMergeTransactionsListPageProps = PlatformStackScreenProps<MergeTrans

function DynamicMergeTransactionsListPage({route}: DynamicMergeTransactionsListPageProps) {
const {translate} = useLocalize();
const {transactionID, isOnSearch} = route.params;
const {transactionID} = route.params;

const [mergeTransaction, mergeTransactionMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${transactionID}`);

Expand Down Expand Up @@ -51,7 +51,6 @@ function DynamicMergeTransactionsListPage({route}: DynamicMergeTransactionsListP
<MergeTransactionsListContent
transactionID={transactionID}
mergeTransaction={mergeTransaction}
isOnSearch={isOnSearch}
/>
</FullPageNotFoundView>
</ScreenWrapper>
Expand Down
5 changes: 2 additions & 3 deletions src/pages/TransactionMerge/MergeTransactionsListContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,11 @@ import MergeTransactionItem from './MergeTransactionItem';
type MergeTransactionsListContentProps = {
transactionID: string;
mergeTransaction: OnyxEntry<MergeTransaction>;
isOnSearch?: boolean;
};

type MergeTransactionListItemType = Transaction & ListItem;

function MergeTransactionsListContent({transactionID, mergeTransaction, isOnSearch}: MergeTransactionsListContentProps) {
function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTransactionsListContentProps) {
const illustrations = useMemoizedLazyIllustrations(['EmptyShelves']);
const {translate, localeCompare} = useLocalize();
const styles = useThemeStyles();
Expand Down Expand Up @@ -164,7 +163,7 @@ function MergeTransactionsListContent({transactionID, mergeTransaction, isOnSear
}

const reports = targetTransactionReport && sourceTransactionReport ? [targetTransactionReport, sourceTransactionReport] : undefined;
setupMergeTransactionDataAndNavigate(transactionID, [targetTransaction, sourceTransaction], localeCompare, getCurrencyDecimals, reports, true, isOnSearch, [
setupMergeTransactionDataAndNavigate(transactionID, [targetTransaction, sourceTransaction], localeCompare, getCurrencyDecimals, reports, true, undefined, [
Comment thread
huult marked this conversation as resolved.
targetTransactionPolicy,
sourceTransactionPolicy,
]);
Expand Down
Loading