Scroll to the first item when added

Author: staskus

WooCommerce/Classes/POS/Presentation/CartView.swift

@@ -95,9 +95,9 @@ struct CartView: View {
                     .coordinateSpace(name: Constants.scrollViewCoordinateSpaceIdentifier)
                     .onChange(of: cartViewModel.itemToScrollToWhenCartUpdated?.id) { _ in
                         if viewModel.orderStage == .building,
-                           let last = cartViewModel.itemToScrollToWhenCartUpdated?.id {
+                           let itemToScrollTo = cartViewModel.itemToScrollToWhenCartUpdated?.id {
                             withAnimation {
-                                proxy.scrollTo(last)
+                                proxy.scrollTo(itemToScrollTo)
                             }
                         }
                     }

WooCommerce/Classes/POS/ViewModels/CartViewModel.swift

@@ -46,6 +46,7 @@ final class CartViewModel: CartViewModelProtocol {
     func addItemToCart(_ item: POSItem) {
         let cartItem = CartItem(id: UUID(), item: item, quantity: 1)
         itemsInCart.insert(cartItem, at: 0)
+        itemToScrollToWhenCartUpdated = cartItem
 
         analytics.track(.pointOfSaleAddItemToCart)
     }
@@ -58,9 +59,7 @@ final class CartViewModel: CartViewModelProtocol {
         itemsInCart.removeAll()
     }
 
-    var itemToScrollToWhenCartUpdated: CartItem? {
-        return itemsInCart.last
-    }
+    var itemToScrollToWhenCartUpdated: CartItem?
 
     var itemsInCartLabel: String? {
         switch itemsInCart.count {

WooCommerce/WooCommerceTests/POS/ViewModels/CartViewModelTests.swift

@@ -84,15 +84,15 @@ final class CartViewModelTests: XCTestCase {
         sut.addItemToCart(item)
         sut.addItemToCart(anotherItem)
         XCTAssertEqual(sut.itemsInCart.count, 2)
-        XCTAssertEqual(sut.itemsInCart.map { $0.item.name }, [item, anotherItem].map { $0.name })
+        XCTAssertEqual(sut.itemsInCart.map { $0.item.name }, [anotherItem, item].map { $0.name })
 
         // When
         let firstCartItem = try XCTUnwrap(sut.itemsInCart.first)
         sut.removeItemFromCart(firstCartItem)
 
         // Then
         XCTAssertEqual(sut.itemsInCart.count, 1)
-        XCTAssertEqual(sut.itemsInCart.map { $0.item.name }, [anotherItem.name])
+        XCTAssertEqual(sut.itemsInCart.map { $0.item.name }, [item.name])
     }
 
     func test_cart_when_removeAllItemsFromCart_is_invoked_then_removes_all_items_from_cart() {