sort reports by transaction date

Expensify · Sep 9, 2024 · 7ca9e81 · 7ca9e81
1 parent fe44ab2
commit 7ca9e81
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
@@ -343,16 +343,20 @@ function getSortedTransactionData(data: TransactionListItemType[], sortBy?: Sear
     });
 }
 
+function getReportNewestTransactionDate(report: ReportListItemType) {
+    return report.transactions?.reduce((max, curr) => (curr.modifiedCreated ?? curr.created > max.created ? curr : max), report.transactions[0])?.created;
+}
+
 function getSortedReportData(data: ReportListItemType[]) {
     return data.sort((a, b) => {
-        const aValue = a?.created;
-        const bValue = b?.created;
+        const aNewestTransaction = getReportNewestTransactionDate(a);
+        const bNewestTransaction = getReportNewestTransactionDate(b);
 
-        if (aValue === undefined || bValue === undefined) {
+        if (!aNewestTransaction || !bNewestTransaction) {
             return 0;
         }
 
-        return bValue.toLowerCase().localeCompare(aValue);
+        return bNewestTransaction.toLowerCase().localeCompare(aNewestTransaction);
     });
 }
 

diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
@@ -94,7 +94,11 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
                     shouldPlaceSubtitleBelowSwitch
                 />
                 <View style={[styles.containerWithSpaceBetween]}>
+<<<<<<< Updated upstream
                     {!!currentPolicy && listItems.length > 0 && canUseWorkspaceRules && (
+=======
+                    {!!currentPolicy && listItems && false && (
+>>>>>>> Stashed changes
                         <>
                             <View style={[styles.mh5, styles.mt2, styles.mb1]}>
                                 <Text style={[styles.headerText]}>{translate('workspace.categories.defaultSpendCategories')}</Text>