Merge pull request #48365 from Expensify/cmartins-updateTripFilters

Update trip statuses
Expensify · Sep 6, 2024 · 735eb17 · 735eb17
2 parents ca782ae + db7c154
commit 735eb17
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -5374,10 +5374,8 @@ const CONST = {
             },
             TRIP: {
                 ALL: 'all',
-                DRAFTS: 'drafts',
-                OUTSTANDING: 'outstanding',
-                APPROVED: 'approved',
-                PAID: 'paid',
+                CURRENT: 'current',
+                PAST: 'past',
             },
         },
         CHAT_TYPES: {

diff --git a/src/components/Search/SearchStatusBar.tsx b/src/components/Search/SearchStatusBar.tsx
@@ -82,28 +82,16 @@ const tripOptions: Array<{key: TripSearchStatus; icon: IconAsset; text: Translat
         query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.ALL),
     },
     {
-        key: CONST.SEARCH.STATUS.TRIP.DRAFTS,
-        icon: Expensicons.Pencil,
-        text: 'common.drafts',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.DRAFTS),
-    },
-    {
-        key: CONST.SEARCH.STATUS.TRIP.OUTSTANDING,
-        icon: Expensicons.Hourglass,
-        text: 'common.outstanding',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.OUTSTANDING),
+        key: CONST.SEARCH.STATUS.TRIP.CURRENT,
+        icon: Expensicons.Calendar,
+        text: 'search.filters.current',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.CURRENT),
     },
     {
-        key: CONST.SEARCH.STATUS.TRIP.APPROVED,
-        icon: Expensicons.ThumbsUp,
-        text: 'iou.approved',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.APPROVED),
-    },
-    {
-        key: CONST.SEARCH.STATUS.TRIP.PAID,
-        icon: Expensicons.MoneyBag,
-        text: 'iou.settledExpensify',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.PAID),
+        key: CONST.SEARCH.STATUS.TRIP.PAST,
+        icon: Expensicons.History,
+        text: 'search.filters.past',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.PAST),
     },
 ];
 

diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -3891,6 +3891,8 @@ export default {
                 greaterThan: (amount?: string) => `Greater than ${amount ?? ''}`,
                 between: (greaterThan: string, lessThan: string) => `Between ${greaterThan} and ${lessThan}`,
             },
+            current: 'Current',
+            past: 'Past',
         },
         expenseType: 'Expense type',
     },

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -3942,6 +3942,8 @@ export default {
                 greaterThan: (amount?: string) => `Más que ${amount ?? ''}`,
                 between: (greaterThan: string, lessThan: string) => `Entre ${greaterThan} y ${lessThan}`,
             },
+            current: 'Actual',
+            past: 'Anterior',
         },
         expenseType: 'Tipo de gasto',
     },