@huma-finance/widgets 0.0.75-beta.981 → 0.0.75-beta.984

package/dist/index.js

@@ -1,6 +1,6 @@
-var dk = Object.defineProperty;
-var pk = (ar, or, ur) => or in ar ? dk(ar, or, { enumerable: !0, configurable: !0, writable: !0, value: ur }) : ar[or] = ur;
-var Aa = (ar, or, ur) => pk(ar, typeof or != "symbol" ? or + "" : or, ur);
+var p8 = Object.defineProperty;
+var h8 = (ar, or, ur) => or in ar ? p8(ar, or, { enumerable: !0, configurable: !0, writable: !0, value: ur }) : ar[or] = ur;
+var Aa = (ar, or, ur) => h8(ar, typeof or != "symbol" ? or + "" : or, ur);
 import * as React from "react";
 import React__default, { forwardRef, useContext, Children, isValidElement, cloneElement, useState, useEffect, useRef, createElement, createContext, useReducer, useDebugValue, useCallback, useMemo, useLayoutEffect } from "react";
 import { txAtom, useMQ, LoggingContextHelper, sendTxAtom, usePoolUnderlyingTokenContract, useMount, usePoolInfo, useAccountStats, usePoolInfoV2, usePoolUnderlyingTokenInfoV2, usePoolSafeAllowanceV2, useAuthErrorHandling, checkIsDev, useCLFeeManager, useCLPoolAllowance, usePoolContract, useCreditContractV2, useCreditStatsV2, useForceRefresh, useHumaProgram, useBorrowerAccounts, useFirstLossCoverContractV2, useFirstLossCoverRequirementV2, useFirstLossCoverAllowanceV2, useFeeManager, useInvoiceNFTContract, useRFPoolAllowance, useLenderDepositRecordV2, useLPConfigV2, useNextEpochStartTimeV2, useTrancheVaultContractV2, useCancellableRedemptionInfoV2, useTrancheMintAccounts, useTrancheTokenAccounts, useLenderAccounts, notEnabledAutoRedeem, getLenderLockupDates, AUTH_ERROR_TYPE, useChainInfo, useTokenAccount, StellarConnectionContext, getClientCommonParams, useStellarLender, useStellarTokenBalance, useParamsSearch, usePoolAllowance, useLenderApproved, useLenderPosition, useWithdrawlLockoutInSeconds, usePoolUnderlyingTokenBalance, usePoolUnderlyingTokenBalanceV2, useLenderApprovedV2, useTrancheVaultAssetsV2, useLastDepositTime, usePoolBalance, useReceivableInfoV2, useReceivableContractV2, useERC2612Permit, useMultiSendContract, useFactoring, fetchStellarPoolSentinel, useStellarBorrower } from "@huma-finance/web-shared";
@@ -19083,11 +19083,11 @@ See https://reactjs.org/link/refs-must-have-owner for more information.`);
           var Fg = uu(Bv, iu, np, qp.value, Uu);
           Fg !== null && (Or && Fg.alternate !== null && Bv.delete(Fg.key === null ? np : Fg.key), vp = Li(Fg, vp, np), wl === null ? nd = Fg : wl.sibling = Fg, wl = Fg);
         }
-        if (Or && Bv.forEach(function(fk) {
-          return $r(iu, fk);
+        if (Or && Bv.forEach(function(d8) {
+          return $r(iu, d8);
         }), Yd()) {
-          var lk = np;
-          _A(iu, lk);
+          var f8 = np;
+          _A(iu, f8);
         }
         return nd;
       }
@@ -19535,9 +19535,9 @@ Incoming: %s`, Tu, "[" + $r.join(", ") + "]", "[" + Or.join(", ") + "]");
       }
       return [Io, Li];
     }
-    function hk(Or, $r, ti) {
+    function y8(Or, $r, ti) {
     }
-    function yk(Or, $r, ti) {
+    function g8(Or, $r, ti) {
     }
     function US(Or, $r, ti) {
       var di = Fl, Si = Pg(), Li, oo = Yd();
@@ -24947,7 +24947,7 @@ Check the render method of %s.`, Lu(Ro) || "Unknown"));
       }
       return Or == null ? null : Or.nodeType === ol ? Or : D4(Or, "findDOMNode");
     }
-    function ek(Or, $r, ti) {
+    function e8(Or, $r, ti) {
       if (dr("ReactDOM.hydrate is no longer supported in React 18. Use hydrateRoot instead. Until you switch to the new API, your app will behave as if it's running React 17. Learn more: https://reactjs.org/link/switch-to-createroot"), !xv($r))
         throw new Error("Target container is not a DOM element.");
       {
@@ -24956,7 +24956,7 @@ Check the render method of %s.`, Lu(Ro) || "Unknown"));
       }
       return u2(null, Or, $r, !0, ti);
     }
-    function tk(Or, $r, ti) {
+    function t8(Or, $r, ti) {
       if (dr("ReactDOM.render is no longer supported in React 18. Use createRoot instead. Until you switch to the new API, your app will behave as if it's running React 17. Learn more: https://reactjs.org/link/switch-to-createroot"), !xv($r))
         throw new Error("Target container is not a DOM element.");
       {
@@ -24965,14 +24965,14 @@ Check the render method of %s.`, Lu(Ro) || "Unknown"));
       }
       return u2(null, Or, $r, !1, ti);
     }
-    function rk(Or, $r, ti, di) {
+    function r8(Or, $r, ti, di) {
       if (dr("ReactDOM.unstable_renderSubtreeIntoContainer() is no longer supported in React 18. Consider using a portal instead. Until you switch to the createRoot API, your app will behave as if it's running React 17. Learn more: https://reactjs.org/link/switch-to-createroot"), !xv(ti))
         throw new Error("Target container is not a DOM element.");
       if (Or == null || !sg(Or))
         throw new Error("parentComponent must be a valid React Component");
       return u2(Or, $r, ti, !1, di);
     }
-    function nk(Or) {
+    function n8(Or) {
       if (!xv(Or))
         throw new Error("unmountComponentAtNode(...): Target container is not a DOM element.");
       {
@@ -25000,14 +25000,14 @@ Check the render method of %s.`, Lu(Ro) || "Unknown"));
     hp(L4), fc(F4), aA(U4), um(Ll), cm(iA), (typeof Map != "function" || // $FlowIssue Flow incorrectly thinks Map has no prototype
     Map.prototype == null || typeof Map.prototype.forEach != "function" || typeof Set != "function" || // $FlowIssue Flow incorrectly thinks Set has no prototype
     Set.prototype == null || typeof Set.prototype.clear != "function" || typeof Set.prototype.forEach != "function") && dr("React depends on Map and Set built-in types. Make sure that you load a polyfill in older browsers. https://reactjs.org/link/react-polyfills"), wy(q2), hb(LI, GR, Pm);
-    function ik(Or, $r) {
+    function i8(Or, $r) {
       var ti = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
       if (!s2($r))
         throw new Error("Target container is not a DOM element.");
       return N4(Or, $r, null, ti);
     }
-    function ok(Or, $r, ti, di) {
-      return rk(Or, $r, ti, di);
+    function o8(Or, $r, ti, di) {
+      return r8(Or, $r, ti, di);
     }
     var sT = {
       usingClientEntryPoint: !1,
@@ -25015,27 +25015,27 @@ Check the render method of %s.`, Lu(Ro) || "Unknown"));
       // This is an array for better minification.
       Events: [wu, Iu, ku, sh, $m, LI]
     };
-    function ak(Or, $r) {
+    function a8(Or, $r) {
       return sT.usingClientEntryPoint || dr('You are importing createRoot from "react-dom" which is not supported. You should instead import it from "react-dom/client".'), G4(Or, $r);
     }
-    function sk(Or, $r, ti) {
+    function s8(Or, $r, ti) {
       return sT.usingClientEntryPoint || dr('You are importing hydrateRoot from "react-dom" which is not supported. You should instead import it from "react-dom/client".'), W4(Or, $r, ti);
     }
-    function uk(Or) {
+    function c8(Or) {
       return K3() && dr("flushSync was called from inside a lifecycle method. React cannot flush when React is already rendering. Consider moving this call to a scheduler task or micro task."), Pm(Or);
     }
-    var ck = H4({
+    var l8 = H4({
       findFiberByHostInstance: Qs,
       bundleType: 1,
       version: eT,
       rendererPackageName: "react-dom"
     });
-    if (!ck && mi && window.top === window.self && (navigator.userAgent.indexOf("Chrome") > -1 && navigator.userAgent.indexOf("Edge") === -1 || navigator.userAgent.indexOf("Firefox") > -1)) {
+    if (!l8 && mi && window.top === window.self && (navigator.userAgent.indexOf("Chrome") > -1 && navigator.userAgent.indexOf("Edge") === -1 || navigator.userAgent.indexOf("Firefox") > -1)) {
       var Lx = window.location.protocol;
       /^(https?|file):$/.test(Lx) && console.info("%cDownload the React DevTools for a better development experience: https://reactjs.org/link/react-devtools" + (Lx === "file:" ? `
 You might need to use a local HTTP server (instead of file://): https://reactjs.org/link/react-devtools-faq` : ""), "font-weight:bold");
     }
-    reactDom_development.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = sT, reactDom_development.createPortal = ik, reactDom_development.createRoot = ak, reactDom_development.findDOMNode = X4, reactDom_development.flushSync = uk, reactDom_development.hydrate = ek, reactDom_development.hydrateRoot = sk, reactDom_development.render = tk, reactDom_development.unmountComponentAtNode = nk, reactDom_development.unstable_batchedUpdates = LI, reactDom_development.unstable_renderSubtreeIntoContainer = ok, reactDom_development.version = eT, typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ < "u" && typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop == "function" && __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop(new Error());
+    reactDom_development.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = sT, reactDom_development.createPortal = i8, reactDom_development.createRoot = a8, reactDom_development.findDOMNode = X4, reactDom_development.flushSync = c8, reactDom_development.hydrate = e8, reactDom_development.hydrateRoot = s8, reactDom_development.render = t8, reactDom_development.unmountComponentAtNode = n8, reactDom_development.unstable_batchedUpdates = LI, reactDom_development.unstable_renderSubtreeIntoContainer = o8, reactDom_development.version = eT, typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ < "u" && typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop == "function" && __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop(new Error());
   }()), reactDom_development;
 }
 var hasRequiredReactDom;
@@ -145634,52 +145634,36 @@ function extractWritableAccounts(ar) {
   }), Array.from(or);
 }
 async function getPriorityFeeEstimate(ar, or, ur, cr, fr) {
-  if (!fr)
-    return null;
-  const lr = cr === SolanaChainEnum.SolanaMainnet ? `https://mainnet.helius-rpc.com/?api-key=${fr}` : `https://devnet.helius-rpc.com/?api-key=${fr}`;
-  try {
-    return (await (await fetch(lr, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        jsonrpc: "2.0",
-        id: "1",
-        method: "getPriorityFeeEstimate",
-        params: [
-          {
-            accountKeys: ur,
-            options: {
-              priorityLevel: ar,
-              evaluateEmptySlotAsZero: !0
-            }
-          }
-        ]
-      })
-    })).json()).result;
-  } catch (dr) {
-    return console.warn(dr), null;
-  }
+  return null;
+}
+function isSetComputeLimitInstruction(ar) {
+  return ar.programId.equals(ComputeBudgetProgram$1.programId) && ar.data[0] === 2;
 }
 async function buildOptimalTransactionImpl(ar, or, ur, cr, fr, lr = "Medium", dr) {
-  const pr = [
-    ComputeBudgetProgram$1.setComputeUnitLimit({ units: 14e5 }),
-    ...ar.instructions
-  ], hr = new VersionedTransaction(new TransactionMessage({
-    instructions: pr,
-    payerKey: fr,
-    recentBlockhash: (await ur.getLatestBlockhash()).blockhash
-  }).compileToV0Message([])), Ar = await ur.simulateTransaction(hr, {
-    replaceRecentBlockhash: !0,
-    sigVerify: !1
-  }), { unitsConsumed: gr } = Ar.value;
-  gr && ar.instructions.unshift(ComputeBudgetProgram$1.setComputeUnitLimit({ units: gr * 1.2 }));
-  const yr = await getPriorityFeeEstimate(lr, ar, or, cr, dr), Sr = yr == null ? void 0 : yr.priorityFeeEstimate, Ir = Sr ?? 5e5;
+  let pr;
+  if (ar.instructions.findIndex(isSetComputeLimitInstruction) === -1) {
+    const Sr = [
+      ComputeBudgetProgram$1.setComputeUnitLimit({ units: 14e5 }),
+      ...ar.instructions
+    ], Ir = new VersionedTransaction(new TransactionMessage({
+      instructions: Sr,
+      payerKey: fr,
+      recentBlockhash: (await ur.getLatestBlockhash()).blockhash
+    }).compileToV0Message([]));
+    pr = (await ur.simulateTransaction(Ir, {
+      replaceRecentBlockhash: !0,
+      sigVerify: !1
+    })).value.unitsConsumed, pr && ar.instructions.unshift(ComputeBudgetProgram$1.setComputeUnitLimit({
+      units: pr * 1.2
+    }));
+  }
+  const Ar = await getPriorityFeeEstimate(), gr = Ar == null ? void 0 : Ar.priorityFeeEstimate, yr = gr ?? 5e5;
   return ar.instructions.unshift(ComputeBudgetProgram$1.setComputeUnitPrice({
-    microLamports: Ir
-  })), ar;
+    microLamports: yr
+  })), { tx: ar, unitsConsumed: pr, fee: yr };
 }
 async function buildOptimalTransactionFromConnection(ar, or, ur, cr, fr, lr, dr) {
-  return buildOptimalTransactionImpl(ar, or, ur, cr, fr, lr, dr);
+  return buildOptimalTransactionImpl(ar, or, ur, cr, fr, lr);
 }
 function getRealWorldReceivableContract(ar, or) {
   var ur;
@@ -178136,39 +178120,43 @@ function SolanaTxSendModal({
           zr.instructions = [...or.instructions];
           const Vr = await hr.getLatestBlockhash("confirmed");
           zr.recentBlockhash = Vr.blockhash, zr.lastValidBlockHeight = Vr.lastValidBlockHeight, zr.feePayer = lr;
-          const Yr = extractWritableAccounts(zr), Dr = await buildOptimalTransactionFromConnection(
+          const Yr = extractWritableAccounts(zr), {
+            tx: Dr,
+            unitsConsumed: br,
+            fee: wr
+          } = await buildOptimalTransactionFromConnection(
             zr,
             Yr,
             hr,
             ar,
             lr,
             Ir ? "High" : void 0,
-            process$1.env.REACT_APP_HELIUS_API_KEY
+            void 0
           );
           Cr.logAction("SigningTransaction", {
-            priceData: Dr.instructions[0].data,
-            unitsData: Dr.instructions[1].data,
+            priorityFee: wr,
+            computeUnitLimit: br,
             recentBlockhash: Dr.recentBlockhash,
             lastValidBlockHeight: Dr.lastValidBlockHeight
           });
-          const br = await dr(Dr);
+          const Er = await dr(Dr);
           Cr.logAction("SendingTransaction", {});
-          const wr = await hr.sendRawTransaction(
-            br.serialize(),
+          const Tr = await hr.sendRawTransaction(
+            Er.serialize(),
             {
               preflightCommitment: "confirmed",
               skipPreflight: !0,
               maxRetries: 0
             }
           );
-          for (gr(wr), fr(setSolanaSignature(wr)); ; ) {
-            const Er = await hr.getSignatureStatus(wr, {
+          for (gr(Tr), fr(setSolanaSignature(Tr)); ; ) {
+            const Rr = await hr.getSignatureStatus(Tr, {
               searchTransactionHistory: !0
             });
-            if (((qr = Er == null ? void 0 : Er.value) == null ? void 0 : qr.confirmationStatus) === "finalized" || ((Hr = Er == null ? void 0 : Er.value) == null ? void 0 : Hr.confirmationStatus) === "confirmed") {
-              if ((Jr = Er == null ? void 0 : Er.value) != null && Jr.err) {
+            if (((qr = Rr == null ? void 0 : Rr.value) == null ? void 0 : qr.confirmationStatus) === "finalized" || ((Hr = Rr == null ? void 0 : Rr.value) == null ? void 0 : Hr.confirmationStatus) === "confirmed") {
+              if ((Jr = Rr == null ? void 0 : Rr.value) != null && Jr.err) {
                 Cr.logAction("TransactionError", {
-                  signature: wr
+                  signature: Tr
                 }), fr(
                   setError({
                     errorMessage: "Your transaction was confirmed but had errors. Please check the transaction details on the explorer for more information."
@@ -178177,15 +178165,15 @@ function SolanaTxSendModal({
                 return;
               }
               Cr.logAction("TransactionSuccess", {
-                signature: wr
-              }), ur({ signature: wr });
+                signature: Tr
+              }), ur({ signature: Tr });
               return;
             }
             if ((await hr.getLatestBlockhash(
               "confirmed"
             )).lastValidBlockHeight - Dr.lastValidBlockHeight > 100) {
               Cr.logAction("ShowRetryScreenDueToExpiration", {
-                signature: wr
+                signature: Tr
               }), Sr(!0);
               return;
             }
@@ -182494,8 +182482,10 @@ function Transfer$a({
       if (!dr || gr || Mr || qr)
         return;
       const Vr = new Transaction$3(), { underlyingTokenATA: Yr, seniorTrancheATA: Dr, juniorTrancheATA: br } = getTokenAccounts(ar, dr), wr = ur === "senior" ? Ir : Sr;
+      let Er = !1;
       if (ur === "senior" && !xr || ur === "junior" && !Cr) {
-        const Nr = await Hr.methods.createLenderAccounts().accountsPartial({
+        Er = !0;
+        const Fr = await Hr.methods.createLenderAccounts().accountsPartial({
           lender: dr,
           humaConfig: ar.humaConfig,
           poolConfig: ar.poolConfig,
@@ -182504,13 +182494,13 @@ function Transfer$a({
           lenderTrancheToken: ur === "senior" ? Dr : br,
           tokenProgram: TOKEN_2022_PROGRAM_ID
         }).transaction();
-        Vr.add(Nr);
+        Vr.add(Fr);
       }
-      const Er = convertToShares(
+      const Tr = convertToShares(
         BigInt(ur === "senior" ? or.seniorTrancheAssets ?? 0 : or.juniorTrancheAssets ?? 0),
         BigInt(ur === "senior" ? (Br == null ? void 0 : Br.toString()) ?? 0 : (Pr == null ? void 0 : Pr.toString()) ?? 0),
         BigInt(Ar.toString())
-      ), Tr = convertToShares(
+      ), Rr = convertToShares(
         BigInt(ur === "senior" ? or.seniorTrancheAssets ?? 0 : or.juniorTrancheAssets ?? 0),
         BigInt(ur === "senior" ? (Br == null ? void 0 : Br.toString()) ?? 0 : (Pr == null ? void 0 : Pr.toString()) ?? 0),
         BigInt(ur === "senior" ? (Ur == null ? void 0 : Ur.amount.toString()) ?? "0" : (Qr == null ? void 0 : Qr.amount.toString()) ?? "0")
@@ -182525,7 +182515,7 @@ function Transfer$a({
           // delegate
           dr,
           // owner of the wallet
-          Er * BigInt(11) / BigInt(10) + Tr,
+          Tr * BigInt(11) / BigInt(10) + Rr,
           // amount
           ar.trancheDecimals,
           void 0,
@@ -182533,7 +182523,7 @@ function Transfer$a({
           TOKEN_2022_PROGRAM_ID
         )
       );
-      const Rr = await Hr.methods.deposit(Ar).accountsPartial({
+      const Nr = await Hr.methods.deposit(Ar).accountsPartial({
         approvedLender: wr,
         depositor: dr,
         poolConfig: ar.poolConfig,
@@ -182545,7 +182535,11 @@ function Transfer$a({
         humaConfig: ar.humaConfig,
         underlyingTokenProgram: TOKEN_PROGRAM_ID
       }).transaction();
-      Vr.add(Rr), yr(Vr);
+      Vr.add(Nr), Vr.instructions.unshift(
+        ComputeBudgetProgram$1.setComputeUnitLimit({
+          units: Er ? 15e4 : 8e4
+        })
+      ), yr(Vr);
     }
     zr();
   }, [
@@ -182889,7 +182883,11 @@ function Transfer$9({
           lenderUnderlyingToken: Sr,
           tokenProgram: TOKEN_PROGRAM_ID
         }).transaction();
-        yr.add(Pr);
+        yr.add(Pr), yr.instructions.unshift(
+          ComputeBudgetProgram$1.setComputeUnitLimit({
+            units: 6e4
+          })
+        );
       }
       hr(yr);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.75-beta.981+a3e08e0",
+  "version": "0.0.75-beta.984+6489f74",
   "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.75-beta.981+a3e08e0",
-    "@huma-finance/shared": "^0.0.75-beta.981+a3e08e0",
-    "@huma-finance/web-shared": "^0.0.75-beta.981+a3e08e0",
+    "@huma-finance/sdk": "^0.0.75-beta.984+6489f74",
+    "@huma-finance/shared": "^0.0.75-beta.984+6489f74",
+    "@huma-finance/web-shared": "^0.0.75-beta.984+6489f74",
     "@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": "a3e08e02260985afd93671044fb6f3154d2b3d6f"
+  "gitHead": "6489f7486bb63b2bc021539cd339260b601e1c49"
 }

package/src/components/Lend/solanaSupply/6-Transfer.tsx

@@ -20,7 +20,7 @@ import {
   TOKEN_PROGRAM_ID,
 } from '@solana/spl-token'
 import { useWallet } from '@solana/wallet-adapter-react'
-import { PublicKey, Transaction } from '@solana/web3.js'
+import { ComputeBudgetProgram, PublicKey, Transaction } from '@solana/web3.js'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
 import { setPointsAccumulated, setStep } from '../../../store/widgets.reducers'
@@ -119,10 +119,12 @@ export function Transfer({
           ? seniorLenderApprovedAccountPDA!
           : juniorLenderApprovedAccountPDA!
 
+      let createdLenderAccounts = false
       if (
         (selectedTranche === 'senior' && !seniorLenderStateAccount) ||
         (selectedTranche === 'junior' && !juniorLenderStateAccount)
       ) {
+        createdLenderAccounts = true
         const createLenderAccountsTx = await program.methods
           .createLenderAccounts()
           .accountsPartial({
@@ -203,6 +205,14 @@ export function Transfer({
         .transaction()
       tx.add(depositTx)
 
+      // Hardcode the limit here due to a race condition where CreateLenderAccounts aren't available
+      // when simulating the Deposit instruction, so simulated transaction CUs are not computed correctly
+      tx.instructions.unshift(
+        ComputeBudgetProgram.setComputeUnitLimit({
+          units: createdLenderAccounts ? 150_000 : 80_000,
+        }),
+      )
+
       setTransaction(tx)
     }
     getTx()

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

@@ -14,7 +14,7 @@ import {
   TokenInvalidAccountOwnerError,
 } from '@solana/spl-token'
 import { useConnection, useWallet } from '@solana/wallet-adapter-react'
-import { PublicKey, Transaction } from '@solana/web3.js'
+import { ComputeBudgetProgram, PublicKey, Transaction } from '@solana/web3.js'
 import React, { useCallback, useEffect, useState } from 'react'
 import useLogOnFirstMount from '../../../hooks/useLogOnFirstMount'
 import { useAppDispatch } from '../../../hooks/useRedux'
@@ -102,6 +102,12 @@ export function Transfer({
           })
           .transaction()
         tx.add(disburseTx)
+
+        tx.instructions.unshift(
+          ComputeBudgetProgram.setComputeUnitLimit({
+            units: 60_000,
+          }),
+        )
       } else {
         const withdrawAfterPoolClosureTx = await program.methods
           .withdrawAfterPoolClosure()

package/src/components/SolanaTxSendModal.tsx

@@ -91,18 +91,22 @@ export function SolanaTxSendModal({
         // Extract writable accounts
         const txAccounts = extractWritableAccounts(txCopy)
         // Add on compute unit limit + price instructions
-        const optimizedTx = await buildOptimalTransactionFromConnection(
+        const {
+          tx: optimizedTx,
+          unitsConsumed,
+          fee,
+        } = await buildOptimalTransactionFromConnection(
           txCopy,
           txAccounts,
           connection,
           chainId,
           publicKey,
           useHighPriority ? 'High' : undefined,
-          process.env.REACT_APP_HELIUS_API_KEY,
+          import.meta.env.REACT_APP_HELIUS_API_KEY,
         )
         loggingHelper.logAction('SigningTransaction', {
-          priceData: optimizedTx.instructions[0].data,
-          unitsData: optimizedTx.instructions[1].data,
+          priorityFee: fee,
+          computeUnitLimit: unitsConsumed,
           recentBlockhash: optimizedTx.recentBlockhash,
           lastValidBlockHeight: optimizedTx.lastValidBlockHeight,
         })