Skip to content

Commit 329632b

Browse files
Merge branch 'main' into refactor-onyx-19
2 parents eeac905 + 2238175 commit 329632b

82 files changed

Lines changed: 746 additions & 490 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 1009018906
118+
versionName "9.1.89-6"
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.6</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.6</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.6</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: 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.89-1",
3+
"version": "9.1.89-6",
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.",
@@ -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: 9 additions & 4 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
},
@@ -3283,9 +3288,9 @@ const CONST = {
32833288
ALLOW: 'personal',
32843289
},
32853290
STATEMENT_CLOSE_DATE: {
3286-
LAST_DAY_OF_MONTH: 'lastDayOfMonth',
3287-
LAST_BUSINESS_DAY_OF_MONTH: 'lastBusinessDayOfMonth',
3288-
CUSTOM_DAY_OF_MONTH: 'customDayOfMonth',
3291+
LAST_DAY_OF_MONTH: 'LAST_DAY_OF_MONTH',
3292+
LAST_BUSINESS_DAY_OF_MONTH: 'LAST_BUSINESS_DAY_OF_MONTH',
3293+
CUSTOM_DAY_OF_MONTH: 'CUSTOM_DAY_OF_MONTH',
32893294
},
32903295
CARD_LIST_THRESHOLD: 8,
32913296
DEFAULT_EXPORT_TYPE: 'default',

0 commit comments

Comments
 (0)