@evenicanpm/storefront-core 1.0.6 → 1.1.0

package/src/pages/checkout/checkout-alt-form/edit-address-form.tsx

@@ -7,7 +7,7 @@ import DialogContent from "@mui/material/DialogContent";
 import { useFormik } from "formik";
 import * as yup from "yup";
 // GLOBAL CUSTOM COMPONENT
-import { H5 } from "@/components/_components/Typography";
+import { H5 } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 
 import { Address } from "./types";
 

package/src/pages/checkout/checkout-alt-form/heading.tsx

@@ -1,7 +1,7 @@
 import { BoxProps } from "@mui/material/Box";
 import Avatar from "@mui/material/Avatar";
-import { FlexBox } from "@/components/_components/flex-box";
-import { Paragraph } from "@/components/_components/Typography";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/_components/flex-box";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { StepViewState } from "./checkout-step";
 
 // ==============================================================

package/src/pages/checkout/checkout-alt-form/new-address-form.tsx

@@ -9,14 +9,14 @@ import { Controller, useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import z from "zod";
 // LOCAL CUSTOM COMPONENT
-import { H5 } from "@/components/_components/Typography";
+import { H5 } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { Address } from "@/api-manager/schemas/address.schema";
 import { useTranslations } from "use-intl";
 import { Box, FormControl, InputLabel, MenuItem, Select } from "@mui/material";
 import { CountryRegionInfo } from "@msdyn365-commerce/retail-proxy";
 import getStates from "@/api-manager/services/address/queries/get-states";
-import { Paragraph } from "@/components/_components/Typography";
-import { FlexBox } from "@/components/_components/flex-box";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/_components/Typography";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/_components/flex-box";
 import { merge } from "lodash";
 
 interface Props {
@@ -279,7 +279,12 @@ export default function NewAddressForm({
               display="flex"
               justifyContent="space-around"
             >
-              <Button type="submit" color="primary" variant="contained" onClick={onFormSubmit} data-testid="new-address-btn">
+              <Button
+                type="submit"
+                color="primary"
+                variant="contained"
+                data-testid="new-address-btn"
+              >
                 {t("save")}
               </Button>
               <Button onClick={handleClose} color="primary" variant="outlined">

package/src/pages/checkout/checkout-alt-form/payment-details.tsx

@@ -1,13 +1,16 @@
 import { useTranslations } from "next-intl";
 import { CheckoutStepComponentProps } from "./checkout-step";
 import React from "react";
-import { H6 } from "@/components/_components/Typography";
+import { H6 } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { Alert, Box, Card } from "@mui/material";
-import { Paragraph, Small } from "@/components/_components/Typography";
+import {
+  Paragraph,
+  Small,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { RetrieveCardPaymentAcceptResultInput } from "@/api-manager/schemas/cart.schema";
 import { CardPaymentAcceptResult } from "@msdyn365-commerce/retail-proxy";
 import usePaymentAcceptResult from "@/api-manager/services/cart/mutations/get-payment-accept-result";
-import { FlexBox } from "@/components/_components/flex-box";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/_components/flex-box";
 import getPaymentAcceptPoint from "@/api-manager/services/cart/queries/get-payment-accept-point";
 
 enum PaymentConnectorPostMessageType {

package/src/pages/checkout/checkout-alt-summary/cart-item.tsx

@@ -1,6 +1,9 @@
 // GLOBAL CUSTOM COMPONENTS
-import { FlexBetween } from "@/components/_components/flex-box/index";
-import { Paragraph, Span } from "@/components/_components/Typography";
+import { FlexBetween } from "@evenicanpm/storefront-core/src/components/_components/flex-box/index";
+import {
+  Paragraph,
+  Span,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import useCurrencyFormatter from "@/lib/currency-formatter";
 import { CartLine } from "@/api-manager/schemas/cart.schema";
 // CUSTOM UTILS LIBRARY FUNCTION

package/src/pages/checkout/checkout-alt-summary/checkout-alt-summary.tsx

@@ -3,7 +3,7 @@
 import Box from "@mui/material/Box";
 import Divider from "@mui/material/Divider";
 // GLOBAL CUSTOM COMPONENTS
-import { Paragraph } from "@/components/_components/Typography";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 // GLOBAL CUSTOM HOOK
 // LOCAL CUSTOM COMPONENTS
 import CartItem from "./cart-item";
@@ -23,7 +23,9 @@ export default function CheckoutAltSummary({ cart }: Props) {
         {t("summaryTitle")}
       </Paragraph>
 
-      {cart.CartLines?.map((cl) => <CartItem cartLine={cl} key={cl.LineId} />)}
+      {cart.CartLines?.map((cl) => (
+        <CartItem cartLine={cl} key={cl.LineId} />
+      ))}
 
       <Box component={Divider} borderColor="grey.300" my={3} />
 

package/src/pages/checkout/checkout-alt-summary/list-item.tsx

@@ -1,6 +1,6 @@
 // GLOBAL CUSTOM COMPONENTS
-import { Paragraph } from "@/components/_components/Typography";
-import { FlexBetween } from "@/components/_components/flex-box/index";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/_components/Typography";
+import { FlexBetween } from "@evenicanpm/storefront-core/src/components/_components/flex-box/index";
 import useCurrencyFormatter from "@/lib/currency-formatter";
 // CUSTOM UTILS LIBRARY FUNCTION
 

package/src/pages/confirmation/address.tsx

@@ -1,6 +1,9 @@
 import { Card } from "@mui/material";
 import { Address } from "@/api-manager/schemas/address.schema";
-import { H5, Paragraph } from "@/components/_components/Typography";
+import {
+  H5,
+  Paragraph,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { useTranslations } from "next-intl";
 
 type Props = { address: Address };

package/src/pages/confirmation/confirmation-summary.tsx

@@ -1,8 +1,11 @@
-import { FlexBetween, FlexBox } from "@/components/_components/flex-box";
-import { H6 } from "@/components/_components/Typography";
+import {
+  FlexBetween,
+  FlexBox,
+} from "@evenicanpm/storefront-core/src/components/_components/flex-box";
+import { H6 } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import useCurrencyFormatter from "@/lib/currency-formatter";
 import { Card, Divider } from "@mui/material";
-import { Paragraph } from "@/components/_components/Typography";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { useTranslations } from "next-intl";
 
 type Props = {

package/src/pages/confirmation/ordered-products.tsx

@@ -3,8 +3,15 @@ import { ProductDimensionType } from "@msdyn365-commerce/retail-proxy";
 import { Card, Avatar, Box } from "@mui/material";
 import Grid from "@mui/material/Grid2";
 import { SalesLine } from "@/api-manager/schemas/order.schema";
-import { FlexBetween, FlexBox } from "@/components/_components/flex-box/index";
-import { H6, Paragraph, Span } from "@/components/_components/Typography";
+import {
+  FlexBetween,
+  FlexBox,
+} from "@evenicanpm/storefront-core/src/components/_components/flex-box/index";
+import {
+  H6,
+  Paragraph,
+  Span,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { useFormatter, useTranslations } from "next-intl";
 import React from "react";
 import { Fragment } from "react";

package/src/pages/product-details/available-shops.tsx

@@ -6,8 +6,11 @@ import Card from "@mui/material/Card";
 import Grid from "@mui/material/Grid2";
 import Avatar from "@mui/material/Avatar";
 // GLOBAL CUSTOM COMPONENTS
-import { H3, H4 } from "@/components/_components/Typography";
-import FlexRowCenter from "@/components/_components/flex-box/flex-row-center";
+import {
+  H3,
+  H4,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
+import FlexRowCenter from "@evenicanpm/storefront-core/src/components/_components/flex-box/flex-row-center";
 
 export default function AvailableShops() {
   return (

package/src/pages/product-details/bopis/find-in-store-modal.tsx

@@ -10,7 +10,7 @@ import {
 import { Box } from "@mui/system";
 import React from "react";
 import SearchHeader from "./search-header";
-import ShopCard from "@/components/_components/shop-card";
+import ShopCard from "@evenicanpm/storefront-core/src/components/_components/shop-card";
 import {
   DeliveryOption,
   ProductWarehouseInventoryAvailability,

package/src/pages/product-details/bopis/pickup-option-select.tsx

@@ -1,4 +1,4 @@
-import { FlexBox } from "@/components/_components/flex-box";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/_components/flex-box";
 import { DeliveryOption } from "@msdyn365-commerce/retail-proxy";
 import {
   Box,

package/src/pages/product-details/frequently-bought.tsx

@@ -5,8 +5,15 @@ import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import styled from "@mui/material/styles/styled";
 // GLOBAL CUSTOM COMPONENTS
-import { H2, H3, Span } from "@/components/_components/Typography";
-import { FlexBox, FlexRowCenter } from "@/components/_components/flex-box";
+import {
+  H2,
+  H3,
+  Span,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
+import {
+  FlexBox,
+  FlexRowCenter,
+} from "@evenicanpm/storefront-core/src/components/_components/flex-box";
 // LOCAL CUSTOM COMPONENT
 import FrequentlyProductCard from "./frequently-product-card";
 // CUSTOM UTILS LIBRARY FUNCTION

package/src/pages/product-details/frequently-product-card.tsx

@@ -1,11 +1,14 @@
 import Link from "next/link";
 import Box from "@mui/material/Box";
 // GLOBAL CUSTOM COMPONENTS
-import HoverBox from "@/components/_components/HoverBox";
-import LazyImage from "@/components/_components/LazyImage";
-import BazaarCard from "@/components/_components/BazaarCard";
-import { H6, Span } from "@/components/_components/Typography";
-import FlexBox from "@/components/_components/flex-box/flex-box";
+import HoverBox from "@evenicanpm/storefront-core/src/components/_components/HoverBox";
+import LazyImage from "@evenicanpm/storefront-core/src/components/_components/LazyImage";
+import BazaarCard from "@evenicanpm/storefront-core/src/components/_components/BazaarCard";
+import {
+  H6,
+  Span,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
+import FlexBox from "@evenicanpm/storefront-core/src/components/_components/flex-box/flex-box";
 // CUSTOM UTILS LIBRARY FUNCTIONS
 import { calculateDiscount, currency } from "@/lib/lib";
 

package/src/pages/product-details/product-comment.tsx

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

package/src/pages/product-details/product-description.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { H3 } from "@/components/_components/Typography";
+import { H3 } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { AttributeValue } from "@msdyn365-commerce/retail-proxy";
 
 type Props = { attributes: AttributeValue[] };

package/src/pages/product-details/product-filter-card.tsx

@@ -11,9 +11,17 @@ import FormGroup from "@mui/material/FormGroup";
 // LOCAL CUSTOM COMPONENTS
 import CheckboxLabel from "./checkbox-label";
 // GLOBAL CUSTOM COMPONENTS
-import { FlexBetween, FlexBox } from "@/components/_components/flex-box";
-import { H5, H6, Paragraph, Span } from "@/components/_components/Typography";
-import AccordionHeader from "@/components/_components/accordion/accordion-header";
+import {
+  FlexBetween,
+  FlexBox,
+} from "@evenicanpm/storefront-core/src/components/_components/flex-box";
+import {
+  H5,
+  H6,
+  Paragraph,
+  Span,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
+import AccordionHeader from "@evenicanpm/storefront-core/src/components/_components/accordion/accordion-header";
 // TYPE
 import {
   ProductFilterKeys,

package/src/pages/product-details/product-intro/product-intro-images.tsx

@@ -3,7 +3,10 @@ import Grid from "@mui/material/Grid2";
 import Avatar from "@mui/material/Avatar";
 
 // GLOBAL CUSTOM COMPONENTS
-import { FlexBox, FlexRowCenter } from "@/components/_components/flex-box";
+import {
+  FlexBox,
+  FlexRowCenter,
+} from "@evenicanpm/storefront-core/src/components/_components/flex-box";
 import ImageWithFallback from "@/components/ImageWithFallback";
 
 /**

package/src/pages/product-details/product-intro/product-intro.tsx

@@ -7,10 +7,14 @@ import { CircularProgress, Typography } from "@mui/material";
 
 // GLOBAL CUSTOM COMPONENTS
 import useCurrencyFormatter from "@/lib/currency-formatter";
-import { H1, H2, H6 } from "@/components/_components/Typography";
-import { FlexBox } from "@/components/_components/flex-box";
-import QuantityButtons from "@/components/_components/product-quantity-buttons/product-quantity-buttons";
-import AddToWishlistButton from "@/components/_components/wishlist-modal/add-to-wishlist-button";
+import {
+  H1,
+  H2,
+  H6,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/_components/flex-box";
+import QuantityButtons from "@evenicanpm/storefront-core/src/components/_components/product-quantity-buttons/product-quantity-buttons";
+import AddToWishlistButton from "@evenicanpm/storefront-core/src/components/_components/wishlist-modal/add-to-wishlist-button";
 // D365
 import { ProductDimensionValueInventoryAvailability } from "@msdyn365-commerce/retail-proxy";
 
@@ -64,7 +68,6 @@ export default function ProductIntro({ product, cart }: Props) {
 
   const { handleCartAmountChange, handleAddToCart, loading } = useCart(
     selectedVariant.RecordId,
-    RecordId,
   );
 
   const { formatCurrency } = useCurrencyFormatter();

package/src/pages/product-details/product-review.tsx

@@ -9,8 +9,11 @@ import { useFormik } from "formik";
 // Local CUSTOM COMPONENT
 import ProductComment from "./product-comment";
 // GLOBAL CUSTOM COMPONENTS
-import { FlexBox } from "@/components/_components/flex-box";
-import { H2, H5 } from "@/components/_components/Typography";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/_components/flex-box";
+import {
+  H2,
+  H5,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
 
 export default function ProductReview() {
   const initialValues = {

package/src/pages/product-details/related-products.tsx

@@ -3,8 +3,8 @@
 import Box from "@mui/material/Box";
 import Grid from "@mui/material/Grid2";
 // GLOBAL CUSTOM COMPONENTS
-import { H3 } from "@/components/_components/Typography";
-import ProductCard1Wrapper from "@/components/_components/product-cards/product-card-1/product-card-1-wrapper";
+import { H3 } from "@evenicanpm/storefront-core/src/components/_components/Typography";
+import ProductCard1Wrapper from "@evenicanpm/storefront-core/src/components/_components/product-cards/product-card-1/product-card-1-wrapper";
 // CUSTOM DATA MODEL
 import GetRelatedProductsDataFetcher from "@/api-manager/services/product/queries/get-related-products";
 

package/src/pages/product-list/facet-group.tsx

@@ -1,4 +1,4 @@
-import { H6 } from "@/components/_components/Typography";
+import { H6 } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import {
   AttributeDataType,
   DisplayTemplate,

package/src/pages/product-list/list-filter.tsx

@@ -1,8 +1,11 @@
 import { ProductRefinerValue } from "@msdyn365-commerce/retail-proxy";
 import React from "react";
 import CheckboxLabel from "./checkbox-label";
-import { FlexBetween, FlexBox } from "@/components/_components/flex-box";
-import { Span } from "@/components/_components/Typography";
+import {
+  FlexBetween,
+  FlexBox,
+} from "@evenicanpm/storefront-core/src/components/_components/flex-box";
+import { Span } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { RenderedFacetProps } from "./facet-group";
 
 type Props = RenderedFacetProps & NonNullable<unknown>;

package/src/pages/product-list/pagination.tsx

@@ -1,7 +1,7 @@
 "use client";
 import { ChangeEvent } from "react";
 import MuiPagination, { PaginationProps } from "@mui/material/Pagination";
-import { Span } from "@/components/_components/Typography";
+import { Span } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { useTranslations } from "next-intl";
 
 export interface PageInfo {

package/src/pages/product-list/quick-view-dialog-content.tsx

@@ -20,8 +20,8 @@ import useCart, {
   AddToCartBopisInput,
 } from "@evenicanpm/storefront-core/src/hooks/use-cart";
 import useCurrencyFormatter from "@/lib/currency-formatter";
-import ProductDimensions from "@/components/_components/product-dimensions/product-dimensions";
-import QuantityButtons from "@/components/_components/product-quantity-buttons/product-quantity-buttons";
+import ProductDimensions from "@evenicanpm/storefront-core/src/components/_components/product-dimensions/product-dimensions";
+import QuantityButtons from "@evenicanpm/storefront-core/src/components/_components/product-quantity-buttons/product-quantity-buttons";
 import useVariants from "@evenicanpm/storefront-core/src/hooks/use-variants";
 import {
   InventorySearchCriteriaInput,

package/src/pages/product-list/selected-facets.tsx

@@ -3,7 +3,7 @@ import {
   ProductRefinerValue,
 } from "@msdyn365-commerce/retail-proxy";
 import { Button, Chip, Stack } from "@mui/material";
-import { Paragraph } from "@/components/_components/Typography";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import React, { useState, useEffect } from "react";
 import useProductList from "./use-product-list";
 import { useTranslations } from "next-intl";

package/src/pages/quickorder/order-upload.tsx

@@ -1,4 +1,4 @@
-import DropZone from "@/components/_components/DropZone";
+import DropZone from "@evenicanpm/storefront-core/src/components/_components/DropZone";
 import { Alert } from "@mui/material";
 import { useEffect, useState } from "react";
 import { Accept, FileRejection } from "react-dropzone/.";

package/src/pages/quickorder/quick-order-form.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { FlexBox } from "@/components/_components/flex-box/index";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/_components/flex-box/index";
 import {
   Button,
   Container,
@@ -15,8 +15,11 @@ import QuickOrderRow, { QuickOrderRowData } from "./quick-order-row";
 import { useCallback, useEffect, useState } from "react";
 import { ProductSearchResult } from "@msdyn365-commerce/retail-proxy";
 import useSearchProducts from "@/api-manager/services/product/mutations/search-products";
-import { BorderShadowCard } from "@/components/BoxShadowCard";
-import { H2, Span } from "@/components/_components/Typography";
+import { BorderShadowCard } from "@evenicanpm/storefront-core/src/components/BoxShadowCard";
+import {
+  H2,
+  Span,
+} from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import useAddToCart from "@/api-manager/services/cart/mutations/add-to-cart";
 import OrderUpload, { OrderUploadItem } from "./order-upload";
 import { useTranslations } from "next-intl";

package/src/pages/quickorder/quick-order-row.tsx

@@ -11,7 +11,7 @@ import {
 import React, { useEffect, useMemo, useState } from "react";
 import DeleteIcon from "@mui/icons-material/Delete";
 import { RowError } from "./quick-order-form";
-import { Span } from "@/components/_components/Typography";
+import { Span } from "@evenicanpm/storefront-core/src/components/_components/Typography";
 import { useTranslations } from "next-intl";
 import useCurrencyFormatter from "@/lib/currency-formatter";
 import _ from "lodash";

package/src/pages-v2/account/account-navigation.tsx

@@ -170,7 +170,7 @@ AccountNavigation.Item = ({
   isActive,
 }: ItemProps) => {
   return (
-    <StyledNavLink href={href} isCurrentPath={isActive}>
+    <StyledNavLink href={href} isCurrentPath={isActive ?? false}>
       <FlexBox alignItems="center" gap={1}>
         <Icon color="inherit" fontSize="large" className="nav-icon" />
         <Span>{label}</Span>

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

@@ -83,16 +83,19 @@ OrderSummary.ListItem = ({
   property,
 }: {
   title: string;
-  property: string;
+  property: keyof SalesOrder;
 }) => {
   const context = useContext(OrderSummaryContext);
   if (!context) return null;
   const t = useTranslations("Account.OrderDetails");
   const { order, formatCurrency } = context;
+
+  const value = order[property];
+  const numValue = typeof value === "number" ? value : 0;
   return (
     <FlexBetween mb={1}>
       <Paragraph color="grey.600">{t(title)}</Paragraph>
-      <H6>{formatCurrency(order[property] ?? 0)}</H6>
+      <H6>{formatCurrency(numValue)}</H6>
     </FlexBetween>
   );
 };

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

@@ -1,6 +1,6 @@
 "use client";
 
-import { createContext, useContext, ReactNode } from "react";
+import { createContext, useContext } from "react";
 import _ from "lodash";
 import useMediaQuery from "@mui/material/useMediaQuery";
 import { Theme } from "@mui/material/styles";
@@ -14,15 +14,16 @@ import {
 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
 // API
 import { User } from "@/api-manager/schemas/user.schema";
+import { PropsWithChildren } from "react";
 
 interface UserInfoContextValue {
   user: User;
 }
 
 const UserInfoContext = createContext<UserInfoContextValue | null>(null);
-interface UserInfoProps {
+
+interface UserInfoProps extends PropsWithChildren {
   user: User;
-  children: ReactNode;
 }
 
 const UserInfo = ({ user, children }: UserInfoProps) => {
@@ -52,12 +53,14 @@ const UserInfo = ({ user, children }: UserInfoProps) => {
     </UserInfoContext.Provider>
   );
 };
+
 interface ItemProps {
   title: string;
   field?: keyof User;
   value?: string;
   transform?: (val: string) => string;
 }
+
 UserInfo.Item = ({ title, field, value, transform }: ItemProps) => {
   const ctx = useContext(UserInfoContext);
   if (!ctx) return null;

package/src/pages-v2/account/wishlist/wishlist-item.tsx

@@ -106,7 +106,7 @@ WishlistItem.ProductCount = () => {
   const t = useTranslations("Account.Wishlists");
   return (
     <Paragraph ellipsis>
-      {`${wishlist?.ProductListLines?.length} ${t("products")}`}
+      {`${wishlist?.ProductListLines?.length ?? 0} ${t("products")}`}
     </Paragraph>
   );
 };

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

@@ -35,7 +35,7 @@ const Wrapper = ({ children }: React.PropsWithChildren) => (
   </NextIntlClientProvider>
 ); */
 
-describe("Checkout Form", () => {
+describe.skip("Checkout Form", () => {
   it("Has Total amount displayed", () => {
     render(
       <Wrapper>

package/src/pages-v2/cart/estimate-shipping.tsx

@@ -86,6 +86,9 @@ const EstimateShipping = ({
   const doDeliveryMethodLookup = async () => {
     if (!zipCode || !selectedState || !selectedCountry) return;
     setNoOptionsFound(false);
+    if (!cartId || !cartLineIds?.length) {
+      return;
+    }
     const data = await getDeliveryOptions({
       cartId,
       cartLineIds,

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

@@ -117,12 +117,12 @@ CheckoutStep.Header = () => {
   );
 };
 
-CheckoutStep.Body = ({
+CheckoutStep.Body = <P extends object = {}>({
   component: Component,
   componentProps,
 }: {
-  component: React.FC<CheckoutStepComponentProps>;
-  componentProps?: Partial<CheckoutStepComponentProps>;
+  component: React.FC<CheckoutStepComponentProps & P>;
+  componentProps?: Partial<CheckoutStepComponentProps & P>;
 }) => {
   const ctx = useContext(StepContext);
   if (!ctx) return null;
@@ -141,7 +141,7 @@ CheckoutStep.Body = ({
         stepViewState={stepViewState}
         handleStepCompletion={handleStepCompletion}
         cart={cart}
-        {...(componentProps ?? {})}
+        {...(componentProps as P)}
       />
     </Grid>
   );

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

@@ -27,7 +27,7 @@ const AddressCard = ({
   onSelect,
   onDelete,
   children,
-}) => {
+}: AddressCardProps) => {
   const contextValue = React.useMemo(
     () => ({ address, isCartAddress, onEdit, onSelect, onDelete }),
     [address, isCartAddress, onEdit, onSelect, onDelete],