@rango-dev/wallets-core 0.49.1-next.2 → 0.49.1-next.4

package/src/namespaces/evm/actions.ts

@@ -40,16 +40,26 @@ export function connect(
       }
     }
 
-    const result = await getAccounts(evmInstance);
+    const providerAccounts = await getAccounts(evmInstance);
 
+    /*
+     * Ensure that the provider returns at least one valid account before proceeding.
+     * This prevents cases (e.g., MetaMask bug) where a user connects with an account
+     * that has no associated EVM address, leaving the dApp without any usable accounts.
+     */
+    if (!providerAccounts.accounts || !providerAccounts.accounts.length) {
+      throw new Error(
+        'No accounts were returned by the provider. Please make sure your wallet has an active EVM-compatible account selected.'
+      );
+    }
     const formattedAccounts = formatAccountsToCAIP(
-      result.accounts,
-      result.chainId
+      providerAccounts.accounts,
+      providerAccounts.chainId
     );
 
     return {
       accounts: formattedAccounts,
-      network: result.chainId,
+      network: providerAccounts.chainId,
     };
   };
 }

package/src/namespaces/evm/builders.ts

@@ -1,7 +1,5 @@
 import type { EvmActions, ProviderAPI } from './types.js';
 
-import { AccountId } from 'caip';
-
 import { ActionBuilder } from '../../mod.js';
 import { ChangeAccountSubscriberBuilder } from '../common/hooks/changeAccountSubscriber.js';
 import {
@@ -10,7 +8,7 @@ import {
   intoConnectionFinished,
 } from '../common/mod.js';
 
-import { CAIP_NAMESPACE } from './constants.js';
+import { formatAccountsToCAIP } from './utils.js';
 
 // Actions
 export const connect = () =>
@@ -39,15 +37,7 @@ export const changeAccountSubscriber = (getInstance: () => ProviderAPI) =>
     )
     .format(async (instance, accounts) => {
       const chainId = await instance.request({ method: 'eth_chainId' });
-      return accounts.map((account) =>
-        AccountId.format({
-          address: account,
-          chainId: {
-            namespace: CAIP_NAMESPACE,
-            reference: chainId,
-          },
-        })
-      );
+      return formatAccountsToCAIP(accounts, chainId);
     })
     .addEventListener((instance, callback) => {
       instance.on('accountsChanged', callback);

package/src/namespaces/evm/eip1193.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /*
  * These are copied from `viem` (EIP1193Provider)
  * They have an issue with `node16`, we can not directly import from their package.
@@ -241,7 +242,6 @@ export type EIP1193Events = {
 
 export type Prettify<T> = {
   [K in keyof T]: T[K];
-  // eslint-disable-next-line @typescript-eslint/ban-types
 } & {};
 
 export type RpcSchema = readonly {
@@ -1411,4 +1411,5 @@ export type EIP1474Methods = [
 
 export type EIP1193Provider = EIP1193Events & {
   request: EIP1193RequestFn<EIP1474Methods>;
+  disconnect: () => void;
 };

package/src/namespaces/solana/utils.ts

@@ -9,7 +9,13 @@ import { CAIP_NAMESPACE, CAIP_SOLANA_CHAIN_ID } from './constants.js';
 
 export async function getAccounts(provider: ProviderAPI) {
   const solanaResponse = await provider.connect();
-  const account = solanaResponse.publicKey.toString();
+  /*
+   * Fallback for wallets like Coinbase that return no response on connect.
+   * If solanaResponse is undefined, use the provider's publicKey directly.
+   */
+  const account = solanaResponse
+    ? solanaResponse.publicKey.toString()
+    : provider.publicKey.toString();
   return {
     accounts: [account],
     chainId: LegacyNetworks.SOLANA,

package/src/types/mod.ts

@@ -1 +1 @@
-export type { AnyFunction } from './actions.js';
+export type { AnyFunction, FunctionWithContext } from './actions.js';