Merge pull request #312 from tonkeeper/fix/transfer-bin

Handle bin parameter in transfer links
tonkeeper · Nov 25, 2024 · 9d373be · 9d373be
2 parents 99cdf18 + 13b9c26
commit 9d373be
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 27 deletions.
diff --git a/packages/core/src/service/deeplinkingService.ts b/packages/core/src/service/deeplinkingService.ts
@@ -28,6 +28,10 @@ export function parseTonTransferWithAddress(options: { url: string }) {
             }
         }
 
+        if (data.query.bin) {
+            throw new Error('Unsupported link');
+        }
+
         const result: Omit<TonTransferParams, 'address'> & { address: string } = {
             address: linkAddress,
             ...data.query

diff --git a/packages/uikit/src/components/connect/connectHook.ts b/packages/uikit/src/components/connect/connectHook.ts
@@ -20,47 +20,54 @@ import { sendEventToBridge } from '@tonkeeper/core/dist/service/tonConnect/httpB
 import { useAppSdk } from '../../hooks/appSdk';
 import { useTranslation } from '../../hooks/translation';
 import { QueryKey } from '../../libs/queryKey';
-import { useActiveAccountQuery, useActiveWallet } from '../../state/wallet';
+import { useActiveAccountQuery } from '../../state/wallet';
 import { BLOCKCHAIN_NAME } from '@tonkeeper/core/dist/entries/crypto';
+import { useToast } from '../../hooks/useNotification';
 
 export const useGetConnectInfo = () => {
     const sdk = useAppSdk();
     const { t } = useTranslation();
+    const notifyError = useToast();
 
     return useMutation<null | TonConnectParams, Error, string>(async url => {
-        const transfer = parseTonTransferWithAddress({ url });
+        try {
+            const transfer = parseTonTransferWithAddress({ url });
+
+            if (transfer) {
+                sdk.uiEvents.emit('copy', {
+                    method: 'copy',
+                    id: Date.now(),
+                    params: t('loading')
+                });
+
+                sdk.uiEvents.emit('transfer', {
+                    method: 'transfer',
+                    id: Date.now(),
+                    params: { chain: BLOCKCHAIN_NAME.TON, ...transfer, from: 'qr-code' }
+                });
+                return null;
+            }
+
+            const params = parseTonConnect({ url });
+
+            if (typeof params === 'string') {
+                console.error(params);
+                throw new Error('Unsupported link');
+            }
+
+            // TODO: handle auto connect
 
-        if (transfer) {
             sdk.uiEvents.emit('copy', {
                 method: 'copy',
                 id: Date.now(),
                 params: t('loading')
             });
 
-            sdk.uiEvents.emit('transfer', {
-                method: 'transfer',
-                id: Date.now(),
-                params: { chain: BLOCKCHAIN_NAME.TON, ...transfer, from: 'qr-code' }
-            });
-            return null;
-        }
-
-        const params = parseTonConnect({ url });
-
-        if (typeof params === 'string') {
-            console.error(params);
-            return null;
+            return params;
+        } catch (e) {
+            notifyError(String(e));
+            throw e;
         }
-
-        // TODO: handle auto connect
-
-        sdk.uiEvents.emit('copy', {
-            method: 'copy',
-            id: Date.now(),
-            params: t('loading')
-        });
-
-        return params;
     });
 };
 

diff --git a/packages/uikit/src/hooks/useNotification.ts b/packages/uikit/src/hooks/useNotification.ts
@@ -1,4 +1,3 @@
-import { useQueryClient } from '@tanstack/react-query';
 import { useTranslation } from './translation';
 import { useCallback, useEffect } from 'react';
 import { notifyError } from '../components/transfer/common';