Merge pull request #598 from synonymdev/fix/reset-suggestions-when-empty

fix: reset suggestions widget when re-added empty

Author: jvsena42

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(

Bitkit/Components/Widgets/SuggestionsWidget.swift

@@ -13,7 +13,7 @@ struct SuggestionsWidget: View {
             hasBackground: false,
             onEditingEnd: onEditingEnd
         ) {
-            Suggestions(isPreview: isPreview)
+            Suggestions(isPreview: isPreview, isEditing: isEditing)
         }
     }
 }

Bitkit/Views/Widgets/WidgetPreviewSheetView.swift

@@ -9,9 +9,15 @@ struct WidgetPreviewSheetView: View {
     @EnvironmentObject private var app: AppViewModel
     @EnvironmentObject private var currency: CurrencyViewModel
     @EnvironmentObject private var navigation: NavigationViewModel
+    @EnvironmentObject private var pubkyProfile: PubkyProfileManager
+    @EnvironmentObject private var settings: SettingsViewModel
     @EnvironmentObject private var sheets: SheetViewModel
+    @EnvironmentObject private var suggestionsManager: SuggestionsManager
+    @EnvironmentObject private var wallet: WalletViewModel
     @EnvironmentObject private var widgets: WidgetsViewModel
 
+    @AppStorage(PaykitFeatureFlags.uiEnabledKey) private var isPaykitUIEnabled = false
+
     @State private var carouselPage: Int
     @State private var showDeleteAlert = false
 
@@ -55,6 +61,23 @@ struct WidgetPreviewSheetView: View {
         carouselPage == 0 && supportsSmall ? .small : .wide
     }
 
+    private var isPaykitUIActive: Bool {
+        PaykitFeatureFlags.isUIAvailable && isPaykitUIEnabled
+    }
+
+    /// Whether the Suggestions widget would currently show no cards (mirrors what the live
+    /// `Suggestions` view renders, including the `pubkyProfile` completion check).
+    private var suggestionsAreEmpty: Bool {
+        Suggestions.visibleCards(
+            wallet: wallet,
+            app: app,
+            settings: settings,
+            suggestionsManager: suggestionsManager,
+            pubkyProfile: pubkyProfile,
+            isPaykitUIEnabled: isPaykitUIActive
+        ).isEmpty
+    }
+
     var body: some View {
         VStack(alignment: .leading, spacing: 16) {
             SheetHeader(title: metadata.name, showBackButton: true)
@@ -261,6 +284,9 @@ struct WidgetPreviewSheetView: View {
     // MARK: - Actions
 
     private func onSave() {
+        if type == .suggestions, suggestionsAreEmpty {
+            suggestionsManager.resetDismissed()
+        }
         widgets.saveWidget(type, size: chosenSize)
         sheets.hideSheet()
         navigation.reset()

changelog.d/next/596.fixed.md

@@ -0,0 +1 @@
+Re-adding the Suggestions widget now restores the default suggestion cards when all of them had been dismissed.