From caafd373fdb899492fae6e827034d9007b941524 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 11 Feb 2025 12:57:01 -0700 Subject: [PATCH 1/4] add done status --- src/CONST.ts | 1 + src/components/Search/SearchStatusBar.tsx | 6 ++++++ src/languages/en.ts | 1 + src/languages/es.ts | 1 + 4 files changed, 9 insertions(+) diff --git a/src/CONST.ts b/src/CONST.ts index e747ea4afa33..1a9ed64c9606 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -6156,6 +6156,7 @@ const CONST = { DRAFTS: 'drafts', OUTSTANDING: 'outstanding', APPROVED: 'approved', + DONE: 'done', PAID: 'paid', }, INVOICE: { diff --git a/src/components/Search/SearchStatusBar.tsx b/src/components/Search/SearchStatusBar.tsx index f94e6e1146c5..72b68ee6df96 100644 --- a/src/components/Search/SearchStatusBar.tsx +++ b/src/components/Search/SearchStatusBar.tsx @@ -49,6 +49,12 @@ const expenseOptions: Array<{status: ExpenseSearchStatus; type: SearchDataTypes; icon: Expensicons.ThumbsUp, text: 'iou.approved', }, + { + type: CONST.SEARCH.DATA_TYPES.EXPENSE, + status: CONST.SEARCH.STATUS.EXPENSE.DONE, + icon: Expensicons.Checkmark, + text: 'iou.done', + }, { type: CONST.SEARCH.DATA_TYPES.EXPENSE, status: CONST.SEARCH.STATUS.EXPENSE.PAID, diff --git a/src/languages/en.ts b/src/languages/en.ts index a5b1ea056b06..14ba00c457e8 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -938,6 +938,7 @@ const translations = { other: 'Are you sure that you want to delete these expenses?', }), settledExpensify: 'Paid', + done: 'Done', settledElsewhere: 'Paid elsewhere', individual: 'Individual', business: 'Business', diff --git a/src/languages/es.ts b/src/languages/es.ts index 7f4e031d3178..4eb2e3007655 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -933,6 +933,7 @@ const translations = { other: '¿Estás seguro de que quieres eliminar estas solicitudes?', }), settledExpensify: 'Pagado', + done: 'Listo', settledElsewhere: 'Pagado de otra forma', individual: 'Individual', business: 'Empresa', From 06d11f40f8fe70687eb554b38cd7f31138711d0d Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Wed, 12 Feb 2025 11:42:22 -0700 Subject: [PATCH 2/4] fix eslint --- src/components/Search/SearchStatusBar.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Search/SearchStatusBar.tsx b/src/components/Search/SearchStatusBar.tsx index 72b68ee6df96..2b491985f6b0 100644 --- a/src/components/Search/SearchStatusBar.tsx +++ b/src/components/Search/SearchStatusBar.tsx @@ -11,7 +11,7 @@ import useStyleUtils from '@hooks/useStyleUtils'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import Navigation from '@libs/Navigation/Navigation'; -import * as SearchQueryUtils from '@libs/SearchQueryUtils'; +import {buildSearchQueryString} from '@libs/SearchQueryUtils'; import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; import type {SearchDataTypes} from '@src/types/onyx/SearchResults'; @@ -183,7 +183,7 @@ function SearchStatusBar({queryJSON, onStatusChange}: SearchStatusBarProps) { {options.map((item, index) => { const onPress = singleExecution(() => { onStatusChange?.(); - const query = SearchQueryUtils.buildSearchQueryString({...queryJSON, status: item.status}); + const query = buildSearchQueryString({...queryJSON, status: item.status}); Navigation.setParams({q: query}); }); const isActive = Array.isArray(queryJSON.status) ? queryJSON.status.includes(item.status) : queryJSON.status === item.status; From f6da1790b3fedd7bf9b94226ff21f96b4c69b3de Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 13 Feb 2025 09:34:17 -0700 Subject: [PATCH 3/4] update icons --- assets/images/checkbox.svg | 12 ++++++++++++ src/components/Icon/Expensicons.ts | 2 ++ src/components/Search/SearchStatusBar.tsx | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 assets/images/checkbox.svg diff --git a/assets/images/checkbox.svg b/assets/images/checkbox.svg new file mode 100644 index 000000000000..d6b31ce82519 --- /dev/null +++ b/assets/images/checkbox.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index b71c9e2402c5..712b03bf4590 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -49,6 +49,7 @@ import ChatBubbleUnread from '@assets/images/chatbubble-unread.svg'; import ChatBubble from '@assets/images/chatbubble.svg'; import ChatBubbles from '@assets/images/chatbubbles.svg'; import CheckCircle from '@assets/images/check-circle.svg'; +import Checkbox from '@assets/images/checkbox.svg'; import CheckmarkCircle from '@assets/images/checkmark-circle.svg'; import Checkmark from '@assets/images/checkmark.svg'; import CircularArrowBackwards from '@assets/images/circular-arrow-backwards.svg'; @@ -249,6 +250,7 @@ export { Cash, ChatBubble, ChatBubbles, + Checkbox, Checkmark, Chair, Close, diff --git a/src/components/Search/SearchStatusBar.tsx b/src/components/Search/SearchStatusBar.tsx index 2b491985f6b0..53ee7b90408a 100644 --- a/src/components/Search/SearchStatusBar.tsx +++ b/src/components/Search/SearchStatusBar.tsx @@ -52,13 +52,13 @@ const expenseOptions: Array<{status: ExpenseSearchStatus; type: SearchDataTypes; { type: CONST.SEARCH.DATA_TYPES.EXPENSE, status: CONST.SEARCH.STATUS.EXPENSE.DONE, - icon: Expensicons.Checkmark, + icon: Expensicons.Checkbox, text: 'iou.done', }, { type: CONST.SEARCH.DATA_TYPES.EXPENSE, status: CONST.SEARCH.STATUS.EXPENSE.PAID, - icon: Expensicons.MoneyBag, + icon: Expensicons.Checkmark, text: 'iou.settledExpensify', }, ]; @@ -79,7 +79,7 @@ const invoiceOptions: Array<{type: SearchDataTypes; status: InvoiceSearchStatus; { type: CONST.SEARCH.DATA_TYPES.INVOICE, status: CONST.SEARCH.STATUS.INVOICE.PAID, - icon: Expensicons.MoneyBag, + icon: Expensicons.Checkmark, text: 'iou.settledExpensify', }, ]; From 11988ac92ef07fd73c4e6c4ea8c814653b42caaf Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Fri, 14 Feb 2025 12:26:39 -0700 Subject: [PATCH 4/4] update badge --- src/components/SelectionList/Search/ActionCell.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx index 635f933582c0..5b96771b7dd6 100644 --- a/src/components/SelectionList/Search/ActionCell.tsx +++ b/src/components/SelectionList/Search/ActionCell.tsx @@ -56,7 +56,7 @@ function ActionCell({