fix: manual emit wallet data

radixdlt · May 3, 2024 · b1f1b7f · b1f1b7f
1 parent e7e9b5f
commit b1f1b7f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 27 deletions.
diff --git a/packages/dapp-toolkit/src/state/state.ts b/packages/dapp-toolkit/src/state/state.ts
@@ -43,34 +43,36 @@ export const StateClient = (input: {
     sharedData: {},
   } satisfies RdtState
 
-  const resetState = () => storageClient.setState(defaultState)
+  const resetState = () =>
+    storageClient.setState(defaultState).map(() => {
+      emitWalletData()
+    })
 
   const initializeState = () =>
-    getState().mapErr(() => {
-      logger?.debug({
-        module: 'StateClient',
-        method: `initializeState.loadedCorruptedStateFromStorage`,
+    getState()
+      .mapErr(() => {
+        logger?.debug({
+          module: 'StateClient',
+          method: `initializeState.loadedCorruptedStateFromStorage`,
+        })
+        resetState()
+        emitWalletData()
+      })
+      .map(() => {
+        emitWalletData()
       })
-      resetState()
-    })
 
   initializeState()
 
   const walletDataSubject = new BehaviorSubject<WalletData | undefined>(
     undefined,
   )
 
-  subscriptions.add(
-    merge(storageClient.storage$, of(null))
-      .pipe(
-        switchMap(() =>
-          getState().map((state) => {
-            walletDataSubject.next(state.walletData)
-          }),
-        ),
-      )
-      .subscribe(),
-  )
+  const emitWalletData = () => {
+    storageClient.getState().map((state) => {
+      walletDataSubject.next(state?.walletData)
+    })
+  }
 
   const walletData$ = walletDataSubject
     .asObservable()
@@ -81,6 +83,7 @@ export const StateClient = (input: {
     patchState,
     getState,
     walletData$,
+    emitWalletData,
     getWalletData: () => walletDataSubject.value,
     reset: resetState,
     destroy: () => {

diff --git a/packages/dapp-toolkit/src/wallet-request/wallet-request.ts b/packages/dapp-toolkit/src/wallet-request/wallet-request.ts
@@ -355,15 +355,20 @@ export const WalletRequestClient = (input: {
                 .map((transformedWalletResponse) => {
                   interactionStatusChangeSubject.next('success')
 
-                  if (!oneTime)
-                    stateClient.setState({
-                      loggedInTimestamp: Date.now().toString(),
-                      walletData: transformedWalletResponse,
-                      sharedData: transformWalletRequestToSharedData(
-                        walletInteraction,
-                        state.sharedData,
-                      ),
-                    })
+                  if (!oneTime) {
+                    stateClient
+                      .setState({
+                        loggedInTimestamp: Date.now().toString(),
+                        walletData: transformedWalletResponse,
+                        sharedData: transformWalletRequestToSharedData(
+                          walletInteraction,
+                          state.sharedData,
+                        ),
+                      })
+                      .map(() => {
+                        stateClient.emitWalletData()
+                      })
+                  }
 
                   return transformedWalletResponse
                 })