@huma-finance/widgets 0.0.73-beta.919 → 0.0.73-beta.922

package/dist/cjs/index.cjs

@@ -3927,51 +3927,33 @@ function SolanaTxSendModal(_ref) {
       if (!connection || !tx || !publicKey || !signTransaction) {
         return;
       }
-      let signatureResult = '';
       try {
-        var _txResult$meta;
         // Optimize transaction
         // Make a copy of the tx so we can use the original tx for retries
         const txCopy = new web3_js.Transaction();
         txCopy.instructions = [...tx.instructions];
-        const recentBlockhash = await connection.getLatestBlockhash('confirmed');
-        txCopy.recentBlockhash = recentBlockhash.blockhash;
-        txCopy.lastValidBlockHeight = recentBlockhash.lastValidBlockHeight;
+        const txBlockhashData = await connection.getLatestBlockhash('confirmed');
+        txCopy.recentBlockhash = txBlockhashData.blockhash;
+        txCopy.lastValidBlockHeight = txBlockhashData.lastValidBlockHeight;
         txCopy.feePayer = publicKey;
         // Extract writable accounts
         const txAccounts = sdk.extractWritableAccounts(txCopy);
         // Add on compute unit limit + price instructions
         const optimizedTx = await sdk.buildOptimalTransactionFromConnection(txCopy, txAccounts, connection, chainId, publicKey, useHighPriority ? 'High' : undefined, process.env.REACT_APP_HELIUS_API_KEY);
-        signatureResult = await sendTransaction(optimizedTx, connection, {
+        const signedTx = await signTransaction(optimizedTx);
+        const signatureResult = await connection.sendRawTransaction(signedTx.serialize(), {
           preflightCommitment: 'confirmed',
-          skipPreflight: true
+          skipPreflight: true,
+          maxRetries: 0
         });
         setSignature(signatureResult);
         dispatch(setSolanaSignature(signatureResult));
-        await connection.confirmTransaction({
-          blockhash: optimizedTx.recentBlockhash,
-          lastValidBlockHeight: optimizedTx.lastValidBlockHeight,
-          signature: signatureResult
-        });
-        const txResult = await connection.getParsedTransaction(signatureResult, 'confirmed');
-        if (txResult !== null && txResult !== void 0 && (_txResult$meta = txResult.meta) !== null && _txResult$meta !== void 0 && _txResult$meta.err) {
-          dispatch(setError({
-            errorMessage: 'Your transaction was confirmed but had errors. Please check the transaction details on the explorer for more information.'
-          }));
-          return;
-        }
-        handleSuccess({
-          signature: signatureResult
-        });
-      } catch (error) {
-        var _err$message;
-        console.log(error);
-        let signatureStatusRetries = 0;
-        while (signatureStatusRetries < 5) {
+
+        // Loop and poll the transaction continuously until it is either confirmed or
+        // the block height has been exceeded
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
           var _result$value, _result$value2;
-          // Attempt to load the signature status using transaction history
-          // eslint-disable-next-line no-await-in-loop
-          await shared.sleep(1000);
           // eslint-disable-next-line no-await-in-loop
           const result = await connection.getSignatureStatus(signatureResult, {
             searchTransactionHistory: true
@@ -3989,17 +3971,23 @@ function SolanaTxSendModal(_ref) {
             });
             return;
           }
-          signatureStatusRetries += 1;
+
+          // eslint-disable-next-line no-await-in-loop
+          const latestBlockhash = await connection.getLatestBlockhash('confirmed');
+          if (latestBlockhash.lastValidBlockHeight - optimizedTx.lastValidBlockHeight > 100) {
+            setShowRetryScreen(true);
+            return;
+          }
+
+          // eslint-disable-next-line no-await-in-loop
+          await shared.sleep(1000);
         }
+      } catch (error) {
+        console.log(error);
         const err = error;
-        if (err !== null && err !== void 0 && (_err$message = err.message) !== null && _err$message !== void 0 && _err$message.includes('block height exceeded')) {
-          // Allow the user to retry the transaction
-          setShowRetryScreen(true);
-        } else {
-          dispatch(setError({
-            errorMessage: (err === null || err === void 0 ? void 0 : err.message) || ''
-          }));
-        }
+        dispatch(setError({
+          errorMessage: (err === null || err === void 0 ? void 0 : err.message) || ''
+        }));
       }
     }
     sendTx();