refactor: use outgoingMessageSubject

radixdlt · Nov 1, 2023 · 7028b54 · 7028b54
1 parent 0ea82b7
commit 7028b54
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/lib/connector-extension/connector-extension-client.ts b/lib/connector-extension/connector-extension-client.ts
@@ -213,32 +213,33 @@ export const ConnectorExtensionClient = (
       removeEventListener(eventType.incomingMessage, handleIncomingMessage)
     },
     openPopup: () => {
-      window.dispatchEvent(
-        new CustomEvent(eventType.outgoingMessage, {
-          detail: { discriminator: 'openPopup' },
-        })
-      )
+      subjects.outgoingMessageSubject.next({
+        interactionId: crypto.randomUUID(),
+        discriminator: 'openPopup',
+      })
     },
     extensionStatus$: of(true).pipe(
-      tap(() => {
+      map(() => {
+        const interactionId = crypto.randomUUID()
         subjects.outgoingMessageSubject.next({
-          interactionId: crypto.randomUUID(),
+          interactionId,
           discriminator: 'extensionStatus',
         })
+        return interactionId
       }),
-      switchMap(() =>
+      switchMap((interactionId) =>
         race(
           extensionStatusEvent$,
           merge(
             extensionStatusEvent$,
             timer(config.extensionDetectionTime).pipe(
               map(
-                () =>
-                  ({
-                    eventType: 'extensionStatus',
-                    isWalletLinked: false,
-                    isExtensionAvailable: false,
-                  } as MessageLifeCycleExtensionStatusEvent)
+                (): MessageLifeCycleExtensionStatusEvent => ({
+                  interactionId,
+                  eventType: 'extensionStatus',
+                  isWalletLinked: false,
+                  isExtensionAvailable: false,
+                })
               )
             )
           )

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "vite-tsconfig-paths": "^4.2.0"
   },
   "dependencies": {
-    "@radixdlt/radix-connect-schemas": "^1.0.0",
+    "@radixdlt/radix-connect-schemas": "^1.1.0",
     "neverthrow": "^6.0.0",
     "rxjs": "^7.8.1",
     "tslog": "4.8.0",