Merge branch 'master' into ovi/trezor-bridge-transport

Author: ovitrif

.agents/commands/pr.md

@@ -197,7 +197,9 @@ gh pr create --base $base --title "..." --body "..." [--draft]
 ### 8b. Changelog Fragments
 
 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.
+Do not edit `CHANGELOG.md` in normal PRs.
+If the PR was created (not dry run), rename any new changelog fragment whose filename does not start with the actual PR number to `<PR_NUMBER>.<category>.md`, preserving the category (`added`, `changed`, `deprecated`, `removed`, `fixed`, or `security`).
+If any fragment was renamed, create a follow-up commit with message `chore: rename changelog fragment` and push it.
 
 ### 9. Output Summary
 

.gitignore

@@ -25,3 +25,4 @@ buildServer.json
 .ai/
 .codex/
 .claude/*.local*
+.claude/scheduled_tasks.lock

Bitkit.xcodeproj/project.pbxproj

@@ -27,10 +27,12 @@ struct AppScene: View {
     @StateObject private var transferTracking: TransferTrackingManager
     @StateObject private var channelDetails = ChannelDetailsViewModel.shared
     @StateObject private var migrations = MigrationsService.shared
+    @StateObject private var languageManager = LanguageManager.shared
     @StateObject private var pubkyProfile = PubkyProfileManager()
     @StateObject private var contactsManager = ContactsManager()
     @State private var keyboardManager = KeyboardManager()
     @State private var trezorViewModel = TrezorViewModel()
+    @State private var calculatorInputManager = CalculatorInputManager()
 
     @State private var hideSplash = false
     @State private var removeSplash = false
@@ -54,6 +56,7 @@ struct AppScene: View {
 
         // Run app data migrations before any feature code loads migrated state
         AppDataMigrations.run()
+        PaykitFeatureFlags.enforceBuildAvailability()
 
         _app = StateObject(wrappedValue: AppViewModel(sheetViewModel: sheetViewModel, navigationViewModel: navigationViewModel))
         _sheets = StateObject(wrappedValue: sheetViewModel)
@@ -146,15 +149,24 @@ struct AppScene: View {
             .environmentObject(contactsManager)
             .environment(keyboardManager)
             .environment(trezorViewModel)
+            .environment(calculatorInputManager)
             .onChange(of: pubkyProfile.authState, initial: true) { _, authState in
                 if authState == .authenticated, let pk = pubkyProfile.publicKey {
-                    Task { try? await contactsManager.loadContacts(for: pk) }
+                    Task {
+                        try? await contactsManager.loadContacts(for: pk)
+                        if !PaykitFeatureFlags.isUIEnabled, wallet.walletExists == true {
+                            await retryPendingPaykitEndpointRemoval()
+                        }
+                    }
                 } else if authState == .idle {
                     contactsManager.reset()
                 }
             }
             .onReceive(contactsManager.$contacts) { contacts in
-                guard wallet.walletExists == true, pubkyProfile.authState == .authenticated else { return }
+                guard PaykitFeatureFlags.isUIEnabled,
+                      wallet.walletExists == true,
+                      pubkyProfile.authState == .authenticated
+                else { return }
                 let publicKeys = contacts.map(\.publicKey)
                 Task {
                     await PrivatePaykitService.shared.prepareSavedContacts(publicKeys, wallet: wallet)
@@ -385,6 +397,9 @@ struct AppScene: View {
         do {
             try await wallet.start()
             try await activity.syncLdkNodePayments()
+            if !PaykitFeatureFlags.isUIEnabled {
+                await retryPendingPaykitEndpointRemoval()
+            }
 
             // Start watching pending orders after wallet is ready
             await blocktank.startWatchingPendingOrders(transferViewModel: transfer)
@@ -546,6 +561,10 @@ struct AppScene: View {
             app.markAppStatusInit()
             BackupService.shared.startObservingBackups()
             Task {
+                if !PaykitFeatureFlags.isUIEnabled {
+                    await retryPendingPaykitEndpointRemoval()
+                }
+                guard PaykitFeatureFlags.isUIEnabled else { return }
                 await PrivatePaykitAddressReservationStore.shared.reconcileReservedIndexesWithLdk()
                 await PrivatePaykitService.shared.prepareSavedContacts(
                     contactsManager.contacts.map(\.publicKey),
@@ -578,20 +597,26 @@ struct AppScene: View {
                     await clearDeliveredNotifications()
                     await LightningService.shared.reconnectPeers()
                     try? await wallet.sync()
-                    await PrivatePaykitService.shared.retryPendingEndpointRemoval(
-                        wallet: wallet,
-                        savedPublicKeys: contactsManager.contacts.map(\.publicKey)
-                    )
+                    await retryPendingPaykitEndpointRemoval()
                     await wallet.refreshPublicPaykitEndpointsOnForeground()
-                    await PrivatePaykitService.shared.refreshSavedContactEndpoints(
-                        for: contactsManager.contacts.map(\.publicKey),
-                        wallet: wallet
-                    )
+                    if PaykitFeatureFlags.isUIEnabled {
+                        await PrivatePaykitService.shared.refreshSavedContactEndpoints(
+                            for: contactsManager.contacts.map(\.publicKey),
+                            wallet: wallet
+                        )
+                    }
                 }
             }
         }
     }
 
+    private func retryPendingPaykitEndpointRemoval() async {
+        await PrivatePaykitService.shared.retryPendingEndpointRemoval(
+            wallet: wallet,
+            savedPublicKeys: contactsManager.contacts.map(\.publicKey)
+        )
+    }
+
     /// Removes all delivered notifications from Notification Center so the app can handle them when opened.
     private func clearDeliveredNotifications() async {
         let center = UNUserNotificationCenter.current()

Bitkit/AppScene.swift

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "bitcoin-symbol.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Bitkit/Assets.xcassets/icons/bitcoin-symbol.imageset/Contents.json

@@ -2,12 +2,18 @@ import BitkitCore
 import SwiftUI
 
 struct ActivityList: View {
+    @AppStorage(PaykitFeatureFlags.uiEnabledKey) private var isPaykitUIEnabled = false
+
     @EnvironmentObject var activity: ActivityListViewModel
     @EnvironmentObject var contactsManager: ContactsManager
     @EnvironmentObject var feeEstimatesManager: FeeEstimatesManager
 
     let viewType: ActivityViewType
 
+    private var isPaykitUIActive: Bool {
+        PaykitFeatureFlags.isUIAvailable && isPaykitUIEnabled
+    }
+
     enum ActivityViewType {
         case all
         case lightning
@@ -31,7 +37,7 @@ struct ActivityList: View {
                             ActivityRow(
                                 item: item,
                                 feeEstimates: feeEstimatesManager.estimates,
-                                contact: item.contact(in: contactsManager.contacts)
+                                contact: isPaykitUIActive ? item.contact(in: contactsManager.contacts) : nil
                             )
                         }
                         .accessibilityIdentifier("Activity-\(index)")

Bitkit/Assets.xcassets/icons/bitcoin-symbol.imageset/bitcoin-symbol.pdf

@@ -1,6 +1,10 @@
 import SwiftUI
 
 struct Header: View {
+    @Environment(CalculatorInputManager.self) private var calculatorInput
+
+    @AppStorage(PaykitFeatureFlags.uiEnabledKey) private var isPaykitUIEnabled = false
+
     @EnvironmentObject var app: AppViewModel
     @EnvironmentObject var navigation: NavigationViewModel
     @EnvironmentObject var pubkyProfile: PubkyProfileManager
@@ -10,27 +14,35 @@ struct Header: View {
     /// Binding to widgets edit state; used when showWidgetEditButton is true.
     @Binding var isEditingWidgets: Bool
 
+    private var isPaykitUIActive: Bool {
+        PaykitFeatureFlags.isUIAvailable && isPaykitUIEnabled
+    }
+
     init(showWidgetEditButton: Bool = false, isEditingWidgets: Binding<Bool> = .constant(false)) {
         self.showWidgetEditButton = showWidgetEditButton
         _isEditingWidgets = isEditingWidgets
     }
 
     var body: some View {
         HStack(alignment: .center, spacing: 0) {
-            profileButton
+            if isPaykitUIActive {
+                profileButton
+            }
 
             Spacer()
 
             HStack(alignment: .center, spacing: 8) {
                 AppStatus(
                     testID: "HeaderAppStatus",
                     onPress: {
+                        if dismissCalculatorIfNeeded() { return }
                         navigation.navigate(.appStatus)
                     }
                 )
 
                 if showWidgetEditButton {
                     Button(action: {
+                        if dismissCalculatorIfNeeded() { return }
                         isEditingWidgets.toggle()
                     }) {
                         Image(isEditingWidgets ? "check-mark" : "pencil")
@@ -45,6 +57,8 @@ struct Header: View {
                 }
 
                 Button {
+                    if dismissCalculatorIfNeeded() { return }
+
                     withAnimation {
                         app.showDrawer = true
                     }
@@ -65,9 +79,10 @@ struct Header: View {
         .padding(.trailing, 10)
     }
 
-    @ViewBuilder
     private var profileButton: some View {
         Button {
+            if dismissCalculatorIfNeeded() { return }
+
             if pubkyProfile.isAuthenticated || pubkyProfile.cachedName != nil {
                 navigation.navigate(.profile)
             } else if pubkyProfile.initializationErrorMessage != nil {
@@ -96,6 +111,12 @@ struct Header: View {
         .accessibilityIdentifier("ProfileButton")
     }
 
+    private func dismissCalculatorIfNeeded() -> Bool {
+        guard calculatorInput.isPresented else { return false }
+        calculatorInput.dismiss()
+        return true
+    }
+
     @ViewBuilder
     private var profileAvatar: some View {
         if let imageUri = pubkyProfile.displayImageUri {

Bitkit/Components/Activity/ActivityList.swift

@@ -8,18 +8,38 @@ enum NumberPadType {
 
 struct NumberPad: View {
     let type: NumberPadType
+    let decimalSeparator: String
     let errorKey: String?
+    let onDeleteLongPress: (() -> Void)?
     let onPress: (String) -> Void
 
-    init(type: NumberPadType = .simple, errorKey: String? = nil, onPress: @escaping (String) -> Void) {
+    static var contentHeight: CGFloat {
+        buttonHeight * 4
+    }
+
+    private static var buttonHeight: CGFloat {
+        UIScreen.main.isSmall ? 65 : 44 + 34
+    }
+
+    init(
+        type: NumberPadType = .simple,
+        decimalSeparator: String = ".",
+        errorKey: String? = nil,
+        onDeleteLongPress: (() -> Void)? = nil,
+        onPress: @escaping (String) -> Void
+    ) {
         self.type = type
+        self.decimalSeparator = decimalSeparator
         self.errorKey = errorKey
+        self.onDeleteLongPress = onDeleteLongPress
         self.onPress = onPress
     }
 
-    private let buttonHeight: CGFloat = UIScreen.main.isSmall ? 65 : 44 + 34
     private let gridItems = Array(repeating: GridItem(.flexible(), spacing: 0), count: 3)
     private let numbers = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+    private var buttonHeight: CGFloat {
+        Self.buttonHeight
+    }
 
     var body: some View {
         VStack(spacing: 0) {
@@ -59,7 +79,7 @@ struct NumberPad: View {
                         }
                     case .decimal:
                         NumberPadButton(
-                            text: ".",
+                            text: decimalSeparator,
                             height: buttonHeight,
                             hasError: errorKey == ".",
                             testID: "NDecimal"
@@ -98,6 +118,13 @@ struct NumberPad: View {
                 .buttonStyle(NumberPadButtonStyle())
                 .accessibilityIdentifier("NRemove")
                 .frame(maxWidth: .infinity)
+                .simultaneousGesture(
+                    LongPressGesture(minimumDuration: 0.45).onEnded { _ in
+                        guard let onDeleteLongPress else { return }
+                        Haptics.play(.buttonTap)
+                        onDeleteLongPress()
+                    }
+                )
             }
         }
     }

Bitkit/Components/Header.swift

@@ -1,11 +1,14 @@
 import SwiftUI
 
 struct TabBar: View {
+    @Environment(CalculatorInputManager.self) private var calculatorInput
     @EnvironmentObject var navigation: NavigationViewModel
     @EnvironmentObject var sheets: SheetViewModel
     @EnvironmentObject var wallet: WalletViewModel
 
     var shouldShow: Bool {
+        if calculatorInput.isPresented { return false }
+
         let routesWithTabBar = Set<Route>([.activityList, .savingsWallet, .spendingWallet])
         if navigation.path.isEmpty { return true }
         return navigation.currentRoute.map { routesWithTabBar.contains($0) } ?? false
@@ -34,7 +37,7 @@ struct TabBar: View {
                 .transition(.move(edge: .bottom))
             }
         }
-        .animation(.easeInOut, value: shouldShow)
+        .animation(.easeOut(duration: 0.14), value: shouldShow)
         .bottomSafeAreaPadding()
     }
 
@@ -66,6 +69,7 @@ struct TabBar: View {
     .frame(maxWidth: .infinity, maxHeight: .infinity)
     .overlay {
         TabBar()
+            .environment(CalculatorInputManager())
             .environmentObject(NavigationViewModel())
             .environmentObject(SheetViewModel())
     }
@@ -79,6 +83,7 @@ struct TabBar: View {
     .frame(maxWidth: .infinity, maxHeight: .infinity)
     .overlay {
         TabBar()
+            .environment(CalculatorInputManager())
             .environmentObject(NavigationViewModel())
             .environmentObject(SheetViewModel())
     }