diff --git a/src/components/masa-interface/masa-interface.tsx b/src/components/masa-interface/masa-interface.tsx index 6eaaca1f..2c86b998 100644 --- a/src/components/masa-interface/masa-interface.tsx +++ b/src/components/masa-interface/masa-interface.tsx @@ -65,8 +65,7 @@ export const MasaInterface = ({ if (!identity?.identityId && scope?.includes('identity')) return 'createIdentity'; if ( - ((!identity?.identityId && !soulnames) || - (!identity?.identityId && soulnames && soulnames.length === 0)) && + (!soulnames || (soulnames && soulnames.length === 0)) && scope?.includes('soulname') ) return 'createSoulname'; diff --git a/src/provider/modules/modal/modal.ts b/src/provider/modules/modal/modal.ts index 74d95c01..30383f2c 100644 --- a/src/provider/modules/modal/modal.ts +++ b/src/provider/modules/modal/modal.ts @@ -24,16 +24,13 @@ export const useModal = ( const closeModal = useCallback( (forceCallback?: boolean) => { setModalOpen(false); - + if ( !forcedPage && areScopesFullfiled && !!modalCallback && isLoggedIn && - isConnected && - (masa?.config.network - ? network?.name.includes(masa.config.network) - : true) + isConnected ) { modalCallback(); } else if (forceCallback && modalCallback) { diff --git a/src/provider/modules/network/network.ts b/src/provider/modules/network/network.ts index f6f17c1b..0fb6dbbd 100644 --- a/src/provider/modules/network/network.ts +++ b/src/provider/modules/network/network.ts @@ -35,6 +35,9 @@ export const useNetwork = ( if (!provider) return; const newNetwork = await provider.provider?.getNetwork(); + + console.log({newNetwork}) + setNetwork(newNetwork ?? undefined); }, [provider]); diff --git a/src/provider/modules/scopes/scopes.ts b/src/provider/modules/scopes/scopes.ts index 2b5e549f..8f47e530 100644 --- a/src/provider/modules/scopes/scopes.ts +++ b/src/provider/modules/scopes/scopes.ts @@ -7,13 +7,14 @@ export const useScopes = ( ) => { const [scope, setScope] = useState([]); const areScopesFullfiled = useMemo(() => { + console.log({ scope, soulnames, isLoggedIn }); if (scope?.includes('soulname') && (soulnames?.length ?? 0) === 0) return false; if (scope?.includes('auth') && !isLoggedIn) return false; return true; - }, [soulnames, scope]); + }, [soulnames, scope, isLoggedIn]); return { scope, setScope, areScopesFullfiled }; };