@salla.sa/twilight-components 2.14.576 → 2.14.577

package/dist/collection/components/salla-bullet-delivery/salla-bullet-delivery.js

@@ -3,14 +3,13 @@
  */
 import { h, Host, } from "@stencil/core";
 import { bulletDeliveryAPI, clearApiCache, isSaudiArabia } from "./api-service";
-import { buildAddressLocationPayloadFromSelection, filterBranches, findNearestBranch, getGeolocationErrorMessage, getIntentBranchId, getIntentCityId, getIntentCountryCode, getIntentCountryId, getIntentDistrictId, getIntentLatitude, getIntentLongitude, getIntentRegionId, getIntentSubtitle, hasSessionAddressIntent, isMapOriginIntent, isBranchSelectable, requireRegionAndDistrictForSA, } from "./helpers";
+import { filterBranches, findNearestBranch, getGeolocationErrorMessage, getIntentBranchId, getIntentCityId, getIntentCountryCode, getIntentCountryId, getIntentDistrictId, getIntentLatitude, getIntentLongitude, getIntentRegionId, getIntentSubtitle, hasSessionAddressIntent, isMapOriginIntent, isBranchSelectable, requireRegionAndDistrictForSA, } from "./helpers";
 const BRANCH_SEARCH_DEBOUNCE_MS = 1000;
 const GEOLOCATION_TIMEOUT = 10000;
 /** Final fallback center used only if `user.default_geo_location` is absent (Riyadh — matches checkout map-page). */
 const DEFAULT_MAP_CENTER = { lat: 24.7756042, lng: 46.7360729 };
 import GetDirections from "../../assets/svg/get-directions.svg";
 import GPS from "../../assets/svg/gps.svg";
-import LocationTag from "../../assets/svg/location-tag.svg";
 import Location from "../../assets/svg/location.svg";
 import MiniMap from "../../assets/svg/mini-map.svg";
 import Search from "../../assets/svg/search.svg";
@@ -27,7 +26,6 @@ function log(message, data) {
  */
 export class SallaBulletDelivery {
     constructor() {
-        this.confirming = false;
         this.pendingCartSubmitResolver = null;
         this.pendingCartSubmitPromise = null;
         this.cartSubmitConfirmationPending = false;
@@ -48,6 +46,8 @@ export class SallaBulletDelivery {
         this.cartSubmittingHandler = null;
         this.useCartEventApi = false;
         this.authLoggedInHandler = null;
+        /** Re-entrancy latch for tryAutoConfirmAfterLogin(); a flaky/duplicate auth::logged.in must not double-save. */
+        this.autoConfirmAfterLoginInFlight = false;
         this.authLoggedOutHandler = null;
         this.loginOpenHandler = null;
         this.hasExplicitPreselectedIdsForOpen = false;
@@ -101,7 +101,6 @@ export class SallaBulletDelivery {
         this.loadingBranches = false;
         this.loadingNearestBranch = false;
         this.locationError = "";
-        this.savingAddress = false;
         this.loadingSavedAddresses = false;
         this.showCartWillBeClearedBanner = false;
         // Searchable dropdown state
@@ -124,10 +123,10 @@ export class SallaBulletDelivery {
         this.addressToken = null;
         this.loadingToken = false;
         this.mapReady = false;
-        this.mapStep = 'map';
         this.addressDescription = '';
         /** True while reverse-geocoding a map-click/geolocation pick (no place from the map component itself). */
         this.reverseGeocoding = false;
+        this.confirming = false;
         this.newAddressForm = {
             ...SallaBulletDelivery.INITIAL_ADDRESS_FORM,
         };
@@ -256,62 +255,35 @@ export class SallaBulletDelivery {
                 }
             }
         };
+        // ─── End Map methods ───
         /**
-         * Submit add-address form: create address via API then switch back to list.
+         * Submit add-address form: stage the picked address/dropdowns as the session intent,
+         * then delegate to handleConfirm() for the single save→allocate→close path (avoids
+         * a second, independently-maintained "save an address" implementation — see SHPD-9907).
          */
-        this.handleSubmitAddAddress = async (e) => {
+        this.handleSubmitNewAddress = async (e) => {
             e.preventDefault();
-            if (this.savingAddress)
+            if (this.confirming)
                 return;
-            const hasMap = this.hasMapLocation();
+            const hasMap = this.canConfirmMapLocation();
             const hasDropdowns = this.selectedCountry && this.selectedCity;
             if (!hasMap && !hasDropdowns)
                 return;
             if (!hasMap &&
                 !requireRegionAndDistrictForSA(this.selectedCountry?.code, this.selectedRegion?.id, this.selectedDistrict?.id ?? (this.districtName?.trim() || null)))
                 return;
-            this.savingAddress = true;
-            try {
-                const payload = this.buildAddressLocationPayload();
-                const { success, address } = await bulletDeliveryAPI.saveAddressLocation(payload);
-                if (success) {
-                    await this.loadSavedAddresses();
-                    const latest = address ?? this.savedAddresses[0] ?? null;
-                    if (latest?.is_in_coverage) {
-                        this.selectedSessionAddress = false;
-                        this.selectedSavedAddress = latest;
-                    }
-                    this.addressCreated.emit({ address: latest });
-                    this.viewMode = "main";
-                    this.districtName = "";
-                    this.mapLocationData = null;
-                    this.invalidatePendingGeocode();
-                    this.mapStep = 'map';
-                    this.addressDescription = '';
-                }
-                else {
-                    if (!this.isLoggedIn) {
-                        Salla.notify?.error(Salla.lang.get('pages.checkout.login_to_use_saved_addresses'));
-                        this.handleLogin();
-                    }
-                    else {
-                        Salla.notify?.error(Salla.lang.get("common.errors.error_occurred"));
-                    }
-                }
-            }
-            catch (error) {
-                console.error("SallaBulletDelivery: Error saving address", error);
-                if (!this.isLoggedIn) {
-                    Salla.notify?.error(Salla.lang.get('pages.checkout.login_to_use_saved_addresses'));
-                    this.handleLogin();
-                }
-                else {
-                    Salla.notify?.error(Salla.lang.get("common.errors.error_occurred"));
-                }
-            }
-            finally {
-                this.savingAddress = false;
-            }
+            const details = this.buildIntentAddress();
+            if (!details)
+                return;
+            this.setStoredIntent({
+                type: "address",
+                country_id: Number(this.selectedCountry?.id) || 0,
+                country_code: this.selectedCountry?.code || "",
+                address_details: details,
+            });
+            this.selectedSavedAddress = null;
+            this.selectedSessionAddress = true;
+            await this.handleConfirm();
         };
         this.handleCountrySelected = (item) => {
             const country = this.countries.find(c => String(c.id) === String(item.id)) || item;
@@ -391,9 +363,12 @@ export class SallaBulletDelivery {
         return Salla.config.isMobileApp();
     }
     /**
-     * Opens the bullet delivery modal
+     * Opens the bullet delivery modal. Pass `silent: true` to run the same state/data
+     * loading below without showing the modal — used by tryAutoConfirmAfterLogin() so a
+     * successful auto-confirm never flashes the saved-addresses list; the caller is
+     * responsible for revealing the modal itself if it still needs the customer's input.
      */
-    async open() {
+    async open(silent = false) {
         if (!this.isEnabled)
             return; // feature disabled — never open
         // If mobile app, open the sheet
@@ -408,9 +383,11 @@ export class SallaBulletDelivery {
         }
         // Reset state before opening
         this.resetState();
-        // Open modal immediately — fields render right away with inline loading
-        this.modal.open();
-        Salla.event.dispatch("salla::bullet-delivery.modal.opened");
+        if (!silent) {
+            // Open modal immediately — fields render right away with inline loading
+            this.modal.open();
+            Salla.event.dispatch("salla::bullet-delivery.modal.opened");
+        }
         try {
             this.isLoggedIn = !this.isGuestUser();
             const savedIntent = this.cleanStaleGuestAddressIdIfNeeded(this.getStoredIntent());
@@ -502,6 +479,7 @@ export class SallaBulletDelivery {
         this.mapLocationData = null;
         this.invalidatePendingGeocode();
         this.autoGeolocationTriggered = false;
+        this.addressDescription = "";
         this.selectedCountry = null;
         this.selectedRegion = null;
         this.selectedCity = null;
@@ -600,12 +578,65 @@ export class SallaBulletDelivery {
             return false;
         if (!this.isIntentMethodSupported(intent))
             return false;
+        // address_id/branch_id alone isn't enough — saveSessionAddressToProfile() persists
+        // address_id as soon as the address is *saved*, before allocation even runs, so a
+        // later allocation failure must not make this look complete. scope_allocated is only
+        // ever explicitly false (that saved-not-allocated state) or true; undefined means a
+        // legacy intent persisted before this field existed (or one written elsewhere without
+        // an outcome yet) — treat that the same as before rather than incorrectly re-prompting
+        // returning customers who already had a valid, complete intent.
+        if (intent.scope_allocated === false)
+            return false;
         if (intent.type === "address")
             return !!intent.address_id;
         if (intent.type === "branch")
             return !!intent.branch_id;
         return false;
     }
+    /**
+     * Auto-save + allocate a guest's pre-login address pick the moment auth::logged.in
+     * fires, instead of reopening the modal and waiting for another "Confirm" click
+     * (SHPD-9907). Guarded by hasIncompleteUserAddressIntent(), which only turns false
+     * once the intent gains an address_id — a durable guard even across a duplicate
+     * event, unlike `confirming` alone which resets after the redirect timeout.
+     */
+    async tryAutoConfirmAfterLogin() {
+        if (this.confirming || this.autoConfirmAfterLoginInFlight)
+            return false;
+        if (!this.hasIncompleteUserAddressIntent())
+            return false;
+        this.autoConfirmAfterLoginInFlight = true;
+        const wasVisible = !!this.modal?.hasAttribute?.("visible");
+        try {
+            if (!wasVisible) {
+                // Load silently — a successful auto-confirm should never flash the
+                // saved-addresses list; only reveal the modal below if it can't finish on its own.
+                await this.open(true);
+            }
+            // open() -> loadSavedAddresses() already sets selectedSessionAddress when a
+            // session intent exists; bail if that didn't happen (e.g. address_id already set).
+            if (!this.selectedSessionAddress) {
+                if (!wasVisible)
+                    this.modal?.open();
+                return false;
+            }
+            await this.handleConfirm();
+            // Checking hasCompleteIntentForLoggedInUser() (rather than just
+            // allocationOutOfCoverageMessage) also catches a *save* failure — handleConfirm()
+            // returns early on that before ever setting an allocation message, which used to
+            // make this report success even though nothing was actually confirmed.
+            if (!wasVisible && !this.hasCompleteIntentForLoggedInUser()) {
+                // Save or allocation failed — surface the modal so the customer can see why
+                // and retry or pick a different address.
+                this.modal?.open();
+                return false;
+            }
+            return true;
+        }
+        finally {
+            this.autoConfirmAfterLoginInFlight = false;
+        }
+    }
     /**
      * Authenticated users on the cart page must select/confirm an address before
      * they can dismiss the modal.
@@ -1217,10 +1248,13 @@ export class SallaBulletDelivery {
         this.viewMode = "main";
         this.mapLocationData = null;
         this.invalidatePendingGeocode();
-        this.mapStep = 'map';
         this.addressDescription = '';
         this.autoGeolocationTriggered = false;
     }
+    /** Whether there's a saved-addresses list (or a pending session intent) to go back to from the add-address view. */
+    hasAddressesToGoBack() {
+        return this.savedAddresses.length > 0 || hasSessionAddressIntent(this.getStoredIntent());
+    }
     // ─── Map methods ───
     async fetchAddressToken() {
         if (this.addressToken || this.loadingToken)
@@ -1319,9 +1353,13 @@ export class SallaBulletDelivery {
     get isMapModeAvailable() {
         return this.isMapSettingEnabled && !!salla.config.get('store.settings.keys.maps') && !!this.addressToken;
     }
+    /** In map mode and a pin has already been dropped (as opposed to still using the dropdowns), regardless of login state. */
+    get isMapPick() {
+        return this.isMapModeAvailable && this.hasMapLocation();
+    }
     /** Guest is in map mode and has already dropped a pin (as opposed to still using the dropdowns). */
     get isGuestMapPick() {
-        return !this.isLoggedIn && this.isMapModeAvailable && this.hasMapLocation();
+        return !this.isLoggedIn && this.isMapPick;
     }
     /** Center shown before geolocation resolves — the customer's IP-based default (falls back to Riyadh). */
     get mapInitialCenter() {
@@ -1344,32 +1382,6 @@ export class SallaBulletDelivery {
         const num = Number(value);
         return Number.isFinite(num) ? num : null;
     }
-    // ─── End Map methods ───
-    /**
-     * Build address/location payload from guest-form state (same fields as add-address).
-     */
-    buildAddressLocationPayload() {
-        if (this.isMapModeAvailable && this.hasMapLocation()) {
-            return {
-                lat: this.mapLocationData.lat,
-                lng: this.mapLocationData.lng,
-                ...(this.mapLocationData.shortAddress && { short_address: this.mapLocationData.shortAddress }),
-                ...(this.addressDescription?.trim() && { description: this.addressDescription.trim() }),
-            };
-        }
-        const districtName = this.selectedDistrict?.name ?? this.districtName?.trim() ?? "";
-        return buildAddressLocationPayloadFromSelection({
-            countryId: this.selectedCountry?.id ?? 0,
-            countryCode: this.selectedCountry?.code,
-            regionId: this.selectedRegion?.id,
-            cityId: this.selectedCity?.id,
-            districtId: this.selectedDistrict?.id,
-            description: districtName,
-            lat: this.mapLocationData?.lat,
-            lng: this.mapLocationData?.lng,
-            shortAddress: this.mapLocationData?.shortAddress,
-        });
-    }
     async handleTabChange(tab) {
         if (this.tabChanging)
             return;
@@ -1531,7 +1543,7 @@ export class SallaBulletDelivery {
      * when already open AND already correctly reflecting the logged-in state, so a duplicate
      * auth::logged.in firing can't reset in-progress form input or cause a visible re-render flicker.
      */
-    handlePendingSubmitAfterLogin() {
+    async handlePendingSubmitAfterLogin() {
         // auth::logged.in can fire prematurely (e.g. a silent cross-store login attempt,
         // packages/twilight/src/api/cart.js's tryCrossStoreLogin, whose profile sync can complete
         // without actually flipping the session to logged-in) while Salla.config still reports a
@@ -1545,6 +1557,10 @@ export class SallaBulletDelivery {
             this.resolvePendingCartSubmit();
             return;
         }
+        // handleConfirm()'s own close() resolves the pending cart-submit gate, so
+        // just return on success rather than resolving it a second time here.
+        if (await this.tryAutoConfirmAfterLogin())
+            return;
         if (!this.modal?.hasAttribute?.("visible") || !this.isLoggedIn) {
             this.open();
         }
@@ -1552,7 +1568,7 @@ export class SallaBulletDelivery {
     buildIntentAddress() {
         if (this.activeTab !== "address")
             return undefined;
-        if (this.isGuestMapPick && this.mapLocationData) {
+        if (this.isMapPick && this.mapLocationData) {
             const { lat, lng, formattedAddress, shortAddress } = this.mapLocationData;
             return {
                 country: this.selectedCountry
@@ -1943,6 +1959,20 @@ export class SallaBulletDelivery {
                         ? String(allocationBranchId)
                         : undefined,
                 });
+                // Applying the allocated scope to this session must succeed before treating the
+                // confirmation as done — allocateScope() only creates the allocation server-side;
+                // setDeliveryScope() is what makes *this* session use it. Ignoring its result let
+                // checkout proceed (and scope_allocated get persisted) even when it failed.
+                if (allocatedScopeId) {
+                    const scopeApplied = await bulletDeliveryAPI.setDeliveryScope(allocatedScopeId);
+                    if (!scopeApplied) {
+                        this.allocationOutOfCoverageMessage = `${Salla.lang.get("common.errors.error_occurred")}.`;
+                        this.confirmBtn?.stop();
+                        this.confirming = false;
+                        return;
+                    }
+                    clearApiCache();
+                }
                 // Store headers in result object for persistence after page reload
                 result.allocation_headers = {
                     "s-scope-allocation-type": allocationType,
@@ -1955,11 +1985,7 @@ export class SallaBulletDelivery {
             this.markShownThisSession();
             // After allocation success: persist latest intent so switch UI can always reflect
             // the selected address/branch once confirmed.
-            this.setStoredIntent(result);
-            if (allocatedScopeId) {
-                await bulletDeliveryAPI.setDeliveryScope(allocatedScopeId);
-                clearApiCache();
-            }
+            this.setStoredIntent({ ...result, scope_allocated: true });
             const allocationConfirmedPayload = {
                 ...result,
                 address: this.buildAllocationConfirmedAddressData(selectedAddress),
@@ -2157,8 +2183,10 @@ export class SallaBulletDelivery {
                 const { success, address } = await bulletDeliveryAPI.saveAddressLocation(payload);
                 if (!success || !address)
                     return null;
-                // Persist address_id immediately to avoid duplicate creation on retry.
-                this.setStoredIntent({ ...intent, address_id: address.id });
+                // Persist address_id immediately to avoid duplicate creation on retry — but keep
+                // scope_allocated false: the address is saved, not yet allocated, so a later
+                // allocation failure must not make hasCompleteIntentForLoggedInUser() think it is.
+                this.setStoredIntent({ ...intent, address_id: address.id, scope_allocated: false });
                 this.addressCreated.emit({ address });
                 return address;
             }
@@ -2193,6 +2221,10 @@ export class SallaBulletDelivery {
                 return null;
             const savedAddress = address ?? null;
             if (savedAddress) {
+                // Persist address_id immediately to avoid duplicate creation on retry — but keep
+                // scope_allocated false: the address is saved, not yet allocated, so a later
+                // allocation failure must not make hasCompleteIntentForLoggedInUser() think it is.
+                this.setStoredIntent({ ...intent, address_id: savedAddress.id, scope_allocated: false });
                 this.addressCreated.emit({ address: savedAddress });
             }
             return savedAddress;
@@ -2281,14 +2313,14 @@ export class SallaBulletDelivery {
     }
     renderAddressConfirmation() {
         const address = this.mapLocationData?.formattedAddress ?? '';
-        const shortCode = this.mapLocationData?.shortAddress;
-        return (h("div", { class: "s-bullet-delivery-address-confirm" }, h("div", { class: "s-bullet-delivery-address-confirm-card" }, h("div", { class: "s-bullet-delivery-address-confirm-details" }, h("span", { class: "s-bullet-delivery-address-confirm-label" }, Salla.lang.get('pages.checkout.selected_address')), h("p", { class: "s-bullet-delivery-address-confirm-text" }, address), shortCode && (h("span", { class: "s-bullet-delivery-address-confirm-tag" }, shortCode, h("span", { class: "s-bullet-delivery-address-confirm-tag-icon", innerHTML: LocationTag })))), h("button", { type: "button", class: "s-bullet-delivery-address-confirm-edit", onClick: () => { this.mapStep = 'map'; } }, Salla.lang.get('common.elements.edit'))), h("div", { class: "s-bullet-delivery-address-confirm-description" }, h("label", { class: "s-bullet-delivery-address-confirm-description-label" }, Salla.lang.get('pages.checkout.address_description'), h("span", { class: "s-bullet-delivery-address-confirm-description-optional" }, Salla.lang.get('common.elements.optional'))), h("input", { type: "text", class: "s-bullet-delivery-address-confirm-description-input form-input", placeholder: Salla.lang.get('pages.checkout.address_description_placeholder'), value: this.addressDescription, onInput: (e) => { this.addressDescription = e.target.value; } }))));
+        return (h("div", { class: "s-bullet-delivery-address-confirm" }, h("div", { class: "s-bullet-delivery-address-confirm-card" }, h("span", { class: "s-bullet-delivery-address-map-icon", innerHTML: MiniMap, "aria-hidden": "true" }), h("div", { class: "s-bullet-delivery-address-confirm-details" }, h("span", { class: "s-bullet-delivery-address-confirm-label" }, Salla.lang.get('pages.checkout.selected_address')), h("p", { class: "s-bullet-delivery-address-confirm-text" }, address))), h("div", { class: "s-bullet-delivery-address-confirm-description" }, h("label", { class: "s-bullet-delivery-address-confirm-description-label" }, Salla.lang.get('pages.checkout.address_description'), h("span", { class: "s-bullet-delivery-address-confirm-description-optional" }, Salla.lang.get('common.elements.optional'))), h("input", { type: "text", class: "s-bullet-delivery-address-confirm-description-input form-input", placeholder: Salla.lang.get('pages.checkout.address_description_placeholder'), value: this.addressDescription, onInput: (e) => { this.addressDescription = e.target.value; } }))));
     }
     renderGuestDeliveryForm() {
         if (this.isMapModeAvailable) {
-            return this.mapStep === 'confirm' && this.hasMapLocation()
-                ? this.renderAddressConfirmation()
-                : this.renderMapSection();
+            return [
+                this.renderMapSection(),
+                this.hasMapLocation() ? this.renderAddressConfirmation() : null,
+            ];
         }
         const isSA = isSaudiArabia(this.selectedCountry?.code ?? '');
         return [
@@ -2310,23 +2342,15 @@ export class SallaBulletDelivery {
         if (!this.isMapModeAvailable) {
             return this.renderGuestDeliveryForm();
         }
-        const hasMapLoc = this.hasMapLocation();
-        const isConfirmStep = this.mapStep === 'confirm' && hasMapLoc;
-        const canAdvanceToConfirm = this.canConfirmMapLocation();
-        const submitLabel = isConfirmStep
-            ? (this.confirming
-                ? Salla.lang.get("pages.checkout.loading")
-                : Salla.lang.get("pages.checkout.confirm_address"))
-            : Salla.lang.get('pages.checkout.confirm_location');
+        const canSubmit = this.canConfirmMapLocation();
+        const submitLabel = this.confirming
+            ? Salla.lang.get("pages.checkout.loading")
+            : Salla.lang.get("pages.checkout.confirm_address");
         const handleSubmit = (e) => {
             e.preventDefault();
-            if (!isConfirmStep && canAdvanceToConfirm) {
-                this.mapStep = 'confirm';
-                return;
-            }
             this.handleConfirm();
         };
-        return (h("form", { onSubmit: handleSubmit }, this.renderGuestDeliveryForm(), h("div", { class: "s-bullet-delivery-form-actions s-bullet-delivery-form-actions--single", style: { padding: '24px' } }, h("salla-button", { type: "submit", loading: this.confirming, disabled: isConfirmStep ? this.confirming : !canAdvanceToConfirm, width: "wide" }, submitLabel), !this.isLoggedIn && (h("button", { type: "button", class: "s-bullet-delivery-login-prompt", onClick: () => this.handleLogin() }, Salla.lang.get('pages.checkout.login_to_use_saved_addresses'))))));
+        return (h("form", { onSubmit: handleSubmit }, this.renderGuestDeliveryForm(), h("div", { class: "s-bullet-delivery-form-actions s-bullet-delivery-form-actions--single", style: { padding: '24px' } }, h("salla-button", { type: "submit", loading: this.confirming, disabled: !canSubmit || this.confirming, width: "wide" }, submitLabel), !this.isLoggedIn && (h("button", { type: "button", class: "s-bullet-delivery-login-prompt", onClick: () => this.handleLogin() }, Salla.lang.get('pages.checkout.login_to_use_saved_addresses'))))));
     }
     renderBranchSearch() {
         return (h("div", { class: "s-bullet-delivery-branch-search" }, h("div", { class: "s-bullet-delivery-search-row" }, h("div", { class: "s-bullet-delivery-search s-bullet-delivery-branch-search-wrap" }, h("span", { class: "s-bullet-delivery-search-icon s-bullet-delivery-branch-search-icon", innerHTML: Search, "aria-hidden": "true" }), h("input", { type: "text", class: "s-bullet-delivery-branch-search-input form-input", placeholder: Salla.lang.get("pages.checkout.search_for_city_or_branch"), value: this.branchSearchQuery, onInput: (e) => this.handleBranchSearch(e), autocomplete: "off" })), h("button", { type: "button", class: {
@@ -2390,25 +2414,18 @@ export class SallaBulletDelivery {
                 "s-hidden": this.activeTab !== "branch",
             } }, this.renderCountrySelect(), this.renderBranchSearch(), this.renderBranchList()));
     }
-    /** Add-address form: map two-step flow or dropdown fallback. */
+    /** Add-address form: map + confirm card in one screen, or dropdown fallback. */
     renderAddAddressForm() {
-        const title = Salla.lang.get("pages.checkout.add_new_address");
         const mapMode = this.isMapModeAvailable;
         const isSA = isSaudiArabia(this.selectedCountry?.code ?? '');
         const hasMapLoc = this.hasMapLocation();
         let canSubmit;
         let submitLabel;
         if (mapMode) {
-            if (this.mapStep === 'map') {
-                canSubmit = this.canConfirmMapLocation();
-                submitLabel = Salla.lang.get('pages.checkout.confirm_location');
-            }
-            else {
-                canSubmit = hasMapLoc;
-                submitLabel = this.savingAddress
-                    ? Salla.lang.get("pages.checkout.loading")
-                    : Salla.lang.get("pages.checkout.confirm_address");
-            }
+            canSubmit = this.canConfirmMapLocation();
+            submitLabel = this.confirming
+                ? Salla.lang.get("pages.checkout.loading")
+                : Salla.lang.get("pages.checkout.confirm_address");
         }
         else {
             const canSubmitDropdowns = this.selectedCountry &&
@@ -2418,20 +2435,16 @@ export class SallaBulletDelivery {
                     !!this.selectedDistrict ||
                     !!(this.districtName && this.districtName.trim().length > 0));
             canSubmit = hasMapLoc || canSubmitDropdowns;
-            submitLabel = this.savingAddress
+            submitLabel = this.confirming
                 ? Salla.lang.get("pages.checkout.loading")
                 : Salla.lang.get("pages.checkout.confirm_address");
         }
-        const hasAddressesToGoBack = this.savedAddresses.length > 0 || hasSessionAddressIntent(this.getStoredIntent());
         const handleFormSubmit = (e) => {
             e.preventDefault();
-            if (mapMode && this.mapStep === 'map' && canSubmit) {
-                this.mapStep = 'confirm';
-                return;
-            }
-            this.handleSubmitAddAddress(e);
+            this.handleSubmitNewAddress(e);
         };
-        return (h("div", { class: "s-bullet-delivery-add-address" }, h("form", { class: "s-bullet-delivery-add-address-form", onSubmit: handleFormSubmit }, this.renderGuestDeliveryForm(), h("div", { class: "s-bullet-delivery-form-actions s-bullet-delivery-form-actions--single" }, h("salla-button", { type: "submit", loading: this.savingAddress, disabled: !canSubmit || this.savingAddress, class: "s-bullet-delivery-add-address-submit" }, submitLabel)))));
+        return (h("div", { class: "s-bullet-delivery-add-address" }, this.allocationOutOfCoverageMessage &&
+            this.renderAllocationOutOfCoverageAlert(), h("form", { class: "s-bullet-delivery-add-address-form", onSubmit: handleFormSubmit }, this.renderGuestDeliveryForm(), h("div", { class: "s-bullet-delivery-form-actions s-bullet-delivery-form-actions--single" }, h("salla-button", { type: "submit", loading: this.confirming, disabled: !canSubmit || this.confirming, class: "s-bullet-delivery-add-address-submit" }, submitLabel), this.hasAddressesToGoBack() && (h("salla-button", { shape: "link", class: "s-bullet-delivery-back-to-list-link", onClick: () => this.handleBackToAddressList() }, Salla.lang.getWithDefault('pages.checkout.saved_addresses', 'العناوين المحفوظة'), h("i", { class: "sicon-arrow-left" })))))));
     }
     renderFooter() {
         if (this.activeTab === "address" && !this.isLoggedIn && this.isMapModeAvailable) {
@@ -2516,15 +2529,26 @@ export class SallaBulletDelivery {
                 if (!this.isEnabled)
                     return;
                 if (this.pendingCartSubmitPromise) {
-                    // A prior attempt is still pending (e.g. the user dismissed the modal without
-                    // completing allocate) — re-prompt instead of silently awaiting with nothing visible.
-                    if (this.isGuestUser()) {
-                        this.openGuestLogin();
-                    }
-                    else if (!this.modal?.hasAttribute?.("visible")) {
-                        this.open();
+                    // A prior attempt is still pending. For a logged-in user, re-prompt instead of
+                    // silently awaiting with nothing visible.
+                    if (!this.isGuestUser()) {
+                        if (!this.modal?.hasAttribute?.("visible")) {
+                            this.open();
+                        }
+                        await this.pendingCartSubmitPromise;
+                        return;
                     }
-                    await this.pendingCartSubmitPromise;
+                    // Guest: login was already shown once for this attempt — reopening it here (the
+                    // old behavior) fought whatever the guest just chose (e.g. "Continue as Guest")
+                    // and froze the page. Reset the gate so the *next* checkout click starts a clean
+                    // cycle (reopening login again, repeating until the guest actually logs in and
+                    // allocates) — but never resolve *this* invocation: returning here would resolve
+                    // salla.cart.event.submitting() (built on emitAsync, which awaits every listener),
+                    // letting cart.js's status() continue straight through to the checkout redirect.
+                    this.pendingCartSubmitResolver = null;
+                    this.pendingCartSubmitPromise = null;
+                    this.cartSubmitConfirmationPending = false;
+                    await new Promise(() => { });
                     return;
                 }
                 // Logged-in users with a complete intent can continue checkout without re-prompting.
@@ -2555,14 +2579,16 @@ export class SallaBulletDelivery {
         this.closeHandler = this.close.bind(this);
         Salla.event.on("salla::bullet-delivery.modal.close.requested", this.closeHandler);
         this.isRTL = Salla.config.get("theme.is_rtl");
-        this.authLoggedInHandler = () => {
+        this.authLoggedInHandler = async () => {
             if (this.cartSubmitConfirmationPending) {
-                this.handlePendingSubmitAfterLogin();
+                await this.handlePendingSubmitAfterLogin();
                 return;
             }
             // Always prompt after login when intent is incomplete, regardless of prior prompted flags.
             if (!this.hasIncompleteUserAddressIntent())
                 return;
+            if (await this.tryAutoConfirmAfterLogin())
+                return;
             if (this.modal?.hasAttribute?.("visible"))
                 return;
             this.open();
@@ -2762,7 +2788,6 @@ export class SallaBulletDelivery {
             "loadingBranches": {},
             "loadingNearestBranch": {},
             "locationError": {},
-            "savingAddress": {},
             "loadingSavedAddresses": {},
             "showCartWillBeClearedBanner": {},
             "countrySearchQuery": {},
@@ -2782,9 +2807,9 @@ export class SallaBulletDelivery {
             "addressToken": {},
             "loadingToken": {},
             "mapReady": {},
-            "mapStep": {},
             "addressDescription": {},
             "reverseGeocoding": {},
+            "confirming": {},
             "newAddressForm": {}
         };
     }
@@ -2873,8 +2898,12 @@ export class SallaBulletDelivery {
         return {
             "open": {
                 "complexType": {
-                    "signature": "() => Promise<void>",
-                    "parameters": [],
+                    "signature": "(silent?: boolean) => Promise<void>",
+                    "parameters": [{
+                            "name": "silent",
+                            "type": "boolean",
+                            "docs": ""
+                        }],
                     "references": {
                         "Promise": {
                             "location": "global",
@@ -2884,7 +2913,7 @@ export class SallaBulletDelivery {
                     "return": "Promise<void>"
                 },
                 "docs": {
-                    "text": "Opens the bullet delivery modal",
+                    "text": "Opens the bullet delivery modal. Pass `silent: true` to run the same state/data\nloading below without showing the modal \u2014 used by tryAutoConfirmAfterLogin() so a\nsuccessful auto-confirm never flashes the saved-addresses list; the caller is\nresponsible for revealing the modal itself if it still needs the customer's input.",
                     "tags": []
                 }
             },