fix: drop request when cancelled

radixdlt · Aug 11, 2023 · 40de5dc · 40de5dc
1 parent 6c15656
commit 40de5dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/examples/index.ts b/examples/index.ts
@@ -4,9 +4,9 @@ import { createLogger } from '../lib/helpers/logger'
 
 const sdk = WalletSdk({
   dAppDefinitionAddress:
-    'account_tdx_a_1qd5svul20u30qnq408zhj2tw5evqrunq48eg0jsjf9qsx5t8qu',
+    'account_tdx_d_12y9wptk69gxnfqrm4gepcu4apuscc8z4v5pvurfr3tcmtjl29a2wjn',
   logger: createLogger(1),
-  networkId: 12,
+  networkId: 13,
 })
 
 document.getElementById('open-popup-btn')!.onclick = async () => {

diff --git a/lib/connector-extension/connector-extension-client.ts b/lib/connector-extension/connector-extension-client.ts
@@ -107,7 +107,6 @@ export const ConnectorExtensionClient = (
       map((message) => {
         const error = createSdkError('canceledByUser', message.interactionId)
         logger?.debug(`🔵⬆️❌ walletRequestCanceled`, error)
-        cancelRequestSubject.next(err(error))
         return message
       })
     )
@@ -119,6 +118,12 @@ export const ConnectorExtensionClient = (
         metadata: walletInteraction.metadata,
       })
 
+      setTimeout(() => {
+        cancelRequestSubject.next(
+          err(createSdkError('canceledByUser', walletInteraction.interactionId))
+        )
+      })
+
       return ResultAsync.fromSafePromise(
         firstValueFrom(
           merge(