@zonos/elements 1.3.251 → 1.3.253

package/dist/cjs/index.cjs.js

@@ -133,7 +133,7 @@ const getZonosQaUrl = () => {
         return null;
     }
     const qaUrl = extractZonosQaUrl(window.location.href);
-    const cdnUrl = "https://v1.3.251.js.zonos.com";
+    const cdnUrl = "https://v1.3.253.js.zonos.com";
     // when the qaUrl is not set and the built URL is from the test domain, use the test domain for testing
     if (!qaUrl &&
         (cdnUrl.includes('test.') ||
@@ -381,10 +381,10 @@ const zonosLoadUrl = (() => {
     return null;
 })();
 const startLoadTime = Date.now();
-const ZONOS_URL = "https://v1.3.251.js.zonos.com";
-const JS_DELIVR_ZONOS_URL = zonosLoadUrl || "https://cdn.jsdelivr.net/npm/@zonos/elements@1.3.251";
-const UNPKG_ZONOS_URL = "https://unpkg.com/@zonos/elements@1.3.251";
-const CDNJS_ZONOS_URL = "https://cdnjs.cloudflare.com/ajax/libs/zonos-elements/1.3.251";
+const ZONOS_URL = "https://v1.3.253.js.zonos.com";
+const JS_DELIVR_ZONOS_URL = zonosLoadUrl || "https://cdn.jsdelivr.net/npm/@zonos/elements@1.3.253";
+const UNPKG_ZONOS_URL = "https://unpkg.com/@zonos/elements@1.3.253";
+const CDNJS_ZONOS_URL = "https://cdnjs.cloudflare.com/ajax/libs/zonos-elements/1.3.253";
 const GOOGLE_FONT_URL = 'https://fonts.googleapis.com';
 const GOOGLE_FONT_REGEX = /^https:\/\/fonts\.googleapis\.com/;
 class Zonos {
@@ -402,7 +402,7 @@ Zonos.iframeLogType = typeof window !== 'undefined'
     ? new URLSearchParams(window.location.search).get('iframeLogType')
     : null;
 Zonos.isBigCommerce = false;
-Zonos.releaseDate = "1775502731069";
+Zonos.releaseDate = "1775689881541";
 Zonos.isLegacyCheckout = false;
 Zonos.googleAnalyticId = null;
 Zonos.googleAnalyticReady = false;
@@ -425,7 +425,7 @@ Zonos.isNpm = true;
 Zonos.zonosQaUrl = null;
 Zonos.zonosQaUrlApi = null;
 Zonos.trackEventLogs = [];
-Zonos.version = `v${"1.3.251"}`;
+Zonos.version = `v${"1.3.253"}`;
 Zonos.modeAlerted = false;
 Zonos.cartData = null;
 Zonos.paypal = null;

package/dist/cjs/zonos-checkout.cjs.entry.js

@@ -138,6 +138,102 @@ providedCountryCode) => {
 };
 
 const FALLBACK_SHIP_TO_COUNTRY_SELECTOR = 'select[name="shippingAddress.countryCode"]';
+/**
+ * Fetch the checkout/cart ID from the BigCommerce Storefront Cart API.
+ * The `/checkout` page URL does not include the checkout ID, so we
+ * retrieve it from `/api/storefront/cart` which returns the active cart(s).
+ */
+const fetchCheckoutId = async () => {
+    var _a, _b;
+    try {
+        const response = await fetch('/api/storefront/cart', {
+            credentials: 'same-origin',
+            headers: {
+                Accept: 'application/json',
+            },
+        });
+        if (!response.ok) {
+            VarianceTest.log(`Failed to fetch BigCommerce cart: ${String(response.status)}`, 'error');
+            return null;
+        }
+        const carts = (await response.json());
+        return (_b = (_a = carts === null || carts === void 0 ? void 0 : carts[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null;
+    }
+    catch (error) {
+        handleFetch.logError('Error fetching BigCommerce cart data', error);
+        return null;
+    }
+};
+/**
+ * Fetch checkout data from the BigCommerce Storefront API.
+ * This API is cookie-authenticated (same-origin), so no token is needed.
+ */
+const fetchBigCommerceCheckout = async (checkoutId) => {
+    try {
+        const response = await fetch(`/api/storefront/checkouts/${checkoutId}`, {
+            credentials: 'same-origin',
+            headers: {
+                Accept: 'application/json',
+                'Content-Type': 'application/json',
+            },
+        });
+        if (!response.ok) {
+            VarianceTest.log(`Failed to fetch BigCommerce checkout: ${String(response.status)}`, 'error');
+            return null;
+        }
+        return (await response.json());
+    }
+    catch (error) {
+        handleFetch.logError('Error fetching BigCommerce checkout data', error);
+        return null;
+    }
+};
+/**
+ * Check if the logged-in user already has a shipping address on the checkout
+ * that is internationally shippable. If so, save the address to session
+ * and redirect to the home page to open the international checkout.
+ */
+const checkLoggedInUserShippingAddress = async ({ onInternationalCheckoutSelected, }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    const checkoutId = await fetchCheckoutId();
+    if (!checkoutId) {
+        return false;
+    }
+    const checkout = await fetchBigCommerceCheckout(checkoutId);
+    const shippingAddress = (_b = (_a = checkout === null || checkout === void 0 ? void 0 : checkout.consignments) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.shippingAddress;
+    if (!(shippingAddress === null || shippingAddress === void 0 ? void 0 : shippingAddress.countryCode)) {
+        return false;
+    }
+    const countryCode = shippingAddress.countryCode;
+    if (!isShippableCountry(false, countryCode)) {
+        return false;
+    }
+    VarianceTest.log(`Logged-in user has international shipping address: ${countryCode}, redirecting`, 'info');
+    if (onInternationalCheckoutSelected) {
+        await onInternationalCheckoutSelected();
+    }
+    // Update localization store with the detected country
+    localization.localizationStoreUpdateSelectedCountryCode({
+        isInitializing: false,
+        newSelectedCountryCode: countryCode,
+    });
+    // Save the shipping address to session storage for the international checkout
+    cart.stripeStoreSaveDomesticShippingSession({
+        address1: (_c = shippingAddress.address1) !== null && _c !== void 0 ? _c : '',
+        address2: (_d = shippingAddress.address2) !== null && _d !== void 0 ? _d : '',
+        city: (_e = shippingAddress.city) !== null && _e !== void 0 ? _e : '',
+        countryCode,
+        firstName: (_f = shippingAddress.firstName) !== null && _f !== void 0 ? _f : '',
+        lastName: (_g = shippingAddress.lastName) !== null && _g !== void 0 ? _g : '',
+        phone: (_h = shippingAddress.phone) !== null && _h !== void 0 ? _h : '',
+        postalCode: (_j = shippingAddress.postalCode) !== null && _j !== void 0 ? _j : '',
+        state: (_k = shippingAddress.stateOrProvince) !== null && _k !== void 0 ? _k : '',
+    });
+    // Redirect to home page — the home page will open the international checkout
+    // when it detects the domestic shipping session
+    window.location.href = '/';
+    return true;
+};
 /**
  * Watch for changes in domestic checkout step. Redirects user to home page to open international checkout when user selects a country in the international shipping zone.
  * @note Only works on default bigcommerce checkout page
@@ -200,7 +296,8 @@ const watchImmediateBigcommerceDomesticCheckoutRedirect = ({ domesticRedirectedB
     };
     let isProcessing = false;
     let intervalCreated = false;
-    const observer = new MutationObserver(() => {
+    let isCheckingLoggedInUserShippingAddress = false;
+    const observer = new MutationObserver(async () => {
         var _a;
         const domesticRedirectedButton = document.querySelector(domesticRedirectedBtnSelector);
         const shippingAddressSession = cart.stripeStoreGetDomesticShippingSession();
@@ -218,13 +315,35 @@ const watchImmediateBigcommerceDomesticCheckoutRedirect = ({ domesticRedirectedB
         }
         const isBigcommerceDomesticCheckoutPage = window.location.pathname.includes('/checkout') &&
             window.Zonos.isBigCommerce;
-        const shipToCountryElement = document.querySelector(((_a = zonosStore.zonosStore.genericSettings) === null || _a === void 0 ? void 0 : _a.bigcommerceDomesticCheckoutCountrySelector) ||
-            FALLBACK_SHIP_TO_COUNTRY_SELECTOR);
         // Should just disconnect the observer if it's not bigcommerce domestic checkout page
         if (!isBigcommerceDomesticCheckoutPage) {
             observer.disconnect();
             return;
         }
+        // For logged-in users, check if their saved address on the checkout is international
+        // before the shipping form is even rendered.
+        // Guard against repeated calls — the observer fires on every DOM mutation.
+        if (isCheckingLoggedInUserShippingAddress) {
+            return;
+        }
+        isCheckingLoggedInUserShippingAddress = true;
+        try {
+            const redirected = await checkLoggedInUserShippingAddress({
+                onInternationalCheckoutSelected,
+            });
+            if (redirected) {
+                observer.disconnect();
+                return;
+            }
+        }
+        catch (error) {
+            handleFetch.logError('Error checking logged-in user shipping address', error);
+        }
+        finally {
+            isCheckingLoggedInUserShippingAddress = false;
+        }
+        const shipToCountryElement = document.querySelector(((_a = zonosStore.zonosStore.genericSettings) === null || _a === void 0 ? void 0 : _a.bigcommerceDomesticCheckoutCountrySelector) ||
+            FALLBACK_SHIP_TO_COUNTRY_SELECTOR);
         // Shouldn't do anything if it's not bigcommerce domestic checkout page
         if (!shipToCountryElement) {
             // do nothing if shipping country and the continue button is not found
@@ -1923,6 +2042,14 @@ const ZonosCheckout = class {
                     zonosStore.zonosStore.sourceCurrency !== 'USD') {
                     return;
                 }
+                // Only redirect when checkout modal is opened
+                if (!this.open) {
+                    return;
+                }
+                // Check if the page is checkout page, if so, do nothing since they're already at the right page
+                if (window.location.pathname.includes('/checkout')) {
+                    return;
+                }
                 const shippingCountry = addressEventData.value.address.country;
                 if (shippingCountry &&
                     zonosStore.zonosStore.disabledCountries.includes(shippingCountry)) {

package/dist/collection/components/checkout/zonos-checkout/zonos-checkout.js

@@ -1490,6 +1490,14 @@ export class ZonosCheckout {
                     zonosStore.sourceCurrency !== 'USD') {
                     return;
                 }
+                // Only redirect when checkout modal is opened
+                if (!this.open) {
+                    return;
+                }
+                // Check if the page is checkout page, if so, do nothing since they're already at the right page
+                if (window.location.pathname.includes('/checkout')) {
+                    return;
+                }
                 const shippingCountry = addressEventData.value.address.country;
                 if (shippingCountry &&
                     zonosStore.disabledCountries.includes(shippingCountry)) {

package/dist/collection/components/utils/checkout/watchImmediateBigcommerceDomesticCheckoutRedirect.js

@@ -3,7 +3,104 @@ import { localizationStoreUpdateSelectedCountryCode } from "../../store/hello/lo
 import { zonosStore } from "../../store/zonosStore";
 import { isShippableCountry } from "./isShippableCountry";
 import { log } from "../logging/log";
+import { logError } from "../logging/logError";
 const FALLBACK_SHIP_TO_COUNTRY_SELECTOR = 'select[name="shippingAddress.countryCode"]';
+/**
+ * Fetch the checkout/cart ID from the BigCommerce Storefront Cart API.
+ * The `/checkout` page URL does not include the checkout ID, so we
+ * retrieve it from `/api/storefront/cart` which returns the active cart(s).
+ */
+const fetchCheckoutId = async () => {
+    var _a, _b;
+    try {
+        const response = await fetch('/api/storefront/cart', {
+            credentials: 'same-origin',
+            headers: {
+                Accept: 'application/json',
+            },
+        });
+        if (!response.ok) {
+            log(`Failed to fetch BigCommerce cart: ${String(response.status)}`, 'error');
+            return null;
+        }
+        const carts = (await response.json());
+        return (_b = (_a = carts === null || carts === void 0 ? void 0 : carts[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null;
+    }
+    catch (error) {
+        logError('Error fetching BigCommerce cart data', error);
+        return null;
+    }
+};
+/**
+ * Fetch checkout data from the BigCommerce Storefront API.
+ * This API is cookie-authenticated (same-origin), so no token is needed.
+ */
+const fetchBigCommerceCheckout = async (checkoutId) => {
+    try {
+        const response = await fetch(`/api/storefront/checkouts/${checkoutId}`, {
+            credentials: 'same-origin',
+            headers: {
+                Accept: 'application/json',
+                'Content-Type': 'application/json',
+            },
+        });
+        if (!response.ok) {
+            log(`Failed to fetch BigCommerce checkout: ${String(response.status)}`, 'error');
+            return null;
+        }
+        return (await response.json());
+    }
+    catch (error) {
+        logError('Error fetching BigCommerce checkout data', error);
+        return null;
+    }
+};
+/**
+ * Check if the logged-in user already has a shipping address on the checkout
+ * that is internationally shippable. If so, save the address to session
+ * and redirect to the home page to open the international checkout.
+ */
+const checkLoggedInUserShippingAddress = async ({ onInternationalCheckoutSelected, }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    const checkoutId = await fetchCheckoutId();
+    if (!checkoutId) {
+        return false;
+    }
+    const checkout = await fetchBigCommerceCheckout(checkoutId);
+    const shippingAddress = (_b = (_a = checkout === null || checkout === void 0 ? void 0 : checkout.consignments) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.shippingAddress;
+    if (!(shippingAddress === null || shippingAddress === void 0 ? void 0 : shippingAddress.countryCode)) {
+        return false;
+    }
+    const countryCode = shippingAddress.countryCode;
+    if (!isShippableCountry(false, countryCode)) {
+        return false;
+    }
+    log(`Logged-in user has international shipping address: ${countryCode}, redirecting`, 'info');
+    if (onInternationalCheckoutSelected) {
+        await onInternationalCheckoutSelected();
+    }
+    // Update localization store with the detected country
+    localizationStoreUpdateSelectedCountryCode({
+        isInitializing: false,
+        newSelectedCountryCode: countryCode,
+    });
+    // Save the shipping address to session storage for the international checkout
+    stripeStoreSaveDomesticShippingSession({
+        address1: (_c = shippingAddress.address1) !== null && _c !== void 0 ? _c : '',
+        address2: (_d = shippingAddress.address2) !== null && _d !== void 0 ? _d : '',
+        city: (_e = shippingAddress.city) !== null && _e !== void 0 ? _e : '',
+        countryCode,
+        firstName: (_f = shippingAddress.firstName) !== null && _f !== void 0 ? _f : '',
+        lastName: (_g = shippingAddress.lastName) !== null && _g !== void 0 ? _g : '',
+        phone: (_h = shippingAddress.phone) !== null && _h !== void 0 ? _h : '',
+        postalCode: (_j = shippingAddress.postalCode) !== null && _j !== void 0 ? _j : '',
+        state: (_k = shippingAddress.stateOrProvince) !== null && _k !== void 0 ? _k : '',
+    });
+    // Redirect to home page — the home page will open the international checkout
+    // when it detects the domestic shipping session
+    window.location.href = '/';
+    return true;
+};
 /**
  * Watch for changes in domestic checkout step. Redirects user to home page to open international checkout when user selects a country in the international shipping zone.
  * @note Only works on default bigcommerce checkout page
@@ -66,7 +163,8 @@ export const watchImmediateBigcommerceDomesticCheckoutRedirect = ({ domesticRedi
     };
     let isProcessing = false;
     let intervalCreated = false;
-    const observer = new MutationObserver(() => {
+    let isCheckingLoggedInUserShippingAddress = false;
+    const observer = new MutationObserver(async () => {
         var _a;
         const domesticRedirectedButton = document.querySelector(domesticRedirectedBtnSelector);
         const shippingAddressSession = stripeStoreGetDomesticShippingSession();
@@ -84,13 +182,35 @@ export const watchImmediateBigcommerceDomesticCheckoutRedirect = ({ domesticRedi
         }
         const isBigcommerceDomesticCheckoutPage = window.location.pathname.includes('/checkout') &&
             window.Zonos.isBigCommerce;
-        const shipToCountryElement = document.querySelector(((_a = zonosStore.genericSettings) === null || _a === void 0 ? void 0 : _a.bigcommerceDomesticCheckoutCountrySelector) ||
-            FALLBACK_SHIP_TO_COUNTRY_SELECTOR);
         // Should just disconnect the observer if it's not bigcommerce domestic checkout page
         if (!isBigcommerceDomesticCheckoutPage) {
             observer.disconnect();
             return;
         }
+        // For logged-in users, check if their saved address on the checkout is international
+        // before the shipping form is even rendered.
+        // Guard against repeated calls — the observer fires on every DOM mutation.
+        if (isCheckingLoggedInUserShippingAddress) {
+            return;
+        }
+        isCheckingLoggedInUserShippingAddress = true;
+        try {
+            const redirected = await checkLoggedInUserShippingAddress({
+                onInternationalCheckoutSelected,
+            });
+            if (redirected) {
+                observer.disconnect();
+                return;
+            }
+        }
+        catch (error) {
+            logError('Error checking logged-in user shipping address', error);
+        }
+        finally {
+            isCheckingLoggedInUserShippingAddress = false;
+        }
+        const shipToCountryElement = document.querySelector(((_a = zonosStore.genericSettings) === null || _a === void 0 ? void 0 : _a.bigcommerceDomesticCheckoutCountrySelector) ||
+            FALLBACK_SHIP_TO_COUNTRY_SELECTOR);
         // Shouldn't do anything if it's not bigcommerce domestic checkout page
         if (!shipToCountryElement) {
             // do nothing if shipping country and the continue button is not found

package/dist/esm/index.js

@@ -131,7 +131,7 @@ const getZonosQaUrl = () => {
         return null;
     }
     const qaUrl = extractZonosQaUrl(window.location.href);
-    const cdnUrl = "https://v1.3.251.js.zonos.com";
+    const cdnUrl = "https://v1.3.253.js.zonos.com";
     // when the qaUrl is not set and the built URL is from the test domain, use the test domain for testing
     if (!qaUrl &&
         (cdnUrl.includes('test.') ||
@@ -379,10 +379,10 @@ const zonosLoadUrl = (() => {
     return null;
 })();
 const startLoadTime = Date.now();
-const ZONOS_URL = "https://v1.3.251.js.zonos.com";
-const JS_DELIVR_ZONOS_URL = zonosLoadUrl || "https://cdn.jsdelivr.net/npm/@zonos/elements@1.3.251";
-const UNPKG_ZONOS_URL = "https://unpkg.com/@zonos/elements@1.3.251";
-const CDNJS_ZONOS_URL = "https://cdnjs.cloudflare.com/ajax/libs/zonos-elements/1.3.251";
+const ZONOS_URL = "https://v1.3.253.js.zonos.com";
+const JS_DELIVR_ZONOS_URL = zonosLoadUrl || "https://cdn.jsdelivr.net/npm/@zonos/elements@1.3.253";
+const UNPKG_ZONOS_URL = "https://unpkg.com/@zonos/elements@1.3.253";
+const CDNJS_ZONOS_URL = "https://cdnjs.cloudflare.com/ajax/libs/zonos-elements/1.3.253";
 const GOOGLE_FONT_URL = 'https://fonts.googleapis.com';
 const GOOGLE_FONT_REGEX = /^https:\/\/fonts\.googleapis\.com/;
 class Zonos {
@@ -400,7 +400,7 @@ Zonos.iframeLogType = typeof window !== 'undefined'
     ? new URLSearchParams(window.location.search).get('iframeLogType')
     : null;
 Zonos.isBigCommerce = false;
-Zonos.releaseDate = "1775502731069";
+Zonos.releaseDate = "1775689881541";
 Zonos.isLegacyCheckout = false;
 Zonos.googleAnalyticId = null;
 Zonos.googleAnalyticReady = false;
@@ -423,7 +423,7 @@ Zonos.isNpm = true;
 Zonos.zonosQaUrl = null;
 Zonos.zonosQaUrlApi = null;
 Zonos.trackEventLogs = [];
-Zonos.version = `v${"1.3.251"}`;
+Zonos.version = `v${"1.3.253"}`;
 Zonos.modeAlerted = false;
 Zonos.cartData = null;
 Zonos.paypal = null;

package/dist/esm/zonos-checkout.entry.js

@@ -4,7 +4,7 @@ import { p as paypalStoreHasPaypalEnabled, a as paypalStore, b as paypalInitScri
 import { f as filterValidTests, l as localizationStore, a as localizationStoreUpdateSelectedCountryCode, g as getZCountryUrlParam, s as storageStore, V as VARIANT_TEST_KEY_EXPIRATION, b as storageStoreSetEnabledVariantTestKeys, t as translate, c as localizationStoreOnChange, d as currencyFormat } from './localization-0ebc8356.js';
 import { z as zonosStore, g as getZonosStoreTheme, m as mergeConfig } from './zonosStore-5242a58d.js';
 import { b as buildCartItemsByTempCart } from './buildCartItemsByTempCart-a117f75d.js';
-import { h as handleFetch, b as getAdditionalLogMetadata, g as getIsTestMode, l as logError, j as jsonParse, s as sendErrorLog, a as getIsStagingMode, i as isCheckoutMobile } from './handleFetch-a844cac1.js';
+import { h as handleFetch, l as logError, b as getAdditionalLogMetadata, g as getIsTestMode, j as jsonParse, s as sendErrorLog, a as getIsStagingMode, i as isCheckoutMobile } from './handleFetch-a844cac1.js';
 import { u as updateCheckoutSessionAttributes } from './updateCheckoutSessionAttributes-b9f7e982.js';
 import { _ as _getIsValidCartId, c as checkoutHiddenBtnSelector, a as checkoutHiddenInternationalBtnSelector, d as domesticRedirectedBtnSelector, g as getAbandonedCartRenewTokenValue } from './CheckoutConfig-724d7bae.js';
 import { l as log, g as getElapsedTime, b as allLogs } from './VarianceTest-572cecf5.js';
@@ -134,6 +134,102 @@ providedCountryCode) => {
 };
 
 const FALLBACK_SHIP_TO_COUNTRY_SELECTOR = 'select[name="shippingAddress.countryCode"]';
+/**
+ * Fetch the checkout/cart ID from the BigCommerce Storefront Cart API.
+ * The `/checkout` page URL does not include the checkout ID, so we
+ * retrieve it from `/api/storefront/cart` which returns the active cart(s).
+ */
+const fetchCheckoutId = async () => {
+    var _a, _b;
+    try {
+        const response = await fetch('/api/storefront/cart', {
+            credentials: 'same-origin',
+            headers: {
+                Accept: 'application/json',
+            },
+        });
+        if (!response.ok) {
+            log(`Failed to fetch BigCommerce cart: ${String(response.status)}`, 'error');
+            return null;
+        }
+        const carts = (await response.json());
+        return (_b = (_a = carts === null || carts === void 0 ? void 0 : carts[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null;
+    }
+    catch (error) {
+        logError('Error fetching BigCommerce cart data', error);
+        return null;
+    }
+};
+/**
+ * Fetch checkout data from the BigCommerce Storefront API.
+ * This API is cookie-authenticated (same-origin), so no token is needed.
+ */
+const fetchBigCommerceCheckout = async (checkoutId) => {
+    try {
+        const response = await fetch(`/api/storefront/checkouts/${checkoutId}`, {
+            credentials: 'same-origin',
+            headers: {
+                Accept: 'application/json',
+                'Content-Type': 'application/json',
+            },
+        });
+        if (!response.ok) {
+            log(`Failed to fetch BigCommerce checkout: ${String(response.status)}`, 'error');
+            return null;
+        }
+        return (await response.json());
+    }
+    catch (error) {
+        logError('Error fetching BigCommerce checkout data', error);
+        return null;
+    }
+};
+/**
+ * Check if the logged-in user already has a shipping address on the checkout
+ * that is internationally shippable. If so, save the address to session
+ * and redirect to the home page to open the international checkout.
+ */
+const checkLoggedInUserShippingAddress = async ({ onInternationalCheckoutSelected, }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    const checkoutId = await fetchCheckoutId();
+    if (!checkoutId) {
+        return false;
+    }
+    const checkout = await fetchBigCommerceCheckout(checkoutId);
+    const shippingAddress = (_b = (_a = checkout === null || checkout === void 0 ? void 0 : checkout.consignments) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.shippingAddress;
+    if (!(shippingAddress === null || shippingAddress === void 0 ? void 0 : shippingAddress.countryCode)) {
+        return false;
+    }
+    const countryCode = shippingAddress.countryCode;
+    if (!isShippableCountry(false, countryCode)) {
+        return false;
+    }
+    log(`Logged-in user has international shipping address: ${countryCode}, redirecting`, 'info');
+    if (onInternationalCheckoutSelected) {
+        await onInternationalCheckoutSelected();
+    }
+    // Update localization store with the detected country
+    localizationStoreUpdateSelectedCountryCode({
+        isInitializing: false,
+        newSelectedCountryCode: countryCode,
+    });
+    // Save the shipping address to session storage for the international checkout
+    stripeStoreSaveDomesticShippingSession({
+        address1: (_c = shippingAddress.address1) !== null && _c !== void 0 ? _c : '',
+        address2: (_d = shippingAddress.address2) !== null && _d !== void 0 ? _d : '',
+        city: (_e = shippingAddress.city) !== null && _e !== void 0 ? _e : '',
+        countryCode,
+        firstName: (_f = shippingAddress.firstName) !== null && _f !== void 0 ? _f : '',
+        lastName: (_g = shippingAddress.lastName) !== null && _g !== void 0 ? _g : '',
+        phone: (_h = shippingAddress.phone) !== null && _h !== void 0 ? _h : '',
+        postalCode: (_j = shippingAddress.postalCode) !== null && _j !== void 0 ? _j : '',
+        state: (_k = shippingAddress.stateOrProvince) !== null && _k !== void 0 ? _k : '',
+    });
+    // Redirect to home page — the home page will open the international checkout
+    // when it detects the domestic shipping session
+    window.location.href = '/';
+    return true;
+};
 /**
  * Watch for changes in domestic checkout step. Redirects user to home page to open international checkout when user selects a country in the international shipping zone.
  * @note Only works on default bigcommerce checkout page
@@ -196,7 +292,8 @@ const watchImmediateBigcommerceDomesticCheckoutRedirect = ({ domesticRedirectedB
     };
     let isProcessing = false;
     let intervalCreated = false;
-    const observer = new MutationObserver(() => {
+    let isCheckingLoggedInUserShippingAddress = false;
+    const observer = new MutationObserver(async () => {
         var _a;
         const domesticRedirectedButton = document.querySelector(domesticRedirectedBtnSelector);
         const shippingAddressSession = stripeStoreGetDomesticShippingSession();
@@ -214,13 +311,35 @@ const watchImmediateBigcommerceDomesticCheckoutRedirect = ({ domesticRedirectedB
         }
         const isBigcommerceDomesticCheckoutPage = window.location.pathname.includes('/checkout') &&
             window.Zonos.isBigCommerce;
-        const shipToCountryElement = document.querySelector(((_a = zonosStore.genericSettings) === null || _a === void 0 ? void 0 : _a.bigcommerceDomesticCheckoutCountrySelector) ||
-            FALLBACK_SHIP_TO_COUNTRY_SELECTOR);
         // Should just disconnect the observer if it's not bigcommerce domestic checkout page
         if (!isBigcommerceDomesticCheckoutPage) {
             observer.disconnect();
             return;
         }
+        // For logged-in users, check if their saved address on the checkout is international
+        // before the shipping form is even rendered.
+        // Guard against repeated calls — the observer fires on every DOM mutation.
+        if (isCheckingLoggedInUserShippingAddress) {
+            return;
+        }
+        isCheckingLoggedInUserShippingAddress = true;
+        try {
+            const redirected = await checkLoggedInUserShippingAddress({
+                onInternationalCheckoutSelected,
+            });
+            if (redirected) {
+                observer.disconnect();
+                return;
+            }
+        }
+        catch (error) {
+            logError('Error checking logged-in user shipping address', error);
+        }
+        finally {
+            isCheckingLoggedInUserShippingAddress = false;
+        }
+        const shipToCountryElement = document.querySelector(((_a = zonosStore.genericSettings) === null || _a === void 0 ? void 0 : _a.bigcommerceDomesticCheckoutCountrySelector) ||
+            FALLBACK_SHIP_TO_COUNTRY_SELECTOR);
         // Shouldn't do anything if it's not bigcommerce domestic checkout page
         if (!shipToCountryElement) {
             // do nothing if shipping country and the continue button is not found
@@ -1919,6 +2038,14 @@ const ZonosCheckout = class {
                     zonosStore.sourceCurrency !== 'USD') {
                     return;
                 }
+                // Only redirect when checkout modal is opened
+                if (!this.open) {
+                    return;
+                }
+                // Check if the page is checkout page, if so, do nothing since they're already at the right page
+                if (window.location.pathname.includes('/checkout')) {
+                    return;
+                }
                 const shippingCountry = addressEventData.value.address.country;
                 if (shippingCountry &&
                     zonosStore.disabledCountries.includes(shippingCountry)) {