From e7e24351396d3de5eb85996ed6ebbd01650e1606 Mon Sep 17 00:00:00 2001 From: Ikeji Benjamin Date: Fri, 9 Feb 2024 22:01:30 +0100 Subject: [PATCH] chore: bump fast auth wallet version --- package.json | 2 +- src/components/vm/VmInitializer.tsx | 36 ++++++++++++++++------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 1acf328ee..f7d4848ef 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "iframe-resizer-react": "^1.1.0", "local-storage": "^2.0.0", "lodash": "^4.17.21", - "near-fastauth-wallet": "^0.0.11", + "near-fastauth-wallet": "^0.0.12", "near-social-vm": "github:NearSocial/VM#use_attr_patch", "next": "^13.5.6", "next-pwa": "^5.6.0", diff --git a/src/components/vm/VmInitializer.tsx b/src/components/vm/VmInitializer.tsx index b96c2b8fa..0c529d5fb 100644 --- a/src/components/vm/VmInitializer.tsx +++ b/src/components/vm/VmInitializer.tsx @@ -87,6 +87,7 @@ export default function VmInitializer() { networkId === 'testnet' ? 'http://34.70.226.83:3030/relay' : 'https://near-relayer-mainnet.api.pagoda.co/relay', + walletUrl: 'http://localhost:3000', }), setupKeypom({ trialAccountSpecs: { @@ -144,22 +145,13 @@ export default function VmInitializer() { }); }, [idOS, near]); - const handleWalletSelectorMessage = useCallback( - (e: MessageEvent<{ showWalletSelector: boolean }>) => { - if (e.data.showWalletSelector) { - // Show wallet selector - walletModal?.show(); - } - }, - [walletModal], - ); - - useEffect(() => { - window.addEventListener('message', handleWalletSelectorMessage, false); - return () => { - window.removeEventListener('message', handleWalletSelectorMessage, false); - }; - }, []); + const handleWalletSelectorMessage = (e: MessageEvent<{ showWalletSelector: boolean }>) => { + console.log('e.data ', e.data); + if (e.data.showWalletSelector) { + // Show wallet selector + walletModal?.show(); + } + }; const requestSignMessage = useCallback( async (message: string) => { @@ -203,6 +195,18 @@ export default function VmInitializer() { return false; }, [saveCurrentUrl, walletModal]); + useEffect(() => { + window.addEventListener( + 'message', + (e: MessageEvent<{ showWalletSelector: boolean }>) => { + if (e.data.showWalletSelector) { + requestSignInWithWallet(); + } + }, + false, + ); + }, [requestSignInWithWallet]); + const logOut = useCallback(async () => { if (!near) { return;