Fix same-chain tx ws cleanup

Author: ted-palmer

packages/sdk/src/utils/executeSteps/index.ts

@@ -281,7 +281,8 @@ export async function executeSteps(
                   stepItems,
                   onWebsocketFailed: statusControl.websocketActive
                     ? onWebsocketFailed
-                    : null
+                    : null,
+                  statusControl
                 })
                 break
               }

packages/sdk/src/utils/executeSteps/transactionStep.ts

@@ -24,7 +24,8 @@ export async function handleTransactionStepItem({
   isAtomicBatchSupported,
   incompleteStepItemIndex,
   stepItems,
-  onWebsocketFailed
+  onWebsocketFailed,
+  statusControl
 }: {
   stepItem: TransactionStepItem
   step: Execute['steps'][0]
@@ -38,6 +39,7 @@ export async function handleTransactionStepItem({
   incompleteStepItemIndex: number
   stepItems: Execute['steps'][0]['items']
   onWebsocketFailed: (() => Promise<void>) | null
+  statusControl?: { lastKnownStatus?: string }
 }): Promise<void> {
   if (!stepItem.data) {
     throw `Step item is missing data`
@@ -131,6 +133,7 @@ export async function handleTransactionStepItem({
           details: json?.details
         })
       }
-    }
+    },
+    statusControl
   )
 }

packages/sdk/src/utils/executeSteps/websocketHandlers.ts

@@ -31,7 +31,7 @@ export function handleWebSocketUpdate({
   // Handle terminal states
   if (isTerminalStatus(data.status)) {
     client.log(
-      ['WebSocket received terminal status', data.status],
+      ['WebSocket received terminal status: ', data.status],
       LogLevel.Verbose
     )
     statusControl.closeWebSocket?.()

packages/sdk/src/utils/transaction.ts

@@ -51,7 +51,8 @@ export async function sendTransactionSafely(
   setReceipt?: (receipt: TransactionReceipt | SvmReceipt | SuiReceipt) => void,
   setCheckStatus?: (
     checkStatus: NonNullable<Execute['steps'][0]['items']>[0]['checkStatus']
-  ) => void
+  ) => void,
+  statusControl?: { lastKnownStatus?: string }
 ) {
   const client = getClient()
   try {
@@ -197,11 +198,8 @@ export async function sendTransactionSafely(
   const pollForConfirmation = async (receiptController?: AbortController) => {
     isValidating?.()
 
-    console.log('onWebsocketFailed', onWebsocketFailed)
-
     // If websocket is enabled, wait for it to fail before falling back to polling
     if (onWebsocketFailed) {
-      console.log('waiting for websocket to fail')
       try {
         await onWebsocketFailed()
         client.log(['WebSocket failed, starting polling'], LogLevel.Verbose)
@@ -214,8 +212,6 @@ export async function sendTransactionSafely(
       }
     }
 
-    client.log(['Polling for confirmation'], LogLevel.Verbose)
-
     // Start polling
     while (
       waitingForConfirmation &&
@@ -227,6 +223,8 @@ export async function sendTransactionSafely(
         return
       }
 
+      client.log(['Polling for confirmation'], LogLevel.Verbose)
+
       let res: AxiosResponse<any, any> | undefined
       if (check?.endpoint && !request?.data?.useExternalLiquidity) {
         let endpoint = check?.endpoint
@@ -437,6 +435,10 @@ export async function sendTransactionSafely(
         await confirmationPromise
       } else {
         waitingForConfirmation = false
+        // For same chain transactions, mark as complete to prevent WebSocket polling fallback
+        if (statusControl) {
+          statusControl.lastKnownStatus = 'success'
+        }
       }
     }