fix ata creation for withdrawl

pyth-network · Nov 29, 2023 · d19784b · d19784b
1 parent e7140f9
commit d19784b
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/components/TokenBalance/TokenDeposit.tsx b/components/TokenBalance/TokenDeposit.tsx
@@ -42,6 +42,7 @@ import queryClient from '@hooks/queries/queryClient'
 import { proposalQueryKeys } from '@hooks/queries/proposal'
 import asFindable from '@utils/queries/asFindable'
 import VanillaVotingPower from '@components/GovernancePower/Vanilla/VanillaVotingPower'
+import { fetchTokenAccountByPubkey } from '@hooks/queries/tokenAccount'
 
 export const TokenDeposit = ({
   mint,
@@ -191,15 +192,26 @@ export const TokenDeposit = ({
         )
       }
     }
-    let ata: PublicKey | null = null
-    if (!depositTokenAccount) {
-      ata = await Token.getAssociatedTokenAddress(
+
+    const ataPk = await Token.getAssociatedTokenAddress(
+      ASSOCIATED_TOKEN_PROGRAM_ID,
+      TOKEN_PROGRAM_ID,
+      depositMint!,
+      wallet!.publicKey!,
+      true
+    )
+    const ata = await fetchTokenAccountByPubkey(connection, ataPk)
+
+    if (!ata.found) {
+      const ataIx = Token.createAssociatedTokenAccountInstruction(
         ASSOCIATED_TOKEN_PROGRAM_ID,
         TOKEN_PROGRAM_ID,
         depositMint!,
+        ataPk,
         wallet!.publicKey!,
-        true
+        wallet!.publicKey! // fee payer
       )
+      instructions.push(ataIx)
     }
 
     await withWithdrawGoverningTokens(
@@ -209,7 +221,7 @@ export const TokenDeposit = ({
       realm!.pubkey,
       depositTokenAccount?.publicKey
         ? depositTokenAccount!.publicKey
-        : new PublicKey(ata!),
+        : new PublicKey(ataPk),
       depositTokenRecord!.account.governingTokenMint,
       wallet!.publicKey!
     )