Skip to content

Commit 5c7bfff

Browse files
LukasModLukasMod
committed
Merge branch 'main' of github.com:Expensify/App into perf/decompose-and-context-menu-anchor-ref
2 parents be97933 + 18678ea commit 5c7bfff

335 files changed

Lines changed: 1664 additions & 1950 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Mobile-Expensify‎

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009037303
115-
versionName "9.3.73-3"
114+
versionCode 1009037400
115+
versionName "9.3.74-0"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

‎config/eslint/eslint.seatbelt.tsv‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@
224224
"../../src/hooks/useNativeCamera.ts" "react-hooks/refs" 1
225225
"../../src/hooks/useNewTransactions.ts" "react-hooks/refs" 2
226226
"../../src/hooks/useOutstandingBalanceGuard.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
227-
"../../src/hooks/usePaginatedReportActions.ts" "react-hooks/refs" 1
228227
"../../src/hooks/usePaymentOptions.ts" "react-hooks/refs" 1
229228
"../../src/hooks/usePrevious.ts" "react-hooks/refs" 1
230229
"../../src/hooks/useProactiveAppReview.ts" "react-hooks/purity" 1

‎ios/NewExpensify/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>CFBundlePackageType</key>
2424
<string>APPL</string>
2525
<key>CFBundleShortVersionString</key>
26-
<string>9.3.73</string>
26+
<string>9.3.74</string>
2727
<key>CFBundleSignature</key>
2828
<string>????</string>
2929
<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.3.73.3</string>
47+
<string>9.3.74.0</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

‎ios/NotificationServiceExtension/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.3.73</string>
14+
<string>9.3.74</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.73.3</string>
16+
<string>9.3.74.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎ios/ShareViewController/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.3.73</string>
14+
<string>9.3.74</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.73.3</string>
16+
<string>9.3.74.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.3.73-3",
3+
"version": "9.3.74-0",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

‎src/ROUTES.ts‎

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const DYNAMIC_ROUTES = {
101101
},
102102
EXPENSE_LIMIT_TYPE_SELECTOR: {
103103
path: 'expense-limit-type',
104-
entryScreens: [SCREENS.WORKSPACE.CATEGORY_FLAG_AMOUNTS_OVER],
104+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_FLAG_AMOUNTS_OVER],
105105
},
106106
REPORT_SETTINGS_NAME: {
107107
path: 'settings/name',
@@ -330,6 +330,51 @@ const DYNAMIC_ROUTES = {
330330
path: 'category-edit',
331331
entryScreens: [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
332332
},
333+
WORKSPACE_CATEGORY_SETTINGS: {
334+
path: 'category/:categoryName',
335+
entryScreens: [SCREENS.WORKSPACE.CATEGORIES],
336+
getRoute: (categoryName: string) => `category/${encodeURIComponent(categoryName)}` as const,
337+
},
338+
WORKSPACE_CATEGORY_EDIT: {
339+
path: 'edit',
340+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS],
341+
},
342+
WORKSPACE_CATEGORY_PAYROLL_CODE: {
343+
path: 'payroll-code',
344+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS],
345+
},
346+
WORKSPACE_CATEGORY_GL_CODE: {
347+
path: 'gl-code',
348+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS],
349+
},
350+
WORKSPACE_CATEGORY_DEFAULT_TAX_RATE: {
351+
path: 'tax-rate',
352+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
353+
},
354+
WORKSPACE_CATEGORY_FLAG_AMOUNTS_OVER: {
355+
path: 'flag-amounts',
356+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
357+
},
358+
WORKSPACE_CATEGORY_DESCRIPTION_HINT: {
359+
path: 'description-hint',
360+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
361+
},
362+
WORKSPACE_CATEGORY_REQUIRED_FIELDS: {
363+
path: 'required-fields',
364+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
365+
},
366+
WORKSPACE_CATEGORY_APPROVER: {
367+
path: 'approver',
368+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
369+
},
370+
WORKSPACE_CATEGORY_REQUIRE_RECEIPTS_OVER: {
371+
path: 'require-receipts-over',
372+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
373+
},
374+
WORKSPACE_CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER: {
375+
path: 'require-itemized-receipts-over',
376+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
377+
},
333378
NOTIFICATION_PREFERENCES: {
334379
path: 'notification-preferences',
335380
entryScreens: [SCREENS.REPORT_SETTINGS.ROOT, SCREENS.PROFILE_ROOT],
@@ -2404,10 +2449,6 @@ const ROUTES = {
24042449
return `workspaces/${policyID}/categories` as const;
24052450
},
24062451
},
2407-
WORKSPACE_CATEGORY_SETTINGS: {
2408-
route: 'workspaces/:policyID/category/:categoryName',
2409-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}` as const,
2410-
},
24112452
WORKSPACE_UPGRADE: {
24122453
route: 'workspaces/:policyID?/upgrade/:featureName?',
24132454
getRoute: (policyID?: string, featureName?: string, backTo?: string) =>
@@ -2426,46 +2467,6 @@ const ROUTES = {
24262467
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
24272468
getRoute: (backTo?: string) => getUrlWithBackToParam(`workspaces/pay-and-downgrade` as const, backTo),
24282469
},
2429-
WORKSPACE_CATEGORY_EDIT: {
2430-
route: 'workspaces/:policyID/category/:categoryName/edit',
2431-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/edit` as const,
2432-
},
2433-
WORKSPACE_CATEGORY_PAYROLL_CODE: {
2434-
route: 'workspaces/:policyID/category/:categoryName/payroll-code',
2435-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/payroll-code` as const,
2436-
},
2437-
WORKSPACE_CATEGORY_GL_CODE: {
2438-
route: 'workspaces/:policyID/category/:categoryName/gl-code',
2439-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/gl-code` as const,
2440-
},
2441-
WORKSPACE_CATEGORY_DEFAULT_TAX_RATE: {
2442-
route: 'workspaces/:policyID/category/:categoryName/tax-rate',
2443-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/tax-rate` as const,
2444-
},
2445-
WORKSPACE_CATEGORY_FLAG_AMOUNTS_OVER: {
2446-
route: 'workspaces/:policyID/category/:categoryName/flag-amounts',
2447-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/flag-amounts` as const,
2448-
},
2449-
WORKSPACE_CATEGORY_DESCRIPTION_HINT: {
2450-
route: 'workspaces/:policyID/category/:categoryName/description-hint',
2451-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/description-hint` as const,
2452-
},
2453-
WORKSPACE_CATEGORY_REQUIRE_RECEIPTS_OVER: {
2454-
route: 'workspaces/:policyID/category/:categoryName/require-receipts-over',
2455-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/require-receipts-over` as const,
2456-
},
2457-
WORKSPACE_CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER: {
2458-
route: 'workspaces/:policyID/category/:categoryName/require-itemized-receipts-over',
2459-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/require-itemized-receipts-over` as const,
2460-
},
2461-
WORKSPACE_CATEGORY_REQUIRED_FIELDS: {
2462-
route: 'workspaces/:policyID/category/:categoryName/required-fields',
2463-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/required-fields` as const,
2464-
},
2465-
WORKSPACE_CATEGORY_APPROVER: {
2466-
route: 'workspaces/:policyID/category/:categoryName/approver',
2467-
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/approver` as const,
2468-
},
24692470
WORKSPACE_MORE_FEATURES: {
24702471
route: 'workspaces/:policyID/more-features',
24712472
getRoute: (policyID: string | undefined) => {

‎src/SCREENS.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -794,18 +794,18 @@ const SCREENS = {
794794
CLIENT_ID: 'Workspace_Overview_Client_ID',
795795
CATEGORY_CREATE: 'Category_Create',
796796
DYNAMIC_CATEGORY_CREATE: 'Dynamic_Category_Create',
797-
CATEGORY_EDIT: 'Category_Edit',
798-
CATEGORY_PAYROLL_CODE: 'Category_Payroll_Code',
799-
CATEGORY_GL_CODE: 'Category_GL_Code',
800-
CATEGORY_SETTINGS: 'Category_Settings',
801-
CATEGORY_DEFAULT_TAX_RATE: 'Category_Default_Tax_Rate',
802-
CATEGORY_FLAG_AMOUNTS_OVER: 'Category_Flag_Amounts_Over',
797+
DYNAMIC_CATEGORY_EDIT: 'Dynamic_Category_Edit',
798+
DYNAMIC_CATEGORY_PAYROLL_CODE: 'Dynamic_Category_Payroll_Code',
799+
DYNAMIC_CATEGORY_GL_CODE: 'Dynamic_Category_GL_Code',
800+
DYNAMIC_CATEGORY_SETTINGS: 'Dynamic_Category_Settings',
801+
DYNAMIC_CATEGORY_DEFAULT_TAX_RATE: 'Dynamic_Category_Default_Tax_Rate',
802+
DYNAMIC_CATEGORY_FLAG_AMOUNTS_OVER: 'Dynamic_Category_Flag_Amounts_Over',
803803
DYNAMIC_EXPENSE_LIMIT_TYPE_SELECTOR: 'Dynamic_Expense_Limit_Type_Selector',
804-
CATEGORY_DESCRIPTION_HINT: 'Category_Description_Hint',
805-
CATEGORY_APPROVER: 'Category_Approver',
806-
CATEGORY_REQUIRE_RECEIPTS_OVER: 'Category_Require_Receipts_Over',
807-
CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER: 'Category_Require_Itemized_Receipts_Over',
808-
CATEGORY_REQUIRED_FIELDS: 'Category_Required_Fields',
804+
DYNAMIC_CATEGORY_DESCRIPTION_HINT: 'Dynamic_Category_Description_Hint',
805+
DYNAMIC_CATEGORY_APPROVER: 'Dynamic_Category_Approver',
806+
DYNAMIC_CATEGORY_REQUIRE_RECEIPTS_OVER: 'Dynamic_Category_Require_Receipts_Over',
807+
DYNAMIC_CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER: 'Dynamic_Category_Require_Itemized_Receipts_Over',
808+
DYNAMIC_CATEGORY_REQUIRED_FIELDS: 'Dynamic_Category_Required_Fields',
809809
CATEGORIES_SETTINGS: 'Categories_Settings',
810810
DYNAMIC_CATEGORIES_SETTINGS: 'Dynamic_Categories_Settings',
811811
DYNAMIC_CATEGORIES_IMPORT: 'Dynamic_Categories_Import',

0 commit comments

Comments
 (0)