From 167bb50f4f7d367d4d811dcaf8659c85d10ac6a9 Mon Sep 17 00:00:00 2001
From: Samir Boulahtit <samir.boulahtit@wizard.lu>
Date: Thu, 19 Feb 2026 16:56:25 +0100
Subject: [PATCH] fix: replace all native confirm() dialogs with styled modal
 macros

Migrated ~68 native browser confirm() calls across 74 files to use the
project's confirm_modal/confirm_modal_dynamic Jinja2 macros, providing
consistent styled confirmation dialogs instead of plain browser popups.

Modules updated: core, tenancy, cms, marketplace, messaging, billing,
customers, orders, cart. Uses danger/warning/info variants and
double-confirm pattern for destructive delete operations.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../static/shared/js/upgrade-prompts.js       | 29 ++++++----
 .../billing/static/store/js/billing.js        |  6 +--
 .../billing/static/store/js/invoices.js       | 15 ++----
 .../billing/merchant/subscription-detail.html | 10 ++--
 .../templates/billing/store/billing.html      |  7 ++-
 .../cart/templates/cart/storefront/cart.html  | 12 +++--
 .../cms/static/admin/js/content-pages.js      | 28 +++++++---
 .../cms/static/store/js/content-page-edit.js  | 11 ++--
 .../cms/static/store/js/content-pages.js      | 18 ++++---
 app/modules/cms/static/store/js/media.js      |  5 +-
 .../templates/cms/admin/content-pages.html    | 25 ++++++++-
 .../cms/store/content-page-edit.html          | 15 +++++-
 .../templates/cms/store/content-pages.html    | 14 ++++-
 .../cms/templates/cms/store/media.html        | 15 +++++-
 .../core/static/admin/js/my-menu-config.js    | 10 +---
 app/modules/core/static/admin/js/settings.js  | 10 +---
 .../templates/core/admin/my-menu-config.html  | 30 ++++++++++-
 .../core/templates/core/admin/settings.html   | 29 +++++++++-
 .../customers/static/admin/js/customers.js    |  9 ++--
 .../templates/customers/admin/customers.html  |  6 ++-
 .../marketplace/static/admin/js/letzshop.js   |  7 ++-
 .../static/admin/js/marketplace-letzshop.js   | 23 ++++----
 .../marketplace/static/store/js/letzshop.js   | 19 +++----
 .../templates/marketplace/admin/letzshop.html |  7 ++-
 .../admin/marketplace-letzshop.html           | 21 ++++++--
 .../partials/letzshop-exceptions-tab.html     |  2 +-
 .../admin/partials/letzshop-orders-tab.html   |  2 +-
 .../admin/partials/letzshop-settings-tab.html |  2 +-
 .../templates/marketplace/store/letzshop.html | 17 ++++--
 .../messaging/static/admin/js/messages.js     |  5 +-
 .../static/admin/js/notifications.js          |  8 +--
 .../static/store/js/email-templates.js        |  7 ++-
 .../messaging/static/store/js/messages.js     |  5 +-
 .../static/store/js/notifications.js          |  8 +--
 .../templates/messaging/admin/messages.html   |  7 ++-
 .../messaging/admin/notifications.html        |  6 ++-
 .../messaging/store/email-templates.html      |  7 ++-
 .../templates/messaging/store/messages.html   |  7 ++-
 .../messaging/store/notifications.html        |  7 ++-
 .../templates/orders/store/invoices.html      | 12 +++--
 .../static/admin/js/admin-user-detail.js      | 25 ++++-----
 .../static/admin/js/admin-user-edit.js        | 31 ++++-------
 .../tenancy/static/admin/js/admin-users.js    | 20 ++++---
 .../static/admin/js/merchant-detail.js        | 25 +++++----
 .../tenancy/static/admin/js/merchant-edit.js  | 39 +++++++-------
 .../static/admin/js/merchant-user-detail.js   | 25 ++++-----
 .../tenancy/static/admin/js/merchant-users.js | 27 ++++------
 .../tenancy/static/admin/js/merchants.js      | 22 ++++----
 .../static/admin/js/platform-menu-config.js   | 10 +---
 .../static/admin/js/platform-modules.js       | 10 +---
 .../tenancy/static/admin/js/store-detail.js   | 29 +++++-----
 .../tenancy/static/admin/js/store-edit.js     | 42 ++++++---------
 .../tenancy/static/admin/js/store-theme.js    |  7 +--
 app/modules/tenancy/static/admin/js/stores.js | 18 ++++---
 .../tenancy/static/admin/js/user-detail.js    | 25 ++++-----
 .../tenancy/static/admin/js/user-edit.js      | 25 ++++-----
 app/modules/tenancy/static/admin/js/users.js  | 36 ++++++-------
 .../tenancy/admin/admin-user-detail.html      | 41 +++++++++++++-
 .../tenancy/admin/admin-user-edit.html        | 54 +++++++++++++++++--
 .../templates/tenancy/admin/admin-users.html  | 27 +++++++++-
 .../tenancy/admin/merchant-detail.html        | 25 ++++++++-
 .../tenancy/admin/merchant-edit.html          | 51 ++++++++++++++++--
 .../tenancy/admin/merchant-user-detail.html   | 38 ++++++++++++-
 .../tenancy/admin/merchant-users.html         | 41 +++++++++++++-
 .../templates/tenancy/admin/merchants.html    | 14 ++++-
 .../tenancy/admin/module-config.html          |  6 ++-
 .../tenancy/admin/platform-menu-config.html   | 29 +++++++++-
 .../tenancy/admin/platform-modules.html       | 29 +++++++++-
 .../templates/tenancy/admin/store-detail.html | 27 +++++++++-
 .../templates/tenancy/admin/store-edit.html   | 53 +++++++++++++++++-
 .../templates/tenancy/admin/store-theme.html  | 15 +++++-
 .../templates/tenancy/admin/stores.html       | 15 +++++-
 app/templates/store/base.html                 |  4 ++
 static/admin/js/module-config.js              |  7 ++-
 74 files changed, 939 insertions(+), 436 deletions(-)

diff --git a/app/modules/billing/static/shared/js/upgrade-prompts.js b/app/modules/billing/static/shared/js/upgrade-prompts.js
index be8284e6..b6910888 100644
--- a/app/modules/billing/static/shared/js/upgrade-prompts.js
+++ b/app/modules/billing/static/shared/js/upgrade-prompts.js
@@ -42,6 +42,11 @@
         loaded: false,
         error: null,
 
+        // Limit reached modal state
+        showLimitReachedConfirm: false,
+        limitReachedMessage: '',
+        limitReachedUpgradeUrl: null,
+
         // Computed-like getters
         get hasLimitsApproaching() {
             return this.usage?.has_limits_approaching || false;
@@ -193,18 +198,24 @@
             const limitName = limitNames[limitType] || limitType;
             const message = response.message || `You've reached your ${limitName} limit.`;
 
-            // Use browser confirm for simplicity - could be replaced with custom modal
-            const shouldUpgrade = confirm(
-                `${message}\n\n` +
-                `Current: ${response.current}/${response.limit}\n\n` +
+            const details = `${message} Current usage: ${response.current}/${response.limit}. ` +
                 (response.upgrade_tier_name
-                    ? `Upgrade to ${response.upgrade_tier_name} to get more ${limitName}.\n\nGo to billing page?`
-                    : 'Contact support for more capacity.')
-            );
+                    ? `Upgrade to ${response.upgrade_tier_name} to get more ${limitName}.`
+                    : 'Contact support for more capacity.');
 
-            if (shouldUpgrade && response.upgrade_tier_code) {
-                window.location.href = this.getBillingUrl();
+            this.limitReachedMessage = details;
+            this.limitReachedUpgradeUrl = response.upgrade_tier_code ? this.getBillingUrl() : null;
+            this.showLimitReachedConfirm = true;
+        },
+
+        /**
+         * Handle upgrade confirmation from limit reached modal
+         */
+        confirmUpgrade() {
+            if (this.limitReachedUpgradeUrl) {
+                window.location.href = this.limitReachedUpgradeUrl;
             }
+            this.showLimitReachedConfirm = false;
         },
 
         /**
diff --git a/app/modules/billing/static/store/js/billing.js b/app/modules/billing/static/store/js/billing.js
index 92584f93..bb7a8917 100644
--- a/app/modules/billing/static/store/js/billing.js
+++ b/app/modules/billing/static/store/js/billing.js
@@ -22,6 +22,8 @@ function storeBilling() {
         showTiersModal: false,
         showAddonsModal: false,
         showCancelModal: false,
+        showCancelAddonConfirm: false,
+        pendingCancelAddon: null,
         showSuccessMessage: false,
         showCancelMessage: false,
         showAddonSuccessMessage: false,
@@ -172,10 +174,6 @@ function storeBilling() {
         },
 
         async cancelAddon(addon) {
-            if (!confirm(`Are you sure you want to cancel ${addon.addon_name}?`)) {
-                return;
-            }
-
             try {
                 await apiClient.delete(`/store/billing/addons/${addon.id}`);
                 Utils.showToast(I18n.t('billing.messages.addon_cancelled_successfully'), 'success');
diff --git a/app/modules/billing/static/store/js/invoices.js b/app/modules/billing/static/store/js/invoices.js
index f0949281..01e81353 100644
--- a/app/modules/billing/static/store/js/invoices.js
+++ b/app/modules/billing/static/store/js/invoices.js
@@ -68,6 +68,11 @@ function storeInvoices() {
             status: ''
         },
 
+        // Update status confirm state
+        showUpdateStatusConfirm: false,
+        pendingStatusInvoice: null,
+        pendingNewStatus: null,
+
         // Create invoice modal
         showCreateModal: false,
         createForm: {
@@ -291,16 +296,6 @@ function storeInvoices() {
          * Update invoice status
          */
         async updateStatus(invoice, newStatus) {
-            const statusLabels = {
-                'issued': 'mark as issued',
-                'paid': 'mark as paid',
-                'cancelled': 'cancel'
-            };
-
-            if (!confirm(`Are you sure you want to ${statusLabels[newStatus] || newStatus} this invoice?`)) {
-                return;
-            }
-
             try {
                 await apiClient.put(`/store/invoices/${invoice.id}/status`, {
                     status: newStatus
diff --git a/app/modules/billing/templates/billing/merchant/subscription-detail.html b/app/modules/billing/templates/billing/merchant/subscription-detail.html
index 7c1a536a..a281c3f4 100644
--- a/app/modules/billing/templates/billing/merchant/subscription-detail.html
+++ b/app/modules/billing/templates/billing/merchant/subscription-detail.html
@@ -1,5 +1,6 @@
 {# app/modules/billing/templates/billing/merchant/subscription-detail.html #}
 {% extends "merchant/base.html" %}
+{% from 'shared/macros/modals.html' import confirm_modal %}
 
 {% block title %}Subscription Details{% endblock %}
 
@@ -119,7 +120,7 @@
                             <span class="inline-block mt-3 px-3 py-1 text-xs font-semibold text-purple-700 dark:text-purple-400 bg-purple-100 dark:bg-purple-900/30 rounded-full">Current Plan</span>
                         </template>
                         <template x-if="!t.is_current">
-                            <button @click="changeTier(t.code)"
+                            <button @click="pendingTierCode = t.code; showChangeTierConfirm = true"
                                     :disabled="changingTier"
                                     class="mt-3 inline-flex items-center px-4 py-2 text-sm font-medium text-white rounded-lg transition-colors disabled:opacity-50"
                                     :class="t.can_upgrade ? 'bg-purple-600 hover:bg-purple-700' : 'bg-gray-600 hover:bg-gray-700'"
@@ -133,6 +134,9 @@
 
     </div>
 </div>
+
+<!-- Change Tier Confirm Modal -->
+{{ confirm_modal('changeTierConfirm', 'Change Plan', 'Are you sure you want to change your plan to this tier? Your billing will be adjusted accordingly.', 'changeTier(pendingTierCode)', 'showChangeTierConfirm', 'Change Plan', 'Cancel', 'warning') }}
 {% endblock %}
 
 {% block extra_scripts %}
@@ -145,6 +149,8 @@ function merchantSubscriptionDetail() {
         subscription: null,
         availableTiers: [],
         changingTier: false,
+        showChangeTierConfirm: false,
+        pendingTierCode: null,
 
         init() {
             this.loadSubscription();
@@ -182,8 +188,6 @@ function merchantSubscriptionDetail() {
         },
 
         async changeTier(tierCode) {
-            if (!confirm(`Are you sure you want to change your plan to this tier?`)) return;
-
             this.changingTier = true;
             this.error = null;
             this.successMessage = null;
diff --git a/app/modules/billing/templates/billing/store/billing.html b/app/modules/billing/templates/billing/store/billing.html
index 09fa7162..6760ba2d 100644
--- a/app/modules/billing/templates/billing/store/billing.html
+++ b/app/modules/billing/templates/billing/store/billing.html
@@ -1,7 +1,7 @@
 {# app/templates/store/billing.html #}
 {% extends "store/base.html" %}
 {% from 'shared/macros/headers.html' import page_header %}
-{% from 'shared/macros/modals.html' import modal_simple %}
+{% from 'shared/macros/modals.html' import modal_simple, confirm_modal_dynamic %}
 
 {% block title %}Billing & Subscription{% endblock %}
 
@@ -308,7 +308,7 @@
                                         <span x-text="addon.period_end ? `Renews ${formatDate(addon.period_end)}` : 'Active'"></span>
                                     </p>
                                 </div>
-                                <button @click="cancelAddon(addon)"
+                                <button @click="pendingCancelAddon = addon; showCancelAddonConfirm = true"
                                         class="px-3 py-1 text-sm font-medium text-red-600 bg-red-100 rounded-lg hover:bg-red-200 dark:bg-red-900/50 dark:text-red-400">
                                     Cancel
                                 </button>
@@ -355,6 +355,9 @@
     </div>
 </div>
 
+<!-- Cancel Add-on Confirm Modal -->
+{{ confirm_modal_dynamic('cancelAddonConfirm', 'Cancel Add-on', "'Are you sure you want to cancel ' + (pendingCancelAddon?.addon_name || 'this add-on') + '?'", 'cancelAddon(pendingCancelAddon)', 'showCancelAddonConfirm', 'Cancel Add-on', 'Keep', 'danger') }}
+
 <!-- Cancel Subscription Modal -->
 <div x-show="showCancelModal"
      x-transition:enter="transition ease-out duration-150"
diff --git a/app/modules/cart/templates/cart/storefront/cart.html b/app/modules/cart/templates/cart/storefront/cart.html
index b35a3a26..6f7e2efd 100644
--- a/app/modules/cart/templates/cart/storefront/cart.html
+++ b/app/modules/cart/templates/cart/storefront/cart.html
@@ -1,5 +1,6 @@
 {# app/templates/storefront/cart.html #}
 {% extends "storefront/base.html" %}
+{% from 'shared/macros/modals.html' import confirm_modal %}
 
 {% block title %}Shopping Cart{% endblock %}
 
@@ -107,7 +108,7 @@
                                 </div>
 
                                 <button
-                                    @click="removeItem(item.product_id)"
+                                    @click="pendingRemoveProductId = item.product_id; showRemoveItemConfirm = true"
                                     :disabled="updating"
                                     class="w-10 h-10 flex items-center justify-center border border-gray-300 dark:border-gray-600 rounded hover:bg-red-600 hover:border-red-600 hover:text-white transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
                                     title="Remove from cart"
@@ -165,6 +166,9 @@
     </div>
 
 </div>
+
+<!-- Remove Cart Item Confirm Modal -->
+{{ confirm_modal('removeItemConfirm', 'Remove Item', 'Remove this item from your cart?', 'removeItem(pendingRemoveProductId)', 'showRemoveItemConfirm', 'Remove', 'Cancel', 'danger') }}
 {% endblock %}
 
 {% block extra_scripts %}
@@ -179,6 +183,8 @@ document.addEventListener('alpine:init', () => {
             items: [],
             loading: false,
             updating: false,
+            showRemoveItemConfirm: false,
+            pendingRemoveProductId: null,
 
             // Computed properties
             get totalItems() {
@@ -271,10 +277,6 @@ document.addEventListener('alpine:init', () => {
 
         // Remove item from cart
         async removeItem(productId) {
-            if (!confirm('Remove this item from your cart?')) {
-                return;
-            }
-
             this.updating = true;
 
             try {
diff --git a/app/modules/cms/static/admin/js/content-pages.js b/app/modules/cms/static/admin/js/content-pages.js
index f1d10d74..49ae53f8 100644
--- a/app/modules/cms/static/admin/js/content-pages.js
+++ b/app/modules/cms/static/admin/js/content-pages.js
@@ -21,6 +21,12 @@ function contentPagesManager() {
         loading: false,
         error: null,
 
+        // Modal state
+        showCreateHomepageConfirm: false,
+        pendingHomepagePlatform: null,
+        showDeletePageConfirm: false,
+        pageToDelete: null,
+
         // Tabs and filters
         activeTab: 'all',  // all, platform_marketing, store_defaults, store_overrides
         searchQuery: '',
@@ -188,13 +194,19 @@ function contentPagesManager() {
                 // Show a toast and offer to create
                 if (slug === 'home') {
                     // Offer to create homepage
-                    if (confirm(`No homepage found for ${platformCode}. Would you like to create one?`)) {
-                        window.location.href = `/admin/content-pages/create?platform_code=${platformCode}&slug=home&is_platform_page=true`;
-                    }
+                    this.pendingHomepagePlatform = platformCode;
+                    this.showCreateHomepageConfirm = true;
                 }
             }
         },
 
+        // Create homepage for a platform (called from confirm modal)
+        createHomepage() {
+            if (this.pendingHomepagePlatform) {
+                window.location.href = `/admin/content-pages/create?platform_code=${this.pendingHomepagePlatform}&slug=home&is_platform_page=true`;
+            }
+        },
+
         // Get page tier label (three-tier system)
         getPageTierLabel(page) {
             if (page.store_id) {
@@ -220,12 +232,14 @@ function contentPagesManager() {
             }
         },
 
+        // Prompt delete page confirmation
+        promptDeletePage(page) {
+            this.pageToDelete = page;
+            this.showDeletePageConfirm = true;
+        },
+
         // Delete a page
         async deletePage(page) {
-            if (!confirm(`Are you sure you want to delete "${page.title}"?`)) {
-                return;
-            }
-
             try {
                 contentPagesLog.info(`Deleting page: ${page.id}`);
 
diff --git a/app/modules/cms/static/store/js/content-page-edit.js b/app/modules/cms/static/store/js/content-page-edit.js
index ed57da3f..918cf1c4 100644
--- a/app/modules/cms/static/store/js/content-page-edit.js
+++ b/app/modules/cms/static/store/js/content-page-edit.js
@@ -40,6 +40,9 @@ function storeContentPageEditor(pageId) {
         loadingDefault: false,
         defaultContent: null,
 
+        // Delete confirmation modal state
+        showDeletePageConfirm: false,
+
         // Initialize
         async init() {
             // Prevent multiple initializations
@@ -211,14 +214,6 @@ function storeContentPageEditor(pageId) {
 
         // Delete page (revert to default for overrides)
         async deletePage() {
-            const message = this.isOverride
-                ? 'Are you sure you want to revert to the platform default? Your customizations will be lost.'
-                : 'Are you sure you want to delete this page? This cannot be undone.';
-
-            if (!confirm(message)) {
-                return;
-            }
-
             try {
                 contentPageEditLog.info('Deleting page:', this.pageId);
 
diff --git a/app/modules/cms/static/store/js/content-pages.js b/app/modules/cms/static/store/js/content-pages.js
index a8d5d717..21524707 100644
--- a/app/modules/cms/static/store/js/content-pages.js
+++ b/app/modules/cms/static/store/js/content-pages.js
@@ -20,6 +20,10 @@ function storeContentPagesManager() {
         activeTab: 'platform',
         searchQuery: '',
 
+        // Modal state
+        showDeletePageConfirm: false,
+        pageToDelete: null,
+
         // Data
         platformPages: [],  // Platform default pages
         customPages: [],    // Store's own pages (overrides + custom)
@@ -152,16 +156,14 @@ function storeContentPagesManager() {
             }
         },
 
+        // Prompt delete page confirmation
+        promptDeletePage(page) {
+            this.pageToDelete = page;
+            this.showDeletePageConfirm = true;
+        },
+
         // Delete a page
         async deletePage(page) {
-            const message = page.is_store_override
-                ? `Are you sure you want to delete your override for "${page.title}"? The platform default will be shown instead.`
-                : `Are you sure you want to delete "${page.title}"? This cannot be undone.`;
-
-            if (!confirm(message)) {
-                return;
-            }
-
             try {
                 contentPagesLog.info('Deleting page:', page.id);
 
diff --git a/app/modules/cms/static/store/js/media.js b/app/modules/cms/static/store/js/media.js
index 23e16fb9..3a980d9f 100644
--- a/app/modules/cms/static/store/js/media.js
+++ b/app/modules/cms/static/store/js/media.js
@@ -105,6 +105,7 @@ function storeMedia() {
         // Modal states
         showUploadModal: false,
         showDetailModal: false,
+        showDeleteMediaConfirm: false,
         selectedMedia: null,
         editingMedia: {
             filename: '',
@@ -253,10 +254,6 @@ function storeMedia() {
         async deleteMedia() {
             if (!this.selectedMedia) return;
 
-            if (!confirm(I18n.t('cms.confirmations.delete_file'))) {
-                return;
-            }
-
             this.saving = true;
 
             try {
diff --git a/app/modules/cms/templates/cms/admin/content-pages.html b/app/modules/cms/templates/cms/admin/content-pages.html
index c8c3bfad..62c487f1 100644
--- a/app/modules/cms/templates/cms/admin/content-pages.html
+++ b/app/modules/cms/templates/cms/admin/content-pages.html
@@ -3,6 +3,7 @@
 {% from 'shared/macros/headers.html' import page_header %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/tabs.html' import tabs_inline, tab_button %}
+{% from 'shared/macros/modals.html' import confirm_modal_dynamic %}
 
 {% block title %}Content Pages{% endblock %}
 
@@ -142,7 +143,7 @@
                                     <span x-html="$icon('edit', 'w-5 h-5')"></span>
                                 </a>
                                 <button
-                                    @click="deletePage(page)"
+                                    @click="promptDeletePage(page)"
                                     class="flex items-center justify-center p-2 text-red-600 rounded-lg hover:bg-red-50 dark:text-red-400 dark:hover:bg-gray-700 focus:outline-none transition-colors"
                                     title="Delete"
                                 >
@@ -175,6 +176,28 @@
         Create First Page
     </a>
 </div>
+
+{{ confirm_modal_dynamic(
+    'createHomepageModal',
+    'Create Homepage',
+    "'No homepage found for ' + (pendingHomepagePlatform || '') + '. Would you like to create one?'",
+    'createHomepage()',
+    'showCreateHomepageConfirm',
+    'Create',
+    'Cancel',
+    'info'
+) }}
+
+{{ confirm_modal_dynamic(
+    'deletePageModal',
+    'Delete Page',
+    "'Are you sure you want to delete \"' + (pageToDelete?.title || '') + '\"?'",
+    'deletePage(pageToDelete)',
+    'showDeletePageConfirm',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/cms/templates/cms/store/content-page-edit.html b/app/modules/cms/templates/cms/store/content-page-edit.html
index fe508968..1148e9bf 100644
--- a/app/modules/cms/templates/cms/store/content-page-edit.html
+++ b/app/modules/cms/templates/cms/store/content-page-edit.html
@@ -3,7 +3,7 @@
 {% from 'shared/macros/alerts.html' import loading_state, error_state, alert_dynamic %}
 {% from 'shared/macros/headers.html' import back_button %}
 {% from 'shared/macros/inputs.html' import number_stepper %}
-{% from 'shared/macros/modals.html' import modal %}
+{% from 'shared/macros/modals.html' import modal, confirm_modal_dynamic %}
 
 {% block title %}{% if page_id %}Edit{% else %}Create{% endif %} Content Page{% endblock %}
 
@@ -61,7 +61,7 @@
                 View Default
             </button>
             <button
-                @click="deletePage()"
+                @click="showDeletePageConfirm = true"
                 class="inline-flex items-center px-3 py-1.5 text-xs font-medium text-red-700 bg-white dark:bg-red-900/50 dark:text-red-300 border border-red-300 dark:border-red-700 rounded-lg hover:bg-red-50 dark:hover:bg-red-900 transition-colors"
             >
                 <span x-html="$icon('arrow-uturn-left', 'w-4 h-4 mr-1')"></span>
@@ -319,6 +319,17 @@
         </div>
     </form>
 </div>
+
+{{ confirm_modal_dynamic(
+    'deletePageModal',
+    'Delete Page',
+    "isOverride ? 'Are you sure you want to revert to the platform default? Your customizations will be lost.' : 'Are you sure you want to delete this page? This cannot be undone.'",
+    'deletePage()',
+    'showDeletePageConfirm',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/cms/templates/cms/store/content-pages.html b/app/modules/cms/templates/cms/store/content-pages.html
index faa7e81c..809bb002 100644
--- a/app/modules/cms/templates/cms/store/content-pages.html
+++ b/app/modules/cms/templates/cms/store/content-pages.html
@@ -3,6 +3,7 @@
 {% from 'shared/macros/headers.html' import page_header %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/tabs.html' import tabs_inline, tab_button %}
+{% from 'shared/macros/modals.html' import confirm_modal_dynamic %}
 
 {% block title %}Content Pages{% endblock %}
 
@@ -286,7 +287,7 @@
                                         <span x-html="$icon('eye', 'w-5 h-5')"></span>
                                     </a>
                                     <button
-                                        @click="deletePage(page)"
+                                        @click="promptDeletePage(page)"
                                         class="flex items-center justify-center p-2 text-red-600 rounded-lg hover:bg-red-50 dark:text-red-400 dark:hover:bg-gray-700 focus:outline-none transition-colors"
                                         title="Delete"
                                     >
@@ -320,6 +321,17 @@
         </a>
     </div>
 </div>
+
+{{ confirm_modal_dynamic(
+    'deletePageModal',
+    'Delete Page',
+    "pageToDelete?.is_store_override ? 'Are you sure you want to delete your override for \"' + (pageToDelete?.title || '') + '\"? The platform default will be shown instead.' : 'Are you sure you want to delete \"' + (pageToDelete?.title || '') + '\"? This cannot be undone.'",
+    'deletePage(pageToDelete)',
+    'showDeletePageConfirm',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/cms/templates/cms/store/media.html b/app/modules/cms/templates/cms/store/media.html
index 38b6b0ab..447db1ba 100644
--- a/app/modules/cms/templates/cms/store/media.html
+++ b/app/modules/cms/templates/cms/store/media.html
@@ -3,7 +3,7 @@
 {% from 'shared/macros/pagination.html' import pagination %}
 {% from 'shared/macros/headers.html' import page_header_flex, refresh_button %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
-{% from 'shared/macros/modals.html' import modal_simple %}
+{% from 'shared/macros/modals.html' import modal_simple, confirm_modal %}
 
 {% block title %}Media Library{% endblock %}
 
@@ -412,7 +412,7 @@
         <!-- Modal Footer -->
         <div class="flex justify-between px-6 py-4 border-t dark:border-gray-700">
             <button
-                @click="deleteMedia()"
+                @click="showDeleteMediaConfirm = true"
                 class="px-4 py-2 text-sm font-medium text-red-600 border border-red-600 rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20"
                 :disabled="saving"
             >
@@ -438,6 +438,17 @@
         </div>
     </div>
 </div>
+
+{{ confirm_modal(
+    'deleteMediaModal',
+    'Delete File',
+    'Are you sure you want to delete this file? This action cannot be undone.',
+    'deleteMedia()',
+    'showDeleteMediaConfirm',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/core/static/admin/js/my-menu-config.js b/app/modules/core/static/admin/js/my-menu-config.js
index e43a8655..5e8424a6 100644
--- a/app/modules/core/static/admin/js/my-menu-config.js
+++ b/app/modules/core/static/admin/js/my-menu-config.js
@@ -28,6 +28,8 @@ function adminMyMenuConfig() {
 
         // Data
         menuConfig: null,
+        showShowAllModal: false,
+        showHideAllModal: false,
 
         // Computed grouped items
         get groupedItems() {
@@ -143,10 +145,6 @@ function adminMyMenuConfig() {
         },
 
         async showAll() {
-            if (!confirm(I18n.t('core.confirmations.show_all_menu_items'))) {
-                return;
-            }
-
             this.saving = true;
             this.error = null;
             this.successMessage = null;
@@ -165,10 +163,6 @@ function adminMyMenuConfig() {
         },
 
         async resetToDefaults() {
-            if (!confirm(I18n.t('core.confirmations.hide_all_menu_items'))) {
-                return;
-            }
-
             this.saving = true;
             this.error = null;
             this.successMessage = null;
diff --git a/app/modules/core/static/admin/js/settings.js b/app/modules/core/static/admin/js/settings.js
index 0e960f2c..b6f2262f 100644
--- a/app/modules/core/static/admin/js/settings.js
+++ b/app/modules/core/static/admin/js/settings.js
@@ -80,6 +80,8 @@ function adminSettings() {
         sendingTestEmail: false,
         testEmailError: null,
         testEmailSuccess: null,
+        showResetEmailModal: false,
+        showCleanupLogsModal: false,
 
         async init() {
             // Load i18n translations
@@ -194,10 +196,6 @@ function adminSettings() {
         },
 
         async cleanupOldLogs() {
-            if (!confirm(`This will delete all logs older than ${this.logSettings.db_log_retention_days} days. Continue?`)) {
-                return;
-            }
-
             this.error = null;
             this.successMessage = null;
 
@@ -439,10 +437,6 @@ function adminSettings() {
         },
 
         async resetEmailSettings() {
-            if (!confirm(I18n.t('core.confirmations.reset_email_settings'))) {
-                return;
-            }
-
             this.saving = true;
             this.error = null;
             this.successMessage = null;
diff --git a/app/modules/core/templates/core/admin/my-menu-config.html b/app/modules/core/templates/core/admin/my-menu-config.html
index d5c70e00..0181027a 100644
--- a/app/modules/core/templates/core/admin/my-menu-config.html
+++ b/app/modules/core/templates/core/admin/my-menu-config.html
@@ -2,6 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/alerts.html' import alert_dynamic, error_state %}
 {% from 'shared/macros/headers.html' import page_header %}
+{% from 'shared/macros/modals.html' import confirm_modal %}
 
 {% block title %}My Menu{% endblock %}
 
@@ -68,7 +69,7 @@
     </p>
     <div class="flex gap-2">
         <button
-            @click="showAll()"
+            @click="showShowAllModal = true"
             :disabled="saving"
             class="inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600 dark:hover:bg-gray-600"
         >
@@ -76,7 +77,7 @@
             Show All
         </button>
         <button
-            @click="resetToDefaults()"
+            @click="showHideAllModal = true"
             :disabled="saving"
             class="inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600 dark:hover:bg-gray-600"
         >
@@ -167,6 +168,31 @@
     </div>
 </div>
 
+<!-- Confirmation Modals -->
+{{ confirm_modal(
+    'showAllModal',
+    'Show All Menu Items',
+    'This will make all menu items visible in your sidebar. Are you sure?',
+    'showAll()',
+    'showShowAllModal',
+    'Show All',
+    'Cancel',
+    'info',
+    'eye'
+) }}
+
+{{ confirm_modal(
+    'hideAllModal',
+    'Hide All Menu Items',
+    'This will hide all non-mandatory menu items from your sidebar. Are you sure?',
+    'resetToDefaults()',
+    'showHideAllModal',
+    'Hide All',
+    'Cancel',
+    'warning',
+    'eye-off'
+) }}
+
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/core/templates/core/admin/settings.html b/app/modules/core/templates/core/admin/settings.html
index 9d5ab6f7..20c64310 100644
--- a/app/modules/core/templates/core/admin/settings.html
+++ b/app/modules/core/templates/core/admin/settings.html
@@ -4,6 +4,7 @@
 {% from 'shared/macros/headers.html' import page_header_refresh %}
 {% from 'shared/macros/tabs.html' import tabs_nav, tab_button %}
 {% from 'shared/macros/inputs.html' import number_stepper %}
+{% from 'shared/macros/modals.html' import confirm_modal, confirm_modal_dynamic %}
 
 {% block title %}Platform Settings{% endblock %}
 
@@ -208,7 +209,7 @@
                     View Logs
                 </a>
                 <button
-                    @click="cleanupOldLogs()"
+                    @click="showCleanupLogsModal = true"
                     class="inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 transition-colors duration-150 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-600 focus:outline-none focus:shadow-outline-gray"
                 >
                     <span x-html="$icon('delete', 'w-4 h-4 mr-2')"></span>
@@ -355,7 +356,7 @@
                 <template x-if="emailSettings.has_db_overrides">
                     <div class="mt-4">
                         <button
-                            @click="resetEmailSettings()"
+                            @click="showResetEmailModal = true"
                             :disabled="saving"
                             class="px-4 py-2 text-sm font-medium text-red-600 dark:text-red-400 bg-white dark:bg-gray-700 border border-red-300 dark:border-red-600 rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20 disabled:opacity-50"
                         >
@@ -775,6 +776,30 @@
     </div>
 </div>
 
+<!-- Confirmation Modals -->
+{{ confirm_modal(
+    'resetEmailModal',
+    'Reset Email Settings',
+    'This will remove all database overrides and revert email configuration to .env defaults. Are you sure?',
+    'resetEmailSettings()',
+    'showResetEmailModal',
+    'Reset to Defaults',
+    'Cancel',
+    'warning',
+    'refresh'
+) }}
+
+{{ confirm_modal_dynamic(
+    'cleanupLogsModal',
+    'Cleanup Old Logs',
+    "'This will permanently delete all logs older than ' + logSettings.db_log_retention_days + ' days. This action cannot be undone.'",
+    'cleanupOldLogs()',
+    'showCleanupLogsModal',
+    'Delete Old Logs',
+    'Cancel',
+    'danger'
+) }}
+
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/customers/static/admin/js/customers.js b/app/modules/customers/static/admin/js/customers.js
index 0c4f5aa1..4e7c482a 100644
--- a/app/modules/customers/static/admin/js/customers.js
+++ b/app/modules/customers/static/admin/js/customers.js
@@ -52,6 +52,10 @@ function adminCustomers() {
         // Selected store (for prominent display and filtering)
         selectedStore: null,
 
+        // Toggle status confirm state
+        showToggleStatusConfirm: false,
+        pendingToggleCustomer: null,
+
         // Tom Select instance
         storeSelectInstance: null,
 
@@ -351,11 +355,6 @@ function adminCustomers() {
          * Toggle customer active status
          */
         async toggleStatus(customer) {
-            const action = customer.is_active ? 'deactivate' : 'activate';
-            if (!confirm(`Are you sure you want to ${action} this customer?`)) {
-                return;
-            }
-
             try {
                 const response = await apiClient.patch(`/admin/customers/${customer.id}/toggle-status`);
                 customer.is_active = response.is_active;
diff --git a/app/modules/customers/templates/customers/admin/customers.html b/app/modules/customers/templates/customers/admin/customers.html
index c6faefe6..6b643fce 100644
--- a/app/modules/customers/templates/customers/admin/customers.html
+++ b/app/modules/customers/templates/customers/admin/customers.html
@@ -4,6 +4,7 @@
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/tables.html' import table_wrapper, table_header %}
 {% from 'shared/macros/pagination.html' import pagination %}
+{% from 'shared/macros/modals.html' import confirm_modal_dynamic %}
 
 {% block title %}Customers{% endblock %}
 
@@ -278,7 +279,7 @@
                         <td class="px-4 py-3">
                             <div class="flex items-center space-x-2 text-sm">
                                 <button
-                                    @click="toggleStatus(customer)"
+                                    @click="pendingToggleCustomer = customer; showToggleStatusConfirm = true"
                                     class="px-2 py-1 text-xs font-medium leading-5 rounded-lg"
                                     :class="customer.is_active
                                         ? 'text-red-600 hover:bg-red-100 dark:text-red-400 dark:hover:bg-red-700/50'
@@ -298,6 +299,9 @@
     <!-- Pagination -->
     {{ pagination() }}
 </div>
+
+<!-- Toggle Customer Status Confirm Modal -->
+{{ confirm_modal_dynamic('toggleStatusConfirm', 'Change Customer Status', "'Are you sure you want to ' + (pendingToggleCustomer?.is_active ? 'deactivate' : 'activate') + ' this customer?'", 'toggleStatus(pendingToggleCustomer)', 'showToggleStatusConfirm', 'Confirm', 'Cancel', 'warning') }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/marketplace/static/admin/js/letzshop.js b/app/modules/marketplace/static/admin/js/letzshop.js
index 86374261..6bc04493 100644
--- a/app/modules/marketplace/static/admin/js/letzshop.js
+++ b/app/modules/marketplace/static/admin/js/letzshop.js
@@ -48,6 +48,9 @@ function adminLetzshop() {
             pendingOrders: 0
         },
 
+        // Confirm modals
+        showDeleteStoreConfigModal: false,
+
         // Configuration modal
         showConfigModal: false,
         selectedStore: null,
@@ -191,10 +194,6 @@ function adminLetzshop() {
          * Delete store configuration
          */
         async deleteStoreConfig() {
-            if (!confirm(I18n.t('marketplace.confirmations.remove_letzshop_config_store'))) {
-                return;
-            }
-
             try {
                 await apiClient.delete(`/admin/letzshop/stores/${this.selectedStore.store_id}/credentials`);
                 this.showConfigModal = false;
diff --git a/app/modules/marketplace/static/admin/js/marketplace-letzshop.js b/app/modules/marketplace/static/admin/js/marketplace-letzshop.js
index e9b56e58..9d4e0203 100644
--- a/app/modules/marketplace/static/admin/js/marketplace-letzshop.js
+++ b/app/modules/marketplace/static/admin/js/marketplace-letzshop.js
@@ -124,6 +124,15 @@ function adminMarketplaceLetzshop() {
         productStats: { total: 0, active: 0, inactive: 0, last_sync: null },
         showImportModal: false,
 
+        // Confirm modals
+        showDeclineOrderModal: false,
+        orderToDecline: null,
+        showConfirmAllItemsModal: false,
+        showDeclineAllItemsModal: false,
+        showDeleteCredentialsModal: false,
+        showIgnoreExceptionModal: false,
+        exceptionToIgnore: null,
+
         // Modals
         showTrackingModal: false,
         showOrderModal: false,
@@ -1010,8 +1019,6 @@ function adminMarketplaceLetzshop() {
         async declineOrder(order) {
             if (!this.selectedStore) return;
 
-            if (!confirm(I18n.t('marketplace.confirmations.decline_order'))) return;
-
             try {
                 await apiClient.post(`/admin/letzshop/stores/${this.selectedStore.id}/orders/${order.id}/reject`);
                 this.successMessage = 'Order declined';
@@ -1128,8 +1135,6 @@ function adminMarketplaceLetzshop() {
         async confirmAllItems(order) {
             if (!this.selectedStore) return;
 
-            if (!confirm(I18n.t('marketplace.confirmations.confirm_all_items'))) return;
-
             try {
                 await apiClient.post(
                     `/admin/letzshop/stores/${this.selectedStore.id}/orders/${order.id}/confirm`
@@ -1149,8 +1154,6 @@ function adminMarketplaceLetzshop() {
         async declineAllItems(order) {
             if (!this.selectedStore) return;
 
-            if (!confirm(I18n.t('marketplace.confirmations.decline_all_items'))) return;
-
             try {
                 await apiClient.post(
                     `/admin/letzshop/stores/${this.selectedStore.id}/orders/${order.id}/reject`
@@ -1241,10 +1244,6 @@ function adminMarketplaceLetzshop() {
         async deleteCredentials() {
             if (!this.selectedStore) return;
 
-            if (!confirm(I18n.t('marketplace.confirmations.remove_letzshop_config'))) {
-                return;
-            }
-
             try {
                 await apiClient.delete(`/admin/letzshop/stores/${this.selectedStore.id}/credentials`);
                 this.successMessage = 'Credentials removed';
@@ -1459,10 +1458,6 @@ function adminMarketplaceLetzshop() {
          * Ignore an exception
          */
         async ignoreException(exception) {
-            if (!confirm(I18n.t('marketplace.confirmations.ignore_exception'))) {
-                return;
-            }
-
             try {
                 await apiClient.post(`/admin/order-exceptions/${exception.id}/ignore`, {
                     notes: 'Ignored via admin interface'
diff --git a/app/modules/marketplace/static/store/js/letzshop.js b/app/modules/marketplace/static/store/js/letzshop.js
index bea3be04..2c7c6783 100644
--- a/app/modules/marketplace/static/store/js/letzshop.js
+++ b/app/modules/marketplace/static/store/js/letzshop.js
@@ -66,6 +66,13 @@ function storeLetzshop() {
             shipped: 0
         },
 
+        // Confirm modals
+        showDeleteCredentialsModal: false,
+        showConfirmOrderModal: false,
+        orderToConfirm: null,
+        showRejectOrderModal: false,
+        orderToReject: null,
+
         // Modals
         showTrackingModal: false,
         showOrderModal: false,
@@ -291,10 +298,6 @@ function storeLetzshop() {
          * Delete credentials
          */
         async deleteCredentials() {
-            if (!confirm(I18n.t('marketplace.confirmations.remove_letzshop_credentials'))) {
-                return;
-            }
-
             try {
                 await apiClient.delete('/store/letzshop/credentials');
                 this.credentials = null;
@@ -316,10 +319,6 @@ function storeLetzshop() {
          * Confirm order
          */
         async confirmOrder(order) {
-            if (!confirm(I18n.t('marketplace.confirmations.confirm_order'))) {
-                return;
-            }
-
             try {
                 const response = await apiClient.post(`/store/letzshop/orders/${order.id}/confirm`);
 
@@ -340,10 +339,6 @@ function storeLetzshop() {
          * Reject order
          */
         async rejectOrder(order) {
-            if (!confirm(I18n.t('marketplace.confirmations.reject_order'))) {
-                return;
-            }
-
             try {
                 const response = await apiClient.post(`/store/letzshop/orders/${order.id}/reject`);
 
diff --git a/app/modules/marketplace/templates/marketplace/admin/letzshop.html b/app/modules/marketplace/templates/marketplace/admin/letzshop.html
index e9571b42..dde4cdb0 100644
--- a/app/modules/marketplace/templates/marketplace/admin/letzshop.html
+++ b/app/modules/marketplace/templates/marketplace/admin/letzshop.html
@@ -4,7 +4,7 @@
 {% from 'shared/macros/headers.html' import page_header_flex, refresh_button %}
 {% from 'shared/macros/alerts.html' import error_state, alert_dynamic %}
 {% from 'shared/macros/tables.html' import table_wrapper, table_header %}
-{% from 'shared/macros/modals.html' import modal %}
+{% from 'shared/macros/modals.html' import modal, confirm_modal %}
 
 {% block title %}Letzshop Management{% endblock %}
 
@@ -283,7 +283,7 @@
             <button
                 type="button"
                 x-show="storeCredentials"
-                @click="deleteStoreConfig()"
+                @click="showDeleteStoreConfigModal = true"
                 class="px-4 py-2 text-sm font-medium text-red-600 border border-red-300 rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20"
             >
                 Remove
@@ -310,6 +310,9 @@
 {% endcall %}
 
 <!-- Orders Modal -->
+<!-- Delete Store Config Confirm Modal -->
+{{ confirm_modal('deleteStoreConfigModal', 'Remove Configuration', 'Are you sure you want to remove the Letzshop configuration for this store? This will delete the API key and disable syncing.', 'deleteStoreConfig()', 'showDeleteStoreConfigModal', 'Remove', 'Cancel', 'danger') }}
+
 {% call modal('ordersModal', 'Store Orders', 'showOrdersModal', size='xl') %}
     <p class="text-sm text-gray-500 dark:text-gray-400 mb-4">
         Orders for: <span class="font-semibold" x-text="selectedStore?.store_name"></span>
diff --git a/app/modules/marketplace/templates/marketplace/admin/marketplace-letzshop.html b/app/modules/marketplace/templates/marketplace/admin/marketplace-letzshop.html
index 21e518e8..ec5b9d16 100644
--- a/app/modules/marketplace/templates/marketplace/admin/marketplace-letzshop.html
+++ b/app/modules/marketplace/templates/marketplace/admin/marketplace-letzshop.html
@@ -4,7 +4,7 @@
 {% from 'shared/macros/alerts.html' import alert_dynamic, error_state %}
 {% from 'shared/macros/headers.html' import page_header_flex, refresh_button %}
 {# Import modals macro - custom modals below use inline definition for specialized forms #}
-{% from 'shared/macros/modals.html' import modal_simple %}
+{% from 'shared/macros/modals.html' import modal_simple, confirm_modal %}
 
 {% block title %}Letzshop Management{% endblock %}
 {% block alpine_data %}adminMarketplaceLetzshop(){% endblock %}
@@ -426,13 +426,13 @@
                 <!-- Bulk Actions -->
                 <div x-show="selectedOrder?.status === 'pending'" class="mt-4 flex gap-2 justify-end">
                     <button
-                        @click="confirmAllItems(selectedOrder)"
+                        @click="showConfirmAllItemsModal = true"
                         class="px-3 py-1.5 text-sm text-white bg-green-600 hover:bg-green-700 rounded-lg"
                     >
                         Confirm All Items
                     </button>
                     <button
-                        @click="declineAllItems(selectedOrder)"
+                        @click="showDeclineAllItemsModal = true"
                         class="px-3 py-1.5 text-sm text-white bg-red-600 hover:bg-red-700 rounded-lg"
                     >
                         Decline All Items
@@ -582,6 +582,21 @@
         </form>
     </div>
 </div>
+
+<!-- Decline Order Confirm Modal -->
+{{ confirm_modal('declineOrderModal', 'Decline Order', 'Are you sure you want to decline this order? This action cannot be undone.', 'declineOrder(orderToDecline)', 'showDeclineOrderModal', 'Decline', 'Cancel', 'danger') }}
+
+<!-- Confirm All Items Modal -->
+{{ confirm_modal('confirmAllItemsModal', 'Confirm All Items', 'Are you sure you want to confirm all items in this order?', 'confirmAllItems(selectedOrder)', 'showConfirmAllItemsModal', 'Confirm All', 'Cancel', 'info') }}
+
+<!-- Decline All Items Modal -->
+{{ confirm_modal('declineAllItemsModal', 'Decline All Items', 'Are you sure you want to decline all items in this order? This action cannot be undone.', 'declineAllItems(selectedOrder)', 'showDeclineAllItemsModal', 'Decline All', 'Cancel', 'danger') }}
+
+<!-- Delete Credentials Confirm Modal -->
+{{ confirm_modal('deleteCredentialsModal', 'Remove Credentials', 'Are you sure you want to remove the Letzshop API credentials? This will disable order syncing for this store.', 'deleteCredentials()', 'showDeleteCredentialsModal', 'Remove', 'Cancel', 'danger') }}
+
+<!-- Ignore Exception Confirm Modal -->
+{{ confirm_modal('ignoreExceptionModal', 'Ignore Exception', 'Are you sure you want to ignore this exception? The unmatched product will not be resolved.', 'ignoreException(exceptionToIgnore)', 'showIgnoreExceptionModal', 'Ignore', 'Cancel', 'warning') }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-exceptions-tab.html b/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-exceptions-tab.html
index 6c16fd0c..18c8439e 100644
--- a/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-exceptions-tab.html
+++ b/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-exceptions-tab.html
@@ -186,7 +186,7 @@
                                 </template>
                                 <template x-if="exc.status === 'pending'">
                                     <button
-                                        @click="ignoreException(exc)"
+                                        @click="exceptionToIgnore = exc; showIgnoreExceptionModal = true"
                                         class="flex items-center justify-center px-2 py-1 text-sm text-gray-600 transition-colors duration-150 rounded-md hover:bg-gray-100 dark:hover:bg-gray-700"
                                         title="Ignore Exception"
                                     >
diff --git a/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-orders-tab.html b/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-orders-tab.html
index 21ec7d9c..78fc1bd6 100644
--- a/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-orders-tab.html
+++ b/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-orders-tab.html
@@ -275,7 +275,7 @@
                                 </button>
                                 <button
                                     x-show="order.status === 'pending'"
-                                    @click="declineOrder(order)"
+                                    @click="orderToDecline = order; showDeclineOrderModal = true"
                                     class="flex items-center justify-center px-2 py-1 text-sm text-red-600 transition-colors duration-150 rounded-md hover:bg-red-100 dark:hover:bg-red-900"
                                     title="Decline Order"
                                 >
diff --git a/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-settings-tab.html b/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-settings-tab.html
index 3380fd2f..85affba3 100644
--- a/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-settings-tab.html
+++ b/app/modules/marketplace/templates/marketplace/admin/partials/letzshop-settings-tab.html
@@ -148,7 +148,7 @@
                     <button
                         type="button"
                         x-show="credentials"
-                        @click="deleteCredentials()"
+                        @click="showDeleteCredentialsModal = true"
                         class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-red-600 transition-colors duration-150 bg-white dark:bg-gray-800 border border-red-300 rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20 focus:outline-none"
                     >
                         <span x-html="$icon('trash', 'w-4 h-4 mr-2')"></span>
diff --git a/app/modules/marketplace/templates/marketplace/store/letzshop.html b/app/modules/marketplace/templates/marketplace/store/letzshop.html
index d35fccae..90230849 100644
--- a/app/modules/marketplace/templates/marketplace/store/letzshop.html
+++ b/app/modules/marketplace/templates/marketplace/store/letzshop.html
@@ -2,7 +2,7 @@
 {% extends "store/base.html" %}
 {% from 'shared/macros/headers.html' import page_header_flex %}
 {% from 'shared/macros/tables.html' import table_wrapper, table_header %}
-{% from 'shared/macros/modals.html' import form_modal %}
+{% from 'shared/macros/modals.html' import form_modal, confirm_modal %}
 
 {% block title %}Letzshop Orders{% endblock %}
 
@@ -217,7 +217,7 @@
                                 <div class="flex items-center space-x-2 text-sm">
                                     <button
                                         x-show="order.sync_status === 'pending'"
-                                        @click="confirmOrder(order)"
+                                        @click="orderToConfirm = order; showConfirmOrderModal = true"
                                         class="flex items-center justify-center px-2 py-1 text-sm text-green-600 transition-colors duration-150 rounded-md hover:bg-green-100 dark:hover:bg-green-900"
                                         title="Confirm Order"
                                     >
@@ -225,7 +225,7 @@
                                     </button>
                                     <button
                                         x-show="order.sync_status === 'pending'"
-                                        @click="rejectOrder(order)"
+                                        @click="orderToReject = order; showRejectOrderModal = true"
                                         class="flex items-center justify-center px-2 py-1 text-sm text-red-600 transition-colors duration-150 rounded-md hover:bg-red-100 dark:hover:bg-red-900"
                                         title="Reject Order"
                                     >
@@ -551,7 +551,7 @@
                     <button
                         type="button"
                         x-show="credentials"
-                        @click="deleteCredentials()"
+                        @click="showDeleteCredentialsModal = true"
                         class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-red-600 transition-colors duration-150 bg-white dark:bg-gray-800 border border-red-300 rounded-lg hover:bg-red-50 dark:hover:bg-red-900/20 focus:outline-none"
                     >
                         <span x-html="$icon('trash', 'w-4 h-4 mr-2')"></span>
@@ -683,4 +683,13 @@
         </div>
     </div>
 </div>
+
+<!-- Delete Credentials Confirm Modal -->
+{{ confirm_modal('deleteCredentialsModal', 'Remove Credentials', 'Are you sure you want to remove your Letzshop API credentials? This will disable order syncing.', 'deleteCredentials()', 'showDeleteCredentialsModal', 'Remove', 'Cancel', 'danger') }}
+
+<!-- Confirm Order Modal -->
+{{ confirm_modal('confirmOrderModal', 'Confirm Order', 'Are you sure you want to confirm this order? The order will be marked as accepted.', 'confirmOrder(orderToConfirm)', 'showConfirmOrderModal', 'Confirm', 'Cancel', 'info') }}
+
+<!-- Reject Order Modal -->
+{{ confirm_modal('rejectOrderModal', 'Reject Order', 'Are you sure you want to reject this order? This action cannot be undone.', 'rejectOrder(orderToReject)', 'showRejectOrderModal', 'Reject', 'Cancel', 'danger') }}
 {% endblock %}
diff --git a/app/modules/messaging/static/admin/js/messages.js b/app/modules/messaging/static/admin/js/messages.js
index 8e2d0c7a..04e5f606 100644
--- a/app/modules/messaging/static/admin/js/messages.js
+++ b/app/modules/messaging/static/admin/js/messages.js
@@ -49,6 +49,9 @@ function adminMessages(initialConversationId = null) {
         replyContent: '',
         attachedFiles: [],
 
+        // Close conversation confirm state
+        showCloseConversationConfirm: false,
+
         // Compose modal
         showComposeModal: false,
         compose: {
@@ -304,8 +307,6 @@ function adminMessages(initialConversationId = null) {
          * Close conversation
          */
         async closeConversation() {
-            if (!confirm(I18n.t('messaging.confirmations.close_conversation_admin'))) return;
-
             try {
                 await apiClient.post(`/admin/messages/${this.selectedConversationId}/close`);
 
diff --git a/app/modules/messaging/static/admin/js/notifications.js b/app/modules/messaging/static/admin/js/notifications.js
index d5825d69..11777f0e 100644
--- a/app/modules/messaging/static/admin/js/notifications.js
+++ b/app/modules/messaging/static/admin/js/notifications.js
@@ -67,6 +67,10 @@ function adminNotifications() {
         resolvingAlert: null,
         resolutionNotes: '',
 
+        // Delete notification confirm state
+        showDeleteNotificationConfirm: false,
+        pendingDeleteNotificationId: null,
+
         /**
          * Initialize component
          */
@@ -163,10 +167,6 @@ function adminNotifications() {
          * Delete notification
          */
         async deleteNotification(notificationId) {
-            if (!confirm(I18n.t('messaging.confirmations.delete_notification'))) {
-                return;
-            }
-
             try {
                 await apiClient.delete(`/admin/notifications/${notificationId}`);
 
diff --git a/app/modules/messaging/static/store/js/email-templates.js b/app/modules/messaging/static/store/js/email-templates.js
index 44a21146..ddc8b4ed 100644
--- a/app/modules/messaging/static/store/js/email-templates.js
+++ b/app/modules/messaging/static/store/js/email-templates.js
@@ -43,6 +43,9 @@ function storeEmailTemplates() {
         },
         reverting: false,
 
+        // Revert confirm state
+        showRevertConfirm: false,
+
         // Preview Modal
         showPreviewModal: false,
         previewData: null,
@@ -184,10 +187,6 @@ function storeEmailTemplates() {
         async revertToDefault() {
             if (!this.editingTemplate) return;
 
-            if (!confirm(I18n.t('messaging.confirmations.delete_customization'))) {
-                return;
-            }
-
             this.reverting = true;
 
             try {
diff --git a/app/modules/messaging/static/store/js/messages.js b/app/modules/messaging/static/store/js/messages.js
index f9332f86..0178abaa 100644
--- a/app/modules/messaging/static/store/js/messages.js
+++ b/app/modules/messaging/static/store/js/messages.js
@@ -46,6 +46,9 @@ function storeMessages(initialConversationId = null) {
         // Reply form
         replyContent: '',
 
+        // Close conversation confirm state
+        showCloseConversationConfirm: false,
+
         // Compose modal
         showComposeModal: false,
         compose: {
@@ -279,8 +282,6 @@ function storeMessages(initialConversationId = null) {
          * Close conversation
          */
         async closeConversation() {
-            if (!confirm(I18n.t('messaging.confirmations.close_conversation'))) return;
-
             try {
                 await apiClient.post(`/store/messages/${this.selectedConversationId}/close`);
 
diff --git a/app/modules/messaging/static/store/js/notifications.js b/app/modules/messaging/static/store/js/notifications.js
index 025f323d..07f2df9c 100644
--- a/app/modules/messaging/static/store/js/notifications.js
+++ b/app/modules/messaging/static/store/js/notifications.js
@@ -42,6 +42,10 @@ function storeNotifications() {
             is_read: ''
         },
 
+        // Delete notification confirm state
+        showDeleteNotificationConfirm: false,
+        pendingDeleteNotificationId: null,
+
         // Settings
         settings: null,
         showSettingsModal: false,
@@ -153,10 +157,6 @@ function storeNotifications() {
          * Delete notification
          */
         async deleteNotification(notificationId) {
-            if (!confirm(I18n.t('messaging.confirmations.delete_notification'))) {
-                return;
-            }
-
             try {
                 await apiClient.delete(`/store/notifications/${notificationId}`);
 
diff --git a/app/modules/messaging/templates/messaging/admin/messages.html b/app/modules/messaging/templates/messaging/admin/messages.html
index 8faf804e..311f7435 100644
--- a/app/modules/messaging/templates/messaging/admin/messages.html
+++ b/app/modules/messaging/templates/messaging/admin/messages.html
@@ -2,7 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/headers.html' import page_header_flex %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
-{% from 'shared/macros/modals.html' import form_modal %}
+{% from 'shared/macros/modals.html' import form_modal, confirm_modal %}
 
 {% block title %}Messages{% endblock %}
 
@@ -157,7 +157,7 @@
                     </div>
                     <div class="flex items-center gap-2">
                         <template x-if="!selectedConversation.is_closed">
-                            <button @click="closeConversation()"
+                            <button @click="showCloseConversationConfirm = true"
                                     class="px-3 py-1.5 text-sm font-medium text-gray-600 bg-gray-100 rounded-lg hover:bg-gray-200 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600">
                                 Close
                             </button>
@@ -329,6 +329,9 @@
         </div>
     </div>
 {% endcall %}
+
+<!-- Close Conversation Confirm Modal -->
+{{ confirm_modal('closeConversationConfirm', 'Close Conversation', 'Are you sure you want to close this conversation? You can reopen it later if needed.', 'closeConversation()', 'showCloseConversationConfirm', 'Close Conversation', 'Cancel', 'warning') }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/messaging/templates/messaging/admin/notifications.html b/app/modules/messaging/templates/messaging/admin/notifications.html
index 4e0e6a39..8f648822 100644
--- a/app/modules/messaging/templates/messaging/admin/notifications.html
+++ b/app/modules/messaging/templates/messaging/admin/notifications.html
@@ -2,6 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/headers.html' import page_header %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
+{% from 'shared/macros/modals.html' import confirm_modal %}
 
 {% block title %}Notifications{% endblock %}
 
@@ -213,7 +214,7 @@
                                     Mark read
                                 </button>
                             </template>
-                            <button @click="deleteNotification(notif.id)"
+                            <button @click="pendingDeleteNotificationId = notif.id; showDeleteNotificationConfirm = true"
                                     class="p-1 text-gray-400 hover:text-red-500 transition-colors">
                                 <span x-html="$icon('trash', 'w-4 h-4')"></span>
                             </button>
@@ -354,6 +355,9 @@
         </ul>
     </div>
 </div>
+
+<!-- Delete Notification Confirm Modal -->
+{{ confirm_modal('deleteNotificationConfirm', 'Delete Notification', 'Are you sure you want to delete this notification? This action cannot be undone.', 'deleteNotification(pendingDeleteNotificationId)', 'showDeleteNotificationConfirm', 'Delete', 'Cancel', 'danger') }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/messaging/templates/messaging/store/email-templates.html b/app/modules/messaging/templates/messaging/store/email-templates.html
index 6c8100de..345f934a 100644
--- a/app/modules/messaging/templates/messaging/store/email-templates.html
+++ b/app/modules/messaging/templates/messaging/store/email-templates.html
@@ -2,7 +2,7 @@
 {% extends "store/base.html" %}
 {% from 'shared/macros/headers.html' import page_header_flex %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
-{% from 'shared/macros/modals.html' import modal_dialog %}
+{% from 'shared/macros/modals.html' import modal_dialog, confirm_modal %}
 
 {% block title %}Email Templates{% endblock %}
 
@@ -212,7 +212,7 @@
                 <!-- Revert to Default Button -->
                 <template x-if="templateSource === 'store_override'">
                     <button
-                        @click="revertToDefault()"
+                        @click="showRevertConfirm = true"
                         :disabled="reverting"
                         class="px-4 py-2 text-sm font-medium text-red-600 hover:text-red-700 hover:bg-red-50 rounded-lg dark:text-red-400 dark:hover:bg-red-900/20"
                     >
@@ -323,6 +323,9 @@
     </div>
 </div>
 {% endcall %}
+
+<!-- Revert to Default Confirm Modal -->
+{{ confirm_modal('revertConfirm', 'Revert to Platform Default', 'Are you sure you want to delete your customization and revert to the platform default template? This action cannot be undone.', 'revertToDefault()', 'showRevertConfirm', 'Revert', 'Cancel', 'danger') }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/messaging/templates/messaging/store/messages.html b/app/modules/messaging/templates/messaging/store/messages.html
index f43bbb4c..db1cc559 100644
--- a/app/modules/messaging/templates/messaging/store/messages.html
+++ b/app/modules/messaging/templates/messaging/store/messages.html
@@ -2,7 +2,7 @@
 {% extends "store/base.html" %}
 {% from 'shared/macros/headers.html' import page_header %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
-{% from 'shared/macros/modals.html' import modal_simple %}
+{% from 'shared/macros/modals.html' import modal_simple, confirm_modal %}
 
 {% block title %}Messages{% endblock %}
 
@@ -128,7 +128,7 @@
                     </div>
                     <div class="flex items-center gap-2">
                         <template x-if="!selectedConversation.is_closed">
-                            <button @click="closeConversation()"
+                            <button @click="showCloseConversationConfirm = true"
                                     class="px-3 py-1.5 text-sm font-medium text-gray-600 bg-gray-100 rounded-lg hover:bg-gray-200 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600">
                                 Close
                             </button>
@@ -272,6 +272,9 @@
     </div>
 </form>
 {% endcall %}
+
+<!-- Close Conversation Confirm Modal -->
+{{ confirm_modal('closeConversationConfirm', 'Close Conversation', 'Are you sure you want to close this conversation? You can reopen it later if needed.', 'closeConversation()', 'showCloseConversationConfirm', 'Close Conversation', 'Cancel', 'warning') }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/messaging/templates/messaging/store/notifications.html b/app/modules/messaging/templates/messaging/store/notifications.html
index 55d9ff68..ed6aabe5 100644
--- a/app/modules/messaging/templates/messaging/store/notifications.html
+++ b/app/modules/messaging/templates/messaging/store/notifications.html
@@ -3,7 +3,7 @@
 {% from 'shared/macros/headers.html' import page_header_flex, refresh_button %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/pagination.html' import pagination_simple %}
-{% from 'shared/macros/modals.html' import modal_simple %}
+{% from 'shared/macros/modals.html' import modal_simple, confirm_modal %}
 
 {% block title %}Notifications{% endblock %}
 
@@ -145,7 +145,7 @@
                                 Mark read
                             </button>
                         </template>
-                        <button @click="deleteNotification(notif.id)"
+                        <button @click="pendingDeleteNotificationId = notif.id; showDeleteNotificationConfirm = true"
                                 class="p-1 text-gray-400 hover:text-red-500 transition-colors">
                             <span x-html="$icon('trash', 'w-4 h-4')"></span>
                         </button>
@@ -223,6 +223,9 @@
     </button>
 </div>
 {% endcall %}
+
+<!-- Delete Notification Confirm Modal -->
+{{ confirm_modal('deleteNotificationConfirm', 'Delete Notification', 'Are you sure you want to delete this notification? This action cannot be undone.', 'deleteNotification(pendingDeleteNotificationId)', 'showDeleteNotificationConfirm', 'Delete', 'Cancel', 'danger') }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/orders/templates/orders/store/invoices.html b/app/modules/orders/templates/orders/store/invoices.html
index fc310879..45b2fdee 100644
--- a/app/modules/orders/templates/orders/store/invoices.html
+++ b/app/modules/orders/templates/orders/store/invoices.html
@@ -3,7 +3,7 @@
 
 {% from 'shared/macros/headers.html' import page_header_flex, refresh_button %}
 {% from 'shared/macros/tables.html' import table_wrapper, table_header, simple_pagination %}
-{% from 'shared/macros/modals.html' import form_modal %}
+{% from 'shared/macros/modals.html' import form_modal, confirm_modal_dynamic %}
 
 {% block title %}Invoices{% endblock %}
 
@@ -219,7 +219,7 @@
                                     </button>
                                     <button
                                         x-show="invoice.status === 'draft'"
-                                        @click="updateStatus(invoice, 'issued')"
+                                        @click="pendingStatusInvoice = invoice; pendingNewStatus = 'issued'; showUpdateStatusConfirm = true"
                                         class="flex items-center justify-center px-2 py-1 text-sm text-blue-600 transition-colors duration-150 rounded-md hover:bg-blue-100 dark:hover:bg-blue-900"
                                         title="Mark as Issued"
                                     >
@@ -227,7 +227,7 @@
                                     </button>
                                     <button
                                         x-show="invoice.status === 'issued'"
-                                        @click="updateStatus(invoice, 'paid')"
+                                        @click="pendingStatusInvoice = invoice; pendingNewStatus = 'paid'; showUpdateStatusConfirm = true"
                                         class="flex items-center justify-center px-2 py-1 text-sm text-green-600 transition-colors duration-150 rounded-md hover:bg-green-100 dark:hover:bg-green-900"
                                         title="Mark as Paid"
                                     >
@@ -235,7 +235,7 @@
                                     </button>
                                     <button
                                         x-show="invoice.status !== 'cancelled' && invoice.status !== 'paid'"
-                                        @click="updateStatus(invoice, 'cancelled')"
+                                        @click="pendingStatusInvoice = invoice; pendingNewStatus = 'cancelled'; showUpdateStatusConfirm = true"
                                         class="flex items-center justify-center px-2 py-1 text-sm text-red-600 transition-colors duration-150 rounded-md hover:bg-red-100 dark:hover:bg-red-900"
                                         title="Cancel Invoice"
                                     >
@@ -467,6 +467,10 @@
     </div>
 </div>
 
+<!-- Create Invoice Modal -->
+<!-- Update Invoice Status Confirm Modal -->
+{{ confirm_modal_dynamic('updateStatusConfirm', 'Update Invoice Status', "'Are you sure you want to ' + ({'issued': 'mark as issued', 'paid': 'mark as paid', 'cancelled': 'cancel'}[pendingNewStatus] || pendingNewStatus) + ' this invoice?'", 'updateStatus(pendingStatusInvoice, pendingNewStatus)', 'showUpdateStatusConfirm', 'Confirm', 'Cancel', 'warning') }}
+
 <!-- Create Invoice Modal -->
 {% call form_modal('createInvoiceModal', 'Create Invoice', show_var='showCreateModal', submit_action='createInvoice()', submit_text='Create Invoice', loading_var='creatingInvoice', loading_text='Creating...', size='sm') %}
     <div class="mb-4">
diff --git a/app/modules/tenancy/static/admin/js/admin-user-detail.js b/app/modules/tenancy/static/admin/js/admin-user-detail.js
index e7aa6efc..eaaa10bd 100644
--- a/app/modules/tenancy/static/admin/js/admin-user-detail.js
+++ b/app/modules/tenancy/static/admin/js/admin-user-detail.js
@@ -17,6 +17,9 @@ function adminUserDetailPage() {
         error: null,
         userId: null,
         currentUserId: null,
+        showToggleStatusModal: false,
+        showDeleteModal: false,
+        showDeleteFinalModal: false,
 
         // Initialize
         async init() {
@@ -116,11 +119,6 @@ function adminUserDetailPage() {
                 return;
             }
 
-            if (!confirm(`Are you sure you want to ${action} "${this.adminUser.username}"?`)) {
-                adminUserDetailLog.info('Status toggle cancelled by user');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/admin-users/${this.userId}/status`;
@@ -142,6 +140,12 @@ function adminUserDetailPage() {
             }
         },
 
+        // Intermediate step for double-confirm delete
+        confirmDeleteStep() {
+            adminUserDetailLog.info('First delete confirmation accepted, showing final confirmation');
+            this.showDeleteFinalModal = true;
+        },
+
         // Delete admin user
         async deleteAdminUser() {
             adminUserDetailLog.info('Delete admin user requested:', this.userId);
@@ -152,17 +156,6 @@ function adminUserDetailPage() {
                 return;
             }
 
-            if (!confirm(`Are you sure you want to delete admin user "${this.adminUser.username}"?\n\nThis action cannot be undone.`)) {
-                adminUserDetailLog.info('Delete cancelled by user');
-                return;
-            }
-
-            // Second confirmation for safety
-            if (!confirm(`FINAL CONFIRMATION\n\nAre you absolutely sure you want to delete "${this.adminUser.username}"?`)) {
-                adminUserDetailLog.info('Delete cancelled by user (second confirmation)');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/admin-users/${this.userId}`;
diff --git a/app/modules/tenancy/static/admin/js/admin-user-edit.js b/app/modules/tenancy/static/admin/js/admin-user-edit.js
index ec1d00b1..b6fcd468 100644
--- a/app/modules/tenancy/static/admin/js/admin-user-edit.js
+++ b/app/modules/tenancy/static/admin/js/admin-user-edit.js
@@ -26,6 +26,10 @@ function adminUserEditPage() {
         // Confirmation modal state
         showRemovePlatformModal: false,
         platformToRemove: null,
+        showToggleSuperAdminModal: false,
+        showToggleStatusModal: false,
+        showDeleteModal: false,
+        showDeleteFinalModal: false,
 
         // Initialize
         async init() {
@@ -149,11 +153,6 @@ function adminUserEditPage() {
                 return;
             }
 
-            if (!confirm(`Are you sure you want to ${action} super admin "${this.adminUser.username}"?`)) {
-                adminUserEditLog.info('Super admin toggle cancelled by user');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/admin-users/${this.userId}/super-admin`;
@@ -192,11 +191,6 @@ function adminUserEditPage() {
                 return;
             }
 
-            if (!confirm(`Are you sure you want to ${action} "${this.adminUser.username}"?`)) {
-                adminUserEditLog.info('Status toggle cancelled by user');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/admin-users/${this.userId}/status`;
@@ -298,6 +292,12 @@ function adminUserEditPage() {
             this.selectedPlatformId = null;
         },
 
+        // Intermediate step for double-confirm delete
+        confirmDeleteStep() {
+            adminUserEditLog.info('First delete confirmation accepted, showing final confirmation');
+            this.showDeleteFinalModal = true;
+        },
+
         // Delete admin user
         async deleteAdminUser() {
             adminUserEditLog.info('Delete admin user requested:', this.userId);
@@ -308,17 +308,6 @@ function adminUserEditPage() {
                 return;
             }
 
-            if (!confirm(`Are you sure you want to delete admin user "${this.adminUser.username}"?\n\nThis action cannot be undone.`)) {
-                adminUserEditLog.info('Delete cancelled by user');
-                return;
-            }
-
-            // Second confirmation for safety
-            if (!confirm(`FINAL CONFIRMATION\n\nAre you absolutely sure you want to delete "${this.adminUser.username}"?`)) {
-                adminUserEditLog.info('Delete cancelled by user (second confirmation)');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/admin-users/${this.userId}`;
diff --git a/app/modules/tenancy/static/admin/js/admin-users.js b/app/modules/tenancy/static/admin/js/admin-users.js
index c4375fbd..e6497dac 100644
--- a/app/modules/tenancy/static/admin/js/admin-users.js
+++ b/app/modules/tenancy/static/admin/js/admin-users.js
@@ -17,6 +17,9 @@ function adminUsersPage() {
         loading: false,
         error: null,
         currentUserId: null,
+        showDeleteModal: false,
+        showDeleteFinalModal: false,
+        adminToDelete: null,
         filters: {
             search: '',
             is_super_admin: '',
@@ -286,6 +289,12 @@ function adminUsersPage() {
             window.location.href = `/admin/admin-users/${admin.id}/edit`;
         },
 
+        // Intermediate step for double-confirm delete
+        confirmDeleteStep() {
+            adminUsersLog.info('First delete confirmation accepted, showing final confirmation');
+            this.showDeleteFinalModal = true;
+        },
+
         async deleteAdminUser(admin) {
             adminUsersLog.warn('Delete admin user requested:', admin.username);
 
@@ -295,17 +304,6 @@ function adminUsersPage() {
                 return;
             }
 
-            if (!confirm(`Are you sure you want to delete admin user "${admin.username}"?\n\nThis action cannot be undone.`)) {
-                adminUsersLog.info('Delete cancelled by user');
-                return;
-            }
-
-            // Second confirmation for safety
-            if (!confirm(`FINAL CONFIRMATION\n\nAre you absolutely sure you want to delete "${admin.username}"?`)) {
-                adminUsersLog.info('Delete cancelled by user (second confirmation)');
-                return;
-            }
-
             try {
                 const url = `/admin/admin-users/${admin.id}`;
                 window.LogConfig.logApiCall('DELETE', url, null, 'request');
diff --git a/app/modules/tenancy/static/admin/js/merchant-detail.js b/app/modules/tenancy/static/admin/js/merchant-detail.js
index e0b3fd8e..166c6b3b 100644
--- a/app/modules/tenancy/static/admin/js/merchant-detail.js
+++ b/app/modules/tenancy/static/admin/js/merchant-detail.js
@@ -16,6 +16,10 @@ function adminMerchantDetail() {
         error: null,
         merchantId: null,
 
+        // Modal state
+        showDeleteMerchantModal: false,
+        showDeleteMerchantFinalModal: false,
+
         // Subscription state
         platforms: [],
         subscriptions: [],
@@ -239,8 +243,8 @@ function adminMerchantDetail() {
             return formatted;
         },
 
-        // Delete merchant
-        async deleteMerchant() {
+        // Prompt delete merchant (first step of double confirm)
+        promptDeleteMerchant() {
             merchantDetailLog.info('Delete merchant requested:', this.merchantId);
 
             if (this.merchant?.store_count > 0) {
@@ -248,17 +252,16 @@ function adminMerchantDetail() {
                 return;
             }
 
-            if (!confirm(`Are you sure you want to delete merchant "${this.merchant.name}"?\n\nThis action cannot be undone.`)) {
-                merchantDetailLog.info('Delete cancelled by user');
-                return;
-            }
+            this.showDeleteMerchantModal = true;
+        },
 
-            // Second confirmation for safety
-            if (!confirm(`FINAL CONFIRMATION\n\nAre you absolutely sure you want to delete "${this.merchant.name}"?`)) {
-                merchantDetailLog.info('Delete cancelled by user (second confirmation)');
-                return;
-            }
+        // Confirm first step, show final confirmation
+        confirmDeleteMerchantStep() {
+            this.showDeleteMerchantFinalModal = true;
+        },
 
+        // Delete merchant
+        async deleteMerchant() {
             try {
                 const url = `/admin/merchants/${this.merchantId}?confirm=true`;
                 window.LogConfig.logApiCall('DELETE', url, null, 'request');
diff --git a/app/modules/tenancy/static/admin/js/merchant-edit.js b/app/modules/tenancy/static/admin/js/merchant-edit.js
index e4aa9891..65a5bfbd 100644
--- a/app/modules/tenancy/static/admin/js/merchant-edit.js
+++ b/app/modules/tenancy/static/admin/js/merchant-edit.js
@@ -18,6 +18,12 @@ function adminMerchantEdit() {
         saving: false,
         merchantId: null,
 
+        // Modal state
+        showToggleVerificationModal: false,
+        showToggleActiveModal: false,
+        showDeleteMerchantModal: false,
+        showDeleteMerchantFinalModal: false,
+
         // Transfer ownership state
         showTransferOwnershipModal: false,
         transferring: false,
@@ -166,11 +172,6 @@ function adminMerchantEdit() {
             const action = this.merchant.is_verified ? 'unverify' : 'verify';
             merchantEditLog.info(`Toggle verification: ${action}`);
 
-            if (!confirm(`Are you sure you want to ${action} this merchant?`)) {
-                merchantEditLog.info('Verification toggle cancelled by user');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/merchants/${this.merchantId}/verification`;
@@ -199,11 +200,6 @@ function adminMerchantEdit() {
             const action = this.merchant.is_active ? 'deactivate' : 'activate';
             merchantEditLog.info(`Toggle active status: ${action}`);
 
-            if (!confirm(`Are you sure you want to ${action} this merchant?\n\nThis will affect all stores under this merchant.`)) {
-                merchantEditLog.info('Active status toggle cancelled by user');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/merchants/${this.merchantId}/status`;
@@ -343,8 +339,8 @@ function adminMerchantEdit() {
             this.userSearchResults = [];
         },
 
-        // Delete merchant
-        async deleteMerchant() {
+        // Prompt delete merchant (first step of double confirm)
+        promptDeleteMerchant() {
             merchantEditLog.info('=== DELETING MERCHANT ===');
 
             if (this.merchant.store_count > 0) {
@@ -352,16 +348,17 @@ function adminMerchantEdit() {
                 return;
             }
 
-            if (!confirm(`Are you sure you want to delete merchant "${this.merchant.name}"?\n\nThis action cannot be undone.`)) {
-                merchantEditLog.info('Merchant deletion cancelled by user');
-                return;
-            }
+            this.showDeleteMerchantModal = true;
+        },
 
-            // Double confirmation for critical action
-            if (!confirm(`FINAL CONFIRMATION: Delete "${this.merchant.name}"?\n\nThis will permanently delete the merchant and all its data.`)) {
-                merchantEditLog.info('Merchant deletion cancelled at final confirmation');
-                return;
-            }
+        // Confirm first step, show final confirmation
+        confirmDeleteMerchantStep() {
+            this.showDeleteMerchantFinalModal = true;
+        },
+
+        // Delete merchant
+        async deleteMerchant() {
+            merchantEditLog.info('=== DELETING MERCHANT (confirmed) ===');
 
             this.saving = true;
             try {
diff --git a/app/modules/tenancy/static/admin/js/merchant-user-detail.js b/app/modules/tenancy/static/admin/js/merchant-user-detail.js
index a44d727d..e22b7cda 100644
--- a/app/modules/tenancy/static/admin/js/merchant-user-detail.js
+++ b/app/modules/tenancy/static/admin/js/merchant-user-detail.js
@@ -16,6 +16,9 @@ function merchantUserDetailPage() {
         saving: false,
         error: null,
         userId: null,
+        showToggleStatusModal: false,
+        showDeleteModal: false,
+        showDeleteFinalModal: false,
 
         // Initialize
         async init() {
@@ -100,11 +103,6 @@ function merchantUserDetailPage() {
             const action = this.merchantUser.is_active ? 'deactivate' : 'activate';
             merchantUserDetailLog.info(`Toggle status: ${action}`);
 
-            if (!confirm(`Are you sure you want to ${action} "${this.merchantUser.full_name || this.merchantUser.username}"?`)) {
-                merchantUserDetailLog.info('Status toggle cancelled by user');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/users/${this.userId}/status`;
@@ -126,21 +124,16 @@ function merchantUserDetailPage() {
             }
         },
 
+        // Intermediate step for double-confirm delete
+        confirmDeleteStep() {
+            merchantUserDetailLog.info('First delete confirmation accepted, showing final confirmation');
+            this.showDeleteFinalModal = true;
+        },
+
         // Delete user
         async deleteUser() {
             merchantUserDetailLog.info('Delete user requested:', this.userId);
 
-            if (!confirm(`Are you sure you want to delete "${this.merchantUser.full_name || this.merchantUser.username}"?\n\nThis action cannot be undone.`)) {
-                merchantUserDetailLog.info('Delete cancelled by user');
-                return;
-            }
-
-            // Second confirmation for safety
-            if (!confirm(`FINAL CONFIRMATION\n\nAre you absolutely sure you want to delete "${this.merchantUser.full_name || this.merchantUser.username}"?`)) {
-                merchantUserDetailLog.info('Delete cancelled by user (second confirmation)');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/users/${this.userId}`;
diff --git a/app/modules/tenancy/static/admin/js/merchant-users.js b/app/modules/tenancy/static/admin/js/merchant-users.js
index 58618b74..43c53058 100644
--- a/app/modules/tenancy/static/admin/js/merchant-users.js
+++ b/app/modules/tenancy/static/admin/js/merchant-users.js
@@ -16,6 +16,11 @@ function merchantUsersPage() {
         merchantUsers: [],
         loading: false,
         error: null,
+        showToggleStatusModal: false,
+        showDeleteModal: false,
+        showDeleteFinalModal: false,
+        userToToggle: null,
+        userToDelete: null,
         filters: {
             search: '',
             is_active: ''
@@ -230,11 +235,6 @@ function merchantUsersPage() {
             const action = user.is_active ? 'deactivate' : 'activate';
             merchantUsersLog.info(`Toggle status: ${action} for user`, user.username);
 
-            if (!confirm(`Are you sure you want to ${action} "${user.full_name || user.username || user.email}"?`)) {
-                merchantUsersLog.info('Status toggle cancelled by user');
-                return;
-            }
-
             try {
                 const url = `/admin/users/${user.id}/status`;
                 window.LogConfig.logApiCall('PUT', url, null, 'request');
@@ -254,21 +254,16 @@ function merchantUsersPage() {
             }
         },
 
+        // Intermediate step for double-confirm delete
+        confirmDeleteStep() {
+            merchantUsersLog.info('First delete confirmation accepted, showing final confirmation');
+            this.showDeleteFinalModal = true;
+        },
+
         // Delete user
         async deleteUser(user) {
             merchantUsersLog.warn('Delete user requested:', user.username);
 
-            if (!confirm(`Are you sure you want to delete "${user.full_name || user.username || user.email}"?\n\nThis action cannot be undone.`)) {
-                merchantUsersLog.info('Delete cancelled by user');
-                return;
-            }
-
-            // Second confirmation for safety
-            if (!confirm(`FINAL CONFIRMATION\n\nAre you absolutely sure you want to delete "${user.full_name || user.username || user.email}"?`)) {
-                merchantUsersLog.info('Delete cancelled by user (second confirmation)');
-                return;
-            }
-
             try {
                 const url = `/admin/users/${user.id}`;
                 window.LogConfig.logApiCall('DELETE', url, null, 'request');
diff --git a/app/modules/tenancy/static/admin/js/merchants.js b/app/modules/tenancy/static/admin/js/merchants.js
index 214eba88..bee2b710 100644
--- a/app/modules/tenancy/static/admin/js/merchants.js
+++ b/app/modules/tenancy/static/admin/js/merchants.js
@@ -26,6 +26,10 @@ function adminMerchants() {
         loading: false,
         error: null,
 
+        // Modal state
+        showDeleteMerchantModal: false,
+        merchantToDelete: null,
+
         // Search and filters
         filters: {
             search: '',
@@ -192,23 +196,19 @@ function adminMerchants() {
             window.location.href = `/admin/merchants/${merchantId}/edit`;
         },
 
-        // Delete merchant
-        async deleteMerchant(merchant) {
+        // Prompt delete merchant modal
+        promptDeleteMerchant(merchant) {
             if (merchant.store_count > 0) {
                 merchantsLog.warn('Cannot delete merchant with stores');
                 Utils.showToast(`Cannot delete "${merchant.name}" because it has ${merchant.store_count} store(s). Please delete or reassign the stores first.`, 'warning');
                 return;
             }
+            this.merchantToDelete = merchant;
+            this.showDeleteMerchantModal = true;
+        },
 
-            const confirmed = confirm(
-                `Are you sure you want to delete "${merchant.name}"?\n\nThis action cannot be undone.`
-            );
-
-            if (!confirmed) {
-                merchantsLog.info('Delete cancelled by user');
-                return;
-            }
-
+        // Delete merchant
+        async deleteMerchant(merchant) {
             try {
                 merchantsLog.info('Deleting merchant:', merchant.id);
 
diff --git a/app/modules/tenancy/static/admin/js/platform-menu-config.js b/app/modules/tenancy/static/admin/js/platform-menu-config.js
index 2c3195dd..c84a7c05 100644
--- a/app/modules/tenancy/static/admin/js/platform-menu-config.js
+++ b/app/modules/tenancy/static/admin/js/platform-menu-config.js
@@ -18,6 +18,8 @@ function adminPlatformMenuConfig(platformCode) {
         error: null,
         successMessage: null,
         saving: false,
+        showShowAllModal: false,
+        showHideAllModal: false,
 
         // Data
         platform: null,
@@ -160,10 +162,6 @@ function adminPlatformMenuConfig(platformCode) {
         },
 
         async showAll() {
-            if (!confirm(I18n.t('tenancy.confirmations.show_all_menu_items'))) {
-                return;
-            }
-
             this.saving = true;
             this.error = null;
             this.successMessage = null;
@@ -186,10 +184,6 @@ function adminPlatformMenuConfig(platformCode) {
         },
 
         async resetToDefaults() {
-            if (!confirm(I18n.t('tenancy.confirmations.hide_all_menu_items'))) {
-                return;
-            }
-
             this.saving = true;
             this.error = null;
             this.successMessage = null;
diff --git a/app/modules/tenancy/static/admin/js/platform-modules.js b/app/modules/tenancy/static/admin/js/platform-modules.js
index e876283c..5d082f2f 100644
--- a/app/modules/tenancy/static/admin/js/platform-modules.js
+++ b/app/modules/tenancy/static/admin/js/platform-modules.js
@@ -15,6 +15,8 @@ function adminPlatformModules(platformCode) {
         error: null,
         successMessage: null,
         saving: false,
+        showEnableAllModal: false,
+        showDisableOptionalModal: false,
 
         // Data
         platform: null,
@@ -176,10 +178,6 @@ function adminPlatformModules(platformCode) {
         },
 
         async enableAll() {
-            if (!confirm(I18n.t('tenancy.confirmations.enable_all_modules'))) {
-                return;
-            }
-
             this.saving = true;
             this.error = null;
             this.successMessage = null;
@@ -207,10 +205,6 @@ function adminPlatformModules(platformCode) {
         },
 
         async disableOptional() {
-            if (!confirm(I18n.t('tenancy.confirmations.disable_optional_modules'))) {
-                return;
-            }
-
             this.saving = true;
             this.error = null;
             this.successMessage = null;
diff --git a/app/modules/tenancy/static/admin/js/store-detail.js b/app/modules/tenancy/static/admin/js/store-detail.js
index 9aad4fa3..d30ad8a3 100644
--- a/app/modules/tenancy/static/admin/js/store-detail.js
+++ b/app/modules/tenancy/static/admin/js/store-detail.js
@@ -17,6 +17,8 @@ function adminStoreDetail() {
         loading: false,
         error: null,
         storeCode: null,
+        showDeleteStoreModal: false,
+        showDeleteStoreFinalModal: false,
 
         // Initialize
         async init() {
@@ -143,21 +145,20 @@ function adminStoreDetail() {
             return 'bg-green-500';
         },
 
+        // Prompt delete store (first step of double confirm)
+        promptDeleteStore() {
+            detailLog.info('Delete store requested:', this.storeCode);
+            this.showDeleteStoreModal = true;
+        },
+
+        // Confirm first step, show final confirmation
+        confirmDeleteStoreStep() {
+            detailLog.info('First delete confirmation accepted, showing final confirmation');
+            this.showDeleteStoreFinalModal = true;
+        },
+
         // Delete store
         async deleteStore() {
-            detailLog.info('Delete store requested:', this.storeCode);
-
-            if (!confirm(`Are you sure you want to delete store "${this.store.name}"?\n\nThis action cannot be undone and will delete:\n- All products\n- All orders\n- All customers\n- All team members`)) {
-                detailLog.info('Delete cancelled by user');
-                return;
-            }
-
-            // Second confirmation for safety
-            if (!confirm(`FINAL CONFIRMATION\n\nType the store code to confirm: ${this.store.store_code}\n\nAre you absolutely sure?`)) {
-                detailLog.info('Delete cancelled by user (second confirmation)');
-                return;
-            }
-
             try {
                 const url = `/admin/stores/${this.storeCode}?confirm=true`;
                 window.LogConfig.logApiCall('DELETE', url, null, 'request');
@@ -189,4 +190,4 @@ function adminStoreDetail() {
     };
 }
 
-detailLog.info('Store detail module loaded');
\ No newline at end of file
+detailLog.info('Store detail module loaded');
diff --git a/app/modules/tenancy/static/admin/js/store-edit.js b/app/modules/tenancy/static/admin/js/store-edit.js
index 2647d381..5ea21781 100644
--- a/app/modules/tenancy/static/admin/js/store-edit.js
+++ b/app/modules/tenancy/static/admin/js/store-edit.js
@@ -18,6 +18,10 @@ function adminStoreEdit() {
         loadingStore: false,
         saving: false,
         storeCode: null,
+        showToggleVerificationModal: false,
+        showToggleActiveModal: false,
+        showDeleteStoreModal: false,
+        showDeleteStoreFinalModal: false,
 
         // Initialize
         async init() {
@@ -166,11 +170,6 @@ function adminStoreEdit() {
             const action = this.store.is_verified ? 'unverify' : 'verify';
             editLog.info(`Toggle verification: ${action}`);
 
-            if (!confirm(`Are you sure you want to ${action} this store?`)) {
-                editLog.info('Verification toggle cancelled by user');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/stores/${this.storeCode}/verification`;
@@ -199,11 +198,6 @@ function adminStoreEdit() {
             const action = this.store.is_active ? 'deactivate' : 'activate';
             editLog.info(`Toggle active status: ${action}`);
 
-            if (!confirm(`Are you sure you want to ${action} this store?\n\nThis will affect their operations.`)) {
-                editLog.info('Active status toggle cancelled by user');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/stores/${this.storeCode}/status`;
@@ -227,22 +221,20 @@ function adminStoreEdit() {
             }
         },
 
+        // Prompt delete store (first step of double confirm)
+        promptDeleteStore() {
+            editLog.info('Delete store requested');
+            this.showDeleteStoreModal = true;
+        },
+
+        // Confirm first step, show final confirmation
+        confirmDeleteStoreStep() {
+            editLog.info('First delete confirmation accepted, showing final confirmation');
+            this.showDeleteStoreFinalModal = true;
+        },
+
         // Delete store
         async deleteStore() {
-            editLog.info('Delete store requested');
-
-            const storeName = this.store?.name || this.storeCode;
-            if (!confirm(`Are you sure you want to delete "${storeName}"?\n\n⚠️ WARNING: This will permanently delete:\n• All products\n• All orders\n• All customers\n• All team members\n\nThis action cannot be undone!`)) {
-                editLog.info('Delete cancelled by user');
-                return;
-            }
-
-            // Double confirmation for safety
-            if (!confirm(`FINAL CONFIRMATION\n\nType OK to permanently delete "${storeName}" and ALL associated data.`)) {
-                editLog.info('Delete cancelled at final confirmation');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/stores/${this.storeCode}?confirm=true`;
@@ -311,4 +303,4 @@ function adminStoreEdit() {
     };
 }
 
-editLog.info('Store edit module loaded');
\ No newline at end of file
+editLog.info('Store edit module loaded');
diff --git a/app/modules/tenancy/static/admin/js/store-theme.js b/app/modules/tenancy/static/admin/js/store-theme.js
index a339df85..b9187838 100644
--- a/app/modules/tenancy/static/admin/js/store-theme.js
+++ b/app/modules/tenancy/static/admin/js/store-theme.js
@@ -31,6 +31,7 @@ function adminStoreTheme() {
         loading: true,
         saving: false,
         error: null,
+        showResetThemeModal: false,
 
         // Theme data structure matching StoreTheme model
         themeData: {
@@ -272,10 +273,6 @@ function adminStoreTheme() {
         },
 
         async resetTheme() {
-            if (!confirm(I18n.t('tenancy.confirmations.reset_theme'))) {
-                return;
-            }
-
             themeLog.warn('Resetting theme to default');
             this.saving = true;
 
@@ -332,4 +329,4 @@ function adminStoreTheme() {
 // MODULE LOADED
 // ============================================================================
 
-themeLog.info('Store theme editor module loaded');
\ No newline at end of file
+themeLog.info('Store theme editor module loaded');
diff --git a/app/modules/tenancy/static/admin/js/stores.js b/app/modules/tenancy/static/admin/js/stores.js
index eba34cf0..ce6c07d1 100644
--- a/app/modules/tenancy/static/admin/js/stores.js
+++ b/app/modules/tenancy/static/admin/js/stores.js
@@ -25,6 +25,8 @@ function adminStores() {
         },
         loading: false,
         error: null,
+        showDeleteStoreModal: false,
+        storeToDelete: null,
 
         // Search and filters
         filters: {
@@ -283,15 +285,15 @@ function adminStores() {
             window.location.href = url;
         },
 
+        // Prompt delete store
+        promptDeleteStore(store) {
+            storesLog.info('Delete store requested:', store.store_code);
+            this.storeToDelete = store;
+            this.showDeleteStoreModal = true;
+        },
+
         // Delete store
         async deleteStore(store) {
-            storesLog.info('Delete store requested:', store.store_code);
-
-            if (!confirm(`Are you sure you want to delete store "${store.name}"?\n\nThis action cannot be undone.`)) {
-                storesLog.info('Delete cancelled by user');
-                return;
-            }
-
             try {
                 const url = `/admin/stores/${store.store_code}`;
                 window.LogConfig.logApiCall('DELETE', url, null, 'request');
@@ -329,4 +331,4 @@ function adminStores() {
     };
 }
 
-storesLog.info('Stores module loaded');
\ No newline at end of file
+storesLog.info('Stores module loaded');
diff --git a/app/modules/tenancy/static/admin/js/user-detail.js b/app/modules/tenancy/static/admin/js/user-detail.js
index d7862cf8..6d75f00b 100644
--- a/app/modules/tenancy/static/admin/js/user-detail.js
+++ b/app/modules/tenancy/static/admin/js/user-detail.js
@@ -16,6 +16,9 @@ function adminUserDetail() {
         saving: false,
         error: null,
         userId: null,
+        showToggleStatusModal: false,
+        showDeleteModal: false,
+        showDeleteFinalModal: false,
 
         // Initialize
         async init() {
@@ -97,11 +100,6 @@ function adminUserDetail() {
             const action = this.user.is_active ? 'deactivate' : 'activate';
             userDetailLog.info(`Toggle status: ${action}`);
 
-            if (!confirm(`Are you sure you want to ${action} ${this.user.username}?`)) {
-                userDetailLog.info('Status toggle cancelled by user');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/users/${this.userId}/status`;
@@ -123,6 +121,12 @@ function adminUserDetail() {
             }
         },
 
+        // Intermediate step for double-confirm delete
+        confirmDeleteStep() {
+            userDetailLog.info('First delete confirmation accepted, showing final confirmation');
+            this.showDeleteFinalModal = true;
+        },
+
         // Delete user
         async deleteUser() {
             userDetailLog.info('Delete user requested:', this.userId);
@@ -132,17 +136,6 @@ function adminUserDetail() {
                 return;
             }
 
-            if (!confirm(`Are you sure you want to delete "${this.user.username}"?\n\nThis action cannot be undone.`)) {
-                userDetailLog.info('Delete cancelled by user');
-                return;
-            }
-
-            // Second confirmation for safety
-            if (!confirm(`FINAL CONFIRMATION\n\nAre you absolutely sure you want to delete "${this.user.username}"?`)) {
-                userDetailLog.info('Delete cancelled by user (second confirmation)');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/users/${this.userId}`;
diff --git a/app/modules/tenancy/static/admin/js/user-edit.js b/app/modules/tenancy/static/admin/js/user-edit.js
index 244018d2..98050201 100644
--- a/app/modules/tenancy/static/admin/js/user-edit.js
+++ b/app/modules/tenancy/static/admin/js/user-edit.js
@@ -17,6 +17,9 @@ function adminUserEdit() {
         loadingUser: false,
         saving: false,
         userId: null,
+        showToggleStatusModal: false,
+        showDeleteModal: false,
+        showDeleteFinalModal: false,
 
         // Initialize
         async init() {
@@ -154,11 +157,6 @@ function adminUserEdit() {
             const action = this.user.is_active ? 'deactivate' : 'activate';
             userEditLog.info(`Toggle status: ${action}`);
 
-            if (!confirm(`Are you sure you want to ${action} ${this.user.username}?`)) {
-                userEditLog.info('Status toggle cancelled by user');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/users/${this.userId}/status`;
@@ -180,6 +178,12 @@ function adminUserEdit() {
             }
         },
 
+        // Intermediate step for double-confirm delete
+        confirmDeleteStep() {
+            userEditLog.info('First delete confirmation accepted, showing final confirmation');
+            this.showDeleteFinalModal = true;
+        },
+
         // Delete user
         async deleteUser() {
             userEditLog.info('=== DELETING USER ===');
@@ -189,17 +193,6 @@ function adminUserEdit() {
                 return;
             }
 
-            if (!confirm(`Are you sure you want to delete user "${this.user.username}"?\n\nThis action cannot be undone.`)) {
-                userEditLog.info('User deletion cancelled by user');
-                return;
-            }
-
-            // Double confirmation for critical action
-            if (!confirm(`FINAL CONFIRMATION: Delete "${this.user.username}"?\n\nThis will permanently delete the user.`)) {
-                userEditLog.info('User deletion cancelled at final confirmation');
-                return;
-            }
-
             this.saving = true;
             try {
                 const url = `/admin/users/${this.userId}`;
diff --git a/app/modules/tenancy/static/admin/js/users.js b/app/modules/tenancy/static/admin/js/users.js
index 9afe68c1..af2eefdc 100644
--- a/app/modules/tenancy/static/admin/js/users.js
+++ b/app/modules/tenancy/static/admin/js/users.js
@@ -16,6 +16,10 @@ function adminUsers() {
         users: [],
         loading: false,
         error: null,
+        showToggleStatusModal: false,
+        showDeleteModal: false,
+        userToToggle: null,
+        userToDelete: null,
         filters: {
             search: '',
             role: '',
@@ -171,15 +175,15 @@ function adminUsers() {
         // Load statistics
         async loadStats() {
             usersLog.info('Loading user statistics...');
-            
+
             try {
                 const url = '/admin/users/stats';
                 window.LogConfig.logApiCall('GET', url, null, 'request');
-                
+
                 const response = await apiClient.get(url);  // ✅ Fixed: lowercase apiClient
-                
+
                 window.LogConfig.logApiCall('GET', url, response, 'response');
-                
+
                 if (response) {
                     this.stats = response;
                     usersLog.debug('Stats loaded:', this.stats);
@@ -242,23 +246,18 @@ function adminUsers() {
         async toggleUserStatus(user) {
             const action = user.is_active ? 'deactivate' : 'activate';
             usersLog.info(`Toggle user status: ${action}`, user.username);
-            
-            if (!confirm(`Are you sure you want to ${action} ${user.username}?`)) {
-                usersLog.info('Status toggle cancelled by user');
-                return;
-            }
 
             try {
                 const url = `/admin/users/${user.id}/status`;
                 window.LogConfig.logApiCall('PUT', url, { is_active: !user.is_active }, 'request');
-                
+
                 await apiClient.put(url, {  // ✅ Fixed: lowercase apiClient
                     is_active: !user.is_active
                 });
-                
+
                 Utils.showToast(`User ${action}d successfully`, 'success');
                 usersLog.info(`User ${action}d successfully`);
-                
+
                 await this.loadUsers();
                 await this.loadStats();
             } catch (error) {
@@ -269,21 +268,16 @@ function adminUsers() {
 
         async deleteUser(user) {
             usersLog.warn('Delete user requested:', user.username);
-            
-            if (!confirm(`Are you sure you want to delete ${user.username}? This action cannot be undone.`)) {
-                usersLog.info('Delete cancelled by user');
-                return;
-            }
 
             try {
                 const url = `/admin/users/${user.id}`;
                 window.LogConfig.logApiCall('DELETE', url, null, 'request');
-                
+
                 await apiClient.delete(url);  // ✅ Fixed: lowercase apiClient
-                
+
                 Utils.showToast(I18n.t('tenancy.messages.user_deleted_successfully'), 'success');
                 usersLog.info('User deleted successfully');
-                
+
                 await this.loadUsers();
                 await this.loadStats();
             } catch (error) {
@@ -299,4 +293,4 @@ function adminUsers() {
     };
 }
 
-usersLog.info('Users module loaded');
\ No newline at end of file
+usersLog.info('Users module loaded');
diff --git a/app/modules/tenancy/templates/tenancy/admin/admin-user-detail.html b/app/modules/tenancy/templates/tenancy/admin/admin-user-detail.html
index b5a630a6..799cd0c7 100644
--- a/app/modules/tenancy/templates/tenancy/admin/admin-user-detail.html
+++ b/app/modules/tenancy/templates/tenancy/admin/admin-user-detail.html
@@ -2,6 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/headers.html' import detail_page_header %}
+{% from 'shared/macros/modals.html' import confirm_modal_dynamic %}
 
 {% block title %}Admin User Details{% endblock %}
 
@@ -33,7 +34,7 @@
                 Edit Admin User
             </a>
             <button
-                @click="toggleStatus()"
+                @click="showToggleStatusModal = true"
                 :disabled="saving || adminUser?.id === currentUserId"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 border border-transparent rounded-lg focus:outline-none disabled:opacity-50 disabled:cursor-not-allowed"
                 :class="adminUser?.is_active ? 'bg-orange-600 hover:bg-orange-700' : 'bg-green-600 hover:bg-green-700'"
@@ -42,7 +43,7 @@
                 <span x-text="adminUser?.is_active ? 'Deactivate' : 'Activate'"></span>
             </button>
             <button
-                @click="deleteAdminUser()"
+                @click="showDeleteModal = true"
                 :disabled="saving || adminUser?.id === currentUserId"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-red-600 border border-transparent rounded-lg hover:bg-red-700 focus:outline-none focus:shadow-outline-red disabled:opacity-50 disabled:cursor-not-allowed"
                 :title="adminUser?.id === currentUserId ? 'Cannot delete yourself' : 'Delete admin user'">
@@ -231,6 +232,42 @@
         </div>
     </div>
 </div>
+
+<!-- Toggle Status Confirmation Modal -->
+{{ confirm_modal_dynamic(
+    'toggleStatusModal',
+    'Toggle User Status',
+    "'Are you sure you want to ' + (adminUser?.is_active ? 'deactivate' : 'activate') + ' \"' + (adminUser?.username || '') + '\"?'",
+    'toggleStatus()',
+    'showToggleStatusModal',
+    'Confirm',
+    'Cancel',
+    'warning'
+) }}
+
+<!-- Delete Admin User Confirmation Modal (Step 1) -->
+{{ confirm_modal_dynamic(
+    'deleteAdminUserModal',
+    'Delete Admin User',
+    "'Are you sure you want to delete admin user \"' + (adminUser?.username || '') + '\"? This action cannot be undone.'",
+    'confirmDeleteStep()',
+    'showDeleteModal',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
+
+<!-- Delete Admin User Final Confirmation Modal (Step 2) -->
+{{ confirm_modal_dynamic(
+    'deleteAdminUserFinalModal',
+    'Final Confirmation',
+    "'FINAL CONFIRMATION: Are you absolutely sure you want to permanently delete \"' + (adminUser?.username || '') + '\"?'",
+    'deleteAdminUser()',
+    'showDeleteFinalModal',
+    'Permanently Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/admin-user-edit.html b/app/modules/tenancy/templates/tenancy/admin/admin-user-edit.html
index 6cfe6d03..ed4b4bf9 100644
--- a/app/modules/tenancy/templates/tenancy/admin/admin-user-edit.html
+++ b/app/modules/tenancy/templates/tenancy/admin/admin-user-edit.html
@@ -25,7 +25,7 @@
         <div class="flex flex-wrap items-center gap-3">
             <!-- Toggle Active Status -->
             <button
-                @click="toggleStatus()"
+                @click="showToggleStatusModal = true"
                 :disabled="saving || adminUser?.id === currentUserId"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 rounded-lg focus:outline-none disabled:opacity-50"
                 :class="adminUser?.is_active ? 'bg-orange-600 hover:bg-orange-700' : 'bg-green-600 hover:bg-green-700'"
@@ -36,7 +36,7 @@
 
             <!-- Toggle Super Admin -->
             <button
-                @click="toggleSuperAdmin()"
+                @click="showToggleSuperAdminModal = true"
                 :disabled="saving || (adminUser?.id === currentUserId && adminUser?.is_super_admin)"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 rounded-lg focus:outline-none disabled:opacity-50"
                 :class="adminUser?.is_super_admin ? 'bg-yellow-600 hover:bg-yellow-700' : 'bg-purple-600 hover:bg-purple-700'"
@@ -180,7 +180,7 @@
         <div class="flex flex-wrap items-center gap-3">
             <!-- Delete Admin User Button -->
             <button
-                @click="deleteAdminUser()"
+                @click="showDeleteModal = true"
                 :disabled="saving || adminUser?.id === currentUserId"
                 class="inline-flex items-center px-4 py-2 text-sm font-medium text-white transition-colors duration-150 bg-red-600 border border-transparent rounded-lg hover:bg-red-700 focus:outline-none focus:shadow-outline-red disabled:opacity-50"
                 :title="adminUser?.id === currentUserId ? 'Cannot delete yourself' : 'Delete this admin user'">
@@ -265,6 +265,54 @@
     'Cancel',
     'warning'
 ) }}
+
+<!-- Toggle Super Admin Confirmation Modal -->
+{{ confirm_modal_dynamic(
+    'toggleSuperAdminModal',
+    'Toggle Super Admin',
+    "'Are you sure you want to ' + (adminUser?.is_super_admin ? 'demote' : 'promote') + ' \"' + (adminUser?.username || '') + '\" ' + (adminUser?.is_super_admin ? 'from' : 'to') + ' super admin?'",
+    'toggleSuperAdmin()',
+    'showToggleSuperAdminModal',
+    'Confirm',
+    'Cancel',
+    'warning'
+) }}
+
+<!-- Toggle Status Confirmation Modal -->
+{{ confirm_modal_dynamic(
+    'toggleStatusModal',
+    'Toggle User Status',
+    "'Are you sure you want to ' + (adminUser?.is_active ? 'deactivate' : 'activate') + ' \"' + (adminUser?.username || '') + '\"?'",
+    'toggleStatus()',
+    'showToggleStatusModal',
+    'Confirm',
+    'Cancel',
+    'warning'
+) }}
+
+<!-- Delete Admin User Confirmation Modal (Step 1) -->
+{{ confirm_modal_dynamic(
+    'deleteAdminUserModal',
+    'Delete Admin User',
+    "'Are you sure you want to delete admin user \"' + (adminUser?.username || '') + '\"? This action cannot be undone.'",
+    'confirmDeleteStep()',
+    'showDeleteModal',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
+
+<!-- Delete Admin User Final Confirmation Modal (Step 2) -->
+{{ confirm_modal_dynamic(
+    'deleteAdminUserFinalModal',
+    'Final Confirmation',
+    "'FINAL CONFIRMATION: Are you absolutely sure you want to permanently delete \"' + (adminUser?.username || '') + '\"?'",
+    'deleteAdminUser()',
+    'showDeleteFinalModal',
+    'Permanently Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/admin-users.html b/app/modules/tenancy/templates/tenancy/admin/admin-users.html
index a66e7003..6fb5d913 100644
--- a/app/modules/tenancy/templates/tenancy/admin/admin-users.html
+++ b/app/modules/tenancy/templates/tenancy/admin/admin-users.html
@@ -4,6 +4,7 @@
 {% from 'shared/macros/headers.html' import page_header %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/tables.html' import table_wrapper, table_header %}
+{% from 'shared/macros/modals.html' import confirm_modal_dynamic %}
 
 {% block title %}Admin Users{% endblock %}
 
@@ -239,7 +240,7 @@
 
                                 <!-- Delete Button (disabled for self) -->
                                 <button
-                                    @click="deleteAdminUser(admin)"
+                                    @click="adminToDelete = admin; showDeleteModal = true"
                                     :disabled="admin.id === currentUserId"
                                     class="flex items-center justify-center p-2 text-red-600 rounded-lg hover:bg-red-50 dark:text-red-400 dark:hover:bg-gray-700 focus:outline-none transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
                                     :title="admin.id === currentUserId ? 'Cannot delete yourself' : 'Delete admin user'"
@@ -255,6 +256,30 @@
 
     {{ pagination() }}
 </div>
+
+<!-- Delete Admin User Confirmation Modal (Step 1) -->
+{{ confirm_modal_dynamic(
+    'deleteAdminUserModal',
+    'Delete Admin User',
+    "'Are you sure you want to delete admin user \"' + (adminToDelete?.username || '') + '\"? This action cannot be undone.'",
+    'confirmDeleteStep()',
+    'showDeleteModal',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
+
+<!-- Delete Admin User Final Confirmation Modal (Step 2) -->
+{{ confirm_modal_dynamic(
+    'deleteAdminUserFinalModal',
+    'Final Confirmation',
+    "'FINAL CONFIRMATION: Are you absolutely sure you want to permanently delete \"' + (adminToDelete?.username || '') + '\"?'",
+    'deleteAdminUser(adminToDelete)',
+    'showDeleteFinalModal',
+    'Permanently Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html b/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html
index c2dc184d..87bd179f 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html
@@ -4,6 +4,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/headers.html' import detail_page_header %}
+{% from 'shared/macros/modals.html' import confirm_modal_dynamic %}
 
 {% block title %}Merchant Details{% endblock %}
 
@@ -42,7 +43,7 @@
                 Create Subscription
             </button>
             <button
-                @click="deleteMerchant()"
+                @click="promptDeleteMerchant()"
                 :disabled="merchant?.store_count > 0"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-red-600 border border-transparent rounded-lg hover:bg-red-700 focus:outline-none focus:shadow-outline-red disabled:opacity-50 disabled:cursor-not-allowed"
                 :title="merchant?.store_count > 0 ? 'Cannot delete merchant with stores' : 'Delete merchant'">
@@ -456,6 +457,28 @@
             Stores created will be associated with this merchant.
         </p>
     </div>
+
+    {{ confirm_modal_dynamic(
+        'deleteMerchantModal',
+        'Delete Merchant',
+        "'Are you sure you want to delete merchant \"' + (merchant?.name || '') + '\"? This action cannot be undone.'",
+        'confirmDeleteMerchantStep()',
+        'showDeleteMerchantModal',
+        'Continue',
+        'Cancel',
+        'danger'
+    ) }}
+
+    {{ confirm_modal_dynamic(
+        'deleteMerchantFinalModal',
+        'Final Confirmation',
+        "'Are you absolutely sure you want to delete \"' + (merchant?.name || '') + '\"?'",
+        'deleteMerchant()',
+        'showDeleteMerchantFinalModal',
+        'Delete Permanently',
+        'Cancel',
+        'danger'
+    ) }}
 </div>
 {% endblock %}
 
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchant-edit.html b/app/modules/tenancy/templates/tenancy/admin/merchant-edit.html
index 1ffa21b1..79247305 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchant-edit.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchant-edit.html
@@ -3,6 +3,7 @@
 {% from 'shared/macros/alerts.html' import loading_state %}
 {% from 'shared/macros/inputs.html' import search_autocomplete, selected_item_display %}
 {% from 'shared/macros/headers.html' import edit_page_header %}
+{% from 'shared/macros/modals.html' import confirm_modal_dynamic %}
 
 {% block title %}Edit Merchant{% endblock %}
 
@@ -24,7 +25,7 @@
         </h3>
         <div class="flex flex-wrap items-center gap-3">
             <button
-                @click="toggleVerification()"
+                @click="showToggleVerificationModal = true"
                 :disabled="saving"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 rounded-lg focus:outline-none focus:shadow-outline-purple disabled:opacity-50"
                 :class="{ 'bg-orange-600 hover:bg-orange-700': merchant && merchant.is_verified, 'bg-green-600 hover:bg-green-700': merchant && !merchant.is_verified }">
@@ -33,7 +34,7 @@
             </button>
 
             <button
-                @click="toggleActive()"
+                @click="showToggleActiveModal = true"
                 :disabled="saving"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 rounded-lg focus:outline-none focus:shadow-outline-purple disabled:opacity-50"
                 :class="{ 'bg-red-600 hover:bg-red-700': merchant && merchant.is_active, 'bg-green-600 hover:bg-green-700': merchant && !merchant.is_active }">
@@ -290,7 +291,7 @@
 
             <!-- Delete Merchant Button -->
             <button
-                @click="deleteMerchant()"
+                @click="promptDeleteMerchant()"
                 :disabled="saving || (merchant?.store_count > 0)"
                 class="inline-flex items-center px-4 py-2 text-sm font-medium text-white transition-colors duration-150 bg-red-600 border border-transparent rounded-lg hover:bg-red-700 focus:outline-none focus:shadow-outline-red disabled:opacity-50"
                 :title="merchant?.store_count > 0 ? 'Cannot delete merchant with stores' : 'Delete this merchant'"
@@ -308,6 +309,50 @@
         </p>
     </div>
 
+    {{ confirm_modal_dynamic(
+        'toggleVerificationModal',
+        'Toggle Verification',
+        "merchant?.is_verified ? 'Are you sure you want to unverify this merchant?' : 'Are you sure you want to verify this merchant?'",
+        'toggleVerification()',
+        'showToggleVerificationModal',
+        'Confirm',
+        'Cancel',
+        'warning'
+    ) }}
+
+    {{ confirm_modal_dynamic(
+        'toggleActiveModal',
+        'Toggle Active Status',
+        "merchant?.is_active ? 'Are you sure you want to deactivate this merchant? This will affect all stores under this merchant.' : 'Are you sure you want to activate this merchant? This will affect all stores under this merchant.'",
+        'toggleActive()',
+        'showToggleActiveModal',
+        'Confirm',
+        'Cancel',
+        'warning'
+    ) }}
+
+    {{ confirm_modal_dynamic(
+        'deleteMerchantModal',
+        'Delete Merchant',
+        "'Are you sure you want to delete merchant \"' + (merchant?.name || '') + '\"? This action cannot be undone.'",
+        'confirmDeleteMerchantStep()',
+        'showDeleteMerchantModal',
+        'Continue',
+        'Cancel',
+        'danger'
+    ) }}
+
+    {{ confirm_modal_dynamic(
+        'deleteMerchantFinalModal',
+        'Final Confirmation',
+        "'FINAL CONFIRMATION: Delete \"' + (merchant?.name || '') + '\"? This will permanently delete the merchant and all its data.'",
+        'deleteMerchant()',
+        'showDeleteMerchantFinalModal',
+        'Delete Permanently',
+        'Cancel',
+        'danger'
+    ) }}
+
     {# noqa: FE-004 - Complex form modal with dynamic user search and transfer functionality #}
     <!-- Transfer Ownership Modal -->
     <div
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchant-user-detail.html b/app/modules/tenancy/templates/tenancy/admin/merchant-user-detail.html
index 0b798eed..489b0b0b 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchant-user-detail.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchant-user-detail.html
@@ -2,6 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/headers.html' import detail_page_header %}
+{% from 'shared/macros/modals.html' import confirm_modal_dynamic %}
 
 {% block title %}Merchant User Details{% endblock %}
 
@@ -27,7 +28,7 @@
         </h3>
         <div class="flex flex-wrap items-center gap-3">
             <button
-                @click="toggleStatus()"
+                @click="showToggleStatusModal = true"
                 :disabled="saving"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 border border-transparent rounded-lg focus:outline-none disabled:opacity-50 disabled:cursor-not-allowed"
                 :class="merchantUser?.is_active ? 'bg-orange-600 hover:bg-orange-700' : 'bg-green-600 hover:bg-green-700'">
@@ -35,7 +36,7 @@
                 <span x-text="merchantUser?.is_active ? 'Deactivate' : 'Activate'"></span>
             </button>
             <button
-                @click="deleteUser()"
+                @click="showDeleteModal = true"
                 :disabled="saving"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-red-600 border border-transparent rounded-lg hover:bg-red-700 focus:outline-none focus:shadow-outline-red disabled:opacity-50 disabled:cursor-not-allowed"
                 title="Delete user">
@@ -243,6 +244,39 @@
             </div>
         </div>
     </div>
+
+    {{ confirm_modal_dynamic(
+        'toggleStatusModal',
+        'Toggle User Status',
+        "merchantUser?.is_active ? 'Are you sure you want to deactivate \"' + (merchantUser?.full_name || merchantUser?.username || '') + '\"?' : 'Are you sure you want to activate \"' + (merchantUser?.full_name || merchantUser?.username || '') + '\"?'",
+        'toggleStatus()',
+        'showToggleStatusModal',
+        'Confirm',
+        'Cancel',
+        'warning'
+    ) }}
+
+    {{ confirm_modal_dynamic(
+        'deleteUserModal',
+        'Delete User',
+        "'Are you sure you want to delete \"' + (merchantUser?.full_name || merchantUser?.username || '') + '\"? This action cannot be undone.'",
+        'confirmDeleteStep()',
+        'showDeleteModal',
+        'Continue',
+        'Cancel',
+        'danger'
+    ) }}
+
+    {{ confirm_modal_dynamic(
+        'deleteUserFinalModal',
+        'Final Confirmation',
+        "'Are you absolutely sure you want to delete \"' + (merchantUser?.full_name || merchantUser?.username || '') + '\"?'",
+        'deleteUser()',
+        'showDeleteFinalModal',
+        'Delete Permanently',
+        'Cancel',
+        'danger'
+    ) }}
 </div>
 {% endblock %}
 
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchant-users.html b/app/modules/tenancy/templates/tenancy/admin/merchant-users.html
index 8e00f1f8..8012426f 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchant-users.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchant-users.html
@@ -4,6 +4,7 @@
 {% from 'shared/macros/headers.html' import page_header %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/tables.html' import table_wrapper, table_header %}
+{% from 'shared/macros/modals.html' import confirm_modal, confirm_modal_dynamic %}
 
 {% block title %}Merchant Users{% endblock %}
 
@@ -198,7 +199,7 @@
 
                                 <!-- Toggle Status Button -->
                                 <button
-                                    @click="toggleUserStatus(user)"
+                                    @click="userToToggle = user; showToggleStatusModal = true"
                                     class="flex items-center justify-center p-2 rounded-lg hover:bg-orange-50 dark:hover:bg-gray-700 focus:outline-none transition-colors"
                                     :class="user.is_active ? 'text-orange-600 dark:text-orange-400' : 'text-green-600 dark:text-green-400'"
                                     :title="user.is_active ? 'Deactivate user' : 'Activate user'"
@@ -208,7 +209,7 @@
 
                                 <!-- Delete Button -->
                                 <button
-                                    @click="deleteUser(user)"
+                                    @click="userToDelete = user; showDeleteModal = true"
                                     class="flex items-center justify-center p-2 text-red-600 rounded-lg hover:bg-red-50 dark:text-red-400 dark:hover:bg-gray-700 focus:outline-none transition-colors"
                                     title="Delete user"
                                 >
@@ -223,6 +224,42 @@
 
     {{ pagination() }}
 </div>
+
+<!-- Toggle Status Confirmation Modal -->
+{{ confirm_modal_dynamic(
+    'toggleStatusModal',
+    'Toggle User Status',
+    "'Are you sure you want to ' + (userToToggle?.is_active ? 'deactivate' : 'activate') + ' \"' + (userToToggle?.full_name || userToToggle?.username || userToToggle?.email || '') + '\"?'",
+    'toggleUserStatus(userToToggle)',
+    'showToggleStatusModal',
+    'Confirm',
+    'Cancel',
+    'warning'
+) }}
+
+<!-- Delete User Confirmation Modal (Step 1) -->
+{{ confirm_modal_dynamic(
+    'deleteUserModal',
+    'Delete User',
+    "'Are you sure you want to delete \"' + (userToDelete?.full_name || userToDelete?.username || userToDelete?.email || '') + '\"? This action cannot be undone.'",
+    'confirmDeleteStep()',
+    'showDeleteModal',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
+
+<!-- Delete User Final Confirmation Modal (Step 2) -->
+{{ confirm_modal_dynamic(
+    'deleteUserFinalModal',
+    'Final Confirmation',
+    "'FINAL CONFIRMATION: Are you absolutely sure you want to permanently delete \"' + (userToDelete?.full_name || userToDelete?.username || userToDelete?.email || '') + '\"?'",
+    'deleteUser(userToDelete)',
+    'showDeleteFinalModal',
+    'Permanently Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchants.html b/app/modules/tenancy/templates/tenancy/admin/merchants.html
index dec1bbc6..918d3626 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchants.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchants.html
@@ -4,6 +4,7 @@
 {% from 'shared/macros/headers.html' import page_header %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/tables.html' import table_wrapper, table_header %}
+{% from 'shared/macros/modals.html' import confirm_modal_dynamic %}
 
 {% block title %}Merchants{% endblock %}
 
@@ -225,7 +226,7 @@
 
                                 <!-- Delete Button -->
                                 <button
-                                    @click="deleteMerchant(merchant)"
+                                    @click="promptDeleteMerchant(merchant)"
                                     class="flex items-center justify-center p-2 text-red-600 rounded-lg hover:bg-red-50 dark:text-red-400 dark:hover:bg-gray-700 focus:outline-none transition-colors"
                                     title="Delete merchant"
                                     :disabled="merchant.store_count > 0"
@@ -242,6 +243,17 @@
 
     {{ pagination() }}
 </div>
+
+{{ confirm_modal_dynamic(
+    'deleteMerchantModal',
+    'Delete Merchant',
+    "'Are you sure you want to delete \"' + (merchantToDelete?.name || '') + '\"? This action cannot be undone.'",
+    'deleteMerchant(merchantToDelete)',
+    'showDeleteMerchantModal',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/module-config.html b/app/modules/tenancy/templates/tenancy/admin/module-config.html
index d13e4b2b..de0e0096 100644
--- a/app/modules/tenancy/templates/tenancy/admin/module-config.html
+++ b/app/modules/tenancy/templates/tenancy/admin/module-config.html
@@ -2,6 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/alerts.html' import alert_dynamic, error_state %}
 {% from 'shared/macros/headers.html' import page_header %}
+{% from 'shared/macros/modals.html' import confirm_modal %}
 
 {% block title %}Module Configuration{% endblock %}
 
@@ -121,7 +122,7 @@
     <!-- Actions -->
     <div class="px-4 py-3 bg-gray-50 dark:bg-gray-700/50 border-t border-gray-200 dark:border-gray-700 flex items-center justify-between">
         <button
-            @click="resetToDefaults()"
+            @click="showResetConfirm = true"
             :disabled="saving"
             class="inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600 dark:hover:bg-gray-600 disabled:opacity-50"
         >
@@ -141,6 +142,9 @@
     </div>
 </div>
 
+<!-- Reset to Defaults Confirm Modal -->
+{{ confirm_modal('resetConfirm', 'Reset Configuration', 'This will reset all configuration options to their default values. This action cannot be undone.', 'resetToDefaults()', 'showResetConfirm', 'Reset to Defaults', 'Cancel', 'warning') }}
+
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/platform-menu-config.html b/app/modules/tenancy/templates/tenancy/admin/platform-menu-config.html
index 3a7e00a4..3e31f079 100644
--- a/app/modules/tenancy/templates/tenancy/admin/platform-menu-config.html
+++ b/app/modules/tenancy/templates/tenancy/admin/platform-menu-config.html
@@ -2,6 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/alerts.html' import alert_dynamic, error_state %}
 {% from 'shared/macros/headers.html' import page_header %}
+{% from 'shared/macros/modals.html' import confirm_modal %}
 
 {% block title %}Menu Configuration{% endblock %}
 
@@ -94,7 +95,7 @@
     </p>
     <div class="flex gap-2">
         <button
-            @click="showAll()"
+            @click="showShowAllModal = true"
             :disabled="saving"
             class="inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600 dark:hover:bg-gray-600"
         >
@@ -102,7 +103,7 @@
             Show All
         </button>
         <button
-            @click="resetToDefaults()"
+            @click="showHideAllModal = true"
             :disabled="saving"
             class="inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600 dark:hover:bg-gray-600"
         >
@@ -193,6 +194,30 @@
     </div>
 </div>
 
+<!-- Show All Menu Items Confirmation Modal -->
+{{ confirm_modal(
+    'showAllModal',
+    'Show All Menu Items',
+    'Are you sure you want to show all menu items? This will make all non-mandatory items visible.',
+    'showAll()',
+    'showShowAllModal',
+    'Show All',
+    'Cancel',
+    'info'
+) }}
+
+<!-- Hide All Menu Items Confirmation Modal -->
+{{ confirm_modal(
+    'hideAllModal',
+    'Hide All Menu Items',
+    'Are you sure you want to hide all optional menu items? Only mandatory items will remain visible.',
+    'resetToDefaults()',
+    'showHideAllModal',
+    'Hide All',
+    'Cancel',
+    'warning'
+) }}
+
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/platform-modules.html b/app/modules/tenancy/templates/tenancy/admin/platform-modules.html
index 4c4100dc..fe0a66e6 100644
--- a/app/modules/tenancy/templates/tenancy/admin/platform-modules.html
+++ b/app/modules/tenancy/templates/tenancy/admin/platform-modules.html
@@ -2,6 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/alerts.html' import alert_dynamic, error_state %}
 {% from 'shared/macros/headers.html' import page_header %}
+{% from 'shared/macros/modals.html' import confirm_modal %}
 
 {% block title %}Module Configuration{% endblock %}
 
@@ -76,7 +77,7 @@
     </p>
     <div class="flex gap-2">
         <button
-            @click="enableAll()"
+            @click="showEnableAllModal = true"
             :disabled="saving"
             class="inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600 dark:hover:bg-gray-600"
         >
@@ -84,7 +85,7 @@
             Enable All
         </button>
         <button
-            @click="disableOptional()"
+            @click="showDisableOptionalModal = true"
             :disabled="saving"
             class="inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600 dark:hover:bg-gray-600"
         >
@@ -275,6 +276,30 @@
     </div>
 </div>
 
+<!-- Enable All Modules Confirmation Modal -->
+{{ confirm_modal(
+    'enableAllModal',
+    'Enable All Modules',
+    'Are you sure you want to enable all modules? This will activate all optional modules for this platform.',
+    'enableAll()',
+    'showEnableAllModal',
+    'Enable All',
+    'Cancel',
+    'info'
+) }}
+
+<!-- Disable Optional Modules Confirmation Modal -->
+{{ confirm_modal(
+    'disableOptionalModal',
+    'Disable Optional Modules',
+    'Are you sure you want to disable all optional modules? Only core modules will remain enabled.',
+    'disableOptional()',
+    'showDisableOptionalModal',
+    'Disable Optional',
+    'Cancel',
+    'warning'
+) }}
+
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/store-detail.html b/app/modules/tenancy/templates/tenancy/admin/store-detail.html
index e755ba5e..0fad2509 100644
--- a/app/modules/tenancy/templates/tenancy/admin/store-detail.html
+++ b/app/modules/tenancy/templates/tenancy/admin/store-detail.html
@@ -2,6 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/headers.html' import detail_page_header %}
+{% from 'shared/macros/modals.html' import confirm_modal, confirm_modal_dynamic %}
 
 {% block title %}Store Details{% endblock %}
 
@@ -33,7 +34,7 @@
                 Edit Store
             </a>
             <button
-                @click="deleteStore()"
+                @click="promptDeleteStore()"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-red-600 border border-transparent rounded-lg hover:bg-red-700 focus:outline-none focus:shadow-outline-red">
                 <span x-html="$icon('delete', 'w-4 h-4 mr-2')"></span>
                 Delete Store
@@ -385,6 +386,30 @@
             Contact info and ownership are managed at the merchant level.
         </p>
     </div>
+
+    <!-- Delete Store Confirmation Modal (Step 1) -->
+    {{ confirm_modal_dynamic(
+        'deleteStoreModal',
+        'Delete Store',
+        "'Are you sure you want to delete \"' + (store?.name || '') + '\"? This will permanently delete all products, orders, customers, and team members. This action cannot be undone!'",
+        'confirmDeleteStoreStep()',
+        'showDeleteStoreModal',
+        'Delete',
+        'Cancel',
+        'danger'
+    ) }}
+
+    <!-- Delete Store Final Confirmation Modal (Step 2) -->
+    {{ confirm_modal_dynamic(
+        'deleteStoreFinalModal',
+        'Final Confirmation',
+        "'FINAL CONFIRMATION: Are you absolutely sure you want to permanently delete \"' + (store?.name || '') + '\" and ALL associated data?'",
+        'deleteStore()',
+        'showDeleteStoreFinalModal',
+        'Permanently Delete',
+        'Cancel',
+        'danger'
+    ) }}
 </div>
 {% endblock %}
 
diff --git a/app/modules/tenancy/templates/tenancy/admin/store-edit.html b/app/modules/tenancy/templates/tenancy/admin/store-edit.html
index eba61ade..1653b281 100644
--- a/app/modules/tenancy/templates/tenancy/admin/store-edit.html
+++ b/app/modules/tenancy/templates/tenancy/admin/store-edit.html
@@ -2,6 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/alerts.html' import loading_state %}
 {% from 'shared/macros/headers.html' import edit_page_header %}
+{% from 'shared/macros/modals.html' import confirm_modal, confirm_modal_dynamic %}
 
 {% block title %}Edit Store{% endblock %}
 
@@ -25,7 +26,7 @@
         </h3>
         <div class="flex flex-wrap items-center gap-3">
             <button
-                @click="toggleVerification()"
+                @click="showToggleVerificationModal = true"
                 :disabled="saving"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 rounded-lg focus:outline-none focus:shadow-outline-purple disabled:opacity-50"
                 :class="store?.is_verified ? 'bg-orange-600 hover:bg-orange-700' : 'bg-green-600 hover:bg-green-700'">
@@ -34,7 +35,7 @@
             </button>
 
             <button
-                @click="toggleActive()"
+                @click="showToggleActiveModal = true"
                 :disabled="saving"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 rounded-lg focus:outline-none focus:shadow-outline-purple disabled:opacity-50"
                 :class="store?.is_active ? 'bg-red-600 hover:bg-red-700' : 'bg-green-600 hover:bg-green-700'">
@@ -425,6 +426,54 @@
         </div>
     </form>
 </div>
+
+<!-- Toggle Verification Confirmation Modal -->
+{{ confirm_modal_dynamic(
+    'toggleVerificationModal',
+    'Toggle Store Verification',
+    "store?.is_verified ? 'Are you sure you want to unverify this store?' : 'Are you sure you want to verify this store?'",
+    'toggleVerification()',
+    'showToggleVerificationModal',
+    'Confirm',
+    'Cancel',
+    'warning'
+) }}
+
+<!-- Toggle Active Status Confirmation Modal -->
+{{ confirm_modal_dynamic(
+    'toggleActiveModal',
+    'Toggle Store Status',
+    "store?.is_active ? 'Are you sure you want to deactivate this store? This will affect their operations.' : 'Are you sure you want to activate this store?'",
+    'toggleActive()',
+    'showToggleActiveModal',
+    'Confirm',
+    'Cancel',
+    'warning'
+) }}
+
+<!-- Delete Store Confirmation Modal (Step 1) -->
+{{ confirm_modal_dynamic(
+    'deleteStoreModal',
+    'Delete Store',
+    "'Are you sure you want to delete \"' + (store?.name || '') + '\"? This will permanently delete all products, orders, customers, and team members. This action cannot be undone!'",
+    'confirmDeleteStoreStep()',
+    'showDeleteStoreModal',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
+
+<!-- Delete Store Final Confirmation Modal (Step 2) -->
+{{ confirm_modal_dynamic(
+    'deleteStoreFinalModal',
+    'Final Confirmation',
+    "'FINAL CONFIRMATION: Are you absolutely sure you want to permanently delete \"' + (store?.name || '') + '\" and ALL associated data?'",
+    'deleteStore()',
+    'showDeleteStoreFinalModal',
+    'Permanently Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/store-theme.html b/app/modules/tenancy/templates/tenancy/admin/store-theme.html
index 39f98249..f159e770 100644
--- a/app/modules/tenancy/templates/tenancy/admin/store-theme.html
+++ b/app/modules/tenancy/templates/tenancy/admin/store-theme.html
@@ -2,6 +2,7 @@
 {% extends "admin/base.html" %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/headers.html' import page_header_flex %}
+{% from 'shared/macros/modals.html' import confirm_modal %}
 
 {% block title %}Theme Editor - {{ store_code }}{% endblock %}
 
@@ -330,7 +331,7 @@
 
         <!-- Action Buttons -->
         <div class="flex justify-between items-center">
-            <button @click="resetToDefault()"
+            <button @click="showResetThemeModal = true"
                     :disabled="saving"
                     class="px-4 py-2 text-sm font-medium leading-5 text-red-700 transition-colors duration-150 bg-white border border-red-300 rounded-lg hover:bg-red-50 focus:outline-none disabled:opacity-50 dark:bg-gray-800 dark:text-red-400 dark:border-red-600">
                 <span x-html="$icon('refresh', 'inline w-4 h-4 mr-2')"></span>
@@ -443,6 +444,18 @@
         </div>
     </div>
 </div>
+
+<!-- Reset Theme Confirmation Modal -->
+{{ confirm_modal(
+    'resetThemeModal',
+    'Reset Theme',
+    'Are you sure you want to reset the theme to default? All customizations will be lost.',
+    'resetTheme()',
+    'showResetThemeModal',
+    'Reset',
+    'Cancel',
+    'warning'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/stores.html b/app/modules/tenancy/templates/tenancy/admin/stores.html
index 165889d1..a72449ba 100644
--- a/app/modules/tenancy/templates/tenancy/admin/stores.html
+++ b/app/modules/tenancy/templates/tenancy/admin/stores.html
@@ -4,6 +4,7 @@
 {% from 'shared/macros/headers.html' import page_header %}
 {% from 'shared/macros/alerts.html' import loading_state, error_state %}
 {% from 'shared/macros/tables.html' import table_wrapper, table_header %}
+{% from 'shared/macros/modals.html' import confirm_modal, confirm_modal_dynamic %}
 
 {% block title %}Stores{% endblock %}
 
@@ -210,7 +211,7 @@
 
                                 <!-- Delete Button -->
                                 <button
-                                    @click="deleteStore(store)"
+                                    @click="promptDeleteStore(store)"
                                     class="flex items-center justify-center p-2 text-red-600 rounded-lg hover:bg-red-50 dark:text-red-400 dark:hover:bg-gray-700 focus:outline-none transition-colors"
                                     title="Delete store"
                                 >
@@ -225,6 +226,18 @@
 
     {{ pagination() }}
 </div>
+
+<!-- Delete Store Confirmation Modal -->
+{{ confirm_modal_dynamic(
+    'deleteStoreModal',
+    'Delete Store',
+    "'Are you sure you want to delete \"' + (storeToDelete?.name || '') + '\"? This action cannot be undone.'",
+    'deleteStore(storeToDelete)',
+    'showDeleteStoreModal',
+    'Delete',
+    'Cancel',
+    'danger'
+) }}
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/app/templates/store/base.html b/app/templates/store/base.html
index fce27eb7..851a5628 100644
--- a/app/templates/store/base.html
+++ b/app/templates/store/base.html
@@ -1,4 +1,5 @@
 {# app/templates/store/base.html #}
+{% from 'shared/macros/modals.html' import confirm_modal_dynamic %}
 <!DOCTYPE html>
 <html :class="{ 'dark': dark }" x-data="{% block alpine_data %}data(){% endblock %}" lang="en">
 <head>
@@ -45,6 +46,9 @@
         </div>
     </div>
 
+    <!-- Upgrade Limit Reached Confirm Modal -->
+    {{ confirm_modal_dynamic('limitReachedConfirm', 'Usage Limit Reached', '$store.upgrade.limitReachedMessage', '$store.upgrade.confirmUpgrade()', '$store.upgrade.showLimitReachedConfirm', 'Go to Billing', 'Dismiss', 'warning') }}
+
     <!-- Core Scripts - ORDER MATTERS! -->
 
     <!-- 1. FIRST: Log Configuration -->
diff --git a/static/admin/js/module-config.js b/static/admin/js/module-config.js
index 5983882d..9a27cafe 100644
--- a/static/admin/js/module-config.js
+++ b/static/admin/js/module-config.js
@@ -17,6 +17,9 @@ function adminModuleConfig(platformCode, moduleCode) {
         successMessage: null,
         saving: false,
 
+        // Reset confirm state
+        showResetConfirm: false,
+
         // Data
         platformId: null,
         platformName: '',
@@ -117,10 +120,6 @@ function adminModuleConfig(platformCode, moduleCode) {
         },
 
         async resetToDefaults() {
-            if (!confirm('This will reset all configuration options to their default values. Continue?')) {
-                return;
-            }
-
             this.saving = true;
             this.error = null;
             this.successMessage = null;