@evenicanpm/storefront-core 1.8.4 → 2.0.1

package/src/{pages-v2 → pages}/account/orders/order-summary.tsx

@@ -1,10 +1,10 @@
 import type { SalesOrder } from "@evenicanpm/storefront-core/src/api-manager/schemas/order.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 {
 	H5,
 	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 from "@mui/material/Card";
 import Divider from "@mui/material/Divider";
@@ -86,9 +86,9 @@ OrderSummary.ListItem = ({
 	title: string;
 	property: keyof SalesOrder;
 }) => {
+	const t = useTranslations("Account.OrderDetails");
 	const context = useContext(OrderSummaryContext);
 	if (!context) return null;
-	const t = useTranslations("Account.OrderDetails");
 	const { order, formatCurrency } = context;
 
 	const value = order[property];
@@ -104,10 +104,10 @@ OrderSummary.ListItem = ({
 OrderSummary.Divider = Divider;
 
 OrderSummary.Total = () => {
+	const t = useTranslations("Account.OrderDetails");
 	const context = useContext(OrderSummaryContext);
 	if (!context) return null;
 	const { order, formatCurrency } = context;
-	const t = useTranslations("Account.OrderDetails");
 
 	return (
 		<FlexBetween mb={2}>

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

@@ -5,12 +5,12 @@ import type {
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
+} from "@evenicanpm/storefront-core/src/components/flex-box/index";
 import {
 	H6,
 	Paragraph,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import buildDetailUrl from "@evenicanpm/storefront-core/src/lib/build-detail-url";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
 import { ProductDimensionType } from "@msdyn365-commerce/retail-proxy";

package/src/{pages-v2 → pages}/account/profile/profile-button.test.tsx

@@ -1,4 +1,4 @@
-import ProfileButton from "@evenicanpm/storefront-core/src/pages-v2/account/profile/profile-button";
+import ProfileButton from "@evenicanpm/storefront-core/src/pages/account/profile/profile-button";
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { vi } from "vitest";
 import { getMsalInstance, getRequestConfig, initializeMsal } from "@/auth/msal";
@@ -9,7 +9,7 @@ vi.mock("@/auth/msal", () => ({
 	getRequestConfig: vi.fn(),
 }));
 
-vi.mock("@evenicanpm/storefront-core/src/components-v2/T/index", () => ({
+vi.mock("@evenicanpm/storefront-core/src/components/T/index", () => ({
 	default: ({ path }: { path: string }) => <span>{path}</span>,
 }));
 

package/src/{pages-v2 → pages}/account/profile/profile-button.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import type { RedirectRequest } from "@azure/msal-browser";
-import T from "@evenicanpm/storefront-core/src/components-v2/T/index";
+import T from "@evenicanpm/storefront-core/src/components/T/index";
 import { Button } from "@mui/material";
 import { useEffect, useState } from "react";
 import { getMsalInstance, getRequestConfig, initializeMsal } from "@/auth/msal";

package/src/{pages-v2 → pages}/account/profile/user-info.tsx

@@ -3,11 +3,11 @@
 // API
 import type { User } from "@evenicanpm/storefront-core/src/api-manager/schemas/user.schema";
 // GLOBAL CUSTOM COMPONENTS
-import FlexBox from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-box";
+import FlexBox from "@evenicanpm/storefront-core/src/components/flex-box/flex-box";
 import {
 	Small,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import Card from "@mui/material/Card";
 import type { Theme } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";

package/src/{pages-v2 → pages}/account/styles.ts

@@ -1,4 +1,4 @@
-import NavLink from "@evenicanpm/storefront-core/src/components-v2/nav-link/nav-link";
+import NavLink from "@evenicanpm/storefront-core/src/components/nav-link/nav-link";
 import Card from "@mui/material/Card";
 import styled from "@mui/material/styles/styled";
 

package/src/{pages-v2 → pages}/account/wishlist/create-new-list.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import useCreateWishlist from "@evenicanpm/storefront-core/src/api-manager/services/user/mutations/create-wishlist";
-import { H5 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { H5 } from "@evenicanpm/storefront-core/src/components/Typography";
 import { useNotification } from "@evenicanpm/storefront-core/src/providers/notifications/use-notification";
 import {
 	Box,
@@ -69,7 +69,7 @@ const CreateNewList = ({
 
 	useEffect(() => {
 		if (open) formik.resetForm();
-	}, [open]);
+	}, [open, formik.resetForm]);
 
 	const handleClose = () => {
 		if (isFunction(onClose)) onClose();

package/src/{pages-v2 → pages}/account/wishlist/create-wishlist-button.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import T from "@evenicanpm/storefront-core/src/components-v2/T";
-import CreateNewList from "@evenicanpm/storefront-core/src/pages-v2/account/wishlist/create-new-list";
+import T from "@evenicanpm/storefront-core/src/components/T";
+import CreateNewList from "@evenicanpm/storefront-core/src/pages/account/wishlist/create-new-list";
 import { Button } from "@mui/material";
 import { useState } from "react";
 

package/src/{pages-v2 → pages}/account/wishlist/wishlist-item.tsx

@@ -6,9 +6,9 @@ import type {
 } from "@evenicanpm/storefront-core/src/api-manager/schemas/user.schema";
 // API
 import useDeleteWishlist from "@evenicanpm/storefront-core/src/api-manager/services/user/mutations/delete-wishlist";
-import { NavLink3 } from "@evenicanpm/storefront-core/src/components-v2/nav-link";
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import TableRow from "@evenicanpm/storefront-core/src/pages-v2/account/table-row";
+import { NavLink3 } from "@evenicanpm/storefront-core/src/components/nav-link";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
+import TableRow from "@evenicanpm/storefront-core/src/pages/account/table-row";
 import { useNotification } from "@evenicanpm/storefront-core/src/providers/notifications/use-notification";
 import { Box, IconButton } from "@mui/material";
 import type { SxProps } from "@mui/material/styles";

package/src/{pages-v2 → pages}/blog/blog-card.tsx

@@ -1,12 +1,12 @@
 // GLOBAL CUSTOM COMPONENTS
 
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { ZoomLazyImage } from "@evenicanpm/storefront-core/src/components-v2/LazyImage";
-import { NavLink2 } from "@evenicanpm/storefront-core/src/components-v2/nav-link";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import { ZoomLazyImage } from "@evenicanpm/storefront-core/src/components/LazyImage";
+import { NavLink2 } from "@evenicanpm/storefront-core/src/components/nav-link";
 import {
 	H3,
 	Paragraph,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 // MUI ICON COMPONENTS
 import AccessTime from "@mui/icons-material/AccessTime";
 import Box from "@mui/material/Box";

package/src/{pages-v2 → pages}/cart/__tests__/cart-item.test.tsx

@@ -1,6 +1,6 @@
 import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
+import cartData from "@evenicanpm/storefront-core/src/pages/cart/__tests__/cart-with-items.json";
 import CartItem from "@evenicanpm/storefront-core/src/pages/cart/cart-item";
-import cartData from "@evenicanpm/storefront-core/src/pages-v2/cart/__tests__/cart-with-items.json";
 import { NotificationProvider } from "@evenicanpm/storefront-core/src/providers/notifications/notification-context";
 import ENUS from "@messages/en-US.json";
 import fr from "@messages/fr.json";

package/src/{pages-v2 → pages}/cart/__tests__/checkout-form.test.tsx

@@ -1,6 +1,6 @@
 import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
+import cartData from "@evenicanpm/storefront-core/src/pages/cart/__tests__/cart-with-items.json";
 import CheckoutForm from "@evenicanpm/storefront-core/src/pages/cart/checkout-form";
-import cartData from "@evenicanpm/storefront-core/src/pages-v2/cart/__tests__/cart-with-items.json";
 import { NotificationProvider } from "@evenicanpm/storefront-core/src/providers/notifications/notification-context";
 import ENUS from "@messages/en-US.json";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";

package/src/{pages-v2 → pages}/cart/__tests__/estimate-shipping.test.tsx

@@ -1,7 +1,7 @@
 import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
-import cartData from "@evenicanpm/storefront-core/src/pages-v2/cart/__tests__/cart-with-items.json";
-import countries from "@evenicanpm/storefront-core/src/pages-v2/cart/__tests__/countries.json";
-import EstimateShipping from "@evenicanpm/storefront-core/src/pages-v2/cart/estimate-shipping";
+import cartData from "@evenicanpm/storefront-core/src/pages/cart/__tests__/cart-with-items.json";
+import countries from "@evenicanpm/storefront-core/src/pages/cart/__tests__/countries.json";
+import EstimateShipping from "@evenicanpm/storefront-core/src/pages/cart/estimate-shipping";
 import { NotificationProvider } from "@evenicanpm/storefront-core/src/providers/notifications/notification-context";
 import ENUS from "@messages/en-US.json";
 import type { CountryRegionInfo } from "@msdyn365-commerce/retail-proxy";
@@ -27,10 +27,10 @@ describe("Estimate Shipping", () => {
 	it("Should Default Country to USA", async () => {
 		const _countries = countries as CountryRegionInfo[];
 		const america = _countries.find((c) => c.ISOCode === "US");
-		let selectedCountry;
-		const setCountryFn = vi.fn(
-			(c: CountryRegionInfo) => (selectedCountry = c.ISOCode),
-		);
+		let selectedCountry: string | undefined;
+		const setCountryFn = vi.fn((c: CountryRegionInfo) => {
+			selectedCountry = c.ISOCode;
+		});
 		render(
 			<Wrapper>
 				<EstimateShipping
@@ -56,10 +56,10 @@ describe("Estimate Shipping", () => {
 	it("Should Default Country to Canada", async () => {
 		const _countries = countries as CountryRegionInfo[];
 		const canada = _countries.find((c) => c.ISOCode === "CA");
-		let selectedCountry;
-		const setCountryFn = vi.fn(
-			(c: CountryRegionInfo) => (selectedCountry = c.ISOCode),
-		);
+		let selectedCountry: string | undefined;
+		const setCountryFn = vi.fn((c: CountryRegionInfo) => {
+			selectedCountry = c.ISOCode;
+		});
 		render(
 			<Wrapper>
 				<EstimateShipping

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

@@ -3,18 +3,18 @@
 import type { CartLine } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
 import useDeleteCartLine from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/delete-cart-line";
 import useUpdateCartLines from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/update-cart-lines";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import Image from "@evenicanpm/storefront-core/src/components-v2/ImageWithFallback";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import Image from "@evenicanpm/storefront-core/src/components/ImageWithFallback";
 // Local components
 import {
 	H6,
 	Span,
 	Tiny,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import { getProductDetailUrl } from "@evenicanpm/storefront-core/src/lib/build-product-detail-url";
 // Utils
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
-import { Wrapper } from "@evenicanpm/storefront-core/src/pages-v2/cart/wrapper";
+import { Wrapper } from "@evenicanpm/storefront-core/src/pages/cart/wrapper";
 // API
 import { ProductDimensionType } from "@msdyn365-commerce/retail-proxy";
 // MUI Icons
@@ -32,7 +32,13 @@ import {
 import Link from "next/link";
 import { useTranslations } from "next-intl";
 import type React from "react";
-import { createContext, useContext, useMemo, useState } from "react";
+import {
+	createContext,
+	useCallback,
+	useContext,
+	useMemo,
+	useState,
+} from "react";
 
 type CartItemContextValue = {
 	cartLine: CartLine;
@@ -84,30 +90,39 @@ function CartItemRoot({
 	const qty = cartLine.Quantity || 1;
 	const isLoading = updatePending || deletePending;
 
-	const performUpdate = (updated: CartLine) => {
-		updateCartLine({ cartLine: [updated], cartId, version: cartVersion });
-	};
+	const performUpdate = useCallback(
+		(updated: CartLine) => {
+			updateCartLine({ cartLine: [updated], cartId, version: cartVersion });
+		},
+		[cartId, cartVersion, updateCartLine],
+	);
 
-	const increase = () => performUpdate({ ...cartLine, Quantity: qty + 1 });
-	const decrease = () => {
+	const increase = useCallback(
+		() => performUpdate({ ...cartLine, Quantity: qty + 1 }),
+		[cartLine, qty, performUpdate],
+	);
+	const decrease = useCallback(() => {
 		if (qty === 1) return;
 		performUpdate({ ...cartLine, Quantity: qty - 1 });
-	};
-	const remove = () =>
-		deleteCartLine({
-			cartLine: [{ ...cartLine, Quantity: 0 }],
-			cartId,
-			version: cartVersion,
-		});
+	}, [cartLine, qty, performUpdate]);
+	const remove = useCallback(
+		() =>
+			deleteCartLine({
+				cartLine: [{ ...cartLine, Quantity: 0 }],
+				cartId,
+				version: cartVersion,
+			}),
+		[cartLine, cartId, cartVersion, deleteCartLine],
+	);
 
-	const saveComment = () => {
+	const saveComment = useCallback(() => {
 		performUpdate({ ...cartLine, Comment: comment });
 		setIsWritingComment(false);
-	};
-	const cancelComment = () => {
+	}, [cartLine, comment, performUpdate]);
+	const cancelComment = useCallback(() => {
 		setComment(cartLine.Comment || "");
 		setIsWritingComment(false);
-	};
+	}, [cartLine.Comment]);
 
 	const value = useMemo<CartItemContextValue>(
 		() => ({
@@ -126,7 +141,20 @@ function CartItemRoot({
 			saveComment,
 			cancelComment,
 		}),
-		[cartLine, cartId, cartVersion, qty, isLoading, isWritingComment, comment],
+		[
+			cartLine,
+			cartId,
+			cartVersion,
+			qty,
+			isLoading,
+			isWritingComment,
+			comment,
+			increase,
+			decrease,
+			remove,
+			saveComment,
+			cancelComment,
+		],
 	);
 
 	return (

package/src/{pages-v2 → pages}/cart/checkout-form.tsx

@@ -4,10 +4,10 @@ import getStates from "@evenicanpm/storefront-core/src/api-manager/services/addr
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import CouponEntry from "@evenicanpm/storefront-core/src/pages-v2/cart/coupon-entry";
-import EstimateShipping from "@evenicanpm/storefront-core/src/pages-v2/cart/estimate-shipping";
+} from "@evenicanpm/storefront-core/src/components/flex-box";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
+import CouponEntry from "@evenicanpm/storefront-core/src/pages/cart/coupon-entry";
+import EstimateShipping from "@evenicanpm/storefront-core/src/pages/cart/estimate-shipping";
 import type {
 	CountryRegionInfo,
 	Coupon,
@@ -141,7 +141,7 @@ CheckoutForm.Notes = () => {
 				multiline
 				onChange={debounceCommentUpdate}
 				inputRef={textRef}
-				inputProps={{ ["data-testid"]: "cart-comment" }}
+				inputProps={{ "data-testid": "cart-comment" }}
 			/>
 			<Divider sx={{ mb: 2 }} />
 		</>

package/src/{pages-v2 → pages}/cart/coupon-entry.tsx

@@ -2,8 +2,8 @@
 
 import useAddDiscountCode from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/add-discount-code";
 import useRemoveDiscountcode from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/remove-discount-code";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
 import type { Coupon } from "@msdyn365-commerce/retail-proxy";
 import Close from "@mui/icons-material/Close";
 import {

package/src/{pages-v2 → pages}/cart/estimate-shipping.tsx

@@ -1,7 +1,7 @@
 import type { Address } from "@evenicanpm/storefront-core/src/api-manager/schemas/address.schema";
 import useGetDeliveryOptions from "@evenicanpm/storefront-core/src/api-manager/services/address/mutations/get-delivery-options";
-import CountryInput from "@evenicanpm/storefront-core/src/components-v2/countries-input";
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import CountryInput from "@evenicanpm/storefront-core/src/components/countries-input";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
 import type {
 	CountryRegionInfo,

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

@@ -4,7 +4,7 @@ import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/c
 import useCheckout from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/checkout";
 import getChannelConfiguration from "@evenicanpm/storefront-core/src/api-manager/services/organization/queries/get-channel-configuration";
 import { PageSlug } from "@evenicanpm/storefront-core/src/lib/page-slugs";
-import CheckoutStep from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/checkout-step";
+import CheckoutStep from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/checkout-step";
 import { useNotification } from "@evenicanpm/storefront-core/src/providers/notifications/use-notification";
 import type { CardPaymentAcceptResult } from "@msdyn365-commerce/retail-proxy";
 import { Box, Button } from "@mui/material";
@@ -43,7 +43,7 @@ interface InjectedStepProps {
 	isLastStep: boolean;
 }
 
-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";
 
 interface StepProps<T extends object> {
 	title: string;

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

@@ -1,8 +1,8 @@
 import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
-import Card from "@evenicanpm/storefront-core/src/components-v2/BazaarCard";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import StepHeading from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/step-heading";
+import Card from "@evenicanpm/storefront-core/src/components/BazaarCard";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
+import StepHeading from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/step-heading";
 import { Button, useTheme } from "@mui/material";
 import Grid from "@mui/material/Grid2";
 import { useTranslations } from "next-intl";
@@ -117,7 +117,7 @@ CheckoutStep.Header = () => {
 	);
 };
 
-CheckoutStep.Body = <P extends object = {}>({
+CheckoutStep.Body = <P extends object = object>({
 	component: Component,
 	componentProps,
 }: {

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/index.ts

@@ -1 +1 @@
-export { default as CheckoutForm } from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/checkout-form";
+export { default as CheckoutForm } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/checkout-form";

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/step-heading.tsx

@@ -1,6 +1,6 @@
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import type { StepViewState } from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/checkout-step";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
+import type { StepViewState } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/checkout-step";
 import Avatar from "@mui/material/Avatar";
 import type { BoxProps } from "@mui/material/Box";
 
@@ -18,7 +18,7 @@ export default function Heading({
 	stepViewState,
 	...props
 }: Readonly<Props>) {
-	let viewStateColor;
+	let viewStateColor: string;
 
 	switch (stepViewState) {
 		case "active":

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/steps/address/address-card.tsx

@@ -1,9 +1,9 @@
 import type { Address } from "@evenicanpm/storefront-core/src/api-manager/schemas/address.schema";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+import { FlexBox } 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 { DeleteOutline, ModeEditOutline } from "@mui/icons-material";
 import { Card, IconButton } from "@mui/material";
 import Grid from "@mui/material/Grid2";

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

@@ -9,12 +9,12 @@ import useUpdateCart from "@evenicanpm/storefront-core/src/api-manager/services/
 import useUpdateCartLines from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/update-cart-lines";
 // API
 import getUser from "@evenicanpm/storefront-core/src/api-manager/services/user/queries/get-user";
-import Menu from "@evenicanpm/storefront-core/src/components-v2/BazaarMenu";
-import type { CheckoutStepComponentProps } from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/checkout-step";
-import AddressCard from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/steps/address/address-card";
+import Menu from "@evenicanpm/storefront-core/src/components/BazaarMenu";
+import type { CheckoutStepComponentProps } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/checkout-step";
+import AddressCard from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/steps/address/address-card";
 // Local components
-import NewAddressForm from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/steps/address/new-address-form";
-import { AddressDropDownHandler } from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/steps/address/styles";
+import NewAddressForm from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/steps/address/new-address-form";
+import { AddressDropDownHandler } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/steps/address/styles";
 import type { CountryRegionInfo } from "@msdyn365-commerce/retail-proxy";
 import { KeyboardArrowDownOutlined } from "@mui/icons-material";
 import { Box, MenuItem } from "@mui/material";
@@ -24,6 +24,7 @@ import { useLocale, useTranslations } from "next-intl";
 import React, {
 	createContext,
 	type ReactNode,
+	useCallback,
 	useContext,
 	useEffect,
 	useState,
@@ -195,21 +196,24 @@ const DeliveryAddress: DeliveryAddressCompound = ({
 	};
 
 	// helper to pick and set selected address + title
-	const pickAddress = (id?: number | null) => {
-		if (!id || id < 0) {
-			setSelectedAddressID(null);
-			setTitle("Select Address");
-			return;
-		}
-
-		const picked = addressList.find((a) => a.RecordId === id);
-		if (picked) {
-			setSelectedAddressID(picked.RecordId as number);
-			setTitle(`${picked.Name}, ${picked.City}`);
-		} else {
-			pickAddress(addressList[0].RecordId);
-		}
-	};
+	const pickAddress = useCallback(
+		(id?: number | null) => {
+			if (!id || id < 0) {
+				setSelectedAddressID(null);
+				setTitle("Select Address");
+				return;
+			}
+
+			const picked = addressList.find((a) => a.RecordId === id);
+			if (picked) {
+				setSelectedAddressID(picked.RecordId as number);
+				setTitle(`${picked.Name}, ${picked.City}`);
+			} else {
+				pickAddress(addressList[0].RecordId);
+			}
+		},
+		[addressList],
+	);
 
 	// keep dropdown title in sync
 	useEffect(() => {
@@ -218,7 +222,7 @@ const DeliveryAddress: DeliveryAddressCompound = ({
 			return;
 		}
 		pickAddress(cart.ShippingAddress?.RecordId ?? selectedAddressID);
-	}, [addressList, cart.ShippingAddress]);
+	}, [addressList, cart.ShippingAddress, selectedAddressID, pickAddress]);
 
 	// step submission -> completion
 	useEffect(() => {

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/steps/address/new-address-form.tsx

@@ -1,10 +1,10 @@
 import type { Address } from "@evenicanpm/storefront-core/src/api-manager/schemas/address.schema";
 import getStates from "@evenicanpm/storefront-core/src/api-manager/services/address/queries/get-states";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
 import {
 	H5,
 	Paragraph,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import { zodResolver } from "@hookform/resolvers/zod";
 import type { CountryRegionInfo } from "@msdyn365-commerce/retail-proxy";
 import { Box, FormControl, InputLabel, MenuItem, Select } from "@mui/material";
@@ -44,7 +44,7 @@ interface NewAddressFormCtx {
 	states: { StateName: string; StateId: string }[] | undefined;
 	selectedCountry: CountryRegionInfo | null;
 	setSelectedCountry: (c: CountryRegionInfo | null) => void;
-	errors: Record<string, any>;
+	errors: Partial<Record<keyof AddressFormInput, { message?: string }>>;
 	t: ReturnType<typeof useTranslations>;
 	onCancel: () => void;
 }

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/steps/customer-info/customer-information.tsx

@@ -1,7 +1,7 @@
 import useUpdateCart from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/update-cart";
 import getUser from "@evenicanpm/storefront-core/src/api-manager/services/user/queries/get-user";
-import { Paragraph } 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 { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
+import type { CheckoutStepComponentProps } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/checkout-step";
 import { yupResolver } from "@hookform/resolvers/yup";
 import Box from "@mui/material/Box";
 import Grid from "@mui/material/Grid2";