fix: buy in progress interval being cleared prematurely (#1925)

reown-com · Feb 15, 2024 · 937edb0 · 937edb0
1 parent 334ad12
commit 937edb0
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/packages/scaffold/src/views/w3m-buy-in-progress-view/index.ts b/packages/scaffold/src/views/w3m-buy-in-progress-view/index.ts
@@ -170,13 +170,11 @@ export class W3mBuyInProgressView extends LitElement {
       tx => tx.metadata.status === 'ONRAMP_TRANSACTION_STATUS_IN_PROGRESS'
     )
 
-    if (this.intervalId) {
+    if (pendingTransactions.length && this.intervalId) {
       clearInterval(this.intervalId)
-    }
-
-    if (pendingTransactions.length) {
       RouterController.replace('OnRampActivity')
-    } else if (this.startTime && Date.now() - this.startTime >= 180_000) {
+    } else if (this.startTime && Date.now() - this.startTime >= 180_000 && this.intervalId) {
+      clearInterval(this.intervalId)
       this.error = true
     }
   }