Merge branch 'master' into release-2.2.1

Author: piotr-iohk

.claude/commands/pr.md

@@ -145,13 +145,10 @@ gh pr create --base $base --title "..." --body "..." [--draft]
 - Add `--draft` flag if draft mode selected
 - If actual PR number differs from predicted, rename the saved file
 
-### 8b. Backfill Changelog PR Number
+### 8b. Changelog Fragments
 
-If the PR was created (not dry run) and `CHANGELOG.md` was modified in the branch (`git diff $base...HEAD --name-only | grep CHANGELOG.md`):
-- Run `git diff $base...HEAD -- CHANGELOG.md` to identify only lines added in this branch (lines prefixed with `+`, excluding the `+++` header line)
-- From those added lines, find entries under `## [Unreleased]` that are missing a `#NUMBER` suffix
-- Append the actual PR number to only those entries, e.g. `- Add foo` becomes `- Add foo #123`
-- If any entries were updated, create a new commit with message `chore: backfill changelog pr number` and push
+If the PR is user-facing, verify the branch adds exactly one changelog fragment under `changelog.d/next/` or `changelog.d/hotfix/`.
+Do not edit `CHANGELOG.md` in normal PRs and do not backfill PR numbers into fragments.
 
 ### 9. Output Summary
 

.claude/commands/release.md

@@ -53,11 +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. Check Changelog
-
-Read `CHANGELOG.md` and check whether `## [Unreleased]` has any entries beneath it. Remember the result for Step 3.
-
-**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
 
@@ -72,20 +70,30 @@ If `{baseRef}` is `master`, pull latest: `git pull origin master`. Skip pull if
 git checkout -b release-{newVersionName}
 ```
 
-**Finalize Changelog (if Step 2c found entries):**
-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 the base is a tag (not master), print:
 ```
 Release branch created from {baseRef}.
 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 `Bitkit.xcodeproj/project.pbxproj` using sed to replace **all** occurrences of the old values (test targets use `= 1` / `= 1.0` so they won't match):
 
 ```bash
@@ -97,12 +105,12 @@ Verify the edit updated exactly 4 occurrences of each (Bitkit Debug/Release + Bi
 
 ```bash
 git add Bitkit.xcodeproj/project.pbxproj
-# Only stage CHANGELOG.md if it was finalized above (i.e. unreleased entries were found in step 2c)
-git add CHANGELOG.md
 git commit -m "chore: version {newVersionName}"
 git push -u origin release-{newVersionName}
 ```
 
+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
 
 Read `.github/pull_request_template.md` for structure. Create PR:

.github/pull_request_template.md

@@ -1,4 +1,4 @@
-<!-- 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. -->
 
 ### Description
 

AGENTS.md

@@ -116,6 +116,8 @@ This project follows **modern SwiftUI patterns** and explicitly **AVOIDS traditi
    - Async operations should delegate to `@Observable` business logic objects
 
 4. **Component Design**
+   - **Always reuse existing components** before creating new ones — check `Components/` for buttons, text styles, layouts, and other shared UI. If identical or near-identical UI exists elsewhere in the codebase, extract it into a shared component rather than duplicating it.
+   - Use the project's text components (`DisplayText`, `HeadlineText`, `TitleText`, `SubtitleText`, `BodyMText`, `BodyMSBText`, `BodySSBText`, `BodySText`, `CaptionMText`, `CaptionText`) instead of raw `Text().font().foregroundColor()` chains.
    - Decompose views into small, focused, single-purpose components
    - Use descriptive names (e.g., `UserProfileCard` not `Card`)
    - Prefer composition over deep view hierarchies
@@ -276,13 +278,14 @@ Ensure accessibility modifiers and labels are added to custom components.
 
 ### 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
 
 ## Common Workflows
 

Bitkit.xcodeproj/project.pbxproj

@@ -7,13 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		182817C12F59A7F10055A441 /* Paykit in Frameworks */ = {isa = PBXBuildFile; productRef = 182817C02F59A7F10055A441 /* Paykit */; };
 		18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65DFF2EB964B500252335 /* VssRustClientFfi */; };
 		18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */ = {isa = PBXBuildFile; productRef = 18D65E012EB964BD00252335 /* VssRustClientFfi */; };
 		3D76260F4C9C4A53B1E4A001 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D76260E4C9C4A53B1E4A001 /* CoreBluetooth.framework */; };
 		3D7626104C9C4A53B1E4A001 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D76260E4C9C4A53B1E4A001 /* CoreBluetooth.framework */; };
 		4AAB08CA2E1FE77600BA63DF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 4AAB08C92E1FE77600BA63DF /* Lottie */; };
-		4AFCA3702E05933800205CAE /* Zip in Frameworks */ = {isa = PBXBuildFile; productRef = 4AFCA36F2E05933800205CAE /* Zip */; };
-		4AFCA3722E0596D900205CAE /* Zip in Frameworks */ = {isa = PBXBuildFile; productRef = 4AFCA3712E0596D900205CAE /* Zip */; };
 		961058E32C355B5500E1F1D8 /* BitkitNotification.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 961058DC2C355B5500E1F1D8 /* BitkitNotification.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */ = {isa = PBXBuildFile; productRef = 9613018B2C5022D700878183 /* LDKNode */; };
 		968FE1402DFB016B0053CD7F /* LDKNode in Frameworks */ = {isa = PBXBuildFile; productRef = 968FE13F2DFB016B0053CD7F /* LDKNode */; };
@@ -157,7 +156,6 @@
 				3D7626104C9C4A53B1E4A001 /* CoreBluetooth.framework in Frameworks */,
 				968FE1402DFB016B0053CD7F /* LDKNode in Frameworks */,
 				96DEA03C2DE8BBAB009932BF /* BitkitCore in Frameworks */,
-				4AFCA3722E0596D900205CAE /* Zip in Frameworks */,
 				96E493A82C943184000E8BC2 /* secp256k1 in Frameworks */,
 				18D65E022EB964BD00252335 /* VssRustClientFfi in Frameworks */,
 			);
@@ -167,8 +165,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				182817C12F59A7F10055A441 /* Paykit in Frameworks */,
 				3D76260F4C9C4A53B1E4A001 /* CoreBluetooth.framework in Frameworks */,
-				4AFCA3702E05933800205CAE /* Zip in Frameworks */,
 				968FDF162DFAFE230053CD7F /* LDKNode in Frameworks */,
 				18D65E002EB964B500252335 /* VssRustClientFfi in Frameworks */,
 				96E493A42C942FD1000E8BC2 /* secp256k1 in Frameworks */,
@@ -246,7 +244,6 @@
 			packageProductDependencies = (
 				96E493A72C943184000E8BC2 /* secp256k1 */,
 				96DEA03B2DE8BBAB009932BF /* BitkitCore */,
-				4AFCA3712E0596D900205CAE /* Zip */,
 				968FE13F2DFB016B0053CD7F /* LDKNode */,
 				18D65E012EB964BD00252335 /* VssRustClientFfi */,
 			);
@@ -278,9 +275,9 @@
 				96E493A32C942FD1000E8BC2 /* secp256k1 */,
 				96E20CD32CB6D91A00C24149 /* CodeScanner */,
 				96DEA0392DE8BBA1009932BF /* BitkitCore */,
-				4AFCA36F2E05933800205CAE /* Zip */,
 				4AAB08C92E1FE77600BA63DF /* Lottie */,
 				18D65DFF2EB964B500252335 /* VssRustClientFfi */,
+				182817C02F59A7F10055A441 /* Paykit */,
 			);
 			productName = Bitkit;
 			productReference = 96FE1F612C2DE6AA006D0C8B /* Bitkit.app */;
@@ -384,10 +381,10 @@
 				96E493A22C942FD1000E8BC2 /* XCRemoteSwiftPackageReference "swift-secp256k1" */,
 				96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */,
 				96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */,
-				4AFCA36E2E05933800205CAE /* XCRemoteSwiftPackageReference "Zip" */,
 				968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */,
 				4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
 				18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */,
+				182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */,
 			);
 			productRefGroup = 96FE1F622C2DE6AA006D0C8B /* Products */;
 			projectDirPath = "";
@@ -903,6 +900,14 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
+		182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/pubky/paykit-rs";
+			requirement = {
+				kind = revision;
+				revision = cd1253291b1582759d569372d5942b8871527ea1;
+			};
+		};
 		18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
@@ -919,20 +924,12 @@
 				minimumVersion = 4.5.2;
 			};
 		};
-		4AFCA36E2E05933800205CAE /* XCRemoteSwiftPackageReference "Zip" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/marmelroy/Zip.git";
-			requirement = {
-				kind = upToNextMinorVersion;
-				minimumVersion = 2.1.2;
-			};
-		};
 		968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/synonymdev/ldk-node";
 			requirement = {
 				kind = revision;
-				revision = ae38eadab70fceb5dbe242bc02bf895581cb7c3f;
+				revision = 52f73c4402cfb06a020ab8fa9594b5ecb94e3cd6;
 			};
 		};
 		96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */ = {
@@ -962,6 +959,11 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		182817C02F59A7F10055A441 /* Paykit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 182817BF2F59A7F10055A441 /* XCRemoteSwiftPackageReference "paykit-rs" */;
+			productName = Paykit;
+		};
 		18D65DFF2EB964B500252335 /* VssRustClientFfi */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */;
@@ -977,16 +979,6 @@
 			package = 4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */;
 			productName = Lottie;
 		};
-		4AFCA36F2E05933800205CAE /* Zip */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4AFCA36E2E05933800205CAE /* XCRemoteSwiftPackageReference "Zip" */;
-			productName = Zip;
-		};
-		4AFCA3712E0596D900205CAE /* Zip */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4AFCA36E2E05933800205CAE /* XCRemoteSwiftPackageReference "Zip" */;
-			productName = Zip;
-		};
 		9613018B2C5022D700878183 /* LDKNode */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 968FE13E2DFB016B0053CD7F /* XCRemoteSwiftPackageReference "ldk-node" */;

Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -68,7 +68,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

Bitkit.xcodeproj/xcshareddata/xcschemes/Bitkit.xcscheme

@@ -27,6 +27,8 @@ struct AppScene: View {
     @StateObject private var transferTracking: TransferTrackingManager
     @StateObject private var channelDetails = ChannelDetailsViewModel.shared
     @StateObject private var migrations = MigrationsService.shared
+    @StateObject private var pubkyProfile = PubkyProfileManager()
+    @StateObject private var contactsManager = ContactsManager()
     @State private var keyboardManager = KeyboardManager()
 
     @State private var hideSplash = false
@@ -135,7 +137,29 @@ struct AppScene: View {
             .environmentObject(tagManager)
             .environmentObject(transferTracking)
             .environmentObject(channelDetails)
+            .environmentObject(pubkyProfile)
+            .environmentObject(contactsManager)
             .environment(keyboardManager)
+            .onChange(of: pubkyProfile.authState, initial: true) { _, authState in
+                if authState == .authenticated, let pk = pubkyProfile.publicKey {
+                    Task { try? await contactsManager.loadContacts(for: pk) }
+                } else if authState == .idle {
+                    contactsManager.reset()
+                }
+            }
+            .onChange(of: navigation.currentRoute) { oldRoute, newRoute in
+                guard shouldDiscardPendingImport(currentRoute: oldRoute, destination: newRoute) else {
+                    return
+                }
+
+                contactsManager.clearPendingImport()
+            }
+            .onChange(of: pubkyProfile.sessionRestorationFailed) { _, failed in
+                if failed {
+                    pubkyProfile.sessionRestorationFailed = false
+                    app.toast(type: .error, title: t("profile__session_expired_title"), description: t("profile__session_expired_description"))
+                }
+            }
             .onAppear {
                 if !settings.pinEnabled {
                     isPinVerified = true
@@ -240,9 +264,12 @@ struct AppScene: View {
             WalletRestoreSuccess()
         } else {
             if !isPinVerified && settings.pinEnabled {
-                AuthCheck {
-                    isPinVerified = true
-                }
+                AuthCheck(
+                    onCancel: nil,
+                    onPinVerified: {
+                        isPinVerified = true
+                    }
+                )
             } else {
                 MainNavView()
             }
@@ -307,19 +334,25 @@ struct AppScene: View {
             app?.handleLdkNodeEvent(lightningEvent)
         }
 
-        if wallet.isRestoringWallet {
-            Task {
+        Task {
+            if wallet.isRestoringWallet {
                 await restoreFromMostRecentBackup()
 
                 await MainActor.run {
                     widgets.loadSavedWidgets()
                     widgets.objectWillChange.send()
                 }
-
+                await pubkyProfile.initialize()
                 await startWallet()
+                return
             }
-        } else {
-            Task { await startWallet() }
+
+            let initializePubkyTask = Task {
+                await pubkyProfile.initialize()
+            }
+
+            await startWallet()
+            await initializePubkyTask.value
         }
     }