From b15d7be4c343665062984eb8033a0db3c9212158 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 23 Sep 2025 10:44:14 +0200
Subject: [PATCH] Improve subscription element removal in post-install script
 (#7814)

---
 tools/pve/post-pve-install.sh | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/tools/pve/post-pve-install.sh b/tools/pve/post-pve-install.sh
index 6e270843d..4764c0446 100644
--- a/tools/pve/post-pve-install.sh
+++ b/tools/pve/post-pve-install.sh
@@ -532,20 +532,28 @@ if [ -f "$MOBILE_TPL" ] && ! grep -q "$MARKER" "$MOBILE_TPL"; then
       "$MARKER" \
       "<script>" \
       "  function removeSubscriptionElements() {" \
+      "    // --- Remove subscription dialogs ---" \
       "    const dialogs = document.querySelectorAll('dialog.pwt-outer-dialog');" \
       "    dialogs.forEach(dialog => {" \
-      "      const closeButton = dialog.querySelector('.fa-close');" \
-      "      const exclamationIcon = dialog.querySelector('.fa-exclamation-triangle');" \
-      "      const continueButton = dialog.querySelector('button');" \
-      "      if (closeButton && exclamationIcon && continueButton) { dialog.remove(); console.log('Removed subscription dialog'); }" \
+      "      const text = (dialog.textContent || '').toLowerCase();" \
+      "      if (text.includes('subscription')) {" \
+      "        dialog.remove();" \
+      "        console.log('Removed subscription dialog');" \
+      "      }" \
       "    });" \
+      "" \
+      "    // --- Remove subscription cards, but keep Reboot/Shutdown/Console ---" \
       "    const cards = document.querySelectorAll('.pwt-card.pwt-p-2.pwt-d-flex.pwt-interactive.pwt-justify-content-center');" \
       "    cards.forEach(card => {" \
-      "      const hasInteractiveElements = card.querySelector('button, input, a');" \
-      "      const hasComplexStructure = card.querySelector('.pwt-grid, .pwt-flex, .pwt-button');" \
-      "      if (!hasInteractiveElements && !hasComplexStructure) { card.remove(); console.log('Removed subscription card'); }" \
+      "      const text = (card.textContent || '').toLowerCase();" \
+      "      const hasButton = card.querySelector('button');" \
+      "      if (!hasButton && text.includes('subscription')) {" \
+      "        card.remove();" \
+      "        console.log('Removed subscription card');" \
+      "      }" \
       "    });" \
       "  }" \
+      "" \
       "  const observer = new MutationObserver(removeSubscriptionElements);" \
       "  observer.observe(document.body, { childList: true, subtree: true });" \
       "  removeSubscriptionElements();" \
@@ -555,9 +563,8 @@ if [ -f "$MOBILE_TPL" ] && ! grep -q "$MARKER" "$MOBILE_TPL"; then
       "" >> "$MOBILE_TPL"
 fi
 EOF
-
     chmod 755 /usr/local/bin/pve-remove-nag.sh
-    
+
     cat >/etc/apt/apt.conf.d/no-nag-script <<'EOF'
 DPkg::Post-Invoke { "/usr/local/bin/pve-remove-nag.sh"; };
 EOF