Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .claude/commands/create-pr.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
description:
'Automatically create a pull request to dev branch with proper validation and
'Automatically create a pull request to main branch with proper validation and
commit handling'
argument-hint: '[target-branch] [title]'
allowed-tools: [Bash, TodoWrite]
Expand All @@ -13,7 +13,7 @@ GitHub integration.

Arguments:

- `target-branch` (optional): Target branch for the PR (default: dev)
- `target-branch` (optional): Target branch for the PR (default: main)
- `title` (optional): PR title (auto-generated if not provided)

## Process
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-link-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
const branch = pr.head.ref || '';
const body = (pr.body || '').trim();

const mainBranches = ['main', 'master', 'dev', 'develop'];
const mainBranches = ['main', 'master', 'dev', 'develop', 'legacy-main'];
if (mainBranches.includes(branch)) {
core.info('Main branch PR: skipping verification');
return;
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ name: "CodeQL Analysis"
on:
push:
branches:
- dev
- main
pull_request:
branches:
- dev
- main
schedule:
- cron: "0 0 * * *"
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
name: "Dependency review"
on:
pull_request:
branches: ["dev"]
branches: ["main"]

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/extension-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- id: set_env
run: |
ENV_NAME="${{ github.ref_type == 'tag' && 'production' || github.ref_name == 'master' && 'production' || contains(github.ref_name, 'release') && 'production' || startsWith(github.ref_name, 'release/') && 'production' || 'development' }}"
ENV_NAME="${{ github.ref_type == 'tag' && 'production' || github.ref_name == 'main' && 'production' || github.ref_name == 'master' && 'production' || contains(github.ref_name, 'release') && 'production' || startsWith(github.ref_name, 'release/') && 'production' || 'development' }}"
IS_BETA="false"
BETA_VERSION=""
if [[ "${{ github.ref_type }}" == "tag" && "${{ github.ref_name }}" == *"beta"* ]]; then
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on:
# Trigger the workflow on push or pull request,
# for main, dev, and release/* branches
push:
branches: [main, dev, "release/*"]
branches: [main, "release/*"]

# Replace pull_request with pull_request_target if you
# plan to use this action with forks, see the Limitations section
pull_request:
branches: [main, dev, "release/*"]
branches: [main, "release/*"]

# Down scope as necessary via https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
permissions:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
paths:
- "packages/**"
branches: [main, dev, "release/*"]
branches: [main, "release/*"]
pull_request:
paths:
- "packages/**"
branches: [main, dev, "release/*"]
branches: [main, "release/*"]

jobs:
ci:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
pull_request_review_comment:
types: [created]
push:
branches: [main, dev, "release/*"]
branches: [main, "release/*"]

jobs:
review:
Expand All @@ -27,4 +27,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
LLM_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
LLM_MODEL: "claude-opus-4-5-20251101"
LLM_MODEL: "claude-opus-4-6-20260327"
4 changes: 2 additions & 2 deletions .github/workflows/react-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
paths:
- "apps/react-native/**"
branches: [main, dev, "release/*"]
branches: [main, "release/*"]
pull_request:
paths:
- "apps/react-native/**"
branches: [main, dev, "release/*"]
branches: [main, "release/*"]

jobs:
react-native-bundle-android:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/submodule-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ on:
ios_ref:
description: "Ref (branch, tag, or SHA) for apps/react-native/ios"
required: false
default: dev
default: main
android_ref:
description: "Ref (branch, tag, or SHA) for apps/react-native/android"
required: false
default: dev
default: main
update_mode:
description: "Use create-pr (default) or update-existing-pr"
required: true
Expand All @@ -34,9 +34,8 @@ on:
description: "Base branch when creating a new PR"
required: false
type: choice
default: dev
default: main
options:
- dev
- main

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/submodule-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
branches: ["**"]
push:
branches: [main, dev, "release/*"]
branches: [main, "release/*"]

jobs:
validate-submodules:
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "apps/react-native/android"]
path = apps/react-native/android
url = https://github.com/onflow/FRW-Android.git
branch = dev
branch = main
9 changes: 4 additions & 5 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,10 @@ these plugins once they're installed. See `.claude/README.md` for full details.
- `/create-issue "Add dark mode"` - Custom title with auto description
- `/create-issue "Fix bug" "Description here"` - Custom title and description

- `/create-pr` - Automated PR creation to dev branch with validation and issue
- `/create-pr` - Automated PR creation to main branch with validation and issue
linking
- `/create-pr` - Create PR to dev with auto-generated title
- `/create-pr main` - Create PR to main branch
- `/create-pr dev "feat: new feature"` - Create PR with custom title
- `/create-pr` - Create PR to main with auto-generated title
- `/create-pr main "feat: new feature"` - Create PR with custom title
- Automatically searches and links related GitHub issues

## GitHub Workflows
Expand Down Expand Up @@ -537,7 +536,7 @@ The UI package includes comprehensive Storybook integration:

**Allowed Branches (no issue number required)**

- `main`, `master`, `dev`, `develop`
- `main`, `master`, `dev`, `develop`, `legacy-main`
- Maintenance branches (GitFlow): `hotfix/<desc>` or `hotfix/<issue>-<desc>`,
`release/<version>` or `release/<issue>-<version>`

Expand Down
4 changes: 2 additions & 2 deletions scripts/update-submodule-refs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -euo pipefail
# scripts/update-submodule-refs.sh [--ios-ref <ref>] [--android-ref <ref>]
# [--skip-ios] [--skip-android]
#
# When a ref is omitted the default branch defined in .gitmodules (dev) is used.
# When a ref is omitted the default branch defined in .gitmodules (main) is used.

IOS_PATH="apps/react-native/ios"
ANDROID_PATH="apps/react-native/android"
Expand Down Expand Up @@ -65,7 +65,7 @@ update_submodule() {

if [[ -z "$ref" || "$ref" == "default" ]]; then
# Use ref configured in .gitmodules (dev)
ref=$(git config -f .gitmodules "submodule.${label}.branch" || echo "dev")
ref=$(git config -f .gitmodules "submodule.${label}.branch" || echo "main")
Comment on lines 67 to +68

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment on line 67 still says (dev) but the code now defaults to main. The comment should be updated to match the new default branch.

fi

echo "::group::Updating $label ($path) to $ref"
Expand Down
Loading