@reown/appkit-solana-react-native 0.0.0-chore-solflare-20250730210452 → 0.0.0-chore-spring-effect-20250909214820

package/lib/typescript/providers/{SolanaDeeplinkProvider.d.ts → DeeplinkProvider.d.ts}

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { Provider, RequestArguments, CaipNetworkId } from '@reown/appkit-common-react-native';
-import type { SolanaDeeplinkProviderConfig, SolanaConnectResult, SolanaWalletSession, SolanaCluster } from '../types';
+import type { DeeplinkProviderConfig, DeeplinkConnectResult, DeeplinkSession, Cluster } from '../types';
 import EventEmitter from 'events';
 export declare const SOLANA_SIGNING_METHODS: {
     readonly SOLANA_SIGN_TRANSACTION: "solana_signTransaction";
@@ -8,31 +8,52 @@ export declare const SOLANA_SIGNING_METHODS: {
     readonly SOLANA_SIGN_AND_SEND_TRANSACTION: "solana_signAndSendTransaction";
     readonly SOLANA_SIGN_ALL_TRANSACTIONS: "solana_signAllTransactions";
 };
-export declare class SolanaDeeplinkProvider extends EventEmitter implements Provider {
+export declare class DeeplinkProvider extends EventEmitter implements Provider {
     private readonly config;
     private dappEncryptionKeyPair;
     private currentCluster;
+    private sharedKey;
     private storage;
     private sessionToken;
     private userPublicKey;
     private walletEncryptionPublicKeyBs58;
-    constructor(config: SolanaDeeplinkProviderConfig);
-    private getStorageKey;
+    private activeSubscription;
+    private isOperationPending;
+    constructor(config: DeeplinkProviderConfig);
+    private getSessionStorageKey;
+    /**
+     * Cleanup method to be called when the provider is destroyed
+     */
+    destroy(): void;
+    /**
+     * Safely cleanup the active subscription
+     */
+    private cleanupActiveSubscription;
+    /**
+     * Safely set a new subscription, ensuring no operation is pending
+     */
+    private setActiveSubscription;
     getUserPublicKey(): string | null;
     isConnected(): boolean;
+    getCurrentCluster(): Cluster;
     private buildUrl;
+    /**
+     * Open a deeplink URL and wait for a redirect back to the app. Handles subscription
+     * lifecycle and common error extraction from `errorCode`/`errorMessage` query params.
+     */
+    private openDeeplinkAndWait;
     private getRpcMethodName;
     private encryptPayload;
     private decryptPayload;
     restoreSession(): Promise<boolean>;
     private saveSession;
     private clearSessionStorage;
-    connect<T = SolanaConnectResult>(params?: {
-        cluster?: SolanaCluster;
+    connect<T = DeeplinkConnectResult>(params?: {
+        cluster?: Cluster;
     }): Promise<T>;
     disconnect(): Promise<void>;
     clearSession(): Promise<void>;
-    setSession(session: SolanaWalletSession): void;
+    setSession(session: DeeplinkSession): void;
     request<T>(args: RequestArguments, _chainId?: CaipNetworkId): Promise<T>;
 }
-//# sourceMappingURL=SolanaDeeplinkProvider.d.ts.map
+//# sourceMappingURL=DeeplinkProvider.d.ts.map

package/lib/typescript/providers/DeeplinkProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DeeplinkProvider.d.ts","sourceRoot":"","sources":["../../../src/providers/DeeplinkProvider.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EAEd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACrB,eAAe,EAYf,OAAO,EACR,MAAM,UAAU,CAAC;AAClB,OAAO,YAAY,MAAM,QAAQ,CAAC;AAElC,eAAO,MAAM,sBAAsB;;;;;CAKzB,CAAC;AAQX,qBAAa,gBAAiB,SAAQ,YAAa,YAAW,QAAQ;IACpE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAChD,OAAO,CAAC,qBAAqB,CAAkB;IAC/C,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,OAAO,CAAU;IAEzB,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,6BAA6B,CAAuB;IAG5D,OAAO,CAAC,kBAAkB,CAAuC;IACjE,OAAO,CAAC,kBAAkB,CAAS;gBAEvB,MAAM,EAAE,sBAAsB;IAQ1C,OAAO,CAAC,oBAAoB;IAI5B;;OAEG;IACI,OAAO,IAAI,IAAI;IAKtB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAQjC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAS7B,gBAAgB,IAAI,MAAM,GAAG,IAAI;IAIjC,WAAW,IAAI,OAAO;IAIf,iBAAiB,IAAI,OAAO;IAInC,OAAO,CAAC,QAAQ;IAMhB;;;OAGG;YACW,mBAAmB;IAiDjC,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,cAAc;IAkCtB,OAAO,CAAC,cAAc;IAiCT,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;YA6BjC,WAAW;YAiBX,mBAAmB;IAQpB,OAAO,CAAC,CAAC,GAAG,qBAAqB,EAAE,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAkE9E,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC3B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAYnC,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAOpC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;CAyKtF"}

package/lib/typescript/types.d.ts

@@ -7,26 +7,13 @@ export interface TokenInfo {
     decimals: number;
     logoURI?: string;
 }
-export type SolanaWalletType = 'phantom' | 'solflare';
-export type SolanaCluster = 'mainnet-beta' | 'testnet' | 'devnet';
-export interface SolanaDeeplinkProviderConfig {
-    appScheme: string;
-    dappUrl: string;
-    storage: Storage;
-    dappEncryptionKeyPair: nacl.BoxKeyPair;
-    walletType: SolanaWalletType;
-    baseUrl: string;
-    encryptionKeyFieldName: string;
-}
-export interface SolanaWalletSession {
+export type Cluster = 'mainnet-beta' | 'testnet' | 'devnet';
+export type DeeplinkConnectResult = DeeplinkSession;
+export interface DeeplinkSession {
     sessionToken: string;
     userPublicKey: string;
     walletEncryptionPublicKeyBs58: string;
-    cluster: SolanaCluster;
-}
-export type SolanaConnectResult = SolanaWalletSession;
-export interface SolanaDeeplinkConnectorConfig {
-    walletType: SolanaWalletType;
+    cluster: Cluster;
 }
 export interface SignTransactionRequestParams {
     transaction: string;
@@ -38,7 +25,7 @@ export interface SignMessageRequestParams {
 export interface SignAllTransactionsRequestParams {
     transactions: string[];
 }
-export interface SolanaDeeplinkResponse {
+export interface DeeplinkResponse {
     wallet_encryption_public_key?: string;
     nonce: string;
     data: string;
@@ -47,45 +34,58 @@ export interface DecryptedConnectData {
     public_key: string;
     session: string;
 }
-export type SolanaRpcMethod = 'connect' | 'disconnect' | 'signTransaction' | 'signAndSendTransaction' | 'signAllTransactions' | 'signMessage';
-export interface SolanaConnectParams {
-    app_url: string;
-    dapp_encryption_public_key: string;
-    redirect_link: string;
-    cluster?: SolanaCluster;
+export interface DeeplinkProviderConfig {
+    appScheme: string;
+    dappUrl: string;
+    storage: Storage;
+    cluster?: Cluster;
+    dappEncryptionKeyPair: nacl.BoxKeyPair;
+    type: 'phantom' | 'solflare';
+    baseUrl: string;
+    encryptionKeyFieldName: string;
 }
-export interface SolanaDisconnectParams {
+export type DeeplinkRpcMethod = 'connect' | 'disconnect' | 'signTransaction' | 'signAndSendTransaction' | 'signAllTransactions' | 'signMessage';
+export interface DeeplinkSignTransactionParams {
     dapp_encryption_public_key: string;
     redirect_link: string;
     payload: string;
     nonce: string;
+    cluster?: Cluster;
 }
-export interface SolanaSignTransactionParams {
+export interface DeeplinkSignAllTransactionsParams {
     dapp_encryption_public_key: string;
     redirect_link: string;
     payload: string;
     nonce: string;
-    cluster?: SolanaCluster;
+    cluster?: Cluster;
 }
-export interface SolanaSignAllTransactionsParams {
+export interface DeeplinkSignMessageParams {
     dapp_encryption_public_key: string;
     redirect_link: string;
     payload: string;
     nonce: string;
-    cluster?: SolanaCluster;
 }
-export interface SolanaSignMessageParams {
+export interface DeeplinkConnectParams {
+    app_url: string;
+    dapp_encryption_public_key: string;
+    redirect_link: string;
+    cluster?: Cluster;
+}
+export interface DeeplinkDisconnectParams {
     dapp_encryption_public_key: string;
     redirect_link: string;
     payload: string;
     nonce: string;
 }
-export interface SolanaConnectorConfig {
-    cluster?: SolanaCluster;
+export interface DeeplinkConnectorConfig {
+    type: 'phantom' | 'solflare';
+    cluster?: Cluster;
 }
-export interface SolanaConnectorSessionData {
+export interface DeeplinkConnectorSessionData {
     namespaces: Namespaces;
     wallet: WalletInfo;
     currentCaipNetworkId: CaipNetworkId;
 }
+export type PhantomConnectorConfig = Pick<DeeplinkConnectorConfig, 'cluster'>;
+export type SolflareConnectorConfig = Pick<DeeplinkConnectorConfig, 'cluster'>;
 //# sourceMappingURL=types.d.ts.map

package/lib/typescript/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reown/appkit-solana-react-native",
-  "version": "0.0.0-chore-solflare-20250730210452",
+  "version": "0.0.0-chore-spring-effect-20250909214820",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@reown/appkit-common-react-native": "0.0.0-chore-solflare-20250730210452",
+    "@reown/appkit-common-react-native": "0.0.0-chore-spring-effect-20250909214820",
     "@solana/web3.js": "1.98.2",
     "bs58": "6.0.0",
     "tweetnacl": "1.0.3"

package/src/adapter.ts

@@ -22,9 +22,8 @@ export interface SolanaTransactionData {
 export class SolanaAdapter extends SolanaBaseAdapter {
   private static supportedNamespace: ChainNamespace = 'solana';
 
-  constructor(configParams: { projectId: string }) {
+  constructor() {
     super({
-      projectId: configParams.projectId,
       supportedNamespace: SolanaAdapter.supportedNamespace,
       adapterType: 'solana'
     });
@@ -88,7 +87,7 @@ export class SolanaAdapter extends SolanaBaseAdapter {
       throw new Error('SolanaAdapter:signTransaction - network is undefined');
     }
 
-    const provider = this.connector.getProvider();
+    const provider = this.connector.getProvider('solana');
     if (!provider) {
       throw new Error('SolanaAdapter:signTransaction - provider is undefined');
     }
@@ -151,7 +150,7 @@ export class SolanaAdapter extends SolanaBaseAdapter {
       throw new Error('SolanaAdapter:sendTransaction - no active connector');
     }
 
-    const provider = this.connector.getProvider();
+    const provider = this.connector.getProvider('solana');
     if (!provider) {
       throw new Error('SolanaAdapter:sendTransaction - provider is undefined');
     }
@@ -217,7 +216,7 @@ export class SolanaAdapter extends SolanaBaseAdapter {
   async switchNetwork(network: AppKitNetwork): Promise<void> {
     if (!this.connector) throw new Error('No active connector');
 
-    const provider = this.connector.getProvider();
+    const provider = this.connector.getProvider('solana');
     if (!provider) throw new Error('No active provider');
 
     try {

package/src/connectors/{SolanaDeeplinkConnector.ts → DeeplinkConnector.ts}

@@ -5,7 +5,6 @@ import {
   type ChainNamespace,
   type ConnectOptions,
   type Namespaces,
-  type WalletInfo,
   type CaipAddress,
   type ConnectorInitOptions,
   type Storage,
@@ -17,31 +16,29 @@ import {
 import nacl from 'tweetnacl';
 import bs58 from 'bs58';
 
-import {
-  SolanaDeeplinkProvider,
-  SOLANA_SIGNING_METHODS
-} from '../providers/SolanaDeeplinkProvider';
+import { DeeplinkProvider, SOLANA_SIGNING_METHODS } from '../providers/DeeplinkProvider';
 import type {
-  SolanaCluster,
-  SolanaDeeplinkConnectorConfig,
-  SolanaConnectorSessionData,
-  SolanaDeeplinkProviderConfig
+  Cluster,
+  DeeplinkConnectorConfig,
+  DeeplinkConnectorSessionData,
+  DeeplinkProviderConfig
 } from '../types';
 
-const SOLANA_CLUSTER_TO_CHAIN_ID_PART: Record<SolanaCluster, string> = {
-  'mainnet-beta': solana.id as string,
-  'testnet': solanaTestnet.id as string,
-  'devnet': solanaDevnet.id as string
+const SOLANA_CLUSTER_TO_NETWORK: Record<Cluster, AppKitNetwork> = {
+  'mainnet-beta': solana,
+  'testnet': solanaTestnet,
+  'devnet': solanaDevnet
 };
 
-export abstract class SolanaDeeplinkConnector extends WalletConnector {
-  protected readonly config: SolanaDeeplinkConnectorConfig;
-  protected currentCaipNetworkId: CaipNetworkId | null = null;
-  protected dappEncryptionKeyPair?: nacl.BoxKeyPair;
-  protected static readonly SUPPORTED_NAMESPACE: ChainNamespace = 'solana';
+export abstract class DeeplinkConnector extends WalletConnector {
+  private readonly config: DeeplinkConnectorConfig;
+  private currentCaipNetworkId: CaipNetworkId | null = null;
+  private dappEncryptionKeyPair?: nacl.BoxKeyPair;
+
+  private static readonly SUPPORTED_NAMESPACE: ChainNamespace = 'solana';
 
-  constructor(config: SolanaDeeplinkConnectorConfig) {
-    super({ type: config.walletType });
+  constructor(config: DeeplinkConnectorConfig) {
+    super({ type: config.type });
     this.config = config;
   }
 
@@ -59,21 +56,22 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
     const appScheme = ops.metadata.redirect?.universal ?? ops.metadata.redirect?.native;
     if (!appScheme) {
       throw new Error(
-        `${this.config.walletType} Connector: No redirect link found in metadata. Please add redirect.universal or redirect.native to the metadata.`
+        `${this.type} connector: No redirect link found in metadata. Please add redirect.universal or redirect.native to the metadata.`
       );
     }
 
-    const providerConfig: SolanaDeeplinkProviderConfig = {
+    const providerConfig: DeeplinkProviderConfig = {
       appScheme,
       dappUrl: ops.metadata.url,
       storage: ops.storage,
+      type: this.type as 'phantom' | 'solflare',
+      cluster: this.config?.cluster ?? 'mainnet-beta',
       dappEncryptionKeyPair: this.dappEncryptionKeyPair!,
-      walletType: this.config.walletType,
       baseUrl: this.getBaseUrl(),
       encryptionKeyFieldName: this.getEncryptionKeyFieldName()
     };
 
-    this.provider = new SolanaDeeplinkProvider(providerConfig);
+    this.provider = new DeeplinkProvider(providerConfig);
     await this.restoreSession();
   }
 
@@ -92,50 +90,51 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
         );
       }
     } catch (error) {
+      // disconnect and clear session
       await this.disconnect();
       throw error;
     }
   }
 
   override async connect(opts?: ConnectOptions): Promise<Namespaces | undefined> {
-    if (this.isConnected()) {
+    if (this.isConnected() && this.namespaces) {
       return this.namespaces;
     }
 
-    const defaultChain =
-      opts?.defaultChain?.split(':')?.[0] === 'solana'
-        ? opts?.defaultChain?.split(':')[1]
-        : opts?.namespaces?.['solana']?.chains?.[0]?.split(':')[1];
+    const defaultNetworkId: CaipNetworkId | undefined =
+      opts?.defaultNetwork?.caipNetworkId?.split(':')?.[0] === 'solana'
+        ? opts?.defaultNetwork?.caipNetworkId
+        : opts?.namespaces?.['solana']?.chains?.[0];
 
-    const requestedCluster = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID_PART).find(
-      key =>
-        SOLANA_CLUSTER_TO_CHAIN_ID_PART[key as keyof typeof SOLANA_CLUSTER_TO_CHAIN_ID_PART] ===
-        defaultChain
-    ) as SolanaCluster | undefined;
+    const requestedCluster =
+      this.config?.cluster ??
+      (Object.keys(SOLANA_CLUSTER_TO_NETWORK).find(
+        key => SOLANA_CLUSTER_TO_NETWORK[key as Cluster]?.caipNetworkId === defaultNetworkId
+      ) as Cluster | undefined);
 
     try {
       const connectResult = await this.getProvider().connect({ cluster: requestedCluster });
 
-      const solanaChainIdPart = SOLANA_CLUSTER_TO_CHAIN_ID_PART[connectResult.cluster];
-      if (!solanaChainIdPart) {
+      const solanaChainId = SOLANA_CLUSTER_TO_NETWORK[connectResult.cluster]?.caipNetworkId;
+      if (!solanaChainId) {
         throw new Error(
-          `${this.config.walletType} Connect: Internal - Unknown cluster mapping for ${connectResult.cluster}`
+          `${this.type} Connect: Internal - Unknown cluster mapping for ${connectResult.cluster}`
         );
       }
-      this.currentCaipNetworkId = `solana:${solanaChainIdPart}` as CaipNetworkId;
+      this.currentCaipNetworkId = solanaChainId;
 
-      this.wallet = this.getWalletInfo();
+      this.wallet = {
+        name: this.getWalletInfo()?.name
+      };
 
       const userPublicKey = this.getProvider().getUserPublicKey();
       if (!userPublicKey) {
-        throw new Error(
-          `${this.config.walletType} Connect: Provider failed to return a user public key.`
-        );
+        throw new Error(`${this.type} Connect: Provider failed to return a user public key.`);
       }
 
       const caipAddress = `${this.currentCaipNetworkId}:${userPublicKey}` as CaipAddress;
       this.namespaces = {
-        [SolanaDeeplinkConnector.SUPPORTED_NAMESPACE]: {
+        [DeeplinkConnector.SUPPORTED_NAMESPACE]: {
           accounts: [caipAddress],
           methods: Object.values(SOLANA_SIGNING_METHODS),
           events: [],
@@ -143,7 +142,7 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
         }
       };
 
-      await this.saveSession();
+      await this.saveSession(); // Save connector-specific session on successful connect
 
       return this.namespaces;
     } catch (error: any) {
@@ -158,8 +157,16 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
         await super.disconnect();
       }
     } catch (error: any) {
-      // console.warn(`${this.config.walletType}Connector: Error during provider disconnect: ${error.message}. Proceeding with local clear.`);
+      console.warn(
+        `${this.type} Connector: Error during provider disconnect: ${error.message}. Proceeding with local clear.`
+      );
     }
+
+    // Cleanup provider resources
+    if (this.provider) {
+      (this.provider as DeeplinkProvider).destroy();
+    }
+
     await this.clearSession();
   }
 
@@ -170,21 +177,17 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
     await this.clearSessionStorage();
   }
 
-  override getProvider(): SolanaDeeplinkProvider {
+  override getProvider(): DeeplinkProvider {
     if (!this.provider) {
-      throw new Error(
-        `${this.config.walletType} Connector: Provider not initialized. Call init() first.`
-      );
+      throw new Error(`${this.type} Connector: Provider not initialized. Call init() first.`);
     }
 
-    return this.provider as SolanaDeeplinkProvider;
+    return this.provider as DeeplinkProvider;
   }
 
   private getStorage(): Storage {
     if (!this.storage) {
-      throw new Error(
-        `${this.config.walletType} Connector: Storage not initialized. Call init() first.`
-      );
+      throw new Error(`${this.type} Connector: Storage not initialized. Call init() first.`);
     }
 
     return this.storage;
@@ -192,14 +195,14 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
 
   override getNamespaces(): Namespaces {
     if (!this.namespaces) {
-      throw new Error(`${this.config.walletType} Connector: Not connected. Call connect() first.`);
+      throw new Error(`${this.type} Connector: Not connected. Call connect() first.`);
     }
 
     return this.namespaces;
   }
 
   override getChainId(namespace: ChainNamespace): CaipNetworkId | undefined {
-    if (namespace === SolanaDeeplinkConnector.SUPPORTED_NAMESPACE) {
+    if (namespace === DeeplinkConnector.SUPPORTED_NAMESPACE) {
       return this.currentCaipNetworkId ?? undefined;
     }
 
@@ -210,61 +213,53 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
     return this.properties;
   }
 
-  override getWalletInfo(): WalletInfo | undefined {
-    if (!this.isConnected()) {
-      return undefined;
-    }
-
-    return this.wallet;
-  }
-
   isConnected(): boolean {
     // Rely solely on the provider as the source of truth for connection status.
-    return this.getProvider().isConnected() && !!this.getProvider().getUserPublicKey();
+    const provider = this.getProvider();
+
+    return provider.isConnected() && !!provider.getUserPublicKey();
   }
 
   override async switchNetwork(network: AppKitNetwork): Promise<void> {
-    const targetClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID_PART).find(
-      key =>
-        SOLANA_CLUSTER_TO_CHAIN_ID_PART[key as keyof typeof SOLANA_CLUSTER_TO_CHAIN_ID_PART] ===
-        network.id
-    ) as SolanaCluster | undefined;
+    const targetClusterName = Object.keys(SOLANA_CLUSTER_TO_NETWORK).find(
+      key => SOLANA_CLUSTER_TO_NETWORK[key as Cluster]?.caipNetworkId === network.caipNetworkId
+    ) as Cluster | undefined;
 
     if (!targetClusterName) {
-      throw new Error(`Cannot switch to unsupported network ID: ${network.id}`);
+      throw new Error(
+        `${this.type} Connector: Cannot switch to unsupported network ID: ${network.id}`
+      );
     }
 
-    const currentClusterName = Object.keys(SOLANA_CLUSTER_TO_CHAIN_ID_PART).find(
-      key =>
-        `solana:${
-          SOLANA_CLUSTER_TO_CHAIN_ID_PART[key as keyof typeof SOLANA_CLUSTER_TO_CHAIN_ID_PART]
-        }` === this.currentCaipNetworkId
-    ) as SolanaCluster | undefined;
+    const currentClusterName = Object.keys(SOLANA_CLUSTER_TO_NETWORK).find(
+      key => SOLANA_CLUSTER_TO_NETWORK[key as Cluster]?.caipNetworkId === this.currentCaipNetworkId
+    ) as Cluster | undefined;
 
     if (targetClusterName === currentClusterName && this.isConnected()) {
       return Promise.resolve();
     }
 
-    // Solana wallets don't provide a way to switch network, so we need to disconnect and reconnect.
+    // Phantom/Solflare don't provide a way to switch network, so we need to disconnect and reconnect.
     await this.disconnect(); // Clear current session
 
     // Create a temporary options object to guide the new connection
     const tempConnectOpts: ConnectOptions = {
-      defaultChain: `solana:${SOLANA_CLUSTER_TO_CHAIN_ID_PART[targetClusterName]}` as CaipNetworkId
+      defaultNetwork: SOLANA_CLUSTER_TO_NETWORK[targetClusterName]
     };
 
     // Attempt to connect to the new cluster
-    // The connect method will use the defaultChain from opts to determine the cluster.
+    // The connect method will use the defaultNetwork from opts to determine the cluster.
     await this.connect(tempConnectOpts);
     this.getProvider().emit('chainChanged', network.id);
 
     // Verify if the connection was successful and to the correct new network
     if (
       !this.isConnected() ||
-      this.getChainId(SolanaDeeplinkConnector.SUPPORTED_NAMESPACE) !== tempConnectOpts.defaultChain
+      this.getChainId(DeeplinkConnector.SUPPORTED_NAMESPACE) !==
+        tempConnectOpts.defaultNetwork?.caipNetworkId
     ) {
       throw new Error(
-        `Failed to switch network to ${targetClusterName}. Please try connecting manually.`
+        `${this.type} Connector: Failed to switch network to ${targetClusterName}. Please try connecting manually.`
       );
     }
   }
@@ -278,17 +273,39 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
       }
 
       // If provider session is restored, try to restore connector data
-      const connectorData = await this.getStorage().getItem<SolanaConnectorSessionData>(
+      const connectorData = await this.getStorage().getItem<DeeplinkConnectorSessionData>(
         this.getStorageKey()
       );
       if (!connectorData) {
-        return false; // Provider session exists but connector data is missing
+        // Self-heal: reconstruct connector state from provider session
+        const userPublicKey = this.getProvider().getUserPublicKey();
+        const cluster = this.getProvider().getCurrentCluster();
+        const caipNetworkId = SOLANA_CLUSTER_TO_NETWORK[cluster]?.caipNetworkId;
+        if (userPublicKey && caipNetworkId) {
+          this.currentCaipNetworkId = caipNetworkId;
+          this.wallet = { name: this.getWalletInfo()?.name };
+          const caipAddress = `${caipNetworkId}:${userPublicKey}` as CaipAddress;
+          this.namespaces = {
+            [DeeplinkConnector.SUPPORTED_NAMESPACE]: {
+              accounts: [caipAddress],
+              methods: Object.values(SOLANA_SIGNING_METHODS),
+              events: [],
+              chains: [caipNetworkId]
+            }
+          };
+          await this.saveSession();
+        } else {
+          // Provider looks connected but we can't reconstruct state → clear everything
+          await this.disconnect();
+
+          return false;
+        }
+      } else {
+        this.namespaces = connectorData.namespaces;
+        this.wallet = connectorData.wallet;
+        this.currentCaipNetworkId = connectorData.currentCaipNetworkId;
       }
 
-      this.namespaces = connectorData.namespaces;
-      this.wallet = connectorData.wallet;
-      this.currentCaipNetworkId = connectorData.currentCaipNetworkId;
-
       // Final validation
       if (this.isConnected()) {
         return true;
@@ -312,7 +329,7 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
       return;
     }
 
-    const connectorData: SolanaConnectorSessionData = {
+    const connectorData: DeeplinkConnectorSessionData = {
       namespaces: this.namespaces,
       wallet: this.wallet,
       currentCaipNetworkId: this.currentCaipNetworkId
@@ -321,7 +338,7 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
     try {
       await this.getStorage().setItem(this.getStorageKey(), connectorData);
     } catch (error) {
-      // console.error(`${this.config.walletType}Connector: Failed to save session.`, error);
+      // console.error(`${this.type} Connector: Failed to save session.`, error);
     }
   }
 
@@ -330,7 +347,7 @@ export abstract class SolanaDeeplinkConnector extends WalletConnector {
     try {
       await this.getStorage().removeItem(this.getStorageKey());
     } catch (error) {
-      // console.error(`${this.config.walletType}Connector: Failed to clear session from storage.`, error);
+      // console.error(`${this.type} Connector: Failed to clear session from storage.`, error);
     }
   }
 }

package/src/connectors/PhantomConnector.ts

@@ -1,13 +1,14 @@
 import { ConstantsUtil, type WalletInfo } from '@reown/appkit-common-react-native';
-import { SolanaDeeplinkConnector } from './SolanaDeeplinkConnector';
+import { DeeplinkConnector } from './DeeplinkConnector';
+import type { PhantomConnectorConfig } from '../types';
 
 const PHANTOM_BASE_URL = 'https://phantom.app/ul/v1';
 const PHANTOM_CONNECTOR_STORAGE_KEY = '@appkit/phantom-connector-data';
 const PHANTOM_DAPP_KEYPAIR_STORAGE_KEY = '@appkit/phantom-dapp-secret-key';
 
-export class PhantomConnector extends SolanaDeeplinkConnector {
-  constructor() {
-    super({ walletType: 'phantom' });
+export class PhantomConnector extends DeeplinkConnector {
+  constructor(config?: PhantomConnectorConfig) {
+    super({ type: 'phantom', cluster: config?.cluster });
   }
 
   override getWalletInfo(): WalletInfo {