From 6c65b1571b591cbaa1f7ba4a2757192c5fdd4798 Mon Sep 17 00:00:00 2001 From: hide-on-bush-x Date: Tue, 9 May 2023 11:51:36 -0300 Subject: [PATCH] Modal opening fix --- .../masa-interface/pages/authenticate/authenticate.tsx | 5 +++-- src/provider/masa-context-provider.tsx | 1 + src/provider/modules/modal/modal.ts | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/masa-interface/pages/authenticate/authenticate.tsx b/src/components/masa-interface/pages/authenticate/authenticate.tsx index e1d37d51..0426025e 100644 --- a/src/components/masa-interface/pages/authenticate/authenticate.tsx +++ b/src/components/masa-interface/pages/authenticate/authenticate.tsx @@ -14,6 +14,7 @@ export const InterfaceAuthenticate = (): JSX.Element => { isLoggedIn, useRainbowKit, connect, + isModalOpen } = useMasa(); const { isConnected } = useAccount(); const { disconnect } = useDisconnect(); @@ -23,10 +24,10 @@ export const InterfaceAuthenticate = (): JSX.Element => { }, [disconnect]); useEffect(() => { - if (isConnected && !isLoggedIn) { + if (isModalOpen && isConnected && !isLoggedIn) { connect?.(); } - }, [connect, isConnected, isLoggedIn]); + }, [connect, isConnected, isLoggedIn, isModalOpen]); const [copied, setCopied] = useState(false); const message = useMemo(() => { diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx index ec145266..84e82223 100644 --- a/src/provider/masa-context-provider.tsx +++ b/src/provider/masa-context-provider.tsx @@ -228,6 +228,7 @@ export const MasaContextProvider = ({ }); openConnectModal?.(); + console.log("OPENING MODAL") } else { setModalOpen(true); } diff --git a/src/provider/modules/modal/modal.ts b/src/provider/modules/modal/modal.ts index c4679b29..1a94558f 100644 --- a/src/provider/modules/modal/modal.ts +++ b/src/provider/modules/modal/modal.ts @@ -24,6 +24,7 @@ export const useModal = ( const [modalCallback, setModalCallback] = useState<(() => void) | null>(null); const [forcedPage, setForcedPage] = useState(null); + const [modalSize, setModalSize] = useState<{ width: number; height: number;