Merge branch 'master' into feat/trezor-hardware-support

Author: coreyphillips

.claude/commands/pr.md .agents/commands/pr.md.claude/commands/pr.md renamed to .agents/commands/pr.md

@@ -122,31 +122,72 @@ This PR adds support for...
 When the user provides custom instructions after `--`:
 - Parse any referenced commit SHAs and read their full messages
 - Focus the description content on areas the user emphasizes
-- Structure QA Notes according to user's specific testing instructions
+- Structure QA Notes according to user's specific manual testing instructions and automated coverage notes
 - Custom instructions take priority over default generation rules for sections they address
-- Preserve exact testing steps provided by the user (don't summarize or omit details)
-
-**QA Notes / Testing Scenarios:**
-- Structure with numbered headings and steps
-- Make steps easily referenceable
-- Be specific about what to test and expected outcomes
+- Preserve exact manual testing steps provided by the user (don't summarize or omit details)
+- If custom instructions include automated checks or coverage notes, place them under `#### Automated Checks`
+
+**QA Notes / Validation:**
+- QA Notes separate actionable human QA instructions from automated verification coverage.
+- Always use this structure:
+  ```md
+  ### QA Notes
+  #### Manual Tests
+  #### Automated Checks
+  ```
+- Keep local verification commands, Gradle tasks, detekt, lint, unit tests, build passes, cargo test, cargo clippy, npm test, typecheck, CI coverage, or similar automated checks out of `#### Manual Tests`; summarize them under `#### Automated Checks` when they add useful context.
+- Use `#### Automated Checks` to summarize automated verification evidence, prioritizing coverage added, modified, or removed with file paths and a short explanation.
+- For removed automated coverage, state why it was removed.
+- Do not list standard CI or PR bot commands as checkbox items just because they run for every PR. If standard CI coverage is worth mentioning, summarize it in one sentence.
+- List raw commands only when they were run locally, are non-standard, use special flags or environment values, validate workflow behavior, or explain a meaningful verification gap.
+- For workflow behavior validation, include `(after merge)` in the automated check item because workflow changes only take effect for PRs opened after the workflow update merges.
+- If no actionable manual validation exists, write `N/A` under `#### Manual Tests`.
+- If no automated checks were run and no automated coverage changed, write `N/A` under `#### Automated Checks`.
+- Write manual tests using this template:
+  ```md
+  - [ ] **{numbering}.** {optional_condition + →} {screen_action} → {next_screen_action}: expectation
+  ```
+- Use a list of unchecked checkboxes for each individual test.
+- Use a numbered prefix for each test, in bold, for example `**1.**`, `**2.**`.
+- Use `regression:` for regression checks, positioned after the numbering.
+- Use sub-lists for variations of the same test.
+- Use letter suffixes in numbering for each variation when a test has a sub-list, for example `**3a.**`, `**3b.**`.
+- Always use `→` to denote navigation, for example `Send → Amount`.
+- Use screen names from code, formatted as separate words without the `Screen` suffix, for example `SendAmountScreen` becomes `Send Amount`.
+- Use short-form wording like `in-sheet` for sheet screens, `nav` for navigation, `back` for back nav, and `LN` for Lightning Network.
 
 **For library repos (has `bindings/` directory or `Cargo.toml`):**
-Structure QA Notes around testing and integration:
+Structure manual QA around integration validation only. Automated checks belong under `#### Automated Checks`.
 
 Example:
 ```
 ### QA Notes
+#### Manual Tests
+- [ ] **1.** Consumer app → exercise updated binding flow: behavior matches previous release.
+- [ ] **2.** `regression:` Android integration screen → trigger changed API path: no crash or stale data.
+#### Automated Checks
+- Binding tests added: cover updated Android API path in `bindings/android/...`.
+- CI: standard cargo and binding checks run by the PR bot.
+```
 
-#### 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
+Concrete style target:
+```md
+### QA Notes
+#### Manual Tests
+- [ ] **1.** No usable channels/spending balance → scan LN invoice: error shows immediately, not after 15s.
+- [ ] **2.** Scanner → scan fixed amount LN invoice: Send Confirm or QuickPay opens directly.
+- [ ] **3a.** `regression:` Send → scanner/paste fixed amount LN invoice: in-sheet nav to Confirm or QuickPay.
+  - [ ] **3b.** `regression:` Variable amount LN invoice/LNURL-pay: lands on Amount view.
+- [ ] **4a.** Activity Detail of LN transfer → tap Connection: lands on Channel Detail.
+  - [ ] **4b.** back: returns to Activity Detail.
+- [ ] **5a.** Settings → Lightning Connections → tap channel: still opens Channel Detail.
+  - [ ] **5b.** back: returns to Connections List.
+- [ ] **6.** `regression:` Channel Detail → tap Close Connection: works.
+#### Automated Checks
+- Unit tests added: cover invoice timeout handling in `app/src/test/.../SendInvoiceTest.kt`.
+- Unit tests modified: update channel navigation assertions in `app/src/test/.../ChannelDetailTest.kt`.
+- Test coverage removed: delete stale mock-only assertions from `app/src/test/.../OldFlowTest.kt` because the flow no longer exists.
+- CI: standard compile, unit test, and detekt checks run by the PR bot.
 ```
 
 **Preview Section (conditional):**

.claude/commands/release.md .agents/commands/release.md.claude/commands/release.md renamed to .agents/commands/release.md

@@ -53,18 +53,9 @@ If "Previous tag": ask `"Which tag?"` with a text input (default: `v{oldVersionN
 
 If "master" or if the release is minor/major: `{baseRef} = master`.
 
-### 2c. Finalize Changelog
-
-Read `CHANGELOG.md` and check whether `## [Unreleased]` has any entries beneath it.
-
-**If entries exist:**
-1. Replace `## [Unreleased]` with `## [{newVersionName}] - {YYYY-MM-DD}` (today's date)
-2. Insert a fresh empty `## [Unreleased]` section above the new version heading
-3. Update the compare link references at the bottom of the file:
-   - Change `[Unreleased]` link to compare from `v{newVersionName}...HEAD`
-   - Add a new `[{newVersionName}]` link comparing `v{oldVersionName}...v{newVersionName}`
-
-**If no entries:** Print `⚠ CHANGELOG.md has no unreleased entries — continuing without changelog update.` and proceed.
+Set `{changelogTarget}`:
+- If `{baseRef}` is `master`: `next`
+- Otherwise: `hotfix`
 
 ### 3. Create Release Branch & Bump Version
 
@@ -86,18 +77,34 @@ Cherry-pick the commits you need onto this branch now, then continue.
 ```
 Wait for the user to confirm they are done cherry-picking before proceeding.
 
+Finalize changelog after the release branch contains all release commits:
+
+```bash
+scripts/collect-changelog.sh --target {changelogTarget}
+```
+
+Read `CHANGELOG.md` and check whether `## [Unreleased]` has any entries beneath it after collecting fragments.
+
+**If entries exist:**
+1. Replace `## [Unreleased]` with `## [{newVersionName}] - {YYYY-MM-DD}` (today's date)
+2. Insert a fresh empty `## [Unreleased]` section above the new version heading
+3. Update the compare link references at the bottom of the file:
+   - Change `[Unreleased]` link to compare from `v{newVersionName}...HEAD`
+   - Add a new `[{newVersionName}]` link comparing `v{oldVersionName}...v{newVersionName}`
+
+**If no entries:** Print `⚠ CHANGELOG.md has no unreleased entries — continuing without changelog update.` and proceed.
+
 Edit `app/build.gradle.kts`:
 - Change `versionCode = {old}` to `versionCode = {newVersionCode}`
 - Change `versionName = "{old}"` to `versionName = "{newVersionName}"`
 
 ```bash
 git add app/build.gradle.kts
-# Only stage CHANGELOG.md if step 2c modified it (i.e. unreleased entries were found)
 git commit -m "chore: version {newVersionName}"
 git push -u origin release-{newVersionName}
 ```
 
-If step 2c updated `CHANGELOG.md`, also `git add CHANGELOG.md` before the commit.
+If changelog collection updated `CHANGELOG.md` or deleted consumed fragments, run `git add CHANGELOG.md changelog.d` before the commit.
 
 ### 4. Create Version Bump PR
 

.claude/commands

@@ -0,0 +1 @@
+../.agents/commands

.cursor/rules/rules.main.mdc

@@ -63,12 +63,14 @@ alwaysApply: true
 ---
 
 ## Changelog rules:
-- add an entry under `## [Unreleased]` in `CHANGELOG.md` for `feat:` and `fix:` PRs; skip for `chore:`, `ci:`, `refactor:`, `test:`, `docs:` unless the change is user-facing
-- use standard Keep a Changelog categories: `### Added`, `### Changed`, `### Deprecated`, `### Removed`, `### Fixed`, `### Security`
-- append `#PR_NUMBER` at the end of each changelog entry when the PR number is known
-- place new entries at the top of their category section (newest first)
-- never modify released version sections — only edit `## [Unreleased]`
-- create category headings on demand (don't add empty stubs)
+- never edit `CHANGELOG.md` in normal feature/fix PRs; release automation collects changelog fragments into it
+- add exactly one changelog fragment for user-facing `feat:` and `fix:` PRs; skip for `chore:`, `ci:`, `refactor:`, `test:`, `docs:` unless the change is user-facing
+- put normal release fragments in `changelog.d/next/` and hotfix fragments in `changelog.d/hotfix/`
+- name fragments `<issue-or-pr>.<category>.md`, where category is one of `added`, `changed`, `deprecated`, `removed`, `fixed`, or `security`
+- write the fragment as one polished user-facing sentence without a leading bullet and without a PR number
+- never add multiple changelog fragments for the same PR — summarize all changes in one concise fragment
+- release commits consume fragments with `scripts/collect-changelog.sh --target next|hotfix`, update `CHANGELOG.md`, and delete consumed fragment files
+- never modify released version sections manually
 
 ---
 

.github/pull_request_template.md

@@ -1,5 +1,5 @@
 <!-- Closes | Fixes | Resolves #ISSUE_ID -->
-<!-- Changelog: Add an entry under ## [Unreleased] in CHANGELOG.md for user-facing changes (skip for chores/CI/refactors). -->
+<!-- Changelog: For user-facing changes, add one fragment in changelog.d/next/ or changelog.d/hotfix/. Do not edit CHANGELOG.md in normal PRs. -->
 <!-- Brief summary of the PR changes, linking to the related resources (issue/design/bug/etc) if applicable. -->
 
 ### Description

AGENTS.md

@@ -1,6 +1,10 @@
 # CLAUDE.md
 
-This file provides guidance to AI agents like Cursor/Claude Code/Codex/WARP when working with code in this repository.
+This file provides guidance to Codex, Claude Code, and Cursor when working with code in this repository.
+
+## Agent Commands
+
+Durable shared agent command specs live in `.agents/commands/`. For PR creation, follow `.agents/commands/pr.md`; `.claude/commands` is a compatibility symlink to the same files.
 
 ## Build Commands
 
@@ -194,7 +198,7 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 - ALWAYS use `remember` for expensive Compose computations
 - ALWAYS declare `modifier: Modifier = Modifier,` as the FIRST optional parameter in composable declarations
 - ALWAYS pass `modifier = ...` as the LAST argument in composable calls
-- ALWAYS add trailing commas in multi-line declarations; NEVER add a trailing comma to `modifier = ...` at call sites
+- ALWAYS add trailing commas in multi-line declarations, EXCEPT after a `modifier = ...` last argument — never add a trailing comma there, whether the modifier is a single call (`modifier = Modifier.weight(1f)`) or a chain (`modifier = Modifier.fillMaxWidth().testTag("foo")`)
 - ALWAYS use `navController.navigateTo(route)` for simple navigation; NEVER use raw `navController.navigate(route)` — `navigateTo` prevents duplicate destinations
 - ALWAYS prefer `VerticalSpacer`, `HorizontalSpacer`, `FillHeight` and `FillWidth` over `Spacer` when applicable
 - PREFER declaring small dependant classes, constants, interfaces or top-level functions in the same file with the core class where these are used
@@ -240,13 +244,14 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 
 ### Changelog
 
-- ALWAYS add exactly ONE entry per PR under `## [Unreleased]` in `CHANGELOG.md` for `feat:` and `fix:` PRs; skip for `chore:`, `ci:`, `refactor:`, `test:`, `docs:` unless the change is user-facing
-- NEVER add multiple changelog lines for the same PR — summarize all changes in a single concise entry
-- USE standard Keep a Changelog categories: `### Added`, `### Changed`, `### Deprecated`, `### Removed`, `### Fixed`, `### Security`
-- ALWAYS append `#PR_NUMBER` at the end of each changelog entry when the PR number is known
-- ALWAYS place new entries at the top of their category section (newest first)
-- NEVER modify released version sections — only edit `## [Unreleased]`
-- ALWAYS create category headings on demand (don't add empty stubs)
+- NEVER edit `CHANGELOG.md` in normal feature/fix PRs; release automation collects changelog fragments into it
+- ALWAYS add exactly ONE changelog fragment for user-facing `feat:` and `fix:` PRs; skip for `chore:`, `ci:`, `refactor:`, `test:`, `docs:` unless the change is user-facing
+- PUT normal release fragments in `changelog.d/next/` and hotfix fragments in `changelog.d/hotfix/`
+- NAME fragments `<issue-or-pr>.<category>.md`, where category is one of `added`, `changed`, `deprecated`, `removed`, `fixed`, or `security`
+- WRITE the fragment as one polished user-facing sentence without a leading bullet and without a PR number
+- NEVER add multiple changelog fragments for the same PR — summarize all changes in one concise fragment
+- Release commits consume fragments with `scripts/collect-changelog.sh --target next|hotfix`, update `CHANGELOG.md`, and delete consumed fragment files
+- NEVER modify released version sections manually
 
 ### Device Debugging (adb)
 

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Improve Pubky profile restore, contact editing, and contact routing flows #905
+
+### Fixed
+- Fix probe results and add keysend probes #920
+- Align top bar back arrow and passphrase input cursor/placeholder with iOS #906
+- Polish Terms of Use screen padding to match iOS #903
+
 ## [2.2.0] - 2026-04-07
 
 ### Fixed
@@ -17,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Show loading state on Spending tab when node is not running #875
 
 ### Added
+- Pubky profile onboarding with contact sync, import, and editing #824
 - Lightning Connections empty state with onboarding screen #857
 - Unified PIN management screen (enable/disable/change in one place) #857
 - Support entry in drawer menu #857

app/build.gradle.kts

@@ -47,6 +47,7 @@ val bcp47Locales = listOf(
     "en", "ar", "es-419", "ca", "cs", "de", "el", "es", "es-ES", "fr", "it", "nl", "pl", "pt", "pt-BR", "ru"
 )
 val e2eBackendEnv = System.getenv("E2E_BACKEND") ?: "local"
+val e2eHomegateUrlEnv = System.getenv("E2E_HOMEGATE_URL") ?: "http://127.0.0.1:6288"
 
 android {
     namespace = "to.bitkit"
@@ -63,6 +64,7 @@ android {
         }
         buildConfigField("boolean", "E2E", System.getenv("E2E")?.toBoolean()?.toString() ?: "false")
         buildConfigField("String", "E2E_BACKEND", "\"$e2eBackendEnv\"")
+        buildConfigField("String", "E2E_HOMEGATE_URL", "\"$e2eHomegateUrlEnv\"")
         buildConfigField("boolean", "GEO", System.getenv("GEO")?.toBoolean()?.toString() ?: "true")
         buildConfigField("String", "LOCALES", "\"${bcp47Locales.joinToString(",")}\"")
     }
@@ -237,6 +239,7 @@ dependencies {
     implementation(libs.bouncycastle.provider.jdk)
     implementation(libs.ldk.node.android) { exclude(group = "net.java.dev.jna", module = "jna") }
     implementation(libs.bitkit.core)
+    implementation(libs.paykit)
     implementation(libs.vss.client)
     // Firebase
     implementation(platform(libs.firebase.bom))
@@ -267,6 +270,9 @@ dependencies {
     implementation(libs.charts)
     implementation(libs.haze)
     implementation(libs.haze.materials)
+    // Image Loading
+    implementation(platform(libs.coil.bom))
+    implementation(libs.coil.compose)
     // Compose Navigation
     implementation(libs.navigation.compose)
     androidTestImplementation(libs.navigation.testing)
@@ -280,6 +286,9 @@ dependencies {
     // WorkManager
     implementation(libs.hilt.work)
     implementation(libs.work.runtime.ktx)
+    // Glance - AppWidgets
+    implementation(libs.glance.appwidget)
+    implementation(libs.glance.material3)
     // Ktor - Networking
     implementation(libs.ktor.client.core)
     implementation(libs.ktor.client.okhttp)

app/src/main/AndroidManifest.xml

@@ -3,9 +3,14 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <queries>
+        <package android:name="to.pubky.ring" />
         <intent>
             <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
         </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="pubkyauth" />
+        </intent>
     </queries>
 
     <uses-feature
@@ -119,6 +124,7 @@
                 <data android:scheme="lnurlw" />
                 <data android:scheme="lnurlc" />
                 <data android:scheme="lnurlp" />
+                <data android:scheme="pubkyauth" />
             </intent-filter>
 
             <!-- NFC -->
@@ -198,6 +204,33 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
+
+        <!-- AppWidget Config Activity -->
+        <activity
+            android:name=".appwidget.config.AppWidgetConfigActivity"
+            android:exported="true"
+            android:excludeFromRecents="true"
+            android:screenOrientation="portrait"
+            android:taskAffinity=""
+            android:theme="@style/Theme.App">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <!-- Price Widget -->
+        <receiver
+            android:name=".appwidget.ui.price.PriceGlanceReceiver"
+            android:exported="true"
+            android:label="@string/widgets__price__name">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/appwidget_info_price" />
+        </receiver>
+
     </application>
 
 </manifest>

app/src/main/java/to/bitkit/App.kt

@@ -7,6 +7,8 @@ import android.app.Application.ActivityLifecycleCallbacks
 import android.os.Bundle
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
+import coil3.ImageLoader
+import coil3.SingletonImageLoader
 import dagger.hilt.android.HiltAndroidApp
 import to.bitkit.env.Env
 import to.bitkit.services.BluetoothInit
@@ -17,13 +19,17 @@ internal open class App : Application(), Configuration.Provider {
     @Inject
     lateinit var workerFactory: HiltWorkerFactory
 
+    @Inject
+    lateinit var imageLoader: ImageLoader
+
     override val workManagerConfiguration
         get() = Configuration.Builder()
             .setWorkerFactory(workerFactory)
             .build()
 
     override fun onCreate() {
         super.onCreate()
+        SingletonImageLoader.setSafe { imageLoader }
         currentActivity = CurrentActivity().also { registerActivityLifecycleCallbacks(it) }
         Env.initAppStoragePath(filesDir.absolutePath)
         // Initialize btleplug for Bluetooth support (required before any BLE usage)