Skip to content

Commit 6c2c95a

Browse files
committed
Merge branch 'main' into perf/improve-canEditFieldOfMoneyRequest
2 parents c5fea78 + f9a179e commit 6c2c95a

45 files changed

Lines changed: 629 additions & 79 deletions

Some content is hidden

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

.github/workflows/deployNewHelp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
# v4
5959
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
6060
with:
61-
node-version: '20.19.1'
61+
node-version-file: '.nvmrc'
6262

6363
# Wil install the _help/package.js
6464
- name: Install Node.js Dependencies

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.19.1
1+
20.19.3

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 1009018001
118-
versionName "9.1.80-1"
117+
versionCode 1009018002
118+
versionName "9.1.80-2"
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.80.1</string>
47+
<string>9.1.80.2</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.80</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.80.1</string>
16+
<string>9.1.80.2</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.80</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.80.1</string>
16+
<string>9.1.80.2</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

Lines changed: 3 additions & 3 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.80-1",
3+
"version": "9.1.80-2",
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.",
@@ -406,7 +406,7 @@
406406
]
407407
},
408408
"engines": {
409-
"node": "20.19.1",
409+
"node": "20.19.3",
410410
"npm": "10.8.2"
411411
}
412412
}

src/CONST/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6393,8 +6393,7 @@ const CONST = {
63936393
get FILTER_DATE_PRESETS() {
63946394
return {
63956395
// s77rt remove DEV lock
6396-
[this.SYNTAX_FILTER_KEYS.POSTED]:
6397-
(Config?.ENVIRONMENT ?? 'development') === 'development' ? [this.DATE_PRESETS.LAST_STATEMENT, this.DATE_PRESETS.LAST_MONTH] : [this.DATE_PRESETS.LAST_MONTH],
6396+
[this.SYNTAX_FILTER_KEYS.POSTED]: (Config?.ENVIRONMENT ?? 'development') === 'development' ? [this.DATE_PRESETS.LAST_STATEMENT, this.DATE_PRESETS.LAST_MONTH] : [],
63986397
[this.SYNTAX_FILTER_KEYS.EXPORTED]: [this.DATE_PRESETS.NEVER],
63996398
};
64006399
},

0 commit comments

Comments
 (0)