Skip to content

Commit 56e6d83

Browse files
committed
Merge branch 'main' into @zfurtak/travel-updates
2 parents 3aadbc9 + e3560bc commit 56e6d83

42 files changed

Lines changed: 1087 additions & 209 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.

.github/workflows/cherryPick.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ jobs:
237237
gh pr create \
238238
--title "🍒 Cherry pick PR #${{ steps.getPRInfo.outputs.PR_NUMBER }} to ${{ inputs.TARGET }} 🍒" \
239239
--body "$PR_DESCRIPTION" \
240-
--label "Engineering,Hourly" \
240+
--label "Engineering,Hourly,${{ inputs.TARGET == 'staging' && 'CP Staging' || 'CP Production' }}" \
241241
--base "${{ inputs.TARGET }}"
242242
sleep 5
243243
env:

Mobile-Expensify

__mocks__/reportData/actions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const REPORT_R14932 = {
1919
childReportID: 'CHILD_REPORT_ID_R14932',
2020
};
2121

22-
const originalMessageR14932: OriginalMessageIOU = {
22+
const originalMessageR14932 = {
2323
currency,
2424
amount,
2525
IOUReportID: REPORT_R14932.IOUReportID,
@@ -28,7 +28,7 @@ const originalMessageR14932: OriginalMessageIOU = {
2828
type: CONST.IOU.TYPE.CREATE,
2929
lastModified: '2025-02-14 08:12:05.165',
3030
comment: '',
31-
};
31+
} satisfies OriginalMessageIOU;
3232

3333
const message = [
3434
{
@@ -50,7 +50,7 @@ const person = [
5050
},
5151
];
5252

53-
const actionR14932: ReportAction = {
53+
const actionR14932: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> = {
5454
person,
5555
message,
5656
reportActionID: REPORT_R14932.reportActionID,
@@ -86,4 +86,4 @@ const actionR98765: ReportAction = {
8686
created: '2025-02-14 08:12:05.165',
8787
};
8888

89-
export {actionR14932, actionR98765};
89+
export {actionR14932, actionR98765, originalMessageR14932};

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 1009015800
118-
versionName "9.1.58-0"
117+
versionCode 1009015803
118+
versionName "9.1.58-3"
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/receipt-multiple.svg

Lines changed: 13 additions & 0 deletions
Loading

docs/articles/expensify-classic/bank-accounts-and-payments/payments/Receive-and-Pay-Bills.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Expensify makes it easy to receive bills in three simple ways:
1818
Share your Expensify billing email with vendors to receive bills automatically.
1919

2020
- Set a Primary Contact under **Settings > Domains > Domain Admins**.
21-
- Ask vendors to email bills to your billing address: `domainname@expensify.cash` (e.g., for *expensicorp.com*, use `expensicorp@expensify.cash`).
21+
- Ask vendors to email bills to your billing address: `domain.com@expensify.cash` (e.g., for *expensicorp.com*, use `expensicorp.com@expensify.cash`).
2222
- Once emailed, the bill is automatically created in Expensify, ready for payment.
2323

2424
![Setting the Primary Contact at Domain Admins > Primary Contact](https://help.expensify.com/assets/images/OldDot%20-%20Create%20%26%20Pay%20Bills%201.png){:width="100%"}
@@ -27,7 +27,7 @@ Share your Expensify billing email with vendors to receive bills automatically.
2727
If you received a bill in via email, you can forward it directly to Expensify.
2828

2929
- Ensure your Primary Contact is set under **Settings > Domains > Domain Admins**.
30-
- Forward bills to `domainname@expensify.cash`. Example: `domainname@expensify.cash` (e.g., for *expensicorp.com*, use `expensicorp@expensify.cash`).
30+
- Forward bills to `domain.com@expensify.cash`. Example: `domain.com@expensify.cash` (e.g., for *expensicorp.com*, use `expensicorp.com@expensify.cash`).
3131
- Expensify will create a bill automatically, ready for payment.
3232

3333
## 3. Manual Upload

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.58.0</string>
47+
<string>9.1.58.3</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.58</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.58.0</string>
16+
<string>9.1.58.3</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.58</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.58.0</string>
16+
<string>9.1.58.3</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

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)