Skip to content

Commit 7a5bd8d

Browse files
committed
Merge branch 'main' into remove-onyx-connect-in-category
2 parents c6b5059 + 91b52b0 commit 7a5bd8d

23 files changed

Lines changed: 76 additions & 1485 deletions

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"test:debug": "TZ=utc NODE_OPTIONS='--inspect-brk --experimental-vm-modules' jest --runInBand",
4747
"perf-test": "NODE_OPTIONS=--experimental-vm-modules npx reassure",
4848
"typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
49-
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=309 --cache --cache-location=node_modules/.cache/eslint",
49+
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=301 --cache --cache-location=node_modules/.cache/eslint",
5050
"lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 ./scripts/lintChanged.sh",
5151
"lint-watch": "npx eslint-watch --watch --changed",
5252
"shellcheck": "./scripts/shellCheck.sh",

src/CONST/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,9 +1527,6 @@ const CONST = {
15271527
SEARCH_OPTION_LIST_DEBOUNCE_TIME: 300,
15281528
RESIZE_DEBOUNCE_TIME: 100,
15291529
UNREAD_UPDATE_DEBOUNCE_TIME: 300,
1530-
SEARCH_CONVERT_SEARCH_VALUES: 'search_convert_search_values',
1531-
SEARCH_MAKE_TREE: 'search_make_tree',
1532-
SEARCH_BUILD_TREE: 'search_build_tree',
15331530
SEARCH_FILTER_OPTIONS: 'search_filter_options',
15341531
USE_DEBOUNCED_STATE_DELAY: 300,
15351532
LIST_SCROLLING_DEBOUNCE_TIME: 200,
@@ -1538,10 +1535,8 @@ const CONST = {
15381535
PLAY_SOUND_MESSAGE_DEBOUNCE_TIME: 500,
15391536
NOTIFY_NEW_ACTION_DELAY: 700,
15401537
SKELETON_ANIMATION_SPEED: 3,
1541-
SEARCH_OPTIONS_COMPARISON: 'search_options_comparison',
15421538
SEARCH_MOST_RECENT_OPTIONS: 'search_most_recent_options',
15431539
DEBOUNCE_HANDLE_SEARCH: 'debounce_handle_search',
1544-
FAST_SEARCH_TREE_CREATION: 'fast_search_tree_creation',
15451540
},
15461541
PRIORITY_MODE: {
15471542
GSD: 'gsd',

src/SCREENS.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,6 @@ const SCREENS = {
225225
SCHEDULE_CALL: 'ScheduleCall',
226226
},
227227
PUBLIC_CONSOLE_DEBUG: 'Console_Debug',
228-
ONBOARDING_MODAL: {
229-
ONBOARDING: 'Onboarding',
230-
},
231228
SIGN_IN_WITH_APPLE_DESKTOP: 'AppleSignInDesktop',
232229
SIGN_IN_WITH_GOOGLE_DESKTOP: 'GoogleSignInDesktop',
233230
DESKTOP_SIGN_IN_REDIRECT: 'DesktopSignInRedirect',

src/components/OptionListContextProvider.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ function OptionsListContextProvider({children}: OptionsListProviderProps) {
5454
const personalDetails = usePersonalDetails();
5555
const prevPersonalDetails = usePrevious(personalDetails);
5656
const hasInitialData = useMemo(() => Object.keys(personalDetails ?? {}).length > 0, [personalDetails]);
57+
const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {canBeMissing: true});
5758

5859
const loadOptions = useCallback(() => {
5960
const optionLists = createOptionList(personalDetails, reports, reportAttributes?.reports);
@@ -160,7 +161,7 @@ function OptionsListContextProvider({children}: OptionsListProviderProps) {
160161
reports: Array.from(updatedReportsMap.values()),
161162
};
162163
});
163-
}, [changedReportActions, personalDetails, reportAttributes?.reports]);
164+
}, [changedReportActions, personalDetails, reportAttributes?.reports, transactions]);
164165

165166
/**
166167
* This effect is used to update the options list when personal details change.

src/components/ReportActionItem/MoneyRequestView.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ function MoneyRequestView({allReports, report, policy, shouldShowAnimatedBackgro
196196
const taxRatesDescription = taxRates?.name;
197197
const taxRateTitle = updatedTransaction ? getTaxName(policy, updatedTransaction) : getTaxName(policy, transaction);
198198

199+
const fallbackTaxRateTitle = transaction?.taxValue;
200+
199201
const isSettled = isSettledReportUtils(moneyRequestReport?.reportID);
200202
const isCancelled = moneyRequestReport && moneyRequestReport?.isCancelledIOU;
201203
const isChatReportArchived = useReportIsArchived(moneyRequestReport?.chatReportID);
@@ -776,7 +778,7 @@ function MoneyRequestView({allReports, report, policy, shouldShowAnimatedBackgro
776778
{shouldShowTax && (
777779
<OfflineWithFeedback pendingAction={getPendingFieldAction('taxCode')}>
778780
<MenuItemWithTopDescription
779-
title={taxRateTitle ?? ''}
781+
title={taxRateTitle ?? fallbackTaxRateTitle}
780782
description={taxRatesDescription}
781783
interactive={canEditTaxFields}
782784
shouldShowRightIcon={canEditTaxFields}

src/hooks/useFastSearchFromOptions.ts

Lines changed: 0 additions & 287 deletions
This file was deleted.

src/libs/DebugUtils.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,7 @@ function validateTransactionDraftProperty(key: keyof Transaction, value: string)
943943
case 'bank':
944944
case 'cardName':
945945
case 'cardNumber':
946+
case 'taxValue':
946947
return validateString(value);
947948
case 'created':
948949
case 'modifiedCreated':
@@ -1080,6 +1081,7 @@ function validateTransactionDraftProperty(key: keyof Transaction, value: string)
10801081
accountant: CONST.RED_BRICK_ROAD_PENDING_ACTION,
10811082
splitExpenses: CONST.RED_BRICK_ROAD_PENDING_ACTION,
10821083
isDemoTransaction: CONST.RED_BRICK_ROAD_PENDING_ACTION,
1084+
taxValue: CONST.RED_BRICK_ROAD_PENDING_ACTION,
10831085
},
10841086
'string',
10851087
);

0 commit comments

Comments
 (0)