@evenicanpm/storefront-core 1.8.4 → 2.0.1

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/steps/payment/payment-details.tsx

@@ -1,14 +1,17 @@
 import type { RetrieveCardPaymentAcceptResultInput } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
 import usePaymentAcceptResult from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/get-payment-accept-result";
 import getPaymentAcceptPoint from "@evenicanpm/storefront-core/src/api-manager/services/cart/queries/get-payment-accept-point";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
 import {
 	H6,
 	Paragraph,
 	Small,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import type { CheckoutStepComponentProps } from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/checkout-step";
-import type { CardPaymentAcceptResult } from "@msdyn365-commerce/retail-proxy";
+} from "@evenicanpm/storefront-core/src/components/Typography";
+import type { CheckoutStepComponentProps } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/checkout-step";
+import type {
+	CardPaymentAcceptPoint,
+	CardPaymentAcceptResult,
+} from "@msdyn365-commerce/retail-proxy";
 import { Alert, Box, Card } from "@mui/material";
 import { useTranslations } from "next-intl";
 import React from "react";
@@ -43,7 +46,7 @@ type PaymentDetailsCompound = React.FC<CheckoutStepComponentProps> & {
 		iframeReference: React.RefObject<HTMLIFrameElement>;
 		iframeHeight: number;
 		errorState: PaymentError[];
-		paymentAcceptPointData: any;
+		paymentAcceptPointData: CardPaymentAcceptPoint | null | undefined;
 	}>;
 };
 
@@ -73,13 +76,16 @@ const PaymentDetails: PaymentDetailsCompound = (props) => {
 	const [iframeHeight, setIFrameHeight] = React.useState<number>(1);
 	const [errorState, setErrorState] = React.useState<PaymentError[]>([]);
 
-	const paymentConnectorMessage = (
-		data: string,
-		messageType: PaymentConnectorPostMessageType,
-	): PaymentConnectorPostMessage => ({
-		message: JSON.stringify({ type: messageType, value: data }),
-		targetOrigin: "*",
-	});
+	const paymentConnectorMessage = React.useCallback(
+		(
+			data: string,
+			messageType: PaymentConnectorPostMessageType,
+		): PaymentConnectorPostMessage => ({
+			message: JSON.stringify({ type: messageType, value: data }),
+			targetOrigin: "*",
+		}),
+		[],
+	);
 
 	const handleResultsAccessCode = React.useCallback(
 		async (accessCode: string) => {
@@ -113,7 +119,7 @@ const PaymentDetails: PaymentDetailsCompound = (props) => {
 
 	const onIFrameMessage = React.useCallback(
 		async (event: MessageEvent) => {
-			let result;
+			let result: unknown;
 			try {
 				if (typeof event.data !== "string") return;
 				result = JSON.parse(event.data);
@@ -122,8 +128,18 @@ const PaymentDetails: PaymentDetailsCompound = (props) => {
 				return;
 			}
 
-			if (!result?.type || !cart.TotalAmount) return;
-			const { type, value } = result;
+			if (
+				!result ||
+				typeof result !== "object" ||
+				!("type" in result) ||
+				!("value" in result) ||
+				!cart.TotalAmount
+			)
+				return;
+			const { type, value } = result as {
+				type: PaymentConnectorPostMessageType;
+				value: unknown;
+			};
 
 			switch (type) {
 				case PaymentConnectorPostMessageType.Height: {
@@ -139,6 +155,9 @@ const PaymentDetails: PaymentDetailsCompound = (props) => {
 				}
 				case PaymentConnectorPostMessageType.Result: {
 					try {
+						if (typeof value !== "string") {
+							throw new Error("Invalid payment result access code");
+						}
 						await handleResultsAccessCode(value);
 						setStepSubmissionState("idle");
 						handleStepCompletion();
@@ -175,6 +194,7 @@ const PaymentDetails: PaymentDetailsCompound = (props) => {
 			postMessageToIframe,
 			setStepSubmissionState,
 			t,
+			paymentConnectorMessage,
 		],
 	);
 
@@ -195,7 +215,7 @@ const PaymentDetails: PaymentDetailsCompound = (props) => {
 		postMessageToIframe(
 			paymentConnectorMessage("true", PaymentConnectorPostMessageType.Submit),
 		);
-	}, [postMessageToIframe]);
+	}, [postMessageToIframe, paymentConnectorMessage]);
 
 	React.useEffect(() => {
 		if (stepSubmissionState === "submitting") {

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/steps/shipping/delivery-date.tsx

@@ -1,5 +1,5 @@
-import StepHeading from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/step-heading";
-import type { InitialValues } from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/types";
+import StepHeading from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/step-heading";
+import type { InitialValues } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/types";
 import Box from "@mui/material/Box";
 import Card from "@mui/material/Card";
 import Grid from "@mui/material/Grid2";

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/steps/shipping/delivery-options.tsx

@@ -2,14 +2,14 @@ import type { Address } from "@evenicanpm/storefront-core/src/api-manager/schema
 import useGetDeliveryOptions from "@evenicanpm/storefront-core/src/api-manager/services/address/mutations/get-delivery-options";
 import useRemoveCartLineDeliveryMode from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/remove-cart-line-delivery-mode";
 import useUpdateCartLineDeliveryMode from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/update-cart-line-delivery-mode";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
 import {
 	H4,
 	Paragraph,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
-import type { CheckoutStepComponentProps } from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/checkout-step";
+import type { CheckoutStepComponentProps } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/checkout-step";
 import {
 	type DeliveryOption,
 	DeliveryPreferenceType,

package/src/{pages-v2 → pages}/checkout/checkout-alt-summary/cart-item.tsx

@@ -1,13 +1,13 @@
 "use client";
 
 import type { CartLine } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
-import { FlexBetween } from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
+import { FlexBetween } from "@evenicanpm/storefront-core/src/components/flex-box/index";
 import {
 	Paragraph,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
-import React, { createContext, type ReactNode, useContext } from "react";
+import { createContext, type ReactNode, useContext } from "react";
 
 interface CartItemContextValue {
 	cartLine: CartLine;

package/src/{pages-v2 → pages}/checkout/checkout-alt-summary/checkout-alt-summary.tsx

@@ -6,14 +6,14 @@ import type {
 	CartLine,
 } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
 // GLOBAL CUSTOM COMPONENTS
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
 // LOCAL CUSTOM COMPONENTS
-import CartItem from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-summary/cart-item";
-import ListItem from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-summary/list-item";
+import CartItem from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-summary/cart-item";
+import ListItem from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-summary/list-item";
 import Box from "@mui/material/Box";
 import Divider from "@mui/material/Divider";
 import { useTranslations } from "next-intl";
-import React, { createContext, type ReactNode, useContext } from "react";
+import { createContext, type ReactNode, useContext } from "react";
 
 interface Props {
 	cart: Cart;

package/src/pages/checkout/checkout-alt-summary/index.ts

@@ -0,0 +1 @@
+export { default as CheckoutAltSummary } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-summary/checkout-alt-summary";

package/src/{pages-v2 → pages}/checkout/checkout-alt-summary/list-item.tsx

@@ -1,5 +1,5 @@
-import { FlexBetween } from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { FlexBetween } from "@evenicanpm/storefront-core/src/components/flex-box/index";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
 import { createContext, type ReactNode, useContext } from "react";
 

package/src/{pages-v2 → pages}/confirmation/address.tsx

@@ -4,10 +4,10 @@ import type { Address } from "@evenicanpm/storefront-core/src/api-manager/schema
 import {
 	H5,
 	Paragraph,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import { Card } from "@mui/material";
 import { useTranslations } from "next-intl";
-import React, { createContext, type ReactNode, useContext } from "react";
+import { createContext, type ReactNode, useContext } from "react";
 
 const AddressContext = createContext<Address | null>(null);
 

package/src/{pages-v2 → pages}/confirmation/confirmation-summary.tsx

@@ -4,15 +4,15 @@ import type { SalesOrder } from "@evenicanpm/storefront-core/src/api-manager/sch
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+} from "@evenicanpm/storefront-core/src/components/flex-box";
 import {
 	H6,
 	Paragraph,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
 import { Card, Divider } from "@mui/material";
 import { useTranslations } from "next-intl";
-import React, { createContext, type ReactNode, useContext } from "react";
+import { createContext, type ReactNode, useContext } from "react";
 
 type SummaryValues = {
 	order: SalesOrder;

package/src/{pages-v2 → pages}/confirmation/ordered-products.tsx

@@ -7,12 +7,12 @@ import type {
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+} from "@evenicanpm/storefront-core/src/components/flex-box";
 import {
 	H6,
 	Paragraph,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
 import { ProductDimensionType } from "@msdyn365-commerce/retail-proxy";
 import { Avatar, Box, Card } from "@mui/material";

package/src/{pages-v2 → pages}/product-details/available-shops.tsx

@@ -1,11 +1,8 @@
 "use client";
 
-import FlexRowCenter from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-row-center";
+import FlexRowCenter from "@evenicanpm/storefront-core/src/components/flex-box/flex-row-center";
 // GLOBAL CUSTOM COMPONENTS
-import {
-	H3,
-	H4,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { H3, H4 } from "@evenicanpm/storefront-core/src/components/Typography";
 import Avatar from "@mui/material/Avatar";
 import Box from "@mui/material/Box";
 import Card from "@mui/material/Card";

package/src/{pages-v2 → pages}/product-details/bopis/find-in-store-button.tsx

@@ -1,5 +1,5 @@
 import type { AddToCartBopisInput } from "@evenicanpm/storefront-core/src/hooks/use-cart";
-import FindInStoreModal from "@evenicanpm/storefront-core/src/pages-v2/product-details/bopis/find-in-store-modal";
+import FindInStoreModal from "@evenicanpm/storefront-core/src/pages/product-details/bopis/find-in-store-modal";
 import { Button } from "@mui/material";
 import { useTranslations } from "next-intl";
 import React from "react";
@@ -55,7 +55,6 @@ const FindInStoreButton = ({
 				handleClose={handleClose}
 				handleAddToCart={onAddToCart}
 				productId={productId}
-				allDimensionsSelected={allDimensionsSelected}
 			/>
 		</React.Fragment>
 	);

package/src/{pages-v2 → pages}/product-details/bopis/find-in-store-modal.tsx

@@ -4,9 +4,9 @@ import getStores from "@evenicanpm/storefront-core/src/api-manager/services/orga
 import getProductAvailability from "@evenicanpm/storefront-core/src/api-manager/services/product/queries/get-product-availability";
 import type { AddToCartBopisInput } from "@evenicanpm/storefront-core/src/hooks/use-cart";
 import { geolocate } from "@evenicanpm/storefront-core/src/lib/map-helper";
-import PickupOptionSelect from "@evenicanpm/storefront-core/src/pages-v2/product-details/bopis/pickup-option-select";
-import SearchHeader from "@evenicanpm/storefront-core/src/pages-v2/product-details/bopis/search-header";
-import ShopCard from "@evenicanpm/storefront-core/src/pages-v2/product-details/bopis/store-card";
+import PickupOptionSelect from "@evenicanpm/storefront-core/src/pages/product-details/bopis/pickup-option-select";
+import SearchHeader from "@evenicanpm/storefront-core/src/pages/product-details/bopis/search-header";
+import ShopCard from "@evenicanpm/storefront-core/src/pages/product-details/bopis/store-card";
 import type {
 	DeliveryOption,
 	ProductWarehouseInventoryAvailability,
@@ -31,7 +31,6 @@ type Props = {
 	handleClose: () => void;
 	handleAddToCart: (bopisInput: AddToCartBopisInput) => void;
 	productId?: number;
-	allDimensionsSelected: boolean;
 };
 
 const qrs: QueryResultSettings = {
@@ -56,7 +55,6 @@ const initialSearchArea: SearchArea = {
  * @param {boolean} props.open - Whether the modal is open or not
  * @param {Function} props.handleAddToCart - Function to handle adding the product to cart
  * @param {number} props.productId - ID of the product being searched
- * @param {boolean} props.allDimensionsSelected - Whether all product dimensions (size, color, etc.) are selected
  *
  * @returns {JSX.Element} - Rendered modal component that displays available stores with inventory information
  *
@@ -66,7 +64,6 @@ const initialSearchArea: SearchArea = {
  *   open={modalOpen}
  *   handleAddToCart={handleAddItemToCart}
  *   productId={123456}
- *   allDimensionsSelected={true}
  * />
  */
 const FindInStoreModal = ({
@@ -74,7 +71,6 @@ const FindInStoreModal = ({
 	open,
 	handleAddToCart,
 	productId,
-	allDimensionsSelected,
 }: Props): JSX.Element => {
 	const t = useTranslations("productDetail");
 	const [hideOutOfStock, setHideOutOfStock] = React.useState(false);
@@ -94,7 +90,7 @@ const FindInStoreModal = ({
 				searchArea,
 			},
 		}),
-		[allDimensionsSelected, productId, searchArea],
+		[productId, searchArea],
 	);
 
 	const { data: inventoryData } =

package/src/{pages-v2 → pages}/product-details/bopis/pickup-option-select.tsx

@@ -1,4 +1,4 @@
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
 import type { AddToCartBopisInput } from "@evenicanpm/storefront-core/src/hooks/use-cart";
 import type { DeliveryOption } from "@msdyn365-commerce/retail-proxy";
 import {

package/src/pages/product-details/bopis/store-card/index.ts

@@ -0,0 +1 @@
+export { default } from "@evenicanpm/storefront-core/src/pages/product-details/bopis/store-card/shop-card";

package/src/{pages-v2 → pages}/product-details/bopis/store-card/shop-card.tsx

@@ -1,20 +1,20 @@
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
+} from "@evenicanpm/storefront-core/src/components/flex-box/index";
 // GLOBAL CUSTOM COMPONENTS
 import {
 	H3,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import {
 	buildStoreHours,
 	type IHoursDisplayInfo,
 } from "@evenicanpm/storefront-core/src/lib/store-hours-helper";
 // STYLED COMPONENT
-import { ContentWrapper } from "@evenicanpm/storefront-core/src/pages-v2/product-details/bopis/store-card/styles";
-import { convertSecondsToTime } from "@evenicanpm/storefront-core/src/pages-v2/product-details/bopis/store-card/utils/convertSecondsToTime";
-import { getDaysResources } from "@evenicanpm/storefront-core/src/pages-v2/product-details/bopis/store-card/utils/getDaysResources";
+import { ContentWrapper } from "@evenicanpm/storefront-core/src/pages/product-details/bopis/store-card/styles";
+import { convertSecondsToTime } from "@evenicanpm/storefront-core/src/pages/product-details/bopis/store-card/utils/convertSecondsToTime";
+import { getDaysResources } from "@evenicanpm/storefront-core/src/pages/product-details/bopis/store-card/utils/getDaysResources";
 import type {
 	ProductWarehouseInventoryAvailability,
 	StoreHours,

package/src/{pages-v2 → pages}/product-details/currency.ts

@@ -13,7 +13,7 @@ import { formatDistanceStrict } from "date-fns";
 
 function getDateDifference(date: string | number | Date) {
 	const distance = formatDistanceStrict(new Date(), new Date(date));
-	return distance + " ago";
+	return `${distance} ago`;
 }
 
 /**
@@ -62,4 +62,4 @@ function currency(price: number, fraction = 2) {
 	return formatCurrency;
 }
 
-export { currency, getDateDifference, calculateDiscount, renderProductCount };
+export { calculateDiscount, currency, getDateDifference, renderProductCount };

package/src/{pages-v2 → pages}/product-details/frequently-bought.tsx

@@ -3,17 +3,17 @@
 import {
 	FlexBox,
 	FlexRowCenter,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+} from "@evenicanpm/storefront-core/src/components/flex-box";
 // GLOBAL CUSTOM COMPONENTS
 import {
 	H2,
 	H3,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 // CUSTOM UTILS LIBRARY FUNCTION
 import { currency } from "@evenicanpm/storefront-core/src/lib/lib";
 // LOCAL CUSTOM COMPONENT
-import FrequentlyProductCard from "@evenicanpm/storefront-core/src/pages-v2/product-details/frequently-product-card";
+import FrequentlyProductCard from "@evenicanpm/storefront-core/src/pages/product-details/frequently-product-card";
 // CUSTOM DATA MODEL
 import type { ProductSearchResult as Product } from "@msdyn365-commerce/retail-proxy";
 import Box from "@mui/material/Box";

package/src/{pages-v2 → pages}/product-details/frequently-product-card.tsx

@@ -1,12 +1,12 @@
-import BazaarCard from "@evenicanpm/storefront-core/src/components-v2/BazaarCard";
-import FlexBox from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-box";
+import BazaarCard from "@evenicanpm/storefront-core/src/components/BazaarCard";
+import FlexBox from "@evenicanpm/storefront-core/src/components/flex-box/flex-box";
 // GLOBAL CUSTOM COMPONENTS
-import HoverBox from "@evenicanpm/storefront-core/src/components-v2/HoverBox";
-import LazyImage from "@evenicanpm/storefront-core/src/components-v2/LazyImage";
+import HoverBox from "@evenicanpm/storefront-core/src/components/HoverBox";
+import LazyImage from "@evenicanpm/storefront-core/src/components/LazyImage";
 import {
 	H6,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 // CUSTOM UTILS LIBRARY FUNCTIONS
 import {
 	calculateDiscount,

package/src/{pages-v2 → pages}/product-details/product-comment.tsx

@@ -1,13 +1,13 @@
 "use client";
 
 // GLOBAL CUSTOM COMPONENTS
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
 import {
 	H5,
 	H6,
 	Paragraph,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 // CUSTOM UTILS LIBRARY FUNCTION
 import { getDateDifference } from "@evenicanpm/storefront-core/src/lib/lib";
 import Avatar from "@mui/material/Avatar";

package/src/{pages-v2 → pages}/product-details/product-description.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { H3 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { H3 } from "@evenicanpm/storefront-core/src/components/Typography";
 import type { AttributeValue } from "@msdyn365-commerce/retail-proxy";
 
 type Props = { attributes: AttributeValue[] };
@@ -10,12 +10,14 @@ export default function ProductDescription({ attributes }: Readonly<Props>) {
 		<div>
 			<H3 mb={2}>Specifications:</H3>
 			{attributes?.map((attr, index) => {
-				if (attr?.TextValue && attr?.Name)
+				if (attr?.TextValue && attr?.Name) {
 					return (
 						<div key={`attr-${index + 1}`}>
 							{attr.Name}: {attr.TextValue}
 						</div>
 					);
+				}
+				return null;
 			})}
 		</div>
 	);

package/src/{pages-v2 → pages}/product-details/product-filter-card.tsx

@@ -1,25 +1,25 @@
 "use client";
 
-import AccordionHeader from "@evenicanpm/storefront-core/src/components-v2/accordion/accordion-header";
+import AccordionHeader from "@evenicanpm/storefront-core/src/components/accordion/accordion-header";
 // GLOBAL CUSTOM COMPONENTS
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+} from "@evenicanpm/storefront-core/src/components/flex-box";
 import {
 	H5,
 	H6,
 	Paragraph,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 // LOCAL CUSTOM COMPONENTS
-import CheckboxLabel from "@evenicanpm/storefront-core/src/pages-v2/product-details/checkbox-label";
+import CheckboxLabel from "@evenicanpm/storefront-core/src/pages/product-details/checkbox-label";
 // TYPE
 import type {
 	ProductFilterKeys,
 	ProductFilters,
 	ProductFilterValues,
-} from "@evenicanpm/storefront-core/src/pages-v2/product-details/types";
+} from "@evenicanpm/storefront-core/src/pages/product-details/types";
 import { Slider } from "@mui/material";
 // MUI
 import Box from "@mui/material/Box";

package/src/{pages-v2 → pages}/product-details/product-intro/compound/product-info.tsx

@@ -1,11 +1,11 @@
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import QuantityButtons from "@evenicanpm/storefront-core/src/components-v2/product-quantity-buttons";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import QuantityButtons from "@evenicanpm/storefront-core/src/components/product-quantity-buttons";
 import {
 	H1,
 	H2,
 	H6,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import AddToWishlistButton from "@evenicanpm/storefront-core/src/components-v2/wishlist-dialogs/add-to-wishlist/add-to-wishlist-button";
+} from "@evenicanpm/storefront-core/src/components/Typography";
+import AddToWishlistButton from "@evenicanpm/storefront-core/src/components/wishlist-dialogs/add-to-wishlist/add-to-wishlist-button";
 // GLOBAL CUSTOM COMPONENTS
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
 import { CircularProgress, Typography } from "@mui/material";
@@ -21,23 +21,23 @@ import getProductAvailability from "@evenicanpm/storefront-core/src/api-manager/
 // API MANAGER
 import getProductPrices from "@evenicanpm/storefront-core/src/api-manager/services/product/queries/get-product-prices";
 // LOCAL COMPONENTS
-import ProductDimensions from "@evenicanpm/storefront-core/src/components-v2/product-dimensions";
+import ProductDimensions from "@evenicanpm/storefront-core/src/components/product-dimensions";
 // LOCAL HOOKS
 import useCart, {
 	type AddToCartBopisInput,
 } from "@evenicanpm/storefront-core/src/hooks/use-cart";
-import FindInStoreButton from "@evenicanpm/storefront-core/src/pages-v2/product-details/bopis/find-in-store-button";
+import FindInStoreButton from "@evenicanpm/storefront-core/src/pages/product-details/bopis/find-in-store-button";
 import {
 	ProductInfoContext,
 	useProductInfo,
 	useProductIntro,
-} from "@evenicanpm/storefront-core/src/pages-v2/product-details/product-intro/compound/context";
+} from "@evenicanpm/storefront-core/src/pages/product-details/product-intro/compound/context";
 
 import {
 	buildInventorySearchCriteria,
 	checkProductOOS,
 	getInventoryLabel,
-} from "@evenicanpm/storefront-core/src/pages-v2/product-details/product-intro/utils";
+} from "@evenicanpm/storefront-core/src/pages/product-details/product-intro/utils";
 
 export interface Props {
 	children: React.ReactNode;
@@ -168,7 +168,6 @@ ProductInfo.Price = () => {
 
 	return (
 		<Box pt={1}>
-			Test
 			<H2 color="primary.main" mb={0.5} lineHeight="1">
 				{pricesPending || !productPrices ? (
 					<CircularProgress size={20} />

package/src/{pages-v2 → pages}/product-details/product-intro/compound/product-intro-images.tsx

@@ -3,13 +3,13 @@
 import {
 	FlexBox,
 	FlexRowCenter,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import ImageWithFallback from "@evenicanpm/storefront-core/src/components-v2/ImageWithFallback";
+} from "@evenicanpm/storefront-core/src/components/flex-box";
+import ImageWithFallback from "@evenicanpm/storefront-core/src/components/ImageWithFallback";
 import {
 	ProductImagesContext,
 	ProductIntroContext,
-} from "@evenicanpm/storefront-core/src/pages-v2/product-details/product-intro/compound/context";
-import ThumbnailWithSkeleton from "@evenicanpm/storefront-core/src/pages-v2/product-details/product-intro/compound/thumbnail-with-skeleton";
+} from "@evenicanpm/storefront-core/src/pages/product-details/product-intro/compound/context";
+import ThumbnailWithSkeleton from "@evenicanpm/storefront-core/src/pages/product-details/product-intro/compound/thumbnail-with-skeleton";
 import Grid from "@mui/material/Grid2";
 import type React from "react";
 import { useContext, useState } from "react";

package/src/{pages-v2 → pages}/product-details/product-intro/compound/product-intro.tsx

@@ -1,9 +1,9 @@
 "use client";
 import type { ProductDetails } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
 import useVariants from "@evenicanpm/storefront-core/src/hooks/use-variants";
-import { ProductIntroContext } from "@evenicanpm/storefront-core/src/pages-v2/product-details/product-intro/compound/context";
-import ProductInfo from "@evenicanpm/storefront-core/src/pages-v2/product-details/product-intro/compound/product-info";
-import ProductImages from "@evenicanpm/storefront-core/src/pages-v2/product-details/product-intro/compound/product-intro-images";
+import { ProductIntroContext } from "@evenicanpm/storefront-core/src/pages/product-details/product-intro/compound/context";
+import ProductInfo from "@evenicanpm/storefront-core/src/pages/product-details/product-intro/compound/product-info";
+import ProductImages from "@evenicanpm/storefront-core/src/pages/product-details/product-intro/compound/product-intro-images";
 import Box from "@mui/material/Box";
 import Grid from "@mui/material/Grid2";
 import type React from "react";

package/src/{pages-v2 → pages}/product-details/product-intro/compound/thumbnail-with-skeleton.tsx

@@ -1,4 +1,5 @@
 import { Skeleton } from "@mui/material";
+import Image from "next/image";
 import { useState } from "react";
 
 /**
@@ -11,9 +12,11 @@ function ThumbnailWithSkeleton({ src }: Readonly<{ src: string }>) {
 	return (
 		<>
 			{!loaded && <Skeleton variant="rounded" width={50} height={50} />}
-			<img
+			<Image
 				src={src}
 				alt="Product thumbnail"
+				width={50}
+				height={50}
 				onLoad={() => setLoaded(true)}
 				style={{
 					display: loaded ? "block" : "none",

package/src/{pages-v2 → pages}/product-details/product-review.tsx

@@ -1,13 +1,10 @@
 "use client";
 
 // GLOBAL CUSTOM COMPONENTS
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import {
-	H2,
-	H5,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import { H2, H5 } from "@evenicanpm/storefront-core/src/components/Typography";
 // Local CUSTOM COMPONENT
-import ProductComment from "@evenicanpm/storefront-core/src/pages-v2/product-details/product-comment";
+import ProductComment from "@evenicanpm/storefront-core/src/pages/product-details/product-comment";
 import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import Rating from "@mui/material/Rating";

package/src/{pages-v2 → pages}/product-details/product-tabs.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 // LOCAL CUSTOM COMPONENTS
-import ProductDescription from "@evenicanpm/storefront-core/src/pages-v2/product-details/product-description";
+import ProductDescription from "@evenicanpm/storefront-core/src/pages/product-details/product-description";
 import type { AttributeValue } from "@msdyn365-commerce/retail-proxy";
 import Box from "@mui/material/Box";
 import styled from "@mui/material/styles/styled";