ALFMOB-158: Update PDP Button Copy Based on Item State

- Added `productsPublisher` to both `WishlistService` and `BagService` to enable real-time updates of button titles based on item state.
- Updated all relevant view models to observe `productsPublisher` instead of using the previous `getWishlistContent` and `getBagContent` methods.
- Adjusted button titles dynamically to reflect the correct state (`"Add to Bag"` / `"Remove from Bag"` and `"Add to Wishlist"` / `"Remove from Wishlist"`).
- Ensured that changing color resets both buttons, while changing size only resets the `"Add to Bag"` button (since wishlist state is unaffected by size).
- Added necessary localized strings to `L10n` table.

Author: JoaoPinhoMinder

Alfie/Alfie/Localization/L10n+Generated.swift

@@ -189,6 +189,18 @@ enum L10n {
         static let cta = L10n.tr("L10n", "product.out_of_stock.button.cta")
       }
     }
+    enum RemoveFromBag {
+      enum Button {
+        /// Remove from bag
+        static let cta = L10n.tr("L10n", "product.remove_from_bag.button.cta")
+      }
+    }
+    enum RemoveFromWishlist {
+      enum Button {
+        /// Remove from wishlist
+        static let cta = L10n.tr("L10n", "product.remove_from_wishlist.button.cta")
+      }
+    }
     enum Size {
       /// Size
       static let title = L10n.tr("L10n", "product.size.title")
@@ -474,6 +486,8 @@ extension L10n {
       case productColorTitle = "product.color.title"
       case productOneSizeTitle = "product.one_size.title"
       case productOutOfStockButtonCta = "product.out_of_stock.button.cta"
+      case productRemoveFromBagButtonCta = "product.remove_from_bag.button.cta"
+      case productRemoveFromWishlistButtonCta = "product.remove_from_wishlist.button.cta"
       case productSizeTitle = "product.size.title"
       case productSizeNoSelectionTitle = "product.size.no_selection.title"
       case searchScreenEmptyViewMessage = "search.screen.empty_view.message"

Alfie/Alfie/Localization/L10n.xcstrings

@@ -409,6 +409,28 @@
         }
       }
     },
+    "product.remove_from_bag.button.cta" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Remove from bag"
+          }
+        }
+      }
+    },
+    "product.remove_from_wishlist.button.cta" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Remove from wishlist"
+          }
+        }
+      }
+    },
     "product.size.no_selection.title" : {
       "extractionState" : "manual",
       "localizations" : {

Alfie/Alfie/Views/BagView/BagView.swift

@@ -38,9 +38,6 @@ struct BagView<ViewModel: BagViewModelProtocol>: View {
         .listRowSpacing(Spacing.space200)
         .padding(.vertical, Spacing.space200)
         .withToolbar(for: .tab(.bag))
-        .onAppear {
-            viewModel.viewDidAppear()
-        }
     }
 }
 

Alfie/Alfie/Views/BagView/BagViewModel.swift

@@ -1,25 +1,31 @@
+import Combine
 import Foundation
 import Models
 
 final class BagViewModel: BagViewModelProtocol {
-    @Published private(set) var products: [BagProduct]
-
+    @Published private(set) var products: [BagProduct] = []
+    private var subscriptions = Set<AnyCancellable>()
     private let dependencies: BagDependencyContainer
 
     init(dependencies: BagDependencyContainer) {
         self.dependencies = dependencies
-        products = dependencies.bagService.getBagContent()
-    }
 
-    // MARK: - BagViewModelProtocol
+        setupBindigs()
+    }
 
-    func viewDidAppear() {
-        products = dependencies.bagService.getBagContent()
+    private func setupBindigs() {
+        dependencies.bagService.productsPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] bagProducts in
+                self?.products = bagProducts
+            }
+            .store(in: &subscriptions)
     }
 
+    // MARK: - BagViewModelProtocol
+
     func didSelectDelete(for selectedProduct: BagProduct) {
         dependencies.bagService.removeProduct(selectedProduct)
-        products = dependencies.bagService.getBagContent()
         dependencies.analytics.trackRemoveFromBag(productID: selectedProduct.product.id)
     }
 

Alfie/Alfie/Views/ProductDetails/ProductDetailsView.swift

@@ -180,7 +180,7 @@ struct ProductDetailsView<ViewModel: ProductDetailsViewModelProtocol>: View {
                 complementaryViews
                     .padding(.horizontal, horizontalPadding)
             }
-            addToBag
+            bagButton
         }
         .fullScreenCover(isPresented: $isMediaFullScreen) {
             fullscreenMediaCarousel
@@ -254,7 +254,7 @@ extension ProductDetailsView {
             }
 
             VStack {
-                addToBag
+                bagButton
                 addToWishlist
             }
             .padding(.vertical, Spacing.space100)
@@ -480,14 +480,11 @@ extension ProductDetailsView {
         }
     }
 
-    @ViewBuilder private var addToBag: some View {
-        if viewModel.shouldShow(section: .addToBag) {
+    @ViewBuilder private var bagButton: some View {
+        if viewModel.shouldShow(section: .bagButton) {
             VStack(spacing: Spacing.space0) {
-                let addToBagText = L10n.Product.AddToBag.Button.cta
-                let outOfStockText = L10n.Product.OutOfStock.Button.cta
-
                 ThemedButton(
-                    text: viewModel.productHasStock ? addToBagText : outOfStockText,
+                    text: viewModel.bagButtonTitle,
                     isDisabled: .init(
                         get: { !viewModel.isAddToBagEnabled },
                         set: { _ in }
@@ -501,10 +498,10 @@ extension ProductDetailsView {
     }
 
     @ViewBuilder private var addToWishlist: some View {
-        if viewModel.shouldShow(section: .addToWishlist) {
+        if viewModel.shouldShow(section: .wishlistButton) {
             VStack(spacing: Spacing.space0) {
                 ThemedButton(
-                    text: L10n.Product.AddToWishlist.Button.cta,
+                    text: viewModel.wishlistButtonTitle,
                     style: .secondary,
                     isFullWidth: true
                 ) {
@@ -608,7 +605,7 @@ private enum Constants {
         viewModel: MockProductDetailsViewModel(
             complementaryInfoToShow: [.paymentOptions, .returns],
             onShouldShowLoadingForSectionCalled: { _ in true },
-            onShouldShowSectionCalled: { section in section != .addToBag }
+            onShouldShowSectionCalled: { section in section != .bagButton }
         )
     )
     .environmentObject(Coordinator())

Alfie/Alfie/Views/ProductDetails/ProductDetailsViewModel.swift

@@ -16,6 +16,7 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
     private(set) var sizingSelectionConfiguration: ColorAndSizingSelectorConfiguration<SizingSwatch> = .init(items: [])
     public let productId: String
     private let initialSelectedProduct: SelectedProduct?
+    private var subscriptions = Set<AnyCancellable>()
 
     private var product: Product? {
         guard case .success(let model) = state else {
@@ -102,6 +103,9 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
         sizingSelectionConfiguration.items.count > 1 ? selectedVariant?.size != nil : true
     }
 
+    @Published var bagButtonTitle: String = ""
+    @Published var wishlistButtonTitle: String = ""
+
     init(
         productId: String,
         product: Product?,
@@ -129,6 +133,59 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
         default:
             break
         }
+
+        setupBindings()
+    }
+
+    private func setupBindings() {
+        Publishers.CombineLatest(
+            $state,
+            dependencies.bagService.productsPublisher
+        )
+        .receive(on: DispatchQueue.main)
+        .sink { [weak self] _ in
+            self?.updateBagButtonTitle()
+        }
+        .store(in: &subscriptions)
+
+        Publishers.CombineLatest(
+            $state,
+            dependencies.wishlistService.productsPublisher
+        )
+        .receive(on: DispatchQueue.main)
+        .sink { [weak self] _ in
+            self?.updateWishlistButtonTitle()
+        }
+        .store(in: &subscriptions)
+    }
+
+    private func updateBagButtonTitle() {
+        guard productHasStock else {
+            bagButtonTitle = L10n.Product.OutOfStock.Button.cta
+            return
+        }
+
+        guard let selectedProduct else {
+            bagButtonTitle = L10n.Product.AddToBag.Button.cta
+            return
+        }
+
+        let bagProduct = BagProduct(selectedProduct: selectedProduct)
+        bagButtonTitle = dependencies.bagService.containsProduct(bagProduct)
+            ? L10n.Product.RemoveFromBag.Button.cta
+            : L10n.Product.AddToBag.Button.cta
+    }
+
+    private func updateWishlistButtonTitle() {
+        guard let selectedProduct else {
+            wishlistButtonTitle = L10n.Product.AddToWishlist.Button.cta
+            return
+        }
+
+        let wishlistProduct = WishlistProduct(selectedProduct: selectedProduct)
+        wishlistButtonTitle = dependencies.wishlistService.containsProduct(wishlistProduct)
+            ? L10n.Product.RemoveFromWishlist.Button.cta
+            : L10n.Product.AddToWishlist.Button.cta
     }
 
     func viewDidAppear() {
@@ -147,8 +204,8 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
              .complementaryInfo:
             return state.isLoading
         case .productDescription,
-             .addToBag, // swiftlint:disable:this indentation_width
-             .addToWishlist:
+             .bagButton, // swiftlint:disable:this indentation_width
+             .wishlistButton:
             return false
         }
     }
@@ -166,9 +223,9 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
             return state.isLoading || !productImageUrls.isEmpty
         case .productDescription:
             return !productDescription.isEmpty
-        case .addToBag:
+        case .bagButton:
             return state.isSuccess
-        case .addToWishlist:
+        case .wishlistButton:
             return state.isSuccess && dependencies.configurationService.isFeatureEnabled(.wishlist)
         }
         // swiftlint:enable vertical_whitespace_between_cases
@@ -194,15 +251,27 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
     func didTapAddToBag() {
         guard let selectedProduct else { return }
         let bagProduct = BagProduct(selectedProduct: selectedProduct)
-        dependencies.bagService.addProduct(bagProduct)
-        dependencies.analytics.trackAddToBag(productID: bagProduct.id)
+
+        if dependencies.bagService.containsProduct(bagProduct) {
+            dependencies.bagService.removeProduct(bagProduct)
+            dependencies.analytics.trackRemoveFromBag(productID: bagProduct.id)
+        } else {
+            dependencies.bagService.addProduct(bagProduct)
+            dependencies.analytics.trackAddToBag(productID: bagProduct.id)
+        }
     }
 
     func didTapAddToWishlist() {
         guard let selectedProduct else { return }
         let wishlistProduct = WishlistProduct(selectedProduct: selectedProduct)
-        dependencies.wishlistService.addProduct(wishlistProduct)
-        dependencies.analytics.trackAddToWishlist(productID: wishlistProduct.id)
+
+        if dependencies.wishlistService.containsProduct(wishlistProduct) {
+            dependencies.wishlistService.removeProduct(wishlistProduct)
+            dependencies.analytics.trackRemoveFromWishlist(productID: wishlistProduct.id)
+        } else {
+            dependencies.wishlistService.addProduct(wishlistProduct)
+            dependencies.analytics.trackAddToWishlist(productID: wishlistProduct.id)
+        }
     }
 
     func colorSwatches(filteredBy searchTerm: String) -> [ColorSwatch] {

Alfie/Alfie/Views/ProductListing/ProductListingViewModel.swift

@@ -14,8 +14,9 @@ final class ProductListingViewModel: ProductListingViewModelProtocol {
     @Published var style: ProductListingListStyle
     @Published var showRefine = false
     @Published var sortOption: String?
-    @Published private(set) var wishlistContent: [SelectedProduct]
+    @Published private(set) var wishlistContent: [SelectedProduct] = []
     @Published private(set) var state: PaginatedViewState<ProductListingViewStateModel, ProductListingViewErrorType>
+    private var subscriptions = Set<AnyCancellable>()
 
     private enum Constants {
         static let defaultSkeletonItemsSize = 12
@@ -54,11 +55,20 @@ final class ProductListingViewModel: ProductListingViewModelProtocol {
         sortOption = sort
         query = searchText ?? urlQueryParameters.map(\.values)?.joined(separator: ",")
         state = .loadingFirstPage(.init(title: "", products: .skeleton(itemsSize: skeletonItemsSize)))
-        wishlistContent = dependencies.wishlistService.getWishlistContent()
+
+        setupBindings()
+    }
+
+    private func setupBindings() {
+        dependencies.wishlistService.productsPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] wishListProducts in
+                self?.wishlistContent = wishListProducts
+            }
+            .store(in: &subscriptions)
     }
 
     func viewDidAppear() {
-        wishlistContent = dependencies.wishlistService.getWishlistContent()
         Task {
             await loadProductsIfNeeded()
         }
@@ -79,7 +89,8 @@ final class ProductListingViewModel: ProductListingViewModelProtocol {
     func didSelect(_: Product) {}
 
     func isFavoriteState(for product: Product) -> Bool {
-        wishlistContent.contains { $0.product.id == product.id }
+        let wishlistProduct = WishlistProduct(product: product)
+        return dependencies.wishlistService.containsProduct(wishlistProduct)
     }
 
     func didTapAddToWishlist(for product: Product, isFavorite: Bool) {
@@ -92,7 +103,6 @@ final class ProductListingViewModel: ProductListingViewModelProtocol {
             dependencies.wishlistService.removeProductVariants(wishlistProduct)
             dependencies.analytics.trackRemoveFromWishlist(productID: wishlistProduct.id)
         }
-        wishlistContent = dependencies.wishlistService.getWishlistContent()
     }
 
     func didApplyFilters() {

Alfie/Alfie/Views/WishlistView/WishlistView.swift

@@ -41,9 +41,6 @@ struct WishlistView<ViewModel: WishlistViewModelProtocol>: View {
         }
         .padding(.vertical, Spacing.space200)
         .withToolbar(for: .wishlist)
-        .onAppear {
-            viewModel.viewDidAppear()
-        }
     }
 }