Skip to content

Commit 7d706aa

Browse files
committed
Merge remote-tracking branch 'upstream/main' into 78247/admin-can-pay-report-newdot
2 parents 67f3cf6 + fd10aa2 commit 7d706aa

95 files changed

Lines changed: 1418 additions & 658 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 1009029604
118-
versionName "9.2.96-4"
117+
versionCode 1009029702
118+
versionName "9.2.97-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"

assets/images/user-minus.svg

Lines changed: 1 addition & 0 deletions
Loading

cspell.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,8 @@
737737
"Venmo",
738738
"viewability",
739739
"viewport",
740+
"Unsharing",
741+
"unsharing",
740742
"viewports",
741743
"VMPD",
742744
"voidings",

docs/articles/expensify-classic/bank-accounts-and-payments/payments/Global-Reimbursement-EU.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ Once the bank account is approved for global reimbursement:
7777
3. Choose your verified EU account as the default reimbursement method.
7878
4. Instruct employees to connect their deposit account:
7979
- Go to **Settings > Account > Wallet**.
80-
- Click **Add deposit-only bank account** and input their account details.
80+
- Click **Add Personal Bank Account** and input their account details.
81+
- **Important:** The name on an employee’s bank account must exactly match the name entered in Expensify. This verification is required for every payment, and mismatches may cause delays or prevent processing.
8182

8283
---
8384

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.96</string>
26+
<string>9.2.97</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.96.4</string>
47+
<string>9.2.97.2</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.96</string>
14+
<string>9.2.97</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.96.4</string>
16+
<string>9.2.97.2</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.96</string>
14+
<string>9.2.97</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.96.4</string>
16+
<string>9.2.97.2</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

jest/setupMockFullstoryLib.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export default function mockFSLibrary() {
2424
consentAndIdentify: jest.fn(),
2525
anonymize: jest.fn(),
2626
getSessionId: jest.fn().mockResolvedValue(undefined),
27+
getSessionURL: jest.fn().mockResolvedValue(undefined),
2728
};
2829
});
2930
}

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.

0 commit comments

Comments
 (0)