Skip to content

Commit a964fad

Browse files
pasyukevichpasyukevich
committed
Merge branch 'main' into performance/set-replace-report
2 parents 830e1ca + 1f8e022 commit a964fad

86 files changed

Lines changed: 1601 additions & 711 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: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,14 @@ jobs:
3434
uses: ./.github/workflows/createNewVersion.yml
3535
secrets: inherit
3636
with:
37-
# In order to submit a new build for production review, it must have a higher PATCH version than the previously-submitted build
38-
SEMVER_LEVEL: ${{ inputs.TARGET == 'staging' && 'BUILD' || 'PATCH' }}
37+
# In order to submit a new build for production review, it must have a higher PATCH version than the previously-submitted build.
38+
# The typical case is that with each staging deploy, we bump the BUILD version, and with each prod deploy we bump the PATCH version.
39+
# However, if PULL_REQUEST_URL is empty, we assume we want to do a PATCH version bump.
40+
# The reason we assume that is because the use-case for a no-PR CP is after a CP to Production.
41+
# In that case, we need to bump the staging version to be higher than prod.
42+
# We use a patch version so that there's a diff in both `CFBundleVersion` and `CFBundleShortVersion` on iOS,
43+
# so that when we later CP that version bump to staging, the `CFBundleShortVersion` diff is picked up as well.
44+
SEMVER_LEVEL: ${{ (inputs.TARGET == 'production' || inputs.PULL_REQUEST_URL == '') && 'PATCH' || 'BUILD' }}
3945

4046
cherryPick:
4147
needs: createNewVersion
@@ -231,7 +237,7 @@ jobs:
231237
gh pr create \
232238
--title "🍒 Cherry pick PR #${{ steps.getPRInfo.outputs.PR_NUMBER }} to ${{ inputs.TARGET }} 🍒" \
233239
--body "$PR_DESCRIPTION" \
234-
--label "Engineering,Hourly" \
240+
--label "Engineering,Hourly,${{ inputs.TARGET == 'staging' && 'CP Staging' || 'CP Production' }}" \
235241
--base "${{ inputs.TARGET }}"
236242
sleep 5
237243
env:

‎.storybook/preview.tsx‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React from 'react';
33
import Onyx from 'react-native-onyx';
44
import {SafeAreaProvider} from 'react-native-safe-area-context';
55
import type {Parameters} from 'storybook/internal/types';
6-
import {MoneyRequestReportContextProvider} from '@components/MoneyRequestReportView/MoneyRequestReportContext';
6+
import {SearchContextProvider} from '@components/Search/SearchContext';
77
import ComposeProviders from '@src/components/ComposeProviders';
88
import HTMLEngineProvider from '@src/components/HTMLEngineProvider';
99
import {LocaleContextProvider} from '@src/components/LocaleContextProvider';
@@ -23,16 +23,7 @@ Onyx.init({
2323
const decorators = [
2424
(Story: React.ElementType) => (
2525
<ComposeProviders
26-
components={[
27-
OnyxProvider,
28-
LocaleContextProvider,
29-
HTMLEngineProvider,
30-
SafeAreaProvider,
31-
PortalProvider,
32-
EnvironmentProvider,
33-
KeyboardStateProvider,
34-
MoneyRequestReportContextProvider,
35-
]}
26+
components={[OnyxProvider, LocaleContextProvider, HTMLEngineProvider, SafeAreaProvider, PortalProvider, EnvironmentProvider, KeyboardStateProvider, SearchContextProvider]}
3627
>
3728
<Story />
3829
</ComposeProviders>

‎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 1009015610
118-
versionName "9.1.56-10"
117+
versionCode 1009015804
118+
versionName "9.1.58-4"
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: 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.1.56</string>
26+
<string>9.1.58</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.1.56.10</string>
47+
<string>9.1.58.4</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.1.56</string>
14+
<string>9.1.58</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.56.10</string>
16+
<string>9.1.58.4</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.1.56</string>
14+
<string>9.1.58</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.56.10</string>
16+
<string>9.1.58.4</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

0 commit comments

Comments
 (0)