@huma-finance/widgets 0.0.73-beta.957 → 0.0.73-beta.963

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.73-beta.957+417f9f2",
+  "version": "0.0.73-beta.963+7ee8a9e",
   "publishConfig": {
     "access": "public"
   },
@@ -22,9 +22,9 @@
     "@ethersproject/contracts": "^5.7.0",
     "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/units": "^5.6.0",
-    "@huma-finance/sdk": "^0.0.73-beta.957+417f9f2",
-    "@huma-finance/shared": "^0.0.73-beta.957+417f9f2",
-    "@huma-finance/web-shared": "^0.0.73-beta.957+417f9f2",
+    "@huma-finance/sdk": "^0.0.73-beta.963+7ee8a9e",
+    "@huma-finance/shared": "^0.0.73-beta.963+7ee8a9e",
+    "@huma-finance/web-shared": "^0.0.73-beta.963+7ee8a9e",
     "@mui/x-date-pickers": "^5.0.7",
     "@notifi-network/notifi-frontend-client": "^1.1.2",
     "@notifi-network/notifi-react": "^1.1.2",
@@ -190,5 +190,5 @@
   "optionalDependencies": {
     "encoding": "^0.1.13"
   },
-  "gitHead": "417f9f299470922914f89fd26b3bfe770764a26c"
+  "gitHead": "7ee8a9ee4711ce7a4a9542c704b1451eec255a31"
 }

package/src/components/Lend/solanaWithdraw/2-Transfer.tsx

@@ -4,15 +4,23 @@ import {
   TrancheType,
 } from '@huma-finance/shared'
 import { useHumaProgram } from '@huma-finance/web-shared'
-import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { useWallet } from '@solana/wallet-adapter-react'
-import { Transaction } from '@solana/web3.js'
+import {
+  ASSOCIATED_TOKEN_PROGRAM_ID,
+  createAssociatedTokenAccountInstruction,
+  getAccount,
+  TOKEN_2022_PROGRAM_ID,
+  TOKEN_PROGRAM_ID,
+  TokenAccountNotFoundError,
+  TokenInvalidAccountOwnerError,
+} from '@solana/spl-token'
+import { useConnection, useWallet } from '@solana/wallet-adapter-react'
+import { PublicKey, Transaction } from '@solana/web3.js'
 import React, { useCallback, useEffect, useState } from 'react'
+import useLogOnFirstMount from '../../../hooks/useLogOnFirstMount'
 import { useAppDispatch } from '../../../hooks/useRedux'
 import { setStep } from '../../../store/widgets.reducers'
 import { WIDGET_STEP } from '../../../store/widgets.store'
 import { SolanaTxSendModal } from '../../SolanaTxSendModal'
-import useLogOnFirstMount from '../../../hooks/useLogOnFirstMount'
 
 type Props = {
   poolInfo: SolanaPoolInfo
@@ -28,12 +36,13 @@ export function Transfer({
   useLogOnFirstMount('Transaction')
   const { publicKey } = useWallet()
   const dispatch = useAppDispatch()
+  const { connection } = useConnection()
   const program = useHumaProgram(poolInfo.chainId)
   const [transaction, setTransaction] = useState<Transaction>()
 
   useEffect(() => {
     async function getTx() {
-      if (!publicKey || transaction) {
+      if (!publicKey || transaction || !connection) {
         return
       }
 
@@ -47,6 +56,37 @@ export function Transfer({
       const lenderTrancheToken =
         selectedTranche === 'senior' ? seniorTrancheATA : juniorTrancheATA
 
+      // Create user token account if it doesn't exist
+      try {
+        await getAccount(
+          connection,
+          underlyingTokenATA,
+          undefined,
+          TOKEN_PROGRAM_ID,
+        )
+      } catch (error: unknown) {
+        // TokenAccountNotFoundError can be possible if the associated address has already received some lamports,
+        // becoming a system account. Assuming program derived addressing is safe, this is the only case for the
+        // TokenInvalidAccountOwnerError in this code path.
+        // Source: https://solana.stackexchange.com/questions/802/checking-to-see-if-a-token-account-exists-using-anchor-ts
+        if (
+          error instanceof TokenAccountNotFoundError ||
+          error instanceof TokenInvalidAccountOwnerError
+        ) {
+          // As this isn't atomic, it's possible others can create associated accounts meanwhile.
+          tx.add(
+            createAssociatedTokenAccountInstruction(
+              publicKey,
+              underlyingTokenATA,
+              publicKey,
+              new PublicKey(poolInfo.underlyingMint.address),
+              TOKEN_PROGRAM_ID,
+              ASSOCIATED_TOKEN_PROGRAM_ID,
+            ),
+          )
+        }
+      }
+
       if (!poolIsClosed) {
         const disburseTx = await program.methods
           .disburse()
@@ -85,6 +125,7 @@ export function Transfer({
     }
     getTx()
   }, [
+    connection,
     poolInfo,
     poolIsClosed,
     program.methods,