Skip to content

Commit fdd63d6

Browse files
MelvinBotdmkt9
andcommitted
Merge remote-tracking branch 'origin/main' into claude-fixEditedStatusTripleClickSelect
Co-authored-by: dmkt9 <dmkt9@users.noreply.github.com>
2 parents b30c1fc + 7b8fde7 commit fdd63d6

495 files changed

Lines changed: 10580 additions & 5368 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/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:*)"

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source "https://rubygems.org"
44
ruby ">= 3.3.4"
55

66
gem "cocoapods", "= 1.16.2"
7-
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
7+
gem 'activesupport', '>= 7.2.3.1'
88
gem 'xcodeproj', '~> 1.27'
99
gem "fastlane", "~> 2", ">= 2.229.0"
1010
gem "xcpretty", "~> 0"

Gemfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ GEM
33
specs:
44
CFPropertyList (3.0.8)
55
abbrev (0.1.2)
6-
activesupport (7.2.3)
6+
activesupport (7.2.3.1)
77
base64
88
benchmark (>= 0.3)
99
bigdecimal
@@ -12,7 +12,7 @@ GEM
1212
drb
1313
i18n (>= 1.6, < 2)
1414
logger (>= 1.4.2)
15-
minitest (>= 5.1)
15+
minitest (>= 5.1, < 6)
1616
securerandom (>= 0.3)
1717
tzinfo (~> 2.0, >= 2.0.5)
1818
addressable (2.8.8)
@@ -45,8 +45,8 @@ GEM
4545
aws-eventstream (~> 1, >= 1.0.2)
4646
babosa (1.0.4)
4747
base64 (0.3.0)
48-
benchmark (0.3.0)
49-
bigdecimal (4.0.1)
48+
benchmark (0.5.0)
49+
bigdecimal (4.1.1)
5050
claide (1.1.0)
5151
cocoapods (1.16.2)
5252
addressable (~> 2.8)
@@ -89,8 +89,8 @@ GEM
8989
colored2 (3.1.2)
9090
commander (4.6.0)
9191
highline (~> 2.0.0)
92-
concurrent-ruby (1.3.5)
93-
connection_pool (2.5.4)
92+
concurrent-ruby (1.3.6)
93+
connection_pool (3.0.2)
9494
csv (3.3.5)
9595
declarative (0.0.20)
9696
digest-crc (0.7.0)
@@ -238,7 +238,7 @@ GEM
238238
domain_name (~> 0.5)
239239
httpclient (2.9.0)
240240
mutex_m
241-
i18n (1.14.7)
241+
i18n (1.14.8)
242242
concurrent-ruby (~> 1.0)
243243
jmespath (1.6.2)
244244
json (2.18.0)
@@ -251,7 +251,7 @@ GEM
251251
mime-types-data (3.2025.0924)
252252
mini_magick (4.13.2)
253253
mini_mime (1.1.5)
254-
minitest (5.26.1)
254+
minitest (5.27.0)
255255
molinillo (0.8.0)
256256
multi_json (1.18.0)
257257
multipart-post (2.4.1)
@@ -322,7 +322,7 @@ PLATFORMS
322322
x86_64-linux
323323

324324
DEPENDENCIES
325-
activesupport (>= 6.1.7.5, != 7.1.0)
325+
activesupport (>= 7.2.3.1)
326326
benchmark
327327
bigdecimal
328328
cocoapods (= 1.16.2)

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 1009035203
115-
versionName "9.3.52-3"
114+
versionCode 1009035305
115+
versionName "9.3.53-5"
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.

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

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

0 commit comments

Comments
 (0)