Merge branch 'master' into feat/sweep-funds

Author: ben-kaufman

.claude/commands/pr.md

@@ -11,7 +11,7 @@ Create a PR on GitHub using the `gh` CLI for the currently checked-out branch.
 - `/pr master` - Interactive with explicit base branch
 - `/pr --dry` - Generate description only, save to `.ai/`
 - `/pr --draft` - Create as draft PR
-- `/pr develop --draft` - Draft PR against develop branch
+- `/pr develop --draft` - Draft PR against non-default branch
 
 ## Steps
 
@@ -23,24 +23,31 @@ Run `gh pr view --json number,url 2>/dev/null` to check if a PR already exists f
 ### 2. Parse Arguments
 - `--dry`: Skip PR creation, only generate and save description
 - `--draft`: Create PR as draft
-- First non-flag argument: base branch (default: `master`)
+- First non-flag argument: base branch (default: auto-detected, see Step 2.5)
 - **If no flags provided**: Use `AskUserQuestion` to prompt user:
   - Open PR (create and publish)
   - Draft PR (create as draft)
   - Dry run (save locally only)
 
+### 2.5. Determine Base Branch
+If no base branch argument provided, detect the repo's default branch:
+- Run: `git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'`
+- Use result as default (typically `main` or `master`)
+- If command fails, fall back to `master`
+
 ### 3. Gather Context
 - Get current branch name: `git branch --show-current`
+- Extract repo identifier: `git remote get-url origin | sed 's/\.git$//' | sed -E 's#.*[:/]([^/]+/[^/]+)$#\1#'` (e.g., `synonymdev/bitkit-android`)
 - Read PR template from `.github/pull_request_template.md`
-- Fetch 10 most recent PRs (open or closed) from `synonymdev/bitkit-android` for writing style reference
+- Fetch 10 most recent PRs (open or closed) from the extracted repo for writing style reference
 - Run `git log $base..HEAD --oneline` for commit messages
 - Run `git diff $base...HEAD --stat` for understanding scope of changes
 
 ### 4. Extract Linked Issues
 Scan commits for issue references:
 - Pattern to match: `#123` (just the issue number reference)
 - Extract unique issue numbers: `git log $base..HEAD --oneline | grep -oE "#[0-9]+" | sort -u`
-- Fetch each issue title: `gh api "repos/synonymdev/bitkit-android/issues/NUMBER" --jq '.title'`
+- Fetch each issue title: `gh api "repos/$REPO/issues/NUMBER" --jq '.title'` (using repo from Step 3)
 - These will be used to start the PR description with linking keywords (see Step 6)
 
 ### 5. Identify Suggested Reviewers
@@ -80,7 +87,6 @@ This PR adds support for...
   - Example:
     ```
     This PR:
-
     1. Adds a Claude Code /pr command for generating PRs
     2. Fixes issue preventing Claude Code reviews to be added as PR comments
     3. Updates reviews workflow to minimize older review comments
@@ -93,22 +99,41 @@ This PR adds support for...
 - Match writing style of recent PRs
 - Focus on functionality over technical details
 - Avoid excessive bold formatting like `**this:** that`
-- Minimize code references like `TheClassName` or `someFunctionName`
+- Minimize code and file references like `TheClassName` or `someFunctionName`, `thisFileName.ext`
 - Exception: for refactoring PRs (1:10 ratio of functionality to code changes), more technical detail is ok
 
 **QA Notes / Testing Scenarios:**
 - Structure with numbered headings and steps
 - Make steps easily referenceable
 - Be specific about what to test and expected outcomes
 
-**Preview Section:**
+**For library repos (has `bindings/` directory or `Cargo.toml`):**
+Structure QA Notes around testing and integration:
+
+Example:
+```
+### QA Notes
+
+#### Testing
+- [ ] `cargo test` passes
+- [ ] `cargo clippy` clean
+- [ ] Android bindings: `./build_android.sh`
+- [ ] iOS bindings: `./build_ios.sh`
+
+#### Integration
+- Tested in: [bitkit-android#XXX](link)
+- Or N/A if internal refactor with no API changes
+```
+
+**Preview Section (conditional):**
+Only include if the PR template (`.github/pull_request_template.md`) contains a `### Preview` heading:
 - Create placeholders for media: `IMAGE_1`, `VIDEO_2`, etc.
 - Add code comment under each placeholder describing what it should show
 - Example: `<!-- VIDEO_1: Record the send flow by scanning a LN invoice and setting amount to 5000 sats -->`
 
 ### 7. Save PR Description
 Before creating the PR:
-- Get next PR number: `gh api "repos/synonymdev/bitkit-android/issues?per_page=1&state=all&sort=created&direction=desc" --jq '.[0].number'` then add 1
+- Get next PR number: `gh api "repos/$REPO/issues?per_page=1&state=all&sort=created&direction=desc" --jq '.[0].number'` then add 1 (using repo from Step 3)
 - Create `.ai/` directory if it doesn't exist
 - Save to `.ai/pr_NN.md` where `NN` is the predicted PR number
 
@@ -130,10 +155,6 @@ Saved: .ai/pr_NN.md
 Suggested reviewers:
 - @username1 (X files modified recently)
 - @username2 (CODEOWNER)
-
-## TODOs
-- [ ] IMAGE_1: [description]
-- [ ] VIDEO_2: [description]
 ```
 
 **If dry run:**
@@ -146,10 +167,13 @@ To create PR: /pr [--draft]
 Suggested reviewers:
 - @username1 (X files modified recently)
 - @username2 (CODEOWNER)
+```
 
+**Media TODOs (only if Preview section was included):**
+If the PR description includes a Preview section with media placeholders, append:
+```
 ## TODOs
 - [ ] IMAGE_1: [description]
 - [ ] VIDEO_2: [description]
 ```
-
 List all media placeholders as TODOs with their descriptions.

.cursor/commands/pr.md

@@ -0,0 +1 @@
+../../.claude/commands/pr.md

.github/workflows/claude-code-review.yml

@@ -2,7 +2,7 @@ name: Claude Code Review
 
 on:
   pull_request:
-    types: [opened, synchronize]
+    types: [opened, synchronize, ready_for_review, reopened]
     # Optional: Only run on specific file changes
     # paths:
     #   - "src/**/*.ts"
@@ -56,20 +56,7 @@ jobs:
         uses: anthropics/claude-code-action@v1
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          additional_permissions: "actions:read"
-          prompt: |
-            REPO: ${{ github.repository }}
-            PR NUMBER: ${{ github.event.pull_request.number }}
-
-            Please review this pull request and provide meaningful feedback on:
-            - Code quality and best practices
-            - Potential bugs or issues
-            - Performance considerations
-            - Security concerns
-            - Test coverage
-
-            Use the repository's CLAUDE.md for guidance on style and conventions.
-            Be constructive, helpful, terse and stay relevant in your feedback.
-
-          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
-          # or https://code.claude.com/docs/en/cli-reference for available options
+          # use_sticky_comment: "true" # doesn't work 
+          plugin_marketplaces: 'https://github.com/anthropics/claude-code.git'
+          plugins: 'code-review@claude-code-plugins'
+          prompt: '/code-review:code-review ${{ github.repository }}/pull/${{ github.event.pull_request.number }}'

.idea/codeStyles/Project.xml

@@ -43,9 +43,15 @@ See also:
 - [bitkit-core android bindings](https://github.com/synonymdev/bitkit-core/tree/master/bindings/android#installation)
 - [vss-rust-client-ffi android bindings](https://github.com/synonymdev/vss-rust-client-ffi/tree/master/bindings/android#installation)
 
-### References
-
-- For LNURL dev testing see [bitkit-docker](https://github.com/ovitrif/bitkit-docker)
+### Related Repositories
+
+- [bitkit-ios](https://github.com/synonymdev/bitkit-ios) - Native iOS Bitkit app
+- [bitkit-core](https://github.com/synonymdev/bitkit-core) - Shared Core Rust library with FFI bindings
+- [ldk-node](https://github.com/synonymdev/ldk-node) - Fork of ldk-node
+- [vss-server](https://github.com/synonymdev/vss-server) - Versioned Storage Service backend
+- [vss-rust-client-ffi](https://github.com/synonymdev/vss-rust-client-ffi) - FFI bindings for vss-rust-client 
+- [bitkit-e2e-tests](https://github.com/synonymdev/bitkit-e2e-tests) - End-to-end tests (WebdriverIO + Appium)
+- [bitkit-docker](https://github.com/synonymdev/bitkit-docker) - Docker setup for LNURL dev testing and local backend for integrations development
 
 ### Lint
 

README.md

@@ -1420,6 +1420,7 @@ class MigrationService @Inject constructor(
         }
     }
 
+    @Suppress("CyclomaticComplexMethod")
     private suspend fun updateOnchainActivityMetadata(
         item: RNActivityItem,
         onchain: OnchainActivity,
@@ -1468,6 +1469,20 @@ class MigrationService @Inject constructor(
             wasUpdated = true
         }
 
+        item.feeRate?.let { feeRate ->
+            if (feeRate > 0 && updated.feeRate != feeRate.toULong()) {
+                updated = updated.copy(feeRate = feeRate.toULong())
+                wasUpdated = true
+            }
+        }
+
+        item.address?.let { address ->
+            if (address.isNotEmpty() && updated.address != address) {
+                updated = updated.copy(address = address)
+                wasUpdated = true
+            }
+        }
+
         return if (wasUpdated) updated else null
     }
 

app/src/main/java/to/bitkit/services/MigrationService.kt

@@ -455,5 +455,5 @@ Transfers are serialized to JSON and included in backup. Restore deserializes an
 
 [^1]: Currently we can't display the channel closure transactions as 'transfer' yet in the activity list, due to an api missing in ldk-node. See comment in [ldk-node/wallet/mod.rs#L728-L738][ldk-node-comment]
 
-[external-node-channel]: https://github.com/ovitrif/bitkit-docker#external-node-channel
+[external-node-channel]: https://github.com/synonymdev/bitkit-docker#external-node-channel
 [ldk-node-comment]: https://github.com/lightningdevkit/ldk-node/blob/22a5d7742cf4e9265173ae51106db4bd9668ec8a/src/wallet/mod.rs#L728-L738