Skip to content

Commit 6be31d1

Browse files
committed
Merge branch 'main' into fix/77148
2 parents 3bc869e + e0923e0 commit 6be31d1

153 files changed

Lines changed: 1742 additions & 880 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 1009027509
118-
versionName "9.2.75-9"
117+
versionCode 1009027800
118+
versionName "9.2.78-0"
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"
Lines changed: 1 addition & 0 deletions
Loading

docs/articles/expensify-classic/workspaces/Expense-Settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ If your **Group Workspace** integrates with Xero, QuickBooks Online, NetSuite, o
5252
Expensify generates **eReceipts**, which are digital replacements for receipts of **$75 or less** for credit card transactions.
5353

5454
- **Enabled** – Expensify will generate eReceipts for all US-based card transactions up to $75.
55-
- **Disabled** – No eReceipts will be generated.
55+
- **Disabled** – No eReceipts will be generated. Disabling **eReceipts** after enabling them will hide existing eReceipts. Enable **eReceipts** again to restore them.
5656

5757
**Note:** Expensify does not generate eReceipts for lodging expenses.
5858

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.2.75</string>
26+
<string>9.2.78</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.2.75.9</string>
47+
<string>9.2.78.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.2.75</string>
14+
<string>9.2.78</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.75.9</string>
16+
<string>9.2.78.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.2.75</string>
14+
<string>9.2.78</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.75.9</string>
16+
<string>9.2.78.0</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.2.75-9",
3+
"version": "9.2.78-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.",
@@ -189,7 +189,7 @@
189189
"react-native-localize": "^3.5.4",
190190
"react-native-nitro-modules": "0.29.4",
191191
"react-native-nitro-sqlite": "9.2.0",
192-
"react-native-onyx": "3.0.15",
192+
"react-native-onyx": "3.0.23",
193193
"react-native-pager-view": "6.9.1",
194194
"react-native-pdf": "7.0.2",
195195
"react-native-performance": "^6.0.0",

src/CONST/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ const CONST = {
238238
POPOVER_DATE_MAX_HEIGHT: 366,
239239
POPOVER_DATE_MIN_HEIGHT: 322,
240240
TOOLTIP_ANIMATION_DURATION: 500,
241+
DROPDOWN_SCROLL_THRESHOLD: 5,
241242
// Multiplier for gyroscope animation in order to make it a bit more subtle
242243
ANIMATION_GYROSCOPE_VALUE: 0.4,
243244
ANIMATION_PAID_DURATION: 200,

0 commit comments

Comments
 (0)