fix: keep customer address selected after delivery step

Author: malessani

components/data/AppProvider/index.tsx

@@ -172,7 +172,11 @@ export const AppProvider: React.FC<AppProviderProps> = ({
     if (state.order) {
       dispatch({ type: ActionType.START_LOADING })
 
-      const others = calculateSettings(order, state.isShipmentRequired)
+      const others = calculateSettings(
+        order,
+        state.isShipmentRequired,
+        state.customerAddresses
+      )
 
       dispatch({
         type: ActionType.CHANGE_COUPON_OR_GIFTCARD,
@@ -190,7 +194,11 @@ export const AppProvider: React.FC<AppProviderProps> = ({
     // TODO Remove after fixing components
     const order = await fetchOrder(cl, orderId)
 
-    const others = calculateSettings(order, state.isShipmentRequired)
+    const others = calculateSettings(
+      order,
+      state.isShipmentRequired,
+      state.customerAddresses
+    )
 
     dispatch({
       type: ActionType.SELECT_SHIPMENT,
@@ -209,7 +217,11 @@ export const AppProvider: React.FC<AppProviderProps> = ({
     dispatch({ type: ActionType.START_LOADING })
 
     const order = await fetchOrder(cl, orderId)
-    const others = calculateSettings(order, state.isShipmentRequired)
+    const others = calculateSettings(
+      order,
+      state.isShipmentRequired,
+      state.customerAddresses
+    )
 
     dispatch({
       type: ActionType.SAVE_SHIPMENTS,
@@ -223,8 +235,12 @@ export const AppProvider: React.FC<AppProviderProps> = ({
   const saveShipments = async () => {
     dispatch({ type: ActionType.START_LOADING })
     const order = await getOrderFromRef()
-
-    const others = calculateSettings(order, state.isShipmentRequired)
+    console.log(order)
+    const others = calculateSettings(
+      order,
+      state.isShipmentRequired,
+      state.customerAddresses
+    )
 
     setTimeout(() => {
       dispatch({
@@ -238,7 +254,11 @@ export const AppProvider: React.FC<AppProviderProps> = ({
     dispatch({ type: ActionType.START_LOADING })
     const order = await getOrderFromRef()
 
-    const others = calculateSettings(order, state.isShipmentRequired)
+    const others = calculateSettings(
+      order,
+      state.isShipmentRequired,
+      state.customerAddresses
+    )
 
     dispatch({
       type: ActionType.SET_PAYMENT,

specs/e2e/customer-addresses-with-wallet.spec.ts

@@ -429,3 +429,57 @@ test.describe("two address on wallet and code lock", () => {
     })
   })
 })
+
+test.describe("one address on wallet", () => {
+  const customerEmail = faker.internet.email().toLocaleLowerCase()
+  const customerPassword = faker.internet.password()
+
+  test.use({
+    defaultParams: {
+      order: "with-items",
+      customer: {
+        email: customerEmail,
+        password: customerPassword,
+      },
+      lineItemsAttributes: [
+        { sku_code: "CANVASAU000000FFFFFF1824", quantity: 1 },
+      ],
+      customerAddresses: [euAddress],
+    },
+  })
+
+  test("check addresses", async ({ checkoutPage }) => {
+    await checkoutPage.checkOrderSummary("Order Summary")
+
+    await checkoutPage.page.locator(`text=${customerEmail}`)
+
+    await checkoutPage.checkStep("Shipping", "open")
+
+    await checkoutPage.clickStep("Customer")
+
+    let element = await checkoutPage.page.locator(
+      "[data-test-id=customer-billing-address]"
+    )
+    await expect(element).toHaveCount(1)
+
+    await checkoutPage.save("Customer")
+
+    await checkoutPage.checkStep("Customer", "close")
+    await checkoutPage.checkStep("Shipping", "open")
+
+    await expect(
+      checkoutPage.page.locator("text=Standard Shipping")
+    ).toBeVisible()
+    await checkoutPage.selectShippingMethod({ text: "Standard Shipping" })
+
+    await checkoutPage.checkShippingSummary("FREE")
+    await checkoutPage.save("Shipping")
+
+    await checkoutPage.clickStep("Customer")
+
+    element = await checkoutPage.page.locator(
+      "[data-test-id=customer-billing-address]"
+    )
+    await expect(element).toHaveCount(1)
+  })
+})

specs/e2e/shipments-multiple.spec.ts

@@ -35,6 +35,8 @@ test.describe("with two shipments", () => {
 
     await checkoutPage.checkShippingSummary("To be calculated")
 
+    await checkoutPage.page.waitForTimeout(TIMEOUT)
+
     await checkoutPage.selectShippingMethod({
       text: "Standard Shipping",
       shipment: 0,
@@ -55,12 +57,15 @@ test.describe("with two shipments", () => {
     await checkoutPage.checkStep("Payment", "open")
 
     await checkoutPage.clickStep("Shipping")
+    await checkoutPage.page.waitForTimeout(TIMEOUT)
 
     await checkoutPage.checkSelectedShippingMethod({
       index: 0,
       shipment: 0,
       value: true,
     })
+    await checkoutPage.page.waitForTimeout(TIMEOUT)
+
     await checkoutPage.checkSelectedShippingMethod({
       index: 0,
       shipment: 1,
@@ -100,6 +105,7 @@ test.describe("with two shipments", () => {
       shipment: 1,
       value: true,
     })
+    await checkoutPage.page.waitForTimeout(TIMEOUT)
 
     await checkoutPage.selectShippingMethod({
       text: "Express Delivery",
@@ -114,6 +120,8 @@ test.describe("with two shipments", () => {
     await checkoutPage.page.waitForTimeout(TIMEOUT)
 
     await checkoutPage.save("Shipping")
+    await checkoutPage.page.waitForTimeout(TIMEOUT)
+
     await checkoutPage.checkStep("Shipping", "close")
     await checkoutPage.checkStep("Payment", "open")
     await checkoutPage.clickStep("Shipping")