@sonic-equipment/ui 260.0.4 → 260.0.6

package/dist/pages/account/sign-in-page/sign-in-page.js

@@ -52,7 +52,10 @@ function SignInPage({ returnUrl } = {}) {
         setIsSuccess(true);
         navigate(returnUrl || paths.HOME, { reload: true });
     };
-    const allowGuestSignIn = returnUrl?.toLowerCase() === paths.CHECKOUT_SHIPPING.toLowerCase();
+    const decodedReturnUrl = returnUrl
+        ? decodeURIComponent(returnUrl).toLowerCase()
+        : undefined;
+    const allowGuestSignIn = !!decodedReturnUrl?.includes(paths.CHECKOUT_SHIPPING.toLowerCase());
     const createAccountPath = `${paths.ACCOUNT_CREATE}${returnUrl ? `?returnUrl=${encodeURIComponent(returnUrl)}` : ''}`;
     const onSignIn = ({ data }) => {
         resetSignIn();

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

@@ -11,8 +11,6 @@ import { CheckoutPageLayout } from '../layouts/checkout-page-layout/checkout-pag
 import { Page } from '../../components/page/page.js';
 import { ErrorPage } from '../../error-page/error-page.js';
 import { LoadingPage } from '../../loading-page/loading-page.js';
-import { useSaveCartForLater } from '../../../shared/api/bff/hooks/cart/use-save-cart-for-later.js';
-import { useIsAuthenticated } from '../../../shared/api/storefront/hooks/authentication/use-is-authenticated.js';
 import { useDeleteCartLineById } from '../../../shared/api/storefront/hooks/cart/use-delete-cart-line-by-id.js';
 import { useDeleteCurrentCart } from '../../../shared/api/storefront/hooks/cart/use-delete-current-cart.js';
 import { useFetchCurrentCartLinesWithAtp } from '../../../shared/api/storefront/hooks/cart/use-fetch-current-cart-lines-with-atp.js';
@@ -27,22 +25,22 @@ function CartContent({ cartLines }) {
     const paths = usePaths();
     const { addToast } = useToast();
     const { data: currentCart } = useFetchCurrentCartWithAtp();
-    const saveCartForLater = useSaveCartForLater({
-        onError: () => {
-            addToast({
-                body: jsx(FormattedMessage, { id: "Unable to save cart for later." }),
-                isUserDismissable: false,
-                messageType: 'danger',
-            });
-        },
-        onSuccess: () => {
-            addToast({
-                body: jsx(FormattedMessage, { id: "Saved cart for later." }),
-                isUserDismissable: false,
-                messageType: 'success',
-            });
-        },
-    });
+    // const saveCartForLater = useSaveCartForLater({
+    //   onError: () => {
+    //     addToast({
+    //       body: <FormattedMessage id="Unable to save cart for later." />,
+    //       isUserDismissable: false,
+    //       messageType: 'danger',
+    //     })
+    //   },
+    //   onSuccess: () => {
+    //     addToast({
+    //       body: <FormattedMessage id="Saved cart for later." />,
+    //       isUserDismissable: false,
+    //       messageType: 'success',
+    //     })
+    //   },
+    // })
     const deleteCurrentCart = useDeleteCurrentCart({
         onError: () => {
             addToast({
@@ -75,7 +73,7 @@ function CartContent({ cartLines }) {
             });
         },
     });
-    const isAuthenticated = useIsAuthenticated();
+    // const isAuthenticated = useIsAuthenticated()
     if (!currentCart)
         return null;
     const currencyCode = getCurrencyCodeBySymbol(currentCart.currencySymbol);
@@ -83,9 +81,25 @@ function CartContent({ cartLines }) {
         throw new Error(`Currency code not found for symbol ${currentCart.currencySymbol}`);
     return (jsx(CheckoutPageLayout, { actions: {
             primary: (jsx(Button, { withArrow: true, "data-test-selector": "checkoutShippingCartTotalContinueButton", href: paths.CHECKOUT_SHIPPING, children: jsx(FormattedMessage, { id: "Start checkout" }) })),
-            secondary: isAuthenticated ? (jsx(Button, { color: "secondary", "data-test-selector": "saveCartForLaterButton", onClick: () => {
-                    saveCartForLater.mutate({ cart: currentCart });
-                }, variant: "outline", children: jsx(FormattedMessage, { id: "Save order" }) })) : (jsx(Button, { color: "secondary", "data-test-selector": "saveCartForLaterButton", href: paths.SIGN_IN, variant: "outline", children: jsx(FormattedMessage, { id: "Save order" }) })),
+            // secondary: isAuthenticated ? (
+            //   <Button
+            //     color="secondary"
+            //     data-test-selector="saveCartForLaterButton"
+            //     onClick={() => {
+            //       saveCartForLater.mutate({ cart: currentCart })
+            //     }}
+            //     variant="outline">
+            //     <FormattedMessage id="Save order" />
+            //   </Button>
+            // ) : (
+            //   <Button
+            //     color="secondary"
+            //     data-test-selector="saveCartForLaterButton"
+            //     href={paths.SIGN_IN}
+            //     variant="outline">
+            //     <FormattedMessage id="Save order" />
+            //   </Button>
+            // ),
         }, mobileSummary: jsx(CartTotalsSummary, { currencyCode: currencyCode, totalAmount: currentCart.orderGrandTotal }), overview: jsx(CartTotals, { currencyCode: currencyCode, shippingCost: currentCart.shippingAndHandling, subtotal: currentCart.orderSubTotal, tax: currentCart.totalTax, total: currentCart.orderGrandTotal, vatPercentage: cartLines[0]?.pricing?.vatRate || 0 }), children: jsx(OrderLineList, { onRemoveAll: () => deleteCurrentCart.mutate(), children: cartLines.map(cartLine => (jsx(ConnectedOrderLineCard, { deliveryDate: cartLine.atp?.date ?? null, href: cartLine.productUri, image: {
                     fit: 'contain',
                     image: {

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

@@ -24,7 +24,7 @@ function ShippingPage() {
     const { createEcommerceEvent, dataLayer } = useDataLayer();
     const gaEventPushed = useRef(false);
     const { data: cart, error: errorFetchCart, isLoading: isLoadingCart, refetch: refetchCart, } = useFetchCurrentCart();
-    const { data: session } = useFetchSession();
+    const { data: session, isLoading: isLoadingSession } = useFetchSession();
     const hasNoBillToAddress = hasNo(cart?.billTo?.address1);
     const isGuest = Boolean(session?.isGuest);
     const { countries, currentCountry: selectedCountry, isFetching: isLoadingCountries, } = useCountries({
@@ -39,7 +39,10 @@ function ShippingPage() {
     const { isLoading: isPatchingSession, mutate: patchSession } = usePatchSession();
     const { error: errorPatchBillingAddress, isError, isLoading: isPatching, isSuccess, mutate: patchShippingDetails, } = usePatchShippingDetails();
     const isAuthenticated = session?.isAuthenticated;
-    const isLoading = isLoadingCart || isLoadingCountries || isLoadingFulfillmentMethods;
+    const isLoading = isLoadingCart ||
+        isLoadingCountries ||
+        isLoadingFulfillmentMethods ||
+        isLoadingSession;
     const { isNavigating, navigate } = useNavigate();
     const isPickup = Boolean(cart?.fulfillmentMethod.match(/pickup/i));
     useEffect(() => {
@@ -48,7 +51,9 @@ function ShippingPage() {
             return;
         if (isAuthenticated === undefined)
             return;
-        if (!isAuthenticated)
+        if (isLoading)
+            return;
+        if (isAuthenticated === false)
             return navigate(paths.CHECKOUT_SHIPPING_VIA_SIGNIN);
         if (hasNo(cart))
             return;
@@ -56,7 +61,7 @@ function ShippingPage() {
             return navigate(paths.CART);
         if (hasNo(cart.billTo))
             return navigate(paths.CHECKOUT_SHIPPING_VIA_SIGNIN);
-    }, [cart, navigate, isAuthenticated, isNavigating, paths]);
+    }, [cart, navigate, isAuthenticated, isNavigating, paths, isLoading]);
     useEffect(() => {
         /* Guards for when the bill to address is saved and we should navigate to the next page */
         if (isPatching)

package/package.json

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