@akinon/projectzero 1.115.0-snapshot-ZERO-3895-20251210115756 → 1.116.0-rc.0

package/CHANGELOG.md

@@ -1,6 +1,17 @@
 # @akinon/projectzero
 
-## 1.115.0-snapshot-ZERO-3895-20251210115756
+## 1.116.0-rc.0
+
+### Minor Changes
+
+- 143be2b9: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
+- d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
+
+## 1.115.0
+
+### Minor Changes
+
+- b59bed4d: ZERO-3878: Reintegrated similar products and removed localStorage checks and implemented props based showing of buttons
 
 ## 1.114.0
 

package/app-template/.env.example

@@ -7,6 +7,7 @@ NEXT_PUBLIC_URL=http://localhost:3000
 SERVICE_BACKEND_URL=https://02fde10fee4440269e695aa10707dfaf.lb.akinoncloud.com
 SITEMAP_S3_BUCKET_NAME=0fb534
 NEXT_PUBLIC_VIRTUAL_TRY_ON_API_URL=https://d2a26507c7094f359aba349b96a96881.lb.akinoncloud.com
+NEXT_PUBLIC_ENABLE_IMAGE_SEARCH=true
 
 # LOG_LEVEL_DEV=debug # For more details, please refer to the Logging documentation.
 

package/app-template/CHANGELOG.md

@@ -1,5 +1,95 @@
 # projectzeronext
 
+## 1.116.0-rc.0
+
+### Minor Changes
+
+- 4449f3a3: ZERO-3681: Add order details localization and improve order handling in AccountOrderDetail
+- 1a8622a9: ZERO-3392: Implemented AI Search functionality and update env
+- b55acb76: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
+- 143be2b9: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
+- 9f8cd3bc: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
+- d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
+- b87517ff: ZERO-3680: Enhance select component styling to ensure focus state is consistent
+- b05c3543: ZERO-2570: Category filters routes to absolute url
+
+### Patch Changes
+
+- Updated dependencies [d2c0e759]
+- Updated dependencies [b55acb76]
+- Updated dependencies [143be2b9]
+- Updated dependencies [9f8cd3bc]
+- Updated dependencies [0d33d9ac]
+- Updated dependencies [d99a6a7d]
+- Updated dependencies [ee191e6f]
+- Updated dependencies [4de5303c]
+- Updated dependencies [95b139dc]
+- Updated dependencies [6b73b050]
+- Updated dependencies [5ae86358]
+  - @akinon/next@1.116.0-rc.0
+  - @akinon/pz-similar-products@1.116.0-rc.0
+  - @akinon/pz-masterpass-rest@1.116.0-rc.0
+  - @akinon/pz-virtual-try-on@1.116.0-rc.0
+  - @akinon/pz-akifast@1.116.0-rc.0
+  - @akinon/pz-apple-pay@1.116.0-rc.0
+  - @akinon/pz-b2b@1.116.0-rc.0
+  - @akinon/pz-basket-gift-pack@1.116.0-rc.0
+  - @akinon/pz-bkm@1.116.0-rc.0
+  - @akinon/pz-checkout-gift-pack@1.116.0-rc.0
+  - @akinon/pz-click-collect@1.116.0-rc.0
+  - @akinon/pz-credit-payment@1.116.0-rc.0
+  - @akinon/pz-cybersource-uc@1.116.0-rc.0
+  - @akinon/pz-flow-payment@1.116.0-rc.0
+  - @akinon/pz-gpay@1.116.0-rc.0
+  - @akinon/pz-haso@1.116.0-rc.0
+  - @akinon/pz-hepsipay@1.116.0-rc.0
+  - @akinon/pz-masterpass@1.116.0-rc.0
+  - @akinon/pz-multi-basket@1.116.0-rc.0
+  - @akinon/pz-one-click-checkout@1.116.0-rc.0
+  - @akinon/pz-otp@1.116.0-rc.0
+  - @akinon/pz-pay-on-delivery@1.116.0-rc.0
+  - @akinon/pz-saved-card@1.116.0-rc.0
+  - @akinon/pz-tabby-extension@1.116.0-rc.0
+  - @akinon/pz-tamara-extension@1.116.0-rc.0
+
+## 1.115.0
+
+### Minor Changes
+
+- b59bed4d: ZERO-3878: Reintegrated similar products and removed localStorage checks and implemented props based showing of buttons
+
+### Patch Changes
+
+- Updated dependencies [b59bed4d]
+- Updated dependencies [b5f9d75c]
+- Updated dependencies [cbcfdf4d]
+- Updated dependencies [1880978c]
+- Updated dependencies [71882722]
+- Updated dependencies [7056203a]
+  - @akinon/next@1.115.0
+  - @akinon/pz-virtual-try-on@1.115.0
+  - @akinon/pz-akifast@1.115.0
+  - @akinon/pz-apple-pay@1.115.0
+  - @akinon/pz-b2b@1.115.0
+  - @akinon/pz-basket-gift-pack@1.115.0
+  - @akinon/pz-bkm@1.115.0
+  - @akinon/pz-checkout-gift-pack@1.115.0
+  - @akinon/pz-click-collect@1.115.0
+  - @akinon/pz-credit-payment@1.115.0
+  - @akinon/pz-cybersource-uc@1.115.0
+  - @akinon/pz-flow-payment@1.115.0
+  - @akinon/pz-gpay@1.115.0
+  - @akinon/pz-hepsipay@1.115.0
+  - @akinon/pz-masterpass@1.115.0
+  - @akinon/pz-masterpass-rest@1.115.0
+  - @akinon/pz-multi-basket@1.115.0
+  - @akinon/pz-one-click-checkout@1.115.0
+  - @akinon/pz-otp@1.115.0
+  - @akinon/pz-pay-on-delivery@1.115.0
+  - @akinon/pz-saved-card@1.115.0
+  - @akinon/pz-tabby-extension@1.115.0
+  - @akinon/pz-tamara-extension@1.115.0
+
 ## 1.114.0
 
 ### Patch Changes

package/app-template/README.md

@@ -12,6 +12,30 @@ Run `cp .env.example .env && yarn` command at project root and all dependencies
 
 - `SITEMAP_S3_BUCKET_NAME`: S3 bucket name for XML sitemaps (e.g., "0fb534"). This is required for the sitemap route to function correctly.
 
+### Optional Environment Variables
+
+- `NEXT_PUBLIC_ENABLE_IMAGE_SEARCH`: Set to `true` to enable image search feature for all users. If not set or `false`, the feature will only be visible to users who have enabled it via localStorage.
+
+## Image Search Feature
+
+The image search functionality allows users to search for similar products by uploading images or cropping existing product images.
+
+### Feature Visibility Control
+
+The image search feature can be controlled in two ways:
+
+1. **Environment Variable (Global)**: Set `NEXT_PUBLIC_ENABLE_IMAGE_SEARCH=true` to enable for all users
+2. **localStorage (Individual Users)**: Users can enable it locally using browser developer tools
+
+````
+
+### Feature Locations
+
+When enabled, the image search feature appears in:
+
+- **Header Search**: Camera icon next to the search input
+- **Product Detail Page**: "View Similar Styles" button on product images
+
 ### Build
 
 To build the app, run the following command:
@@ -19,7 +43,7 @@ To build the app, run the following command:
 ```bash
 cd projectzeronext # Project root
 yarn build
-```
+````
 
 ### Develop
 

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.114.0",
+  "version": "1.116.0-rc.0",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,29 +24,31 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.114.0",
-    "@akinon/pz-akifast": "1.114.0",
-    "@akinon/pz-apple-pay": "1.114.0",
-    "@akinon/pz-b2b": "1.114.0",
-    "@akinon/pz-basket-gift-pack": "1.114.0",
-    "@akinon/pz-bkm": "1.114.0",
-    "@akinon/pz-checkout-gift-pack": "1.114.0",
-    "@akinon/pz-click-collect": "1.114.0",
-    "@akinon/pz-credit-payment": "1.114.0",
-    "@akinon/pz-cybersource-uc": "1.114.0",
-    "@akinon/pz-flow-payment": "1.114.0",
-    "@akinon/pz-gpay": "1.114.0",
-    "@akinon/pz-hepsipay": "1.114.0",
-    "@akinon/pz-masterpass": "1.114.0",
-    "@akinon/pz-masterpass-rest": "1.114.0",
-    "@akinon/pz-multi-basket": "1.114.0",
-    "@akinon/pz-one-click-checkout": "1.114.0",
-    "@akinon/pz-otp": "1.114.0",
-    "@akinon/pz-pay-on-delivery": "1.114.0",
-    "@akinon/pz-saved-card": "1.114.0",
-    "@akinon/pz-tabby-extension": "1.114.0",
-    "@akinon/pz-tamara-extension": "1.114.0",
-    "@akinon/pz-virtual-try-on": "1.114.0",
+    "@akinon/next": "1.116.0-rc.0",
+    "@akinon/pz-akifast": "1.116.0-rc.0",
+    "@akinon/pz-apple-pay": "1.116.0-rc.0",
+    "@akinon/pz-b2b": "1.116.0-rc.0",
+    "@akinon/pz-basket-gift-pack": "1.116.0-rc.0",
+    "@akinon/pz-bkm": "1.116.0-rc.0",
+    "@akinon/pz-checkout-gift-pack": "1.116.0-rc.0",
+    "@akinon/pz-click-collect": "1.116.0-rc.0",
+    "@akinon/pz-credit-payment": "1.116.0-rc.0",
+    "@akinon/pz-cybersource-uc": "1.116.0-rc.0",
+    "@akinon/pz-flow-payment": "1.116.0-rc.0",
+    "@akinon/pz-gpay": "1.116.0-rc.0",
+    "@akinon/pz-haso": "1.116.0-rc.0",
+    "@akinon/pz-hepsipay": "1.116.0-rc.0",
+    "@akinon/pz-masterpass": "1.116.0-rc.0",
+    "@akinon/pz-masterpass-rest": "1.116.0-rc.0",
+    "@akinon/pz-multi-basket": "1.116.0-rc.0",
+    "@akinon/pz-one-click-checkout": "1.116.0-rc.0",
+    "@akinon/pz-otp": "1.116.0-rc.0",
+    "@akinon/pz-pay-on-delivery": "1.116.0-rc.0",
+    "@akinon/pz-saved-card": "1.116.0-rc.0",
+    "@akinon/pz-similar-products": "1.116.0-rc.0",
+    "@akinon/pz-tabby-extension": "1.116.0-rc.0",
+    "@akinon/pz-tamara-extension": "1.116.0-rc.0",
+    "@akinon/pz-virtual-try-on": "1.116.0-rc.0",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -69,7 +71,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.114.0",
+    "@akinon/eslint-plugin-projectzero": "1.116.0-rc.0",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.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/common.json

@@ -29,7 +29,25 @@
     "clean": "clean",
     "categories": "CATEGORIES",
     "view_all": "VIEW ALL",
-    "not_found": "Search Results Not Found"
+    "not_found": "Search Results Not Found",
+    "image_search": {
+      "title": "Search by Image",
+      "upload_image": "Upload an image to find similar products",
+      "select_image": "Select Image",
+      "crop_image": "Crop Image",
+      "cancel_crop": "Cancel Crop",
+      "apply_crop": "Apply Crop",
+      "try_another": "Try Another Image",
+      "search_image": "Search Image",
+      "similar_products": "Similar Products",
+      "loading_cropper": "Loading cropper...",
+      "no_products": "No similar products found",
+      "best_results": "For best results:",
+      "tip_1": "Upload clear images of products",
+      "tip_2": "Use images with simple backgrounds",
+      "tip_3": "Focus on the main product",
+      "tip_4": "Use the crop tool to focus on specific details"
+    }
   },
   "page_404": {
     "title": "Page not found.",
@@ -74,6 +92,29 @@
     "select_file": "Select File",
     "no_file": "No file selected"
   },
+  "product": {
+    "no_products": "No products found",
+    "new_image": "New Image",
+    "view_similar_styles": "View Similar Styles",
+    "clear_all_filters": "Clear All Filters",
+    "reset_to_original": "Reset to Original",
+    "similar_styles": "Similar Styles",
+    "filters": "Filters",
+    "active_filters": "Active Filters"
+  },
+  "similar_products": {
+    "errors": {
+      "file_size_too_large": "Image size should be less than 5MB",
+      "invalid_image_file": "The selected file is not a valid image",
+      "invalid_image_format": "Invalid image format detected",
+      "search_failed": "Search failed. Please try again later",
+      "connection_failed": "Image search failed. Please check your connection and try again",
+      "invalid_image_properties": "Invalid image properties detected",
+      "file_read_error": "Error reading the file",
+      "processing_error": "Error processing image",
+      "crop_processing_error": "Error processing cropped image"
+    }
+  },
   "forms": {
     "sending": "Sending...",
     "success": "Form submitted successfully!",

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

@@ -77,10 +77,10 @@
     "photo_preview": "Photo Preview",
     "error_title": "An Error Occurred",
     "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.",
+      "title": "Consent Statement",
+      "text": "I hereby declare that I give my <strong>explicit consent</strong> for the image I will upload to be used for <strong>AI-powered processing, enhancement, analysis, and content creation</strong> purposes.",
       "accept": "Accept",
-      "error": "Please accept the terms and conditions."
+      "error": "Please accept the consent statement."
     },
     "multiple_results_title": "Virtual Try-On Results",
     "multiple_results_subtitle": "Try-on completed for {{count}} products",

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/common.json

@@ -29,7 +29,25 @@
     "clean": "temizle",
     "categories": "KATEGORİLER",
     "view_all": "HEPSİNİ GÖSTER",
-    "not_found": "Arama Sonuçları Bulunamadı"
+    "not_found": "Arama Sonuçları Bulunamadı",
+    "image_search": {
+      "title": "Görsel ile Ara",
+      "upload_image": "Benzer ürünleri bulmak için bir görsel yükleyin",
+      "select_image": "Görsel Seç",
+      "crop_image": "Görsel Kırp",
+      "cancel_crop": "Kırpmayı İptal Et",
+      "apply_crop": "Kırpmayı Uygula",
+      "try_another": "Başka Görsel Dene",
+      "search_image": "Arama Görseli",
+      "similar_products": "Benzer Ürünler",
+      "loading_cropper": "Kırpıcı yükleniyor...",
+      "no_products": "Benzer ürün bulunamadı",
+      "best_results": "En iyi sonuçlar için:",
+      "tip_1": "Net ürün görselleri yükleyin",
+      "tip_2": "Basit arka planlı görseller kullanın",
+      "tip_3": "Ana ürüne odaklanın",
+      "tip_4": "Belirli detaylara odaklanmak için kırpma aracını kullanın"
+    }
   },
   "page_404": {
     "title": "Sayfa bulunamadı.",
@@ -74,6 +92,29 @@
     "select_file": "Dosya Seç",
     "no_file": "Dosya seçilmedi"
   },
+  "product": {
+    "no_products": "Ürün bulunamadı",
+    "new_image": "Yeni Görsel",
+    "view_similar_styles": "Benzer Stillere Göz At",
+    "clear_all_filters": "Tüm Filtreleri Temizle",
+    "reset_to_original": "Orjinale Dön",
+    "similar_styles": "Benzer Stillere Göz At",
+    "filters": "Filtreler",
+    "active_filters": "Aktif Filtreler"
+  },
+  "similar_products": {
+    "errors": {
+      "file_size_too_large": "Görsel boyutu 5MB'dan küçük olmalıdır",
+      "invalid_image_file": "Seçilen dosya geçerli bir görsel değil",
+      "invalid_image_format": "Geçersiz görsel formatı tespit edildi",
+      "search_failed": "Arama başarısız oldu. Lütfen daha sonra tekrar deneyin",
+      "connection_failed": "Görsel arama başarısız oldu. Lütfen bağlantınızı kontrol edip tekrar deneyin",
+      "invalid_image_properties": "Geçersiz görsel özellikleri tespit edildi",
+      "file_read_error": "Dosya okuma hatası",
+      "processing_error": "Görsel işleme hatası",
+      "crop_processing_error": "Kırpılan görsel işleme hatası"
+    }
+  },
   "forms": {
     "sending": "Gönderiliyor...",
     "success": "Form başarıyla gönderildi!",

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

@@ -80,7 +80,7 @@
     "cabin": "Sanal Deneme Kabini",
     "legal": {
       "title": "Açık Rıza Metni",
-      "text": "Açık rıza metnini okudum ve onaylıyorum.",
+      "text": "Yükleyeceğim görselin, <strong>yapay zekâ destekli işleme, iyileştirme, analiz ve içerik oluşturma</strong> amaçlarıyla kullanılmasına <strong>açık rıza verdiğimi</strong> beyan ederim.",
       "accept": "Onayla",
       "error": "Lütfen açık rıza metnini onaylayın."
     },

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/api/image-proxy/route.ts

@@ -0,0 +1 @@
+export * from '@akinon/next/api/image-proxy';

package/app-template/src/app/api/product-categories/route.ts

@@ -0,0 +1 @@
+export * from '@akinon/next/api/product-categories';

package/app-template/src/app/api/similar-product-list/route.ts

@@ -0,0 +1 @@
+export * from '@akinon/next/api/similar-product-list';

package/app-template/src/app/api/similar-products/route.ts

@@ -0,0 +1 @@
+export * from '@akinon/next/api/similar-products';

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/hooks/index.ts

@@ -1 +1,3 @@
+export * from './use-contract';
+export * from './use-fav-button';
 export * from './use-add-product-to-basket';

package/app-template/src/plugins.js

@@ -19,7 +19,10 @@ module.exports = [
   'pz-hepsipay',
   'pz-flow-payment',
   'pz-virtual-try-on',
+  'pz-similar-products',
   'pz-cybersource-uc',
   'pz-hepsipay',
-  'pz-masterpass-rest'
+  'pz-masterpass-rest',
+  'pz-similar-products',
+  'pz-haso'
 ];

package/app-template/src/routes/index.ts

@@ -27,7 +27,8 @@ enum ACCOUNT_ROUTES {
 
 enum ORDER_ROUTES {
   CHECKOUT = '/orders/checkout',
-  CHECKOUT_COMPLETED = '/orders/completed'
+  CHECKOUT_COMPLETED = '/orders/completed',
+  PAYMENT_GATEWAY_HASO = '/payment-gateway/haso'
 }
 
 enum FLATPAGE_ROUTES {

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/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) {