@rhea-finance/cross-chain-aggregation-dex 2.1.0 → 2.1.1

package/dist/index.mjs

@@ -28,6 +28,7 @@ function asSwapSdkError(error, stage) {
 
 // src/utils/orderStatus.ts
 function shouldPollSwapOrderStatus(input) {
+  if (String(input.reportRecordId ?? "").trim()) return true;
   const waitMode = input.waitFor ?? "submitted";
   const requiresOrderStatus = input.isCrossChain || input.confidentiality === "basic";
   return requiresOrderStatus && waitMode !== "submitted";
@@ -2584,16 +2585,12 @@ var SwapClient = class {
         });
       }
       const waitMode = input.waitFor ?? "submitted";
-      const shouldPollOrderStatus = shouldPollSwapOrderStatus({
-        waitFor: waitMode,
-        isCrossChain: build.isCrossChain,
-        confidentiality: build.request?.confidentiality
-      });
+      const requiresTrackedStatus = build.isCrossChain || build.request?.confidentiality === "basic";
       const reportRequest = this.createReportRequest(build, result);
       if (reportRequest) {
         this.reportRequests.set(build.executionId, reportRequest);
       }
-      const mustReportForStatus = shouldPollOrderStatus && Boolean(reportRequest);
+      const mustReportForStatus = requiresTrackedStatus && waitMode !== "submitted" && Boolean(reportRequest);
       const shouldReportNow = Boolean(reportRequest) && this.reportMode !== "disabled" && (this.reportMode === "auto" || mustReportForStatus);
       let reportRecordId;
       if (shouldReportNow && reportRequest) {
@@ -2616,6 +2613,12 @@ var SwapClient = class {
           emit({ type: "warning", executionId: build.executionId, warning });
         }
       }
+      const shouldPollOrderStatus = shouldPollSwapOrderStatus({
+        waitFor: waitMode,
+        isCrossChain: build.isCrossChain,
+        confidentiality: build.request?.confidentiality,
+        reportRecordId
+      });
       const statusLookup = resolveOrderStatusLookup({
         recordId: reportRecordId ?? result.report?.recordId,
         orderId,