ALFMOB-162: Improve Wishlist functionality on PLP & Wishlist (#67)

khoinguyen-mindera · web-flow · commit a898473c72aa · 2026-05-19T11:25:23.000Z
* ALFMOB-162: Hide size from wishlist item card

* ALFMOB-162: Redirect wishlist Add to Bag to PDP

* ALFMOB-162: Migrate WishlistTests to Swift Testing

* ALFMOB-162: Remove unused bagService from WishlistDependencyContainer

* ALFMOB-162: Do not auto-select size on PDP entry

* ALFMOB-162: Revert WishlistTests to XCTest for project consistency

* ALFMOB-162: Add trackForMemoryLeak helper and apply to WishlistTests

* ALFMOB-162: Remove size field and view from VerticalProductCard

* ALFMOB-162: Disable PDP Add to Bag until size is selected

* ALFMOB-162: Remove wishlist product by id and consolidate removal API

* ALFMOB-162: Fix PDP Add to Bag for single-size and sizeless products

* ALFMOB-162: Base PDP Add to Bag label on overall product stock

* ALFMOB-150: Persist wishlist via UserDefaults-backed store

* ALFMOB-150: Add unit tests for wishlist persistence

* ALFMOB-150: Persist bag via UserDefaults-backed store

* ALFMOB-150: Add unit tests for bag persistence

* ALFMOB-150: Consolidate Bag/Wishlist storage keys into single StorageKey enum

* Revert "ALFMOB-150: Persist Wishlist &amp; Bag"
diff --git a/Alfie/Alfie/Alfie.xctestplan b/Alfie/Alfie/Alfie.xctestplan
@@ -102,6 +102,13 @@
         "identifier" : "ProductListingTests",
         "name" : "ProductListingTests"
       }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:AlfieKit",
+        "identifier" : "WishlistTests",
+        "name" : "WishlistTests"
+      }
     }
   ],
   "version" : 1
diff --git a/Alfie/AlfieKit/Sources/AppFeature/Navigation/AppFeatureViewModel.swift b/Alfie/AlfieKit/Sources/AppFeature/Navigation/AppFeatureViewModel.swift
@@ -81,7 +81,6 @@ public final class AppFeatureViewModel: AppFeatureViewModelProtocol {
         )
         let wishlistDependencyContainer = WishlistDependencyContainer(
             wishlistService: serviceProvider.wishlistService,
-            bagService: serviceProvider.bagService,
             analytics: serviceProvider.analytics
         )
         let categorySelectorDependencyContainer = CategorySelectorDependencyContainer(
diff --git a/Alfie/AlfieKit/Sources/Core/Services/Wishlist/WishlistService.swift b/Alfie/AlfieKit/Sources/Core/Services/Wishlist/WishlistService.swift
@@ -13,8 +13,8 @@ public final class WishlistService: WishlistServiceProtocol {
         products.append(product)
     }
 
-    public func removeProduct(_ product: SelectedProduct) {
-        products = products.filter { $0.id != product.id }
+    public func removeProduct(withId productId: String) {
+        products = products.filter { $0.product.id != productId }
     }
 
     public func getWishlistContent() -> [SelectedProduct] {
diff --git a/Alfie/AlfieKit/Sources/Mocks/Core/Features/MockProductDetailsViewModel.swift b/Alfie/AlfieKit/Sources/Mocks/Core/Features/MockProductDetailsViewModel.swift
@@ -8,6 +8,9 @@ public class MockProductDetailsViewModel: ProductDetailsViewModelProtocol {
     public var productId: String = ""
     public var productTitle: String = ""
     public var productHasStock: Bool = true
+    public var productHasAnyStock: Bool = true
+    public var isAddToBagEnabled: Bool = true
+    public var canShowSizeSelector: Bool = true
     public var productName: String = ""
     public var productImageUrls: [URL] = []
     public var colorSelectionConfiguration: ColorAndSizingSelectorConfiguration<ColorSwatch>
diff --git a/Alfie/AlfieKit/Sources/Mocks/Core/Services/MockWishlistService.swift b/Alfie/AlfieKit/Sources/Mocks/Core/Services/MockWishlistService.swift
@@ -12,8 +12,8 @@ public final class MockWishlistService: WishlistServiceProtocol {
         products.append(product)
     }
 
-    public func removeProduct(_ product: SelectedProduct) {
-        products = products.filter { $0.id != product.id }
+    public func removeProduct(withId productId: String) {
+        products = products.filter { $0.product.id != productId }
     }
 
     public func getWishlistContent() -> [SelectedProduct] {
diff --git a/Alfie/AlfieKit/Sources/Model/Models/ProductDetails/Protocols/ProductDetailsViewModelProtocol.swift b/Alfie/AlfieKit/Sources/Model/Models/ProductDetails/Protocols/ProductDetailsViewModelProtocol.swift
@@ -7,6 +7,9 @@ public protocol ProductDetailsViewModelProtocol: ObservableObject {
     var productTitle: String { get }
     var productName: String { get }
     var productHasStock: Bool { get }
+    var productHasAnyStock: Bool { get }
+    var isAddToBagEnabled: Bool { get }
+    var canShowSizeSelector: Bool { get }
     var productImageUrls: [URL] { get }
     var productDescription: String { get }
     var colorSelectionConfiguration: ColorAndSizingSelectorConfiguration<ColorSwatch> { get }
diff --git a/Alfie/AlfieKit/Sources/Model/Services/Wishlist/WishlistServiceProtocol.swift b/Alfie/AlfieKit/Sources/Model/Services/Wishlist/WishlistServiceProtocol.swift
@@ -2,6 +2,6 @@ import Foundation
 
 public protocol WishlistServiceProtocol {
     func addProduct(_ product: SelectedProduct)
-    func removeProduct(_ product: SelectedProduct)
+    func removeProduct(withId productId: String)
     func getWishlistContent() -> [SelectedProduct]
 }
diff --git a/Alfie/AlfieKit/Sources/Model/UI/ProductCard/VerticalProductCardViewModel.swift b/Alfie/AlfieKit/Sources/Model/UI/ProductCard/VerticalProductCardViewModel.swift
@@ -9,8 +9,6 @@ public struct VerticalProductCardViewModel {
     public var priceType: PriceType
     public var colorTitle: String?
     public var color: String?
-    public var sizeTitle: String?
-    public var size: String?
     public var addToBagTitle: String?
     public var outOfStockTitle: String?
     public var isAddToBagDisabled = false
@@ -24,8 +22,6 @@ public struct VerticalProductCardViewModel {
         priceType: PriceType,
         colorTitle: String? = nil,
         color: String? = nil,
-        sizeTitle: String? = nil,
-        size: String? = nil,
         addToBagTitle: String? = nil,
         outOfStockTitle: String? = nil,
         isAddToBagDisabled: Bool = false
@@ -38,8 +34,6 @@ public struct VerticalProductCardViewModel {
         self.priceType = priceType
         self.colorTitle = colorTitle
         self.color = color
-        self.sizeTitle = sizeTitle
-        self.size = size
         self.addToBagTitle = addToBagTitle
         self.outOfStockTitle = outOfStockTitle
         self.isAddToBagDisabled = isAddToBagDisabled
@@ -51,8 +45,6 @@ public extension VerticalProductCardViewModel {
         configuration: VerticalProductCardConfiguration,
         product: Product,
         colorTitle: String? = nil,
-        sizeTitle: String? = nil,
-        oneSizeTitle: String? = nil,
         addToBagTitle: String? = nil,
         outOfStockTitle: String? = nil,
         isAddToBagDisabled: Bool = false
@@ -64,8 +56,6 @@ public extension VerticalProductCardViewModel {
         self.name = product.name
         self.colorTitle = colorTitle
         self.color = product.defaultVariant.colour?.name
-        self.sizeTitle = sizeTitle
-        self.size = product.isSingleSizeProduct ? oneSizeTitle : product.sizeText
         self.priceType = product.priceType
         self.addToBagTitle = addToBagTitle
         self.outOfStockTitle = outOfStockTitle
diff --git a/Alfie/AlfieKit/Sources/ProductDetails/UI/ProductDetailsView.swift b/Alfie/AlfieKit/Sources/ProductDetails/UI/ProductDetailsView.swift
@@ -40,10 +40,6 @@ public struct ProductDetailsView<ViewModel: ProductDetailsViewModelProtocol>: Vi
         viewModel.sizingSelectionConfiguration.items.count > 6
     }
 
-    private var canShowSizeSelector: Bool {
-        viewModel.sizingSelectionConfiguration.items.count > 1
-    }
-
     private var isOneSize: Bool {
         viewModel.sizingSelectionConfiguration.items.count == 1
     }
@@ -418,7 +414,7 @@ extension ProductDetailsView {
     @ViewBuilder private var sizeSelector: some View {
         if viewModel.shouldShow(section: .sizeSelector) {
             VStack(alignment: .leading, spacing: Spacing.space150) {
-                if canShowSizeSelector {
+                if viewModel.canShowSizeSelector {
                     ColorAndSizingSelectorHeaderView(
                         configuration: viewModel.sizingSelectionConfiguration,
                         isExpandable: canShowSizePickers
@@ -487,9 +483,9 @@ extension ProductDetailsView {
                 let outOfStockText = L10n.Product.OutOfStock.Button.cta
 
                 ThemedButton(
-                    text: viewModel.productHasStock ? addToBagText : outOfStockText,
+                    text: viewModel.productHasAnyStock ? addToBagText : outOfStockText,
                     isDisabled: .init(
-                        get: { !viewModel.productHasStock },
+                        get: { !viewModel.isAddToBagEnabled },
                         set: { _ in }
                     ),
                     isFullWidth: true
diff --git a/Alfie/AlfieKit/Sources/ProductDetails/UI/ProductDetailsViewModel.swift b/Alfie/AlfieKit/Sources/ProductDetails/UI/ProductDetailsViewModel.swift
@@ -172,8 +172,26 @@ public final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
         (selectedVariant?.stock ?? 0) > 0
     }
 
+    /// True when at least one variant of the product has stock.
+    /// Use this for the CTA label (avoid showing "Out of Stock" while the product is still buyable in another size).
+    public var productHasAnyStock: Bool {
+        product?.variants.contains { $0.stock > 0 } ?? false
+    }
+
+    /// True when the user is offered an interactive size choice (more than one size swatch).
+    /// When false, the size is implicit (sizeless product or a single available size).
+    public var canShowSizeSelector: Bool {
+        sizingSelectionConfiguration.items.count > 1
+    }
+
+    public var isAddToBagEnabled: Bool {
+        productHasStock
+            && colorSelectionConfiguration.selectedItem != nil
+            && (!canShowSizeSelector || sizingSelectionConfiguration.selectedItem != nil)
+    }
+
     public func didTapAddToBag() {
-        guard let selectedProduct else { return }
+        guard isAddToBagEnabled, let selectedProduct else { return }
         dependencies.bagService.addProduct(selectedProduct)
         dependencies.analytics.trackAddToBag(productID: selectedProduct.id)
     }
@@ -296,15 +314,11 @@ public final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
 
         let sizingSwatches = buildSizingSwatches(product: product, selectedVariant: selectedVariant)
 
-        var selectedSwatch: SizingSwatch?
-        if let selectedVariant {
-            selectedSwatch = sizingSwatches.first { $0.id == selectedVariant.size?.id }
-        }
-
+        // Size is never auto-selected on PDP entry — the user must tap a swatch.
         sizingSelectionConfiguration = .init(
             selectedTitle: L10n.Product.Size.title + ":",
             items: sizingSwatches,
-            selectedItem: selectedSwatch
+            selectedItem: nil
         )
         sizingSelectionSubscription = sizingSelectionConfiguration.$selectedItem
             .receive(on: dependencies.scheduler)
diff --git a/Alfie/AlfieKit/Sources/ProductListing/UI/ProductListingViewModel.swift b/Alfie/AlfieKit/Sources/ProductListing/UI/ProductListingViewModel.swift
@@ -93,7 +93,7 @@ public final class ProductListingViewModel: ProductListingViewModelProtocol {
     }
 
     public func isFavoriteState(for product: Product) -> Bool {
-        wishlistContent.contains { $0.product.defaultVariant.sku == product.defaultVariant.sku }
+        wishlistContent.contains { $0.product.id == product.id }
     }
 
     public func didTapSearch() {
@@ -106,8 +106,7 @@ public final class ProductListingViewModel: ProductListingViewModelProtocol {
             dependencies.wishlistService.addProduct(selectedProduct)
             dependencies.analytics.trackAddToWishlist(productID: product.id)
         } else {
-            let selectedProduct = SelectedProduct(product: product)
-            dependencies.wishlistService.removeProduct(selectedProduct)
+            dependencies.wishlistService.removeProduct(withId: product.id)
             dependencies.analytics.trackRemoveFromWishlist(productID: product.id)
         }
         wishlistContent = dependencies.wishlistService.getWishlistContent()
diff --git a/Alfie/AlfieKit/Sources/SharedUI/Components/ProductCards/VerticalProductCard.swift b/Alfie/AlfieKit/Sources/SharedUI/Components/ProductCards/VerticalProductCard.swift
@@ -41,7 +41,6 @@ public struct VerticalProductCard: View {
                     productNameView
                     if !viewModel.configuration.hideDetails {
                         productColorView
-                        productSizeView
                     }
                 }
 
@@ -129,24 +128,6 @@ public struct VerticalProductCard: View {
         .accessibilityIdentifier(AccessibilityId.productColor)
     }
 
-    private var productSizeView: some View {
-        HStack(spacing: Spacing.space100) {
-            if let sizeTitle = viewModel.sizeTitle {
-                Text(sizeTitle)
-                    .font(Font(viewModel.configuration.smallTextFont))
-                    .foregroundStyle(Colors.primary.mono500)
-            }
-            if let size = viewModel.size {
-                Text(size)
-                    .font(Font(viewModel.configuration.smallTextFont))
-                    .foregroundStyle(Colors.primary.mono700)
-            }
-        }
-        .lineLimit(Constants.productSizeLineLimit)
-        .accessibilityElement(children: .contain)
-        .accessibilityIdentifier(AccessibilityId.productSize)
-    }
-
     private var productPriceView: some View {
         PriceComponentView(type: viewModel.priceType, configuration: viewModel.configuration.priceConfiguration)
             .shimmering(while: $isSkeleton)
@@ -237,7 +218,6 @@ private enum AccessibilityId {
     static let productDesigner = "product-designer"
     static let productName = "product-name"
     static let productColor = "product-color"
-    static let productSize = "product-size"
     static let productPrice = "product-price-component"
     static let productWishlistButton = "product-add-wishlist-btn"
     static let productRemoveFromWishlistButton = "product-remove-from-wishlist-btn"
@@ -247,7 +227,6 @@ private enum Constants {
     static let productDesignerLineLimit: Int = 1
     static let productNameLineLimit: Int = 2
     static let productColorLineLimit: Int = 1
-    static let productSizeLineLimit: Int = 1
     static let iconSmallSize: CGFloat = 24
     static let iconLargeSize: CGFloat = 32
     static let imageAspectRatio: CGFloat = 0.75
diff --git a/Alfie/AlfieKit/Sources/TestUtils/Helpers/XCTestCase+MemoryLeak.swift b/Alfie/AlfieKit/Sources/TestUtils/Helpers/XCTestCase+MemoryLeak.swift
@@ -0,0 +1,18 @@
+import XCTest
+
+extension XCTestCase {
+    public func trackForMemoryLeak(
+        _ instance: AnyObject,
+        file: StaticString = #filePath,
+        line: UInt = #line
+    ) {
+        addTeardownBlock { [weak instance] in
+            XCTAssertNil(
+                instance,
+                "Potential memory leak: instance was not deallocated after the test ended.",
+                file: file,
+                line: line
+            )
+        }
+    }
+}
diff --git a/Alfie/AlfieKit/Sources/Wishlist/Models/WishlistDependencyContainer.swift b/Alfie/AlfieKit/Sources/Wishlist/Models/WishlistDependencyContainer.swift
@@ -2,12 +2,10 @@ import Model
 
 public final class WishlistDependencyContainer {
     let wishlistService: WishlistServiceProtocol
-    let bagService: BagServiceProtocol
     let analytics: AlfieAnalyticsTracker
 
-    public init(wishlistService: WishlistServiceProtocol, bagService: BagServiceProtocol, analytics: AlfieAnalyticsTracker) {
+    public init(wishlistService: WishlistServiceProtocol, analytics: AlfieAnalyticsTracker) {
         self.wishlistService = wishlistService
-        self.bagService = bagService
         self.analytics = analytics
     }
 }
diff --git a/Alfie/AlfieKit/Sources/Wishlist/UI/WishlistView.swift b/Alfie/AlfieKit/Sources/Wishlist/UI/WishlistView.swift
@@ -72,7 +72,6 @@ private extension WishlistView {
             hasNavigationSeparator: true,
             dependencies: WishlistDependencyContainer(
                 wishlistService: MockWishlistService(),
-                bagService: MockBagService(),
                 analytics: MockAnalyticsTracker().eraseToAnyAnalyticsTracker()
             )
         ) { _ in }
diff --git a/Alfie/AlfieKit/Sources/Wishlist/UI/WishlistViewModel.swift b/Alfie/AlfieKit/Sources/Wishlist/UI/WishlistViewModel.swift
@@ -33,14 +33,13 @@ public final class WishlistViewModel: WishlistViewModelProtocol {
     }
 
     public func didSelectDelete(for selectedProduct: SelectedProduct) {
-        dependencies.wishlistService.removeProduct(selectedProduct)
+        dependencies.wishlistService.removeProduct(withId: selectedProduct.product.id)
         dependencies.analytics.trackRemoveFromWishlist(productID: selectedProduct.product.id)
         products = dependencies.wishlistService.getWishlistContent()
     }
 
     public func didTapAddToBag(for selectedProduct: SelectedProduct) {
-        dependencies.bagService.addProduct(selectedProduct)
-        dependencies.analytics.trackAddToBag(productID: selectedProduct.product.id)
+        navigate(.productDetails(.productDetails(.selectedProduct(selectedProduct))))
     }
 
     public func didTapMyAccount() {
@@ -57,8 +56,6 @@ public final class WishlistViewModel: WishlistViewModelProtocol {
             priceType: selectedProduct.priceType,
             colorTitle: L10n.Product.Color.title + ":",
             color: selectedProduct.colour?.name ?? "",
-            sizeTitle: L10n.Product.Size.title + ":",
-            size: selectedProduct.size == nil ? L10n.Product.OneSize.title : selectedProduct.sizeText,
             addToBagTitle: L10n.Product.AddToBag.Button.cta,
             outOfStockTitle: L10n.Product.OutOfStock.Button.cta,
             isAddToBagDisabled: selectedProduct.stock == .zero
diff --git a/Alfie/AlfieKit/Tests/CoreTests/ServiceTests/WishlistServiceTests.swift b/Alfie/AlfieKit/Tests/CoreTests/ServiceTests/WishlistServiceTests.swift
diff --git a/Alfie/AlfieKit/Tests/ProductDetailsTests/ProductDetailsViewModelTests.swift b/Alfie/AlfieKit/Tests/ProductDetailsTests/ProductDetailsViewModelTests.swift
diff --git a/Alfie/AlfieKit/Tests/ProductListingTests/ProductListingViewModelTests.swift b/Alfie/AlfieKit/Tests/ProductListingTests/ProductListingViewModelTests.swift
diff --git a/Alfie/AlfieKit/Tests/WishlistTests/WishlistTests.swift b/Alfie/AlfieKit/Tests/WishlistTests/WishlistTests.swift

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,13 @@`
`102`	`102`	`"identifier" : "ProductListingTests",`
`103`	`103`	`"name" : "ProductListingTests"`
`104`	`104`	`}`
	`105`	`+ },`
	`106`	`+ {`
	`107`	`+ "target" : {`
	`108`	`+ "containerPath" : "container:AlfieKit",`
	`109`	`+ "identifier" : "WishlistTests",`
	`110`	`+ "name" : "WishlistTests"`
	`111`	`+ }`
`105`	`112`	`}`
`106`	`113`	`],`
`107`	`114`	`"version" : 1`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ public final class AppFeatureViewModel: AppFeatureViewModelProtocol {`
`81`	`81`	`)`
`82`	`82`	`let wishlistDependencyContainer = WishlistDependencyContainer(`
`83`	`83`	`wishlistService: serviceProvider.wishlistService,`
`84`		`- bagService: serviceProvider.bagService,`
`85`	`84`	`analytics: serviceProvider.analytics`
`86`	`85`	`)`
`87`	`86`	`let categorySelectorDependencyContainer = CategorySelectorDependencyContainer(`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public final class WishlistService: WishlistServiceProtocol {`
`13`	`13`	`products.append(product)`
`14`	`14`	`}`
`15`	`15`
`16`		`- public func removeProduct(_ product: SelectedProduct) {`
`17`		`- products = products.filter { $0.id != product.id }`
	`16`	`+ public func removeProduct(withId productId: String) {`
	`17`	`+ products = products.filter { $0.product.id != productId }`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public func getWishlistContent() -> [SelectedProduct] {`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public final class MockWishlistService: WishlistServiceProtocol {`
`12`	`12`	`products.append(product)`
`13`	`13`	`}`
`14`	`14`
`15`		`- public func removeProduct(_ product: SelectedProduct) {`
`16`		`- products = products.filter { $0.id != product.id }`
	`15`	`+ public func removeProduct(withId productId: String) {`
	`16`	`+ products = products.filter { $0.product.id != productId }`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public func getWishlistContent() -> [SelectedProduct] {`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ import Foundation`
`2`	`2`
`3`	`3`	`public protocol WishlistServiceProtocol {`
`4`	`4`	`func addProduct(_ product: SelectedProduct)`
`5`		`- func removeProduct(_ product: SelectedProduct)`
	`5`	`+ func removeProduct(withId productId: String)`
`6`	`6`	`func getWishlistContent() -> [SelectedProduct]`
`7`	`7`	`}`