@sonic-equipment/ui 258.0.4 → 258.1.1

package/dist/config.js

@@ -70,7 +70,7 @@ const configPerEnvironment = {
     production: () => ({
         ALGOLIA_API_KEY: 'e31a3a53449eceb4d0f9273b9bcd9759',
         ALGOLIA_APP_ID: '14CUFCVMAD',
-        ALGOLIA_HOST: 'shopapi.sonic-equipment.com',
+        ALGOLIA_HOST: 'shop.sonic-equipment.com',
         BFF_API_URL: 'https://shopapi.sonic-equipment.com/api/v1/bff',
         COOKIE_DOMAIN: '.sonic-equipment.com',
         HOME_PAGE_URL: 'https://sonic-equipment.com/',
@@ -81,10 +81,10 @@ const configPerEnvironment = {
         ALGOLIA_API_KEY: 'e0edf30798a6b2e4e44fd25f0f2f9646',
         ALGOLIA_APP_ID: 'testing9VXJ0U4GSV',
         ALGOLIA_HOST: 'shop.accept-sonic-equipment.com',
-        BFF_API_URL: 'https://shop.accept-sonic-equipment.com/api/v1/bff',
+        BFF_API_URL: 'https://shopapi.accept-sonic-equipment.com/api/v1/bff',
         COOKIE_DOMAIN: '.accept-sonic-equipment.com',
         HOME_PAGE_URL: 'https://accept-sonic-equipment.com/',
-        SHOP_API_URL: 'https://shop.accept-sonic-equipment.com',
+        SHOP_API_URL: 'https://shopapi.accept-sonic-equipment.com',
         SHOP_URL: 'https://shop.accept-sonic-equipment.com',
     }),
     'sandbox-reverse-proxy': () => ({

package/dist/exports.d.ts

@@ -243,9 +243,11 @@ export * from './pages/checkout/payment-page/hooks/use-has-returned-from-adyen';
 export * from './pages/checkout/payment-page/payment-page';
 export * from './pages/checkout/payment-page/payment-page-content';
 export * from './pages/checkout/payment-page/utils/parse-amount';
+export * from './pages/checkout/shipping-page/components/address-book-selector';
 export * from './pages/checkout/shipping-page/components/currency-change-dialog';
 export * from './pages/checkout/shipping-page/components/edit-checkout-bill-to-address-form';
 export * from './pages/checkout/shipping-page/components/readonly-address';
+export * from './pages/checkout/shipping-page/components/ship-to-mode-selector';
 export * from './pages/checkout/shipping-page/components/sonic-address';
 export * from './pages/checkout/shipping-page/hooks/use-patch-shipping-details';
 export * from './pages/checkout/shipping-page/shipping-page';

package/dist/forms/elements/checkbox/checkbox.d.ts

@@ -17,7 +17,7 @@ export interface CheckboxWithLabelProps extends CheckboxPropsBase {
     'aria-label': string;
 }
 export interface CheckboxWithChildrenProps extends CheckboxPropsBase {
-    children: ReactNode;
+    children?: ReactNode;
 }
 export type CheckboxProps = CheckboxWithLabelProps | CheckboxWithChildrenProps;
 export declare function Checkbox(props: CheckboxProps): import("react/jsx-runtime").JSX.Element;

package/dist/index.js

@@ -244,9 +244,12 @@ export { useHasReturnedFromAdyen } from './pages/checkout/payment-page/hooks/use
 export { PaymentPage } from './pages/checkout/payment-page/payment-page.js';
 export { PaymentPageContent } from './pages/checkout/payment-page/payment-page-content.js';
 export { parseAmount } from './pages/checkout/payment-page/utils/parse-amount.js';
+export { AddressBookSelector } from './pages/checkout/shipping-page/components/address-book-selector.js';
 export { CurrencyChangeDialog } from './pages/checkout/shipping-page/components/currency-change-dialog.js';
 export { EDIT_ADDRESS_FORM_ID, EditCheckoutBillToAddressForm } from './pages/checkout/shipping-page/components/edit-checkout-bill-to-address-form.js';
 export { ReadOnlyAddresses } from './pages/checkout/shipping-page/components/readonly-address.js';
+import 'react/jsx-runtime';
+import 'react';
 export { SonicAddress } from './pages/checkout/shipping-page/components/sonic-address.js';
 export { usePatchShippingDetails } from './pages/checkout/shipping-page/hooks/use-patch-shipping-details.js';
 export { ShippingPage } from './pages/checkout/shipping-page/shipping-page.js';

package/dist/intl/translation-id.d.ts

@@ -1 +1 @@
-export type TranslationId = "'{0}' in all products" | "Try 'Search' and try to find the product you're looking for" | "Unfortnately, We found no articles for your search '{0}'" | ' to your account to manage your lists.' | 'Access denied.' | 'Account' | 'Account was activated successfully.' | 'active' | 'Add address' | 'Add order notes' | 'Add to cart' | 'Add to list' | 'Address 1' | 'Address 2' | 'Address 3' | 'Address 4' | 'Address not found' | 'Address' | 'Address book' | 'addressProperty.Default' | 'addressProperty.Company Name' | 'addressProperty.Address Line' | 'addressProperty.Postal Code' | 'addressProperty.City' | 'addressProperty.Country' | 'All payment methods are unavailable at this time. Please contact customer support.' | 'Amount: {0}' | 'An error occurred while changing the customer.' | 'An error occurred while fetching customers. Please try again later.' | 'An error occurred while processing your payment. Please try again.' | 'An unexpected error occured' | 'An unexpected error occured. Please try again.' | 'Are you looking for information about our service? Please visit our customer support page' | 'Are you sure you want to remove all items from your cart?' | 'Are you sure you want to remove this item from your cart?' | 'article' | 'articles' | 'As soon as possible' | 'ASC' | 'Attention' | 'Availability unknown, please contact customer support for lead time or alternatives.' | 'Back' | 'Billing address' | 'Billing and shipping address' | 'Billing and shipping information' | 'Billing' | 'Cancel' | 'Cart' | 'Change customer' | 'Change password' | 'Changing password…' | 'Changing your address is currently not possible. Please contact customer support to change your address.' | 'Checkout order' | 'Chosen filters' | 'City' | 'Clear filters' | 'Create' | 'Clear' | 'Click the button below to continue shopping.' | 'Client cases' | 'Close' | 'CoC number' | 'Column 1: Item number or customer part number' | 'Column 2: Quantity (optional)' | 'Column 3: Unit of measure (optional)' | 'Company name' | 'Conceal value' | 'Confirm new password' | 'Continue shopping' | 'Continue to sign in' | 'Continue' | 'Copyright © Sonic Equipment B.V.' | 'Cost overview' | 'Country' | 'Create a row for each product. The allowed maximum is 500 rows' | 'Create account' | 'Create new list' | 'Create or modify a spreadsheet' | 'Currency Change' | 'Current page' | 'Current password' | 'Current Password is invalid' | 'Date' | 'Decrease' | 'Default shipping address' | 'Delivery date' | 'Delivery expected on {0}' | 'DESC' | 'Double check your spelling' | 'Download spreadsheet template' | 'Downloads' | 'Easily add your favorite products' | 'Edit billing address' | 'Edit shipping address' | 'Edit Sonic account' | 'Edit' | 'Email' | 'Enter your email address and we will send you an email that will allow you to recover your password.' | 'Excl. VAT' | 'Explore by categories' | 'Exploring our products by category' | 'facet.categories' | 'facet.height' | 'facet.weight' | 'Favorites' | 'Features' | 'Filter order status' | 'Finalize order' | 'Finalize payment' | 'First name' | 'Forgot password?' | 'Fulfillment method' | 'General' | 'Good day' | 'Good morning' | 'Good afternoon' | 'Good evening' | 'Goodnight' | 'Guest' | 'Hide filters' | 'Home' | 'If an account matches the email address you entered, instructions on how to recover the password will be sent to that email address shortly. If you do not receive this email, please contact Customer Support.' | 'If you want to proceed, click the continue button. If you want to change your country, close this message and select a different country.' | 'Incl. VAT' | 'Includes' | 'Increase' | 'Industry' | 'industry.AG' | 'industry.AU' | 'industry.AV' | 'industry.BC' | 'industry.MA' | 'industry.MC' | 'industry.OT' | 'industry.PP' | 'industry.TR' | 'Information' | 'Instructions' | 'Language' | 'Last name' | 'List name already exists' | 'Log out' | 'Main menu' | 'Make sure the spreadsheet has 3 columns' | 'Make this the default customer' | 'Make this the default ship to address' | 'More than {0} articles' | 'My account' | 'My Sonic' | 'My Sonic menu' | 'Name' | 'Navigate to...' | 'Navigation' | 'New list name' | 'New Password is required and must be different than Current Password' | 'New password' | 'New user?' | 'Next' | 'No countries available. Unable to change address.' | 'No orders found.' | 'No results found. Please refine your search.' | 'No search results' | 'Number of favorites' | 'Number of products' | 'of' | 'OK' | 'Or continue as guest' | 'Order confirmation' | 'Order date' | 'Order details' | 'Order history' | 'Order number' | 'Order#' | 'Order' | 'orderProperty.Date' | 'orderProperty.Number' | 'orderProperty.PO Number' | 'orderProperty.Price' | 'orderProperty.Shipping Address' | 'orderProperty.Status' | 'Orders' | 'orderStatus.Any' | 'orderStatus.Cancelled' | 'orderStatus.ForwardToReseller' | 'orderStatus.Fulfilled' | 'orderStatus.Partially fulfilled' | 'orderStatus.Processing' | 'orderStatus.Saved' | 'orderStatus.Waiting for customer service' | 'Our products' | 'Overview' | 'Page not found.' | 'Password changed. Please sign in again.' | 'Password does not meet requirements' | 'Password' | 'Passwords do not match' | 'Pay by invoice' | 'Payment method' | 'Payment' | 'pc' | 'Phone' | 'Pick up' | 'Pickup address' | 'Please contact Customer Support if you need assistance.' | 'Please enter a valid email address' | 'Please enter a valid phone number' | 'please go back to your cart.' | 'Please Sign In' | 'PO Number' | 'Popular searches' | 'Postal Code' | 'Previous' | 'Print' | 'Private account' | 'Processing' | 'Product Features' | 'Product' | 'Products' | 'Quantity' | 'Quick access' | 'Recent searches' | 'Recently viewed' | 'Recover your password' | 'Reset' | 'Remember me' | 'Remove' | 'Remove all' | 'Reorder' | 'Reordering...' | 'Requested delivery date' | 'Results' | 'Reveal value' | 'Review and payment' | 'Save order' | 'Save' | 'Save the file in XLS, XLSX or CSV format' | 'Saved' | 'Saved cart for later.' | 'Saving' | 'Search for a customer' | 'Search' | 'Searching again using more general terms' | 'Search orders' | 'See all results' | 'Select a country' | 'Select a desired delivery date' | 'Select a language' | 'Select a list' | 'Select an industry' | 'Select other customer' | 'Select the file to upload in the form and click Upload order' | 'Selected customer' | 'Selecting As Soon As Possible will enable us to send the products to you as they become available.' | 'Selecting this country will result in your cart to be converted to the currency {0}' | 'Share your favorite list with others' | 'Ship' | 'Shipping address' | 'Shipping and handling' | 'Shipping details' | 'Shop more efficiently and quicker with a favorites list' | 'Shopping cart' | 'Show all' | 'Show filters' | 'Show less' | 'Show' | 'Sign in or create account' | 'Sign in' | 'Sign me up for newsletters and product updates' | 'Signed in' | 'Signed out' | 'Signing in…' | 'Something went wrong' | 'Sonic account' | 'Sonic address' | 'Sonic Equipment' | 'Sorry, there are no products found' | 'Sorry, we could not find matches for' | 'Sort by' | 'sort.newest' | 'sort.price_asc' | 'sort.price_desc' | 'sort.relevance' | 'sort.ASC' | 'sort.DESC' | 'sort.NONE' | 'Specifications' | 'Start checkout' | 'Status' | 'Submenu' | 'Submit email address' | 'Submit' | 'Submitting…' | 'Subtotal' | 'Suggestions' | 'Support' | 'tag.limited' | 'tag.new' | 'The email address you entered is already associated with an existing account. Please sign in to this account or contact Customer Support.' | 'The expected delivery is an indication based on the product availability and the shipping location.' | 'The link you used for resetting your password is invalid. Please, reset your password again, or contact Customer Support.' | 'The password could not be changed. Please, reset your password again, or contact Customer Support.' | 'The product has been added to your cart.' | 'The product has been removed from your cart.' | 'The product has been updated in your cart.' | 'The option to upload an Excel file with your order is temporarily unavailable.' | 'The order has been added to your cart.' | 'The user to change the password for could not be found. Please, reset your password again, or contact Customer Support.' | 'There are more customers, please refine your search if needed.' | 'There are no products in your shopping cart.' | 'There is no information to display' | 'This email is already in use' | 'Toggle navigation menu' | 'Total amount is' | 'Total' | 'Try another search' | 'Unable to add the product to your cart.' | 'Unable to add the order to your cart.' | 'Unable to empty your cart.' | 'Unable to remove the product from your cart.' | 'Unable to save cart for later.' | 'Unable to update the product in your cart.' | 'Unknown' | 'Updating address' | 'Upload order' | 'Upload an Excel (XLS/XLSX) spreadsheet or CSV file to quickly add items to your cart.' | 'Use billing address' | 'Use fewer keywords' | 'Username' | 'Validating' | 'validation.badInput' | 'validation.customError' | 'validation.invalid' | 'validation.patternMismatch' | 'validation.rangeOverflow' | 'validation.rangeUnderflow' | 'validation.stepMismatch' | 'validation.tooLong' | 'validation.tooShort' | 'validation.typeMismatch' | 'validation.valid' | 'validation.valueMissing' | 'VAT Number' | 'VAT' | 'Welcome to Sonic Equipment. Please choose your country and language below.' | 'What are you searching for?' | 'You are not authorized to access this information.' | 'You are not authorized to perform this action' | 'You are not authorized to view customers. Please log in or contact support.' | 'You are required to change your password and then sign in again, using your new credentials.' | 'You could try checking the spelling of your search query' | 'You could try exploring our products by category' | 'You could try' | 'You have no favorite products yet.' | 'You have reached the end of the results, but there may be more articles available. Adjust your filters or search to discover more!' | 'You must ' | 'You selected a country where we invoice in a different currency. This will result in your cart being converted to the new currency. If you would like to review your order, ' | 'Your account is temporarily locked. Please try again later or contact Customer Support.' | 'Your cart has been emptied.' | 'Your email and password were not recognized.' | 'Your favorites are available on multiple devices' | 'Your new Sonic Equipment account was succesfully created. You should receive an email soon with further instructions on how to activate this account. If you do not receive this email, please contact Customer Support.' | 'Your shopping cart is still empty';
+export type TranslationId = "'{0}' in all products" | "Try 'Search' and try to find the product you're looking for" | "Unfortnately, We found no articles for your search '{0}'" | ' to your account to manage your lists.' | 'Access denied.' | 'Account' | 'Account was activated successfully.' | 'active' | 'Add address' | 'Add order notes' | 'Add to cart' | 'Add to list' | 'Address 1' | 'Address 2' | 'Address 3' | 'Address 4' | 'Address not found' | 'Address' | 'Address book' | 'addressProperty.Default' | 'addressProperty.Company Name' | 'addressProperty.Address Line' | 'addressProperty.Postal Code' | 'addressProperty.City' | 'addressProperty.Country' | 'All payment methods are unavailable at this time. Please contact customer support.' | 'Amount: {0}' | 'An error occurred while changing the customer.' | 'An error occurred while fetching customers. Please try again later.' | 'An error occurred while fetching addresses. Please try again later.' | 'An error occurred while processing your payment. Please try again.' | 'An unexpected error occured' | 'An unexpected error occured. Please try again.' | 'Are you looking for information about our service? Please visit our customer support page' | 'Are you sure you want to remove all items from your cart?' | 'Are you sure you want to remove this item from your cart?' | 'article' | 'articles' | 'As soon as possible' | 'ASC' | 'Attention' | 'Availability unknown, please contact customer support for lead time or alternatives.' | 'Back' | 'Billing address' | 'Billing and shipping address' | 'Billing and shipping information' | 'Billing' | 'Cancel' | 'Cart' | 'Change customer' | 'Change password' | 'Changing password…' | 'Changing your address is currently not possible. Please contact customer support to change your address.' | 'Checkout order' | 'Chosen filters' | 'City' | 'Clear filters' | 'Create' | 'Clear' | 'Click the button below to continue shopping.' | 'Client cases' | 'Close' | 'CoC number' | 'Column 1: Item number or customer part number' | 'Column 2: Quantity (optional)' | 'Column 3: Unit of measure (optional)' | 'Company name' | 'Conceal value' | 'Confirm new password' | 'Continue shopping' | 'Continue to sign in' | 'Continue' | 'Copyright © Sonic Equipment B.V.' | 'Cost overview' | 'Country' | 'Create a row for each product. The allowed maximum is 500 rows' | 'Create account' | 'Create new list' | 'Create or modify a spreadsheet' | 'Currency Change' | 'Current page' | 'Current password' | 'Current Password is invalid' | 'Date' | 'Decrease' | 'Default shipping address' | 'Delivery date' | 'Delivery expected on {0}' | 'DESC' | 'Double check your spelling' | 'Download spreadsheet template' | 'Downloads' | 'Easily add your favorite products' | 'Edit billing address' | 'Edit shipping address' | 'Edit Sonic account' | 'Edit' | 'Email' | 'Enter your email address and we will send you an email that will allow you to recover your password.' | 'Excl. VAT' | 'Explore by categories' | 'Exploring our products by category' | 'facet.categories' | 'facet.height' | 'facet.weight' | 'Favorites' | 'Features' | 'Filter order status' | 'Finalize order' | 'Finalize payment' | 'First name' | 'Forgot password?' | 'Fulfillment method' | 'General' | 'Good day' | 'Good morning' | 'Good afternoon' | 'Good evening' | 'Goodnight' | 'Guest' | 'Hide filters' | 'Home' | 'If an account matches the email address you entered, instructions on how to recover the password will be sent to that email address shortly. If you do not receive this email, please contact Customer Support.' | 'If you want to proceed, click the continue button. If you want to change your country, close this message and select a different country.' | 'Incl. VAT' | 'Includes' | 'Increase' | 'Industry' | 'industry.AG' | 'industry.AU' | 'industry.AV' | 'industry.BC' | 'industry.MA' | 'industry.MC' | 'industry.OT' | 'industry.PP' | 'industry.TR' | 'Information' | 'Instructions' | 'Language' | 'Last name' | 'List name already exists' | 'Log out' | 'Main menu' | 'Make sure the spreadsheet has 3 columns' | 'Make this the default customer' | 'Make this the default ship to address' | 'More than {0} articles' | 'My account' | 'My Sonic' | 'My Sonic menu' | 'Name' | 'Navigate to...' | 'Navigation' | 'New list name' | 'New Password is required and must be different than Current Password' | 'New password' | 'New user?' | 'Next' | 'No countries available. Unable to change address.' | 'No orders found.' | 'No results found. Please refine your search.' | 'No search results' | 'Number of favorites' | 'Number of products' | 'of' | 'OK' | 'Or continue as guest' | 'Order confirmation' | 'Order date' | 'Order details' | 'Order history' | 'Order number' | 'Order#' | 'Order' | 'orderProperty.Date' | 'orderProperty.Number' | 'orderProperty.PO Number' | 'orderProperty.Price' | 'orderProperty.Shipping Address' | 'orderProperty.Status' | 'Orders' | 'orderStatus.Any' | 'orderStatus.Cancelled' | 'orderStatus.ForwardToReseller' | 'orderStatus.Fulfilled' | 'orderStatus.Partially fulfilled' | 'orderStatus.Processing' | 'orderStatus.Saved' | 'orderStatus.Waiting for customer service' | 'Our products' | 'Overview' | 'Page not found.' | 'Password changed. Please sign in again.' | 'Password does not meet requirements' | 'Password' | 'Passwords do not match' | 'Pay by invoice' | 'Payment method' | 'Payment' | 'pc' | 'Phone' | 'Pick up' | 'Pickup address' | 'Please contact Customer Support if you need assistance.' | 'Please enter a valid email address' | 'Please enter a valid phone number' | 'please go back to your cart.' | 'Please Sign In' | 'PO Number' | 'Popular searches' | 'Postal Code' | 'Previous' | 'Print' | 'Private account' | 'Processing' | 'Product Features' | 'Product' | 'Products' | 'Quantity' | 'Quick access' | 'Recent searches' | 'Recently viewed' | 'Recover your password' | 'Reset' | 'Remember me' | 'Remove' | 'Remove all' | 'Reorder' | 'Reordering...' | 'Requested delivery date' | 'Results' | 'Reveal value' | 'Review and payment' | 'Save order' | 'Save' | 'Save the file in XLS, XLSX or CSV format' | 'Saved' | 'Saved cart for later.' | 'Saving' | 'Search for a customer' | 'Search' | 'Searching again using more general terms' | 'Search orders' | 'Search addresses' | 'See all results' | 'Select a country' | 'Select a desired delivery date' | 'Select a language' | 'Select a list' | 'Select an industry' | 'Select other customer' | 'Select the file to upload in the form and click Upload order' | 'Selected customer' | 'Selecting As Soon As Possible will enable us to send the products to you as they become available.' | 'Selecting this country will result in your cart to be converted to the currency {0}' | 'Share your favorite list with others' | 'Ship' | 'Shipping address' | 'Shipping and handling' | 'Shipping details' | 'Shop more efficiently and quicker with a favorites list' | 'Shopping cart' | 'Show all' | 'Show filters' | 'Show less' | 'Show' | 'Sign in or create account' | 'Sign in' | 'Sign me up for newsletters and product updates' | 'Signed in' | 'Signed out' | 'Signing in…' | 'Something went wrong' | 'Sonic account' | 'Sonic address' | 'Sonic Equipment' | 'Sorry, there are no products found' | 'Sorry, we could not find matches for' | 'Sort by' | 'sort.newest' | 'sort.price_asc' | 'sort.price_desc' | 'sort.relevance' | 'sort.ASC' | 'sort.DESC' | 'sort.NONE' | 'Specifications' | 'Start checkout' | 'Status' | 'Submenu' | 'Submit email address' | 'Submit' | 'Submitting…' | 'Subtotal' | 'Suggestions' | 'Support' | 'tag.limited' | 'tag.new' | 'The email address you entered is already associated with an existing account. Please sign in to this account or contact Customer Support.' | 'The expected delivery is an indication based on the product availability and the shipping location.' | 'The link you used for resetting your password is invalid. Please, reset your password again, or contact Customer Support.' | 'The password could not be changed. Please, reset your password again, or contact Customer Support.' | 'The product has been added to your cart.' | 'The product has been removed from your cart.' | 'The product has been updated in your cart.' | 'The option to upload an Excel file with your order is temporarily unavailable.' | 'The order has been added to your cart.' | 'The user to change the password for could not be found. Please, reset your password again, or contact Customer Support.' | 'There are more customers, please refine your search if needed.' | 'There are more addresses, please refine your search if needed.' | 'There are no products in your shopping cart.' | 'There is no information to display' | 'This email is already in use' | 'Toggle navigation menu' | 'Total amount is' | 'Total' | 'Try another search' | 'Unable to add the product to your cart.' | 'Unable to add the order to your cart.' | 'Unable to empty your cart.' | 'Unable to remove the product from your cart.' | 'Unable to save cart for later.' | 'Unable to update the product in your cart.' | 'Unknown' | 'Updating address' | 'Upload order' | 'Upload an Excel (XLS/XLSX) spreadsheet or CSV file to quickly add items to your cart.' | 'Use billing address' | 'Use default shipping address' | 'Use new address' | 'Use fewer keywords' | 'Username' | 'Validating' | 'validation.badInput' | 'validation.customError' | 'validation.invalid' | 'validation.patternMismatch' | 'validation.rangeOverflow' | 'validation.rangeUnderflow' | 'validation.stepMismatch' | 'validation.tooLong' | 'validation.tooShort' | 'validation.typeMismatch' | 'validation.valid' | 'validation.valueMissing' | 'VAT Number' | 'VAT' | 'Welcome to Sonic Equipment. Please choose your country and language below.' | 'What are you searching for?' | 'You are not authorized to access this information.' | 'You are not authorized to perform this action' | 'You are not authorized to view customers. Please log in or contact support.' | 'You are not authorized to view addresses. Please log in or contact support.' | 'You are required to change your password and then sign in again, using your new credentials.' | 'You could try checking the spelling of your search query' | 'You could try exploring our products by category' | 'You could try' | 'You have no favorite products yet.' | 'You have reached the end of the results, but there may be more articles available. Adjust your filters or search to discover more!' | 'You must ' | 'You selected a country where we invoice in a different currency. This will result in your cart being converted to the new currency. If you would like to review your order, ' | 'Your account is temporarily locked. Please try again later or contact Customer Support.' | 'Your cart has been emptied.' | 'Your email and password were not recognized.' | 'Your favorites are available on multiple devices' | 'Your new Sonic Equipment account was succesfully created. You should receive an email soon with further instructions on how to activate this account. If you do not receive this email, please contact Customer Support.' | 'Your shopping cart is still empty';

package/dist/pages/checkout/order-confirmation-page/order-confirmation-page.js

@@ -1,32 +1,19 @@
 "use client";
 import { jsx } from 'react/jsx-runtime';
-import { useEffect } from 'react';
 import { LoadingPage } from '../../loading-page/loading-page.js';
 import { useIsAuthenticated } from '../../../shared/api/storefront/hooks/authentication/use-is-authenticated.js';
 import { useFetchCartById } from '../../../shared/api/storefront/hooks/cart/use-fetch-cart-by-id.js';
 import { useNavigate } from '../../../shared/routing/use-navigate.js';
-import { usePaths } from '../../../shared/routing/use-paths.js';
 import { hasNo } from '../../../shared/utils/types.js';
 import { ErrorPage } from '../../error-page/error-page.js';
 import { OrderConfirmationPageContent } from './order-confirmation-page-content.js';
 
 function OrderConfirmationPage({ cartId }) {
-    const paths = usePaths();
     const isAuthenticated = useIsAuthenticated();
-    const { isNavigating, navigate } = useNavigate();
+    const { isNavigating } = useNavigate();
     const { data: cart, error, isLoading: cartIsLoading, } = useFetchCartById({
         id: cartId,
     });
-    useEffect(() => {
-        if (!cart)
-            return;
-        if (isAuthenticated === undefined)
-            return;
-        if (!isAuthenticated)
-            return navigate(paths.CART);
-        if (cart.status === 'Cart')
-            navigate(paths.CART);
-    }, [cart, navigate, isAuthenticated, paths]);
     if (error)
         return jsx(ErrorPage, { error: error });
     if (cartIsLoading || isNavigating)

package/dist/pages/checkout/payment-page/payment-page.js

@@ -24,7 +24,9 @@ function PaymentPage({ hasReturnedFromAdyen, }) {
     const [isProcessing, setIsProcessing] = useState(false);
     const { isNavigating, navigate } = useNavigate();
     const onPaymentComplete = useCallback(({ cartId }) => {
-        navigate(`${paths.ORDER_CONFIRMATION}?cartId=${cartId}`);
+        setTimeout(() => {
+            navigate(`${paths.ORDER_CONFIRMATION}?cartId=${cartId}`);
+        }, 500);
     }, [navigate, paths]);
     useEffect(() => {
         if (isNavigating)

package/dist/pages/checkout/shipping-page/components/address-book-selector.d.ts

@@ -0,0 +1,6 @@
+export interface AddressBookSelectorProps {
+    billToId: string;
+    className?: string;
+    currentShipToId?: string;
+}
+export declare function AddressBookSelector({ className, currentShipToId, }: AddressBookSelectorProps): import("react/jsx-runtime").JSX.Element;

package/dist/pages/checkout/shipping-page/components/address-book-selector.js

@@ -0,0 +1,81 @@
+"use client";
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { useRef, useState, useCallback, useMemo } from 'react';
+import { ListBox, ListBoxItem, Text } from 'react-aria-components';
+import clsx from 'clsx';
+import { Checkbox } from '../../../../forms/elements/checkbox/checkbox.js';
+import { SearchField } from '../../../../forms/fields/search-field/search-field.js';
+import { FormattedMessage } from '../../../../intl/formatted-message.js';
+import { useFormattedMessage } from '../../../../intl/use-formatted-message.js';
+import { Message } from '../../../../message/message.js';
+import { useFetchPagedShipToAddresses } from '../../../../shared/api/storefront/hooks/customer/use-fetch-paged-ship-to-addresses.js';
+import { UnauthorizedRequestError } from '../../../../shared/fetch/request.js';
+import { HighlightText } from '../../../../text/highlight-text/highlight-text.js';
+import styles from './address-book-selector.module.css.js';
+
+const DEFAULT_PAGE_SIZE = 20;
+function AddressBookSelector({ 
+// billToId,
+className, currentShipToId, }) {
+    const t = useFormattedMessage();
+    const listBoxRef = useRef(null);
+    const [selectedAddressId, setSelectedAddressId] = useState(currentShipToId);
+    const [search, setSearch] = useState('');
+    const [page] = useState(1);
+    const { data, error, isFetching } = useFetchPagedShipToAddresses({
+        page,
+        pageSize: DEFAULT_PAGE_SIZE,
+        search,
+    });
+    const hasMoreResults = !isFetching &&
+        data?.pagination &&
+        data.pagination.totalItemCount > DEFAULT_PAGE_SIZE;
+    const onAddressSelectionChanged = useCallback((key) => {
+        if (key && key !== 'undefined' && key !== '') {
+            setSelectedAddressId(String(key));
+        }
+    }, []);
+    const [listBoxItems, rerenderKey] = useMemo(() => {
+        const listBoxItems = [...(data?.shipTos || [])];
+        if (error instanceof UnauthorizedRequestError) {
+            listBoxItems.push({
+                id: 'message',
+                message: t('You are not authorized to view addresses. Please log in or contact support.'),
+                type: 'danger',
+            });
+        }
+        else if (error) {
+            listBoxItems.push({
+                id: 'message',
+                message: t('An error occurred while fetching addresses. Please try again later.'),
+                type: 'danger',
+            });
+        }
+        else if (hasMoreResults) {
+            listBoxItems.push({
+                id: 'message',
+                message: t('There are more addresses, please refine your search if needed.'),
+                type: 'warning',
+            });
+        }
+        return [
+            listBoxItems,
+            Math.random().toString(36).slice(2, 15) + currentShipToId,
+        ];
+    }, [data?.shipTos, error, hasMoreResults, t, currentShipToId]);
+    return (jsxs("div", { className: clsx(styles['address-book-selector-container'], className), children: [jsx(SearchField, { autoFocus: true, isDebounced: true, "aria-controls": "filtered-address-results-list", isDisabled: isFetching, isLoading: isFetching, label: t('Search addresses'), onChange: setSearch, onKeyUp: ({ key }) => {
+                    if (key === 'ArrowDown') {
+                        listBoxRef.current?.focus();
+                    }
+                }, placeholder: t('Search addresses'), showLabel: false, size: "md", value: search, variant: "outline" }), jsx(ListBox, { ref: listBoxRef, "aria-label": "List of addresses", "aria-live": "polite", className: styles['list-box'], id: "filtered-address-results-list", items: listBoxItems, onSelectionChange: keys => onAddressSelectionChanged(String([...keys][0])), renderEmptyState: () => !isFetching && (jsx(Message, { type: "info", children: jsx(FormattedMessage, { id: "Address not found" }) })), selectedKeys: selectedAddressId ? [selectedAddressId] : [], selectionBehavior: "replace", selectionMode: "single", children: listBoxItem => 'type' in listBoxItem ? (jsx(ListBoxItem, { isDisabled: true, textValue: listBoxItem.id, children: jsx(Message, { type: listBoxItem.type, children: jsx(Text, { slot: "description", children: listBoxItem.message }) }) }, "marker")) : (jsxs(ListBoxItem, { className: styles['list-box-item'], id: listBoxItem.id, textValue: listBoxItem.id, children: [jsx(Checkbox, { isReadOnly: true, isSelected: selectedAddressId === listBoxItem.id }), jsxs("div", { className: styles['list-box-item-content'], children: [jsx(Text, { slot: "label", children: jsx("div", { className: styles['company-name'], children: jsx(HighlightText, { className: styles['company-name-text'], highlightText: search, text: `${listBoxItem.address1} ${listBoxItem.address2 || ''}`.trim() }) }) }), jsxs(Text, { slot: "description", children: [jsx("div", { children: jsx(HighlightText, { highlightText: search, text: [listBoxItem.companyName, listBoxItem.customerName]
+                                                    .filter(Boolean)
+                                                    .join(', ') }) }), jsx("div", { children: jsx(HighlightText, { highlightText: search, text: [
+                                                    listBoxItem.city,
+                                                    listBoxItem.postalCode,
+                                                    listBoxItem.country?.name,
+                                                ]
+                                                    .filter(Boolean)
+                                                    .join(', ') }) })] })] })] }, `${listBoxItem.id}-${selectedAddressId === listBoxItem.id}`)) }, `${rerenderKey}-${selectedAddressId}`), selectedAddressId && (jsx("input", { name: "selectedShipToId", type: "hidden", value: selectedAddressId }))] }));
+}
+
+export { AddressBookSelector };

package/dist/pages/checkout/shipping-page/components/address-book-selector.module.css.js

@@ -0,0 +1,3 @@
+var styles = {"address-book-selector-container":"address-book-selector-module-vK8zS","list-box":"address-book-selector-module-l-Ld-","list-box-item":"address-book-selector-module-mdKrg","list-box-item-content":"address-book-selector-module-ApSjS","company-name":"address-book-selector-module-sWeiG","company-name-text":"address-book-selector-module-txXx3"};
+
+export { styles as default };

package/dist/pages/checkout/shipping-page/components/readonly-address.d.ts

@@ -1,11 +1,17 @@
-import { BillToModel, ShipToModel } from '../../../../shared/api/storefront/model/storefront.model';
-export declare function ReadOnlyAddresses({ billTo, isLoading, isPickup, notes, onSubmit, shipTo, }: {
+import { BillToModel, PatchCartModel, PostShipToModel, ShipToModel } from '../../../../shared/api/storefront/model/storefront.model';
+import { Country } from '../../../../shared/model/countries-languages';
+export declare function ReadOnlyAddresses({ billTo, cartId, countries, currentCountry, isLoading, isPickup, notes, onSubmit, shipTo, }: {
     billTo: BillToModel | undefined | null;
+    cartId: string;
+    countries: Country[];
+    currentCountry?: Country | undefined;
     isLoading: boolean;
     isPickup: boolean;
     notes: string | undefined;
-    onSubmit: ({ notes }: {
+    onSubmit: (args: {
+        cart?: PatchCartModel;
         notes: string | undefined;
+        shipTo?: PostShipToModel;
     }) => void;
     shipTo: ShipToModel | undefined | null;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/pages/checkout/shipping-page/components/readonly-address.js

@@ -1,73 +1,123 @@
 "use client";
-import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
+import { jsxs, jsx } from 'react/jsx-runtime';
 import { Form } from 'react-aria-components';
 import { AddressInfoDisplay } from '../../../../address-info-display/address-info-display.js';
-import { Link } from '../../../../buttons/link/link.js';
-import { Checkbox } from '../../../../forms/elements/checkbox/checkbox.js';
 import { TextField } from '../../../../forms/fields/text-field/text-field.js';
+import { AddressForm } from '../../../../forms/partials/address-form/address-form.js';
 import { FormattedMessage } from '../../../../intl/formatted-message.js';
 import { useFormattedMessage } from '../../../../intl/use-formatted-message.js';
-import { useLocation } from '../../../../shared/routing/use-location.js';
-import { usePaths } from '../../../../shared/routing/use-paths.js';
-import { environment } from '../../../../shared/utils/environment.js';
 import { CheckoutPageSection } from '../../layouts/checkout-page-layout/components/checkout-page-section.js';
 import { CheckoutPageSectionContent } from '../../layouts/checkout-page-layout/components/checkout-page-section-content.js';
-import { CheckoutPageSectionLink } from '../../layouts/checkout-page-layout/components/checkout-page-section-link.js';
+import { AddressBookSelector } from './address-book-selector.js';
 import { EDIT_ADDRESS_FORM_ID } from './edit-checkout-bill-to-address-form.js';
+import ShipToModeSelector from './ship-to-mode-selector.js';
 import { SonicAddress } from './sonic-address.js';
 import styles from './readonly-address.module.css.js';
 
-function ReadOnlyAddresses({ billTo, isLoading, isPickup, notes, onSubmit, shipTo, }) {
+function ReadOnlyAddresses({ billTo, cartId, countries, currentCountry, isLoading, isPickup, notes, onSubmit, shipTo, }) {
     const t = useFormattedMessage();
-    const paths = usePaths();
-    const { pathname, search } = useLocation();
-    const href = `${pathname}${search}`;
     const billToId = billTo?.id;
     const shipToId = shipTo?.id;
     const isShipToABillToAddress = billToId && shipToId && billToId === shipToId;
-    const editBillToAddressUrl = environment.includes('next')
-        ? `${paths.ACCOUNT_EDIT_BILL_TO_ADDRESS}/${billToId}?returnUrl=${encodeURIComponent(href)}`
-        : paths.ACCOUNT_ADDRESSES;
-    const editShipToAddressUrl = environment.includes('next')
-        ? isShipToABillToAddress
-            ? `${paths.ACCOUNT_EDIT_BILL_TO_ADDRESS}/${billToId}${paths.ACCOUNT_EDIT_SHIP_TO_ADDRESS}/new?returnUrl=${encodeURIComponent(href)}&makeDefault=true`
-            : `${paths.ACCOUNT_EDIT_BILL_TO_ADDRESS}/${billToId}${paths.ACCOUNT_EDIT_SHIP_TO_ADDRESS}/${shipToId}?returnUrl=${encodeURIComponent(href)}`
-        : paths.ACCOUNT_ADDRESSES;
-    return (jsxs(Form, { id: EDIT_ADDRESS_FORM_ID, onSubmit: e => {
-            e.preventDefault();
-            const formData = new FormData(e.currentTarget);
-            onSubmit({
-                notes: notes === formData.get('notes')
-                    ? undefined
-                    : formData.get('notes')?.toString() || '',
-            });
-        }, children: [jsxs(CheckoutPageSection, { title: jsx(FormattedMessage, { id: "Billing address" }), children: [jsx(CheckoutPageSectionLink, { children: jsxs(Link, { color: "secondary", href: editBillToAddressUrl, isDisabled: isLoading, children: [jsx(FormattedMessage, { id: "Edit billing address" }), " >"] }) }), jsxs(CheckoutPageSectionContent, { children: [billTo && (jsx(AddressInfoDisplay, { address: {
-                                    address1: billTo.address1,
-                                    address2: billTo.address2,
-                                    address3: billTo.address3,
-                                    attention: billTo.attention,
-                                    city: billTo.city,
-                                    companyName: billTo.companyName,
-                                    country: billTo.country,
-                                    email: billTo.email,
-                                    firstName: billTo.firstName,
-                                    lastName: billTo.lastName,
-                                    phone: billTo.phone,
-                                    postalCode: billTo.postalCode,
-                                }, "data-test-selector": "billToAddress" })), jsx("div", { className: styles.notes, children: jsx(TextField, { defaultValue: notes, isDisabled: isLoading, isMultiline: true, label: t('Add order notes'), name: "notes", rows: 3, showLabel: true }) })] })] }), jsxs(CheckoutPageSection, { title: jsx(FormattedMessage, { id: isPickup ? 'Pickup address' : 'Shipping address' }), children: [!isPickup && (jsx(CheckoutPageSectionLink, { children: jsxs(Link, { color: "secondary", href: editShipToAddressUrl, isDisabled: isLoading, children: [jsx(FormattedMessage, { id: "Edit shipping address" }), " >"] }) })), jsx(CheckoutPageSectionContent, { children: isPickup ? (jsx(SonicAddress, {})) : (jsxs(Fragment, { children: [jsx(Checkbox, { className: styles['use-invoice-checkbox'], "data-test-selector": "checkboxUseBillingAddress", isDisabled: true, isSelected: true, children: jsx(FormattedMessage, { id: "Use billing address" }) }), shipTo && (jsx(AddressInfoDisplay, { address: {
-                                        address1: shipTo.address1,
-                                        address2: shipTo.address2,
-                                        address3: shipTo.address3,
-                                        attention: shipTo.attention,
-                                        city: shipTo.city,
-                                        companyName: shipTo.companyName,
-                                        country: shipTo.country,
-                                        email: shipTo.email,
-                                        firstName: shipTo.firstName,
-                                        lastName: shipTo.lastName,
-                                        phone: shipTo.phone,
-                                        postalCode: shipTo.postalCode,
-                                    }, "data-test-selector": "shipToAddress" }))] })) })] })] }));
+    const onSubmitHandler = (event) => {
+        event.preventDefault();
+        const formData = new FormData(event.currentTarget);
+        const shippingType = formData
+            .get('shippingType')
+            ?.toString();
+        switch (shippingType) {
+            case 'selectFromAddressBook': {
+                const selectedShipToId = formData.get('selectedShipToId')?.toString();
+                if (!selectedShipToId) {
+                    return;
+                }
+                onSubmit({
+                    cart: {
+                        id: cartId,
+                        shipTo: { id: selectedShipToId },
+                    },
+                    notes: notes === formData.get('notes')
+                        ? undefined
+                        : formData.get('notes')?.toString() || '',
+                });
+                break;
+            }
+            case 'useNewAddress': {
+                const countryFormValue = formData.get('countrySelect')?.toString();
+                const country = countries.find(country => country.id === countryFormValue);
+                if (!country)
+                    throw new Error(`Country not found ${formData.get('country')}`);
+                const shipToUpdate = {
+                    address1: formData.get('address1')?.toString() || '',
+                    address2: formData.get('address2')?.toString() || '',
+                    address3: formData.get('address3')?.toString() || '',
+                    attention: formData.get('attention')?.toString() || '',
+                    city: formData.get('city')?.toString() || '',
+                    companyName: formData.get('companyName')?.toString() || '',
+                    country,
+                    email: formData.get('email')?.toString() || '',
+                    firstName: formData.get('firstName')?.toString() || '',
+                    isNew: true,
+                    lastName: formData.get('lastName')?.toString() || '',
+                    phone: formData.get('phone')?.toString() || '',
+                    postalCode: formData.get('postalCode')?.toString() || '',
+                };
+                onSubmit({
+                    notes: notes === formData.get('notes')
+                        ? undefined
+                        : formData.get('notes')?.toString() || '',
+                    shipTo: shipToUpdate,
+                });
+                break;
+            }
+            case 'useBillTo': {
+                const country = countries.find(country => country.id === billTo.country.id);
+                if (!country)
+                    throw new Error(`Country not found ${formData.get('country')}`);
+                onSubmit({
+                    cart: {
+                        id: cartId,
+                        shipTo: null,
+                    },
+                    notes: notes === formData.get('notes')
+                        ? undefined
+                        : formData.get('notes')?.toString() || '',
+                });
+                break;
+            }
+        }
+    };
+    return (jsxs(Form, { id: EDIT_ADDRESS_FORM_ID, onSubmit: onSubmitHandler, children: [jsx(CheckoutPageSection, { title: jsx(FormattedMessage, { id: "Billing address" }), children: jsxs(CheckoutPageSectionContent, { children: [billTo && (jsx(AddressInfoDisplay, { address: {
+                                address1: billTo.address1,
+                                address2: billTo.address2,
+                                address3: billTo.address3,
+                                attention: billTo.attention,
+                                city: billTo.city,
+                                companyName: billTo.companyName,
+                                country: billTo.country,
+                                email: billTo.email,
+                                firstName: billTo.firstName,
+                                lastName: billTo.lastName,
+                                phone: billTo.phone,
+                                postalCode: billTo.postalCode,
+                            }, "data-test-selector": "billToAddress" })), jsx("div", { className: styles.notes, children: jsx(TextField, { defaultValue: notes, isDisabled: isLoading, isMultiline: true, label: t('Add order notes'), name: "notes", rows: 3, showLabel: true }) })] }) }), jsx(CheckoutPageSection, { title: jsx(FormattedMessage, { id: isPickup ? 'Pickup address' : 'Shipping address' }), children: jsx(CheckoutPageSectionContent, { stretch: true, children: isPickup ? (jsx(SonicAddress, {})) : (jsx(ShipToModeSelector, { addressBookSelector: billTo?.id && (jsx("div", { className: styles['address-book-selector'], children: jsx(AddressBookSelector, { billToId: billTo.id, currentShipToId: shipTo?.id }) })), defaultShippingOption: isShipToABillToAddress
+                            ? 'useBillTo'
+                            : shipTo
+                                ? 'selectFromAddressBook'
+                                : 'useNewAddress', newAddressForm: jsx("div", { className: styles['new-address-form'], children: jsx(AddressForm, { address: shipTo, countries: countries, currentCountry: currentCountry }) }), shipToInfoDisplay: shipTo && (jsx("div", { className: styles['ship-to-info-display'], children: jsx(AddressInfoDisplay, { address: {
+                                    address1: shipTo.address1,
+                                    address2: shipTo.address2,
+                                    address3: shipTo.address3,
+                                    attention: shipTo.attention,
+                                    city: shipTo.city,
+                                    companyName: shipTo.companyName,
+                                    country: shipTo.country,
+                                    email: shipTo.email,
+                                    firstName: shipTo.firstName,
+                                    lastName: shipTo.lastName,
+                                    phone: shipTo.phone,
+                                    postalCode: shipTo.postalCode,
+                                }, "data-test-selector": "shipToAddress" }) })) })) }) })] }));
 }
 
 export { ReadOnlyAddresses };

package/dist/pages/checkout/shipping-page/components/readonly-address.module.css.js

@@ -1,3 +1,3 @@
-var styles = {"notes":"readonly-address-module-1hAQK","use-invoice-checkbox":"readonly-address-module-jMyJ-"};
+var styles = {"notes":"readonly-address-module-1hAQK","ship-to-info-display":"readonly-address-module-1bMRB","address-book-selector":"readonly-address-module-8Y-8n","new-address-form":"readonly-address-module-p6QoO"};
 
 export { styles as default };

package/dist/pages/checkout/shipping-page/components/ship-to-mode-selector.d.ts

@@ -0,0 +1,8 @@
+export type ShippingOption = 'useBillTo' | 'selectFromAddressBook' | 'useNewAddress';
+export type ShipToSelectorProps = {
+    addressBookSelector?: React.ReactNode;
+    defaultShippingOption?: ShippingOption;
+    newAddressForm: React.ReactNode;
+    shipToInfoDisplay?: React.ReactNode;
+};
+export default function ShipToModeSelector(props: ShipToSelectorProps): import("react/jsx-runtime").JSX.Element;

package/dist/pages/checkout/shipping-page/components/ship-to-mode-selector.js

@@ -0,0 +1,25 @@
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import { useState } from 'react';
+import { SelectField } from '../../../../forms/fields/select-field/select-field.js';
+import { useFormattedMessage } from '../../../../intl/use-formatted-message.js';
+
+function ShipToModeSelector(props) {
+    const t = useFormattedMessage();
+    const [shippingOption, setShippingOption] = useState(props.defaultShippingOption ?? 'useBillTo');
+    const options = {
+        // @ts-expect-error - Translation key will be added to translation files
+        selectFromAddressBook: t('Select from address book'),
+        useBillTo: t('Use billing address'),
+        // useDefaultShipTo: t('Use default shipping address'),
+        useNewAddress: t('Use new address'),
+    };
+    const additionalComponentForShipping = {
+        selectFromAddressBook: props.addressBookSelector,
+        useBillTo: null,
+        // useDefaultShipTo: props.shipToInfoDisplay,
+        useNewAddress: props.newAddressForm,
+    }[shippingOption];
+    return (jsxs(Fragment, { children: [jsx(SelectField, { "data-test-selector": "order-history-filter", label: t('Shipping address'), name: "shippingType", onChange: setShippingOption, options: options, selectedOption: shippingOption, showLabel: false }), additionalComponentForShipping] }));
+}
+
+export { ShipToModeSelector as default };

package/dist/pages/checkout/shipping-page/hooks/use-patch-shipping-details.d.ts

@@ -8,6 +8,11 @@ export declare function usePatchShippingDetails(): {
         billTo?: PatchBillToModel;
         cart: PatchCartModel;
         notes: string | undefined;
+        shipTo?: Partial<Omit<import("../../../../shared/api/storefront/model/storefront.model").ShipToModel, "country"> & {
+            country?: import("../../../../shared/api/storefront/model/storefront.model").CountryModel | {
+                id: string;
+            } | null;
+        }>;
     }) => Promise<{
         patchedBillTo: BillToModel | undefined;
         patchedCart: CartModel | undefined;

package/dist/pages/checkout/shipping-page/hooks/use-patch-shipping-details.js

@@ -2,26 +2,41 @@
 import { patchCart } from '../../../../shared/api/bff/services/bff-service.js';
 import { useAwaitableMutation } from '../../../../shared/api/shared/hooks/use-awaitable-mutation.js';
 import { patchSession } from '../../../../shared/api/storefront/services/authentication-service.js';
-import { patchBillToAddress } from '../../../../shared/api/storefront/services/customer-service.js';
+import { postShipToAddress, patchBillToAddress } from '../../../../shared/api/storefront/services/customer-service.js';
 
 function usePatchShippingDetails() {
     return useAwaitableMutation({
-        mutationFn: async ({ billTo, cart, notes, }) => {
+        mutationFn: async ({ billTo, cart, notes, shipTo, }) => {
+            const postedShipTo = shipTo
+                ? await postShipToAddress({
+                    billToId: cart.billTo.id,
+                    shipTo,
+                })
+                : undefined;
             const patchedBillTo = billTo
                 ? await patchBillToAddress({ billTo })
                 : undefined;
-            const patchedSession = patchedBillTo
+            const patchedSession = patchedBillTo || cart.shipTo !== null
                 ? await patchSession({
                     session: {
-                        billTo: { id: patchedBillTo.id },
+                        billTo: patchedBillTo ? { id: patchedBillTo.id } : undefined,
                         customerWasUpdated: true,
-                        shipTo: { id: cart.shipTo?.id || patchedBillTo.id },
+                        shipTo: postedShipTo ? { id: postedShipTo.id } : undefined,
                     },
                 })
                 : undefined;
-            const patchedCart = patchedBillTo || notes !== undefined
+            const patchedCart = patchedBillTo ||
+                patchedSession ||
+                notes !== undefined ||
+                postedShipTo ||
+                cart.shipTo === null
                 ? await patchCart({
-                    cart: { ...cart, billTo: patchedBillTo, notes },
+                    cart: {
+                        ...cart,
+                        billTo: patchedBillTo || cart.billTo,
+                        notes,
+                        shipTo: postedShipTo ?? cart.shipTo ?? { id: cart.billTo.id },
+                    },
                 })
                 : undefined;
             return { patchedBillTo, patchedCart, patchedSession };

package/dist/pages/checkout/shipping-page/shipping-page.js

@@ -154,14 +154,26 @@ function ShippingPage() {
                 },
             });
             await refetchCart();
-        }, readOnlyAddress: jsx(ReadOnlyAddresses, { billTo: cart.billTo, isLoading: isPatching, isPickup: isPickup, notes: cart.notes, onSubmit: async ({ notes }) => {
+        }, readOnlyAddress: jsx(ReadOnlyAddresses, { billTo: cart.billTo, cartId: cart.id, countries: countries || [], currentCountry: currentCountry, isLoading: isPatching, isPickup: isPickup, notes: cart.notes, onSubmit: async ({ cart: updatedCart, notes, shipTo }) => {
                 if (!cart.billTo)
                     return;
-                if (notes === undefined) {
-                    navigate(paths.REVIEW_AND_SUBMIT);
+                if (notes ||
+                    cart.shipTo === null ||
+                    (shipTo && shipTo.id !== cart.shipTo?.id) ||
+                    (updatedCart &&
+                        (updatedCart.shipTo?.id !== cart.shipTo?.id ||
+                            updatedCart.shipTo === null))) {
+                    await patchShippingDetails({
+                        cart: {
+                            ...cart,
+                            ...updatedCart,
+                        },
+                        notes,
+                        shipTo,
+                    });
                 }
                 else {
-                    await patchShippingDetails({ cart, notes });
+                    navigate(paths.REVIEW_AND_SUBMIT);
                 }
                 dataLayer.push(createEcommerceEvent({
                     cart,

package/dist/shared/api/storefront/model/storefront.model.d.ts

@@ -1001,10 +1001,13 @@ export type PatchShipToModel = Partial<Omit<ShipToModel, 'country'> & {
 }> & {
     id: string;
 };
-export type PatchCartModel = Partial<Omit<CartModel, 'billTo'> & {
+export type PatchCartModel = Partial<Omit<Omit<CartModel, 'billTo'>, 'shipTo'> & {
     billTo?: PatchBillToModel | {
         id: string;
     } | null;
+    shipTo?: PatchShipToModel | {
+        id: string;
+    } | null;
 }> & {
     id: string;
 };

package/dist/styles.css

@@ -8100,6 +8100,93 @@ button.swiper-pagination-bullet {
     gap: var(--space-8);
   }
 
+.highlight-text-module-e6Irk {
+  background-color: var(--highlighted-text-bg-color, rgb(109 170 200 / 40%));
+}
+
+.address-book-selector-module-vK8zS {
+  display: grid;
+  block-size: 100%;
+  gap: var(--space-8);
+  grid-template-rows: min-content 1fr;
+}
+
+.address-book-selector-module-l-Ld- {
+  box-sizing: border-box;
+  border: 1.5px solid var(--color-brand-medium-gray);
+  border-radius: var(--border-radius-8);
+  block-size: 100%;
+  inline-size: 100%;
+  overflow-y: scroll;
+}
+
+.address-book-selector-module-mdKrg {
+  position: relative;
+  display: flex;
+  box-sizing: border-box;
+  flex-direction: row;
+  padding: var(--space-4) var(--space-12);
+  -moz-column-gap: 16px;
+       column-gap: 16px;
+  cursor: pointer;
+}
+
+.address-book-selector-module-mdKrg .address-book-selector-module-ApSjS {
+    flex-grow: 1;
+  }
+
+.address-book-selector-module-mdKrg::after {
+    position: absolute;
+    display: block;
+    background: var(--color-brand-light-gray);
+    block-size: 1.5px;
+    content: '';
+    inset: auto 12px 0;
+  }
+
+.address-book-selector-module-mdKrg .address-book-selector-module-mabQ4 {
+    width: 16px;
+    height: 16px;
+    color: var(--color-brand-primary);
+  }
+
+.address-book-selector-module-mdKrg [slot='label'] {
+    display: flex;
+    width: 100%;
+    flex-direction: column;
+  }
+
+.address-book-selector-module-mdKrg [slot='label'] .address-book-selector-module-sWeiG {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      gap: var(--space-4);
+    }
+
+.address-book-selector-module-mdKrg [slot='label'] .address-book-selector-module-sWeiG .address-book-selector-module-txXx3 {
+        font-weight: bold;
+      }
+
+.address-book-selector-module-mdKrg:focus,
+  .address-book-selector-module-mdKrg:hover,
+  .address-book-selector-module-mdKrg:focus-visible {
+    outline: none;
+  }
+
+.address-book-selector-module-mdKrg:focus::before, .address-book-selector-module-mdKrg:hover::before, .address-book-selector-module-mdKrg:focus-visible::before {
+      position: absolute;
+      z-index: -1;
+      display: block;
+      background: color-mix(in srgb, var(--color-brand-red) 25%, white);
+      content: '';
+      inset: 0;
+      pointer-events: none;
+    }
+
+.address-book-selector-module-mdKrg:focus::after, .address-book-selector-module-mdKrg:hover::after, .address-book-selector-module-mdKrg:focus-visible::after {
+      display: none;
+    }
+
 .sonic-address-module-9Q9-Q {
   line-height: 1.5;
   white-space: pre;
@@ -8143,6 +8230,38 @@ button.swiper-pagination-bullet {
   margin-bottom: var(--space-12);
 }
 
+.readonly-address-module-1bMRB {
+  margin-top: var(--space-12);
+}
+
+.readonly-address-module-8Y-8n {
+  margin-top: var(--space-12);
+}
+
+.readonly-address-module-p6QoO {
+  display: grid;
+  margin-top: var(--space-12);
+  gap: var(--space-16);
+  grid-template-columns: auto;
+}
+
+.readonly-address-module-p6QoO .readonly-address-module-xkryv {
+    display: grid;
+  }
+
+@media (width >= 768px) {
+
+.readonly-address-module-p6QoO {
+    align-items: flex-start;
+    grid-template-columns: 1fr 1fr
+}
+
+    .readonly-address-module-p6QoO .readonly-address-module-xkryv {
+      display: grid;
+      grid-column: span 2;
+    }
+  }
+
 .shipping-page-module-v6oci {
   display: grid;
 }
@@ -8151,10 +8270,6 @@ button.swiper-pagination-bullet {
   color: var(--color-brand-red);
 }
 
-.highlight-text-module-e6Irk {
-  background-color: var(--highlighted-text-bg-color, rgb(109 170 200 / 40%));
-}
-
 .change-customer-module-2kOw4 {
   display: grid;
   block-size: 100%;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonic-equipment/ui",
-  "version": "258.0.4",
+  "version": "258.1.1",
   "type": "module",
   "license": "MIT",
   "engines": {