Skip to content

Commit 9324205

Browse files
thelullabyythelullabyy
committed
Merge branch 'main' into fix/64565
2 parents 7152062 + 69d1f32 commit 9324205

103 files changed

Lines changed: 804 additions & 2058 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
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009019001
118-
versionName "9.1.90-1"
117+
versionCode 1009019004
118+
versionName "9.1.90-4"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

‎ios/NewExpensify/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.1.90.1</string>
47+
<string>9.1.90.4</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

‎ios/NotificationServiceExtension/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.90</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.90.1</string>
16+
<string>9.1.90.4</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎ios/ShareViewController/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.90</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.90.1</string>
16+
<string>9.1.90.4</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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.1.90-1",
3+
"version": "9.1.90-4",
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.",
@@ -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=310 --cache --cache-location=node_modules/.cache/eslint",
49+
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=299 --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/ONYXKEYS.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -834,8 +834,8 @@ const ONYXKEYS = {
834834
SEARCH_SAVED_SEARCH_RENAME_FORM_DRAFT: 'searchSavedSearchRenameFormDraft',
835835
TEXT_PICKER_MODAL_FORM: 'textPickerModalForm',
836836
TEXT_PICKER_MODAL_FORM_DRAFT: 'textPickerModalFormDraft',
837-
RULES_CUSTOM_NAME_MODAL_FORM: 'rulesCustomNameModalForm',
838-
RULES_CUSTOM_NAME_MODAL_FORM_DRAFT: 'rulesCustomNameModalFormDraft',
837+
REPORTS_DEFAULT_TITLE_MODAL_FORM: 'ReportsDefaultTitleModalForm',
838+
REPORTS_DEFAULT_TITLE_MODAL_FORM_DRAFT: 'ReportsDefaultTitleModalFormDraft',
839839
RULES_AUTO_APPROVE_REPORTS_UNDER_MODAL_FORM: 'rulesAutoApproveReportsUnderModalForm',
840840
RULES_AUTO_APPROVE_REPORTS_UNDER_MODAL_FORM_DRAFT: 'rulesAutoApproveReportsUnderModalFormDraft',
841841
RULES_RANDOM_REPORT_AUDIT_MODAL_FORM: 'rulesRandomReportAuditModalForm',
@@ -954,7 +954,7 @@ type OnyxFormValuesMapping = {
954954
[ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM]: FormTypes.SageIntacctDimensionForm;
955955
[ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM]: FormTypes.SearchAdvancedFiltersForm;
956956
[ONYXKEYS.FORMS.TEXT_PICKER_MODAL_FORM]: FormTypes.TextPickerModalForm;
957-
[ONYXKEYS.FORMS.RULES_CUSTOM_NAME_MODAL_FORM]: FormTypes.RulesCustomNameModalForm;
957+
[ONYXKEYS.FORMS.REPORTS_DEFAULT_TITLE_MODAL_FORM]: FormTypes.ReportsDefaultTitleModalForm;
958958
[ONYXKEYS.FORMS.RULES_AUTO_APPROVE_REPORTS_UNDER_MODAL_FORM]: FormTypes.RulesAutoApproveReportsUnderModalForm;
959959
[ONYXKEYS.FORMS.RULES_RANDOM_REPORT_AUDIT_MODAL_FORM]: FormTypes.RulesRandomReportAuditModalForm;
960960
[ONYXKEYS.FORMS.RULES_AUTO_PAY_REPORTS_UNDER_MODAL_FORM]: FormTypes.RulesAutoPayReportsUnderModalForm;

‎src/ROUTES.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,43 +1630,43 @@ const ROUTES = {
16301630
route: 'workspaces/:policyID/tax/:taxID/tax-code',
16311631
getRoute: (policyID: string, taxID: string) => `workspaces/${policyID}/tax/${encodeURIComponent(taxID)}/tax-code` as const,
16321632
},
1633-
WORKSPACE_REPORT_FIELDS: {
1634-
route: 'workspaces/:policyID/reportFields',
1633+
WORKSPACE_REPORTS: {
1634+
route: 'workspaces/:policyID/reports',
16351635
getRoute: (policyID: string | undefined) => {
16361636
if (!policyID) {
1637-
Log.warn('Invalid policyID is used to build the WORKSPACE_REPORT_FIELDS route');
1637+
Log.warn('Invalid policyID is used to build the WORKSPACE_REPORTS route');
16381638
}
1639-
return `workspaces/${policyID}/reportFields` as const;
1639+
return `workspaces/${policyID}/reports` as const;
16401640
},
16411641
},
16421642
WORKSPACE_CREATE_REPORT_FIELD: {
1643-
route: 'workspaces/:policyID/reportFields/new',
1644-
getRoute: (policyID: string) => `workspaces/${policyID}/reportFields/new` as const,
1643+
route: 'workspaces/:policyID/reports/newReportField',
1644+
getRoute: (policyID: string) => `workspaces/${policyID}/reports/newReportField` as const,
16451645
},
16461646
WORKSPACE_REPORT_FIELDS_SETTINGS: {
1647-
route: 'workspaces/:policyID/reportFields/:reportFieldID/edit',
1648-
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reportFields/${encodeURIComponent(reportFieldID)}/edit` as const,
1647+
route: 'workspaces/:policyID/reports/:reportFieldID/edit',
1648+
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reports/${encodeURIComponent(reportFieldID)}/edit` as const,
16491649
},
16501650
WORKSPACE_REPORT_FIELDS_LIST_VALUES: {
1651-
route: 'workspaces/:policyID/reportFields/listValues/:reportFieldID?',
1652-
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reportFields/listValues/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
1651+
route: 'workspaces/:policyID/reports/listValues/:reportFieldID?',
1652+
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reports/listValues/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
16531653
},
16541654
WORKSPACE_REPORT_FIELDS_ADD_VALUE: {
1655-
route: 'workspaces/:policyID/reportFields/addValue/:reportFieldID?',
1656-
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reportFields/addValue/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
1655+
route: 'workspaces/:policyID/reports/addValue/:reportFieldID?',
1656+
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reports/addValue/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
16571657
},
16581658
WORKSPACE_REPORT_FIELDS_VALUE_SETTINGS: {
1659-
route: 'workspaces/:policyID/reportFields/:valueIndex/:reportFieldID?',
1659+
route: 'workspaces/:policyID/reports/:valueIndex/:reportFieldID?',
16601660
getRoute: (policyID: string, valueIndex: number, reportFieldID?: string) =>
1661-
`workspaces/${policyID}/reportFields/${valueIndex}/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
1661+
`workspaces/${policyID}/reports/${valueIndex}/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
16621662
},
16631663
WORKSPACE_REPORT_FIELDS_EDIT_VALUE: {
1664-
route: 'workspaces/:policyID/reportFields/new/:valueIndex/edit',
1665-
getRoute: (policyID: string, valueIndex: number) => `workspaces/${policyID}/reportFields/new/${valueIndex}/edit` as const,
1664+
route: 'workspaces/:policyID/reports/newReportField/:valueIndex/edit',
1665+
getRoute: (policyID: string, valueIndex: number) => `workspaces/${policyID}/reports/newReportField/${valueIndex}/edit` as const,
16661666
},
16671667
WORKSPACE_EDIT_REPORT_FIELDS_INITIAL_VALUE: {
1668-
route: 'workspaces/:policyID/reportFields/:reportFieldID/edit/initialValue',
1669-
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reportFields/${encodeURIComponent(reportFieldID)}/edit/initialValue` as const,
1668+
route: 'workspaces/:policyID/reports/:reportFieldID/edit/initialValue',
1669+
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reports/${encodeURIComponent(reportFieldID)}/edit/initialValue` as const,
16701670
},
16711671
WORKSPACE_COMPANY_CARDS: {
16721672
route: 'workspaces/:policyID/company-cards',
@@ -1884,9 +1884,9 @@ const ROUTES = {
18841884
route: 'workspaces/:policyID/per-diem/edit/currency/:rateID/:subRateID',
18851885
getRoute: (policyID: string, rateID: string, subRateID: string) => `workspaces/${policyID}/per-diem/edit/currency/${rateID}/${subRateID}` as const,
18861886
},
1887-
RULES_CUSTOM_NAME: {
1888-
route: 'workspaces/:policyID/rules/name',
1889-
getRoute: (policyID: string) => `workspaces/${policyID}/rules/name` as const,
1887+
REPORTS_DEFAULT_TITLE: {
1888+
route: 'workspaces/:policyID/reports/name',
1889+
getRoute: (policyID: string) => `workspaces/${policyID}/reports/name` as const,
18901890
},
18911891
RULES_AUTO_APPROVE_REPORTS_UNDER: {
18921892
route: 'workspaces/:policyID/rules/auto-approve',

0 commit comments

Comments
 (0)