From 48ce99e463df80ba7870d22c60902c52b75340e1 Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 15 May 2024 11:24:42 +0200 Subject: [PATCH 01/12] Add canned searches --- src/CONST.ts | 3 +++ src/languages/en.ts | 3 +++ src/pages/Search/SearchFilters.tsx | 35 +++++++++++++++++++++++++----- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 08fc5908d328..0b22291c252f 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -3479,6 +3479,9 @@ const CONST = { }, TAB_SEARCH: { ALL: 'all', + SHARED: 'shared', + DRAFTS: 'drafts', + FINISHED: 'finished', }, STATUS_TEXT_MAX_LENGTH: 100, diff --git a/src/languages/en.ts b/src/languages/en.ts index cb260f2f0de5..c90ddf88d378 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -334,6 +334,9 @@ export default { action: 'Action', expenses: 'Expenses', tax: 'Tax', + shared: 'Shared', + drafts: 'Drafts', + finished: 'Finished', }, location: { useCurrent: 'Use current location', diff --git a/src/pages/Search/SearchFilters.tsx b/src/pages/Search/SearchFilters.tsx index 06611db61824..0138b9fd18a7 100644 --- a/src/pages/Search/SearchFilters.tsx +++ b/src/pages/Search/SearchFilters.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {View} from 'react-native'; +import { View } from 'react-native'; import MenuItem from '@components/MenuItem'; import useLocalize from '@hooks/useLocalize'; import useSingleExecution from '@hooks/useSingleExecution'; @@ -9,9 +9,11 @@ import Navigation from '@libs/Navigation/Navigation'; import variables from '@styles/variables'; import * as Expensicons from '@src/components/Icon/Expensicons'; import CONST from '@src/CONST'; -import type {Route} from '@src/ROUTES'; +import type { Route } from '@src/ROUTES'; import ROUTES from '@src/ROUTES'; import type IconAsset from '@src/types/utils/IconAsset'; +import SearchFiltersNarrow from './SearchFiltersNarrow'; + type SearchFiltersProps = { query: string; @@ -37,13 +39,34 @@ function SearchFilters({query}: SearchFiltersProps) { icon: Expensicons.Receipt, route: ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.ALL), }, + { + title: translate('common.shared'), + query: CONST.TAB_SEARCH.SHARED, + icon: Expensicons.Send, + route: ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.SHARED), + }, + { + title: translate('common.drafts'), + query: CONST.TAB_SEARCH.DRAFTS, + icon: Expensicons.Pencil, + route: ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.DRAFTS), + }, + { + title: translate('common.finished'), + query: CONST.TAB_SEARCH.FINISHED, + icon: Expensicons.Checkmark, + route: ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.FINISHED), + }, ]; const activeItemIndex = filterItems.findIndex((item) => item.query === query); - // We're not showing the filters on mobile yet since there's only one search option. - // We'll introduce the filters as part of https://github.com/Expensify/App/issues/39878 if (isSmallScreenWidth) { - return; + return ( + + ); } return ( @@ -75,4 +98,4 @@ function SearchFilters({query}: SearchFiltersProps) { SearchFilters.displayName = 'SearchFilters'; export default SearchFilters; -export type {SearchMenuFilterItem}; +export type {SearchMenuFilterItem}; \ No newline at end of file From 6f631fe11483cf80787b4a20d9bfaf820fc225ed Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 15 May 2024 11:51:28 +0200 Subject: [PATCH 02/12] Update icon --- assets/images/check-circle.svg | 4 ++++ src/components/Icon/Expensicons.ts | 2 ++ src/pages/Search/SearchFilters.tsx | 9 ++++----- 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 assets/images/check-circle.svg diff --git a/assets/images/check-circle.svg b/assets/images/check-circle.svg new file mode 100644 index 000000000000..87391b840129 --- /dev/null +++ b/assets/images/check-circle.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index c147c3735e96..e92f7d2db54f 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -35,6 +35,7 @@ import ChatBubbleReply from '@assets/images/chatbubble-reply.svg'; 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 Checkmark from '@assets/images/checkmark.svg'; import Close from '@assets/images/close.svg'; import ClosedSign from '@assets/images/closed-sign.svg'; @@ -338,4 +339,5 @@ export { Lightbulb, DocumentPlus, Clear, + CheckCircle, }; diff --git a/src/pages/Search/SearchFilters.tsx b/src/pages/Search/SearchFilters.tsx index 0138b9fd18a7..c09111a78fc8 100644 --- a/src/pages/Search/SearchFilters.tsx +++ b/src/pages/Search/SearchFilters.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { View } from 'react-native'; +import {View} from 'react-native'; import MenuItem from '@components/MenuItem'; import useLocalize from '@hooks/useLocalize'; import useSingleExecution from '@hooks/useSingleExecution'; @@ -9,12 +9,11 @@ import Navigation from '@libs/Navigation/Navigation'; import variables from '@styles/variables'; import * as Expensicons from '@src/components/Icon/Expensicons'; import CONST from '@src/CONST'; -import type { Route } from '@src/ROUTES'; +import type {Route} from '@src/ROUTES'; import ROUTES from '@src/ROUTES'; import type IconAsset from '@src/types/utils/IconAsset'; import SearchFiltersNarrow from './SearchFiltersNarrow'; - type SearchFiltersProps = { query: string; }; @@ -54,7 +53,7 @@ function SearchFilters({query}: SearchFiltersProps) { { title: translate('common.finished'), query: CONST.TAB_SEARCH.FINISHED, - icon: Expensicons.Checkmark, + icon: Expensicons.CheckCircle, route: ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.FINISHED), }, ]; @@ -98,4 +97,4 @@ function SearchFilters({query}: SearchFiltersProps) { SearchFilters.displayName = 'SearchFilters'; export default SearchFilters; -export type {SearchMenuFilterItem}; \ No newline at end of file +export type {SearchMenuFilterItem}; From d02e71185d6eabda084ac79577cb2bdef8f2f887 Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 15 May 2024 11:57:10 +0200 Subject: [PATCH 03/12] Fix icon display on ios --- assets/images/check-circle.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/images/check-circle.svg b/assets/images/check-circle.svg index 87391b840129..556c943fe576 100644 --- a/assets/images/check-circle.svg +++ b/assets/images/check-circle.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file From c46501fad5a7992592b2864fc2426adf3e077f2c Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 15 May 2024 14:56:55 +0200 Subject: [PATCH 04/12] Add missing translation and illustrations --- .../simple-illustration__drafts.svg | 48 ++++++++ .../simple-illustration__finished.svg | 8 ++ .../simple-illustration__shared.svg | 42 +++++++ src/components/Icon/Illustrations.ts | 6 + src/languages/es.ts | 110 ++---------------- src/pages/Search/SearchPage.tsx | 12 ++ 6 files changed, 123 insertions(+), 103 deletions(-) create mode 100644 assets/images/simple-illustrations/simple-illustration__drafts.svg create mode 100644 assets/images/simple-illustrations/simple-illustration__finished.svg create mode 100644 assets/images/simple-illustrations/simple-illustration__shared.svg diff --git a/assets/images/simple-illustrations/simple-illustration__drafts.svg b/assets/images/simple-illustrations/simple-illustration__drafts.svg new file mode 100644 index 000000000000..059e8125058d --- /dev/null +++ b/assets/images/simple-illustrations/simple-illustration__drafts.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/images/simple-illustrations/simple-illustration__finished.svg b/assets/images/simple-illustrations/simple-illustration__finished.svg new file mode 100644 index 000000000000..4876f5fc4607 --- /dev/null +++ b/assets/images/simple-illustrations/simple-illustration__finished.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/assets/images/simple-illustrations/simple-illustration__shared.svg b/assets/images/simple-illustrations/simple-illustration__shared.svg new file mode 100644 index 000000000000..ae99ce5f90dd --- /dev/null +++ b/assets/images/simple-illustrations/simple-illustration__shared.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts index 8d3f53be9396..fc7f1d067c1c 100644 --- a/src/components/Icon/Illustrations.ts +++ b/src/components/Icon/Illustrations.ts @@ -47,7 +47,9 @@ import CompanyCard from '@assets/images/simple-illustrations/simple-illustration import ConciergeBubble from '@assets/images/simple-illustrations/simple-illustration__concierge-bubble.svg'; import ConciergeNew from '@assets/images/simple-illustrations/simple-illustration__concierge.svg'; import CreditCardsNew from '@assets/images/simple-illustrations/simple-illustration__credit-cards.svg'; +import Drafts from '@assets/images/simple-illustrations/simple-illustration__drafts.svg'; import EmailAddress from '@assets/images/simple-illustrations/simple-illustration__email-address.svg'; +import Finished from '@assets/images/simple-illustrations/simple-illustration__finished.svg'; import FolderOpen from '@assets/images/simple-illustrations/simple-illustration__folder-open.svg'; import Gears from '@assets/images/simple-illustrations/simple-illustration__gears.svg'; import HandCard from '@assets/images/simple-illustrations/simple-illustration__handcard.svg'; @@ -75,6 +77,7 @@ import ReceiptEnvelope from '@assets/images/simple-illustrations/simple-illustra import ReceiptWrangler from '@assets/images/simple-illustrations/simple-illustration__receipt-wrangler.svg'; import ReceiptUpload from '@assets/images/simple-illustrations/simple-illustration__receiptupload.svg'; import SanFrancisco from '@assets/images/simple-illustrations/simple-illustration__sanfrancisco.svg'; +import Shared from '@assets/images/simple-illustrations/simple-illustration__shared.svg'; import ShieldYellow from '@assets/images/simple-illustrations/simple-illustration__shield.svg'; import SmallRocket from '@assets/images/simple-illustrations/simple-illustration__smallrocket.svg'; import SplitBill from '@assets/images/simple-illustrations/simple-illustration__splitbill.svg'; @@ -176,4 +179,7 @@ export { Tag, CarIce, Lightbulb, + Shared, + Drafts, + Finished, }; diff --git a/src/languages/es.ts b/src/languages/es.ts index b512bcaeaf52..ed24993422a4 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1,107 +1,8 @@ import Str from 'expensify-common/lib/str'; import CONST from '@src/CONST'; -import type {ConnectionName, PolicyConnectionSyncStage} from '@src/types/onyx/Policy'; -import type { - AddressLineParams, - AdminCanceledRequestParams, - AlreadySignedInParams, - ApprovedAmountParams, - BeginningOfChatHistoryAdminRoomPartOneParams, - BeginningOfChatHistoryAnnounceRoomPartOneParams, - BeginningOfChatHistoryAnnounceRoomPartTwo, - BeginningOfChatHistoryDomainRoomPartOneParams, - CanceledRequestParams, - CharacterLimitParams, - ConfirmThatParams, - DateShouldBeAfterParams, - DateShouldBeBeforeParams, - DeleteActionParams, - DeleteConfirmationParams, - DidSplitAmountMessageParams, - DistanceRateOperationsParams, - EditActionParams, - ElectronicFundsParams, - EnglishTranslation, - EnterMagicCodeParams, - FormattedMaxLengthParams, - GoBackMessageParams, - GoToRoomParams, - InstantSummaryParams, - LocalTimeParams, - LoggedInAsParams, - LogSizeParams, - ManagerApprovedAmountParams, - ManagerApprovedParams, - NewFaceEnterMagicCodeParams, - NoLongerHaveAccessParams, - NotAllowedExtensionParams, - NotYouParams, - OOOEventSummaryFullDayParams, - OOOEventSummaryPartialDayParams, - OurEmailProviderParams, - PaidElsewhereWithAmountParams, - PaidWithExpensifyWithAmountParams, - ParentNavigationSummaryParams, - PayerOwesAmountParams, - PayerOwesParams, - PayerPaidAmountParams, - PayerPaidParams, - PayerSettledParams, - PaySomeoneParams, - ReimbursementRateParams, - RemovedTheRequestParams, - RenamedRoomActionParams, - ReportArchiveReasonsClosedParams, - ReportArchiveReasonsMergedParams, - ReportArchiveReasonsPolicyDeletedParams, - ReportArchiveReasonsRemovedFromPolicyParams, - RequestAmountParams, - RequestCountParams, - RequestedAmountMessageParams, - ResolutionConstraintsParams, - RoomNameReservedErrorParams, - RoomRenamedToParams, - SetTheDistanceParams, - SetTheRequestParams, - SettledAfterAddedBankAccountParams, - SettleExpensifyCardParams, - SizeExceededParams, - SplitAmountParams, - StepCounterParams, - TaskCreatedActionParams, - TermsParams, - ThreadRequestReportNameParams, - ThreadSentMoneyReportNameParams, - ToValidateLoginParams, - TransferParams, - UntilTimeParams, - UpdatedTheDistanceParams, - UpdatedTheRequestParams, - UsePlusButtonParams, - UserIsAlreadyMemberParams, - UserSplitParams, - ViolationsAutoReportedRejectedExpenseParams, - ViolationsCashExpenseWithNoReceiptParams, - ViolationsConversionSurchargeParams, - ViolationsInvoiceMarkupParams, - ViolationsMaxAgeParams, - ViolationsMissingTagParams, - ViolationsOverAutoApprovalLimitParams, - ViolationsOverCategoryLimitParams, - ViolationsOverLimitParams, - ViolationsPerDayLimitParams, - ViolationsReceiptRequiredParams, - ViolationsRterParams, - ViolationsTagOutOfPolicyParams, - ViolationsTaxOutOfPolicyParams, - WaitingOnBankAccountParams, - WalletProgramParams, - WelcomeEnterMagicCodeParams, - WelcomeNoteParams, - WelcomeToRoomParams, - WeSentYouMagicSignInLinkParams, - ZipCodeExampleFormatParams, -} from './types'; +import type { ConnectionName, PolicyConnectionSyncStage } from '@src/types/onyx/Policy'; +import type { AddressLineParams, AdminCanceledRequestParams, AlreadySignedInParams, ApprovedAmountParams, BeginningOfChatHistoryAdminRoomPartOneParams, BeginningOfChatHistoryAnnounceRoomPartOneParams, BeginningOfChatHistoryAnnounceRoomPartTwo, BeginningOfChatHistoryDomainRoomPartOneParams, CanceledRequestParams, CharacterLimitParams, ConfirmThatParams, DateShouldBeAfterParams, DateShouldBeBeforeParams, DeleteActionParams, DeleteConfirmationParams, DidSplitAmountMessageParams, DistanceRateOperationsParams, EditActionParams, ElectronicFundsParams, EnglishTranslation, EnterMagicCodeParams, FormattedMaxLengthParams, GoBackMessageParams, GoToRoomParams, InstantSummaryParams, LocalTimeParams, LoggedInAsParams, LogSizeParams, ManagerApprovedAmountParams, ManagerApprovedParams, NewFaceEnterMagicCodeParams, NoLongerHaveAccessParams, NotAllowedExtensionParams, NotYouParams, OOOEventSummaryFullDayParams, OOOEventSummaryPartialDayParams, OurEmailProviderParams, PaidElsewhereWithAmountParams, PaidWithExpensifyWithAmountParams, ParentNavigationSummaryParams, PayerOwesAmountParams, PayerOwesParams, PayerPaidAmountParams, PayerPaidParams, PayerSettledParams, PaySomeoneParams, ReimbursementRateParams, RemovedTheRequestParams, RenamedRoomActionParams, ReportArchiveReasonsClosedParams, ReportArchiveReasonsMergedParams, ReportArchiveReasonsPolicyDeletedParams, ReportArchiveReasonsRemovedFromPolicyParams, RequestAmountParams, RequestCountParams, RequestedAmountMessageParams, ResolutionConstraintsParams, RoomNameReservedErrorParams, RoomRenamedToParams, SetTheDistanceParams, SetTheRequestParams, SettledAfterAddedBankAccountParams, SettleExpensifyCardParams, SizeExceededParams, SplitAmountParams, StepCounterParams, TaskCreatedActionParams, TermsParams, ThreadRequestReportNameParams, ThreadSentMoneyReportNameParams, ToValidateLoginParams, TransferParams, UntilTimeParams, UpdatedTheDistanceParams, UpdatedTheRequestParams, UsePlusButtonParams, UserIsAlreadyMemberParams, UserSplitParams, ViolationsAutoReportedRejectedExpenseParams, ViolationsCashExpenseWithNoReceiptParams, ViolationsConversionSurchargeParams, ViolationsInvoiceMarkupParams, ViolationsMaxAgeParams, ViolationsMissingTagParams, ViolationsOverAutoApprovalLimitParams, ViolationsOverCategoryLimitParams, ViolationsOverLimitParams, ViolationsPerDayLimitParams, ViolationsReceiptRequiredParams, ViolationsRterParams, ViolationsTagOutOfPolicyParams, ViolationsTaxOutOfPolicyParams, WaitingOnBankAccountParams, WalletProgramParams, WelcomeEnterMagicCodeParams, WelcomeNoteParams, WelcomeToRoomParams, WeSentYouMagicSignInLinkParams, ZipCodeExampleFormatParams } from './types'; + /* eslint-disable max-len */ export default { @@ -324,6 +225,9 @@ export default { action: 'Acción', expenses: 'Gastos', tax: 'Impuesto', + shared: 'Compartido', + drafts: 'Borradores', + finished: 'Finalizado', }, connectionComplete: { title: 'Conexión Completa', @@ -3604,4 +3508,4 @@ export default { systemMessage: { mergedWithCashTransaction: 'encontró un recibo para esta transacción.', }, -} satisfies EnglishTranslation; +} satisfies EnglishTranslation; \ No newline at end of file diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx index bc36b7bd2d2f..9f1aea7cabd2 100644 --- a/src/pages/Search/SearchPage.tsx +++ b/src/pages/Search/SearchPage.tsx @@ -27,6 +27,18 @@ function SearchPage({route}: SearchPageProps) { const headerContent: {[key in SearchQuery]: {icon: IconAsset; title: string}} = { all: {icon: Illustrations.MoneyReceipts, title: translate('common.expenses')}, + shared: { + icon: Illustrations.Shared, + title: translate('common.shared'), + }, + drafts: { + icon: Illustrations.Drafts, + title: translate('common.drafts'), + }, + finished: { + icon: Illustrations.Finished, + title: translate('common.finished'), + }, }; const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.ALL)); From f870dbeb267ce5ccfe6841382b2d5db6ab33f900 Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 15 May 2024 15:05:49 +0200 Subject: [PATCH 05/12] Format es.ts --- src/languages/es.ts | 107 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 103 insertions(+), 4 deletions(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index ed24993422a4..6a53e58a9b26 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1,8 +1,107 @@ import Str from 'expensify-common/lib/str'; import CONST from '@src/CONST'; -import type { ConnectionName, PolicyConnectionSyncStage } from '@src/types/onyx/Policy'; -import type { AddressLineParams, AdminCanceledRequestParams, AlreadySignedInParams, ApprovedAmountParams, BeginningOfChatHistoryAdminRoomPartOneParams, BeginningOfChatHistoryAnnounceRoomPartOneParams, BeginningOfChatHistoryAnnounceRoomPartTwo, BeginningOfChatHistoryDomainRoomPartOneParams, CanceledRequestParams, CharacterLimitParams, ConfirmThatParams, DateShouldBeAfterParams, DateShouldBeBeforeParams, DeleteActionParams, DeleteConfirmationParams, DidSplitAmountMessageParams, DistanceRateOperationsParams, EditActionParams, ElectronicFundsParams, EnglishTranslation, EnterMagicCodeParams, FormattedMaxLengthParams, GoBackMessageParams, GoToRoomParams, InstantSummaryParams, LocalTimeParams, LoggedInAsParams, LogSizeParams, ManagerApprovedAmountParams, ManagerApprovedParams, NewFaceEnterMagicCodeParams, NoLongerHaveAccessParams, NotAllowedExtensionParams, NotYouParams, OOOEventSummaryFullDayParams, OOOEventSummaryPartialDayParams, OurEmailProviderParams, PaidElsewhereWithAmountParams, PaidWithExpensifyWithAmountParams, ParentNavigationSummaryParams, PayerOwesAmountParams, PayerOwesParams, PayerPaidAmountParams, PayerPaidParams, PayerSettledParams, PaySomeoneParams, ReimbursementRateParams, RemovedTheRequestParams, RenamedRoomActionParams, ReportArchiveReasonsClosedParams, ReportArchiveReasonsMergedParams, ReportArchiveReasonsPolicyDeletedParams, ReportArchiveReasonsRemovedFromPolicyParams, RequestAmountParams, RequestCountParams, RequestedAmountMessageParams, ResolutionConstraintsParams, RoomNameReservedErrorParams, RoomRenamedToParams, SetTheDistanceParams, SetTheRequestParams, SettledAfterAddedBankAccountParams, SettleExpensifyCardParams, SizeExceededParams, SplitAmountParams, StepCounterParams, TaskCreatedActionParams, TermsParams, ThreadRequestReportNameParams, ThreadSentMoneyReportNameParams, ToValidateLoginParams, TransferParams, UntilTimeParams, UpdatedTheDistanceParams, UpdatedTheRequestParams, UsePlusButtonParams, UserIsAlreadyMemberParams, UserSplitParams, ViolationsAutoReportedRejectedExpenseParams, ViolationsCashExpenseWithNoReceiptParams, ViolationsConversionSurchargeParams, ViolationsInvoiceMarkupParams, ViolationsMaxAgeParams, ViolationsMissingTagParams, ViolationsOverAutoApprovalLimitParams, ViolationsOverCategoryLimitParams, ViolationsOverLimitParams, ViolationsPerDayLimitParams, ViolationsReceiptRequiredParams, ViolationsRterParams, ViolationsTagOutOfPolicyParams, ViolationsTaxOutOfPolicyParams, WaitingOnBankAccountParams, WalletProgramParams, WelcomeEnterMagicCodeParams, WelcomeNoteParams, WelcomeToRoomParams, WeSentYouMagicSignInLinkParams, ZipCodeExampleFormatParams } from './types'; - +import type {ConnectionName, PolicyConnectionSyncStage} from '@src/types/onyx/Policy'; +import type { + AddressLineParams, + AdminCanceledRequestParams, + AlreadySignedInParams, + ApprovedAmountParams, + BeginningOfChatHistoryAdminRoomPartOneParams, + BeginningOfChatHistoryAnnounceRoomPartOneParams, + BeginningOfChatHistoryAnnounceRoomPartTwo, + BeginningOfChatHistoryDomainRoomPartOneParams, + CanceledRequestParams, + CharacterLimitParams, + ConfirmThatParams, + DateShouldBeAfterParams, + DateShouldBeBeforeParams, + DeleteActionParams, + DeleteConfirmationParams, + DidSplitAmountMessageParams, + DistanceRateOperationsParams, + EditActionParams, + ElectronicFundsParams, + EnglishTranslation, + EnterMagicCodeParams, + FormattedMaxLengthParams, + GoBackMessageParams, + GoToRoomParams, + InstantSummaryParams, + LocalTimeParams, + LoggedInAsParams, + LogSizeParams, + ManagerApprovedAmountParams, + ManagerApprovedParams, + NewFaceEnterMagicCodeParams, + NoLongerHaveAccessParams, + NotAllowedExtensionParams, + NotYouParams, + OOOEventSummaryFullDayParams, + OOOEventSummaryPartialDayParams, + OurEmailProviderParams, + PaidElsewhereWithAmountParams, + PaidWithExpensifyWithAmountParams, + ParentNavigationSummaryParams, + PayerOwesAmountParams, + PayerOwesParams, + PayerPaidAmountParams, + PayerPaidParams, + PayerSettledParams, + PaySomeoneParams, + ReimbursementRateParams, + RemovedTheRequestParams, + RenamedRoomActionParams, + ReportArchiveReasonsClosedParams, + ReportArchiveReasonsMergedParams, + ReportArchiveReasonsPolicyDeletedParams, + ReportArchiveReasonsRemovedFromPolicyParams, + RequestAmountParams, + RequestCountParams, + RequestedAmountMessageParams, + ResolutionConstraintsParams, + RoomNameReservedErrorParams, + RoomRenamedToParams, + SetTheDistanceParams, + SetTheRequestParams, + SettledAfterAddedBankAccountParams, + SettleExpensifyCardParams, + SizeExceededParams, + SplitAmountParams, + StepCounterParams, + TaskCreatedActionParams, + TermsParams, + ThreadRequestReportNameParams, + ThreadSentMoneyReportNameParams, + ToValidateLoginParams, + TransferParams, + UntilTimeParams, + UpdatedTheDistanceParams, + UpdatedTheRequestParams, + UsePlusButtonParams, + UserIsAlreadyMemberParams, + UserSplitParams, + ViolationsAutoReportedRejectedExpenseParams, + ViolationsCashExpenseWithNoReceiptParams, + ViolationsConversionSurchargeParams, + ViolationsInvoiceMarkupParams, + ViolationsMaxAgeParams, + ViolationsMissingTagParams, + ViolationsOverAutoApprovalLimitParams, + ViolationsOverCategoryLimitParams, + ViolationsOverLimitParams, + ViolationsPerDayLimitParams, + ViolationsReceiptRequiredParams, + ViolationsRterParams, + ViolationsTagOutOfPolicyParams, + ViolationsTaxOutOfPolicyParams, + WaitingOnBankAccountParams, + WalletProgramParams, + WelcomeEnterMagicCodeParams, + WelcomeNoteParams, + WelcomeToRoomParams, + WeSentYouMagicSignInLinkParams, + ZipCodeExampleFormatParams, +} from './types'; /* eslint-disable max-len */ export default { @@ -3508,4 +3607,4 @@ export default { systemMessage: { mergedWithCashTransaction: 'encontró un recibo para esta transacción.', }, -} satisfies EnglishTranslation; \ No newline at end of file +} satisfies EnglishTranslation; From afe0d174b919140dbb4e52ba0e2c6c6c6013f135 Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 15 May 2024 15:27:49 +0200 Subject: [PATCH 06/12] Export illustrations correctly --- .../simple-illustration__checkmark-circle.svg | 20 ++++++ .../simple-illustration__drafts.svg | 48 ------------- .../simple-illustration__finished.svg | 8 --- .../simple-illustration__send-money.svg | 72 +++++++++++++++++++ .../simple-illustration__shared.svg | 42 ----------- src/components/Icon/Illustrations.ts | 10 ++- src/pages/Search/SearchPage.tsx | 15 ++-- 7 files changed, 104 insertions(+), 111 deletions(-) create mode 100644 assets/images/simple-illustrations/simple-illustration__checkmark-circle.svg delete mode 100644 assets/images/simple-illustrations/simple-illustration__drafts.svg delete mode 100644 assets/images/simple-illustrations/simple-illustration__finished.svg create mode 100644 assets/images/simple-illustrations/simple-illustration__send-money.svg delete mode 100644 assets/images/simple-illustrations/simple-illustration__shared.svg diff --git a/assets/images/simple-illustrations/simple-illustration__checkmark-circle.svg b/assets/images/simple-illustrations/simple-illustration__checkmark-circle.svg new file mode 100644 index 000000000000..ba6f817c76fd --- /dev/null +++ b/assets/images/simple-illustrations/simple-illustration__checkmark-circle.svg @@ -0,0 +1,20 @@ + + + + + + + + \ No newline at end of file diff --git a/assets/images/simple-illustrations/simple-illustration__drafts.svg b/assets/images/simple-illustrations/simple-illustration__drafts.svg deleted file mode 100644 index 059e8125058d..000000000000 --- a/assets/images/simple-illustrations/simple-illustration__drafts.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/assets/images/simple-illustrations/simple-illustration__finished.svg b/assets/images/simple-illustrations/simple-illustration__finished.svg deleted file mode 100644 index 4876f5fc4607..000000000000 --- a/assets/images/simple-illustrations/simple-illustration__finished.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/assets/images/simple-illustrations/simple-illustration__send-money.svg b/assets/images/simple-illustrations/simple-illustration__send-money.svg new file mode 100644 index 000000000000..80393e3c30cf --- /dev/null +++ b/assets/images/simple-illustrations/simple-illustration__send-money.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/images/simple-illustrations/simple-illustration__shared.svg b/assets/images/simple-illustrations/simple-illustration__shared.svg deleted file mode 100644 index ae99ce5f90dd..000000000000 --- a/assets/images/simple-illustrations/simple-illustration__shared.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts index fc7f1d067c1c..23a30a2d1eee 100644 --- a/src/components/Icon/Illustrations.ts +++ b/src/components/Icon/Illustrations.ts @@ -40,6 +40,7 @@ import Binoculars from '@assets/images/simple-illustrations/simple-illustration_ import CarIce from '@assets/images/simple-illustrations/simple-illustration__car-ice.svg'; import Car from '@assets/images/simple-illustrations/simple-illustration__car.svg'; import ChatBubbles from '@assets/images/simple-illustrations/simple-illustration__chatbubbles.svg'; +import CheckmarkCircle from '@assets/images/simple-illustrations/simple-illustration__checkmark-circle.svg'; import CoffeeMug from '@assets/images/simple-illustrations/simple-illustration__coffeemug.svg'; import Coins from '@assets/images/simple-illustrations/simple-illustration__coins.svg'; import CommentBubbles from '@assets/images/simple-illustrations/simple-illustration__commentbubbles.svg'; @@ -47,9 +48,7 @@ import CompanyCard from '@assets/images/simple-illustrations/simple-illustration import ConciergeBubble from '@assets/images/simple-illustrations/simple-illustration__concierge-bubble.svg'; import ConciergeNew from '@assets/images/simple-illustrations/simple-illustration__concierge.svg'; import CreditCardsNew from '@assets/images/simple-illustrations/simple-illustration__credit-cards.svg'; -import Drafts from '@assets/images/simple-illustrations/simple-illustration__drafts.svg'; import EmailAddress from '@assets/images/simple-illustrations/simple-illustration__email-address.svg'; -import Finished from '@assets/images/simple-illustrations/simple-illustration__finished.svg'; import FolderOpen from '@assets/images/simple-illustrations/simple-illustration__folder-open.svg'; import Gears from '@assets/images/simple-illustrations/simple-illustration__gears.svg'; import HandCard from '@assets/images/simple-illustrations/simple-illustration__handcard.svg'; @@ -77,7 +76,7 @@ import ReceiptEnvelope from '@assets/images/simple-illustrations/simple-illustra import ReceiptWrangler from '@assets/images/simple-illustrations/simple-illustration__receipt-wrangler.svg'; import ReceiptUpload from '@assets/images/simple-illustrations/simple-illustration__receiptupload.svg'; import SanFrancisco from '@assets/images/simple-illustrations/simple-illustration__sanfrancisco.svg'; -import Shared from '@assets/images/simple-illustrations/simple-illustration__shared.svg'; +import SendMoney from '@assets/images/simple-illustrations/simple-illustration__send-money.svg'; import ShieldYellow from '@assets/images/simple-illustrations/simple-illustration__shield.svg'; import SmallRocket from '@assets/images/simple-illustrations/simple-illustration__smallrocket.svg'; import SplitBill from '@assets/images/simple-illustrations/simple-illustration__splitbill.svg'; @@ -179,7 +178,6 @@ export { Tag, CarIce, Lightbulb, - Shared, - Drafts, - Finished, + SendMoney, + CheckmarkCircle, }; diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx index 9f1aea7cabd2..0506467a4be2 100644 --- a/src/pages/Search/SearchPage.tsx +++ b/src/pages/Search/SearchPage.tsx @@ -1,4 +1,4 @@ -import type {StackScreenProps} from '@react-navigation/stack'; +import type { StackScreenProps } from '@react-navigation/stack'; import React from 'react'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -9,13 +9,14 @@ import useActiveWorkspace from '@hooks/useActiveWorkspace'; import useLocalize from '@hooks/useLocalize'; import useWindowDimensions from '@hooks/useWindowDimensions'; import Navigation from '@libs/Navigation/Navigation'; -import type {CentralPaneNavigatorParamList} from '@libs/Navigation/types'; +import type { CentralPaneNavigatorParamList } from '@libs/Navigation/types'; import CONST from '@src/CONST'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; -import type {SearchQuery} from '@src/types/onyx/SearchResults'; +import type { SearchQuery } from '@src/types/onyx/SearchResults'; import type IconAsset from '@src/types/utils/IconAsset'; + type SearchPageProps = StackScreenProps; function SearchPage({route}: SearchPageProps) { @@ -28,15 +29,15 @@ function SearchPage({route}: SearchPageProps) { const headerContent: {[key in SearchQuery]: {icon: IconAsset; title: string}} = { all: {icon: Illustrations.MoneyReceipts, title: translate('common.expenses')}, shared: { - icon: Illustrations.Shared, + icon: Illustrations.SendMoney, title: translate('common.shared'), }, drafts: { - icon: Illustrations.Drafts, + icon: Illustrations.Pencil, title: translate('common.drafts'), }, finished: { - icon: Illustrations.Finished, + icon: Illustrations.CheckmarkCircle, title: translate('common.finished'), }, }; @@ -75,4 +76,4 @@ function SearchPage({route}: SearchPageProps) { SearchPage.displayName = 'SearchPage'; -export default SearchPage; +export default SearchPage; \ No newline at end of file From 3d5313720ef448926c57871da7c9f319b5dcb9c0 Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 15 May 2024 16:18:55 +0200 Subject: [PATCH 07/12] Fix prettier --- src/pages/Search/SearchPage.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx index 0506467a4be2..e7adf423e390 100644 --- a/src/pages/Search/SearchPage.tsx +++ b/src/pages/Search/SearchPage.tsx @@ -1,4 +1,4 @@ -import type { StackScreenProps } from '@react-navigation/stack'; +import type {StackScreenProps} from '@react-navigation/stack'; import React from 'react'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -9,14 +9,13 @@ import useActiveWorkspace from '@hooks/useActiveWorkspace'; import useLocalize from '@hooks/useLocalize'; import useWindowDimensions from '@hooks/useWindowDimensions'; import Navigation from '@libs/Navigation/Navigation'; -import type { CentralPaneNavigatorParamList } from '@libs/Navigation/types'; +import type {CentralPaneNavigatorParamList} from '@libs/Navigation/types'; import CONST from '@src/CONST'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; -import type { SearchQuery } from '@src/types/onyx/SearchResults'; +import type {SearchQuery} from '@src/types/onyx/SearchResults'; import type IconAsset from '@src/types/utils/IconAsset'; - type SearchPageProps = StackScreenProps; function SearchPage({route}: SearchPageProps) { @@ -76,4 +75,4 @@ function SearchPage({route}: SearchPageProps) { SearchPage.displayName = 'SearchPage'; -export default SearchPage; \ No newline at end of file +export default SearchPage; From 43f4de13a31e3b104e3cdbaa5ddcbcb459d61cab Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Mon, 27 May 2024 10:52:13 +0200 Subject: [PATCH 08/12] Update svg --- assets/images/check-circle.svg | 15 ++++++++++++--- package-lock.json | 13 ------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/assets/images/check-circle.svg b/assets/images/check-circle.svg index 556c943fe576..c13b83cbf281 100644 --- a/assets/images/check-circle.svg +++ b/assets/images/check-circle.svg @@ -1,4 +1,13 @@ - - - + + + + + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 5a5e486ab8ae..2dc47c0d8671 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1852,19 +1852,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-object-assign": { - "version": "7.18.6", - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-transform-object-rest-spread": { "version": "7.24.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz", From b765ea27fd4f118b9452323c8203d14eacc26b9f Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Mon, 27 May 2024 11:03:44 +0200 Subject: [PATCH 09/12] Icon size --- src/pages/Search/SearchFilters.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Search/SearchFilters.tsx b/src/pages/Search/SearchFilters.tsx index c09111a78fc8..6026a4570a91 100644 --- a/src/pages/Search/SearchFilters.tsx +++ b/src/pages/Search/SearchFilters.tsx @@ -80,8 +80,8 @@ function SearchFilters({query}: SearchFiltersProps) { interactive title={item.title} icon={item.icon} - iconWidth={variables.iconSizeLarge} - iconHeight={variables.iconSizeLarge} + iconWidth={variables.iconSizeNormal} + iconHeight={variables.iconSizeNormal} wrapperStyle={styles.sectionMenuItem} focused={index === activeItemIndex} hoverAndPressStyle={styles.hoveredComponentBG} From e77f8e0a4df04ab3e54378addcd1c4ee1b1fe02a Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Tue, 28 May 2024 11:10:38 +0200 Subject: [PATCH 10/12] Restore package-lock.json --- package-lock.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/package-lock.json b/package-lock.json index d5fb4bf71445..71b6a72c0f92 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1855,6 +1855,19 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-object-assign": { + "version": "7.18.6", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-transform-object-rest-spread": { "version": "7.24.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz", From 1292b7d8fe0774726a0e36a6f31cb9537651d90a Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 29 May 2024 10:30:00 +0200 Subject: [PATCH 11/12] format --- src/pages/Search/SearchPage.tsx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx index 197dc73794e4..ec8bc8090b2a 100644 --- a/src/pages/Search/SearchPage.tsx +++ b/src/pages/Search/SearchPage.tsx @@ -28,18 +28,9 @@ function SearchPage({route}: SearchPageProps) { const headerContent: {[key in SearchQuery]: {icon: IconAsset; title: string}} = { all: {icon: Illustrations.MoneyReceipts, title: translate('common.expenses')}, - shared: { - icon: Illustrations.SendMoney, - title: translate('common.shared'), - }, - drafts: { - icon: Illustrations.Pencil, - title: translate('common.drafts'), - }, - finished: { - icon: Illustrations.CheckmarkCircle, - title: translate('common.finished'), - }, + shared: {icon: Illustrations.SendMoney, title: translate('common.shared')}, + drafts: {icon: Illustrations.Pencil, title: translate('common.drafts')}, + finished: {icon: Illustrations.CheckmarkCircle, title: translate('common.finished')}, }; const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.ALL)); From 5be9339b242e0fa40b2de39cad8c34e6e3bbda1f Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 29 May 2024 10:59:37 +0200 Subject: [PATCH 12/12] Update checkmarkcircle.svg and rename images --- .../simple-illustration__checkmark-circle.svg | 20 ------------------ .../simple-illustration__checkmarkcircle.svg | 21 +++++++++++++++++++ ...svg => simple-illustration__sendmoney.svg} | 0 src/components/Icon/Illustrations.ts | 4 ++-- 4 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 assets/images/simple-illustrations/simple-illustration__checkmark-circle.svg create mode 100644 assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg rename assets/images/simple-illustrations/{simple-illustration__send-money.svg => simple-illustration__sendmoney.svg} (100%) diff --git a/assets/images/simple-illustrations/simple-illustration__checkmark-circle.svg b/assets/images/simple-illustrations/simple-illustration__checkmark-circle.svg deleted file mode 100644 index ba6f817c76fd..000000000000 --- a/assets/images/simple-illustrations/simple-illustration__checkmark-circle.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg b/assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg new file mode 100644 index 000000000000..a96a7e5dc0af --- /dev/null +++ b/assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg @@ -0,0 +1,21 @@ + + + + + + + + + \ No newline at end of file diff --git a/assets/images/simple-illustrations/simple-illustration__send-money.svg b/assets/images/simple-illustrations/simple-illustration__sendmoney.svg similarity index 100% rename from assets/images/simple-illustrations/simple-illustration__send-money.svg rename to assets/images/simple-illustrations/simple-illustration__sendmoney.svg diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts index 23a30a2d1eee..e59d73aee192 100644 --- a/src/components/Icon/Illustrations.ts +++ b/src/components/Icon/Illustrations.ts @@ -40,7 +40,7 @@ import Binoculars from '@assets/images/simple-illustrations/simple-illustration_ import CarIce from '@assets/images/simple-illustrations/simple-illustration__car-ice.svg'; import Car from '@assets/images/simple-illustrations/simple-illustration__car.svg'; import ChatBubbles from '@assets/images/simple-illustrations/simple-illustration__chatbubbles.svg'; -import CheckmarkCircle from '@assets/images/simple-illustrations/simple-illustration__checkmark-circle.svg'; +import CheckmarkCircle from '@assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg'; import CoffeeMug from '@assets/images/simple-illustrations/simple-illustration__coffeemug.svg'; import Coins from '@assets/images/simple-illustrations/simple-illustration__coins.svg'; import CommentBubbles from '@assets/images/simple-illustrations/simple-illustration__commentbubbles.svg'; @@ -76,7 +76,7 @@ import ReceiptEnvelope from '@assets/images/simple-illustrations/simple-illustra import ReceiptWrangler from '@assets/images/simple-illustrations/simple-illustration__receipt-wrangler.svg'; import ReceiptUpload from '@assets/images/simple-illustrations/simple-illustration__receiptupload.svg'; import SanFrancisco from '@assets/images/simple-illustrations/simple-illustration__sanfrancisco.svg'; -import SendMoney from '@assets/images/simple-illustrations/simple-illustration__send-money.svg'; +import SendMoney from '@assets/images/simple-illustrations/simple-illustration__sendmoney.svg'; import ShieldYellow from '@assets/images/simple-illustrations/simple-illustration__shield.svg'; import SmallRocket from '@assets/images/simple-illustrations/simple-illustration__smallrocket.svg'; import SplitBill from '@assets/images/simple-illustrations/simple-illustration__splitbill.svg';