From e0ead589f5cd49f298ed3da0e1c1d06a307b5bf3 Mon Sep 17 00:00:00 2001 From: iamacook Date: Mon, 16 Oct 2023 13:32:06 +0200 Subject: [PATCH] fix: remove function + check clipboard prefix --- .../walletconnect/WalletConnectContext.tsx | 2 -- .../useWalletConnectClipboardUri.ts | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/services/walletconnect/WalletConnectContext.tsx b/src/services/walletconnect/WalletConnectContext.tsx index 011daa3cee..540f4c15f9 100644 --- a/src/services/walletconnect/WalletConnectContext.tsx +++ b/src/services/walletconnect/WalletConnectContext.tsx @@ -10,8 +10,6 @@ import { stripEip155Prefix } from './utils' const walletConnectSingleton = new WalletConnectWallet() -const isWcUri = (uri: string) => uri.startsWith('wc:') - export const WalletConnectContext = createContext<{ walletConnect: WalletConnectWallet | null error: Error | null diff --git a/src/services/walletconnect/useWalletConnectClipboardUri.ts b/src/services/walletconnect/useWalletConnectClipboardUri.ts index 9719e5c600..96397fe28f 100644 --- a/src/services/walletconnect/useWalletConnectClipboardUri.ts +++ b/src/services/walletconnect/useWalletConnectClipboardUri.ts @@ -11,13 +11,18 @@ export const useWalletConnectClipboardUri = (): [string, Dispatch { - isClipboardGranted().then((isGranted) => { - if (isGranted) { - getClipboard().then(setState) - } - }) + const setClipboard = async () => { + // Errors handled in the clipboard utils + const isGranted = await isClipboardGranted() + if (!isGranted) { + return + } + + const clipboard = await getClipboard() + + if (clipboard.startsWith('wc:')) { + setState(clipboard) + } } setClipboard()