Skip to content

Commit 474e33d

Browse files
committed
Merge branch 'main' into fix/72521-no-more-msg-loaded-after-reach-end-in-search-page
2 parents 015e076 + 1d0ce34 commit 474e33d

398 files changed

Lines changed: 9295 additions & 3147 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/ISSUE_TEMPLATE/Accessibility.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ Which of our officially supported platforms is this issue occurring on? Please o
4343
- [ ] iOS: mWeb Chrome
4444
- [ ] Windows: Chrome
4545
- [ ] MacOS: Chrome / Safari
46-
- [ ] MacOS: Desktop
46+
47+
## Screenshots/Videos
4748

4849
**Version Number:**
4950
**Reproducible in staging?:**

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ jobs:
355355
needs: prep
356356
runs-on: macos-15-xlarge
357357
env:
358-
DEVELOPER_DIR: /Applications/Xcode_16.4.0.app/Contents/Developer
358+
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
359359
SHOULD_BUILD_APP: ${{ github.ref == 'refs/heads/staging' || fromJSON(needs.prep.outputs.IS_CHERRY_PICK) }}
360360
steps:
361361
- name: Checkout

.github/workflows/remote-build-android.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,15 @@ jobs:
4747
git fetch origin pull/${{ github.event.inputs.mobile_expensify_pr }}/head:pr-${{ github.event.inputs.mobile_expensify_pr }}
4848
git checkout pr-${{ github.event.inputs.mobile_expensify_pr }}
4949
echo "Checked out Mobile-Expensify PR #${{ github.event.inputs.mobile_expensify_pr }}"
50-
50+
51+
- name: Configure AWS Credentials
52+
# v4
53+
uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722
54+
with:
55+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
56+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
57+
aws-region: us-east-1
58+
5159
- name: Rock Remote Build - Android
5260
# rock v3
5361
uses: callstackincubator/android@1a7d52dfe3ca195ccbe5ad2f06c15f2fc3835115

.github/workflows/remote-build-ios.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ jobs:
5252
git checkout pr-${{ github.event.inputs.mobile_expensify_pr }}
5353
echo "Checked out Mobile-Expensify PR #${{ github.event.inputs.mobile_expensify_pr }}"
5454
55+
- name: Configure AWS Credentials
56+
# v4
57+
uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722
58+
with:
59+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
60+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
61+
aws-region: us-east-1
62+
5563
- name: Rock Remote Build - iOS
5664
# rock v3
5765
uses: callstackincubator/ios@08a533dbeda6adec39f94d08d820091514d1f7af

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818
env:
1919
CI: true
20-
NODE_OPTIONS: --max_old_space_size=8192
20+
NODE_OPTIONS: "--experimental-vm-modules --max-old-space-size=8192"
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
chunk: [ 1, 2, 3, 4 ]
24+
chunk: [1, 2, 3, 4, 5, 6, 7, 8]
2525
name: test (job ${{ fromJSON(matrix.chunk) }})
2626
steps:
2727
- name: Checkout
@@ -44,7 +44,7 @@ jobs:
4444
key: ${{ runner.os }}-jest
4545

4646
- name: Jest tests
47-
run: NODE_OPTIONS="$NODE_OPTIONS --experimental-vm-modules" npm test -- --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --maxWorkers=4 --coverage --coverageDirectory=coverage/shard-${{ matrix.chunk }}
47+
run: npm test -- --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --maxWorkers=2 --coverage --coverageDirectory=coverage/shard-${{ matrix.chunk }}
4848

4949
- name: Upload coverage to Codecov (PRs - tokenless)
5050
if: ${{ github.event_name == 'pull_request' }}

.github/workflows/verifyHybridApp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
name: Verify iOS HybridApp builds on main
114114
runs-on: macos-15-xlarge
115115
env:
116-
DEVELOPER_DIR: /Applications/Xcode_16.4.0.app/Contents/Developer
116+
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
117117
# Only run on pull requests that are *not* on a fork
118118
if: ${{ !github.event.pull_request.head.repo.fork && github.event_name == 'pull_request' }}
119119
steps:

Mobile-Expensify

__mocks__/Illustrations.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const CreditCardsNew = 'CreditCardsNew';
2121
const CreditCardsNewGreen = 'CreditCardsNewGreen';
2222
const InvoiceBlue = 'InvoiceBlue';
2323
const LaptopWithSecondScreenAndHourglass = 'LaptopWithSecondScreenAndHourglass';
24+
const RunningTurtle = 'RunningTurtle';
2425
const LockOpen = 'LockOpen';
2526
const Luggage = 'Luggage';
2627
const MoneyIntoWallet = 'MoneyIntoWallet';
@@ -29,6 +30,7 @@ const ConciergeBubble = 'ConciergeBubble';
2930
const TreasureChest = 'TreasureChest';
3031
const ThumbsUpStars = 'ThumbsUpStars';
3132
const Hands = 'Hands';
33+
const Hand = 'Hand';
3234
const SmartScan = 'SmartScan';
3335
const Hourglass = 'Hourglass';
3436
const CommentBubbles = 'CommentBubbles';
@@ -56,6 +58,9 @@ const Binoculars = 'Binoculars';
5658
const CompanyCard = 'CompanyCard';
5759
const ReceiptUpload = 'ReceiptUpload';
5860
const ExpensifyCardIllustration = 'ExpensifyCardIllustration';
61+
const ExpensifyCardImage = 'ExpensifyCardImage';
62+
const MultiScan = 'MultiScan';
63+
const Shutter = 'Shutter';
5964
const SplitBill = 'SplitBill';
6065
const PiggyBank = 'PiggyBank';
6166
const Pillow = 'Pillow';
@@ -134,6 +139,7 @@ export {
134139
CreditCardsNewGreen,
135140
InvoiceBlue,
136141
LaptopWithSecondScreenAndHourglass,
142+
RunningTurtle,
137143
LockOpen,
138144
Luggage,
139145
MoneyIntoWallet,
@@ -142,6 +148,7 @@ export {
142148
TreasureChest,
143149
ThumbsUpStars,
144150
Hands,
151+
Hand,
145152
SmartScan,
146153
Hourglass,
147154
CommentBubbles,
@@ -169,6 +176,9 @@ export {
169176
CompanyCard,
170177
ReceiptUpload,
171178
ExpensifyCardIllustration,
179+
ExpensifyCardImage,
180+
MultiScan,
181+
Shutter,
172182
SplitBill,
173183
PiggyBank,
174184
Pillow,

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 1009026001
118-
versionName "9.2.60-1"
117+
versionCode 1009026202
118+
versionName "9.2.62-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"

contributingGuides/SETUP_ANDROID.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,14 @@
22

33
## Running the mobile application using Rock 🪨
44

5-
This project uses [Rock](https://rockjs.dev/) to manage native builds. Rather than compiling native code locally when running commands like `npm run android`, Rock first attempts to download remote builds (artifacts prebuilt on CI) from GitHub. If a matching remote build isn’t available, it automatically falls back to building locally.
5+
This project uses [Rock](https://rockjs.dev/) to manage native builds. Rather than compiling native code locally when running commands like `npm run android`, Rock first attempts to download remote builds (artifacts prebuilt on CI) from S3. If a matching remote build isn’t available, it automatically falls back to building locally.
66

77
By storing complete native build artifacts remotely, Rock reduces the need for local compilation and simplifies setup through automated downloads.
88

99
**Note:** Any changes to files involved in generating a fingerprint (e.g., `package.json`) will trigger a local build.
1010

1111
The following steps describe how to configure the project to fully utilize Rock.
1212

13-
### Generating GitHub Personal Access Token
14-
15-
To take advantage of remote builds, setup your GitHub Personal Access Token (PAT) in your `.env` file:
16-
17-
1. Create a GitHub Personal Access Token:
18-
- Go to [GitHub Settings > Developer Settings > Personal Access Tokens](https://github.com/settings/tokens)
19-
- Click "Generate new token (classic)"
20-
- Select the following scope:
21-
- `repo`
22-
- Copy the generated token
23-
24-
2. Add `GITHUB_TOKEN` to `.env` file with your generated token
25-
2613
### Running the mobile application 📱
2714
* To install project dependencies run: `npm install`
2815
* To start metro server run: `npm run start`

0 commit comments

Comments
 (0)