@akinon/next 1.82.0-rc.2 → 1.82.0-rc.20

package/.eslintrc.js

@@ -24,6 +24,18 @@ module.exports = {
       parserOptions: {
         sourceType: 'script'
       }
+    },
+    {
+      env: {
+        node: true
+      },
+      files: ['redux/middlewares/pre-order/index.ts'],
+      rules: {
+        '@akinon/projectzero/check-pre-order-middleware-order': 'error'
+      },
+      parserOptions: {
+        sourceType: 'script'
+      }
     }
   ],
   parser: '@typescript-eslint/parser',

package/CHANGELOG.md

@@ -1,5 +1,141 @@
 # @akinon/next
 
+## 1.82.0-rc.20
+
+### Minor Changes
+
+- e5529cd: ZERO-3267: Update error-page component to use root path for links instead of ROUTES
+
+## 1.82.0-rc.19
+
+### Minor Changes
+
+- 33377cf: ZERO-3267: Refactor import statement for ROUTES in error-page component
+
+## 1.82.0-rc.18
+
+### Minor Changes
+
+- e4761d2: Refactor import statement for ROUTES in error-page component
+
+## 1.82.0-rc.17
+
+### Minor Changes
+
+- e2c6d426: ZERO-2935: Add @sentry/nextjs dependency to akinon-next and remove from projectzeronext
+- 70bc0aed: ZERO-3284: Set tracesSampleRate in Sentry configuration
+
+## 1.82.0-rc.16
+
+### Minor Changes
+
+- 757ee539: ZERO-3207: Add SMS send & verify endpoints with state management
+- 6f506af: ZERO-3229: Implement mini basket query for basket total quantity
+- 5dfeea04: ZERO-2801: Revert ZERO-2801
+- 2d9b2b2c: ZERO-2816: Add segment to headers
+- 5e1feca: Revert "ZERO-3286: Add notFound handling for chunk URLs starting with \_next"
+- c0c1962: ZERO-3258: Add new API endpoints for fetching Bukalemun image URL and bundle product data
+- 40a46853: ZERO-3182: Optimize basket update mutation with optimistic update
+- f49bb74f: ZERO-3097: Add setCookie to logging in payment redirection middlewares
+- 0e05135: ZERO-3244: Encode URL search parameters
+- e9541a13: ZERO-2816: Add headers to url
+- 4d3deb4f: ZERO-2935: sentry 8 upgrade
+- 72fd4d67: ZERO-3084: Fix URL search parameters encoding in default middleware
+- c53ef7b9: ZERO-2668: The Link component has been updated to improve the logic for handling href values. Previously, if the href was not a string or started with 'http', it would return the href as is. Now, if the href is not provided, it will default to '#' to prevent any potential errors. Additionally, if the href is a string and does not start with 'http', it will be formatted with the locale and pathname, based on the localeUrlStrategy and defaultLocaleValue. This ensures that the correct href is generated based on the localization settings.
+- 64699d3f: ZERO-2761: Fix invalid import for plugin module
+- 9abd011: ZERO-3267: Refactor error handling in ErrorPage component to set error details in Sentry scope
+- 7727ae55: ZERO-3073: Refactor basket page to use server-side data fetching and simplify component structure
+- d552629: ZERO-3182: Refactor basketApi to use invalidatesTags and comment out onQueryStarted logic
+- c3b2f3f: ZERO-3267: Enable sentry client errors and filter them by log type
+- 17f87524: ZERO-2816: Make the incoming currency lowercase
+- 65d3b862: ZERO-3054: Update headers in appFetch
+- bbe18b9f: ZERO-2575: Fix build error
+- 17bfadc: ZERO-3275: Disable OpenTelemetry monitoring in production environment
+- 4920742c: Disable getCachedTranslations
+- b6e5b62: ZERO-3257: Enhance locale middleware to redirect using existing or default locale and support 303 status for POST requests
+- ac65ca9: ZERO-3269: Enhance locale handling by adding Subdomain strategy and updating related functions
+- 7e56d6b6: ZERO-2841: Update api tagTypes
+- 43c182ee: ZERO-3054: Update Redis variable checks to conditionally include CACHE_SECRET
+- 2d305aaf: ZERO-2935: Update Sentry configuration: remove hideSourceMaps option and add it to withPzConfig
+- eeb20bea: Revert "ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing"
+- 3bf63c8: ZERO-3286: Add notFound handling for chunk URLs starting with \_next
+- 9be2c08: ZERO-3243: Improve basket update query handling with optimistic updates
+- f2c92d5c: ZERO-2816: Update cookie name
+- 2f3588f: ZERO-3287: Add user session handling in authentication flow
+- 7bd3d992: ZERO-2801: Refactor locale middleware to handle single locale configuration
+- fdd255ee: ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing
+- 0b1bd07: ZERO-3240: Remove unused preOrderMiddleware
+- 49eeebfa: ZERO-2909: Add deleteCollectionItem query to wishlistApi
+- 3f9b8d7e: ZERO-2761: Update plugins.js for akinon-next
+
+## 1.82.0-rc.15
+
+### Minor Changes
+
+- 2f3588fb: ZERO-3287: Add user session handling in authentication flow
+
+## 1.82.0-rc.14
+
+### Minor Changes
+
+- 5e1feca: Revert "ZERO-3286: Add notFound handling for chunk URLs starting with \_next"
+
+## 1.82.0-rc.13
+
+### Minor Changes
+
+- 3bf63c8: ZERO-3286: Add notFound handling for chunk URLs starting with \_next
+
+## 1.82.0-rc.12
+
+### Minor Changes
+
+- ac65ca9: ZERO-3269: Enhance locale handling by adding Subdomain strategy and updating related functions
+
+## 1.82.0-rc.11
+
+## 1.82.0-rc.10
+
+## 1.82.0-rc.9
+
+### Minor Changes
+
+- 9abd011: ZERO-3267: Refactor error handling in ErrorPage component to set error details in Sentry scope
+
+## 1.82.0-rc.8
+
+### Minor Changes
+
+- 17bfadc: ZERO-3275: Disable OpenTelemetry monitoring in production environment
+
+## 1.82.0-rc.7
+
+### Minor Changes
+
+- c3b2f3f: ZERO-3267: Enable sentry client errors and filter them by log type
+
+## 1.82.0-rc.6
+
+### Minor Changes
+
+- 0b1bd07f: ZERO-3240: Remove unused preOrderMiddleware
+
+## 1.82.0-rc.5
+
+### Minor Changes
+
+- 6f506afc: ZERO-3229: Implement mini basket query for basket total quantity
+- c0c19629: ZERO-3258: Add new API endpoints for fetching Bukalemun image URL and bundle product data
+- 9be2c081: ZERO-3243: Improve basket update query handling with optimistic updates
+
+## 1.82.0-rc.4
+
+### Minor Changes
+
+- b6e5b624: ZERO-3257: Enhance locale middleware to redirect using existing or default locale and support 303 status for POST requests
+
+## 1.82.0-rc.3
+
 ## 1.82.0-rc.2
 
 ### Minor Changes

package/api/auth.ts

@@ -99,6 +99,21 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
             userIp
           });
 
+          const checkCurrentUser = await getCurrentUser(
+            req.cookies['osessionid'] ?? '',
+            req.cookies['pz-currency'] ?? ''
+          );
+
+          if (checkCurrentUser?.pk) {
+            const sessionCookie = headers
+              .get('cookie')
+              ?.match(/osessionid=\w+/)?.[0]
+              .replace(/osessionid=/, '');
+            if (sessionCookie) {
+              headers.set('cookie', sessionCookie);
+            }
+          }
+
           const apiRequest = await fetch(
             `${Settings.commerceUrl}${user[credentials.formType]}`,
             {

package/components/client-root.tsx

@@ -1,6 +1,9 @@
 'use client';
 
 import { useMobileIframeHandler } from '../hooks';
+import * as Sentry from '@sentry/nextjs';
+import { initSentry } from '../sentry';
+import { useEffect } from 'react';
 
 export default function ClientRoot({
   children,
@@ -11,6 +14,23 @@ export default function ClientRoot({
 }) {
   const { preventPageRender } = useMobileIframeHandler({ sessionId });
 
+  const initializeSentry = async () => {
+    const response = await fetch('/api/sentry', { next: { revalidate: 0 } });
+    const data = await response.json();
+
+    const options = {
+      dsn: data.dsn
+    };
+
+    initSentry('Client', options);
+  };
+
+  useEffect(() => {
+    if (!Sentry.isInitialized()) {
+      initializeSentry();
+    }
+  }, []);
+
   if (preventPageRender) {
     return null;
   }

package/data/client/basket.ts

@@ -24,6 +24,26 @@ export const basketApi = api.injectEndpoints({
       transformResponse: (response: { basket: Basket }) => response.basket,
       providesTags: ['Basket']
     }),
+    getMiniBasket: build.query<
+      { pk: number | null; total_quantity: number },
+      void
+    >({
+      query: () =>
+        buildClientRequestUrl(basket.getMiniBasket, {
+          contentType: 'application/json'
+        }),
+      providesTags: ['Basket']
+    }),
+    getMiniBasketDetail: build.query<
+      { pk: number | null; total_quantity: number },
+      { namespace: string }
+    >({
+      query: ({ namespace }) =>
+        buildClientRequestUrl(basket.getMiniBasketDetail(namespace), {
+          contentType: 'application/json'
+        }),
+      providesTags: ['MultiBasket']
+    }),
     getBasketDetail: build.query<Basket, { namespace: string }>({
       query: ({ namespace }) =>
         buildClientRequestUrl(basket.getBasketDetail(namespace)),
@@ -84,23 +104,45 @@ export const basketApi = api.injectEndpoints({
         method: 'PUT',
         body
       }),
-      // TODO: It doesn't work with namespaced baskets. Fix it and remove invalidatesTags.
-      invalidatesTags: ['MultiBasket', 'Basket']
+      async onQueryStarted(_, { dispatch, queryFulfilled }) {
+        try {
+          const { data } = await queryFulfilled;
+
+          dispatch(
+            basketApi.util.updateQueryData(
+              'getBasket',
+              undefined,
+              () => data.basket
+            )
+          );
 
-      // async onQueryStarted(_, { dispatch, queryFulfilled }) {
-      //   try {
-      //     const { data } = await queryFulfilled;
-      //     dispatch(
-      //       basketApi.util.updateQueryData(
-      //         'getBasket',
-      //         undefined,
-      //         () => data.basket
-      //       )
-      //     );
-      //   } catch {
-      //     dispatch(basketApi.util.invalidateTags(['MultiBasket', 'Basket']));
-      //   }
-      // }
+          if (data.basket.namespace) {
+            dispatch(
+              basketApi.util.updateQueryData(
+                'getBasketDetail',
+                { namespace: data.basket.namespace },
+                () => data.basket
+              )
+            );
+          }
+
+          dispatch(
+            basketApi.util.updateQueryData(
+              'getAllBaskets',
+              undefined,
+              (baskets) => {
+                if (!baskets) return baskets;
+
+                return baskets.map((basket) =>
+                  basket.pk === data.basket.pk ? data.basket : basket
+                );
+              }
+            )
+          );
+        } catch (error) {
+          console.error('Error updating quantity:', error);
+        }
+      }
     }),
     clearBasket: build.mutation<Basket, void>({
       query: (body) => ({
@@ -141,6 +183,8 @@ export const basketApi = api.injectEndpoints({
 
 export const {
   useGetBasketQuery,
+  useGetMiniBasketQuery,
+  useGetMiniBasketDetailQuery,
   useLazyGetBasketDetailQuery,
   useGetAllBasketsQuery,
   useRemoveBasketMutation,

package/data/client/misc.ts

@@ -92,6 +92,29 @@ export const miscApi = api.injectEndpoints({
       transformResponse: (response: { menu: MenuItemType[] }) => {
         return response.menu;
       }
+    }),
+    getBukalemunImageUrl: builder.query<
+      any,
+      { current_chapter: string; sku: string; selected_attributes: any }
+    >({
+      query: ({ current_chapter, sku, selected_attributes }) => {
+        const data = {
+          ...selected_attributes,
+          current_chapter,
+          sku
+        };
+
+        const params = new URLSearchParams(data);
+
+        return {
+          url: buildClientRequestUrl(
+            misc.bukalemunImageUrl(params.toString()),
+            {
+              responseType: 'json'
+            }
+          )
+        };
+      }
     })
   }),
   overrideExisting: true
@@ -102,5 +125,6 @@ export const {
   useEmailSubscriptionMutation,
   useSetLanguageMutation,
   useGetWidgetQuery,
-  useGetMenuQuery
+  useGetMenuQuery,
+  useGetBukalemunImageUrlQuery
 } = miscApi;

package/data/client/product.ts

@@ -75,6 +75,21 @@ export const productApi = api.injectEndpoints({
       query: (productPk) => ({
         url: buildClientRequestUrl(product.installments(productPk))
       })
+    }),
+    getBundleProductData: build.query<
+      any,
+      { productPk: string; queryString: string }
+    >({
+      query: ({ productPk, queryString }) => {
+        return {
+          url: buildClientRequestUrl(
+            product.bundleProduct(productPk, queryString),
+            {
+              responseType: 'json'
+            }
+          )
+        };
+      }
     })
   }),
   overrideExisting: true
@@ -85,5 +100,6 @@ export const {
   useGetProductByPkQuery,
   useGetRetailStoreStockMutation,
   useGetInstallmentsQuery,
-  useGetProductByParamsQuery
+  useGetProductByParamsQuery,
+  useGetBundleProductDataQuery
 } = productApi;

package/data/urls.ts

@@ -74,7 +74,10 @@ export const address = {
 
 export const basket = {
   getBasket: '/baskets/basket/',
+  getMiniBasket: '/baskets/basket/mini/',
   getBasketDetail: (namespace: string) => `/baskets/basket/${namespace}/`,
+  getMiniBasketDetail: (namespace: string) =>
+    `/baskets/basket/${namespace}/mini/`,
   getAllBaskets: '/baskets/basket-list/',
   removeBasket: (pk: number) => `/baskets/basket-list/${pk}/`,
   selectMainBasket: (pk: number) => `/baskets/basket-list/id/${pk}/main/`,
@@ -162,7 +165,8 @@ export const misc = {
       parent ? `&parent=${parent}` : ''
     }`,
   cmsSeo: (slug: string | string[]) => `/cms/seo/?url=${slug ? slug : '/'}`,
-  setCurrency: '/users/activate-currency/'
+  setCurrency: '/users/activate-currency/',
+  bukalemunImageUrl: (params: string) => `/bukalemun/?${params}`
 };
 
 export const product = {
@@ -176,7 +180,9 @@ export const product = {
   slug: (slug: string) => `/${slug}/`,
   categoryUrl: (pk: number) => `/products/${pk}/category_nodes/?limit=1`,
   breadcrumbUrl: (menuitemmodel: string) =>
-    `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`
+    `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
+  bundleProduct: (productPk: string, queryString: string) =>
+    `/bundle-product/${productPk}/?${queryString}`
 };
 
 export const wishlist = {

package/hooks/index.ts

@@ -10,3 +10,4 @@ export * from './use-mobile-iframe-handler';
 export * from './use-payment-options';
 export * from './use-pagination';
 export * from './use-message-listener';
+export * from './use-sentry-uncaught-errors';

package/hooks/use-router.ts

@@ -27,8 +27,11 @@ export const useRouter = () => {
     );
 
     url.pathname = `${
-      locale === defaultLocale?.value &&
-      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale
+      localeUrlStrategy === LocaleUrlStrategy.Subdomain ||
+      (locale === defaultLocale?.value &&
+        [LocaleUrlStrategy.HideDefaultLocale].includes(
+          localeUrlStrategy as LocaleUrlStrategy
+        ))
         ? ''
         : `/${locale}`
     }${pathnameWithoutLocale}`;

package/hooks/use-sentry-uncaught-errors.ts

@@ -0,0 +1,24 @@
+import { useEffect } from 'react';
+import * as Sentry from '@sentry/nextjs';
+import { ClientLogType } from '@akinon/next/sentry';
+
+export const useSentryUncaughtErrors = (error: Error & { digest?: string }) => {
+  useEffect(() => {
+    Sentry.withScope(function (scope) {
+      scope.setLevel('fatal');
+      scope.setTags({
+        APP_TYPE: 'ProjectZeroNext',
+        TYPE: 'Client',
+        LOG_TYPE: ClientLogType.UNCAUGHT_ERROR_PAGE
+      });
+      scope.setExtra('error', error);
+
+      const error_ = new Error('FATAL: Uncaught client error');
+      error_.name = 'UNCAUGHT_ERROR_PAGE';
+
+      Sentry.captureException(error_, {
+        fingerprint: ['UNCAUGHT_ERROR_PAGE', error.digest]
+      });
+    });
+  }, [error]);
+};

package/instrumentation/index.ts

@@ -1,4 +1,5 @@
 import { initSentry } from '../sentry';
+import * as Sentry from '@sentry/nextjs';
 
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
@@ -10,3 +11,5 @@ export async function register() {
     initSentry('Edge');
   }
 }
+
+export const onRequestError = Sentry.captureRequestError;

package/instrumentation/node.ts

@@ -4,17 +4,19 @@ import { Resource } from '@opentelemetry/resources';
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
 import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
 
-const sdk = new NodeSDK({
-  resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
-  }),
-  spanProcessor: new SimpleSpanProcessor(
-    new OTLPTraceExporter({
-      url: `${
-        process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
-      }/api/traces`
-    })
-  )
-});
+if (process.env.NODE_ENV === 'development') {
+  const sdk = new NodeSDK({
+    resource: new Resource({
+      [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
+    }),
+    spanProcessor: new SimpleSpanProcessor(
+      new OTLPTraceExporter({
+        url: `${
+          process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
+        }/api/traces`
+      })
+    )
+  });
 
-sdk.start();
+  sdk.start();
+}

package/localization/index.ts

@@ -1,5 +1,6 @@
 export enum LocaleUrlStrategy {
   HideAllLocales = 'hide-all-locales',
   HideDefaultLocale = 'hide-default-locale',
-  ShowAllLocales = 'show-all-locales'
+  ShowAllLocales = 'show-all-locales',
+  Subdomain = 'subdomain'
 }

package/middlewares/locale.ts

@@ -4,17 +4,32 @@ import { PzNextRequest } from '.';
 import { LocaleUrlStrategy } from '../localization';
 import { urlLocaleMatcherRegex } from '../utils';
 import logger from '../utils/log';
+import { getUrlPathWithLocale } from '../utils/localization';
 
-const getMatchedLocale = (pathname: string) => {
+const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
   let matchedLocale = pathname.match(urlLocaleMatcherRegex)?.[0] ?? '';
   matchedLocale = matchedLocale.replace('/', '');
 
+  const { localeUrlStrategy, defaultLocaleValue } = settings.localization;
+
+  if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
+    const host = req.headers.get('x-forwarded-host');
+
+    if (host) {
+      const subDomain = host.split('.')[0] || '';
+      const subDomainLocaleMatched = `/${subDomain}`.match(
+        urlLocaleMatcherRegex
+      );
+
+      if (subDomainLocaleMatched && subDomainLocaleMatched[0]) {
+        matchedLocale = subDomainLocaleMatched[0].slice(1);
+      }
+    }
+  }
+
   if (!matchedLocale.length) {
-    if (
-      settings.localization.localeUrlStrategy !==
-      LocaleUrlStrategy.ShowAllLocales
-    ) {
-      matchedLocale = settings.localization.defaultLocaleValue;
+    if (localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales) {
+      matchedLocale = defaultLocaleValue;
     }
   }
 
@@ -28,7 +43,7 @@ const withLocale =
 
     try {
       const url = req.nextUrl.clone();
-      const matchedLocale = getMatchedLocale(url.pathname);
+      const matchedLocale = getMatchedLocale(url.pathname, req);
       let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
         settings.localization;
 
@@ -50,8 +65,15 @@ const withLocale =
         redirectToDefaultLocale &&
         req.method === 'GET'
       ) {
-        url.pathname = `/${defaultLocaleValue}${url.pathname}`;
-        return NextResponse.redirect(url);
+        // Redirect to existing or default locale
+
+        url.pathname = getUrlPathWithLocale(
+          url.pathname,
+          req.cookies.get('pz-locale')?.value
+        );
+
+        // Use 303 for POST requests
+        return NextResponse.redirect(url, 303);
       }
 
       req.middlewareParams.rewrites.locale = matchedLocale;
@@ -61,7 +83,6 @@ const withLocale =
         ip
       });
     }
-
     return middleware(req, event);
   };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.82.0-rc.2",
+  "version": "1.82.0-rc.20",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -21,6 +21,7 @@
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
     "@neshca/cache-handler": "1.9.0",
+    "@sentry/nextjs": "9.5.0",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
     "react-redux": "8.1.3",
@@ -30,7 +31,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.82.0-rc.2",
+    "@akinon/eslint-plugin-projectzero": "1.82.0-rc.20",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/redux/middlewares/checkout.ts

@@ -16,10 +16,8 @@ import {
   setLoyaltyBalance,
   setPaymentChoices,
   setPaymentOptions,
-  setPreOrder,
   setRetailStores,
   setShippingOptions,
-  setShippingStepCompleted,
   setHepsipayAvailability,
   setWalletPaymentData,
   setPayOnDeliveryOtpModalActive
@@ -59,146 +57,6 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
   };
 };
 
-export const preOrderMiddleware: Middleware = ({
-  getState,
-  dispatch
-}: MiddlewareParams) => {
-  return (next) => (action) => {
-    const result: CheckoutResult = next(action);
-    const preOrder = result?.payload?.pre_order;
-
-    if (
-      !preOrder ||
-      action?.meta?.arg?.endpointName === 'guestLogin' ||
-      action?.meta?.arg?.endpointName === 'getCheckoutLoyaltyBalance'
-    ) {
-      return result;
-    }
-
-    const {
-      deliveryOptions,
-      addressList: addresses,
-      shippingOptions,
-      dataSourceShippingOptions,
-      paymentOptions,
-      installmentOptions,
-      attributeBasedShippingOptions
-    } = getState().checkout;
-    const { endpoints: apiEndpoints } = checkoutApi;
-
-    if (preOrder.is_redirected) {
-      const contextList = result?.payload?.context_list;
-
-      if (
-        contextList.find(
-          (ctx) => ctx.page_name === 'RedirectionPaymentSelectedPage'
-        )
-      ) {
-        dispatch(
-          apiEndpoints.setPaymentOption.initiate(preOrder.payment_option?.pk)
-        );
-        return;
-      }
-    }
-
-    dispatch(setPreOrder(preOrder));
-
-    if (!preOrder.delivery_option && deliveryOptions.length > 0) {
-      dispatch(
-        apiEndpoints.setDeliveryOption.initiate(
-          deliveryOptions.find((opt) => opt.delivery_option_type === 'customer')
-            ?.pk
-        )
-      );
-    }
-
-    if (
-      (!preOrder.shipping_address || !preOrder.billing_address) &&
-      addresses.length > 0 &&
-      (!preOrder.delivery_option ||
-        preOrder.delivery_option.delivery_option_type === 'customer')
-    ) {
-      dispatch(
-        apiEndpoints.setAddresses.initiate({
-          shippingAddressPk: addresses[0].pk,
-          billingAddressPk: addresses[0].pk
-        })
-      );
-    }
-
-    if (
-      shippingOptions.length > 0 &&
-      (!preOrder.shipping_option ||
-        !shippingOptions.find((opt) => opt.pk === preOrder.shipping_option?.pk))
-    ) {
-      dispatch(apiEndpoints.setShippingOption.initiate(shippingOptions[0].pk));
-    }
-
-    if (
-      dataSourceShippingOptions.length > 0 &&
-      !preOrder.data_source_shipping_options
-    ) {
-      const selectedDataSourceShippingOptionsPks =
-        dataSourceShippingOptions.map(
-          (opt) => opt.data_source_shipping_options[0].pk
-        );
-
-      dispatch(
-        apiEndpoints.setDataSourceShippingOptions.initiate(
-          selectedDataSourceShippingOptionsPks
-        )
-      );
-    }
-
-    if (
-      Object.keys(attributeBasedShippingOptions).length > 0 &&
-      !preOrder.attribute_based_shipping_options
-    ) {
-      const initialSelectedOptions: Record<string, number> = Object.fromEntries(
-        Object.entries(attributeBasedShippingOptions).map(([key, options]) => [
-          key,
-          options.attribute_based_shipping_options[0].pk
-        ])
-      );
-
-      dispatch(
-        apiEndpoints.setAttributeBasedShippingOptions.initiate(
-          initialSelectedOptions
-        )
-      );
-    }
-
-    if (!preOrder.payment_option && paymentOptions.length > 0) {
-      dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
-    }
-
-    if (
-      !preOrder.installment &&
-      preOrder.payment_option?.payment_type !== 'saved_card' &&
-      installmentOptions.length > 0
-    ) {
-      dispatch(
-        apiEndpoints.setInstallmentOption.initiate(installmentOptions[0].pk)
-      );
-    }
-
-    dispatch(
-      setShippingStepCompleted(
-        [
-          preOrder.delivery_option?.delivery_option_type === 'retail_store'
-            ? true
-            : preOrder.shipping_address?.pk,
-          preOrder.billing_address?.pk,
-          preOrder.shipping_option?.pk,
-          addresses.length > 0
-        ].every(Boolean)
-      )
-    );
-
-    return result;
-  };
-};
-
 export const contextListMiddleware: Middleware = ({
   dispatch,
   getState

package/redux/middlewares/pre-order/address.ts

@@ -37,6 +37,8 @@ export const setAddressMiddleware: Middleware = ({
           billingAddressPk: firstAddressPk
         })
       );
+
+      return null;
     }
 
     return result;

package/redux/middlewares/pre-order/attribute-based-shipping-option.ts

@@ -33,6 +33,8 @@ export const attributeBasedShippingOptionMiddleware: Middleware = ({
           initialSelectedOptions
         )
       );
+
+      return null;
     }
 
     return result;

package/redux/middlewares/pre-order/data-source-shipping-option.ts

@@ -29,6 +29,8 @@ export const dataSourceShippingOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setDataSourceShippingOptions.initiate(selectedPks)
         );
+
+        return null;
       }
     }
 

package/redux/middlewares/pre-order/delivery-option.ts

@@ -26,6 +26,8 @@ export const deliveryOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setDeliveryOption.initiate(customerDeliveryOption)
         );
+
+        return null;
       }
     }
 

package/redux/middlewares/pre-order/index.ts

@@ -10,16 +10,20 @@ import { paymentOptionMiddleware } from './payment-option';
 import { installmentOptionMiddleware } from './installment-option';
 import { shippingStepMiddleware } from './shipping-step';
 
+// ⚠️ WARNING: Redux Toolkit applies middlewares in reverse order (from last to first).
+// This list is written **in reverse execution order** to ensure they run in the correct sequence.  
+// If you add a new middleware, make sure to insert it **in reverse order** based on execution priority.
+
 export const preOrderMiddlewares = [
-  preOrderValidationMiddleware,
-  redirectionMiddleware,
-  setPreOrderMiddleware,
-  deliveryOptionMiddleware,
-  setAddressMiddleware,
-  shippingOptionMiddleware,
-  dataSourceShippingOptionMiddleware,
-  attributeBasedShippingOptionMiddleware,
-  paymentOptionMiddleware,
+  shippingStepMiddleware,
   installmentOptionMiddleware,
-  shippingStepMiddleware
+  paymentOptionMiddleware,
+  attributeBasedShippingOptionMiddleware,
+  dataSourceShippingOptionMiddleware,
+  shippingOptionMiddleware,
+  setAddressMiddleware,
+  deliveryOptionMiddleware,
+  setPreOrderMiddleware,
+  redirectionMiddleware,
+  preOrderValidationMiddleware
 ];

package/redux/middlewares/pre-order/installment-option.ts

@@ -28,6 +28,8 @@ export const installmentOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setInstallmentOption.initiate(firstInstallmentOptionPk)
         );
+
+        return null;
       }
     }
 

package/redux/middlewares/pre-order/payment-option.ts

@@ -21,6 +21,8 @@ export const paymentOptionMiddleware: Middleware = ({
       const firstPaymentOptionPk = paymentOptions[0]?.pk;
 
       dispatch(apiEndpoints.setPaymentOption.initiate(firstPaymentOptionPk));
+
+      return null;
     }
 
     return result;

package/redux/middlewares/pre-order/redirection.ts

@@ -26,6 +26,8 @@ export const redirectionMiddleware: Middleware = ({
             preOrder.payment_option?.pk
           )
         );
+
+        return null;
       }
     }
 

package/redux/middlewares/pre-order/shipping-option.ts

@@ -30,6 +30,8 @@ export const shippingOptionMiddleware: Middleware = ({
         dispatch(
           apiEndpoints.setShippingOption.initiate(defaultShippingOption)
         );
+
+        return null;
       }
     }
 

package/sentry/index.ts

@@ -1,29 +1,48 @@
 import * as Sentry from '@sentry/nextjs';
 
-const SENTRY_DSN: string =
+const SENTRY_DSN: string | undefined =
   process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
 
+export enum ClientLogType {
+  UNCAUGHT_ERROR_PAGE = 'UNCAUGHT_ERROR_PAGE',
+  CHECKOUT = 'CHECKOUT'
+}
+
+const ALLOWED_CLIENT_LOG_TYPES: ClientLogType[] = [
+  ClientLogType.UNCAUGHT_ERROR_PAGE,
+  ClientLogType.CHECKOUT
+];
+
 export const initSentry = (
   type: 'Server' | 'Client' | 'Edge',
   options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
 ) => {
   // TODO: Handle options with ESLint rules
 
-  // TODO: Remove Zero Project DSN
+  Sentry.init({
+    dsn:
+      options.dsn ||
+      SENTRY_DSN ||
+      'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
+    initialScope: {
+      tags: {
+        APP_TYPE: 'ProjectZeroNext',
+        TYPE: type
+      }
+    },
+    tracesSampleRate: 0,
+    integrations: [],
+    beforeSend: (event, hint) => {
+      if (
+        type === 'Client' &&
+        !ALLOWED_CLIENT_LOG_TYPES.includes(
+          event.tags?.LOG_TYPE as ClientLogType
+        )
+      ) {
+        return null;
+      }
 
-  if (type === 'Server' || type === 'Edge') {
-    Sentry.init({
-      dsn:
-        SENTRY_DSN ||
-        'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
-      initialScope: {
-        tags: {
-          APP_TYPE: 'ProjectZeroNext',
-          TYPE: type
-        }
-      },
-      tracesSampleRate: 1.0,
-      integrations: []
-    });
-  }
+      return event;
+    }
+  });
 };

package/utils/index.ts

@@ -1,6 +1,6 @@
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../localization';
-import { CDNOptions, ClientRequestOptions } from '../types';
+import { CDNOptions, ClientRequestOptions, Locale } from '../types';
 
 export * from './get-currency';
 export * from './menu-generator';
@@ -152,14 +152,17 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
   return `${rootWithoutOptions}${options}${fileExtension}`;
 }
 
+const { locales, localeUrlStrategy, defaultLocaleValue } =
+  settings.localization;
+
+const isLocaleExcluded = (locale: Locale) =>
+  ![LocaleUrlStrategy.ShowAllLocales, LocaleUrlStrategy.Subdomain].includes(
+    localeUrlStrategy
+  ) && locale.value !== defaultLocaleValue;
+
 export const urlLocaleMatcherRegex = new RegExp(
-  `^/(${settings.localization.locales
-    .filter((l) =>
-      settings.localization.localeUrlStrategy !==
-      LocaleUrlStrategy.ShowAllLocales
-        ? l.value !== settings.localization.defaultLocaleValue
-        : l
-    )
+  `^/(${locales
+    .filter((l) => !isLocaleExcluded(l))
     .map((l) => l.value)
     .join('|')})(?=/|$)`
 );

package/utils/localization.ts

@@ -11,6 +11,10 @@ export const getUrlPathWithLocale = (
     currentLocale = defaultLocaleValue;
   }
 
+  if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
+    return pathname;
+  }
+
   if (localeUrlStrategy === LocaleUrlStrategy.HideAllLocales) {
     return pathname;
   }

package/views/error-page.tsx

@@ -0,0 +1,92 @@
+import { useEffect, useState } from 'react';
+import { useLocalization } from '../hooks';
+import { Button, Link } from '../components';
+
+export default function PzErrorPage({
+  error,
+  reset
+}: {
+  error: Error & { digest?: string; isServerError?: boolean };
+  reset: () => void;
+}) {
+  const [isServerError, setIsServerError] = useState(false);
+
+  useEffect(() => {
+    if ('isServerError' in error) {
+      setIsServerError(true);
+      return;
+    }
+
+    setIsServerError(!!error.digest);
+  }, [error]);
+
+  return isServerError ? (
+    <ServerErrorUI />
+  ) : (
+    <ClientErrorUI error={error} reset={reset} />
+  );
+}
+
+function ClientErrorUI({
+  error,
+  reset
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  const { t } = useLocalization();
+
+  const errorMessage = error?.message || 'Unknown error';
+
+  return (
+    <section className="text-center px-6 my-14 md:px-0 md:m-14">
+      <div className="text-4xl font-bold md:text-6xl text-red-500">Oops!</div>
+      <h1 className="text-lg md:text-xl mt-4">
+        {t('common.client_error.title')}
+      </h1>
+      <p className="text-lg md:text-xl mt-2">
+        {t('common.client_error.description')}
+      </p>
+
+      <div className="mt-4 mx-auto max-w-lg">
+        <p className="text-xs text-gray-600 font-mono bg-gray-100 p-3 rounded overflow-auto text-left">
+          <span className="font-semibold">Error:</span> {errorMessage}
+        </p>
+      </div>
+
+      <div className="mt-6 flex flex-col gap-4 items-center justify-center">
+        <Link href="/" className="text-lg underline">
+          {t('common.client_error.link_text')}
+        </Link>
+        <Button onClick={reset} className="text-lg w-28">
+          {t('common.try_again')}
+        </Button>
+      </div>
+    </section>
+  );
+}
+
+function ServerErrorUI() {
+  const { t } = useLocalization();
+
+  const reloadPage = () => {
+    window.location.reload();
+  };
+
+  return (
+    <section className="text-center px-6 my-14 md:px-0 md:m-14">
+      <div className="text-7xl font-bold md:text-8xl">500</div>
+      <h1 className="text-lg md:text-xl"> {t('common.page_500.title')} </h1>
+      <p className="text-lg md:text-xl"> {t('common.page_500.description')} </p>
+
+      <div className="mt-6 flex flex-col gap-4 items-center justify-center">
+        <Link href="/" className="text-lg underline">
+          {t('common.page_500.link_text')}
+        </Link>
+        <Button onClick={reloadPage} className="text-lg w-28">
+          {t('common.try_again')}
+        </Button>
+      </div>
+    </section>
+  );
+}