Skip to content

Commit dd18050

Browse files
committed
merge main
2 parents 18397c0 + 7bafe0a commit dd18050

291 files changed

Lines changed: 11855 additions & 4443 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.

.claude/agents/code-inline-reviewer.md

Lines changed: 401 additions & 36 deletions
Large diffs are not rendered by default.

.claude/agents/deploy-blocker-investigator.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ Technical explanation of what went wrong in the code.
207207

208208
**DO NOT:**
209209
- Remove `DeployBlockerCash` if there's an App PR that caused or contributed to the issue
210+
- Remove `DeployBlockerCash` if the issue is not reproducible on production
211+
- Remove any of the blocker labels if it has been added by an internal employee
210212
- Remove both blocker labels simultaneously
211213
- Make assumptions about code you haven't read
212214
- Recommend DEMOTE for bugs affecting core functionality (auth, payments, data loss)

.github/workflows/testBuildOnPush.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
branches: [main]
66
paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**', 'jest/**', '.claude/**']
77

8+
concurrency:
9+
group: 'testBuildOnPush'
10+
cancel-in-progress: false
11+
812
jobs:
913
prep:
1014
runs-on: ubuntu-latest
@@ -432,7 +436,6 @@ jobs:
432436
summary.addRaw(`\n**Mobile-Expensify Submodule SHA:** [${submoduleSHA}](${submoduleUrl})`);
433437
}
434438
435-
436439
const prUrl = '${{ needs.prep.outputs.PR_URL }}';
437440
438441
if (prUrl) {
@@ -441,5 +444,4 @@ jobs:
441444
summary.addRaw(`\n**PR Link:** No PR associated with this commit.`);
442445
}
443446
444-
445447
summary.write();

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 1009031149
118-
versionName "9.3.11-49"
117+
versionCode 1009031500
118+
versionName "9.3.15-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"

assets/images/gallery-plus.svg

Lines changed: 1 addition & 0 deletions
Loading
-350 Bytes
Loading

assets/images/odometer-end.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/images/odometer-start.svg

Lines changed: 1 addition & 0 deletions
Loading

contributingGuides/CONTRIBUTING.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,16 @@ This helps future investigators understand the history and current status of err
193193
16. Please pay attention to the pull request template, especially to how we link PRs with issues they fix. Make sure you don't use GitHub keywords such as `fixes` in your PR description, as this can break our current automated steps for issue management. Follow the PR template format carefully.
194194
17. Upon submission of a PR, please include a numbered list of explicit testing steps for each platform (Web, iOS, Android, and Mobile Web) to confirm the fix works as expected and there are no regressions.
195195
18. Please add a screenshot of the app running on each platform (Web, iOS, Android, Mobile Web).
196+
19. Please review the [PR Authoring & Reviewing Best Practices](./PR_AUTHOR_REVIEWER_BEST_PRACTICES.md) for standards on PR titles, testing responsibilities, and the review workflow.
196197
197198
### Completing the final checklist
198-
19. Once your PR has been deployed to production, a checklist will automatically be commented in the GH issue. You're required to complete the steps that have your name mentioned before payment will be issued.
199-
20. The items requiring your completion consist of:
199+
20. Once your PR has been deployed to production, a checklist will automatically be commented in the GH issue. You're required to complete the steps that have your name mentioned before payment will be issued.
200+
21. The items requiring your completion consist of:
200201
1. Proposing steps to take for a regression test to ensure the bug doesn't occur again (For information on how to successfully complete this, head [here](https://github.com/Expensify/App/blob/main/contributingGuides/REGRESSION_TEST_BEST_PRACTICES.md)).
201202
2. Identifying and noting the offending PR that caused the bug (if any).
202203
3. Commenting on the offending PR to note the bug it caused and why (if applicable).
203204
4. Starting a conversation on if any additional steps should be taken to prevent further bugs similar to the one fixed from occurring again.
204-
21. Once the above items have been successfully completed, then payments will begin to be issued.
205+
22. Once the above items have been successfully completed, then payments will begin to be issued.
205206
206207
### Timeline expectations and asking for help along the way
207208
- If you have made a change to your pull request and are ready for another review, leave a comment that says "Updated" on the pull request itself.

0 commit comments

Comments
 (0)