feat: close wallet tab after request modal is closed (#829)

Author: ganchoradkov

advanced/wallets/react-wallet-v2/src/pages/wc.tsx

@@ -35,12 +35,11 @@ export default function DeepLinkPairingPage() {
   }, [state.view])
 
   useEffect(() => {
-    if (requestId) {
-      ModalStore.open('LoadingModal', { loadingMessage })
-    }
-
-    if (uri) {
-      ModalStore.open('LoadingModal', { loadingMessage })
+    if (uri || requestId) {
+      ModalStore.open('LoadingModal', { loadingMessage }, () => {
+        console.log('Modal closed')
+        window.close()
+      })
     }
   }, [uri, requestId, loadingMessage])
 

advanced/wallets/react-wallet-v2/src/store/ModalStore.ts

@@ -1,6 +1,5 @@
 import { SessionTypes, SignClientTypes } from '@walletconnect/types'
-import { WalletKitTypes } from '@reown/walletkit'
-import { proxy } from 'valtio'
+import { proxy, subscribe } from 'valtio'
 
 /**
  * Types
@@ -52,10 +51,18 @@ const state = proxy<State>({
 const ModalStore = {
   state,
 
-  open(view: State['view'], data: State['data']) {
+  open(view: State['view'], data: State['data'], onClose?: () => void) {
     state.view = view
     state.data = data
     state.open = true
+    if (!onClose) return
+    const unsubscribe = subscribe(state, () => {
+      if (!state.open) {
+        console.log('ModalStore: Closing modal')
+        unsubscribe()
+        onClose?.()
+      }
+    })
   },
 
   close() {