Merge branch 'main' into feat/add-history-page

frontend/src/App.jsx

@@ -18,13 +18,20 @@ import { useConnectWallet } from 'hooks/useConnectWallet';
 import OverviewPage from 'pages/spotnet/overview/Overview';
 import { ActionModal } from 'components/ui/ActionModal';
 import Stake from 'pages/vault/stake/Stake';
+import { TELEGRAM_BOT_LINK } from 'utils/constants';
+import { useCheckMobile } from 'hooks/useCheckMobile';
 import { notifyError } from 'utils/notification';
 import PositionHistory from 'pages/spotnet/position_history/PositionHistory';
 
+
 function App() {
   const { walletId, setWalletId, removeWalletId } = useWalletStore();
   const [showModal, setShowModal] = useState(false);
   const navigate = useNavigate();
+  const [isMobileRestrictionModalOpen, setisMobileRestrictionModalOpen] = useState(true);
+  const isMobile = useCheckMobile();
+
+  const disableDesktopOnMobile = process.env.REACT_APP_DISABLE_DESKTOP_ON_MOBILE !== 'false';
 
   const connectWalletMutation = useConnectWallet(setWalletId);
 
@@ -47,6 +54,15 @@ function App() {
     setShowModal(false);
   };
 
+
+  const handleisMobileRestrictionModalClose = () => {
+    setisMobileRestrictionModalOpen(false);
+  };
+
+  const openTelegramBot = () => {
+    window.open(TELEGRAM_BOT_LINK, '_blank');
+  };
+
   useEffect(() => {
     if (window.Telegram?.WebApp?.initData) {
       getTelegramUserWalletId(window.Telegram.WebApp.initDataUnsafe.user.id)
@@ -62,6 +78,7 @@ function App() {
     }
   }, [window.Telegram?.WebApp?.initDataUnsafe]);
 
+
   return (
     <div className="App">
       <Notifier />
@@ -96,8 +113,20 @@ function App() {
         </Routes>
       </main>
       <Footer />
+      {isMobile && disableDesktopOnMobile && (
+        <ActionModal
+          isOpen={isMobileRestrictionModalOpen}
+          title="Mobile website restriction"
+          subTitle="Please, use desktop version or telegram mini-app"
+          content={[]}
+          cancelLabel="Cancel"
+          submitLabel="Open in Telegram"
+          submitAction={openTelegramBot}
+          cancelAction={handleisMobileRestrictionModalClose}
+        />
+      )}
     </div>
   );
 }
 
-export default App;
+export default App;

frontend/src/hooks/useCheckMobile.js

@@ -0,0 +1,26 @@
+import { useState, useEffect } from 'react';
+
+export const useCheckMobile = () => {
+  const [isMobile, setIsMobile] = useState(false);
+
+  useEffect(() => {
+    const checkMobile = () => {
+      const userAgent = navigator.userAgent || navigator.vendor || window.opera;
+
+      const mobileRegex = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i;
+
+      const isMobileDevice = mobileRegex.test(userAgent);
+      const isMobileWidth = window.innerWidth <= 768;
+
+      setIsMobile(isMobileDevice || isMobileWidth);
+    };
+
+    checkMobile();
+
+    window.addEventListener('resize', checkMobile);
+
+    return () => window.removeEventListener('resize', checkMobile);
+  }, []);
+
+  return isMobile;
+};

frontend/src/utils/constants.js

@@ -12,6 +12,8 @@ export const USDC_ADDRESS = '0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5
 
 export const ONE_HOUR_IN_MILLISECONDS = 3600000;
 
+export const TELEGRAM_BOT_LINK = 'https://t.me/spotnet_bot';
+
 export function getDeployContractData(walletId) {
   return {
     classHash: CLASS_HASH,

web_app/db/seed_data.py

@@ -26,8 +26,10 @@ def create_users(session: SessionLocal) -> list[User]:
     """
     users = []
     for _ in range(10):
+        wallet_id = fake.unique.uuid4()
+        print('wallet_id:', wallet_id)
         user = User(
-            wallet_id=fake.unique.uuid4(),
+            wallet_id=wallet_id,
             contract_address=fake.address(),
             is_contract_deployed=fake.boolean(),
         )
@@ -49,7 +51,7 @@ def create_positions(session: SessionLocal, users: list[User]) -> None:
         for _ in range(2):
             position = Position(
                 user_id=user.id,
-                token_symbol=fake.random_choices(
+                token_symbol=fake.random_element(
                     elements=[token.name for token in TokenParams.tokens()]
                 ),
                 amount=fake.random_number(digits=5),
@@ -157,8 +159,8 @@ def create_vaults(session: SessionLocal, users: list[User]) -> None:
         # Populate the database
         users = create_users(session)
         create_positions(session, users)
-        create_airdrops(session, users)
-        create_telegram_users(session, users)
+        # create_airdrops(session, users)
+        # create_telegram_users(session, users)
         create_vaults(session, users)
 
     logger.info("Database populated with fake data.")