Update app.py

app.py

@@ -14,7 +14,7 @@ import threading
 from huggingface_hub import HfApi, hf_hub_download
 from huggingface_hub.utils import RepositoryNotFoundError
 
-BOT_TOKEN = os.getenv("BOT_TOKEN", "7566834146:AAGiG4MaTZZvvtTVsqEJVG5SYK5hUlc_Ewo")
+BOT_TOKEN = os.getenv("BOT_TOKEN", "7566834146:AAGiG4MaTZZvvtVsqEJVG5SYK5hUlc_Ewo")
 HOST = '0.0.0.0'
 PORT = 7860
 DATA_FILE = 'data.json'
@@ -37,6 +37,7 @@ def download_data_from_hf():
         logging.warning("HF_TOKEN_READ not set.")
         return False
     try:
+        logging.info(f"Attempting to download {HF_DATA_FILE_PATH} from {REPO_ID}...")
         hf_hub_download(
             repo_id=REPO_ID,
             filename=HF_DATA_FILE_PATH,
@@ -47,15 +48,18 @@ def download_data_from_hf():
             force_download=True,
             etag_timeout=10
         )
+        logging.info("Data file successfully downloaded from Hugging Face.")
         with _data_lock:
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
                     visitor_data_cache = json.load(f)
+                logging.info("Successfully loaded downloaded data into cache.")
             except (FileNotFoundError, json.JSONDecodeError) as e:
+                 logging.error(f"Error reading downloaded data file: {e}. Starting with empty cache.")
                  visitor_data_cache = {}
         return True
     except RepositoryNotFoundError:
-        logging.error(f"Hugging Face repository '{REPO_ID}' not found.")
+        logging.error(f"Hugging Face repository '{REPO_ID}' not found. Cannot download data.")
     except Exception as e:
         logging.error(f"Error downloading data from Hugging Face: {e}")
     return False
@@ -67,11 +71,15 @@ def load_visitor_data():
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
                     visitor_data_cache = json.load(f)
+                logging.info("Visitor data loaded from local JSON.")
             except FileNotFoundError:
+                logging.warning(f"{DATA_FILE} not found locally. Starting with empty data.")
                 visitor_data_cache = {}
             except json.JSONDecodeError:
+                logging.error(f"Error decoding {DATA_FILE}. Starting with empty data.")
                 visitor_data_cache = {}
             except Exception as e:
+                logging.error(f"Unexpected error loading visitor data: {e}")
                 visitor_data_cache = {}
         return visitor_data_cache
 
@@ -81,14 +89,17 @@ def save_visitor_data(data):
             visitor_data_cache.update(data)
             with open(DATA_FILE, 'w', encoding='utf-8') as f:
                 json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
+            logging.info(f"Visitor data successfully saved to {DATA_FILE}.")
             upload_data_to_hf_async()
         except Exception as e:
             logging.error(f"Error saving visitor data: {e}")
 
 def upload_data_to_hf():
     if not HF_TOKEN_WRITE:
+        logging.warning("HF_TOKEN_WRITE not set. Skipping Hugging Face upload.")
         return
     if not os.path.exists(DATA_FILE):
+        logging.warning(f"{DATA_FILE} does not exist. Skipping upload.")
         return
 
     try:
@@ -96,8 +107,10 @@ def upload_data_to_hf():
         with _data_lock:
              file_content_exists = os.path.getsize(DATA_FILE) > 0
              if not file_content_exists:
+                 logging.warning(f"{DATA_FILE} is empty. Skipping upload.")
                  return
 
+             logging.info(f"Attempting to upload {DATA_FILE} to {REPO_ID}/{HF_DATA_FILE_PATH}...")
              api.upload_file(
                  path_or_fileobj=DATA_FILE,
                  path_in_repo=HF_DATA_FILE_PATH,
@@ -106,6 +119,7 @@ def upload_data_to_hf():
                  token=HF_TOKEN_WRITE,
                  commit_message=f"Update visitor data {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
              )
+        logging.info("Visitor data successfully uploaded to Hugging Face.")
     except Exception as e:
         logging.error(f"Error uploading data to Hugging Face: {e}")
 
@@ -115,9 +129,11 @@ def upload_data_to_hf_async():
 
 def periodic_backup():
      if not HF_TOKEN_WRITE:
+         logging.info("Periodic backup disabled: HF_TOKEN_WRITE not set.")
          return
      while True:
          time.sleep(3600)
+         logging.info("Initiating periodic backup...")
          upload_data_to_hf()
 
 def verify_telegram_data(init_data_str):
@@ -140,7 +156,7 @@ def verify_telegram_data(init_data_str):
             auth_date = int(parsed_data.get('auth_date', [0])[0])
             current_time = int(time.time())
             if current_time - auth_date > 86400:
-                 pass
+                 logging.warning(f"Telegram InitData is older than 24 hours (Auth Date: {auth_date}, Current: {current_time}).")
             return parsed_data, True
         else:
             logging.warning(f"Data verification failed. Calculated: {calculated_hash}, Received: {received_hash}")
@@ -156,11 +172,8 @@ TEMPLATE = """
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no, user-scalable=no, viewport-fit=cover">
     <title>Morshen Group</title>
-    <!-- Telegram WebApp script MUST be loaded first -->
     <script src="https://telegram.org/js/telegram-web-app.js"></script>
-    <!-- TON Connect SDK script with defer to avoid blocking -->
-    <script src="https://unpkg.com/@tonconnect/sdk@2.0.0/dist/tonconnect-sdk.min.js" defer></script>
-
+    <script src="https://unpkg.com/@tonconnect/ui@latest/dist/tonconnect-ui.min.js"></script>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
@@ -261,14 +274,6 @@ TEMPLATE = """
             background: rgba(44, 44, 46, 0.95);
             box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.2), var(--shadow-medium);
         }
-         .btn-red {
-             background: linear-gradient(95deg, #ff3b30, #ff453a);
-             color: var(--tg-theme-button-text-color);
-         }
-         .btn-red:hover {
-             background: linear-gradient(95deg, #ff453a, #ff3b30);
-         }
-
         .tag {
             display: inline-block; background: var(--tag-bg); color: var(--text-secondary-color);
             padding: 6px 12px; border-radius: var(--border-radius-s); font-size: 0.85em;
@@ -392,6 +397,37 @@ TEMPLATE = """
         .modal-text b { color: var(--tg-theme-link-color); font-weight: 600; }
         .modal-instruction { font-size: 1em; color: var(--text-secondary-color); margin-top: var(--padding-m); }
 
+        .ton-section {
+             margin-top: var(--padding-l);
+             text-align: center;
+             padding: var(--padding-l);
+             border-radius: var(--border-radius-l);
+             background-color: var(--card-bg);
+             box-shadow: var(--shadow-medium);
+             border: 1px solid rgba(255, 255, 255, 0.08);
+             backdrop-filter: blur(var(--backdrop-blur));
+             -webkit-backdrop-filter: blur(var(--backdrop-blur));
+        }
+        .ton-section h3 {
+             font-size: 1.5em;
+             font-weight: 700;
+             margin-bottom: var(--padding-s);
+             color: var(--text-color);
+        }
+         .ton-connect-widget-container {
+             margin-top: var(--padding-m);
+         }
+         .ton-info {
+             margin-top: var(--padding-m);
+             font-size: 1.1em;
+             color: var(--text-secondary-color);
+         }
+         .ton-info div { margin-bottom: var(--padding-s); word-break: break-all; }
+         .ton-info strong { color: var(--text-color); font-weight: 600; }
+         .ton-address { color: var(--tg-theme-link-color); font-weight: 500;}
+         .ton-balance { color: var(--accent-gradient-green, #34c759); font-weight: 600; }
+
+
         .icon { display: inline-block; width: 1.2em; text-align: center; margin-right: 8px; opacity: 0.9; }
         .icon-save::before { content: '💾'; }
         .icon-web::before { content: '🌐'; }
@@ -413,7 +449,6 @@ TEMPLATE = """
         .icon-leader::before { content: '🏆'; }
         .icon-company::before { content: '🏢'; }
         .icon-ton::before { content: '💎'; }
-        .icon-wallet::before { content: '👛'; }
 
         @media (max-width: 480px) {
             .section-title { font-size: 1.8em; }
@@ -423,6 +458,8 @@ TEMPLATE = """
             .stats-grid { grid-template-columns: repeat(auto-fit, minmax(90px, 1fr)); gap: var(--padding-s); }
             .stat-value { font-size: 1.5em; }
             .modal-content { margin: 25% auto; width: 92%; }
+             .ton-section h3 { font-size: 1.3em; }
+             .ton-info { font-size: 1em; }
         }
     </style>
 </head>
@@ -450,24 +487,6 @@ TEMPLATE = """
              </a>
         </section>
 
-        <section class="ton-wallet-section section-card">
-             <h2 class="section-title"><i class="icon icon-ton"></i>TON Кошелек</h2>
-             <p class="description" id="ton-wallet-status">Статус: Не подключен</p>
-             <div id="ton-info" style="display: none;">
-                 <p class="modal-text" style="font-size: 1.1em; margin-bottom: var(--padding-s);">
-                     <b>Адрес:</b> <span id="ton-wallet-address" style="word-break: break-all;"></span>
-                 </p>
-                 <p class="modal-text" style="font-size: 1.1em;">
-                     <b>Баланс:</b> <span id="ton-balance"></span> TON
-                 </p>
-             </div>
-             <div style="display: flex; gap: var(--padding-s); margin-top: var(--padding-m);">
-                 <button id="connect-ton-btn" class="btn" style="flex-grow: 1;"><i class="icon icon-wallet"></i>Подключить кошелек</button>
-                 <button id="disconnect-ton-btn" class="btn btn-red" style="flex-grow: 1; display: none;">Отключить</button>
-             </div>
-             <p id="ton-error" style="color: var(--admin-danger); font-size: 0.9em; margin-top: var(--padding-s); display: none;"></p>
-        </section>
-
          <section class="ecosystem-header">
              <h2 class="section-title"><i class="icon icon-company"></i>Экосистема инноваций</h2>
              <p class="description">
@@ -552,6 +571,18 @@ TEMPLATE = """
             </div>
         </section>
 
+        <section class="ton-section">
+            <h3><i class="icon icon-ton"></i> TON Wallet</h3>
+            <p class="description" style="margin-bottom: var(--padding-m); font-size: 1em;">Подключите свой TON кошелек для авторизации и просмотра баланса.</p>
+            <div id="ton-connect-ui" class="ton-connect-widget-container"></div>
+            <div class="ton-info">
+                <div id="ton-status">Статус: Не подключен</div>
+                <div id="ton-address" style="display: none;">Адрес: <span class="ton-address"></span></div>
+                <div id="ton-balance" style="display: none;">Баланс: <span class="ton-balance"></span></div>
+            </div>
+        </section>
+
+
         <footer class="footer-greeting">
              <p id="greeting">Инициализация...</p>
         </footer>
@@ -572,10 +603,8 @@ TEMPLATE = """
       </div>
     </div>
 
-
     <script>
         const tg = window.Telegram.WebApp;
-        let tonConnectSDK = null;
 
         function applyTheme(themeParams) {
             const root = document.documentElement;
@@ -598,58 +627,44 @@ TEMPLATE = """
             }
         }
 
-        async function fetchTonBalance(address) {
-             // Using public RPC endpoint provided by TON Center
-             const rpcUrl = 'https://rpc.toncenter.com/api/v2/jsonRPC';
-             try {
-                 const response = await fetch(rpcUrl, {
-                     method: 'POST',
-                     headers: {
-                         'Content-Type': 'application/json',
-                     },
-                     body: JSON.stringify({
-                         jsonrpc: '2.0',
-                         id: 1, // Request ID, can be anything
-                         method: 'getBalance',
-                         params: {
-                             address: address
-                         }
-                     })
-                 });
-                 if (!response.ok) throw new Error(`RPC error: ${response.status}`);
-                 const data = await response.json();
-                 if (data.error) throw new Error(`RPC error: ${data.error.message}`);
-                 const balanceNanoTon = parseInt(data.result);
-                 const balanceTon = balanceNanoTon / 1e9; // Convert NanoTON to TON
-                 return balanceTon.toFixed(4); // Format to 4 decimal places
-             } catch (error) {
-                 console.error('Error fetching TON balance:', error);
-                 document.getElementById('ton-error').textContent = `Ошибка получения баланса: ${error.message}`;
-                 document.getElementById('ton-error').style.display = 'block';
-                 return 'N/A'; // Return N/A on error
-             }
-         }
+        let tonConnectUI = null;
 
+        async function fetchTonBalance(address) {
+            const tonCenterUrl = `https://toncenter.com/api/v3/account/getBalance?address=${address}`;
+            try {
+                const response = await fetch(tonCenterUrl);
+                if (!response.ok) {
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
+                const data = await response.json();
+                if (data.error) {
+                     throw new Error(data.error);
+                }
+                // Balance is in NanoTONs, convert to TON
+                const balanceNano = BigInt(data.result.balance);
+                const balanceTon = Number(balanceNano) / 1e9;
+                return balanceTon.toFixed(2); // Format to 2 decimal places
+            } catch (error) {
+                console.error("Error fetching TON balance:", error);
+                return "Ошибка";
+            }
+        }
 
-        function initializeWebApp() {
-            // Check if Telegram WebApp is ready
+        function setupTelegram() {
             if (!tg || !tg.initData) {
                  console.error("Telegram WebApp script not loaded or initData is missing.");
                  const greetingElement = document.getElementById('greeting');
                  if(greetingElement) greetingElement.textContent = 'Не удалось связаться с Telegram.';
-                 document.body.style.visibility = 'visible'; // Show body even on error
+                 document.body.style.visibility = 'visible';
                  return;
              }
 
-            // Initialize Telegram WebApp features
             tg.ready();
             tg.expand();
 
-            // Apply theme based on Telegram app theme
             applyTheme(tg.themeParams);
             tg.onEvent('themeChanged', () => applyTheme(tg.themeParams));
 
-            // Send initData to backend for verification and logging
              fetch('/verify', {
                  method: 'POST',
                  headers: {
@@ -673,7 +688,7 @@ TEMPLATE = """
                  console.error('Error sending initData for verification:', error);
              });
 
-             // Display user greeting
+
              const user = tg.initDataUnsafe?.user;
              const greetingElement = document.getElementById('greeting');
              if (user) {
@@ -681,19 +696,17 @@ TEMPLATE = """
                  greetingElement.textContent = `Добро пожаловать, ${name}! 👋`;
              } else {
                  greetingElement.textContent = 'Добро пожаловать!';
+                 console.warn('Telegram User data not available (initDataUnsafe.user is empty).');
              }
 
-             // Setup Contact Links to open Telegram chat
              const contactButtons = document.querySelectorAll('.contact-link');
              contactButtons.forEach(button => {
                  button.addEventListener('click', (e) => {
                      e.preventDefault();
-                     // Replace 'morshenkhan' with the actual Telegram username
                      tg.openTelegramLink('https://t.me/morshenkhan');
                  });
              });
 
-             // Setup Save Card Modal
              const modal = document.getElementById("saveModal");
              const saveCardBtn = document.getElementById("save-card-btn");
              const closeBtn = document.getElementById("modal-close-btn");
@@ -716,113 +729,107 @@ TEMPLATE = """
                          modal.style.display = "none";
                      }
                  });
+             } else {
+                 console.error("Modal elements not found!");
              }
 
-             // Show body after initial setup is complete
-             document.body.style.visibility = 'visible';
-
-
-             // --- TON Connect Integration ---
-             const connectTonBtn = document.getElementById('connect-ton-btn');
-             const disconnectTonBtn = document.getElementById('disconnect-ton-btn');
-             const tonWalletStatus = document.getElementById('ton-wallet-status');
-             const tonWalletAddress = document.getElementById('ton-wallet-address');
-             const tonBalance = document.getElementById('ton-balance');
-             const tonInfoDiv = document.getElementById('ton-info');
-             const tonErrorDiv = document.getElementById('ton-error');
-
-             // Check if TON Connect elements exist and TON Connect SDK is loaded
-             if (connectTonBtn && disconnectTonBtn && tonWalletStatus && tonWalletAddress && tonBalance && tonInfoDiv && tonErrorDiv) {
-                 if (!window.TonConnectSDK) {
-                     console.error("TON Connect SDK script not loaded correctly or window.TonConnectSDK is not defined.");
-                     tonErrorDiv.textContent = 'Ошибка: TON Connect SDK не загружен.';
-                     tonErrorDiv.style.display = 'block';
-                     connectTonBtn.disabled = true; // Disable connect button
-                     return; // Stop TON Connect initialization
-                 }
-
-                 try {
-                     // Initialize TON Connect SDK
-                     tonConnectSDK = new window.TonConnectSDK.TonConnectSDK({
-                         manifestUrl: window.location.origin + '/tonconnect-manifest.json',
-                         actionsConfiguration: {
-                             // !!! IMPORTANT: Replace with your actual bot username and Mini App shortname
-                             // Example: 'https://t.me/MyAwesomeBot/MyMiniApp'
-                             twaReturnUrl: 'https://t.me/YOUR_BOT_USERNAME/YOUR_MINIAPP_SHORTNAME'
-                         }
-                     });
+            setupTonConnect();
 
-                     // Subscribe to wallet status changes
-                     tonConnectSDK.onStatusChange(async wallet => {
-                         tonErrorDiv.style.display = 'none'; // Clear previous errors
-                         if (wallet) {
-                             // Wallet is connected
-                             tonWalletStatus.textContent = 'Статус: Подключен ✅';
-                             tonWalletAddress.textContent = wallet.account.address;
-                             tonInfoDiv.style.display = 'block';
-                             connectTonBtn.style.display = 'none';
-                             disconnectTonBtn.style.display = 'inline-flex';
-                             tonBalance.textContent = 'Загрузка...'; // Show loading state for balance
-                             const balance = await fetchTonBalance(wallet.account.address);
-                             tonBalance.textContent = balance;
-                             if (tg.HapticFeedback) {
-                                tg.HapticFeedback.notificationOccurred('success');
-                             }
-                         } else {
-                             // Wallet is disconnected
-                             tonWalletStatus.textContent = 'Статус: Не подключен';
-                             tonWalletAddress.textContent = '';
-                             tonBalance.textContent = '';
-                             tonInfoDiv.style.display = 'none';
-                             connectTonBtn.style.display = 'inline-flex';
-                             disconnectTonBtn.style.display = 'none';
-                             if (tg.HapticFeedback) {
-                                 tg.HapticFeedback.notificationOccurred('warning');
-                             }
-                         }
-                         // Hide Telegram's MainButton if it might be interfering
-                         // tg.MainButton.hide();
-                     });
+            document.body.style.visibility = 'visible';
+         }
 
-                     // Add event listeners for connect/disconnect buttons
-                     connectTonBtn.addEventListener('click', () => {
-                         tonErrorDiv.style.display = 'none'; // Clear error on button click
-                         tonConnectSDK.connectWallet(); // Trigger wallet connection flow
-                     });
+        function setupTonConnect() {
+            if (!window.TonConnectUI) {
+                 console.error("TonConnectUI script not loaded.");
+                 document.getElementById('ton-status').textContent = 'Ошибка загрузки TonConnect.';
+                 return;
+            }
 
-                     disconnectTonBtn.addEventListener('click', () => {
-                         tonErrorDiv.style.display = 'none'; // Clear error on button click
-                         tonConnectSDK.disconnect(); // Trigger wallet disconnection
-                     });
+            try {
+                 tonConnectUI = new window.TonConnectUI({
+                     manifestUrl: window.location.origin + '/tonconnect-manifest.json',
+                     uiPreferences: {
+                         colorsSet: tg.themeParams.bg_color ? 'STANDARD' : 'DARK', // Use standard or dark based on TG theme
+                         // You can customize colors further based on tg.themeParams if needed
+                         // colors: {
+                         //      dark: { ... },
+                         //      light: { ... }
+                         // }
+                     },
+                 });
 
-                     // Attempt to restore previous connection on startup
-                     tonConnectSDK.restoreConnection();
+                 tonConnectUI.onStatusChange(async wallet => {
+                     const tonStatusElement = document.getElementById('ton-status');
+                     const tonAddressElement = document.getElementById('ton-address');
+                     const tonBalanceElement = document.getElementById('ton-balance');
+
+                     if (wallet) {
+                         const address = wallet.account.address;
+                         tonStatusElement.textContent = 'Статус: Подключен';
+                         tonAddressElement.style.display = 'block';
+                         tonAddressElement.querySelector('span').textContent = address;
+
+                         tonBalanceElement.style.display = 'block';
+                         tonBalanceElement.querySelector('span').textContent = 'Загрузка...';
+
+                         const balance = await fetchTonBalance(address);
+                         tonBalanceElement.querySelector('span').textContent = balance + ' TON';
+
+                         console.log('TON Wallet connected:', address);
+                         console.log('TON Account:', wallet.account);
+                         // You might want to send this address to the backend here
+                         // to link it to the Telegram user ID if needed for your application logic.
+
+                     } else {
+                         tonStatusElement.textContent = 'Статус: Не подключен';
+                         tonAddressElement.style.display = 'none';
+                         tonBalanceElement.style.display = 'none';
+                         console.log('TON Wallet disconnected.');
+                     }
+                 });
 
-                 } catch (e) {
-                      // Catch errors specifically during SDK instantiation
-                      console.error("Error initializing TON Connect SDK:", e);
-                      tonErrorDiv.textContent = `Ошибка инициализации TON Connect: ${e.message}`;
-                      tonErrorDiv.style.display = 'block';
-                      connectTonBtn.disabled = true; // Disable button on initialization error
+                 // Render the TonConnect button/widget
+                 const tonConnectUiContainer = document.getElementById('ton-connect-ui');
+                 if (tonConnectUiContainer) {
+                     tonConnectUI.renderButtons(tonConnectUiContainer, {
+                         messages: {
+                             connectingModalWithoutWallets: 'Пожалуйста, установите кошелек, поддерживающий TonConnect.',
+                             connectingModalTitle: 'Подключение кошелька TON',
+                             walletConnectRequestTemporarilyUnavailable: 'Запрос подключения временно недоступен. Попробуйте позже.',
+                         },
+                         labels: {
+                             disconnect: 'Отключить кошелек',
+                             connectWallet: 'Подключить TON Кошелек',
+                             connectedWallet: 'Подключен {{walletName}}',
+                         }
+                     });
+                 } else {
+                      console.error("TON Connect UI container not found!");
                  }
-             } else {
-                  console.error("TON Wallet section HTML elements not found!");
+
+             } catch (e) {
+                 console.error("Error initializing TonConnectUI:", e);
+                 document.getElementById('ton-status').textContent = 'Ошибка инициализации TonConnect.';
              }
-             // --- End TON Connect Integration ---
-         }
+        }
+
+
+        if (window.Telegram && window.Telegram.WebApp) {
+            setupTelegram();
+        } else {
+            console.warn("Telegram WebApp script not immediately available, waiting for window.onload");
+            window.addEventListener('load', setupTelegram);
+             setTimeout(() => {
+                 if (document.body.style.visibility !== 'visible') {
+                      console.error("Telegram WebApp script fallback timeout triggered.");
+                      const greetingElement = document.getElementById('greeting');
+                      if(greetingElement) greetingElement.textContent = 'Ошибка загрузки интерфейса Telegram.';
+                      document.body.style.visibility = 'visible';
+                      setupTonConnect(); // Still try to setup TON even without TG
+                  }
+             }, 3500);
+        }
 
-        // Wait for the window to fully load all resources (including deferred scripts)
-        window.addEventListener('load', initializeWebApp);
-
-         // Fallback timeout in case something prevents 'load' or Telegram script
-         setTimeout(() => {
-             if (document.body.style.visibility !== 'visible') {
-                  console.error("WebApp initialization fallback timeout triggered.");
-                  const greetingElement = document.getElementById('greeting');
-                  if(greetingElement) greetingElement.textContent = 'Ошибка загрузки интерфейса.';
-                  document.body.style.visibility = 'visible';
-              }
-         }, 5000); // Increased timeout slightly to 5 seconds
     </script>
 </body>
 </html>
@@ -894,6 +901,7 @@ ADMIN_TEMPLATE = """
         }
         .user-card .name { font-weight: 600; font-size: 1.2em; margin-bottom: 0.3rem; color: var(--admin-primary); }
         .user-card .username { color: var(--admin-secondary); margin-bottom: 0.8rem; font-size: 0.95em; }
+        .user-card .username a { color: inherit; text-decoration: none; }
         .user-card .details { font-size: 0.9em; color: #495057; word-break: break-word; }
         .user-card .detail-item { margin-bottom: 0.3rem; }
         .user-card .detail-item strong { color: var(--admin-text); }
@@ -975,7 +983,7 @@ ADMIN_TEMPLATE = """
                         <img src="{{ user.photo_url if user.photo_url else 'data:image/svg+xml;charset=UTF-8,%3csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 100 100%27%3e%3crect width=%27100%27 height=%27100%27 fill=%27%23e9ecef%27/%3e%3ctext x=%2750%25%27 y=%2755%25%27 dominant-baseline=%27middle%27 text-anchor=%27middle%27 font-size=%2745%27 font-family=%27sans-serif%27 fill=%27%23adb5bd%27%3e?%3c/text%3e%3c/svg%3e' }}" alt="User Avatar">
                         <div class="name">{{ user.first_name or '' }} {{ user.last_name or '' }}</div>
                         {% if user.username %}
-                            <div class="username"><a href="https://t.me/{{ user.username }}" target="_blank" style="color: inherit; text-decoration: none;">@{{ user.username }}</a></div>
+                            <div class="username"><a href="https://t.me/{{ user.username }}" target="_blank">@{{ user.username }}</a></div>
                         {% else %}
                              <div class="username" style="height: 1.3em;"></div>
                         {% endif %}
@@ -984,6 +992,9 @@ ADMIN_TEMPLATE = """
                            <div class="detail-item"><strong>Язык:</strong> {{ user.language_code or 'N/A' }}</div>
                            <div class="detail-item"><strong>Premium:</strong> {{ 'Да' if user.is_premium else 'Нет' }}</div>
                            <div class="detail-item"><strong>Телефон:</strong> {{ user.phone_number or 'Недоступен' }}</div>
+                           {% if user.ton_address %}
+                           <div class="detail-item"><strong>TON:</strong> {{ user.ton_address }}</div>
+                           {% endif %}
                         </div>
                          <div class="timestamp">Визит: {{ user.visited_at_str }}</div>
                     </div>
@@ -1017,6 +1028,7 @@ ADMIN_TEMPLATE = """
             } catch (error) {
                 statusMessage.textContent = `Ошибка ${action}: ${error.message}`;
                 statusMessage.style.color = 'var(--admin-danger)';
+                console.error(`Error during ${action}:`, error);
             } finally {
                 loader.style.display = 'none';
             }
@@ -1034,6 +1046,14 @@ ADMIN_TEMPLATE = """
 </html>
 """
 
+TON_MANIFEST = {
+    "url": os.getenv("APP_BASE_URL", "https://localhost:7860") + "/",
+    "name": "Morshen Group TMA",
+    "iconUrl": os.getenv("APP_BASE_URL", "https://localhost:7860") + "/static/morshengroup.jpg", # Or a publicly hosted image
+    "termsOfServiceUrl": "https://example.com/terms", # Replace with your actual terms
+    "privacyPolicyUrl": "https://example.com/privacy" # Replace with your actual privacy policy
+}
+
 @app.route('/')
 def index():
     theme_params = {}
@@ -1050,56 +1070,55 @@ def verify_data():
         user_data_parsed, is_valid = verify_telegram_data(init_data_str)
 
         user_info_dict = {}
+        user_id = None
         if user_data_parsed and 'user' in user_data_parsed:
             try:
                 user_json_str = unquote(user_data_parsed['user'][0])
                 user_info_dict = json.loads(user_json_str)
+                user_id = user_info_dict.get('id')
             except Exception as e:
                 logging.error(f"Could not parse user JSON: {e}")
                 user_info_dict = {}
 
-        if is_valid:
-            user_id = user_info_dict.get('id')
-            if user_id:
-                now = time.time()
-                user_entry = {
-                    str(user_id): {
-                        'id': user_id,
-                        'first_name': user_info_dict.get('first_name'),
-                        'last_name': user_info_dict.get('last_name'),
-                        'username': user_info_dict.get('username'),
-                        'photo_url': user_info_dict.get('photo_url'),
-                        'language_code': user_info_dict.get('language_code'),
-                        'is_premium': user_info_dict.get('is_premium', False),
-                        'phone_number': user_info_dict.get('phone_number'),
-                        'visited_at': now,
-                        'visited_at_str': datetime.fromtimestamp(now).strftime('%Y-%m-%d %H:%M:%S')
-                    }
-                }
-                save_visitor_data(user_entry)
+        if is_valid and user_id:
+            now = time.time()
+            # Load current data to potentially merge
+            current_data = load_visitor_data()
+            user_key = str(user_id)
+
+            # Get existing user data if any, and update it
+            existing_user_entry = current_data.get(user_key, {})
+
+            # Update with latest TG data
+            updated_user_entry = {
+                'id': user_id,
+                'first_name': user_info_dict.get('first_name', existing_user_entry.get('first_name')),
+                'last_name': user_info_dict.get('last_name', existing_user_entry.get('last_name')),
+                'username': user_info_dict.get('username', existing_user_entry.get('username')),
+                'photo_url': user_info_dict.get('photo_url', existing_user_entry.get('photo_url')),
+                'language_code': user_info_dict.get('language_code', existing_user_entry.get('language_code')),
+                'is_premium': user_info_dict.get('is_premium', existing_user_entry.get('is_premium', False)),
+                'phone_number': user_info_dict.get('phone_number', existing_user_entry.get('phone_number')),
+                'visited_at': now,
+                'visited_at_str': datetime.fromtimestamp(now).strftime('%Y-%m-%d %H:%M:%S')
+            }
+
+            # Keep existing TON address if present
+            if 'ton_address' in existing_user_entry:
+                 updated_user_entry['ton_address'] = existing_user_entry['ton_address']
+
+            # Save the updated entry
+            save_visitor_data({user_key: updated_user_entry})
+
             return jsonify({"status": "ok", "verified": True, "user": user_info_dict}), 200
         else:
-            logging.warning(f"Verification failed for user: {user_info_dict.get('id')}")
-            return jsonify({"status": "error", "verified": False, "message": "Invalid data"}), 403
+            logging.warning(f"Verification failed or user ID missing for data: {user_info_dict}")
+            return jsonify({"status": "error", "verified": False, "message": "Invalid data or missing user ID"}), 403
 
     except Exception as e:
         logging.exception("Error in /verify endpoint")
         return jsonify({"status": "error", "message": "Internal server error"}), 500
 
-@app.route('/tonconnect-manifest.json')
-def tonconnect_manifest():
-    # You need to serve your icon file, e.g., place morshengroup.png in a 'static' folder
-    icon_url = request.url_root.rstrip('/') + "/static/morshengroup.png"
-    manifest = {
-        "url": request.url_root.rstrip('/') + "/tonconnect-manifest.json",
-        "name": "Morshen Group Mini App",
-        "iconUrl": icon_url,
-        # !!! IMPORTANT: Replace with actual URLs for your terms of use and privacy policy
-        "termsOfUseUrl": "https://example.com/terms",
-        "privacyPolicyUrl": "https://example.com/privacy"
-    }
-    return jsonify(manifest)
-
 @app.route('/admin')
 def admin_panel():
     current_data = load_visitor_data()
@@ -1121,30 +1140,76 @@ def admin_trigger_upload():
     upload_data_to_hf_async()
     return jsonify({"status": "ok", "message": "Загрузка данных на Hugging Face запущена в фоновом режиме."})
 
-@app.route('/static/<path:filename>')
-def static_files(filename):
-     # Assuming you place your icon file (e.g., morshengroup.png) in a 'static' folder
-     # relative to your app.py file.
-     # For the manifest, a PNG is usually required, but the original code used JPG.
-     # Let's assume you have a morshengroup.png in a static folder.
-     static_dir = os.path.join(app.root_path, 'static')
-     return send_from_directory(static_dir, filename)
+@app.route('/tonconnect-manifest.json')
+def tonconnect_manifest():
+    manifest_url = os.getenv("APP_BASE_URL")
+    if not manifest_url:
+        # Fallback for local testing or if env var is not set
+        manifest_url = f"http://{request.host}"
+        logging.warning(f"APP_BASE_URL not set. Using {manifest_url} for manifest.")
+
+    manifest = {
+        "url": manifest_url + "/",
+        "name": "Morshen Group TMA",
+        "iconUrl": manifest_url + "/static/morshengroup.jpg",
+        "termsOfServiceUrl": manifest_url + "/terms", # Placeholder
+        "privacyPolicyUrl": manifest_url + "/privacy" # Placeholder
+    }
+    return jsonify(manifest)
 
-# Import send_from_directory for the static route
-from flask import send_from_directory
+@app.route('/static/morshengroup.jpg')
+def serve_logo():
+    # This route serves the logo locally if needed,
+    # but the HF link in the template is likely better.
+    # If you put morshengroup.jpg in a 'static' folder next to app.py,
+    # Flask can serve it. For Hugging Face Spaces, serving static files
+    # from the repo path directly via URL (like in the template) is common.
+    # Keeping this route as a placeholder or for local testing.
+    try:
+        # Attempt to serve from local static folder
+        return app.send_static_file('morshengroup.jpg')
+    except FileNotFoundError:
+        # Fallback or error if file isn't there
+        return "Logo not found", 404
 
 
 if __name__ == '__main__':
-    # Ensure the static directory exists if you're using it for icons
-    if not os.path.exists('static'):
-        os.makedirs('static')
-        # You should place your morshengroup.png file inside the new 'static' folder
+    print("---")
+    print("--- MORSHEN GROUP MINI APP SERVER ---")
+    print("---")
+    print(f"Flask server starting on http://{HOST}:{PORT}")
+    print(f"Using Bot Token ID: {BOT_TOKEN.split(':')[0]}")
+    print(f"Visitor data file: {DATA_FILE}")
+    print(f"Hugging Face Repo: {REPO_ID}")
+    print(f"HF Data Path: {HF_DATA_FILE_PATH}")
+    if os.getenv("APP_BASE_URL"):
+         print(f"App Base URL (for manifest): {os.getenv('APP_BASE_URL')}")
+    else:
+         print("APP_BASE_URL not set. Manifest URL will be based on request host.")
+    if not HF_TOKEN_READ or not HF_TOKEN_WRITE:
+         print("---")
+         print("--- WARNING: HUGGING FACE TOKEN(S) NOT SET ---")
+         print("--- Backup/restore functionality will be limited. Set HF_TOKEN_READ and HF_TOKEN_WRITE environment variables.")
+         print("---")
+    else:
+         print("--- Hugging Face tokens found.")
+         print("--- Attempting initial data download from Hugging Face...")
+         download_data_from_hf()
 
-    download_data_from_hf()
     load_visitor_data()
 
+    print("---")
+    print("--- SECURITY WARNING ---")
+    print("--- The /admin route and its sub-routes are NOT protected.")
+    print("--- Implement proper authentication before deploying.")
+    print("---")
+
     if HF_TOKEN_WRITE:
         backup_thread = threading.Thread(target=periodic_backup, daemon=True)
         backup_thread.start()
+        print("--- Periodic backup thread started (every hour).")
+    else:
+        print("--- Periodic backup disabled (HF_TOKEN_WRITE missing).")
 
+    print("--- Server Ready ---")
     app.run(host=HOST, port=PORT, debug=False)