@salla.sa/twilight-components 2.14.384 → 2.14.386

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

@@ -53,25 +53,6 @@ export const filterBranches = (branches, searchQuery) => {
     const q = searchQuery.toLowerCase();
     return branches.filter((b) => b.name.toLowerCase().includes(q) || b.city?.name?.toLowerCase().includes(q));
 };
-/** Match saved address to guest intent by city/district (and optional street). */
-export function findMatchingAddress(guestIntent, userAddresses) {
-    const cityId = getIntentCityId(guestIntent);
-    const districtId = getIntentDistrictId(guestIntent);
-    return userAddresses.find((addr) => {
-        const addrCity = addr.city?.id ?? addr.city_id;
-        const addrDistrict = addr.district?.id ?? addr.district_id;
-        if (cityId == null || addrCity !== cityId)
-            return false;
-        if (districtId != null) {
-            if (addrDistrict !== districtId)
-                return false;
-            if (guestIntent.street && addr.street)
-                return guestIntent.street.toLowerCase() === addr.street.toLowerCase();
-            return true;
-        }
-        return true;
-    }) ?? null;
-}
 export const getIntentSubtitle = (intent, toAddress, fromBranch) => {
     if (intent.type === 'branch') {
         const loc = intent.branch_details?.city ?? intent.branch_details?.name;
@@ -100,7 +81,10 @@ export const hasSessionAddressIntent = (intent) => {
     const city = getIntentCityId(intent);
     const d = getIntentDistrictId(intent);
     const code = getIntentCountryCode(intent);
-    return !!(c && city && (!isSaudiArabia(code) || d));
+    const hasDistrictId = d != null && Number(d) !== 0;
+    const hasDistrictName = Boolean(intent.address_details?.district?.name?.trim());
+    const districtOk = !isSaudiArabia(code) || hasDistrictId || hasDistrictName;
+    return !!(c && city && districtOk);
 };
 export const requireRegionAndDistrictForSA = (countryCode, regionId, districtIdOrName) => !countryCode || !isSaudiArabia(countryCode)
     ? true

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

@@ -3,7 +3,7 @@
  */
 import { h, Host, } from "@stencil/core";
 import { bulletDeliveryAPI, isSaudiArabia } from "./api-service";
-import { findNearestBranch, filterBranches, formatWorkingHoursDisplay, getBranchFirstSlot, findMatchingAddress, getGeolocationErrorMessage, getIntentSubtitle, getIntentCountryId, getIntentCountryCode, getIntentRegionId, getIntentCityId, getIntentDistrictId, getIntentBranchId, getIntentLatitude, getIntentLongitude, hasSessionAddressIntent, requireRegionAndDistrictForSA, buildAddressLocationPayloadFromSelection, } from "./helpers";
+import { findNearestBranch, filterBranches, formatWorkingHoursDisplay, getBranchFirstSlot, getGeolocationErrorMessage, getIntentSubtitle, getIntentCountryId, getIntentCountryCode, getIntentRegionId, getIntentCityId, getIntentDistrictId, getIntentBranchId, getIntentLatitude, getIntentLongitude, hasSessionAddressIntent, requireRegionAndDistrictForSA, buildAddressLocationPayloadFromSelection, } from "./helpers";
 const BRANCH_SEARCH_DEBOUNCE_MS = 1000;
 const GEOLOCATION_TIMEOUT = 10000;
 import Store from "../../assets/svg/store3.svg";
@@ -20,22 +20,33 @@ import GetDirections from "../../assets/svg/get-directions.svg";
 export class SallaBulletDelivery {
     constructor() {
         this.confirming = false;
+        this.pendingCartSubmitResolver = null;
+        this.pendingCartSubmitPromise = null;
+        this.cartSubmitConfirmationPending = false;
         this.branchSearchDebounceTimer = null;
         this.componentReady = false;
         this.pendingOpen = false;
         this.tabChanging = false;
         this.intentStorageKey = "bullet_delivery_intent";
-        this.sessionShownKey = "bullet_delivery_shown_this_session";
+        this.sessionShownKey = "bullet_delivery_shown";
+        this.incompleteIntentPromptKey = "bullet_delivery_incomplete_intent_prompted";
         this.cartItemAddedEvent = "cart::item.added";
         this.cartItemAddedHandler = null;
+        this.cartSubmittingHandler = null;
         this.useCartEventApi = false;
+        this.authLoggedInHandler = null;
+        this.authLoggedOutHandler = null;
+        this.loginClosedHandler = null;
+        this.hasExplicitPreselectedIdsForOpen = false;
         this.bulletDeliveryOpenHandler = (eventData) => {
             this.preselectedAddressId = eventData?.preselected_address_id;
             this.preselectedBranchId = eventData?.preselected_branch_id;
+            this.hasExplicitPreselectedIdsForOpen =
+                eventData?.preselected_address_id != null ||
+                    eventData?.preselected_branch_id != null;
             this.open();
         };
         this.closeHandler = null;
-        this.guestLoginSyncHandler = null;
         /** True after saved addresses have been loaded (lazy: only when address tab is shown). */
         this.savedAddressesLoaded = false;
         // Core state
@@ -144,17 +155,9 @@ export class SallaBulletDelivery {
         // Open modal immediately to show skeleton/loading state
         this.modal.open();
         try {
-            // Check login status
-            const userType = Salla.config.get("user.type");
-            this.isLoggedIn = userType !== "guest";
-            const savedIntent = this.getStoredIntent();
-            // When opening from a stored intent, treat its IDs as preselected targets
-            if (savedIntent?.type === "address" && savedIntent.address_id) {
-                this.preselectedAddressId = savedIntent.address_id;
-            }
-            if (savedIntent?.type === "branch" && savedIntent.branch_id) {
-                this.preselectedBranchId = savedIntent.branch_id;
-            }
+            this.isLoggedIn = !this.isGuestUser();
+            const savedIntent = this.cleanStaleGuestAddressIdIfNeeded(this.getStoredIntent());
+            this.applyPreselectedIdsFromIntent(savedIntent);
             const hasStoredAddressIds = !this.isLoggedIn &&
                 savedIntent?.type === "address" &&
                 getIntentCountryId(savedIntent) != null &&
@@ -214,12 +217,17 @@ export class SallaBulletDelivery {
             // Only hide loading after all data is loaded and UI is ready
             this.loading = false;
             this.modal?.stopLoading();
+            this.overrideScopeSwitchUI();
         }
     }
     /**
      * Closes the bullet delivery modal
      */
     async close() {
+        // If submit flow is waiting and user dismissed the modal, release the pending gate.
+        if (this.cartSubmitConfirmationPending && !this.confirming) {
+            this.resolvePendingCartSubmit();
+        }
         this.bulletDeliveryClosed.emit();
         return this.modal?.close();
     }
@@ -251,14 +259,87 @@ export class SallaBulletDelivery {
         const rememberLastSession = Boolean(Salla.config.get("store.settings.bullet_delivery.settings.remember_last_session"));
         return Salla.storage[rememberLastSession ? "store" : "session"];
     }
+    getShownStorage() {
+        // Always session-scoped. `remember_last_session` applies to intent persistence only.
+        return Salla.storage.session;
+    }
     getStoredIntent() {
         return this.getIntentStorage().get(this.intentStorageKey);
     }
+    isGuestUser() {
+        return String(Salla.config.get("user.type") ?? "guest") === "guest";
+    }
+    cleanStaleGuestAddressIdIfNeeded(intent) {
+        if (!this.isGuestUser() || intent?.type !== "address" || !intent.address_id)
+            return intent;
+        const cleaned = {
+            ...intent,
+            address_id: undefined,
+        };
+        this.setStoredIntent(cleaned);
+        return cleaned;
+    }
+    applyPreselectedIdsFromIntent(intent) {
+        if (this.hasExplicitPreselectedIdsForOpen) {
+            this.hasExplicitPreselectedIdsForOpen = false;
+            return;
+        }
+        this.preselectedAddressId = undefined;
+        this.preselectedBranchId = undefined;
+        if (this.isGuestUser()) {
+            if (intent?.type === "branch" && intent.branch_id) {
+                this.preselectedBranchId = intent.branch_id;
+            }
+            return;
+        }
+        if (intent?.type === "address" && intent.address_id) {
+            this.preselectedAddressId = intent.address_id;
+        }
+        else if (intent?.type === "branch" && intent.branch_id) {
+            this.preselectedBranchId = intent.branch_id;
+        }
+    }
+    hasIncompleteUserAddressIntent() {
+        if (this.isGuestUser())
+            return false;
+        const intent = this.getStoredIntent();
+        if (!intent || intent.type !== "address" || intent.address_id || !intent.address_details)
+            return false;
+        // Intent is an address without address_id; consider it "incomplete"
+        // only when it represents a valid session-style address.
+        return hasSessionAddressIntent(intent);
+    }
+    hasCompleteIntentForLoggedInUser() {
+        if (this.isGuestUser())
+            return false;
+        const intent = this.getStoredIntent();
+        if (!intent)
+            return false;
+        if (intent.type === "address")
+            return !!intent.address_id;
+        if (intent.type === "branch")
+            return !!intent.branch_id;
+        return false;
+    }
+    shouldPromptIncompleteIntentThisSession() {
+        const storage = this.getShownStorage();
+        return (this.hasIncompleteUserAddressIntent() &&
+            storage.get(this.incompleteIntentPromptKey) !== true);
+    }
+    markIncompleteIntentPrompted() {
+        this.getShownStorage().set(this.incompleteIntentPromptKey, true);
+    }
     setStoredIntent(intent) {
         this.getIntentStorage().set(this.intentStorageKey, intent);
+        this.overrideScopeSwitchUI();
     }
-    removeStoredIntent() {
-        this.getIntentStorage().remove(this.intentStorageKey);
+    clearBulletDeliveryStoredData() {
+        // Clear all bullet-delivery keys from both scopes to avoid stale state across auth transitions.
+        Salla.storage.session.remove(this.intentStorageKey);
+        Salla.storage.store.remove(this.intentStorageKey);
+        Salla.storage.session.remove(this.sessionShownKey);
+        Salla.storage.session.remove(this.incompleteIntentPromptKey);
+        this.overrideScopeSwitchUI();
     }
     /**
      * Single prefill flow: load geography from stored intent and set selected location + form.
@@ -316,17 +397,23 @@ export class SallaBulletDelivery {
                 this.selectedDistrict = district;
             }
         }
+        // When district is captured as free text (or couldn't be matched), keep it in the text input state.
+        if (!this.selectedDistrict && districtName) {
+            this.districtName = districtName;
+        }
     }
     updateNewAddressForm(partial) {
         this.newAddressForm = { ...this.newAddressForm, ...partial };
     }
     /** Whether allocation completed successfully this session (modal won't auto-open again). */
     hasBeenShownThisSession() {
-        return !!Salla.storage.session.get(this.sessionShownKey);
+        const storage = this.getShownStorage();
+        return storage.get(this.sessionShownKey) === true;
     }
     /** Mark allocation as completed this session (called only after allocateScope succeeds). */
     markShownThisSession() {
-        Salla.storage.session.set(this.sessionShownKey, true);
+        const storage = this.getShownStorage();
+        storage.set(this.sessionShownKey, true);
     }
     async loadCountries(skipEagerSubFetch = false) {
         const forBranch = this.activeTab === "branch";
@@ -523,110 +610,6 @@ export class SallaBulletDelivery {
             this.loadingRegions = false;
         }
     }
-    /**
-     * AC7: Guest-to-Registered Sync
-     * Syncs guest session location to user profile on login
-     */
-    async handleGuestToRegisteredSync() {
-        try {
-            // Check if user is now logged in
-            const userId = Salla.config.get("user.id");
-            if (!userId)
-                return;
-            // Get the guest session location from session storage
-            const guestIntent = this.getStoredIntent();
-            if (!guestIntent || guestIntent.type !== "address") {
-                // No guest address intent to sync, or it's a branch intent
-                return;
-            }
-            // Get user's saved addresses
-            const userAddresses = await bulletDeliveryAPI.getSavedAddresses();
-            const matchingAddress = findMatchingAddress(guestIntent, userAddresses);
-            if (matchingAddress) {
-                await this.setAddressAsActive(matchingAddress.id);
-                const updatedIntent = {
-                    ...guestIntent,
-                    address_id: matchingAddress.id,
-                    address_details: this.buildIntentAddressFromSaved(matchingAddress),
-                };
-                this.setStoredIntent(updatedIntent);
-            }
-            else if (getIntentCityId(guestIntent)) {
-                // No match - create new address from guest session data
-                const newAddress = await this.createAddressFromGuestSession(guestIntent);
-                if (newAddress) {
-                    const updatedIntent = {
-                        ...guestIntent,
-                        address_id: newAddress.id,
-                        address_details: this.buildIntentAddressFromSaved(newAddress),
-                    };
-                    this.setStoredIntent(updatedIntent);
-                    this.addressCreated.emit({ address: newAddress });
-                }
-            }
-            // Emit event to notify that sync is complete
-            Salla.event.emit("bullet-delivery::guest-synced", {
-                guest_intent: guestIntent,
-                matched_address_id: matchingAddress?.id,
-            });
-        }
-        catch (error) {
-            console.error("SallaBulletDelivery: Error syncing guest session to user profile", error);
-        }
-    }
-    /**
-     * Set an address as active/last used
-     */
-    async setAddressAsActive(addressId) {
-        try {
-            // Call API to mark address as default/active
-            await Salla.address?.api?.setDefault?.(addressId);
-        }
-        catch (error) {
-            // If setDefault API doesn't exist, just update local state
-            console.warn("SallaBulletDelivery: Could not set address as default", error);
-        }
-    }
-    /**
-     * Create a new address from guest session: only country, city and district IDs (no street, etc.).
-     * Uses address/location API; after fetch we return the newly created address from the list.
-     */
-    async createAddressFromGuestSession(guestIntent) {
-        const countryId = getIntentCountryId(guestIntent);
-        const cityId = getIntentCityId(guestIntent);
-        if (!countryId || !cityId)
-            return null;
-        const isSA = isSaudiArabia(getIntentCountryCode(guestIntent));
-        const districtName = guestIntent.address_details?.district?.name ?? "";
-        const payload = {
-            country_id: countryId,
-            region_id: getIntentRegionId(guestIntent),
-            city_id: cityId,
-            district_id: getIntentDistrictId(guestIntent),
-            description: districtName,
-        };
-        if (isSA) {
-            payload.local = districtName;
-        }
-        try {
-            const { success, address } = await bulletDeliveryAPI.saveAddressLocation(payload);
-            if (!success)
-                return null;
-            if (address)
-                return address;
-            const addresses = await bulletDeliveryAPI.getSavedAddresses();
-            const districtId = getIntentDistrictId(guestIntent);
-            const newAddress = addresses.find((a) => (a.city_id ?? a.city?.id) === cityId &&
-                (a.district_id ?? a.district?.id) === districtId) ??
-                addresses[0] ??
-                null;
-            return newAddress;
-        }
-        catch (error) {
-            console.error("SallaBulletDelivery: Could not create address from guest session", error);
-            return null;
-        }
-    }
     emitHeaderContextUpdate(result, address, branch) {
         let locationText = "";
         if (result.type === "address") {
@@ -897,8 +880,21 @@ export class SallaBulletDelivery {
         return false;
     }
     handleLogin() {
+        // Keep bullet-delivery flow in-place and avoid full page reload after login.
+        Salla.auth.setCanRedirect(false);
         Salla.event.dispatch("bullet-delivery::close");
-        Salla.event.dispatch("login::open");
+        Salla.event.dispatch("login::open", Salla.url.is_page("cart")
+            ? { withoutReload: true, source: "cart-submit" }
+            : { withoutReload: true, source: "bullet-delivery" });
+    }
+    resolvePendingCartSubmit() {
+        if (!this.pendingCartSubmitResolver)
+            return;
+        const resolve = this.pendingCartSubmitResolver;
+        this.pendingCartSubmitResolver = null;
+        this.pendingCartSubmitPromise = null;
+        this.cartSubmitConfirmationPending = false;
+        resolve();
     }
     buildIntentAddress() {
         if (this.activeTab !== "address" ||
@@ -984,10 +980,8 @@ export class SallaBulletDelivery {
             };
             let selectedAddress;
             let selectedBranchData;
-            let usedSessionAddress = false;
             if (this.activeTab === "address") {
                 if (this.isLoggedIn && this.selectedSessionAddress) {
-                    usedSessionAddress = true;
                     const savedAddress = await this.saveSessionAddressToProfile();
                     if (!savedAddress) {
                         Salla.notify?.error(Salla.lang.get("common.errors.error_occurred"));
@@ -1094,14 +1088,9 @@ export class SallaBulletDelivery {
             }
             // After allocation success: mark session so we don't show modal again this session
             this.markShownThisSession();
-            // After allocation success: update session storage for guest prefill on next visit
-            // When session address was confirmed, remove intent so logout shows a reset form
-            if (usedSessionAddress) {
-                this.removeStoredIntent();
-            }
-            else {
-                this.setStoredIntent(result);
-            }
+            // 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);
             }
@@ -1117,6 +1106,10 @@ export class SallaBulletDelivery {
                 this.confirmBtn?.stop();
                 this.close();
                 this.confirming = false;
+                if (this.cartSubmitConfirmationPending) {
+                    this.resolvePendingCartSubmit();
+                    return;
+                }
                 if (allocatedScopeId) {
                     const scope = Salla.storage.get("scope") || {};
                     let url = Salla.helpers.addParamToUrl("scope", allocatedScopeId);
@@ -1235,7 +1228,7 @@ export class SallaBulletDelivery {
             } }, h("option", { value: "", disabled: true, selected: !this.selectedCountry }, Salla.lang.get("pages.checkout.select_country")), this.countries.map((country) => (h("option", { key: country.id, value: country.id, selected: this.selectedCountry?.id === country.id }, country.name))))));
     }
     renderSelectLoader() {
-        return (h("span", { class: "s-bullet-delivery-select-loader", "aria-hidden": "true" }, h("salla-loading", { size: "16", width: "3" })));
+        return (h("span", { class: "s-bullet-delivery-select-loader", "aria-hidden": "true" }, h("salla-skeleton", { height: "16px", width: "16px" })));
     }
     renderLoadingLabel(label, htmlFor, isLoading = false, isRequired = true) {
         return (h("label", { class: "s-bullet-delivery-label", htmlFor: htmlFor }, h("span", { class: "s-bullet-delivery-label-content" }, h("span", null, label, isRequired && h("span", { class: "text-red-500" }, " *")), isLoading && this.renderSelectLoader())));
@@ -1360,22 +1353,17 @@ export class SallaBulletDelivery {
         if (!this.isLoggedIn)
             return null;
         if (this.loadingSavedAddresses) {
-            return (h("div", null, h("salla-loading", { size: "md" })));
+            return (h("div", { class: "s-bullet-delivery-addresses-list s-scrollbar" }, [1, 2, 3].map((v) => (h("div", { key: v, class: "s-bullet-delivery-address-item s-bullet-delivery-address-item--skeleton" }, h("salla-skeleton", { class: "s-bullet-delivery-skel-radio", height: "18px", width: "18px" }), h("salla-skeleton", { class: "s-bullet-delivery-skel-map", height: "36px", width: "36px" }), h("div", { class: "s-bullet-delivery-address-content" }, h("div", { class: "s-bullet-delivery-address-lines" }, h("salla-skeleton", { height: "18px", width: "72%" }), h("salla-skeleton", { height: "16px", width: "56%" }))))))));
         }
         const intent = this.getStoredIntent();
         const hasSessionAddress = hasSessionAddressIntent(intent);
-        const sessionAddressTitle = hasSessionAddress && intent?.address_details
-            ? [
-                intent.address_details.district?.name,
-                intent.address_details.city.name,
-                intent.address_details.country.name,
-            ]
+        const sessionLine1 = hasSessionAddress && intent?.address_details
+            ? [intent.address_details.city?.name, intent.address_details.country?.name]
                 .filter(Boolean)
-                .join("، ") ||
-                [
-                    intent.address_details.country.id,
-                    intent.address_details.city.id,
-                ].join(", ")
+                .join("، ") || ""
+            : "";
+        const sessionLine2 = hasSessionAddress && intent?.address_details
+            ? (intent.address_details.district?.name ?? "").trim()
             : "";
         if (this.savedAddresses.length === 0 && !hasSessionAddress) {
             return this.renderSavedAddressesEmptyState();
@@ -1383,8 +1371,8 @@ export class SallaBulletDelivery {
         return (h("div", { class: "s-bullet-delivery-addresses-list s-scrollbar" }, hasSessionAddress &&
             this.renderAddressRow({
                 key: "session-address",
-                line1: sessionAddressTitle,
-                line2: "",
+                line1: sessionLine1,
+                line2: sessionLine2,
                 selected: this.selectedSessionAddress,
                 onClick: () => this.handleSessionAddressSelect(),
             }), this.savedAddresses.map((address) => {
@@ -1399,7 +1387,7 @@ export class SallaBulletDelivery {
             ]
                 .filter(Boolean)
                 .join("، ");
-            const line2 = (builtLine2 || address.formatted?.address_two) ?? "";
+            const line2 = (address.formatted?.address_two || builtLine2) ?? "";
             const inCoverage = address.is_in_coverage !== false;
             return this.renderAddressRow({
                 key: String(address.id),
@@ -1447,7 +1435,7 @@ export class SallaBulletDelivery {
                 "s-bullet-delivery-location-btn": true,
                 "s-bullet-delivery-location-btn--full": true,
                 "s-bullet-delivery-location-btn--loading": this.loadingNearestBranch,
-            }, onClick: () => this.handleFindNearestBranch(), disabled: this.loadingNearestBranch }, this.loadingNearestBranch ? (h("salla-loading", { size: "sm" })) : (h("span", { class: "s-bullet-delivery-location-icon", innerHTML: GPS, "aria-hidden": "true" })), h("span", null, Salla.lang.get("pages.checkout.nearest_to_my_location")))), this.locationError && this.activeTab === "branch" && (h("span", { class: "s-bullet-delivery-error" }, this.locationError))));
+            }, onClick: () => this.handleFindNearestBranch(), disabled: this.loadingNearestBranch }, this.loadingNearestBranch ? (h("span", { class: "s-bullet-delivery-location-icon", "aria-hidden": "true" }, h("salla-skeleton", { height: "18px", width: "18px" }))) : (h("span", { class: "s-bullet-delivery-location-icon", innerHTML: GPS, "aria-hidden": "true" })), h("span", null, Salla.lang.get("pages.checkout.nearest_to_my_location")))), this.locationError && this.activeTab === "branch" && (h("span", { class: "s-bullet-delivery-error" }, this.locationError))));
     }
     renderBranchList() {
         if (this.loadingBranches) {
@@ -1517,10 +1505,14 @@ export class SallaBulletDelivery {
     handleAfterAddToCart() {
         if (this.openingType !== "after_add_to_cart")
             return;
-        if (this.hasBeenShownThisSession())
+        const canOpenForIncompleteIntent = this.shouldPromptIncompleteIntentThisSession();
+        if (this.hasBeenShownThisSession() && !canOpenForIncompleteIntent)
             return;
         if (this.modal?.hasAttribute?.("visible"))
             return;
+        if (canOpenForIncompleteIntent) {
+            this.markIncompleteIntentPrompted();
+        }
         this.open();
     }
     overrideScopeSwitchUI() {
@@ -1528,13 +1520,17 @@ export class SallaBulletDelivery {
         const btn = document.querySelector('[onclick*="scopes"]');
         if (!btn)
             return;
+        const hasIntentWithType = !!intent && (intent.type === "address" || intent.type === "branch");
+        if (!hasIntentWithType) {
+            btn.style.display = "none";
+            btn.onclick = () => this.open();
+            return;
+        }
         const trunc = (s, max) => s && s.length > max ? `${s.slice(0, max)}...` : (s ?? "");
-        const label = !intent
-            ? Salla.lang.get("common.titles.shipping")
-            : intent.type === "branch"
-                ? `${Salla.lang.get("mobile_app.strings.pickup")} ${Salla.lang.get("common.elements.from")} ${trunc(intent.branch_details?.name, 20)}`
-                : `${Salla.lang.get("mobile_app.strings.delivery")} ${Salla.lang.get("common.elements.to")} ${trunc(intent.address_details?.city?.name, 10)}`;
-        btn.style.display = intent ? "" : "none";
+        const label = intent.type === "branch"
+            ? `${Salla.lang.get("mobile_app.strings.pickup")} ${Salla.lang.get("common.elements.from")} ${trunc(intent.branch_details?.name, 20)}`
+            : `${Salla.lang.get("mobile_app.strings.delivery")} ${Salla.lang.get("common.elements.to")} ${trunc(intent.address_details?.city?.name, 10)}`;
+        btn.style.display = "inline-flex";
         btn.onclick = () => this.open();
         const span = btn.querySelector('span:not([class*="sicon"]):not([class*="icon"])');
         if (span) {
@@ -1550,6 +1546,31 @@ export class SallaBulletDelivery {
         await Salla.onReady();
         try {
             this.overrideScopeSwitchUI();
+            this.cartSubmittingHandler = async () => {
+                if (this.pendingCartSubmitPromise) {
+                    await this.pendingCartSubmitPromise;
+                    return;
+                }
+                // Logged-in users with a complete intent can continue checkout without re-prompting.
+                if (this.hasCompleteIntentForLoggedInUser()) {
+                    return;
+                }
+                this.cartSubmitConfirmationPending = true;
+                this.pendingCartSubmitPromise = new Promise((resolve) => {
+                    this.pendingCartSubmitResolver = resolve;
+                    if (this.isGuestUser()) {
+                        Salla.auth.setCanRedirect(false);
+                        Salla.event.dispatch("login::open", {
+                            withoutReload: true,
+                            source: "cart-submit",
+                        });
+                        return;
+                    }
+                    this.open();
+                });
+                await this.pendingCartSubmitPromise;
+            };
+            Salla.cart.event.onSubmitting(this.cartSubmittingHandler);
         }
         catch (e) {
             console.warn("SallaBulletDelivery: overrideScopeSwitchUI failed", e);
@@ -1557,11 +1578,40 @@ export class SallaBulletDelivery {
         Salla.event.on("bullet-delivery::open", this.bulletDeliveryOpenHandler);
         this.closeHandler = this.close.bind(this);
         Salla.event.on("bullet-delivery::close", this.closeHandler);
-        // Listen for successful login to sync guest session to user profile (AC7)
-        this.guestLoginSyncHandler = this.handleGuestToRegisteredSync.bind(this);
-        Salla.event.on("login::success", this.guestLoginSyncHandler);
-        Salla.event.on("auth::logged-in", this.guestLoginSyncHandler);
         this.isRTL = Salla.config.get("theme.is_rtl");
+        this.authLoggedInHandler = () => {
+            if (this.cartSubmitConfirmationPending) {
+                Salla.event.dispatch("login::close");
+                if (this.hasCompleteIntentForLoggedInUser()) {
+                    this.resolvePendingCartSubmit();
+                    return;
+                }
+                if (!this.modal?.hasAttribute?.("visible")) {
+                    this.open();
+                }
+                return;
+            }
+            // Always prompt after login when intent is incomplete, regardless of prior prompted flags.
+            if (!this.hasIncompleteUserAddressIntent())
+                return;
+            if (this.modal?.hasAttribute?.("visible"))
+                return;
+            this.open();
+        };
+        Salla.event.on("auth::logged.in", this.authLoggedInHandler);
+        this.authLoggedOutHandler = () => {
+            this.clearBulletDeliveryStoredData();
+        };
+        Salla.event.on("auth::logged.out", this.authLoggedOutHandler);
+        this.loginClosedHandler = () => {
+            // Guest cart-submit flow opens login first; if login is dismissed, unblock submit gate.
+            if (!this.cartSubmitConfirmationPending || !this.isGuestUser())
+                return;
+            if (this.hasCompleteIntentForLoggedInUser())
+                return;
+            this.resolvePendingCartSubmit();
+        };
+        Salla.event.on("salla-login::closed", this.loginClosedHandler);
         // Listen for add-to-cart events for 'after_add_to_cart' opening strategy (after salla is ready)
         this.cartItemAddedHandler = () => this.handleAfterAddToCart();
         if (typeof Salla.cart?.event?.onItemAdded === "function") {
@@ -1573,7 +1623,7 @@ export class SallaBulletDelivery {
         }
     }
     render() {
-        return (h(Host, { key: '5d79f6404692b4a68504770a54f46c9e5161e533', class: "s-bullet-delivery" }, h("salla-modal", { key: 'f123012f8593e20eeb14ebf59fc8dc5af9bbe12b', ref: (modal) => {
+        return (h(Host, { key: '751566707c28202b5ccf4ecde28bfb09550ae886', class: "s-bullet-delivery" }, h("salla-modal", { key: '25a18755aa4aa85b55f08bb73829e30833ca5328', ref: (modal) => {
                 this.modal = modal;
             }, isClosable: !this.isRequired, class: "s-bullet-delivery-modal", isLoading: this.loading, width: "sm" }, this.loading ? (this.renderSkeleton()) : (h("div", { class: "s-bullet-delivery-inner" }, this.viewMode === "main" && this.renderMainView(), this.viewMode === "add-address" && this.renderAddAddressForm())))));
     }
@@ -1593,12 +1643,22 @@ export class SallaBulletDelivery {
                 if (!this.hasBeenShownThisSession()) {
                     this.open();
                 }
+                else if (this.shouldPromptIncompleteIntentThisSession()) {
+                    this.markIncompleteIntentPrompted();
+                    this.open();
+                }
                 break;
             case "on_cart_click":
                 // Open automatically when user is on the cart page
                 if (Salla.url.is_page("cart")) {
-                    Salla.storage.session.get(this.sessionShownKey) !== true &&
+                    const shown = this.getShownStorage().get(this.sessionShownKey) === true;
+                    if (!shown) {
+                        this.open();
+                    }
+                    else if (this.shouldPromptIncompleteIntentThisSession()) {
+                        this.markIncompleteIntentPrompted();
                         this.open();
+                    }
                 }
                 break;
             case "after_add_to_cart":
@@ -1622,11 +1682,6 @@ export class SallaBulletDelivery {
             Salla.event.off("bullet-delivery::close", this.closeHandler);
             this.closeHandler = null;
         }
-        if (this.guestLoginSyncHandler) {
-            Salla.event.off("login::success", this.guestLoginSyncHandler);
-            Salla.event.off("auth::logged-in", this.guestLoginSyncHandler);
-            this.guestLoginSyncHandler = null;
-        }
         if (this.cartItemAddedHandler) {
             if (this.useCartEventApi && typeof Salla.cart?.event?.offItemAdded === "function") {
                 Salla.cart.event.offItemAdded(this.cartItemAddedHandler);
@@ -1636,6 +1691,27 @@ export class SallaBulletDelivery {
             }
             this.cartItemAddedHandler = null;
         }
+        if (this.cartSubmittingHandler) {
+            if (typeof Salla.cart?.event?.offSubmitting === "function") {
+                Salla.cart.event.offSubmitting(this.cartSubmittingHandler);
+            }
+            else {
+                Salla.event.off("cart::submitting", this.cartSubmittingHandler);
+            }
+            this.cartSubmittingHandler = null;
+        }
+        if (this.authLoggedInHandler) {
+            Salla.event.off("auth::logged.in", this.authLoggedInHandler);
+            this.authLoggedInHandler = null;
+        }
+        if (this.authLoggedOutHandler) {
+            Salla.event.off("auth::logged.out", this.authLoggedOutHandler);
+            this.authLoggedOutHandler = null;
+        }
+        if (this.loginClosedHandler) {
+            Salla.event.off("salla-login::closed", this.loginClosedHandler);
+            this.loginClosedHandler = null;
+        }
     }
     static get is() { return "salla-bullet-delivery"; }
     static get originalStyleUrls() {