fix: correct account hasn't been activated on ton connect tx request …

…received
tonkeeper · Dec 20, 2024 · ec145f4 · ec145f4
1 parent 1fa1450
commit ec145f4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/apps/desktop/src/app/components/TonConnectSubscription.tsx b/apps/desktop/src/app/components/TonConnectSubscription.tsx
@@ -8,18 +8,30 @@ import {
 } from '@tonkeeper/uikit/dist/state/tonConnect';
 import { sendBackground } from '../../libs/backgroudService';
 import { SendTransactionAppRequest } from '@tonkeeper/core/dist/entries/tonConnect';
+import { QueryKey } from '@tonkeeper/uikit/dist/libs/queryKey';
+import { useQueryClient } from '@tanstack/react-query';
 
 export const TonConnectSubscription = () => {
     const [request, setRequest] = useState<SendTransactionAppRequest | undefined>(undefined);
 
     const { mutateAsync: responseSendAsync } = useResponseSendMutation();
     const { mutate: disconnect } = useDisconnectTonConnectApp({ skipEmit: true });
 
+    const queryClient = useQueryClient();
+
+    const onTransaction = useCallback(
+        async (request: SendTransactionAppRequest) => {
+            await queryClient.invalidateQueries([QueryKey.account]);
+            setRequest(request);
+        },
+        [setRequest]
+    );
+
     useSendNotificationAnalytics(request?.connection?.manifest);
 
     useEffect(() => {
-        window.backgroundApi.onTonConnectTransaction(setRequest);
-    }, [setRequest]);
+        window.backgroundApi.onTonConnectTransaction(onTransaction);
+    }, [onTransaction]);
 
     useEffect(() => {
         window.backgroundApi.onTonConnectDisconnect(disconnect);

diff --git a/apps/tablet/src/app/components/TonConnectSubscription.tsx b/apps/tablet/src/app/components/TonConnectSubscription.tsx
@@ -13,6 +13,8 @@ import {
   tonConnectSSE
 } from "../../libs/tonConnect";
 import { useActiveWallet } from "@tonkeeper/uikit/dist/state/wallet";
+import { useQueryClient } from "@tanstack/react-query";
+import { QueryKey } from "@tonkeeper/uikit/dist/libs/queryKey";
 
 export const TonConnectSubscription = () => {
   const [request, setRequest] = useState<SendTransactionAppRequest | undefined>(undefined);
@@ -22,10 +24,16 @@ export const TonConnectSubscription = () => {
   const { data: appConnections } = useAppTonConnectConnections();
   const wallet = useActiveWallet();
   const activeWalletConnections = useMemo(() => appConnections?.find(c => c.wallet.id === wallet.id)?.connections, [appConnections, wallet.id]);
+  const queryClient = useQueryClient();
 
   useSendNotificationAnalytics(request?.connection?.manifest);
 
-  useEffect(() => subscribeToTonConnectSendTransaction(setRequest), [setRequest]);
+  const onTransaction = useCallback(async (request: SendTransactionAppRequest) => {
+    await queryClient.invalidateQueries([QueryKey.account]);
+    setRequest(request);
+  }, [setRequest]);
+
+  useEffect(() => subscribeToTonConnectSendTransaction(onTransaction), [onTransaction]);
 
   useEffect(() => subscribeToTonConnectDisconnect(disconnect), [disconnect]);