wip 2

trilitech · Oct 25, 2024 · 77af87f · 77af87f
1 parent 886a7e1
commit 77af87f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/apps/web/src/components/WalletConnect/WalletConnectProvider.tsx b/apps/web/src/components/WalletConnect/WalletConnectProvider.tsx
@@ -1,15 +1,14 @@
 import { type NetworkType } from "@airgap/beacon-wallet";
 import { useToast } from "@chakra-ui/react";
 import { type WalletKitTypes } from "@reown/walletkit";
-import { useQueryClient } from "@tanstack/react-query";
 import { useDynamicModalContext } from "@umami/components";
 import {
   type State,
   createWalletKit,
   useAsyncActionHandler,
   useAvailableNetworks,
   useGetAllWcTopicToAcc,
-  useRemoveWcConnection,
+  useRemoveWcTopicToAcc,
   useWcPeers,
   walletKit,
 } from "@umami/state";
@@ -30,8 +29,7 @@ export const WalletConnectProvider = ({ children }: PropsWithChildren) => {
   const availableNetworks: Network[] = useAvailableNetworks();
 
   const handleWcRequest = useHandleWcRequest();
-  const removeWcPeer = useRemoveWcConnection();
-  const queryClient = useQueryClient();
+  const removeWcTopicToAcc = useRemoveWcTopicToAcc();
 
   const slice = useGetAllWcTopicToAcc();
   const { peers, refresh } = useWcPeers();
@@ -77,7 +75,7 @@ export const WalletConnectProvider = ({ children }: PropsWithChildren) => {
       } else {
         console.error(`Session deleted by dApp but not known locally. Topic: ${topic}`);
       }
-      removeWcPeer(topic);
+      await removeWcTopicToAcc(topic);
 
       // update peer list in the UI
       await refresh();
@@ -100,7 +98,7 @@ export const WalletConnectProvider = ({ children }: PropsWithChildren) => {
           status: "info",
         });
       }
-      await handleWcRequest(event, peers);
+      await handleWcRequest(event, peers, sliceTopicToAcc);
     }).catch(async error => {
       const { id, topic } = event;
       console.error("WalletConnect session request failed", event, peers, error);

diff --git a/apps/web/src/components/WalletConnect/useHandleWcRequest.tsx b/apps/web/src/components/WalletConnect/useHandleWcRequest.tsx
@@ -2,9 +2,9 @@ import { useToast } from "@chakra-ui/react";
 import { useDynamicModalContext } from "@umami/components";
 import { type ImplicitAccount, estimate, toAccountOperations } from "@umami/core";
 import {
+  type State,
   useAsyncActionHandler,
   useFindNetwork,
-  useGetAllWcTopicToAcc,
   useGetOwnedAccountSafe,
   walletKit,
 } from "@umami/state";
@@ -28,7 +28,6 @@ export const useHandleWcRequest = () => {
   const getAccount = useGetOwnedAccountSafe();
   const findNetwork = useFindNetwork();
   // const { peers } = useWcPeers();
-  const state = useGetAllWcTopicToAcc();
   const toast = useToast();
 
   return async (
@@ -42,7 +41,8 @@ export const useHandleWcRequest = () => {
       };
       chainId: string;
     }>,
-    peers: Record<string, SessionTypes.Struct>
+    peers: Record<string, SessionTypes.Struct>,
+    sliceTopicToAcc: State
   ) => {
     await handleAsyncActionUnsafe(
       async () => {
@@ -74,10 +74,10 @@ export const useHandleWcRequest = () => {
             if (!request.params.account) {
               throw new Error("Missing account in request");
             }
-            if (!(topic in state)) {
+            if (!(topic in sliceTopicToAcc)) {
               throw new Error(`Unknown dapp: ${topic}`);
             }
-            const dappInfo = state[topic];
+            const dappInfo = sliceTopicToAcc[topic];
             if (request.params.account !== dappInfo.accountPkh) {
               throw new Error(`Unknown account: ${request.params.account}, topic: ${topic}`);
             }

diff --git a/packages/state/src/hooks/WalletConnect.ts b/packages/state/src/hooks/WalletConnect.ts
@@ -58,21 +58,23 @@ export const useAddWcTopicToAcc = () => {
 };
 
 // remove from slice
-export const useRemoveWcConnection = () => {
+export const useRemoveWcTopicToAcc = () => {
   const dispatch = useDispatch();
-  return (topic: string) => dispatch(wcActions.removeConnection(topic));
+  return async (topic: string) => {
+    console.log("removing connection from sliceTopicToAcc", topic);
+    dispatch(wcActions.removeConnection(topic));}
 };
 
 // remove from WC and slice
 export const useRemoveWcPeer = () => {
   const { refresh } = useWcPeers();
-  const removeConnectionFromWcSlice = useRemoveWcConnection();
+  const removeWcTopicToAcc = useRemoveWcTopicToAcc();
 
   return async (params: { topic: string; reason: ErrorResponse }) => {
     console.log("disconnecting WC session", params);
     await walletKit
       .disconnectSession(params)
-      .then(() => removeConnectionFromWcSlice(params.topic))
+      .then(() => removeWcTopicToAcc(params.topic))
       .then(async () => await refresh());
   };
 };