Restore Paystack Inline in-page sheet/modal; stop separate-browser checkout.

Pass access_code through pay responses and launch PaystackPop from the shared sheet instead of window.open.
2026-07-21 19:12:24 +00:00
parent d18bb3cd97
commit e30c9dada5
2 changed files with 267 additions and 180 deletions
@@ -6,13 +6,16 @@
      - operator: signed-in staff flows such as wallet top-up

    Optional overrides: $sheetTitle, $sheetSubtitle, $sheetFooter, $sheetAria, $iframeTitle
-    Requires Alpine ancestor with: showSheet (bool), checkoutUrl (string).
+    Requires Alpine ancestor with:
+      - showSheet (bool)
+      - checkoutUrl (string) — authorization / waiting URL
+      - accessCode (string, optional) — Paystack initialize access_code for Inline
+      - publicKey (string, optional) — unused by resumeTransaction; kept for callers
+      - returnUrl (string, optional) — where to go after Inline onSuccess (?reference=)

-    Paystack (checkout.paystack.com) sends X-Frame-Options: SAMEORIGIN and cannot be
-    embedded. Same-origin URLs (e.g. MoMo waiting pages) still load in an iframe.
-    External checkouts open in a named window. Call LadillPayCheckout.prepare()
-    synchronously in the Pay click handler (before await fetch) so the popup is not
-    blocked after the async response. An in-sheet Continue CTA remains as fallback.
+    Paystack 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.
 --}}
@php
    $audience = $audience ?? 'buyer';
@@ -43,8 +46,9 @@
 (function () {
    if (window.LadillPayCheckout) return;

-    var PENDING_NAME = 'ladill_pay_checkout';
-    var pendingWindow = null;
+    var INLINE_SRC = 'https://js.paystack.co/v2/inline.js';
+    var inlineLoading = null;
+    var activePopup = null;

    function isFrameable(url) {
        if (!url) return false;
@@ -55,54 +59,80 @@
        }
    }

-    function writePendingPlaceholder(win) {
-        if (!win) return;
+    function isPaystackCheckoutUrl(url) {
+        if (!url) return false;
        try {
-            win.document.open();
-            win.document.write('<!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Payment</title></head><body style="margin:0;min-height:100vh;display:grid;place-items:center;font-family:system-ui,sans-serif;background:#f8fafc;color:#475569"><p style="font-size:0.95rem">Opening secure checkout…</p></body></html>');
-            win.document.close();
-        } catch (e) {}
-    }
-
-    function prepare() {
-        cancel();
-        try {
-            var win = window.open('about:blank', PENDING_NAME, 'width=480,height=720');
-            if (win && !win.closed) {
-                pendingWindow = win;
-                writePendingPlaceholder(win);
-                return win;
-            }
-        } catch (e) {}
-        pendingWindow = null;
-        return null;
-    }
-
-    function cancel() {
-        if (pendingWindow && !pendingWindow.closed) {
-            try { pendingWindow.close(); } catch (e) {}
-        }
-        pendingWindow = null;
-    }
-
-    function openCheckout(url) {
-        if (!url) return null;
-        try {
-            if (pendingWindow && !pendingWindow.closed) {
-                pendingWindow.location = url;
-                var win = pendingWindow;
-                pendingWindow = null;
-                return win;
-            }
-            pendingWindow = null;
-            // Named window (no noopener) so payment-return can redirect window.opener.
-            return window.open(url, PENDING_NAME, 'width=480,height=720');
+            var host = new URL(url, window.location.href).hostname.toLowerCase();
+            return host === 'checkout.paystack.com' || host.endsWith('.paystack.com');
        } catch (e) {
-            pendingWindow = null;
-            return null;
+            return false;
        }
    }

+    function accessCodeFromUrl(url) {
+        if (!url || !isPaystackCheckoutUrl(url)) return '';
+        try {
+            var path = new URL(url, window.location.href).pathname.replace(/^\/+/, '');
+            var code = path.split('/')[0] || '';
+            return /^[A-Za-z0-9_-]{6,}$/.test(code) ? code : '';
+        } catch (e) {
+            return '';
+        }
+    }
+
+    function resolveAccessCode(accessCode, checkoutUrl) {
+        var code = (accessCode || '').toString().trim();
+        if (code) return code;
+        return accessCodeFromUrl(checkoutUrl);
+    }
+
+    function loadInlineJs() {
+        if (window.PaystackPop) {
+            return Promise.resolve(window.PaystackPop);
+        }
+        if (inlineLoading) return inlineLoading;
+        inlineLoading = new Promise(function (resolve, reject) {
+            var existing = document.querySelector('script[data-ladill-paystack-inline]');
+            if (existing) {
+                existing.addEventListener('load', function () { resolve(window.PaystackPop); });
+                existing.addEventListener('error', function () { reject(new Error('Paystack script failed')); });
+                return;
+            }
+            var script = document.createElement('script');
+            script.src = INLINE_SRC;
+            script.async = true;
+            script.dataset.ladillPaystackInline = '1';
+            script.onload = function () { resolve(window.PaystackPop); };
+            script.onerror = function () {
+                inlineLoading = null;
+                reject(new Error('Paystack script failed'));
+            };
+            document.head.appendChild(script);
+        });
+        return inlineLoading;
+    }
+
+    function buildReturnUrl(returnUrl, reference) {
+        if (!returnUrl || !reference) return '';
+        try {
+            var u = new URL(returnUrl, window.location.href);
+            u.searchParams.set('reference', reference);
+            return u.toString();
+        } catch (e) {
+            var join = returnUrl.indexOf('?') >= 0 ? '&' : '?';
+            return returnUrl + join + 'reference=' + encodeURIComponent(reference);
+        }
+    }
+
+    function cancelInline() {
+        try {
+            if (activePopup && typeof activePopup.cancelTransaction === 'function') {
+                activePopup.cancelTransaction();
+            }
+        } catch (e) {}
+        activePopup = null;
+    }
+
    function ensureStore() {
        if (!window.Alpine || typeof window.Alpine.store !== 'function') return null;
        if (window.Alpine.store('ladillPayCheckout')) {
@@ -110,37 +140,109 @@
        }
        window.Alpine.store('ladillPayCheckout', {
            frameable: false,
-            popupBlocked: false,
-            launchKey: '',
+            inline: false,
+            ready: false,
+            launching: false,
+            error: '',
+            _launchToken: 0,
+            _activeCode: '',
            reset() {
                this.frameable = false;
-                this.popupBlocked = false;
-                this.launchKey = '';
+                this.inline = false;
+                this.ready = false;
+                this.launching = false;
+                this.error = '';
+                this._activeCode = '';
+                cancelInline();
            },
-            sync(show, url) {
+            sync(show, url, accessCode, returnUrl) {
                if (!show) {
+                    this._launchToken += 1;
                    this.reset();
                    return;
                }
-                if (!url) return;
-                this.frameable = isFrameable(url);
-                if (this.frameable) {
-                    cancel();
-                    this.popupBlocked = false;
+                this.ready = !!(url || accessCode);
+                if (!url && !accessCode) {
+                    this.frameable = false;
+                    this.inline = false;
+                    this.launching = false;
+                    this._activeCode = '';
                    return;
                }
-                if (this.launchKey === url) return;
-                this.launchKey = url;
-                var popup = openCheckout(url);
-                this.popupBlocked = !(popup && !popup.closed);
-            },
-            continueTo(url) {
-                if (!url) return;
-                var popup = openCheckout(url);
-                this.popupBlocked = !(popup && !popup.closed);
-                if (this.popupBlocked) {
-                    window.location.assign(url);
+                if (isFrameable(url)) {
+                    this.frameable = true;
+                    this.inline = false;
+                    this.launching = false;
+                    this._activeCode = '';
+                    cancelInline();
+                    return;
                }
+                var code = resolveAccessCode(accessCode, url);
+                if (code) {
+                    this.frameable = false;
+                    this.inline = true;
+                    if (this._activeCode === code && (this.launching || activePopup)) {
+                        return;
+                    }
+                    this.launchInline(code, returnUrl);
+                    return;
+                }
+                // Non-Paystack external URL without access_code — cannot embed.
+                this.frameable = false;
+                this.inline = false;
+                this.launching = false;
+                this._activeCode = '';
+                this.error = 'Secure checkout could not be opened in-page. Please try again.';
+            },
+            launchInline(accessCode, returnUrl) {
+                var store = this;
+                var token = ++this._launchToken;
+                this._activeCode = accessCode;
+                this.launching = true;
+                this.error = '';
+                loadInlineJs().then(function (PaystackPop) {
+                    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;
+                            }
+                            // 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(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.';
+                });
            },
        });
        return window.Alpine.store('ladillPayCheckout');
@@ -157,9 +259,16 @@

    window.LadillPayCheckout = {
        isFrameable: isFrameable,
-        prepare: prepare,
-        cancel: cancel,
-        open: openCheckout,
+        isPaystackCheckoutUrl: isPaystackCheckoutUrl,
+        accessCodeFromUrl: accessCodeFromUrl,
+        resolveAccessCode: resolveAccessCode,
+        prepare: function () { return null; },
+        cancel: function () {
+            cancelInline();
+            var store = ensureStore();
+            if (store) store.reset();
+        },
+        open: function () { return null; },
        ensureStore: ensureStore,
    };
 })();
@@ -168,16 +277,24 @@
 <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();
        }
-        if ($store.ladillPayCheckout) {
-            $store.ladillPayCheckout.sync(showSheet, checkoutUrl);
+        const store = $store.ladillPayCheckout;
+        if (store) {
+            store.sync(
+                showSheet,
+                typeof checkoutUrl !== 'undefined' ? checkoutUrl : '',
+                typeof accessCode !== 'undefined' ? accessCode : '',
+                typeof returnUrl !== 'undefined' ? 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"
@@ -185,6 +302,7 @@
     aria-label="{{ $sheetAria }}">

    <div class="absolute inset-0 bg-black/60"
+         data-ladill-pay-backdrop
         x-show="showSheet"
         x-transition:enter="transition-opacity duration-300"
         x-transition:enter-start="opacity-0"
@@ -192,23 +310,24 @@
         x-transition:leave="transition-opacity duration-200"
         x-transition:leave-start="opacity-100"
         x-transition:leave-end="opacity-0"
-         @click="showSheet = false">
+         @click="showSheet = false; window.LadillPayCheckout?.cancel?.()">
    </div>

-    {{-- Mobile bottom sheet --}}
-    <div class="relative flex w-full flex-col overflow-hidden rounded-t-2xl bg-white md:hidden"
-         style="height:90dvh; padding-bottom: env(safe-area-inset-bottom, 0px)"
+    {{-- One panel: bottom sheet (mobile) + centered modal (desktop). --}}
+    <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-transform duration-300 ease-out"
-         x-transition:enter-start="translate-y-full"
-         x-transition:enter-end="translate-y-0"
-         x-transition:leave="transition-transform duration-200 ease-in"
-         x-transition:leave-start="translate-y-0"
-         x-transition:leave-end="translate-y-full"
+         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"
+         x-transition:enter-end="translate-y-0 opacity-100 md:scale-100"
+         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"
         @click.stop>
-        <div class="relative flex shrink-0 flex-col gap-0.5 border-b border-slate-100 px-4 pb-3 pt-5"
+        <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))">
-            <div class="absolute left-1/2 top-2 h-1 w-10 -translate-x-1/2 rounded-full bg-slate-200"></div>
+            <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">
                    <p class="text-sm font-semibold text-slate-800">{{ $sheetTitle }}</p>
@@ -217,8 +336,9 @@
                    @endif
                </div>
                <button type="button"
-                        x-ref="checkoutCloseMobile"
-                        @click="showSheet = false"
+                        x-ref="checkoutClose"
+                        x-init="$watch('showSheet', value => { if (value) { $nextTick(() => $refs.checkoutClose?.focus()) } })"
+                        @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">
@@ -228,109 +348,60 @@
            </div>
        </div>
        <div class="min-h-0 flex-1 overflow-y-auto overscroll-contain">
-            <iframe x-show="$store.ladillPayCheckout.frameable"
-                    :src="showSheet && $store.ladillPayCheckout.frameable ? checkoutUrl : ''"
-                    class="h-full min-h-[60dvh] w-full border-0"
-                    allow="payment *"
-                    title="{{ $iframeTitle }}"></iframe>
-            <div x-show="!$store.ladillPayCheckout.frameable"
-                 class="flex min-h-[60dvh] flex-col items-center justify-center gap-4 px-6 py-10 text-center">
-                <div class="flex h-12 w-12 items-center justify-center rounded-full bg-indigo-50 text-indigo-600" aria-hidden="true">
-                    <svg 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>
-                </div>
-                <div class="max-w-xs space-y-1">
-                    <p class="text-sm font-semibold text-slate-800"
-                       x-text="$store.ladillPayCheckout.popupBlocked ? 'Continue in a secure payment window' : 'Complete payment in the secure window'"></p>
-                    <p class="text-xs leading-snug text-slate-500">
-                        <span x-show="!$store.ladillPayCheckout.popupBlocked">A Paystack window should be open. If you do not see it, tap continue below.</span>
-                        <span x-show="$store.ladillPayCheckout.popupBlocked">Your browser blocked the popup. Tap continue to open Paystack.</span>
-                    </p>
-                </div>
-                <button type="button"
-                        @click="$store.ladillPayCheckout.continueTo(checkoutUrl)"
-                        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">
-                    Continue to Paystack
-                </button>
-                <button type="button"
-                        @click="showSheet = false"
-                        class="text-xs font-medium text-slate-500 hover:text-slate-700">
-                    Cancel
-                </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">
-                {{ $sheetFooter }}
-            </p>
-        @endif
-    </div>
-
-    {{-- Desktop centered modal --}}
-    <div class="relative hidden w-full max-w-lg overflow-hidden rounded-2xl bg-white shadow-2xl md:flex md:h-[min(720px,85vh)] md:flex-col"
-         x-show="showSheet"
-         x-transition:enter="transition ease-out duration-200"
-         x-transition:enter-start="opacity-0 scale-95"
-         x-transition:enter-end="opacity-100 scale-100"
-         x-transition:leave="transition ease-in duration-150"
-         x-transition:leave-start="opacity-100 scale-100"
-         x-transition:leave-end="opacity-0 scale-95"
-         @click.stop>
-        <div class="flex shrink-0 items-start justify-between gap-3 border-b border-slate-100 px-5 py-3">
-            <div class="min-w-0">
-                <p class="text-sm font-semibold text-slate-800">{{ $sheetTitle }}</p>
-                @if (! empty($sheetSubtitle))
-                    <p class="mt-0.5 text-xs leading-snug text-slate-500">{{ $sheetSubtitle }}</p>
-                @endif
-            </div>
-            <button type="button"
-                    x-ref="checkoutCloseDesktop"
-                    x-init="$watch('showSheet', value => { if (value) { $nextTick(() => ($refs.checkoutCloseDesktop || $refs.checkoutCloseMobile)?.focus()) } })"
-                    @click="showSheet = false"
-                    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>
-        <div class="min-h-0 flex-1 overflow-y-auto overscroll-contain">
-            <iframe x-show="$store.ladillPayCheckout.frameable"
-                    :src="showSheet && $store.ladillPayCheckout.frameable ? checkoutUrl : ''"
-                    class="h-full min-h-0 w-full border-0"
+            <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 *"
                    title="{{ $iframeTitle }}"></iframe>
-            <div x-show="!$store.ladillPayCheckout.frameable"
-                 class="flex h-full min-h-[28rem] flex-col items-center justify-center gap-4 px-8 py-12 text-center">
+
+            <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-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 class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke-width="1.75" stroke="currentColor">
+                    <svg x-show="!$store.ladillPayCheckout || $store.ladillPayCheckout.launching || !checkoutUrl && !(typeof accessCode !== 'undefined' && accessCode)"
+                         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"/>
+                    </svg>
                </div>
-                <div class="max-w-sm space-y-1">
+                <div class="max-w-xs space-y-1 md:max-w-sm">
                    <p class="text-sm font-semibold text-slate-800"
-                       x-text="$store.ladillPayCheckout.popupBlocked ? 'Continue in a secure payment window' : 'Complete payment in the secure window'"></p>
-                    <p class="text-xs leading-snug text-slate-500">
-                        <span x-show="!$store.ladillPayCheckout.popupBlocked">A Paystack window should be open. If you do not see it, click continue below.</span>
-                        <span x-show="$store.ladillPayCheckout.popupBlocked">Your browser blocked the popup. Click continue to open Paystack.</span>
-                    </p>
+                       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>
+                    <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>
                </div>
                <button type="button"
-                        @click="$store.ladillPayCheckout.continueTo(checkoutUrl)"
+                        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 : '')"
                        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">
-                    Continue to Paystack
+                    Try again
                </button>
                <button type="button"
-                        @click="showSheet = false"
+                        @click="showSheet = false; window.LadillPayCheckout?.cancel?.()"
                        class="text-xs font-medium text-slate-500 hover:text-slate-700">
                    Cancel
                </button>
            </div>
        </div>
        @if (! empty($sheetFooter))
-            <p class="shrink-0 border-t border-slate-100 bg-slate-50 px-5 py-2 text-center text-[11px] text-slate-500">
+            <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">
                {{ $sheetFooter }}
            </p>
        @endif
@@ -14,21 +14,37 @@ class ResponsivePaystackSheetTest extends TestCase

        $this->assertStringContainsString('role="dialog"', $html);
        $this->assertStringContainsString('aria-modal="true"', $html);
+        $this->assertStringContainsString('data-ladill-pay-sheet', $html);
+        $this->assertStringContainsString('data-ladill-pay-panel', $html);
+        $this->assertStringContainsString('data-ladill-pay-backdrop', $html);
+        $this->assertStringContainsString('data-ladill-pay-handle', $html);
+        $this->assertStringContainsString('data-ladill-pay-inline-status', $html);
        $this->assertStringContainsString('md:items-center', $html);
        $this->assertStringContainsString('rounded-t-2xl', $html);
-        $this->assertStringContainsString('md:h-[min(720px,85vh)]', $html);
+        $this->assertStringContainsString('md:rounded-2xl', $html);
+        $this->assertStringContainsString('md:max-w-lg', $html);
        $this->assertStringContainsString('Complete your payment', $html);
        $this->assertStringContainsString('safe-area-inset-bottom', $html);
        $this->assertStringContainsString('LadillPayCheckout', $html);
-        $this->assertStringContainsString('Continue to Paystack', $html);
-        $this->assertStringContainsString('ladill_pay_checkout', $html);
-        $this->assertStringContainsString('prepare:', $html);
+        $this->assertStringContainsString('resumeTransaction', $html);
+        $this->assertStringContainsString('js.paystack.co/v2/inline.js', $html);
+        $this->assertStringContainsString('Starting secure checkout', $html);
+        $this->assertStringContainsString('not in a separate browser', $html);
+        // Must not push Paystack to a separate browser as the primary path.
+        $this->assertStringNotContainsString('Continue to Paystack', $html);
+        $this->assertStringNotContainsString('window.open(', $html);
+        // Must not use Tailwind `hidden` + x-show on the panel (desktop stays invisible).
+        $this->assertStringNotContainsString('hidden w-full max-w-lg', $html);
        $this->assertStringNotContainsString('Paystack checkout', $html);
    }

    public function test_payment_return_escapes_popup_and_iframe_to_opener_or_top(): void
    {
-        $html = view('public.payment-return', [
+        $view = view()->exists('partials.payment-return')
+            ? 'partials.payment-return'
+            : 'public.payment-return';
+
+        $html = view($view, [
            'redirect' => 'https://example.test/paid',
        ])->render();