Skip to content

fix: cannot use wallet after connecting to Solana external wallets #2346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaitanyapotti merged 1 commit into from
Jan 26, 2026
Merged

fix: cannot use wallet after connecting to Solana external wallets #2346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions packages/modal/src/vue/Web3AuthProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
ANALYTICS_INTEGRATION_TYPE,
type ChainNamespaceType,
CONNECTOR_EVENTS,
CONNECTOR_STATUS,
type CONNECTOR_STATUS_TYPE,
Expand All @@ -23,6 +24,8 @@ export const Web3AuthProvider = defineComponent({
const isMFAEnabled = ref(false);
const status = ref<CONNECTOR_STATUS_TYPE | null>(null);
const isAuthorized = ref(false);
const chainId = ref<string | null>(null);
const chainNamespace = ref<ChainNamespaceType | null>(null);

const isInitializing = ref(false);
const initError = ref<Error | null>(null);
Expand All @@ -48,6 +51,8 @@ export const Web3AuthProvider = defineComponent({
isConnected.value = false;
isAuthorized.value = false;
status.value = null;
chainId.value = null;
chainNamespace.value = null;
};

onInvalidate(() => {
Expand Down Expand Up @@ -109,6 +114,8 @@ export const Web3AuthProvider = defineComponent({
if (!isInitialized.value) isInitialized.value = true;
isConnected.value = true;
provider.value = newWeb3Auth.provider;
chainId.value = web3Auth.value!.currentChainId;
chainNamespace.value = web3Auth.value!.currentChain?.chainNamespace ?? null;
}
};

Expand Down Expand Up @@ -170,6 +177,27 @@ export const Web3AuthProvider = defineComponent({
{ immediate: true }
);

// Listen for chain changes on the provider
watch(
provider,
(newProvider, prevProvider) => {
const handleChainChange = (newChainId: string) => {
chainId.value = newChainId;
chainNamespace.value = web3Auth.value?.currentChain?.chainNamespace ?? null;
};

// unregister previous listener
if (prevProvider && newProvider !== prevProvider) {
prevProvider.removeListener("chainChanged", handleChainChange);
}

if (newProvider && newProvider !== prevProvider) {
newProvider.on("chainChanged", handleChainChange);
}
},
{ immediate: true }
);

provide<IWeb3AuthInnerContext>(Web3AuthContextKey, {
web3Auth,
isConnected,
Expand All @@ -180,6 +208,8 @@ export const Web3AuthProvider = defineComponent({
isInitializing,
initError,
isMFAEnabled,
chainId,
chainNamespace,
getPlugin,
setIsMFAEnabled,
});
Expand Down
20 changes: 5 additions & 15 deletions packages/modal/src/vue/composables/useChain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,18 @@
import { ChainNamespaceType } from "@web3auth/no-modal";
import { computed, ComputedRef } from "vue";
import { Ref } from "vue";

import { useWeb3AuthInner } from "./useWeb3AuthInner";

export type IUseChain = {
chainId: ComputedRef<string | null>;
chainNamespace: ComputedRef<ChainNamespaceType | null>;
chainId: Ref<string | null>;
chainNamespace: Ref<ChainNamespaceType | null>;
};

export const useChain = (): IUseChain => {
const context = useWeb3AuthInner();

const chainId = computed(() => {
if (!context.web3Auth.value?.currentChain) return null;
return context.web3Auth.value.currentChain.chainId;
});

const chainNamespace = computed(() => {
if (!context.web3Auth.value?.currentChain) return null;
return context.web3Auth.value.currentChain.chainNamespace;
});

return {
chainId,
chainNamespace,
chainId: context.chainId,
chainNamespace: context.chainNamespace,
};
};
4 changes: 3 additions & 1 deletion packages/modal/src/vue/interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { CONNECTOR_STATUS_TYPE, IPlugin, IProvider, WalletServicesPluginType } from "@web3auth/no-modal";
import type { ChainNamespaceType, CONNECTOR_STATUS_TYPE, IPlugin, IProvider, WalletServicesPluginType } from "@web3auth/no-modal";
import { Ref, ShallowRef } from "vue";

import type { Web3Auth, Web3AuthOptions } from "../modalManager";
Expand All @@ -20,6 +20,8 @@ interface IBaseWeb3AuthComposableContext {
isInitialized: Ref<boolean>;
status: Ref<CONNECTOR_STATUS_TYPE | null>;
isMFAEnabled: Ref<boolean>;
chainId: Ref<string | null>;
chainNamespace: Ref<ChainNamespaceType | null>;
getPlugin: (pluginName: string) => IPlugin | null;
setIsMFAEnabled: (isMfaEnabled: boolean) => void;
}
Expand Down
30 changes: 30 additions & 0 deletions packages/no-modal/src/vue/Web3AuthProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { defineComponent, h, PropType, provide, ref, shallowRef, watch } from "v

import {
ANALYTICS_INTEGRATION_TYPE,
type ChainNamespaceType,
CONNECTOR_EVENTS,
CONNECTOR_STATUS,
type CONNECTOR_STATUS_TYPE,
Expand All @@ -22,6 +23,8 @@ export const Web3AuthProvider = defineComponent({
const provider = ref<IProvider | null>(null);
const isMFAEnabled = ref(false);
const status = ref<CONNECTOR_STATUS_TYPE | null>(null);
const chainId = ref<string | null>(null);
const chainNamespace = ref<ChainNamespaceType | null>(null);

const isInitializing = ref(false);
const initError = ref<Error | null>(null);
Expand All @@ -48,6 +51,8 @@ export const Web3AuthProvider = defineComponent({
isConnected.value = false;
isAuthorized.value = false;
status.value = null;
chainId.value = null;
chainNamespace.value = null;
};

onInvalidate(() => {
Expand Down Expand Up @@ -111,6 +116,8 @@ export const Web3AuthProvider = defineComponent({
if (!isInitialized.value) isInitialized.value = true;
isConnected.value = true;
provider.value = newWeb3Auth.provider;
chainId.value = web3Auth.value!.currentChainId;
chainNamespace.value = web3Auth.value!.currentChain?.chainNamespace ?? null;
}
};

Expand Down Expand Up @@ -172,6 +179,27 @@ export const Web3AuthProvider = defineComponent({
{ immediate: true }
);

// Listen for chain changes on the provider
watch(
provider,
(newProvider, prevProvider) => {
const handleChainChange = (newChainId: string) => {
chainId.value = newChainId;
chainNamespace.value = web3Auth.value?.currentChain?.chainNamespace ?? null;
};

// unregister previous listener
if (prevProvider && newProvider !== prevProvider) {
prevProvider.removeListener("chainChanged", handleChainChange);
}

if (newProvider && newProvider !== prevProvider) {
newProvider.on("chainChanged", handleChainChange);
}
},
{ immediate: true }
);

provide<IWeb3AuthInnerContext>(Web3AuthContextKey, {
web3Auth,
isConnected,
Expand All @@ -181,6 +209,8 @@ export const Web3AuthProvider = defineComponent({
isInitializing,
initError,
isMFAEnabled,
chainId,
chainNamespace,
getPlugin,
setIsMFAEnabled,
isAuthorized,
Expand Down
20 changes: 5 additions & 15 deletions packages/no-modal/src/vue/composables/useChain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,18 @@
import { computed, ComputedRef } from "vue";
import { Ref } from "vue";

import { ChainNamespaceType } from "../../base";
import { useWeb3AuthInner } from "./useWeb3AuthInner";

export type IUseChain = {
chainId: ComputedRef<string | null>;
chainNamespace: ComputedRef<ChainNamespaceType | null>;
chainId: Ref<string | null>;
chainNamespace: Ref<ChainNamespaceType | null>;
};

export const useChain = (): IUseChain => {
const context = useWeb3AuthInner();

const chainId = computed(() => {
if (!context.web3Auth.value?.currentChain) return null;
return context.web3Auth.value.currentChain.chainId;
});

const chainNamespace = computed(() => {
if (!context.web3Auth.value?.currentChain) return null;
return context.web3Auth.value.currentChain.chainNamespace;
});

return {
chainId,
chainNamespace,
chainId: context.chainId,
chainNamespace: context.chainNamespace,
};
};
5 changes: 4 additions & 1 deletion packages/no-modal/src/vue/composables/useWeb3Auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { useWeb3AuthInner } from "./useWeb3AuthInner";
export type IWeb3AuthNoModalContext = Omit<IWeb3AuthInnerContext, "isMFAEnabled" | "setIsMFAEnabled">;

export const useWeb3Auth = (): IWeb3AuthNoModalContext => {
const { initError, isConnected, isInitialized, isInitializing, isAuthorized, provider, status, web3Auth, getPlugin } = useWeb3AuthInner();
const { initError, isConnected, isInitialized, isInitializing, isAuthorized, provider, status, web3Auth, getPlugin, chainId, chainNamespace } =
useWeb3AuthInner();
return {
initError,
isConnected,
Expand All @@ -14,6 +15,8 @@ export const useWeb3Auth = (): IWeb3AuthNoModalContext => {
provider,
status,
web3Auth,
chainId,
chainNamespace,
getPlugin,
};
};
4 changes: 3 additions & 1 deletion packages/no-modal/src/vue/interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Ref, ShallowRef } from "vue";

import type { CONNECTOR_STATUS_TYPE, IPlugin, IProvider, IWeb3AuthCoreOptions } from "../base";
import type { ChainNamespaceType, CONNECTOR_STATUS_TYPE, IPlugin, IProvider, IWeb3AuthCoreOptions } from "../base";
import type { Web3AuthNoModal } from "../noModal";
import { WalletServicesPluginType } from "../plugins/wallet-services-plugin";

Expand All @@ -21,6 +21,8 @@ interface IBaseWeb3AuthComposableContext {
isInitialized: Ref<boolean>;
status: Ref<CONNECTOR_STATUS_TYPE | null>;
isMFAEnabled: Ref<boolean>;
chainId: Ref<string | null>;
chainNamespace: Ref<ChainNamespaceType | null>;
getPlugin: (pluginName: string) => IPlugin | null;
setIsMFAEnabled: (isMfaEnabled: boolean) => void;
}
Expand Down