@akinon/projectzero 1.108.0-rc.87 → 1.108.0-rc.9

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.108.0-rc.87",
+  "version": "1.108.0-rc.9",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,24 +24,29 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.108.0-rc.87",
-    "@akinon/pz-akifast": "1.108.0-rc.87",
-    "@akinon/pz-b2b": "1.108.0-rc.87",
-    "@akinon/pz-basket-gift-pack": "1.108.0-rc.87",
-    "@akinon/pz-bkm": "1.108.0-rc.87",
-    "@akinon/pz-checkout-gift-pack": "1.108.0-rc.87",
-    "@akinon/pz-click-collect": "1.108.0-rc.87",
-    "@akinon/pz-credit-payment": "1.108.0-rc.87",
-    "@akinon/pz-cybersource-uc": "1.108.0-rc.87",
-    "@akinon/pz-gpay": "1.108.0-rc.87",
-    "@akinon/pz-hepsipay": "1.108.0-rc.87",
-    "@akinon/pz-masterpass": "1.108.0-rc.87",
-    "@akinon/pz-one-click-checkout": "1.108.0-rc.87",
-    "@akinon/pz-otp": "1.108.0-rc.87",
-    "@akinon/pz-pay-on-delivery": "1.108.0-rc.87",
-    "@akinon/pz-saved-card": "1.108.0-rc.87",
-    "@akinon/pz-tabby-extension": "1.108.0-rc.87",
-    "@akinon/pz-tamara-extension": "1.108.0-rc.87",
+    "@akinon/next": "1.108.0-rc.9",
+    "@akinon/pz-akifast": "1.108.0-rc.9",
+    "@akinon/pz-apple-pay": "1.108.0-rc.9",
+    "@akinon/pz-b2b": "1.108.0-rc.9",
+    "@akinon/pz-basket-gift-pack": "1.108.0-rc.9",
+    "@akinon/pz-bkm": "1.108.0-rc.9",
+    "@akinon/pz-checkout-gift-pack": "1.108.0-rc.9",
+    "@akinon/pz-click-collect": "1.108.0-rc.9",
+    "@akinon/pz-credit-payment": "1.108.0-rc.9",
+    "@akinon/pz-cybersource-uc": "1.108.0-rc.9",
+    "@akinon/pz-flow-payment": "1.108.0-rc.9",
+    "@akinon/pz-gpay": "1.108.0-rc.9",
+    "@akinon/pz-hepsipay": "1.108.0-rc.9",
+    "@akinon/pz-masterpass": "1.108.0-rc.9",
+    "@akinon/pz-multi-basket": "1.108.0-rc.9",
+    "@akinon/pz-one-click-checkout": "1.108.0-rc.9",
+    "@akinon/pz-otp": "1.108.0-rc.9",
+    "@akinon/pz-pay-on-delivery": "1.108.0-rc.9",
+    "@akinon/pz-saved-card": "1.108.0-rc.9",
+    "@akinon/pz-similar-products": "1.108.0-rc.9",
+    "@akinon/pz-tabby-extension": "1.108.0-rc.9",
+    "@akinon/pz-tamara-extension": "1.108.0-rc.9",
+    "@akinon/pz-virtual-try-on": "1.108.0-rc.9",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -64,7 +69,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.108.0-rc.87",
+    "@akinon/eslint-plugin-projectzero": "1.108.0-rc.9",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
@@ -92,7 +97,7 @@
     "jest-environment-jsdom": "29.7.0",
     "lint-staged": "13.1.0",
     "prettier": "2.6.2",
-    "react-number-format": "5.4.3",
+    "react-number-format": "5.3.4",
     "sass": "1.49.9",
     "semantic-release": "19.0.5",
     "server-only": "0.0.1",

package/app-template/public/locales/en/account.json

@@ -242,7 +242,9 @@
       "total": "Total",
       "items": "items",
       "packages": "Packages",
-      "package_no": "Package no"
+      "package_no": "Package no",
+      "back_to_orders": "Back to Orders",
+      "no_orders_found": "No orders found"
     },
     "return": {
       "title": "Return Items",

package/app-template/public/locales/en/product.json

@@ -32,8 +32,30 @@
   "installment": "Installment",
   "stock_alert": {
     "title": "Stock Alert",
-    "success_description": "When your size is back in stock we’ll send an email to: <Email/>",
+    "success_description": "When your size is back in stock we'll send an email to: <Email/>",
     "error_description": "An unexpected error has occured. Please try again later.",
     "close_button": "CLOSE"
+  },
+  "virtual_try_on": {
+    "title": "Virtual Try On",
+    "button_text": "Virtual Try On",
+    "loading": "Loading...",
+    "upload_title": "Upload Your Photo",
+    "upload_prompt": "Click to upload image",
+    "upload_requirements": "Max 1MB, JPEG/PNG/WebP only",
+    "instructions": "Upload a clear photo of yourself for the best virtual try-on experience. Make sure you are facing the camera directly.",
+    "try_on": "Try On",
+    "processing": "Processing...",
+    "processing_message": "Creating your virtual try-on...",
+    "result_title": "Virtual Try-On Result",
+    "result_placeholder": "Upload your photo to see the result",
+    "error": "Virtual try-on failed. Please try again.",
+    "feedback_prompt": "How did the virtual try-on work for you?",
+    "reset_crop": "Reset Crop",
+    "legal": {
+      "title": "Terms & Conditions",
+      "text": "By using this virtual try-on feature, you agree to our terms and conditions. Your image will be processed securely and not stored permanently. We use your photo only to generate the virtual try-on result.",
+      "accept": "I Accept & Continue"
+    }
   }
 }

package/app-template/public/locales/tr/account.json

@@ -242,7 +242,9 @@
       "total": "Toplam",
       "items": "adet",
       "packages": "paket",
-      "package_no": "Paket no"
+      "package_no": "Paket no",
+      "back_to_orders": "Siparişlere geri dön",
+      "no_orders_found": "Sipariş bulunamadı"
     },
     "return": {
       "title": "İade Ürünleri",

package/app-template/public/locales/tr/product.json

@@ -35,5 +35,27 @@
     "success_description": "Bedeniniz stoklara tekrar girdiğinde şu adrese bir e-posta göndereceğiz: <Email/>",
     "error_description": "Beklenmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.",
     "close_button": "KAPAT"
+  },
+  "virtual_try_on": {
+    "title": "Sanal Deneme",
+    "button_text": "Sanal Deneme",
+    "loading": "Yükleniyor...",
+    "upload_title": "Fotoğrafınızı Yükleyin",
+    "upload_prompt": "Resim yüklemek için tıklayın",
+    "upload_requirements": "Maks 1MB, sadece JPEG/PNG/WebP",
+    "instructions": "En iyi sanal deneme deneyimi için net bir fotoğrafınızı yükleyin. Kameraya doğrudan baktığınızdan emin olun.",
+    "try_on": "Dene",
+    "processing": "İşleniyor...",
+    "processing_message": "Sanal denemeniz oluşturuluyor...",
+    "result_title": "Sanal Deneme Sonucu",
+    "result_placeholder": "Sonucu görmek için fotoğrafınızı yükleyin",
+    "error": "Sanal deneme başarısız oldu. Lütfen tekrar deneyin.",
+    "feedback_prompt": "Sanal deneme sizin için nasıldı?",
+    "reset_crop": "Kırpma Sıfırla",
+    "legal": {
+      "title": "Şartlar ve Koşullar",
+      "text": "Bu sanal deneme özelliğini kullanarak şartlar ve koşullarımızı kabul etmiş olursunuz. Fotoğrafınız güvenli bir şekilde işlenecek ve kalıcı olarak saklanmayacaktır. Fotoğrafınızı yalnızca sanal deneme sonucunu oluşturmak için kullanırız.",
+      "accept": "Kabul Ediyorum & Devam Et"
+    }
   }
 }

package/app-template/src/app/[commerce]/[locale]/[currency]/account/orders/[id]/page.tsx

@@ -61,7 +61,26 @@ const AccountOrderDetail = ({ params: { id } }) => {
   }, [order, isSuccess, localeValue]);
 
   if (isLoading && isFetching) {
-    return <LoaderSpinner />;
+    return (
+      <div className="flex flex-col items-center justify-center h-96">
+        <LoaderSpinner />
+      </div>
+    );
+  }
+
+  if (!order) {
+    return (
+      <div className="flex flex-col items-center justify-center h-96">
+        <p className="mt-5 text-start text-lg mb-4">
+          {t('account.my_orders.detail.no_orders_found')}
+        </p>
+        <Link href={`/account/orders/`}>
+          <Button className="px-4" appearance="filled">
+            {t('account.my_orders.detail.back_to_orders')}
+          </Button>
+        </Link>
+      </div>
+    );
   }
 
   return (

package/app-template/src/app/[commerce]/[locale]/[currency]/basket/page.tsx

@@ -1,14 +1,87 @@
-import { BasketContent } from '@theme/views/basket/basket-content';
-import { getBasketData } from '@akinon/next/data/server/basket';
+'use client';
+
+import { useEffect } from 'react';
+import { ROUTES } from '@theme/routes';
+import { useGetBasketQuery } from '@akinon/next/data/client/basket';
+import { pushCartView } from '@theme/utils/gtm';
+import { Button, LoaderSpinner, Link } from '@theme/components';
+import { BasketItem, Summary } from '@theme/views/basket';
+import { useLocalization } from '@akinon/next/hooks';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 import settings from '@theme/settings';
 
-export default async function Page() {
-  const { basket } = await getBasketData();
+export default function Page() {
+  const { data: basket, isLoading, isSuccess } = useGetBasketQuery();
+  const { t } = useLocalization();
+  const multiBasket = settings.plugins?.multiBasket ?? false;
+
+  useEffect(() => {
+    if (isSuccess) {
+      const products = basket.basketitem_set.map((basketItem) => ({
+        ...basketItem.product
+      }));
+      pushCartView(products);
+    }
+  }, [basket, isSuccess]);
+
+  return (
+    <div className="max-w-screen-xl p-4 flex flex-col text-primary-800 lg:p-8 xl:flex-row xl:mx-auto">
+      {isLoading && (
+        <div className="flex justify-center w-full">
+          <LoaderSpinner />
+        </div>
+      )}
+      {isSuccess &&
+        (basket && basket.basketitem_set && basket.basketitem_set.length > 0 ? (
+          <>
+            <div className="flex-1 xl:mr-16">
+              <div className="flex items-center justify-between py-2 border-b border-gray-200 lg:py-3">
+                <h2 className="text-xl lg:text-2xl font-light">
+                  {t('basket.my_cart')}
+                </h2>
+                <Link
+                  href={ROUTES.HOME}
+                  className="text-xs hover:text-secondary-500"
+                >
+                  {t('basket.back_to_shopping')}
+                </Link>
+              </div>
+              <ul>
+                {multiBasket ? (
+                  <PluginModule
+                    component={Component.MultiBasket}
+                    props={{ BasketItem }}
+                  />
+                ) : (
+                  basket.basketitem_set.map((basketItem, index) => (
+                    <BasketItem basketItem={basketItem} key={index} />
+                  ))
+                )}
+              </ul>
+            </div>
+            <Summary basket={basket} />
+          </>
+        ) : (
+          <div className="flex flex-col items-center container max-w-screen-sm py-4 px-4 xs:py-6 xs:px-6 sm:py-8 sm:px-8 lg:max-w-screen-xl">
+            <h1
+              className="w-full text-xl font-light text-secondary text-center sm:text-2xl"
+              data-testid="basket-empty"
+            >
+              {t('basket.empty.title')}
+            </h1>
 
-  const multiBasket: boolean =
-    typeof settings.plugins?.multiBasket === 'boolean'
-      ? settings.plugins.multiBasket
-      : false;
+            <div className="w-full text-sm text-black-800 text-center my-4 mb-2 sm:text-base">
+              <p>{t('basket.empty.content_first')}</p>
+              <p>{t('basket.empty.content_second')}.</p>
+            </div>
 
-  return <BasketContent initialBasket={basket} multiBasket={multiBasket} />;
+            <Link href={ROUTES.HOME} passHref>
+              <Button className="px-10 mt-2" appearance="filled">
+                {t('basket.empty.button')}
+              </Button>
+            </Link>
+          </div>
+        ))}
+    </div>
+  );
 }

package/app-template/src/app/[commerce]/[locale]/[currency]/landing-page/[pk]/page.tsx

@@ -1,20 +1,9 @@
 import { getLandingPageData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
-import { notFound } from 'next/navigation';
 
 async function Page({ params }: PageProps<{ pk: number }>) {
-  let data;
-
-  try {
-    data = await getLandingPageData({ pk: params.pk });
-  } catch (error) {
-    return notFound();
-  }
-
-  if (!data || !data.landing_page) {
-    return notFound();
-  }
+  const data = await getLandingPageData({ pk: params.pk });
 
   const content = data.landing_page;
 

package/app-template/src/app/api/virtual-try-on/limited-categories/route.ts

@@ -0,0 +1 @@
+export * from '@akinon/next/api/virtual-try-on';

package/app-template/src/app/api/virtual-try-on/route.ts

@@ -0,0 +1 @@
+export * from '@akinon/next/api/virtual-try-on';

package/app-template/src/assets/fonts/pz-icon.css

@@ -152,6 +152,3 @@ url("./pz-icon.svg?db4ba799c4ca72f4bb855458e0cd19ee#pz-icon") format("svg");
 .pz-icon-whatsapp:before {
   content: "\f12c";
 }
-.pz-icon-camera:before {
-  content: "\f12d";
-}

package/app-template/src/components/input.tsx

@@ -78,8 +78,7 @@ export const Input = forwardRef<
               hasFloatingLabel,
             'mb-2': !hasFloatingLabel,
             '-translate-y-2 bg-white inline-flex h-auto':
-              hasFloatingLabel &&
-              (focused || hasValue || props.value || props.format)
+              hasFloatingLabel && (focused || hasValue)
           })
         )}
       >

package/app-template/src/components/modal.tsx

@@ -41,12 +41,14 @@ export const Modal = (props: ModalProps) => {
           'fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50',
           overlayClassName
         )}
+        onClick={(e) => e.stopPropagation()}
       />
       <section
         className={twMerge(
           'fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 bg-white',
           className
         )}
+        onClick={(e) => e.stopPropagation()}
       >
         {(showCloseButton || title) && (
           <div

package/app-template/src/components/select.tsx

@@ -48,7 +48,7 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
             clsx(
               'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
               !borderless &&
-                'border border-gray-200 transition-all duration-150 hover:border-primary',
+                'border border-gray-200 transition-all duration-150 hover:border-primary focus:border-primary',
               'appearance-none bg-transparent'
             ),
             className

package/app-template/src/plugins.js

@@ -1,4 +1,3 @@
-// we are holding all of the plugins because of the development enviroment.
 module.exports = [
   'pz-basket-gift-pack',
   'pz-click-collect',
@@ -12,9 +11,15 @@ module.exports = [
   'pz-masterpass',
   'pz-b2b',
   'pz-akifast',
+  'pz-multi-basket',
   'pz-saved-card',
   'pz-tabby-extension',
+  'pz-apple-pay',
   'pz-tamara-extension',
+  'pz-hepsipay',
+  'pz-flow-payment',
+  'pz-virtual-try-on',
+  'pz-similar-products',
   'pz-cybersource-uc',
   'pz-hepsipay'
 ];

package/app-template/src/settings.js

@@ -1,10 +1,6 @@
 const { LocaleUrlStrategy } = require('@akinon/next/localization');
 const { ROUTES } = require('@theme/routes');
 
-/* IMPORTANT *
- * In order to use one locale in the locales array and hide the default locale in the URL, you need to set the localeUrlStrategy to LocaleUrlStrategy.ShowAllLocales.
- */
-
 const commerceUrl = encodeURI(process.env.SERVICE_BACKEND_URL ?? 'default');
 
 /** @type {import('@akinon/next/types').Settings} */
@@ -18,7 +14,6 @@ module.exports = {
     { translationKey: 'size', key: 'size' }
   ],
   localization: {
-    // If there is one locale in the locales array, the default locale will be hidden in the URL.
     locales: [
       {
         label: 'EN',
@@ -46,7 +41,7 @@ module.exports = {
       }
     ],
     defaultLocaleValue: 'en',
-    localeUrlStrategy: LocaleUrlStrategy.HideDefaultLocale, // If there is one locale in the locales array, the default locale will be hidden in the URL and localeUrlStrategy should be set to LocaleUrlStrategy.ShowAllLocales.
+    localeUrlStrategy: LocaleUrlStrategy.HideDefaultLocale,
     redirectToDefaultLocale: true,
     defaultCurrencyCode: 'usd'
   },

package/app-template/src/views/account/orders/order-detail-header.tsx

@@ -21,7 +21,7 @@ export const OrderDetailHeader = ({ title, order, children }: Props) => {
         <div>
           <span>{t('account.my_orders.detail.order_number')}</span>:{' '}
           <span data-testid="account-orders-return-order-id">
-            {order.number}
+            {order?.number}
           </span>
         </div>
 

package/app-template/src/views/basket/basket-item.tsx

@@ -3,7 +3,7 @@ import {
   useUpdateQuantityMutation
 } from '@akinon/next/data/client/basket';
 import { useAppDispatch } from '@akinon/next/redux/hooks';
-import { Basket, BasketItem as BasketItemType } from '@akinon/next/types';
+import { BasketItem as BasketItemType } from '@akinon/next/types';
 import { Price, Button, Icon, Modal, Select, Link } from '@theme/components';
 import { useState } from 'react';
 import { useAddFavoriteMutation } from '@akinon/next/data/client/wishlist';
@@ -19,12 +19,11 @@ import { pushRemoveFromCart } from '@theme/utils/gtm';
 interface Props {
   basketItem?: BasketItemType;
   namespace?: string;
-  onBasketUpdate?: (basket: Basket) => void;
 }
 
 export const BasketItem = (props: Props) => {
   const { t } = useLocalization();
-  const { basketItem, namespace, onBasketUpdate } = props;
+  const { basketItem, namespace } = props;
   const [updateQuantityMutation] = useUpdateQuantityMutation();
   const dispatch = useAppDispatch();
   const [isRemoveBasketModalOpen, setRemoveBasketModalOpen] = useState(false);
@@ -55,21 +54,19 @@ export const BasketItem = (props: Props) => {
       requestParams.namespace = namespace;
     }
 
-    try {
-      const response = await updateQuantityMutation(requestParams).unwrap();
-      dispatch(
-        basketApi.util.updateQueryData(
-          'getBasket',
-          undefined,
-          (draftBasket) => {
-            Object.assign(draftBasket, response.basket);
-          }
+    await updateQuantityMutation(requestParams)
+      .unwrap()
+      .then((data) =>
+        dispatch(
+          basketApi.util.updateQueryData(
+            'getBasket',
+            undefined,
+            (draftBasket) => {
+              Object.assign(draftBasket, data.basket);
+            }
+          )
         )
       );
-      onBasketUpdate?.(response.basket);
-    } catch (error) {
-      console.error('Error updating quantity:', error);
-    }
   };
 
   const deleteProduct = async (productPk?: number) => {

package/app-template/src/views/basket/summary.tsx

@@ -18,7 +18,6 @@ import clsx from 'clsx';
 
 interface Props {
   basket: Basket;
-  onBasketUpdate?: (basket: Basket) => void;
 }
 
 const voucherCodeFormSchema = (t) =>
@@ -28,7 +27,7 @@ const voucherCodeFormSchema = (t) =>
 
 export const Summary = (props: Props) => {
   const { t } = useLocalization();
-  const { basket, onBasketUpdate } = props;
+  const { basket } = props;
   const router = useRouter();
   const {
     register,
@@ -54,7 +53,7 @@ export const Summary = (props: Props) => {
   const removeVoucherCode = () => {
     removeVoucherCodeMutation()
       .unwrap()
-      .then((basket) => {
+      .then((basket) =>
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -63,9 +62,8 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        );
-        onBasketUpdate?.(basket);
-      })
+        )
+      )
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });
@@ -76,7 +74,7 @@ export const Summary = (props: Props) => {
       voucher_code: data.voucherCode
     })
       .unwrap()
-      .then((basket) => {
+      .then((basket) =>
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -85,9 +83,8 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        );
-        onBasketUpdate?.(basket);
-      })
+        )
+      )
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });

package/app-template/src/views/checkout/steps/shipping/address-box.tsx

@@ -85,7 +85,7 @@ const AddressBox = ({
   };
 
   const onSubmit = (data) => {
-    editAddress({ ...data, invalidateTag: 'Addresses' })
+    editAddress({ ...data, invalidateTag: 'Checkout' })
       .unwrap()
       .then((editAddressResponse) => {
         handleAddressClick(addressType, editAddressResponse);
@@ -96,7 +96,7 @@ const AddressBox = ({
   };
 
   const handleRemoveAddress = async (addressPk: number) => {
-    await removeAddress({ id: addressPk, invalidateTag: 'Addresses' });
+    await removeAddress({ id: addressPk, invalidateTag: 'Checkout' });
     setRemoveAddressModalOpen(false);
     dispatch(resetCheckoutState());
 
@@ -168,7 +168,10 @@ const AddressBox = ({
         <Button
           appearance="ghost"
           className="italic underline hover:text-secondary-500 hover:!bg-white hover:!border-white p-0 h-auto"
-          onClick={() => setIsEditAddressModalOpen(true)}
+          onClick={(e) => {
+            e.stopPropagation();
+            setIsEditAddressModalOpen(true);
+          }}
           data-testid="checkout-address-edit"
         >
           {t('checkout.address.box.edit')}
@@ -180,21 +183,26 @@ const AddressBox = ({
           setOpen={setIsEditAddressModalOpen}
           className="w-full sm:w-[28rem] max-h-[90vh] overflow-y-auto"
         >
-          <AddressForm
-            data={{
-              ...address,
-              country: address.country?.pk,
-              city: address.city?.pk,
-              township: address.township?.pk,
-              district: address.district?.pk
-            }}
-            onSubmit={onSubmit}
-          />
+          <div onClick={(e) => e.stopPropagation()}>
+            <AddressForm
+              data={{
+                ...address,
+                country: address.country?.pk,
+                city: address.city?.pk,
+                township: address.township?.pk,
+                district: address.district?.pk
+              }}
+              onSubmit={onSubmit}
+            />
+          </div>
         </Modal>
         <Button
           appearance="ghost"
           className="italic underline hover:text-secondary-500 hover:!bg-white hover:!border-white p-0 h-auto"
-          onClick={() => setRemoveAddressModalOpen(true)}
+          onClick={(e) => {
+            e.stopPropagation();
+            setRemoveAddressModalOpen(true);
+          }}
           data-testid="checkout-address-remove"
         >
           {t('checkout.address.box.remove')}
@@ -207,14 +215,18 @@ const AddressBox = ({
         setOpen={setRemoveAddressModalOpen}
         showCloseButton={false}
       >
-        <div className="text-center px-6 py-10">
+        <div
+          className="text-center px-6 py-10"
+          onClick={(e) => e.stopPropagation()}
+        >
           <p className="mb-4">
             {t('account.address_book.modal.delete_description')}
           </p>
           <div className="space-x-3 flex justify-center">
             <Button
               appearance="outlined"
-              onClick={() => {
+              onClick={(e) => {
+                e.stopPropagation();
                 setRemoveAddressModalOpen(false);
               }}
               data-testid="remove-address-modal-cancel"
@@ -224,7 +236,8 @@ const AddressBox = ({
             <Button
               appearance="filled"
               disabled={removeAddressLoading}
-              onClick={() => {
+              onClick={(e) => {
+                e.stopPropagation();
                 handleRemoveAddress(address.pk);
               }}
               className={

package/app-template/src/views/checkout/steps/shipping/addresses.tsx

@@ -77,7 +77,7 @@ const Addresses = () => {
   }, [billing_and_shipping_same]);
 
   const onSubmit = (data) => {
-    addAddress({ ...data, invalidateTag: 'Addresses' })
+    addAddress({ ...data, invalidateTag: 'Checkout' })
       .unwrap()
       .then((addAddressResponse) => {
         if (addressList.length === 0) {

package/app-template/src/views/guest-login/index.tsx

@@ -51,14 +51,9 @@ const GuestLogin = () => {
       ).unwrap();
 
       Object.keys(response?.errors || {}).forEach((key) => {
-        const errorValue = response?.errors[key];
-        const message = Array.isArray(errorValue)
-          ? errorValue.join(', ')
-          : errorValue || '';
-
         setError(key as keyof GuestLoginFormParams, {
           type: 'custom',
-          message
+          message: response?.errors[key]?.join(', ')
         });
       });
     } catch (error) {