From 275fe811bb5b515f78e386545d88e191ff2a2319 Mon Sep 17 00:00:00 2001
From: PEDZEO <vitali.gavrikov@yandex.ru>
Date: Tue, 20 Jan 2026 03:26:07 +0300
Subject: [PATCH] Refactor ConnectionModal and TopUpModal: simplify body scroll
 locking mechanism, update modal wrapper styling for consistent padding across
 devices, and enhance responsiveness for improved user experience.

---
 src/components/ConnectionModal.tsx | 44 +++++++-----------------------
 src/components/TopUpModal.tsx      | 10 +++++--
 2 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/src/components/ConnectionModal.tsx b/src/components/ConnectionModal.tsx
index ce7ac3f..9b78a57 100644
--- a/src/components/ConnectionModal.tsx
+++ b/src/components/ConnectionModal.tsx
@@ -231,36 +231,14 @@ export default function ConnectionModal({ onClose }: ConnectionModalProps) {
     }
   }, [appConfig, detectedPlatform, selectedApp])
 
-  // Lock body scroll when modal is open (works on iOS too)
+  // Prevent body scroll when modal is open
   useEffect(() => {
-    const scrollY = window.scrollY
-    const body = document.body
-    const html = document.documentElement
-
-    // Save original styles
-    const originalBodyOverflow = body.style.overflow
-    const originalBodyPosition = body.style.position
-    const originalBodyTop = body.style.top
-    const originalBodyWidth = body.style.width
-    const originalHtmlOverflow = html.style.overflow
-
-    // Lock scroll
-    body.style.overflow = 'hidden'
-    body.style.position = 'fixed'
-    body.style.top = `-${scrollY}px`
-    body.style.width = '100%'
-    html.style.overflow = 'hidden'
+    // Simple overflow hidden - let the modal handle its own scrolling
+    const originalOverflow = document.body.style.overflow
+    document.body.style.overflow = 'hidden'
 
     return () => {
-      // Restore original styles
-      body.style.overflow = originalBodyOverflow
-      body.style.position = originalBodyPosition
-      body.style.top = originalBodyTop
-      body.style.width = originalBodyWidth
-      html.style.overflow = originalHtmlOverflow
-
-      // Restore scroll position
-      window.scrollTo(0, scrollY)
+      document.body.style.overflow = originalOverflow
     }
   }, [])
 
@@ -327,21 +305,19 @@ export default function ConnectionModal({ onClose }: ConnectionModalProps) {
     window.location.href = redirectUrl
   }
 
-  // Modal wrapper - centered on desktop, top on mobile
+  // Modal wrapper - centered on all devices
   const ModalWrapper = ({ children }: { children: React.ReactNode }) => (
     <div
-      className="fixed inset-0 bg-black/70 z-50 flex items-start sm:items-center justify-center overflow-y-auto overscroll-contain"
+      className="fixed inset-0 bg-black/70 z-[60] flex items-center justify-center p-4"
       style={{
-        padding: '1rem',
-        paddingTop: 'calc(2.5rem + env(safe-area-inset-top, 0px))',
-        paddingBottom: 'calc(1.5rem + env(safe-area-inset-bottom, 0px))',
-        WebkitOverflowScrolling: 'touch'
+        paddingTop: 'calc(1rem + env(safe-area-inset-top, 0px))',
+        paddingBottom: 'calc(1rem + env(safe-area-inset-bottom, 0px))',
       }}
       onClick={onClose}
     >
       <div
         className="w-full max-w-sm bg-dark-900 rounded-2xl border border-dark-700/50 overflow-hidden animate-scale-in shadow-2xl"
-        style={{ maxHeight: 'calc(100vh - 4rem - env(safe-area-inset-top, 0px) - env(safe-area-inset-bottom, 0px))' }}
+        style={{ maxHeight: 'calc(100vh - 2rem - env(safe-area-inset-top, 0px) - env(safe-area-inset-bottom, 0px))' }}
         onClick={(e) => e.stopPropagation()}
       >
         {children}
diff --git a/src/components/TopUpModal.tsx b/src/components/TopUpModal.tsx
index 056c19c..7d62d10 100644
--- a/src/components/TopUpModal.tsx
+++ b/src/components/TopUpModal.tsx
@@ -133,10 +133,16 @@ export default function TopUpModal({ method, onClose, initialAmountRubles }: Top
   const isPending = topUpMutation.isPending || starsPaymentMutation.isPending
 
   return (
-    <div className="fixed inset-0 bg-black/70 z-50 flex items-center justify-center px-4 pt-14 pb-28 sm:pt-0 sm:pb-0">
+    <div
+      className="fixed inset-0 bg-black/70 z-[60] flex items-center justify-center p-4"
+      style={{
+        paddingTop: 'calc(1rem + env(safe-area-inset-top, 0px))',
+        paddingBottom: 'calc(1rem + env(safe-area-inset-bottom, 0px))',
+      }}
+    >
       <div className="absolute inset-0" onClick={onClose} />
 
-      <div className="relative w-full max-w-sm bg-dark-900 rounded-2xl border border-dark-700/50 shadow-2xl overflow-hidden">
+      <div className="relative w-full max-w-sm bg-dark-900 rounded-2xl border border-dark-700/50 shadow-2xl overflow-hidden animate-scale-in">
         {/* Header */}
         <div className="flex items-center justify-between px-4 py-3 bg-dark-800/50">
           <span className="font-semibold text-dark-100">{methodName}</span>