{error}
}
-
);
diff --git a/frontend/src/pages/spotnet/home/Home.jsx b/frontend/src/pages/spotnet/home/Home.jsx
index b4217131..d97c4b3a 100644
--- a/frontend/src/pages/spotnet/home/Home.jsx
+++ b/frontend/src/pages/spotnet/home/Home.jsx
@@ -5,7 +5,6 @@ import StarMaker from '../../../components/StarMaker';
import { ReactComponent as Decoration } from 'assets/particles/deco.svg';
import { ReactComponent as Starknet } from 'assets/particles/starknet.svg';
import { ReactComponent as Rocket } from 'assets/icons/rocket.svg';
-import { Notifier } from 'components/Notifier/Notifier';
import { notifyWarning } from 'utils/notification';
import './home.css';
@@ -98,7 +97,6 @@ function Home({ walletId }) {
diff --git a/frontend/src/hooks/useConnectWallet.js b/frontend/src/hooks/useConnectWallet.js
new file mode 100644
index 00000000..61e7519a
--- /dev/null
+++ b/frontend/src/hooks/useConnectWallet.js
@@ -0,0 +1,28 @@
+import { useMutation } from '@tanstack/react-query';
+import { connectWallet, checkForCRMToken } from 'services/wallet';
+import { notifyError } from 'utils/notification';
+
+export const useConnectWallet = (setWalletId) => {
+ return useMutation({
+ mutationFn: async () => {
+ const walletAddress = await connectWallet();
+
+ if (!walletAddress) {
+ throw new Error('Failed to connect wallet');
+ }
+ const hasCRMToken = await checkForCRMToken(walletAddress);
+ if (!hasCRMToken) {
+ throw new Error('Wallet does not have CRM token');
+ }
+
+ return walletAddress;
+ },
+ onSuccess: (walletAddress) => {
+ setWalletId(walletAddress);
+ },
+ onError: (error) => {
+ console.error('Wallet connection failed:', error);
+ notifyError('Failed to connect wallet. Please try again.');
+ },
+ });
+};
\ No newline at end of file
diff --git a/frontend/src/pages/forms/Form.jsx b/frontend/src/pages/forms/Form.jsx
index 610cda6e..98f65a0c 100644
--- a/frontend/src/pages/forms/Form.jsx
+++ b/frontend/src/pages/forms/Form.jsx
@@ -2,7 +2,6 @@ import React, { useState } from 'react';
import TokenSelector from 'components/TokenSelector';
import BalanceCards from 'components/BalanceCards';
import MultiplierSelector from 'components/MultiplierSelector';
-import { connectWallet } from 'services/wallet';
import { handleTransaction } from 'services/transaction';
import Spinner from 'components/spinner/Spinner';
import { ReactComponent as AlertHexagon } from 'assets/icons/alert_hexagon.svg';
@@ -13,6 +12,7 @@ import CongratulationsModal from 'components/congratulationsModal/Congratulation
import StyledPopup from 'components/openpositionpopup/StyledPopup';
import { useQuery } from '@tanstack/react-query';
import axios from 'axios';
+import { useConnectWallet } from 'hooks/useConnectWallet';
const Form = ({ walletId, setWalletId }) => {
const [tokenAmount, setTokenAmount] = useState('');
@@ -25,6 +25,8 @@ const Form = ({ walletId, setWalletId }) => {
useLockBodyScroll(successful);
const [showPopup, setShowPopup] = useState(false);
+ const connectWalletMutation = useConnectWallet(setWalletId);
+
const { data: positionData, refetch: refetchPosition } = useQuery({
queryKey: ['hasOpenPosition', walletId],
queryFn: async () => {
@@ -37,32 +39,19 @@ const Form = ({ walletId, setWalletId }) => {
enabled: !!walletId,
});
- const connectWalletHandler = async () => {
- try {
- setError(null);
- const address = await connectWallet();
- if (address) {
- setWalletId(address);
- console.log('Wallet successfully connected. Address:', address);
- return address;
- } else {
- setError('Failed to connect wallet. Please try again.');
- console.error('Wallet connection flag is false after enabling');
- }
- } catch (error) {
- console.error('Wallet connection failed:', error);
- setError('Failed to connect wallet. Please try again.');
- }
- return null;
+ const connectWalletHandler = () => {
+ connectWalletMutation.mutate();
};
+
const handleSubmit = async (e) => {
e.preventDefault();
let connectedWalletId = walletId;
if (!connectedWalletId) {
- connectedWalletId = await connectWalletHandler();
- if (!connectedWalletId) return;
+ connectWalletHandler();
+ return;
}
+
await refetchPosition();
if (positionData?.has_opened_position) {
setShowPopup(true);
@@ -95,51 +84,46 @@ const Form = ({ walletId, setWalletId }) => {
return (
-
);
};
diff --git a/frontend/src/pages/spotnet/dont_miss/DontMiss.jsx b/frontend/src/pages/spotnet/dont_miss/DontMiss.jsx
index 0d008626..dabd57e7 100644
--- a/frontend/src/pages/spotnet/dont_miss/DontMiss.jsx
+++ b/frontend/src/pages/spotnet/dont_miss/DontMiss.jsx
@@ -4,7 +4,7 @@ import { ReactComponent as Rocket } from 'assets/icons/rocket.svg';
import { ReactComponent as Hand } from 'assets/images/hand.svg';
import { ReactComponent as Star } from 'assets/particles/star.svg';
import { useNavigate } from 'react-router-dom';
-import { Notifier, notify } from 'components/Notifier/Notifier';
+import { notify } from 'components/Notifier/Notifier';
const DontMiss = ({ walletId }) => {
const navigate = useNavigate();
@@ -47,7 +47,6 @@ const DontMiss = ({ walletId }) => {
+
+ {error &&
+ {error}
} + setTokenAmount(e.target.value)} + className={error ? 'error' : ''} + /> +
+
+
+
+
+
+