Merge pull request #3 from RedDuck-Software/feat/game-page

feat: fix answer
RedDuck-Software · Jan 9, 2025 · 532b47a · 532b47a
2 parents 838fa5c + cb88ac2
commit 532b47a
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 19 deletions.
diff --git a/src/hooks/contracts/write/use-make-prediction.ts b/src/hooks/contracts/write/use-make-prediction.ts
@@ -1,44 +1,70 @@
 import { useWallet } from '@solana/wallet-adapter-react';
-import { Transaction, SystemProgram } from '@solana/web3.js';
+import { SystemProgram, Transaction } from '@solana/web3.js';
 import { useMutation } from '@tanstack/react-query';
 
 import { OwnerAddress } from '@/constants/addresses';
 import { env } from '@/env';
 import useSubmitTarotCards from '@/hooks/api/use-submit-cards';
 import { network } from '@/lib/solana';
 import { sendAndConfirmTransaction } from '@/lib/solana/utils';
-import { getRandomTarotCards, showTxToast } from '@/lib/utils';
+import { getRandomTarotCards } from '@/lib/utils';
+import { toast } from 'react-toastify';
+
+let toastId: string | number | null = null;
+
+const notify = () => {
+  toastId = toast('Making prediction...', {
+    autoClose: false,
+    closeOnClick: false,
+    draggable: false,
+    isLoading: true,
+    type: 'default',
+  });
+};
+
+const updateToast = () => {
+  if (toastId !== null) {
+    toast.update(toastId, {
+      render: 'Done!',
+      type: 'success',
+      autoClose: 3000,
+      isLoading: false,
+    });
+  }
+};
 
 const useMakePrediction = () => {
   const { publicKey, sendTransaction } = useWallet();
-  const { mutateAsync: submitCards, data: predictionAnswer } = useSubmitTarotCards();
+  const { mutateAsync: submitCards } = useSubmitTarotCards();
 
   return useMutation({
     async mutationFn(question: string) {
       if (!publicKey) {
         return;
       }
 
-      await showTxToast('Making prediction', async () => {
-        const rawTx = new Transaction();
+      notify();
+
+      const rawTx = new Transaction();
+
+      rawTx.add(
+        SystemProgram.transfer({
+          fromPubkey: publicKey,
+          toPubkey: OwnerAddress[network],
+          lamports: Number(env.VITE_DEPOSIT_AMOUNT_SOL) * 1e9,
+        }),
+      );
 
-        rawTx.add(
-          SystemProgram.transfer({
-            fromPubkey: publicKey,
-            toPubkey: OwnerAddress[network],
-            lamports: Number(env.VITE_DEPOSIT_AMOUNT_SOL) * 1e9,
-          }),
-        );
+      const txHash = await sendAndConfirmTransaction(publicKey, rawTx, sendTransaction);
+      console.log('txHash', txHash);
 
-        const txHash = await sendAndConfirmTransaction(publicKey, rawTx, sendTransaction);
-        console.log('txHash', txHash);
+      const tarots = getRandomTarotCards(txHash + publicKey.toBase58());
 
-        const tarots = getRandomTarotCards(txHash + publicKey.toBase58());
+      const result = await submitCards({ tarots, hash: txHash, question });
 
-        await submitCards({ tarots, hash: txHash, question });
-      });
+      updateToast();
 
-      return predictionAnswer;
+      return result?.response || '';
     },
 
     onError(error) {

diff --git a/src/pages/game-page.tsx b/src/pages/game-page.tsx
@@ -43,7 +43,7 @@ export default function GamePage() {
 
   useEffect(() => {
     if (predictionAnswer) {
-      setValue('question', predictionAnswer.response + '\n' + watch('question'));
+      setValue('question', predictionAnswer + '\n' + watch('question'));
     }
   }, [isSuccess, predictionAnswer, setValue, watch]);