Skip to content

Commit 973a441

Browse files
committed
merge main
2 parents 43e4cc7 + b96c699 commit 973a441

409 files changed

Lines changed: 10837 additions & 7001 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/deploy-blocker-investigator.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@ removeDeployBlockerLabel.sh "$ISSUE_URL" DeployBlocker # For Frontend bugs
129129

130130
Call scripts by name only (e.g., `removeDeployBlockerLabel.sh`), not with full paths.
131131

132+
### Step 8: Assign contributors
133+
134+
When a causing PR is identified with medium or high confidence, assign the PR author and all approving reviewers to the deploy blocker issue using `gh issue edit "$ISSUE_URL" --add-assignee`. Extract approving reviewers from `gh pr view <PR_NUMBER> --json reviews`.
135+
132136
---
133137

134138
## Decision Tree
@@ -182,6 +186,7 @@ Post ONE comment using this exact format:
182186
Brief explanation of why this recommendation (1-2 sentences).
183187

184188

189+
**Assigned**: @author (PR author), @reviewer (approving reviewer) — or omit if no causing PR identified
185190
**Labels**: [Describe any label changes made]
186191

187192
<details>

.claude/commands/investigate-deploy-blocker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
allowed-tools: Bash(gh issue view:*),Bash(gh issue comment:*),Bash(gh issue list:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh pr diff:*),Bash(gh api:*),Bash(git log:*),Bash(git show:*),Bash(git blame:*),Bash(removeDeployBlockerLabel.sh:*),Glob,Grep,Read
2+
allowed-tools: Bash(gh issue view:*),Bash(gh issue comment:*),Bash(gh issue edit:*),Bash(gh issue list:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh pr diff:*),Bash(gh api:*),Bash(git log:*),Bash(git show:*),Bash(git blame:*),Bash(removeDeployBlockerLabel.sh:*),Glob,Grep,Read
33
description: Investigate a deploy blocker issue to find the causing PR and recommend resolution
44
---
55

.github/actions/composite/setupNode/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ runs:
4949

5050
- name: Install root project node packages
5151
if: steps.cache-node-modules.outputs.cache-hit != 'true' || (inputs.IS_HYBRID_BUILD == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true')
52-
uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
52+
uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4
5353
with:
5454
timeout_minutes: 30
5555
max_attempts: 3

.github/workflows/buildIOS.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
run: echo "IS_PODFILE_SAME_AS_MANIFEST=${{ hashFiles('Mobile-Expensify/iOS/Podfile.lock') == hashFiles('Mobile-Expensify/iOS/Pods/Manifest.lock') }}" >> "$GITHUB_OUTPUT"
127127

128128
- name: Install cocoapods
129-
uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
129+
uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4
130130
if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true' || steps.setup-node.outputs.cache-hit != 'true'
131131
with:
132132
timeout_minutes: 10

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
# JS is better at handling JSON: https://stackoverflow.com/questions/72953526/github-actions-how-to-pass-tojson-result-to-shell-commands
6767
- name: Check if this deploy was triggered by a cherry-pick
6868
id: isCherryPick
69-
uses: actions/github-script@e7aeb8c663f696059ebb5f9ab1425ed2ef511bdb
69+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
7070
with:
7171
script: |
7272
const commitMessages = context.payload.commits.map((commit) => commit.message);

.github/workflows/deployBlockerInvestigation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ jobs:
7777
github_token: ${{ secrets.OS_BOTIFY_TOKEN }}
7878
prompt: "/investigate-deploy-blocker ISSUE_URL: ${{ env.ISSUE_URL }}"
7979
claude_args: |
80-
--allowedTools "Task,Glob,Grep,Read,Bash(gh issue view:*),Bash(gh issue comment:*),Bash(gh issue list:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh pr diff:*),Bash(gh api:*),Bash(git log:*),Bash(git show:*),Bash(git blame:*),Bash(removeDeployBlockerLabel.sh:*)"
80+
--allowedTools "Task,Glob,Grep,Read,Bash(gh issue view:*),Bash(gh issue comment:*),Bash(gh issue edit:*),Bash(gh issue list:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh pr diff:*),Bash(gh api:*),Bash(git log:*),Bash(git show:*),Bash(git blame:*),Bash(removeDeployBlockerLabel.sh:*)"

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009035300
115-
versionName "9.3.53-0"
114+
versionCode 1009035400
115+
versionName "9.3.54-0"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

android/app/src/main/java/com/expensify/chat/MainActivity.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ class MainActivity : ReactActivity() {
4646
.apply()
4747
BootSplash.init(this)
4848
super.onCreate(null)
49-
if (resources.getBoolean(R.bool.portrait_only)) {
50-
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
51-
}
5249

5350
// Sets translucent status bar. This code is based on what the react-native StatusBar
5451
// module does, but we need to do it here to avoid the splash screen jumping on app start.

android/app/src/main/res/values-large/orientation.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)