@rango-dev/wallets-core 0.51.1-next.1 → 0.53.1-next.0

package/src/namespaces/solana/builders.ts

@@ -21,14 +21,16 @@ export const connect = () =>
 export const changeAccountSubscriber = (getInstance: () => ProviderAPI) =>
   new ChangeAccountSubscriberBuilder<string, ProviderAPI>()
     .getInstance(getInstance)
-    .validateEventPayload(
-      (accounts) =>
-        /*
-         * In some wallets, when a user switches to an account not yet connected to the dApp, it returns null.
-         * A null value indicates no access to the account, requiring a disconnect and user reconnection.
-         */
-        !!accounts
-    )
+    /*
+     * In some wallets, when a user switches to an account not yet connected to the dApp, it returns null.
+     * A null value indicates no access to the account, requiring a disconnect and user reconnection.
+     */
+    .onSwitchAccount((event, context) => {
+      if (!event.payload) {
+        context.action('disconnect');
+        event.preventDefault();
+      }
+    })
     .format(async (_, accounts) => formatAccountsToCAIP([accounts]))
     .addEventListener((instance, callback) => {
       instance.on('accountChanged', callback);

package/src/namespaces/sui/builders.ts

@@ -59,15 +59,16 @@ export const changeAccountSubscriber = (
     ProviderAPI
   >()
     .getInstance(() => getInstanceOrThrow(params.name))
-    .validateEventPayload(
-      (event) =>
-        /*
-         * In some wallets, when a user switches to an account not yet connected to the dApp, it returns null.
-         * A null value indicates no access to the account, requiring a disconnect and user reconnection.
-         */
-
-        event.accounts?.length !== 0
-    )
+    /*
+     * In some wallets, when a user switches to an account not yet connected to the dApp, it returns null.
+     * A null value indicates no access to the account, requiring a disconnect and user reconnection.
+     */
+    .onSwitchAccount((event, context) => {
+      if (!event.payload.accounts?.length) {
+        context.action('disconnect');
+        event.preventDefault();
+      }
+    })
     .format(async (_, event) => formatAccountsToCAIP(event.accounts))
     .addEventListener((instance, callback) =>
       instance.features['standard:events'].on('change', callback)

package/src/namespaces/utxo/mod.ts

@@ -3,6 +3,6 @@ export * as after from './after.js';
 export * as and from './and.js';
 export * as before from './before.js';
 export * as builders from './builders.js';
-
+export * as utils from './utils.js';
 export type { ProviderAPI, UtxoActions } from './types.js';
 export { CAIP_NAMESPACE, CAIP_BITCOIN_CHAIN_ID } from './constants.js';

package/src/namespaces/utxo/utils.ts

@@ -0,0 +1,18 @@
+import type { CaipAccount } from '../common/mod.js';
+
+import { AccountId } from 'caip';
+
+import { CAIP_BITCOIN_CHAIN_ID, CAIP_NAMESPACE } from './constants.js';
+
+export function formatAccountsToCAIP(accounts: string[]) {
+  return accounts.map(
+    (account) =>
+      AccountId.format({
+        address: account.toString(),
+        chainId: {
+          namespace: CAIP_NAMESPACE,
+          reference: CAIP_BITCOIN_CHAIN_ID,
+        },
+      }) as CaipAccount
+  );
+}