chore: merge master into release

Author: ovitrif

AGENTS.md

@@ -279,6 +279,7 @@ Ensure accessibility modifiers and labels are added to custom components.
 - Swift version: 5.10
 - Use descriptive names: `isLoadingUsers` not `loading`
 - Follow Apple's SwiftUI best practices
+- AVOID code comments on private functions, types, etc — PREFER self-documenting names that make intent obvious without explanation; only add a comment when the rationale is genuinely non-obvious (e.g. a workaround, an edge case, or a "why" the code itself can't convey)
 
 ### Changelog
 

Bitkit.xcodeproj/xcshareddata/xcschemes/BitkitAITests.xcscheme

@@ -31,8 +31,7 @@
       shouldAutocreateTestPlan = "YES">
       <Testables>
          <TestableReference
-            skipped = "NO"
-            parallelizable = "NO">
+            skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "96FE1F7B2C2DE6AC006D0C8B"

Bitkit/Components/Button/Button.swift

@@ -166,7 +166,8 @@ struct CustomButton: View {
                 size: size,
                 icon: icon,
                 isDisabled: effectiveIsDisabled,
-                isPressed: isPressed
+                isPressed: isPressed,
+                isLoading: isLoading
             ))
         case .tertiary:
             AnyView(TertiaryButtonView(

Bitkit/Components/Button/SecondaryButtonView.swift

@@ -6,14 +6,19 @@ struct SecondaryButtonView: View {
     let icon: AnyView?
     let isDisabled: Bool
     let isPressed: Bool
+    var isLoading: Bool = false
 
     var body: some View {
         HStack(spacing: 8) {
-            if let icon {
+            if let icon, !isLoading {
                 icon
             }
 
-            if size == .small {
+            if isLoading {
+                ProgressView()
+                    .progressViewStyle(CircularProgressViewStyle(tint: textColor))
+                    .frame(width: 20, height: 20)
+            } else if size == .small {
                 CaptionBText(title, textColor: textColor)
             } else {
                 BodySSBText(title, textColor: textColor)

Bitkit/Components/NumberPad.swift

@@ -10,6 +10,7 @@ struct NumberPad: View {
     let type: NumberPadType
     let decimalSeparator: String
     let errorKey: String?
+    let isDisabled: Bool
     let onDeleteLongPress: (() -> Void)?
     let onPress: (String) -> Void
 
@@ -25,12 +26,14 @@ struct NumberPad: View {
         type: NumberPadType = .simple,
         decimalSeparator: String = ".",
         errorKey: String? = nil,
+        isDisabled: Bool = false,
         onDeleteLongPress: (() -> Void)? = nil,
         onPress: @escaping (String) -> Void
     ) {
         self.type = type
         self.decimalSeparator = decimalSeparator
         self.errorKey = errorKey
+        self.isDisabled = isDisabled
         self.onDeleteLongPress = onDeleteLongPress
         self.onPress = onPress
     }
@@ -127,6 +130,8 @@ struct NumberPad: View {
                 )
             }
         }
+        .opacity(isDisabled ? 0.5 : 1)
+        .disabled(isDisabled)
     }
 }
 

Bitkit/Components/NumberPadTextField.swift

@@ -3,7 +3,7 @@ import SwiftUI
 /// NumberPadTextField - Amount view to be used with number pad
 struct NumberPadTextField: View {
     @EnvironmentObject var currency: CurrencyViewModel
-    @ObservedObject var viewModel: AmountInputViewModel
+    var viewModel: AmountInputViewModel
 
     var showConversion: Bool = true
     var showEditButton: Bool = false

Bitkit/Components/ToastView.swift

@@ -21,7 +21,7 @@ struct ToastView: View {
         .frame(maxWidth: .infinity, alignment: .leading)
         .padding(16)
         .background(accentColor.opacity(0.32))
-        .background(.ultraThinMaterial)
+        .background(BlurView())
         .cornerRadius(16)
         .shadow(color: .black.opacity(0.4), radius: 10, x: 0, y: 25)
         .accessibilityIdentifierIfPresent(toast.accessibilityIdentifier)
@@ -78,7 +78,7 @@ struct ToastView: View {
                         }
                     } else {
                         // Snap back to original position
-                        withAnimation(.spring(response: 0.3, dampingFraction: 0.7)) {
+                        withAnimation(ToastMotion.entrance) {
                             dragOffset = 0
                         }
                     }
@@ -92,7 +92,7 @@ struct ToastView: View {
         case .info: return .blueAccent
         case .lightning: return .purpleAccent
         case .warning: return .brandAccent
-        case .error: return .redAccent
+        case .error: return .brandAccent
         }
     }
 }

Bitkit/Components/Trezor/TrezorAccountTypeSelector.swift

@@ -0,0 +1,18 @@
+import SwiftUI
+
+struct TrezorAccountTypeSelector: View {
+    @Binding var selection: TrezorAccountTypeSelection
+    var title: String = "Account Type"
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            CaptionMText(title)
+
+            SegmentedControl(selectedTab: $selection, tabs: TrezorAccountTypeSelection.allCases)
+
+            FootnoteText(selection.subtitle)
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .accessibilityIdentifier("TrezorAccountTypeSelector")
+    }
+}

Bitkit/Components/Trezor/TrezorPinPad.swift

@@ -6,8 +6,11 @@ struct TrezorPinPad: View {
     /// Current PIN being entered
     @Binding var pin: String
 
-    /// Maximum PIN length
-    var maxLength: Int = 9
+    /// Maximum PIN length. Trezor PINs can be up to 50 digits.
+    var maxLength: Int = 50
+
+    /// Number of entered-digit dots to render per row before wrapping.
+    private let dotsPerRow = 9
 
     /// PIN pad layout (positions map to device keypad)
     /// The Trezor shows scrambled numbers, we show only position dots
@@ -19,12 +22,30 @@ struct TrezorPinPad: View {
 
     var body: some View {
         VStack(spacing: 16) {
-            // PIN display
-            HStack(spacing: 12) {
-                ForEach(0 ..< maxLength, id: \.self) { index in
-                    Circle()
-                        .fill(index < pin.count ? Color.white : Color.white.opacity(0.3))
-                        .frame(width: 12, height: 12)
+            // PIN display — one dot per entered digit, wrapping across rows so long
+            // PINs (Trezor allows up to 50 digits) don't overflow a single line.
+            VStack(spacing: 8) {
+                if pin.isEmpty {
+                    // Placeholder row so the layout doesn't collapse before entry.
+                    HStack(spacing: 12) {
+                        ForEach(0 ..< dotsPerRow, id: \.self) { _ in
+                            Circle()
+                                .fill(Color.white.opacity(0.3))
+                                .frame(width: 12, height: 12)
+                        }
+                    }
+                } else {
+                    let rowCount = (pin.count + dotsPerRow - 1) / dotsPerRow
+                    ForEach(0 ..< rowCount, id: \.self) { row in
+                        let dotsInRow = min(dotsPerRow, pin.count - row * dotsPerRow)
+                        HStack(spacing: 12) {
+                            ForEach(0 ..< dotsInRow, id: \.self) { _ in
+                                Circle()
+                                    .fill(Color.white)
+                                    .frame(width: 12, height: 12)
+                            }
+                        }
+                    }
                 }
             }
             .padding(.bottom, 24)

Bitkit/Components/Widgets/Suggestions.swift

@@ -164,6 +164,10 @@ struct Suggestions: View {
     /// When true, show a fixed set of static cards and ignore taps (e.g. widget preview).
     var isPreview: Bool = false
 
+    /// When editing the home grid, keep the widget visible (and reorderable/removable) by falling
+    /// back to the static preview set when there are no live cards to show.
+    var isEditing: Bool = false
+
     var previewCardIds: [String]?
 
     static let previewSheetCardIds = ["backupSeedPhrase", "pin", "transferToSpending", "support"]
@@ -250,8 +254,30 @@ struct Suggestions: View {
         )
     }
 
+    private var isEditingFallback: Bool {
+        isEditing && !isPreview && visibleCards.isEmpty
+    }
+
+    private var cardsToShow: [SuggestionCardData] {
+        guard isEditingFallback else { return visibleCards }
+        return Self.visibleCards(
+            wallet: wallet,
+            app: app,
+            settings: settings,
+            suggestionsManager: suggestionsManager,
+            pubkyProfile: pubkyProfile,
+            isPaykitUIEnabled: isPaykitUIActive,
+            isPreview: true,
+            previewCardIds: Self.previewSheetCardIds
+        )
+    }
+
+    private var renderStatic: Bool {
+        isPreview || isEditingFallback
+    }
+
     var body: some View {
-        if visibleCards.isEmpty {
+        if cardsToShow.isEmpty {
             EmptyView()
         } else {
             LazyVGrid(
@@ -261,25 +287,25 @@ struct Suggestions: View {
                 ],
                 spacing: 16
             ) {
-                ForEach(visibleCards) { card in
+                ForEach(cardsToShow) { card in
                     SuggestionCard(
                         title: card.title,
                         description: card.description,
                         imageName: card.imageName,
                         accentColor: card.color,
-                        onTap: { if !isPreview { onItemTap(card) } },
+                        onTap: { if !renderStatic { onItemTap(card) } },
                         onDismiss: { dismissCard(card) }
                     )
                     .background {
-                        if isPreview {
+                        if renderStatic {
                             RoundedRectangle(cornerRadius: 16).fill(Color.black)
                         }
                     }
                     .accessibilityElement(children: .contain)
                     .accessibilityIdentifier("Suggestion-\(card.accessibilityId)")
                 }
             }
-            .allowsHitTesting(!isPreview)
+            .allowsHitTesting(!renderStatic)
             .sheet(isPresented: $showShareSheet) {
                 ShareSheet(activityItems: [
                     t(