From c2bfa59e2bca7e4efeb0c7891c74a366f471f3ad Mon Sep 17 00:00:00 2001
From: chillpad <k@chillpad.club>
Date: Sun, 26 Jul 2026 17:27:20 +0300
Subject: [PATCH] refactor: wrap (not edit) additional-options block to avoid
 future merge conflicts

---
 src/pages/Subscription.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/Subscription.tsx b/src/pages/Subscription.tsx
index 8b44082..59f2abd 100644
--- a/src/pages/Subscription.tsx
+++ b/src/pages/Subscription.tsx
@@ -1496,9 +1496,12 @@ export default function Subscription() {
           </div>
         )}
 
-      {/* Additional Options (Buy Devices) */}
-      {false &&
-        subscription &&
+      {/* Additional Options (Buy Devices) — disabled on purpose. Wrapped (not
+          edited in place) so future upstream changes to the condition/body
+          below merge cleanly instead of conflicting on this toggle. */}
+      {false && (
+        <>
+      {subscription &&
         (subscription.is_active || subscription.is_limited) &&
         !subscription.is_trial &&
         subscription.device_limit !== 0 && (
@@ -1577,6 +1580,8 @@ export default function Subscription() {
             )}
           </div>
         )}
+        </>
+      )}
 
       {/* Reissue Subscription — standalone block, not dependent on device_limit */}
       {subscription &&