From 6a4dfd4c2d42b0f35e9a6644e3ae76bb59b1c1e9 Mon Sep 17 00:00:00 2001
From: isaacclad <sense.corporate@gmail.com>
Date: Thu, 23 Jul 2026 22:37:27 +0000
Subject: [PATCH] Force Paystack checkout into the sheet mount on first insert.

Redirect first iframe append into the Ladill sheet body and keep absolute
fill styles applied so checkout is not a second full-screen modal.
---
 .../views/partials/paystack-sheet.blade.php   | 1064 +++++++++++++++--
 1 file changed, 963 insertions(+), 101 deletions(-)

diff --git a/resources/views/partials/paystack-sheet.blade.php b/resources/views/partials/paystack-sheet.blade.php
index 4aee647..3c63f5e 100644
--- a/resources/views/partials/paystack-sheet.blade.php
+++ b/resources/views/partials/paystack-sheet.blade.php
@@ -13,7 +13,7 @@
       - publicKey (string, optional) — unused by resumeTransaction; kept for callers
       - returnUrl (string, optional) — where to go after Inline onSuccess (?reference=)
 
-    Paystack checkout.paystack.com cannot be iframed (X-Frame-Options: SAMEORIGIN).
+    checkout.paystack.com cannot be iframed (X-Frame-Options: SAMEORIGIN).
     Primary path: Paystack Inline JS (PaystackPop.resumeTransaction) — in-page overlay,
     not a separate browser tab. Same-origin URLs (e.g. MoMo waiting) still use iframe.
 --}}
@@ -44,7 +44,8 @@
 @once
 <script>
 (function () {
-    if (window.LadillPayCheckout) return;
+    if (window.__ladillPayCheckoutBootstrapped) return;
+    window.__ladillPayCheckoutBootstrapped = true;
 
     var INLINE_SRC = 'https://js.paystack.co/v2/inline.js';
     var inlineLoading = null;
@@ -94,6 +95,10 @@
         inlineLoading = new Promise(function (resolve, reject) {
             var existing = document.querySelector('script[data-ladill-paystack-inline]');
             if (existing) {
+                if (window.PaystackPop) {
+                    resolve(window.PaystackPop);
+                    return;
+                }
                 existing.addEventListener('load', function () { resolve(window.PaystackPop); });
                 existing.addEventListener('error', function () { reject(new Error('Paystack script failed')); });
                 return;
@@ -112,6 +117,15 @@
         return inlineLoading;
     }
 
+    // Warm the Paystack script early so resumeTransaction is ready on Pay click.
+    if (document.readyState === 'complete' || document.readyState === 'interactive') {
+        loadInlineJs().catch(function () {});
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            loadInlineJs().catch(function () {});
+        });
+    }
+
     function buildReturnUrl(returnUrl, reference) {
         if (!returnUrl || !reference) return '';
         try {
@@ -131,14 +145,635 @@
             }
         } catch (e) {}
         activePopup = null;
+        setPaystackContainActive(false);
     }
 
-    function ensureStore() {
-        if (!window.Alpine || typeof window.Alpine.store !== 'function') return null;
-        if (window.Alpine.store('ladillPayCheckout')) {
-            return window.Alpine.store('ladillPayCheckout');
+    // Paystack Inline always body-appends a full-viewport modal (position:fixed 100%).
+    // Strategy:
+    //  1) On FIRST append only, put checkout iframe into our sheet mount (no later reparent
+    //     — reparent after load reloads the frame and breaks Paystack).
+    //  2) Force position:absolute + fill mount (fixed+100% always paints the whole viewport
+    //     even when the node is nested under the sheet).
+    //  3) Continuously re-apply styles (Paystack rewrites style on open/animate).
+    //  4) Hide Paystack's own dimmer; Ladill sheet owns backdrop + chrome.
+    var PAYSTACK_IFRAME_ALLOW = 'payment *; fullscreen *; clipboard-read *; clipboard-write *; publickey-credentials-get *';
+    var PAYSTACK_ALLOW_FEATURES = ['payment', 'fullscreen', 'clipboard-read', 'clipboard-write', 'publickey-credentials-get'];
+    var activeMountEl = null;
+    var activeBodyEl = null;
+    var pinRafId = 0;
+    var lastPinRect = null;
+    var nativeAppendChild = Node.prototype.appendChild;
+    var nativeInsertBefore = Node.prototype.insertBefore;
+
+    function isElementShown(el) {
+        if (!el || el.nodeType !== 1) return false;
+        if (el.getAttribute && el.getAttribute('aria-hidden') === 'true') return false;
+        var p = el;
+        while (p && p.nodeType === 1) {
+            try {
+                var s = window.getComputedStyle(p);
+                if (s.display === 'none' || s.visibility === 'hidden') return false;
+            } catch (e) {}
+            p = p.parentElement;
         }
-        window.Alpine.store('ladillPayCheckout', {
+        return true;
+    }
+
+    function resolveOpenSheet() {
+        var sheets = document.querySelectorAll('[data-ladill-pay-sheet]');
+        var fallback = null;
+        for (var i = 0; i < sheets.length; i++) {
+            var sheet = sheets[i];
+            if (!fallback) fallback = sheet;
+            if (sheet.getAttribute('aria-hidden') !== 'true') return sheet;
+        }
+        for (var j = 0; j < sheets.length; j++) {
+            if (isElementShown(sheets[j])) return sheets[j];
+        }
+        return fallback;
+    }
+
+    function resolvePaystackMount() {
+        var sheet = resolveOpenSheet();
+        if (sheet) {
+            var mount = sheet.querySelector('[data-ladill-pay-mount]');
+            if (mount) return mount;
+            var body = sheet.querySelector('[data-ladill-pay-body]');
+            if (body) return body;
+        }
+        return document.querySelector('[data-ladill-pay-mount]')
+            || document.querySelector('[data-ladill-pay-body]');
+    }
+
+    function getPaystackMount() {
+        if (activeMountEl && activeMountEl.isConnected) return activeMountEl;
+        return resolvePaystackMount();
+    }
+
+    function getPaystackBody() {
+        if (activeBodyEl && activeBodyEl.isConnected) return activeBodyEl;
+        var mount = getPaystackMount();
+        if (mount) {
+            var body = mount.closest('[data-ladill-pay-body]');
+            if (body) return body;
+        }
+        var sheet = resolveOpenSheet();
+        return sheet ? sheet.querySelector('[data-ladill-pay-body]') : document.querySelector('[data-ladill-pay-body]');
+    }
+
+    function armPaystackMount() {
+        var sheet = resolveOpenSheet();
+        activeMountEl = sheet
+            ? (sheet.querySelector('[data-ladill-pay-mount]') || sheet.querySelector('[data-ladill-pay-body]'))
+            : resolvePaystackMount();
+        activeBodyEl = sheet
+            ? sheet.querySelector('[data-ladill-pay-body]')
+            : getPaystackBody();
+        // Keep the mount measurable while we pin (Alpine x-show can set display:none).
+        try {
+            if (activeMountEl) {
+                activeMountEl.style.setProperty('display', 'block', 'important');
+                activeMountEl.style.setProperty('visibility', 'visible', 'important');
+                activeMountEl.style.setProperty('pointer-events', 'none', 'important');
+            }
+        } catch (e) {}
+        return activeMountEl;
+    }
+
+    function measurePinTarget() {
+        var el = getPaystackMount() || getPaystackBody();
+        if (!el) return null;
+        var rect = el.getBoundingClientRect();
+        if (rect.width >= 40 && rect.height >= 40) {
+            return rect;
+        }
+        // Mount may still be display:none — fall back to the white body panel.
+        var body = getPaystackBody();
+        if (body && body !== el) {
+            rect = body.getBoundingClientRect();
+            if (rect.width >= 40 && rect.height >= 40) return rect;
+        }
+        return null;
+    }
+
+    function waitForPinTarget(timeoutMs) {
+        timeoutMs = timeoutMs || 1200;
+        return new Promise(function (resolve) {
+            var start = Date.now();
+            var tick = function () {
+                armPaystackMount();
+                var rect = measurePinTarget();
+                if (rect) {
+                    syncPaystackMountBox();
+                    resolve(rect);
+                    return;
+                }
+                if (Date.now() - start >= timeoutMs) {
+                    syncPaystackMountBox();
+                    resolve(null);
+                    return;
+                }
+                if (typeof requestAnimationFrame === 'function') {
+                    requestAnimationFrame(tick);
+                } else {
+                    setTimeout(tick, 16);
+                }
+            };
+            tick();
+        });
+    }
+
+    function isPaystackCheckoutFrame(iframe) {
+        if (!iframe || !iframe.tagName || iframe.tagName.toUpperCase() !== 'IFRAME') return false;
+        var id = (iframe.id || '').toLowerCase();
+        return id.indexOf('inline-checkout') === 0 || id.indexOf('embed-checkout') === 0;
+    }
+
+    function isPaystackBackgroundFrame(iframe) {
+        if (!iframe || !iframe.tagName || iframe.tagName.toUpperCase() !== 'IFRAME') return false;
+        var id = (iframe.id || '').toLowerCase();
+        return id.indexOf('inline-background') === 0;
+    }
+
+    function isPaystackIframe(iframe) {
+        if (!iframe || !iframe.tagName || iframe.tagName.toUpperCase() !== 'IFRAME') return false;
+        var id = (iframe.id || '').toLowerCase();
+        var name = (iframe.getAttribute('name') || iframe.name || '').toLowerCase();
+        var src = '';
+        try { src = (iframe.getAttribute('src') || iframe.src || '').toLowerCase(); } catch (e) {}
+        return src.indexOf('paystack') !== -1
+            || src.indexOf('checkout.paystack.com') !== -1
+            || id.indexOf('paystack') !== -1
+            || id.indexOf('inline-checkout') !== -1
+            || id.indexOf('inline-background') !== -1
+            || id.indexOf('embed-checkout') !== -1
+            || name.indexOf('paystack') !== -1
+            || name.indexOf('inline-checkout') !== -1;
+    }
+
+    function mergeIframeAllow(current) {
+        var parts = current
+            ? current.split(';').map(function (p) { return p.trim(); }).filter(Boolean)
+            : [];
+        var lower = parts.map(function (p) { return p.toLowerCase(); });
+        PAYSTACK_ALLOW_FEATURES.forEach(function (perm) {
+            if (!lower.some(function (p) { return p === perm || p.indexOf(perm + ' ') === 0; })) {
+                parts.push(perm + ' *');
+            }
+        });
+        return parts.join('; ') || PAYSTACK_IFRAME_ALLOW;
+    }
+
+    function applyIframePermissions(iframe) {
+        if (!iframe || !iframe.setAttribute) return;
+        try {
+            var next = mergeIframeAllow((iframe.getAttribute('allow') || '').trim());
+            if ((iframe.getAttribute('allow') || '') !== next) {
+                iframe.setAttribute('allow', next);
+            }
+            if (!iframe.hasAttribute('allowfullscreen')) {
+                iframe.setAttribute('allowfullscreen', '');
+            }
+            try { iframe.allowFullscreen = true; } catch (e) {}
+        } catch (e) {}
+    }
+
+    function isCheckoutFrame(iframe) {
+        if (!iframe || !iframe.tagName || iframe.tagName.toUpperCase() !== 'IFRAME') return false;
+        var id = (iframe.id || '');
+        return id.indexOf('inline-checkout') === 0
+            || id.indexOf('embed-checkout') === 0
+            || iframe.hasAttribute('data-ladill-pay-contained');
+    }
+
+    function styleMountAsContainer(mount) {
+        if (!mount) return;
+        try {
+            // Create a fixed containing block so position:fixed descendants still
+            // cannot escape to the viewport (transform + isolation).
+            var s = mount.style;
+            s.setProperty('position', 'absolute', 'important');
+            s.setProperty('inset', '0', 'important');
+            s.setProperty('left', '0', 'important');
+            s.setProperty('top', '0', 'important');
+            s.setProperty('right', '0', 'important');
+            s.setProperty('bottom', '0', 'important');
+            s.setProperty('width', '100%', 'important');
+            s.setProperty('height', '100%', 'important');
+            s.setProperty('overflow', 'hidden', 'important');
+            s.setProperty('display', 'block', 'important');
+            s.setProperty('visibility', 'visible', 'important');
+            s.setProperty('background', '#fff', 'important');
+            s.setProperty('transform', 'translateZ(0)', 'important');
+            s.setProperty('isolation', 'isolate', 'important');
+            s.setProperty('contain', 'layout size', 'important');
+            s.setProperty('z-index', '1', 'important');
+        } catch (e) {}
+    }
+
+    function styleCheckoutInMount(iframe) {
+        if (!iframe) return;
+        try {
+            iframe.setAttribute('data-ladill-pay-contained', '1');
+            iframe.setAttribute('data-ladill-pay-mode', 'mount');
+            var s = iframe.style;
+            // Absolute fill of mount — NOT position:fixed 100% (that always paints viewport).
+            s.setProperty('position', 'absolute', 'important');
+            s.setProperty('left', '0', 'important');
+            s.setProperty('top', '0', 'important');
+            s.setProperty('right', '0', 'important');
+            s.setProperty('bottom', '0', 'important');
+            s.setProperty('width', '100%', 'important');
+            s.setProperty('height', '100%', 'important');
+            s.setProperty('max-width', 'none', 'important');
+            s.setProperty('max-height', 'none', 'important');
+            s.setProperty('margin', '0', 'important');
+            s.setProperty('padding', '0', 'important');
+            s.setProperty('border', '0', 'important');
+            s.setProperty('border-radius', '0', 'important');
+            s.setProperty('z-index', '2', 'important');
+            s.setProperty('visibility', 'visible', 'important');
+            s.setProperty('display', 'block', 'important');
+            s.setProperty('opacity', '1', 'important');
+            s.setProperty('background', '#fff', 'important');
+            s.setProperty('background-color', '#fff', 'important');
+            s.setProperty('pointer-events', 'auto', 'important');
+            s.setProperty('color-scheme', 'light', 'important');
+            s.setProperty('transform', 'none', 'important');
+            applyIframePermissions(iframe);
+        } catch (e) {}
+    }
+
+    function styleCheckoutPinnedToRect(iframe, rect) {
+        if (!iframe || !rect) return;
+        try {
+            iframe.setAttribute('data-ladill-pay-contained', '1');
+            iframe.setAttribute('data-ladill-pay-mode', 'pin');
+            var s = iframe.style;
+            var left = Math.max(0, Math.round(rect.left));
+            var top = Math.max(0, Math.round(rect.top));
+            var width = Math.max(0, Math.round(rect.width));
+            var height = Math.max(0, Math.round(rect.height));
+            // Direct pixels — CSS vars in setProperty are unreliable across browsers.
+            s.setProperty('position', 'fixed', 'important');
+            s.setProperty('left', left + 'px', 'important');
+            s.setProperty('top', top + 'px', 'important');
+            s.setProperty('right', 'auto', 'important');
+            s.setProperty('bottom', 'auto', 'important');
+            s.setProperty('width', width + 'px', 'important');
+            s.setProperty('height', height + 'px', 'important');
+            s.setProperty('max-width', 'none', 'important');
+            s.setProperty('max-height', 'none', 'important');
+            s.setProperty('margin', '0', 'important');
+            s.setProperty('padding', '0', 'important');
+            s.setProperty('border', '0', 'important');
+            s.setProperty('border-radius', '0', 'important');
+            s.setProperty('z-index', '10050', 'important');
+            s.setProperty('visibility', 'visible', 'important');
+            s.setProperty('display', 'block', 'important');
+            s.setProperty('opacity', '1', 'important');
+            s.setProperty('background', '#fff', 'important');
+            s.setProperty('background-color', '#fff', 'important');
+            s.setProperty('pointer-events', 'auto', 'important');
+            s.setProperty('color-scheme', 'light', 'important');
+            s.setProperty('transform', 'none', 'important');
+            applyIframePermissions(iframe);
+        } catch (e) {}
+    }
+
+    function pinCheckoutIframe(iframe) {
+        if (!iframe || !window.__ladillContainPaystack) return;
+        var mount = getPaystackMount();
+        if (mount) {
+            styleMountAsContainer(mount);
+            // Prefer living inside the mount (absolute fill). Only first-append
+            // redirects into mount; if already elsewhere, pin with fixed+pixels.
+            if (iframe.parentNode === mount) {
+                styleCheckoutInMount(iframe);
+                return;
+            }
+        }
+        var rect = measurePinTarget() || lastPinRect;
+        if (rect) {
+            lastPinRect = rect;
+            styleCheckoutPinnedToRect(iframe, rect);
+        }
+    }
+
+    function hidePaystackBackground(iframe) {
+        if (!iframe) return;
+        try {
+            iframe.setAttribute('data-ladill-pay-bg-hidden', '1');
+            var s = iframe.style;
+            s.setProperty('display', 'none', 'important');
+            s.setProperty('visibility', 'hidden', 'important');
+            s.setProperty('pointer-events', 'none', 'important');
+            s.setProperty('opacity', '0', 'important');
+            s.setProperty('z-index', '-1', 'important');
+            s.setProperty('width', '0', 'important');
+            s.setProperty('height', '0', 'important');
+            s.setProperty('left', '-9999px', 'important');
+            s.setProperty('top', '-9999px', 'important');
+            s.setProperty('position', 'fixed', 'important');
+        } catch (e) {}
+    }
+
+    function containPaystackIframe(iframe) {
+        if (!iframe || !window.__ladillContainPaystack) return;
+        if (isPaystackBackgroundFrame(iframe)) {
+            hidePaystackBackground(iframe);
+            return;
+        }
+        if (!isCheckoutFrame(iframe) && !isPaystackCheckoutFrame(iframe)) {
+            if (isPaystackIframe(iframe)) applyIframePermissions(iframe);
+            return;
+        }
+        pinCheckoutIframe(iframe);
+    }
+
+    function ensurePaystackContained(root) {
+        if (!window.__ladillContainPaystack) return;
+        try {
+            syncPaystackMountBox();
+            var bgs = document.querySelectorAll('iframe[id^="inline-background"]');
+            for (var j = 0; j < bgs.length; j++) hidePaystackBackground(bgs[j]);
+
+            var checks = document.querySelectorAll(
+                'iframe[id^="inline-checkout"], iframe[id^="embed-checkout"], iframe[data-ladill-pay-contained]'
+            );
+            for (var k = 0; k < checks.length; k++) pinCheckoutIframe(checks[k]);
+
+            if (root && root !== document && root.querySelectorAll) {
+                var nested = root.querySelectorAll('iframe');
+                for (var i = 0; i < nested.length; i++) containPaystackIframe(nested[i]);
+            }
+        } catch (e) {}
+    }
+
+    function ensurePaystackIframePermissions(root) {
+        try {
+            var scope = root || document;
+            var nodes = scope.querySelectorAll ? scope.querySelectorAll('iframe') : [];
+            for (var i = 0; i < nodes.length; i++) {
+                var iframe = nodes[i];
+                if (isPaystackIframe(iframe) || isCheckoutFrame(iframe)) {
+                    applyIframePermissions(iframe);
+                }
+            }
+            ensurePaystackContained(scope);
+        } catch (e) {}
+    }
+
+    function syncPaystackMountBox() {
+        try {
+            if (!window.__ladillContainPaystack) return;
+            var rect = measurePinTarget();
+            var root = document.documentElement;
+            if (!rect) {
+                root.style.setProperty('--ladill-pay-left', '0px');
+                root.style.setProperty('--ladill-pay-top', '0px');
+                root.style.setProperty('--ladill-pay-width', '0px');
+                root.style.setProperty('--ladill-pay-height', '0px');
+                return;
+            }
+            lastPinRect = rect;
+            root.style.setProperty('--ladill-pay-left', Math.max(0, Math.round(rect.left)) + 'px');
+            root.style.setProperty('--ladill-pay-top', Math.max(0, Math.round(rect.top)) + 'px');
+            root.style.setProperty('--ladill-pay-width', Math.max(0, Math.round(rect.width)) + 'px');
+            root.style.setProperty('--ladill-pay-height', Math.max(0, Math.round(rect.height)) + 'px');
+        } catch (e) {}
+    }
+
+    function startPinLoop() {
+        stopPinLoop();
+        var tick = function () {
+            if (!window.__ladillContainPaystack) {
+                pinRafId = 0;
+                return;
+            }
+            ensurePaystackContained(document);
+            pinRafId = typeof requestAnimationFrame === 'function'
+                ? requestAnimationFrame(tick)
+                : setTimeout(tick, 32);
+        };
+        tick();
+    }
+
+    function stopPinLoop() {
+        if (!pinRafId) return;
+        if (typeof cancelAnimationFrame === 'function') {
+            cancelAnimationFrame(pinRafId);
+        } else {
+            clearTimeout(pinRafId);
+        }
+        pinRafId = 0;
+    }
+
+    function setPaystackContainActive(active) {
+        window.__ladillContainPaystack = !!active;
+        try {
+            document.documentElement.classList.toggle('ladill-pay-inline-active', !!active);
+        } catch (e) {}
+        if (active) {
+            armPaystackMount();
+            styleMountAsContainer(getPaystackMount());
+            installIframeAllowHook();
+            installAppendHook();
+            ensurePaystackContained(document);
+            syncPaystackMountBox();
+            startPinLoop();
+            if (!window.__ladillPayMountResizeBound) {
+                window.__ladillPayMountResizeBound = true;
+                window.addEventListener('resize', function () {
+                    syncPaystackMountBox();
+                    ensurePaystackContained(document);
+                }, { passive: true });
+                window.addEventListener('orientationchange', function () {
+                    setTimeout(function () {
+                        syncPaystackMountBox();
+                        ensurePaystackContained(document);
+                    }, 100);
+                }, { passive: true });
+                window.addEventListener('scroll', function () {
+                    if (window.__ladillContainPaystack) {
+                        syncPaystackMountBox();
+                        ensurePaystackContained(document);
+                    }
+                }, { passive: true, capture: true });
+            }
+        } else {
+            stopPinLoop();
+            lastPinRect = null;
+            try {
+                if (activeMountEl) {
+                    activeMountEl.style.removeProperty('display');
+                    activeMountEl.style.removeProperty('visibility');
+                    activeMountEl.style.removeProperty('pointer-events');
+                    activeMountEl.style.removeProperty('transform');
+                    activeMountEl.style.removeProperty('isolation');
+                    activeMountEl.style.removeProperty('contain');
+                }
+            } catch (e) {}
+            activeMountEl = null;
+            activeBodyEl = null;
+            try {
+                var root = document.documentElement;
+                root.style.removeProperty('--ladill-pay-left');
+                root.style.removeProperty('--ladill-pay-top');
+                root.style.removeProperty('--ladill-pay-width');
+                root.style.removeProperty('--ladill-pay-height');
+            } catch (e) {}
+        }
+    }
+
+    function installIframeAllowHook() {
+        if (window.__ladillIframeAllowHook) return;
+        window.__ladillIframeAllowHook = true;
+        try {
+            var orig = Document.prototype.createElement;
+            Document.prototype.createElement = function (tagName, options) {
+                var el = options !== undefined ? orig.call(this, tagName, options) : orig.call(this, tagName);
+                try {
+                    if (String(tagName).toLowerCase() === 'iframe') {
+                        applyIframePermissions(el);
+                    }
+                } catch (e) {}
+                return el;
+            };
+        } catch (e) {}
+    }
+
+    function installAppendHook() {
+        if (window.__ladillAppendHook) return;
+        window.__ladillAppendHook = true;
+        try {
+            Node.prototype.appendChild = function (child) {
+                try {
+                    if (window.__ladillContainPaystack && child && child.tagName === 'IFRAME') {
+                        if (isPaystackBackgroundFrame(child)) {
+                            var bg = nativeAppendChild.call(this, child);
+                            hidePaystackBackground(child);
+                            return bg;
+                        }
+                        if (isCheckoutFrame(child) || isPaystackCheckoutFrame(child)
+                            || (child.id || '').indexOf('inline-checkout') === 0
+                            || (child.id || '').indexOf('embed-checkout') === 0) {
+                            var mount = getPaystackMount();
+                            if (mount) {
+                                styleMountAsContainer(mount);
+                                // FIRST insert goes into mount — avoids later reparent reload.
+                                var mounted = nativeAppendChild.call(mount, child);
+                                styleCheckoutInMount(child);
+                                return mounted;
+                            }
+                        }
+                    }
+                } catch (e) {}
+                var result = nativeAppendChild.call(this, child);
+                try {
+                    if (window.__ladillContainPaystack && child && child.tagName === 'IFRAME') {
+                        containPaystackIframe(child);
+                    }
+                } catch (e2) {}
+                return result;
+            };
+
+            Node.prototype.insertBefore = function (child, ref) {
+                try {
+                    if (window.__ladillContainPaystack && child && child.tagName === 'IFRAME') {
+                        if (isPaystackBackgroundFrame(child)) {
+                            var bg = nativeInsertBefore.call(this, child, ref);
+                            hidePaystackBackground(child);
+                            return bg;
+                        }
+                        if (isCheckoutFrame(child) || isPaystackCheckoutFrame(child)) {
+                            var mount = getPaystackMount();
+                            if (mount) {
+                                styleMountAsContainer(mount);
+                                var mounted = nativeAppendChild.call(mount, child);
+                                styleCheckoutInMount(child);
+                                return mounted;
+                            }
+                        }
+                    }
+                } catch (e) {}
+                var result = nativeInsertBefore.call(this, child, ref);
+                try {
+                    if (window.__ladillContainPaystack && child && child.tagName === 'IFRAME') {
+                        containPaystackIframe(child);
+                    }
+                } catch (e2) {}
+                return result;
+            };
+        } catch (e) {}
+    }
+
+    function watchPaystackIframes() {
+        if (window.__ladillPaystackIframeWatch) return;
+        window.__ladillPaystackIframeWatch = true;
+        installIframeAllowHook();
+        installAppendHook();
+        ensurePaystackIframePermissions(document);
+
+        try {
+            var obs = new MutationObserver(function (mutations) {
+                var dirty = false;
+                for (var i = 0; i < mutations.length; i++) {
+                    var m = mutations[i];
+                    if (m.type === 'attributes' && m.target) {
+                        if (m.target.tagName && m.target.tagName.toUpperCase() === 'IFRAME') {
+                            if (isPaystackIframe(m.target)) {
+                                applyIframePermissions(m.target);
+                                // Paystack rewrites style when animating the popup open — re-contain.
+                                if (window.__ladillContainPaystack) {
+                                    containPaystackIframe(m.target);
+                                }
+                            }
+                            dirty = true;
+                        }
+                        continue;
+                    }
+                    if (!m.addedNodes || !m.addedNodes.length) continue;
+                    for (var n = 0; n < m.addedNodes.length; n++) {
+                        var node = m.addedNodes[n];
+                        if (!node || node.nodeType !== 1) continue;
+                        if (node.tagName && node.tagName.toUpperCase() === 'IFRAME') {
+                            applyIframePermissions(node);
+                            if (window.__ladillContainPaystack) containPaystackIframe(node);
+                            dirty = true;
+                        } else if (node.querySelectorAll) {
+                            var nested = node.querySelectorAll('iframe');
+                            for (var k = 0; k < nested.length; k++) {
+                                applyIframePermissions(nested[k]);
+                                if (window.__ladillContainPaystack) containPaystackIframe(nested[k]);
+                                dirty = true;
+                            }
+                        }
+                    }
+                }
+                if (dirty) {
+                    ensurePaystackIframePermissions(document);
+                }
+            });
+            obs.observe(document.documentElement || document.body, {
+                childList: true,
+                subtree: true,
+                attributes: true,
+                attributeFilter: ['allow', 'src', 'id', 'name', 'style', 'class'],
+            });
+        } catch (e) {}
+
+        var polls = 0;
+        var pollId = setInterval(function () {
+            ensurePaystackIframePermissions(document);
+            polls += 1;
+            if (polls >= 60) clearInterval(pollId);
+        }, 200);
+    }
+
+
+    function createStoreDefinition() {
+        return {
             frameable: false,
             inline: false,
             ready: false,
@@ -156,6 +791,10 @@
                 cancelInline();
             },
             sync(show, url, accessCode, returnUrl) {
+                url = (url || '').toString();
+                accessCode = (accessCode || '').toString();
+                returnUrl = (returnUrl || '').toString();
+
                 if (!show) {
                     this._launchToken += 1;
                     this.reset();
@@ -165,14 +804,17 @@
                 if (!url && !accessCode) {
                     this.frameable = false;
                     this.inline = false;
-                    this.launching = false;
+                    this.launching = true; // waiting for checkout payload
+                    this.error = '';
                     this._activeCode = '';
+                    setPaystackContainActive(false);
                     return;
                 }
                 if (isFrameable(url)) {
                     this.frameable = true;
                     this.inline = false;
                     this.launching = false;
+                    this.error = '';
                     this._activeCode = '';
                     cancelInline();
                     return;
@@ -187,12 +829,15 @@
                     this.launchInline(code, returnUrl);
                     return;
                 }
-                // Non-Paystack external URL without access_code — cannot embed.
+                // Never navigate to checkout.paystack.com (external tab/window).
                 this.frameable = false;
                 this.inline = false;
                 this.launching = false;
                 this._activeCode = '';
-                this.error = 'Secure checkout could not be opened in-page. Please try again.';
+                setPaystackContainActive(false);
+                this.error = isPaystackCheckoutUrl(url)
+                    ? 'Could not start in-app payment. Please try again.'
+                    : 'Secure checkout could not be opened in-page. Please try again.';
             },
             launchInline(accessCode, returnUrl) {
                 var store = this;
@@ -200,69 +845,121 @@
                 this._activeCode = accessCode;
                 this.launching = true;
                 this.error = '';
-                loadInlineJs().then(function (PaystackPop) {
+                // Wait for the bottomsheet/modal body to lay out, then open Paystack
+                // and pin its body iframe over that loading area (no reparent).
+                var start = function () {
                     if (token !== store._launchToken) return;
-                    if (!PaystackPop) throw new Error('Paystack unavailable');
-                    cancelInline();
-                    var popup = new PaystackPop();
-                    activePopup = popup;
-                    popup.resumeTransaction(accessCode, {
-                        onLoad: function () {
-                            if (token !== store._launchToken) return;
-                            store.launching = false;
-                        },
-                        onSuccess: function (transaction) {
-                            if (token !== store._launchToken) return;
-                            store.launching = false;
-                            var reference = (transaction && (transaction.reference || transaction.trxref)) || '';
-                            var dest = buildReturnUrl(returnUrl, reference);
-                            if (dest) {
-                                window.location.assign(dest);
-                                return;
+                    armPaystackMount();
+                    setPaystackContainActive(true);
+                    watchPaystackIframes();
+                    waitForPinTarget(1200).then(function () {
+                        if (token !== store._launchToken) return;
+                        return loadInlineJs();
+                    }).then(function (PaystackPop) {
+                        if (token !== store._launchToken) return;
+                        if (!PaystackPop) throw new Error('Paystack unavailable');
+                        try {
+                            if (activePopup && typeof activePopup.cancelTransaction === 'function') {
+                                activePopup.cancelTransaction();
                             }
-                            // Fallback: reload so server can reconcile via webhook.
-                            window.location.reload();
-                        },
-                        onCancel: function () {
-                            if (token !== store._launchToken) return;
-                            store.launching = false;
-                            store._activeCode = '';
-                            activePopup = null;
-                            window.dispatchEvent(new CustomEvent('ladill-pay-cancelled'));
-                        },
-                        onError: function (err) {
-                            if (token !== store._launchToken) return;
-                            store.launching = false;
-                            store._activeCode = '';
-                            store.error = (err && err.message) ? String(err.message) : 'Could not open secure payment.';
-                        },
+                        } catch (e) {}
+                        activePopup = null;
+                        armPaystackMount();
+                        setPaystackContainActive(true);
+                        syncPaystackMountBox();
+                        // PaystackPop constructor appends iframes to document.body.
+                        // We leave them there and pin checkout over our sheet body.
+                        var popup = new PaystackPop();
+                        activePopup = popup;
+                        ensurePaystackContained(document);
+                        popup.resumeTransaction(accessCode, {
+                            onLoad: function () {
+                                if (token !== store._launchToken) return;
+                                store.launching = false;
+                                ensurePaystackIframePermissions(document);
+                                ensurePaystackContained(document);
+                                // Alpine swaps header/spinner; re-measure then re-pin.
+                                setTimeout(function () { ensurePaystackContained(document); }, 0);
+                                setTimeout(function () { ensurePaystackContained(document); }, 50);
+                                setTimeout(function () { ensurePaystackContained(document); }, 150);
+                                setTimeout(function () { ensurePaystackContained(document); }, 400);
+                            },
+                            onSuccess: function (transaction) {
+                                if (token !== store._launchToken) return;
+                                store.launching = false;
+                                setPaystackContainActive(false);
+                                var reference = (transaction && (transaction.reference || transaction.trxref)) || '';
+                                var dest = buildReturnUrl(returnUrl, reference);
+                                if (dest) {
+                                    window.location.assign(dest);
+                                    return;
+                                }
+                                window.location.reload();
+                            },
+                            onCancel: function () {
+                                if (token !== store._launchToken) return;
+                                store.launching = false;
+                                store._activeCode = '';
+                                activePopup = null;
+                                setPaystackContainActive(false);
+                                window.dispatchEvent(new CustomEvent('ladill-pay-cancelled'));
+                            },
+                            onError: function (err) {
+                                if (token !== store._launchToken) return;
+                                store.launching = false;
+                                store._activeCode = '';
+                                setPaystackContainActive(false);
+                                store.error = (err && err.message) ? String(err.message) : 'Could not open secure payment.';
+                            },
+                        });
+                        setTimeout(function () { ensurePaystackContained(document); }, 0);
+                        setTimeout(function () { ensurePaystackContained(document); }, 50);
+                        setTimeout(function () { ensurePaystackContained(document); }, 200);
+                        setTimeout(function () { ensurePaystackContained(document); }, 500);
+                    }).catch(function (err) {
+                        if (token !== store._launchToken) return;
+                        store.launching = false;
+                        store._activeCode = '';
+                        setPaystackContainActive(false);
+                        store.error = (err && err.message) ? String(err.message) : 'Could not load payment script.';
                     });
-                }).catch(function (err) {
-                    if (token !== store._launchToken) return;
-                    store.launching = false;
-                    store._activeCode = '';
-                    store.error = (err && err.message) ? String(err.message) : 'Could not load payment script.';
-                });
+                };
+                if (typeof requestAnimationFrame === 'function') {
+                    requestAnimationFrame(function () { requestAnimationFrame(start); });
+                } else {
+                    setTimeout(start, 32);
+                }
             },
-        });
+        };
+    }
+
+    function ensureStore() {
+        if (!window.Alpine || typeof window.Alpine.store !== 'function') return null;
+        try {
+            var existing = window.Alpine.store('ladillPayCheckout');
+            if (existing) return existing;
+        } catch (e) {}
+        window.Alpine.store('ladillPayCheckout', createStoreDefinition());
         return window.Alpine.store('ladillPayCheckout');
     }
 
-    function onAlpineReady() {
+    document.addEventListener('alpine:init', function () {
+        ensureStore();
+    });
+
+    // If Alpine already started (late include), register immediately.
+    if (window.Alpine && window.Alpine.version) {
         ensureStore();
     }
 
-    if (window.Alpine) {
-        onAlpineReady();
-    }
-    document.addEventListener('alpine:init', onAlpineReady);
+    watchPaystackIframes();
 
     window.LadillPayCheckout = {
         isFrameable: isFrameable,
         isPaystackCheckoutUrl: isPaystackCheckoutUrl,
         accessCodeFromUrl: accessCodeFromUrl,
         resolveAccessCode: resolveAccessCode,
-        prepare: function () { return null; },
+        prepare: function () { loadInlineJs().catch(function () {}); return null; },
         cancel: function () {
             cancelInline();
             var store = ensureStore();
@@ -274,32 +971,140 @@
 })();
 </script>
 @endonce
+{{-- Keep Paystack checkout inside the Ladill sheet loading area. --}}
+@once('ladill-paystack-contain-css')
+<style>
+    /* Hide Paystack's own full-screen dimmer — Ladill backdrop owns that. */
+    html.ladill-pay-inline-active iframe[id^="inline-background"],
+    iframe[data-ladill-pay-bg-hidden] {
+        display: none !important;
+        visibility: hidden !important;
+        pointer-events: none !important;
+        opacity: 0 !important;
+        width: 0 !important;
+        height: 0 !important;
+        z-index: -1 !important;
+        left: -9999px !important;
+        top: -9999px !important;
+        position: fixed !important;
+    }
+
+    [data-ladill-pay-mount] {
+        position: absolute;
+        inset: 0;
+        overflow: hidden;
+        background: #fff;
+        min-height: 12rem;
+        /* Containing block so fixed children cannot escape the sheet body. */
+        transform: translateZ(0);
+        isolation: isolate;
+    }
+    html.ladill-pay-inline-active [data-ladill-pay-mount] {
+        display: block !important;
+        visibility: visible !important;
+        pointer-events: auto !important;
+    }
+    html.ladill-pay-inline-active [data-ladill-pay-panel] {
+        /* Ensure panel is a stacking context above page content. */
+        z-index: 1;
+    }
+    html.ladill-pay-inline-active [data-ladill-pay-sheet] {
+        z-index: 9999 !important;
+    }
+
+    /* Preferred: iframe lives inside the mount and fills it. */
+    html.ladill-pay-inline-active [data-ladill-pay-mount] iframe[id^="inline-checkout"],
+    html.ladill-pay-inline-active [data-ladill-pay-mount] iframe[id^="embed-checkout"],
+    html.ladill-pay-inline-active [data-ladill-pay-mount] iframe[data-ladill-pay-contained],
+    html.ladill-pay-inline-active iframe[data-ladill-pay-mode="mount"] {
+        position: absolute !important;
+        left: 0 !important;
+        top: 0 !important;
+        right: 0 !important;
+        bottom: 0 !important;
+        width: 100% !important;
+        height: 100% !important;
+        max-width: none !important;
+        max-height: none !important;
+        margin: 0 !important;
+        padding: 0 !important;
+        border: 0 !important;
+        border-radius: 0 !important;
+        z-index: 2 !important;
+        visibility: visible !important;
+        display: block !important;
+        opacity: 1 !important;
+        background: #fff !important;
+        background-color: #fff !important;
+        color-scheme: light !important;
+        pointer-events: auto !important;
+        transform: none !important;
+    }
+
+    /*
+      Fallback when the frame stays on body: pin with measured pixels.
+      Default 0×0 until JS measures the sheet body (never flash full viewport).
+    */
+    html.ladill-pay-inline-active body > iframe[id^="inline-checkout"],
+    html.ladill-pay-inline-active body > iframe[id^="embed-checkout"],
+    html.ladill-pay-inline-active iframe[data-ladill-pay-mode="pin"] {
+        position: fixed !important;
+        left: var(--ladill-pay-left, 0px) !important;
+        top: var(--ladill-pay-top, 0px) !important;
+        right: auto !important;
+        bottom: auto !important;
+        width: var(--ladill-pay-width, 0px) !important;
+        height: var(--ladill-pay-height, 0px) !important;
+        max-width: none !important;
+        max-height: none !important;
+        margin: 0 !important;
+        padding: 0 !important;
+        border: 0 !important;
+        border-radius: 0 !important;
+        z-index: 10050 !important;
+        visibility: visible !important;
+        display: block !important;
+        opacity: 1 !important;
+        background: #fff !important;
+        background-color: #fff !important;
+        color-scheme: light !important;
+        pointer-events: auto !important;
+        transform: none !important;
+    }
+</style>
+@endonce
 <template x-teleport="body">
-<div x-show="showSheet"
-     x-cloak
-     data-ladill-pay-sheet
-     x-effect="
-        document.documentElement.style.overflow = showSheet ? 'hidden' : '';
-        if (typeof window.LadillPayCheckout !== 'undefined') {
-            window.LadillPayCheckout.ensureStore();
-        }
-        const store = $store.ladillPayCheckout;
-        if (store) {
+{{-- No local x-data: inherit showSheet/checkoutUrl/accessCode from the including scope. --}}
+<div
+    x-init="
+        window.LadillPayCheckout && window.LadillPayCheckout.ensureStore();
+        const runSync = () => {
+            const store = $store.ladillPayCheckout;
+            if (!store) return;
             store.sync(
-                showSheet,
-                typeof checkoutUrl !== 'undefined' ? checkoutUrl : '',
-                typeof accessCode !== 'undefined' ? accessCode : '',
-                typeof returnUrl !== 'undefined' ? returnUrl : ''
+                !!showSheet,
+                (typeof checkoutUrl === 'undefined' || checkoutUrl === null) ? '' : String(checkoutUrl),
+                (typeof accessCode === 'undefined' || accessCode === null) ? '' : String(accessCode),
+                (typeof returnUrl === 'undefined' || returnUrl === null) ? '' : String(returnUrl)
             );
-        }
-     "
-     @keydown.escape.window="if (showSheet) showSheet = false"
-     @ladill-pay-cancelled.window="showSheet = false"
-     class="fixed inset-0 z-[9999] flex items-end justify-center md:items-center md:p-6"
-     role="dialog"
-     aria-modal="true"
-     :aria-hidden="(!showSheet).toString()"
-     aria-label="{{ $sheetAria }}">
+        };
+        $watch('showSheet', () => runSync());
+        $watch('checkoutUrl', () => runSync());
+        $watch('accessCode', () => runSync());
+        $watch('returnUrl', () => runSync());
+        $nextTick(() => runSync());
+    "
+    x-show="showSheet"
+    x-cloak
+    data-ladill-pay-sheet
+    x-effect="document.documentElement.style.overflow = showSheet ? 'hidden' : ''"
+    @keydown.escape.window="if (showSheet) showSheet = false"
+    @ladill-pay-cancelled.window="showSheet = false"
+    class="fixed inset-0 z-[9999] flex items-end justify-center md:items-center md:p-6"
+    role="dialog"
+    aria-modal="true"
+    :aria-hidden="(!showSheet).toString()"
+    aria-label="{{ $sheetAria }}">
 
     <div class="absolute inset-0 bg-black/60"
          data-ladill-pay-backdrop
@@ -313,10 +1118,13 @@
          @click="showSheet = false; window.LadillPayCheckout?.cancel?.()">
     </div>
 
-    {{-- One panel: bottom sheet (mobile) + centered modal (desktop). --}}
+    {{--
+      ONE surface everywhere (POS / Merchant / Mini / Give / Invoice / Events):
+      - Mobile: bottom sheet
+      - Desktop: centered modal
+      - Paystack Inline fills the sheet body loading area (not a second full-screen modal)
+    --}}
     <div data-ladill-pay-panel
-         class="relative flex w-full flex-col overflow-hidden rounded-t-2xl bg-white shadow-2xl md:max-w-lg md:rounded-2xl"
-         style="height: min(90dvh, 720px); max-height: 90dvh; padding-bottom: env(safe-area-inset-bottom, 0px)"
          x-show="showSheet"
          x-transition:enter="transition duration-300 ease-out md:duration-200"
          x-transition:enter-start="translate-y-full opacity-0 md:translate-y-0 md:scale-95"
@@ -324,9 +1132,23 @@
          x-transition:leave="transition duration-200 ease-in md:duration-150"
          x-transition:leave-start="translate-y-0 opacity-100 md:scale-100"
          x-transition:leave-end="translate-y-full opacity-0 md:translate-y-0 md:scale-95"
+         class="relative flex w-full flex-col overflow-hidden rounded-t-2xl bg-white shadow-2xl md:rounded-2xl"
+         :data-paystack-live="($store.ladillPayCheckout && $store.ladillPayCheckout.inline && !$store.ladillPayCheckout.launching && !$store.ladillPayCheckout.error && !$store.ladillPayCheckout.frameable) ? '1' : '0'"
+         :class="($store.ladillPayCheckout && $store.ladillPayCheckout.inline && !$store.ladillPayCheckout.launching && !$store.ladillPayCheckout.error && !$store.ladillPayCheckout.frameable)
+            ? 'md:max-w-3xl'
+            : 'md:max-w-lg'"
+         style="height: min(90dvh, 720px); max-height: 90dvh; padding-bottom: env(safe-area-inset-bottom, 0px)"
          @click.stop>
-        <div class="relative flex shrink-0 flex-col gap-0.5 border-b border-slate-100 px-4 pb-3 pt-5 md:px-5 md:pt-3"
-             style="padding-top: max(1.25rem, env(safe-area-inset-top, 0px))">
+
+        {{-- Full header while loading / error / same-origin; compact bar once Paystack fills the body --}}
+        <div x-show="!$store.ladillPayCheckout
+                     || $store.ladillPayCheckout.frameable
+                     || $store.ladillPayCheckout.launching
+                     || $store.ladillPayCheckout.error
+                     || !$store.ladillPayCheckout.inline"
+             class="relative flex shrink-0 flex-col gap-0.5 border-b border-slate-100 px-4 pb-3 pt-5 md:px-5 md:pt-3"
+             style="padding-top: max(1.25rem, env(safe-area-inset-top, 0px))"
+             data-ladill-pay-header>
             <div class="absolute left-1/2 top-2 h-1 w-10 -translate-x-1/2 rounded-full bg-slate-200 md:hidden" data-ladill-pay-handle aria-hidden="true"></div>
             <div class="flex items-start justify-between gap-3">
                 <div class="min-w-0">
@@ -347,27 +1169,62 @@
                 </button>
             </div>
         </div>
-        <div class="min-h-0 flex-1 overflow-y-auto overscroll-contain">
+
+        <div x-show="$store.ladillPayCheckout
+                     && $store.ladillPayCheckout.inline
+                     && !$store.ladillPayCheckout.launching
+                     && !$store.ladillPayCheckout.error
+                     && !$store.ladillPayCheckout.frameable"
+             class="relative z-20 flex shrink-0 items-center justify-between border-b border-slate-100 px-3 pb-2 pt-3 md:px-4 md:pt-2"
+             style="padding-top: max(0.75rem, env(safe-area-inset-top, 0px))"
+             data-ladill-pay-header-minimal>
+            <div class="absolute left-1/2 top-2 h-1 w-10 -translate-x-1/2 rounded-full bg-slate-200 md:hidden" data-ladill-pay-handle aria-hidden="true"></div>
+            <p class="pl-1 text-xs font-medium text-slate-500">{{ $sheetTitle }}</p>
+            <button type="button"
+                    data-ladill-pay-close-live
+                    @click="showSheet = false; window.LadillPayCheckout?.cancel?.()"
+                    class="shrink-0 rounded-full p-1.5 text-slate-400 transition hover:bg-slate-100 hover:text-slate-700"
+                    aria-label="Close">
+                <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12"/>
+                </svg>
+            </button>
+        </div>
+
+        {{-- Body: spinner while starting; Paystack fills this when ready --}}
+        <div class="relative min-h-0 flex-1 overflow-hidden overscroll-contain bg-white"
+             data-ladill-pay-body
+             style="min-height: 22rem">
             <iframe x-show="$store.ladillPayCheckout && $store.ladillPayCheckout.frameable"
                     :src="showSheet && $store.ladillPayCheckout && $store.ladillPayCheckout.frameable ? checkoutUrl : ''"
-                    class="h-full min-h-[60dvh] w-full border-0 md:min-h-0"
-                    style="min-height: 28rem"
-                    allow="payment *"
+                    class="absolute inset-0 h-full w-full border-0"
+                    allow="payment *; fullscreen *; clipboard-read *; clipboard-write *"
                     title="{{ $iframeTitle }}"></iframe>
 
+            {{-- Pin target for Paystack: keep in layout while inline checkout is active. --}}
             <div x-show="!$store.ladillPayCheckout || !$store.ladillPayCheckout.frameable"
-                 class="flex min-h-[60dvh] flex-col items-center justify-center gap-4 px-6 py-10 text-center md:min-h-[28rem] md:px-8 md:py-12"
+                 data-ladill-pay-mount
+                 class="absolute inset-0 bg-white"
+                 style="min-height: 12rem"
+                 aria-hidden="true"></div>
+
+            <div x-show="(!$store.ladillPayCheckout || !$store.ladillPayCheckout.frameable)
+                         && (!$store.ladillPayCheckout
+                             || $store.ladillPayCheckout.launching
+                             || $store.ladillPayCheckout.error
+                             || !$store.ladillPayCheckout.inline
+                             || !$store.ladillPayCheckout.ready)"
+                 x-transition:leave="transition ease-in duration-150"
+                 x-transition:leave-start="opacity-100"
+                 x-transition:leave-end="opacity-0"
+                 class="absolute inset-0 z-10 flex flex-col items-center justify-center gap-4 bg-white px-6 py-10 text-center md:px-8 md:py-12"
                  data-ladill-pay-inline-status>
                 <div class="flex h-12 w-12 items-center justify-center rounded-full bg-indigo-50 text-indigo-600" aria-hidden="true">
-                    <svg x-show="!$store.ladillPayCheckout || $store.ladillPayCheckout.launching || !checkoutUrl && !(typeof accessCode !== 'undefined' && accessCode)"
+                    <svg x-show="!$store.ladillPayCheckout || !$store.ladillPayCheckout.error"
                          class="h-6 w-6 animate-spin" fill="none" viewBox="0 0 24 24">
                         <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
                         <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path>
                     </svg>
-                    <svg x-show="$store.ladillPayCheckout && $store.ladillPayCheckout.inline && !$store.ladillPayCheckout.launching && !$store.ladillPayCheckout.error"
-                         class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke-width="1.75" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" d="M16.5 10.5V6.75a4.5 4.5 0 1 0-9 0v3.75m-.75 11.25h10.5a2.25 2.25 0 0 0 2.25-2.25v-6.75a2.25 2.25 0 0 0-2.25-2.25H6.75a2.25 2.25 0 0 0-2.25 2.25v6.75a2.25 2.25 0 0 0 2.25 2.25Z"/>
-                    </svg>
                     <svg x-show="$store.ladillPayCheckout && $store.ladillPayCheckout.error"
                          class="h-6 w-6 text-red-500" fill="none" viewBox="0 0 24 24" stroke-width="1.75" stroke="currentColor">
                         <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m9-.75a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 3.75h.008v.008H12v-.008Z"/>
@@ -378,18 +1235,16 @@
                        data-ladill-pay-status-title
                        x-text="$store.ladillPayCheckout && $store.ladillPayCheckout.error
                           ? 'Checkout unavailable'
-                          : ($store.ladillPayCheckout && $store.ladillPayCheckout.inline && !$store.ladillPayCheckout.launching
-                              ? 'Complete payment in the Paystack window'
-                              : 'Starting secure checkout…')"></p>
+                          : 'Starting secure checkout…'"></p>
                     <p class="text-xs leading-snug text-slate-500"
                        x-text="$store.ladillPayCheckout && $store.ladillPayCheckout.error
                           ? $store.ladillPayCheckout.error
-                          : 'Paystack opens on this page — not in a separate browser.'"></p>
+                          : 'Secure card and mobile money checkout opens on this page — not in a separate browser.'"></p>
                 </div>
                 <button type="button"
                         data-ladill-pay-retry
                         x-show="$store.ladillPayCheckout && $store.ladillPayCheckout.error"
-                        @click="$store.ladillPayCheckout.sync(true, typeof checkoutUrl !== 'undefined' ? checkoutUrl : '', typeof accessCode !== 'undefined' ? accessCode : '', typeof returnUrl !== 'undefined' ? returnUrl : '')"
+                        @click="window.LadillPayCheckout?.ensureStore()?.sync(true, (typeof checkoutUrl==='undefined'||checkoutUrl===null)?'':String(checkoutUrl), (typeof accessCode==='undefined'||accessCode===null)?'':String(accessCode), (typeof returnUrl==='undefined'||returnUrl===null)?'':String(returnUrl))"
                         class="inline-flex w-full max-w-xs items-center justify-center rounded-xl bg-indigo-600 px-4 py-3 text-sm font-semibold text-white hover:bg-indigo-700">
                     Try again
                 </button>
@@ -400,8 +1255,15 @@
                 </button>
             </div>
         </div>
+
         @if (! empty($sheetFooter))
-            <p class="shrink-0 border-t border-slate-100 bg-slate-50 px-4 py-2 text-center text-[11px] text-slate-500 md:px-5">
+            <p x-show="!$store.ladillPayCheckout
+                       || $store.ladillPayCheckout.frameable
+                       || $store.ladillPayCheckout.launching
+                       || $store.ladillPayCheckout.error
+                       || !$store.ladillPayCheckout.inline"
+               class="shrink-0 border-t border-slate-100 bg-slate-50 px-4 py-2 text-center text-[11px] text-slate-500 md:px-5"
+               data-ladill-pay-footer>
                 {{ $sheetFooter }}
             </p>
         @endif