Skip to content

Commit 757c2c8

Browse files
Merge branch 'main' into fix/64253-approver-cannot-move-expense
2 parents d8f590c + 028bd0f commit 757c2c8

139 files changed

Lines changed: 2484 additions & 1701 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 1009018901
118-
versionName "9.1.89-1"
117+
versionCode 1009018915
118+
versionName "9.1.89-15"
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"

desktop/package-lock.json

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

desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"electron-context-menu": "^2.3.0",
88
"electron-log": "^4.4.8",
9-
"electron-updater": "^6.6.5",
9+
"electron-updater": "^6.6.6",
1010
"mime-types": "^2.1.35",
1111
"node-machine-id": "^1.1.12"
1212
},

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.89.1</string>
47+
<string>9.1.89.15</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.89</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.89.1</string>
16+
<string>9.1.89.15</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.89</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.89.1</string>
16+
<string>9.1.89.15</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.1.89-1",
3+
"version": "9.1.89-15",
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=314 --cache --cache-location=node_modules/.cache/eslint",
49+
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=312 --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",
@@ -179,7 +179,7 @@
179179
"react-native-modal": "^13.0.0",
180180
"react-native-nitro-modules": "0.26.2",
181181
"react-native-nitro-sqlite": "9.1.10",
182-
"react-native-onyx": "2.0.130",
182+
"react-native-onyx": "2.0.127",
183183
"react-native-pager-view": "6.5.3",
184184
"react-native-pdf": "6.7.3",
185185
"react-native-performance": "^5.1.4",

src/CONST/index.ts

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,8 @@ const CONST = {
326326
OLD_DEFAULT_AVATAR_COUNT: 8,
327327

328328
DISPLAY_NAME: {
329-
MAX_LENGTH: 50,
329+
// This value is consistent with the BE display name max length limit.
330+
MAX_LENGTH: 100,
330331
RESERVED_NAMES: ['Expensify', 'Concierge'],
331332
EXPENSIFY_CONCIERGE: 'Expensify Concierge',
332333
},
@@ -343,6 +344,10 @@ const CONST = {
343344
MAX_LENGTH: 40,
344345
},
345346

347+
NAME: {
348+
MAX_LENGTH: 50,
349+
},
350+
346351
REPORT_DESCRIPTION: {
347352
MAX_LENGTH: 1000,
348353
},
@@ -1053,7 +1058,6 @@ const CONST = {
10531058
SHUTTER_SIZE: 90,
10541059
MAX_REPORT_PREVIEW_RECEIPTS: 3,
10551060
},
1056-
RECEIPT_PREVIEW_TOP_BOTTOM_MARGIN: 120,
10571061
REPORT: {
10581062
ROLE: {
10591063
ADMIN: 'admin',
@@ -1426,11 +1430,17 @@ const CONST = {
14261430
EXPORT_TO_INTEGRATION: 'exportToIntegration',
14271431
MARK_AS_EXPORTED: 'markAsExported',
14281432
DOWNLOAD_CSV: 'downloadCSV',
1433+
REPORT_LEVEL_EXPORT: 'report_level_export',
1434+
EXPENSE_LEVEL_EXPORT: 'detailed_export',
14291435
},
14301436
ROOM_MEMBERS_BULK_ACTION_TYPES: {
14311437
REMOVE: 'remove',
14321438
},
14331439
},
1440+
EXPORT_TEMPLATE_TYPES: {
1441+
INTEGRATIONS: 'integrations',
1442+
IN_APP: 'in-app',
1443+
},
14341444
NEXT_STEP: {
14351445
ICONS: {
14361446
HOURGLASS: 'hourglass',
@@ -1528,8 +1538,6 @@ const CONST = {
15281538
SEARCH_MOST_RECENT_OPTIONS: 'search_most_recent_options',
15291539
DEBOUNCE_HANDLE_SEARCH: 'debounce_handle_search',
15301540
FAST_SEARCH_TREE_CREATION: 'fast_search_tree_creation',
1531-
SHOW_HOVER_PREVIEW_DELAY: 270,
1532-
SHOW_HOVER_PREVIEW_ANIMATION_DURATION: 200,
15331541
},
15341542
PRIORITY_MODE: {
15351543
GSD: 'gsd',
@@ -3283,9 +3291,9 @@ const CONST = {
32833291
ALLOW: 'personal',
32843292
},
32853293
STATEMENT_CLOSE_DATE: {
3286-
LAST_DAY_OF_MONTH: 'lastDayOfMonth',
3287-
LAST_BUSINESS_DAY_OF_MONTH: 'lastBusinessDayOfMonth',
3288-
CUSTOM_DAY_OF_MONTH: 'customDayOfMonth',
3294+
LAST_DAY_OF_MONTH: 'LAST_DAY_OF_MONTH',
3295+
LAST_BUSINESS_DAY_OF_MONTH: 'LAST_BUSINESS_DAY_OF_MONTH',
3296+
CUSTOM_DAY_OF_MONTH: 'CUSTOM_DAY_OF_MONTH',
32893297
},
32903298
CARD_LIST_THRESHOLD: 8,
32913299
DEFAULT_EXPORT_TYPE: 'default',
@@ -3489,10 +3497,6 @@ const CONST = {
34893497
EMOJIS: /[\p{Extended_Pictographic}\uE000-\uF8FF\u{F0000}-\u{FFFFD}\u{100000}-\u{10FFFD}](\u200D[\p{Extended_Pictographic}\uE000-\uF8FF\u{F0000}-\u{FFFFD}\u{100000}-\u{10FFFD}]|[\u{1F3FB}-\u{1F3FF}]|[\u{E0020}-\u{E007F}]|\uFE0F|\u20E3)*|[\u{1F1E6}-\u{1F1FF}]{2}|[#*0-9]\uFE0F?\u20E3/du,
34903498
// eslint-disable-next-line max-len, no-misleading-character-class
34913499
EMOJI_SKIN_TONES: /[\u{1f3fb}-\u{1f3ff}]/gu,
3492-
/** Regex to match emojis that are not wrapped in `<emoji>` tags */
3493-
get UNWRAPPED_EMOJI() {
3494-
return new RegExp(`(?:(?!<emoji[^>]*>))(${this.EMOJIS.source})(?:(?!</emoji[^>]*>))`, 'gu');
3495-
},
34963500

34973501
PRIVATE_USER_AREA: /[\uE000-\uF8FF\u{F0000}-\u{FFFFD}\u{100000}-\u{10FFFD}]/u,
34983502

@@ -6451,14 +6455,6 @@ const CONST = {
64516455
LAST_MONTH: 'last-month',
64526456
LAST_STATEMENT: 'last-statement',
64536457
},
6454-
get FILTER_DATE_PRESETS() {
6455-
return {
6456-
// s77rt remove DEV lock
6457-
[this.SYNTAX_FILTER_KEYS.POSTED]:
6458-
(Config?.ENVIRONMENT ?? 'development') === 'development' ? [this.DATE_PRESETS.LAST_STATEMENT, this.DATE_PRESETS.LAST_MONTH] : [this.DATE_PRESETS.LAST_MONTH],
6459-
[this.SYNTAX_FILTER_KEYS.EXPORTED]: [this.DATE_PRESETS.NEVER],
6460-
};
6461-
},
64626458
SNAPSHOT_ONYX_KEYS: [
64636459
ONYXKEYS.COLLECTION.REPORT,
64646460
ONYXKEYS.COLLECTION.POLICY,

0 commit comments

Comments
 (0)