refactor: move session change outside of cb wiring

radixdlt · May 7, 2024 · 18e322b · 18e322b
1 parent 410fb91
commit 18e322b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/packages/dapp-toolkit/src/connect-button/connect-button-client.ts b/packages/dapp-toolkit/src/connect-button/connect-button-client.ts
@@ -1,4 +1,5 @@
 import {
+  delay,
   filter,
   first,
   fromEvent,
@@ -95,17 +96,6 @@ export const ConnectButtonClient = (input: {
 
           connectButtonElement.enableMobile = enableMobile
 
-          if (transport?.sessionChange$)
-            subscriptions.add(
-              transport.sessionChange$.subscribe(() => {
-                setTimeout(() => {
-                  connectButtonElement.showPopoverMenu = true
-                  connectButtonElement.showLinking = true
-                  connectButtonElement.pristine = false
-                }, 1000)
-              }),
-            )
-
           const onConnect$ = fromEvent(connectButtonElement, 'onConnect').pipe(
             tap(() => {
               onConnect((value) => subjects.onConnect.next(value))
@@ -216,6 +206,15 @@ export const ConnectButtonClient = (input: {
             tap((value) => (connectButtonElement.theme = value)),
           )
 
+          const showLinking$ = subjects.showLinking.pipe(
+            delay(1000),
+            tap((value) => {
+              connectButtonElement.showPopoverMenu = value
+              connectButtonElement.showLinking = value
+              connectButtonElement.pristine = false
+            }),
+          )
+
           return merge(
             onConnect$,
             status$,
@@ -238,6 +237,7 @@ export const ConnectButtonClient = (input: {
             onShowPopover$,
             dAppName$,
             onLinkClick$,
+            showLinking$,
           )
         }),
       )
@@ -277,6 +277,15 @@ export const ConnectButtonClient = (input: {
       .subscribe(),
   )
 
+  if (transport?.sessionChange$)
+    subscriptions.add(
+      transport.sessionChange$
+        .pipe(filter((session) => session.status === 'Active'))
+        .subscribe(() => {
+          subjects.showLinking.next(true)
+        }),
+    )
+
   const connectButtonApi = {
     status$: subjects.status.asObservable(),
     onConnect$: subjects.onConnect.asObservable(),

diff --git a/packages/dapp-toolkit/src/connect-button/subjects.ts b/packages/dapp-toolkit/src/connect-button/subjects.ts
@@ -33,4 +33,5 @@ export const ConnectButtonSubjects = () => ({
     type: 'account' | 'transaction' | 'setupGuide' | 'showQrCode'
     data: string
   }>(),
+  showLinking: new BehaviorSubject<boolean>(false),
 })