@reown/appkit-core-react-native 0.0.0-fix-approved-networks-20250822000414 → 0.0.0-fix-ui-changes-20250828183750

package/lib/module/controllers/ConnectionsController.js

@@ -0,0 +1,399 @@
+"use strict";
+
+import { proxy, ref } from 'valtio';
+import { derive } from 'derive-valtio';
+import { EVMAdapter, SolanaBaseAdapter } from '@reown/appkit-common-react-native';
+import { StorageUtil } from '../utils/StorageUtil';
+import { BlockchainApiController } from './BlockchainApiController';
+import { SnackController } from './SnackController';
+import { CoreHelperUtil } from '../utils/CoreHelperUtil';
+
+// -- Types --------------------------------------------- //
+
+// -- State --------------------------------------------- //
+const baseState = proxy({
+  activeNamespace: undefined,
+  connections: new Map(),
+  networks: []
+});
+
+// -- Helper Functions --------------------------------------------- //
+const getActiveConnection = snap => {
+  if (!snap.activeNamespace) return undefined;
+  return snap.connections.get(snap.activeNamespace);
+};
+const hasValidAccounts = connection => {
+  return connection?.accounts && connection.accounts.length > 0;
+};
+const findSmartAccountForNetwork = connection => {
+  return connection.properties?.smartAccounts?.find(account => account.startsWith(connection.caipNetwork));
+};
+const findEOAForNetwork = connection => {
+  const smartAccounts = connection.properties?.smartAccounts || [];
+  return connection.accounts.find(account => account.startsWith(connection.caipNetwork) && !smartAccounts.includes(account));
+};
+const getActiveAddress = connection => {
+  if (!hasValidAccounts(connection)) {
+    return undefined;
+  }
+
+  // For smart accounts, prioritize smart account addresses
+  if (connection.type === 'smartAccount') {
+    const smartAccount = findSmartAccountForNetwork(connection);
+    if (smartAccount) {
+      return smartAccount;
+    }
+  }
+
+  // Fall back to EOA or any account that matches the network
+  return findEOAForNetwork(connection);
+};
+const updateConnection = (namespace, connection, updates) => {
+  if (!connection) return;
+  const newConnectionsMap = new Map(baseState.connections);
+  newConnectionsMap.set(namespace, {
+    ...connection,
+    ...updates
+  });
+  baseState.connections = newConnectionsMap;
+};
+const getActiveIdentity = connection => {
+  const activeAddress = getActiveAddress(connection);
+  if (!activeAddress) return undefined;
+  return connection.identities?.get(activeAddress);
+};
+const derivedState = derive({
+  isConnected: get => {
+    const snap = get(baseState);
+    return !!snap.activeNamespace && !!snap.connections.size;
+  },
+  activeAddress: get => {
+    const snap = get(baseState);
+    const connection = getActiveConnection(snap);
+    return connection ? getActiveAddress(connection) : undefined;
+  },
+  identity: get => {
+    const snap = get(baseState);
+    const connection = getActiveConnection(snap);
+    return connection ? getActiveIdentity(connection) : undefined;
+  },
+  activeBalance: get => {
+    const snap = get(baseState);
+    const connection = getActiveConnection(snap);
+    if (!connection) {
+      return undefined;
+    }
+    const activeAddress = getActiveAddress(connection);
+    if (!activeAddress || !connection.balances || connection.balances.size === 0) {
+      return undefined;
+    }
+    const addressBalances = connection.balances.get(activeAddress);
+    if (!addressBalances || addressBalances.length === 0) {
+      return undefined;
+    }
+
+    // Return the native token (first balance without address)
+    const nativeToken = addressBalances.find(balance => !balance.address);
+    if (nativeToken) {
+      return nativeToken;
+    }
+
+    // Fallback to first available balance
+    return addressBalances[0];
+  },
+  activeNetwork: get => {
+    const snap = get(baseState);
+    const connection = getActiveConnection(snap);
+    if (!connection) return undefined;
+    return snap.networks.find(network => network.chainNamespace === snap.activeNamespace && network.id?.toString() === connection.caipNetwork?.split(':')[1]);
+  },
+  activeCaipNetworkId: get => {
+    const snap = get(baseState);
+    const connection = getActiveConnection(snap);
+    return connection?.caipNetwork;
+  },
+  accountType: get => {
+    const snap = get(baseState);
+    const connection = getActiveConnection(snap);
+    return connection?.type;
+  },
+  connection: get => {
+    const snap = get(baseState);
+    return getActiveConnection(snap);
+  },
+  balances: get => {
+    const snap = get(baseState);
+    const _connection = getActiveConnection(snap);
+    if (!_connection) {
+      return undefined;
+    }
+    const _activeAddress = getActiveAddress(_connection);
+    if (!_activeAddress) return [];
+    return _connection?.balances.get(_activeAddress)
+    // Filter out tokens with no quantity
+    ?.filter(balance => balance?.quantity?.numeric);
+  },
+  walletInfo: get => {
+    const snap = get(baseState);
+    const connection = getActiveConnection(snap);
+    return connection?.wallet;
+  }
+}, {
+  proxy: baseState // Link derived proxy to the base state proxy
+});
+
+// -- Controller ---------------------------------------- //
+export const ConnectionsController = {
+  state: derivedState,
+  setActiveNamespace(namespace) {
+    baseState.activeNamespace = namespace;
+    StorageUtil.setActiveNamespace(namespace);
+  },
+  setConnection({
+    accounts,
+    adapter,
+    caipNetwork,
+    namespace,
+    properties,
+    wallet
+  }) {
+    const type = properties?.smartAccounts?.length && properties.smartAccounts.find(account => account.startsWith(caipNetwork)) ? 'smartAccount' : 'eoa';
+    const newConnectionEntry = {
+      balances: new Map(),
+      caipNetwork,
+      adapter: ref(adapter),
+      accounts,
+      wallet,
+      properties,
+      type
+    };
+
+    // Create a new Map to ensure Valtio detects the change
+    const newConnectionsMap = new Map(baseState.connections);
+    newConnectionsMap.set(namespace, newConnectionEntry);
+    baseState.connections = newConnectionsMap;
+  },
+  updateAccounts(namespace, accounts) {
+    const connection = baseState.connections.get(namespace);
+    if (!connection) {
+      return;
+    }
+    const newConnectionsMap = new Map(baseState.connections);
+    const updatedConnection = {
+      ...connection,
+      accounts
+    };
+    newConnectionsMap.set(namespace, updatedConnection);
+    baseState.connections = newConnectionsMap;
+  },
+  updateBalance(namespace, address, balance) {
+    const connection = baseState.connections.get(namespace);
+    if (!connection) {
+      console.warn(`No connection found for namespace: ${namespace}`);
+      return;
+    }
+    const newBalances = new Map(connection.balances);
+    const existingBalances = connection.balances.get(address) || [];
+    // Check if this token already exists by contract address or symbol
+    const existingIndex = existingBalances.findIndex(existingBalance => {
+      if (balance.address) {
+        return existingBalance.address === balance.address;
+      }
+      return existingBalance.symbol === balance.symbol;
+    });
+    let updatedBalances;
+    if (existingIndex >= 0) {
+      // Update existing token
+      updatedBalances = [...existingBalances];
+      updatedBalances[existingIndex] = {
+        ...updatedBalances[existingIndex],
+        ...balance
+      };
+    } else {
+      // Add new token
+      updatedBalances = [...existingBalances, balance];
+    }
+    newBalances.set(address, updatedBalances);
+    updateConnection(namespace, connection, {
+      balances: newBalances
+    });
+  },
+  updateIdentity(namespace, connection, plainAddress, identity) {
+    const accounts = connection.accounts.filter(account => CoreHelperUtil.getPlainAddress(account) === plainAddress);
+    if (accounts.length > 0) {
+      const newIdentities = new Map(connection.identities || []);
+      let hasChanges = false;
+      accounts.forEach(account => {
+        const existingIdentity = newIdentities.get(account);
+        if (!existingIdentity || existingIdentity.name !== identity.name) {
+          newIdentities.set(account, identity);
+          hasChanges = true;
+        }
+      });
+      if (hasChanges) {
+        updateConnection(namespace, connection, {
+          identities: newIdentities
+        });
+      }
+    }
+  },
+  setActiveNetwork(namespace, networkId) {
+    const connection = baseState.connections.get(namespace);
+    if (!connection) {
+      return;
+    }
+    baseState.connections.set(namespace, {
+      ...connection,
+      caipNetwork: networkId
+    });
+  },
+  setNetworks(networks) {
+    baseState.networks = networks;
+  },
+  getConnectedNetworks() {
+    return baseState.networks.filter(network => baseState.connections.get(network.chainNamespace)?.accounts.some(account => account.startsWith(network.caipNetworkId)));
+  },
+  setAccountType(namespace, type) {
+    const connection = baseState.connections.get(namespace);
+    if (!connection) return;
+    const newConnectionsMap = new Map(baseState.connections);
+    const newConnection = {
+      ...connection,
+      type
+    };
+    newConnectionsMap.set(namespace, newConnection);
+    baseState.connections = newConnectionsMap;
+  },
+  async disconnect(namespace, isInternal = true) {
+    const connection = baseState.connections.get(namespace);
+    if (!connection) return;
+
+    // Get the current connector from the adapter
+    const connector = connection.adapter.connector;
+    if (!connector) return;
+
+    // Find all namespaces that use the same connector
+    const namespacesUsingConnector = Array.from(baseState.connections.keys()).filter(ns => baseState.connections.get(ns)?.adapter.connector === connector);
+
+    // Unsubscribe all event listeners from the adapter
+    namespacesUsingConnector.forEach(ns => {
+      const _connection = baseState.connections.get(ns);
+      if (_connection?.adapter) {
+        _connection.adapter.removeAllListeners();
+      }
+    });
+
+    // Disconnect the adapter
+    if (isInternal) {
+      await connection.adapter.disconnect();
+    }
+
+    // Remove all namespaces that used this connector
+    const newConnectionsMap = new Map(baseState.connections);
+    namespacesUsingConnector.forEach(ns => {
+      newConnectionsMap.delete(ns);
+    });
+    baseState.connections = newConnectionsMap;
+
+    // Remove activeNamespace if it is in the list of namespaces using the connector
+    if (baseState.activeNamespace && (baseState.activeNamespace === namespace || namespacesUsingConnector.includes(baseState.activeNamespace))) {
+      baseState.activeNamespace = undefined;
+      StorageUtil.setActiveNamespace(undefined);
+    }
+  },
+  parseUnits(value, decimals) {
+    if (!baseState.activeNamespace) return undefined;
+    return baseState.connections.get(baseState.activeNamespace)?.adapter.parseUnits(value, decimals);
+  },
+  async signMessage(address, message) {
+    if (!baseState.activeNamespace) return undefined;
+    const [namespace, chainId, plainAddress] = address.split(':');
+    if (!namespace || namespace !== baseState.activeNamespace || !chainId || !plainAddress) {
+      return undefined;
+    }
+    const adapter = baseState.connections.get(baseState.activeNamespace)?.adapter;
+    if (adapter instanceof EVMAdapter && plainAddress && chainId) {
+      return adapter.signMessage(plainAddress, message, chainId);
+    }
+    return undefined;
+  },
+  async sendTransaction(args) {
+    if (!baseState.activeNamespace) return undefined;
+    const adapter = baseState.connections.get(baseState.activeNamespace)?.adapter;
+    if (adapter instanceof EVMAdapter || adapter instanceof SolanaBaseAdapter) {
+      return adapter.sendTransaction(args);
+    }
+    return undefined;
+  },
+  async estimateGas(args) {
+    if (!baseState.activeNamespace || baseState.activeNamespace !== 'eip155') return undefined;
+    const adapter = baseState.connections.get(baseState.activeNamespace)?.adapter;
+    if (adapter instanceof EVMAdapter) {
+      return adapter.estimateGas(args);
+    }
+    return undefined;
+  },
+  async writeContract(args) {
+    if (!baseState.activeNamespace) return undefined;
+    const adapter = baseState.connections.get(baseState.activeNamespace)?.adapter;
+    if (adapter instanceof EVMAdapter) {
+      return adapter.writeContract(args);
+    }
+    return undefined;
+  },
+  async fetchBalance(forceUpdateAddresses) {
+    const connection = getActiveConnection(baseState);
+    if (!connection) {
+      throw new Error('No active connection found for balance fetch');
+    }
+    const chainId = connection.caipNetwork;
+    const address = getActiveAddress(connection);
+    const namespace = baseState.activeNamespace;
+    if (!namespace || !address || !chainId) {
+      throw new Error('Missing required data for balance fetch');
+    }
+    try {
+      const response = await BlockchainApiController.getBalance(address, forceUpdateAddresses);
+      if (!response) {
+        throw new Error('Failed to fetch token balance');
+      }
+      // Update balances for each token in the response
+      response.balances.forEach(balance => {
+        this.updateBalance(namespace, address, {
+          name: balance.name,
+          symbol: balance.symbol,
+          amount: balance.quantity.numeric,
+          address: balance.address,
+          quantity: balance.quantity,
+          price: balance.price,
+          value: balance.value,
+          iconUrl: balance.iconUrl
+        });
+      });
+    } catch (error) {
+      SnackController.showError('Failed to get account balance');
+    }
+  },
+  getSmartAccountEnabledNetworks() {
+    const activeConnection = getActiveConnection(baseState);
+    if (!activeConnection) {
+      return [];
+    }
+    if (!activeConnection.properties?.smartAccounts?.length) {
+      return [];
+    }
+    const smartAccountNetworks = new Set();
+    activeConnection.properties.smartAccounts.forEach(smartAccount => {
+      const parts = smartAccount.split(':');
+      if (parts.length >= 2) {
+        const networkId = `${parts[0]}:${parts[1]}`;
+        smartAccountNetworks.add(networkId);
+      }
+    });
+    return baseState.networks.filter(network => {
+      const networkId = `${network.chainNamespace}:${network.id}`;
+      return smartAccountNetworks.has(networkId);
+    });
+  }
+};
+//# sourceMappingURL=ConnectionsController.js.map

package/lib/module/controllers/ConnectionsController.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["proxy","ref","derive","EVMAdapter","SolanaBaseAdapter","StorageUtil","BlockchainApiController","SnackController","CoreHelperUtil","baseState","activeNamespace","undefined","connections","Map","networks","getActiveConnection","snap","get","hasValidAccounts","connection","accounts","length","findSmartAccountForNetwork","properties","smartAccounts","find","account","startsWith","caipNetwork","findEOAForNetwork","includes","getActiveAddress","type","smartAccount","updateConnection","namespace","updates","newConnectionsMap","set","getActiveIdentity","activeAddress","identities","derivedState","isConnected","size","identity","activeBalance","balances","addressBalances","nativeToken","balance","address","activeNetwork","network","chainNamespace","id","toString","split","activeCaipNetworkId","accountType","_connection","_activeAddress","filter","quantity","numeric","walletInfo","wallet","ConnectionsController","state","setActiveNamespace","setConnection","adapter","newConnectionEntry","updateAccounts","updatedConnection","updateBalance","console","warn","newBalances","existingBalances","existingIndex","findIndex","existingBalance","symbol","updatedBalances","updateIdentity","plainAddress","getPlainAddress","newIdentities","hasChanges","forEach","existingIdentity","name","setActiveNetwork","networkId","setNetworks","getConnectedNetworks","some","caipNetworkId","setAccountType","newConnection","disconnect","isInternal","connector","namespacesUsingConnector","Array","from","keys","ns","removeAllListeners","delete","parseUnits","value","decimals","signMessage","message","chainId","sendTransaction","args","estimateGas","writeContract","fetchBalance","forceUpdateAddresses","Error","response","getBalance","amount","price","iconUrl","error","showError","getSmartAccountEnabledNetworks","activeConnection","smartAccountNetworks","Set","parts","add","has"],"sourceRoot":"../../../src","sources":["controllers/ConnectionsController.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/controllers/EnsController.js

@@ -1,3 +1,5 @@
+"use strict";
+
 import { subscribeKey as subKey } from 'valtio/utils';
 import { proxy, subscribe as sub } from 'valtio';
 import { BlockchainApiController } from './BlockchainApiController';

package/lib/module/controllers/EnsController.js.map

@@ -1 +1 @@
-{"version":3,"names":["subscribeKey","subKey","proxy","subscribe","sub","BlockchainApiController","state","loading","EnsController","callback","key","resolveName","name","lookupEnsName","e","error","Error","reasons","description"],"sourceRoot":"../../../src","sources":["controllers/EnsController.ts"],"mappings":"AAAA,SAASA,YAAY,IAAIC,MAAM,QAAQ,cAAc;AACrD,SAASC,KAAK,EAAEC,SAAS,IAAIC,GAAG,QAAQ,QAAQ;AAChD,SAASC,uBAAuB,QAAQ,2BAA2B;;AAGnE;;AAQA;AACA,MAAMC,KAAK,GAAGJ,KAAK,CAAqB;EACtCK,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,aAAa,GAAG;EAC3BF,KAAK;EAELH,SAASA,CAACM,QAAgD,EAAE;IAC1D,OAAOL,GAAG,CAACE,KAAK,EAAE,MAAMG,QAAQ,CAACH,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDN,YAAYA,CAAqBU,GAAM,EAAED,QAAgD,EAAE;IACzF,OAAOR,MAAM,CAACK,KAAK,EAAEI,GAAG,EAAED,QAAQ,CAAC;EACrC,CAAC;EAED,MAAME,WAAWA,CAACC,IAAY,EAAE;IAC9B,IAAI;MACF,OAAO,MAAMP,uBAAuB,CAACQ,aAAa,CAACD,IAAI,CAAC;IAC1D,CAAC,CAAC,OAAOE,CAAC,EAAE;MACV,MAAMC,KAAK,GAAGD,CAA0B;MACxC,MAAM,IAAIE,KAAK,CAACD,KAAK,EAAEE,OAAO,GAAG,CAAC,CAAC,EAAEC,WAAW,IAAI,sBAAsB,CAAC;IAC7E;EACF;AACF,CAAC"}
+{"version":3,"names":["subscribeKey","subKey","proxy","subscribe","sub","BlockchainApiController","state","loading","EnsController","callback","key","resolveName","name","lookupEnsName","e","error","Error","reasons","description"],"sourceRoot":"../../../src","sources":["controllers/EnsController.ts"],"mappings":";;AAAA,SAASA,YAAY,IAAIC,MAAM,QAAQ,cAAc;AACrD,SAASC,KAAK,EAAEC,SAAS,IAAIC,GAAG,QAAQ,QAAQ;AAChD,SAASC,uBAAuB,QAAQ,2BAA2B;;AAGnE;;AAQA;AACA,MAAMC,KAAK,GAAGJ,KAAK,CAAqB;EACtCK,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,aAAa,GAAG;EAC3BF,KAAK;EAELH,SAASA,CAACM,QAAgD,EAAE;IAC1D,OAAOL,GAAG,CAACE,KAAK,EAAE,MAAMG,QAAQ,CAACH,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDN,YAAYA,CAAqBU,GAAM,EAAED,QAAgD,EAAE;IACzF,OAAOR,MAAM,CAACK,KAAK,EAAEI,GAAG,EAAED,QAAQ,CAAC;EACrC,CAAC;EAED,MAAME,WAAWA,CAACC,IAAY,EAAE;IAC9B,IAAI;MACF,OAAO,MAAMP,uBAAuB,CAACQ,aAAa,CAACD,IAAI,CAAC;IAC1D,CAAC,CAAC,OAAOE,CAAC,EAAE;MACV,MAAMC,KAAK,GAAGD,CAA0B;MACxC,MAAM,IAAIE,KAAK,CAACD,KAAK,EAAEE,OAAO,GAAG,CAAC,CAAC,EAAEC,WAAW,IAAI,sBAAsB,CAAC;IAC7E;EACF;AACF,CAAC","ignoreList":[]}

package/lib/module/controllers/EventsController.js

@@ -1,3 +1,5 @@
+"use strict";
+
 import { proxy, subscribe as sub } from 'valtio';
 import { ApiController } from './ApiController';
 import { OptionsController } from './OptionsController';

package/lib/module/controllers/EventsController.js.map

@@ -1 +1 @@
-{"version":3,"names":["proxy","subscribe","sub","ApiController","OptionsController","CoreHelperUtil","FetchUtil","baseUrl","getAnalyticsUrl","api","excluded","state","timestamp","Date","now","data","type","event","EventsController","callback","subscribeEvent","_sendAnalyticsEvent","includes","post","path","headers","_getApiHeaders","body","eventId","getUUID","bundleId","getBundleId","props","sendEvent","prefetchPromise","enableAnalytics"],"sourceRoot":"../../../src","sources":["controllers/EventsController.ts"],"mappings":"AAAA,SAASA,KAAK,EAAEC,SAAS,IAAIC,GAAG,QAAQ,QAAQ;AAChD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,iBAAiB,QAAQ,qBAAqB;AACvD,SAASC,cAAc,QAAQ,yBAAyB;AACxD,SAASC,SAAS,QAAQ,oBAAoB;AAG9C;AACA,MAAMC,OAAO,GAAGF,cAAc,CAACG,eAAe,CAAC,CAAC;AAChD,MAAMC,GAAG,GAAG,IAAIH,SAAS,CAAC;EAAEC;AAAQ,CAAC,CAAC;AACtC,MAAMG,QAAQ,GAAG,CAAC,eAAe,CAAC;;AAElC;;AAMA;AACA,MAAMC,KAAK,GAAGX,KAAK,CAAwB;EACzCY,SAAS,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC;EACrBC,IAAI,EAAE;IACJC,IAAI,EAAE,OAAO;IACbC,KAAK,EAAE,eAAe,CAAC;EACzB;AACF,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,gBAAgB,GAAG;EAC9BP,KAAK;EAELV,SAASA,CAACkB,QAAmD,EAAE;IAC7D,OAAOjB,GAAG,CAACS,KAAK,EAAE,MAAMQ,QAAQ,CAACR,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDS,cAAcA,CAACH,KAAgB,EAAEE,QAAmD,EAAE;IACpF,OAAOjB,GAAG,CAACS,KAAK,EAAE,MAAM;MACtB,IAAIA,KAAK,CAACI,IAAI,CAACE,KAAK,KAAKA,KAAK,EAAE;QAC9BE,QAAQ,CAACR,KAAK,CAAC;MACjB;IACF,CAAC,CAAC;EACJ,CAAC;EAED,MAAMU,mBAAmBA,CAACN,IAAmC,EAAEH,SAAiB,EAAE;IAChF,IAAIF,QAAQ,CAACY,QAAQ,CAACP,IAAI,CAACE,KAAK,CAAC,EAAE;MACjC;IACF;IAEA,IAAI;MACF,MAAMR,GAAG,CAACc,IAAI,CAAC;QACbC,IAAI,EAAE,IAAI;QACVC,OAAO,EAAEtB,aAAa,CAACuB,cAAc,CAAC,CAAC;QACvCC,IAAI,EAAE;UACJC,OAAO,EAAEvB,cAAc,CAACwB,OAAO,CAAC,CAAC;UACjCC,QAAQ,EAAEzB,cAAc,CAAC0B,WAAW,CAAC,CAAC;UACtCnB,SAAS;UACToB,KAAK,EAAEjB;QACT;MACF,CAAC,CAAC;IACJ,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ,CAAC;EAED,MAAMkB,SAASA,CAAClB,IAAmC,EAAE;IACnD,MAAMH,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAC5BH,KAAK,CAACC,SAAS,GAAGA,SAAS;IAC3BD,KAAK,CAACI,IAAI,GAAGA,IAAI;IACjB,MAAMZ,aAAa,CAACQ,KAAK,CAACuB,eAAe;IAEzC,IAAI9B,iBAAiB,CAACO,KAAK,CAACwB,eAAe,EAAE;MAC3CjB,gBAAgB,CAACG,mBAAmB,CAACN,IAAI,EAAEH,SAAS,CAAC;IACvD;EACF;AACF,CAAC"}
+{"version":3,"names":["proxy","subscribe","sub","ApiController","OptionsController","CoreHelperUtil","FetchUtil","baseUrl","getAnalyticsUrl","api","excluded","state","timestamp","Date","now","data","type","event","EventsController","callback","subscribeEvent","_sendAnalyticsEvent","includes","post","path","headers","_getApiHeaders","body","eventId","getUUID","bundleId","getBundleId","props","sendEvent","prefetchPromise","enableAnalytics"],"sourceRoot":"../../../src","sources":["controllers/EventsController.ts"],"mappings":";;AAAA,SAASA,KAAK,EAAEC,SAAS,IAAIC,GAAG,QAAQ,QAAQ;AAChD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,iBAAiB,QAAQ,qBAAqB;AACvD,SAASC,cAAc,QAAQ,yBAAyB;AACxD,SAASC,SAAS,QAAQ,oBAAoB;AAG9C;AACA,MAAMC,OAAO,GAAGF,cAAc,CAACG,eAAe,CAAC,CAAC;AAChD,MAAMC,GAAG,GAAG,IAAIH,SAAS,CAAC;EAAEC;AAAQ,CAAC,CAAC;AACtC,MAAMG,QAAQ,GAAG,CAAC,eAAe,CAAC;;AAElC;;AAMA;AACA,MAAMC,KAAK,GAAGX,KAAK,CAAwB;EACzCY,SAAS,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC;EACrBC,IAAI,EAAE;IACJC,IAAI,EAAE,OAAO;IACbC,KAAK,EAAE,eAAe,CAAC;EACzB;AACF,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,gBAAgB,GAAG;EAC9BP,KAAK;EAELV,SAASA,CAACkB,QAAmD,EAAE;IAC7D,OAAOjB,GAAG,CAACS,KAAK,EAAE,MAAMQ,QAAQ,CAACR,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDS,cAAcA,CAACH,KAAgB,EAAEE,QAAmD,EAAE;IACpF,OAAOjB,GAAG,CAACS,KAAK,EAAE,MAAM;MACtB,IAAIA,KAAK,CAACI,IAAI,CAACE,KAAK,KAAKA,KAAK,EAAE;QAC9BE,QAAQ,CAACR,KAAK,CAAC;MACjB;IACF,CAAC,CAAC;EACJ,CAAC;EAED,MAAMU,mBAAmBA,CAACN,IAAmC,EAAEH,SAAiB,EAAE;IAChF,IAAIF,QAAQ,CAACY,QAAQ,CAACP,IAAI,CAACE,KAAK,CAAC,EAAE;MACjC;IACF;IAEA,IAAI;MACF,MAAMR,GAAG,CAACc,IAAI,CAAC;QACbC,IAAI,EAAE,IAAI;QACVC,OAAO,EAAEtB,aAAa,CAACuB,cAAc,CAAC,CAAC;QACvCC,IAAI,EAAE;UACJC,OAAO,EAAEvB,cAAc,CAACwB,OAAO,CAAC,CAAC;UACjCC,QAAQ,EAAEzB,cAAc,CAAC0B,WAAW,CAAC,CAAC;UACtCnB,SAAS;UACToB,KAAK,EAAEjB;QACT;MACF,CAAC,CAAC;IACJ,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ,CAAC;EAED,MAAMkB,SAASA,CAAClB,IAAmC,EAAE;IACnD,MAAMH,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAC5BH,KAAK,CAACC,SAAS,GAAGA,SAAS;IAC3BD,KAAK,CAACI,IAAI,GAAGA,IAAI;IACjB,MAAMZ,aAAa,CAACQ,KAAK,CAACuB,eAAe;IAEzC,IAAI9B,iBAAiB,CAACO,KAAK,CAACwB,eAAe,EAAE;MAC3CjB,gBAAgB,CAACG,mBAAmB,CAACN,IAAI,EAAEH,SAAS,CAAC;IACvD;EACF;AACF,CAAC","ignoreList":[]}

package/lib/module/controllers/ModalController.js

@@ -1,10 +1,11 @@
+"use strict";
+
 import { proxy } from 'valtio';
-import { AccountController } from './AccountController';
 import { RouterController } from './RouterController';
 import { PublicStateController } from './PublicStateController';
 import { EventsController } from './EventsController';
 import { ApiController } from './ApiController';
-import { ConnectorController } from './ConnectorController';
+import { ConnectionsController } from './ConnectionsController';
 
 // -- Types --------------------------------------------- //
 
@@ -19,11 +20,11 @@ export const ModalController = {
   state,
   async open(options) {
     await ApiController.state.prefetchPromise;
-    const connected = AccountController.state.isConnected;
+    const isConnected = ConnectionsController.state.isConnected;
     if (options?.view) {
       RouterController.reset(options.view);
-    } else if (AccountController.state.isConnected) {
-      const isUniversalWallet = ConnectorController.state.connectedConnector === 'AUTH';
+    } else if (isConnected) {
+      const isUniversalWallet = !!ConnectionsController.state.connection?.properties?.provider;
       RouterController.reset(isUniversalWallet ? 'Account' : 'AccountDefault');
     } else {
       RouterController.reset('Connect');
@@ -36,12 +37,12 @@ export const ModalController = {
       type: 'track',
       event: 'MODAL_OPEN',
       properties: {
-        connected
+        connected: isConnected
       }
     });
   },
   close() {
-    const connected = AccountController.state.isConnected;
+    const connected = ConnectionsController.state.isConnected;
     state.open = false;
     PublicStateController.set({
       open: false

package/lib/module/controllers/ModalController.js.map

@@ -1 +1 @@
-{"version":3,"names":["proxy","AccountController","RouterController","PublicStateController","EventsController","ApiController","ConnectorController","state","open","loading","ModalController","options","prefetchPromise","connected","isConnected","view","reset","isUniversalWallet","connectedConnector","set","sendEvent","type","event","properties","close","setLoading"],"sourceRoot":"../../../src","sources":["controllers/ModalController.ts"],"mappings":"AAAA,SAASA,KAAK,QAAQ,QAAQ;AAC9B,SAASC,iBAAiB,QAAQ,qBAAqB;AACvD,SAASC,gBAAgB,QAAoC,oBAAoB;AACjF,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAASC,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,mBAAmB,QAAQ,uBAAuB;;AAE3D;;AAYA;AACA,MAAMC,KAAK,GAAGP,KAAK,CAAuB;EACxCQ,IAAI,EAAE,KAAK;EACXC,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,eAAe,GAAG;EAC7BH,KAAK;EAEL,MAAMC,IAAIA,CAACG,OAA0C,EAAE;IACrD,MAAMN,aAAa,CAACE,KAAK,CAACK,eAAe;IACzC,MAAMC,SAAS,GAAGZ,iBAAiB,CAACM,KAAK,CAACO,WAAW;IACrD,IAAIH,OAAO,EAAEI,IAAI,EAAE;MACjBb,gBAAgB,CAACc,KAAK,CAACL,OAAO,CAACI,IAAI,CAAC;IACtC,CAAC,MAAM,IAAId,iBAAiB,CAACM,KAAK,CAACO,WAAW,EAAE;MAC9C,MAAMG,iBAAiB,GAAGX,mBAAmB,CAACC,KAAK,CAACW,kBAAkB,KAAK,MAAM;MACjFhB,gBAAgB,CAACc,KAAK,CAACC,iBAAiB,GAAG,SAAS,GAAG,gBAAgB,CAAC;IAC1E,CAAC,MAAM;MACLf,gBAAgB,CAACc,KAAK,CAAC,SAAS,CAAC;IACnC;IACAT,KAAK,CAACC,IAAI,GAAG,IAAI;IACjBL,qBAAqB,CAACgB,GAAG,CAAC;MAAEX,IAAI,EAAE;IAAK,CAAC,CAAC;IACzCJ,gBAAgB,CAACgB,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,YAAY;MACnBC,UAAU,EAAE;QAAEV;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDW,KAAKA,CAAA,EAAG;IACN,MAAMX,SAAS,GAAGZ,iBAAiB,CAACM,KAAK,CAACO,WAAW;IACrDP,KAAK,CAACC,IAAI,GAAG,KAAK;IAClBL,qBAAqB,CAACgB,GAAG,CAAC;MAAEX,IAAI,EAAE;IAAM,CAAC,CAAC;IAC1CJ,gBAAgB,CAACgB,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,aAAa;MACpBC,UAAU,EAAE;QAAEV;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDY,UAAUA,CAAChB,OAAwC,EAAE;IACnDF,KAAK,CAACE,OAAO,GAAGA,OAAO;EACzB;AACF,CAAC"}
+{"version":3,"names":["proxy","RouterController","PublicStateController","EventsController","ApiController","ConnectionsController","state","open","loading","ModalController","options","prefetchPromise","isConnected","view","reset","isUniversalWallet","connection","properties","provider","set","sendEvent","type","event","connected","close","setLoading"],"sourceRoot":"../../../src","sources":["controllers/ModalController.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,QAAQ;AAC9B,SAASC,gBAAgB,QAAoC,oBAAoB;AACjF,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAASC,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,qBAAqB,QAAQ,yBAAyB;;AAE/D;;AAYA;AACA,MAAMC,KAAK,GAAGN,KAAK,CAAuB;EACxCO,IAAI,EAAE,KAAK;EACXC,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,eAAe,GAAG;EAC7BH,KAAK;EAEL,MAAMC,IAAIA,CAACG,OAA0C,EAAE;IACrD,MAAMN,aAAa,CAACE,KAAK,CAACK,eAAe;IACzC,MAAMC,WAAW,GAAGP,qBAAqB,CAACC,KAAK,CAACM,WAAW;IAC3D,IAAIF,OAAO,EAAEG,IAAI,EAAE;MACjBZ,gBAAgB,CAACa,KAAK,CAACJ,OAAO,CAACG,IAAI,CAAC;IACtC,CAAC,MAAM,IAAID,WAAW,EAAE;MACtB,MAAMG,iBAAiB,GAAG,CAAC,CAACV,qBAAqB,CAACC,KAAK,CAACU,UAAU,EAAEC,UAAU,EAAEC,QAAQ;MACxFjB,gBAAgB,CAACa,KAAK,CAACC,iBAAiB,GAAG,SAAS,GAAG,gBAAgB,CAAC;IAC1E,CAAC,MAAM;MACLd,gBAAgB,CAACa,KAAK,CAAC,SAAS,CAAC;IACnC;IACAR,KAAK,CAACC,IAAI,GAAG,IAAI;IACjBL,qBAAqB,CAACiB,GAAG,CAAC;MAAEZ,IAAI,EAAE;IAAK,CAAC,CAAC;IACzCJ,gBAAgB,CAACiB,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,YAAY;MACnBL,UAAU,EAAE;QAAEM,SAAS,EAAEX;MAAY;IACvC,CAAC,CAAC;EACJ,CAAC;EAEDY,KAAKA,CAAA,EAAG;IACN,MAAMD,SAAS,GAAGlB,qBAAqB,CAACC,KAAK,CAACM,WAAW;IACzDN,KAAK,CAACC,IAAI,GAAG,KAAK;IAClBL,qBAAqB,CAACiB,GAAG,CAAC;MAAEZ,IAAI,EAAE;IAAM,CAAC,CAAC;IAC1CJ,gBAAgB,CAACiB,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,aAAa;MACpBL,UAAU,EAAE;QAAEM;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDE,UAAUA,CAACjB,OAAwC,EAAE;IACnDF,KAAK,CAACE,OAAO,GAAGA,OAAO;EACzB;AACF,CAAC","ignoreList":[]}

package/lib/module/controllers/OnRampController.js

@@ -1,15 +1,16 @@
-import { subscribeKey as subKey } from 'valtio/vanilla/utils';
-import { proxy, subscribe as sub } from 'valtio/vanilla';
-import { BlockchainOnRampError } from '../utils/TypeUtil';
+"use strict";
+
+import { subscribeKey as subKey } from 'valtio/utils';
+import { proxy, subscribe as sub } from 'valtio';
+import { BlockchainOnRampError } from '@reown/appkit-common-react-native';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
-import { NetworkController } from './NetworkController';
-import { AccountController } from './AccountController';
 import { OptionsController } from './OptionsController';
 import { ConstantsUtil, OnRampErrorType } from '../utils/ConstantsUtil';
 import { StorageUtil } from '../utils/StorageUtil';
 import { SnackController } from './SnackController';
 import { EventsController } from './EventsController';
 import { BlockchainApiController, EXCLUDED_ONRAMP_PROVIDERS } from './BlockchainApiController';
+import { ConnectionsController } from './ConnectionsController';
 
 // -- Helpers ------------------------------------------- //
 
@@ -126,11 +127,11 @@ export const OnRampController = {
   },
   updateSelectedPurchaseCurrency() {
     let selectedCurrency;
-    if (NetworkController.state.caipNetwork?.id) {
-      const defaultCurrency = ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[NetworkController.state.caipNetwork?.id];
+    if (ConnectionsController.state.activeNetwork?.caipNetworkId) {
+      const defaultCurrency = ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[ConnectionsController.state.activeNetwork?.caipNetworkId];
       selectedCurrency = state.purchaseCurrencies?.find(c => c.currencyCode === defaultCurrency);
     }
-    state.purchaseCurrency = selectedCurrency ?? state.purchaseCurrencies?.[0] ?? undefined;
+    state.purchaseCurrency = selectedCurrency ?? undefined;
   },
   getServiceProviderImage(serviceProviderName) {
     if (!serviceProviderName) return undefined;
@@ -229,11 +230,11 @@ export const OnRampController = {
       });
       state.purchaseCurrencies = cryptoCurrencies || [];
       let selectedCurrency;
-      if (NetworkController.state.caipNetwork?.id) {
-        const defaultCurrency = ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[NetworkController.state.caipNetwork?.id] || 'ETH';
+      if (ConnectionsController.state.activeNetwork?.caipNetworkId) {
+        const defaultCurrency = ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[ConnectionsController.state.activeNetwork?.caipNetworkId];
         selectedCurrency = state.purchaseCurrencies?.find(c => c.currencyCode === defaultCurrency);
       }
-      state.purchaseCurrency = selectedCurrency || cryptoCurrencies?.[0] || undefined;
+      state.purchaseCurrency = selectedCurrency || undefined;
     } catch (error) {
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_CURRENCIES,
@@ -292,19 +293,23 @@ export const OnRampController = {
     quotesAbortController = new AbortController();
     const currentSignal = quotesAbortController.signal;
     try {
-      if (!state.selectedCountry?.countryCode || !state.purchaseCurrency?.currencyCode || !state.paymentCurrency?.currencyCode || !AccountController.state.address) {
+      if (!state.selectedCountry?.countryCode || !state.purchaseCurrency?.currencyCode || !state.paymentCurrency?.currencyCode || !ConnectionsController.state.activeAddress) {
         throw new BlockchainOnRampError(OnRampErrorType.UNKNOWN, 'Invalid quote parameters');
       }
       state.quotesLoading = true;
       state.selectedQuote = undefined;
       state.selectedServiceProvider = undefined;
       state.error = undefined;
+      const plainAddress = CoreHelperUtil.getPlainAddress(ConnectionsController.state.activeAddress);
+      if (!plainAddress) {
+        throw new Error('Invalid address');
+      }
       const body = {
         countryCode: state.selectedCountry.countryCode,
         destinationCurrencyCode: state.purchaseCurrency.currencyCode,
         sourceAmount: state.paymentAmount,
         sourceCurrencyCode: state.paymentCurrency.currencyCode,
-        walletAddress: AccountController.state.address,
+        walletAddress: plainAddress,
         excludeProviders: EXCLUDED_ONRAMP_PROVIDERS
       };
       const response = await BlockchainApiController.getOnRampQuotes(body, currentSignal);
@@ -355,7 +360,7 @@ export const OnRampController = {
     }
   },
   canGenerateQuote() {
-    return !!(state.selectedCountry?.countryCode && state.selectedPaymentMethod?.paymentMethod && state.purchaseCurrency?.currencyCode && state.paymentAmount && state.paymentAmount > 0 && state.paymentCurrency?.currencyCode && state.selectedCountry && !state.loading && AccountController.state.address);
+    return !!(state.selectedCountry?.countryCode && state.selectedPaymentMethod?.paymentMethod && state.purchaseCurrency?.currencyCode && state.paymentAmount && state.paymentAmount > 0 && state.paymentCurrency?.currencyCode && state.selectedCountry && !state.loading && ConnectionsController.state.activeAddress);
   },
   async fetchFiatLimits() {
     try {
@@ -378,6 +383,9 @@ export const OnRampController = {
   async generateWidget({
     quote
   }) {
+    if (!ConnectionsController.state.activeAddress) {
+      throw new Error('No active address');
+    }
     const metadata = OptionsController.state.metadata;
     const eventProperties = {
       asset: quote.destinationCurrencyCode,
@@ -392,6 +400,10 @@ export const OnRampController = {
       if (!quote) {
         throw new Error('Invalid quote');
       }
+      const plainAddress = CoreHelperUtil.getPlainAddress(ConnectionsController.state.activeAddress);
+      if (!plainAddress) {
+        throw new Error('Invalid address');
+      }
       const body = {
         countryCode: quote.countryCode,
         destinationCurrencyCode: quote.destinationCurrencyCode,
@@ -399,7 +411,7 @@ export const OnRampController = {
         serviceProvider: quote.serviceProvider,
         sourceAmount: quote.sourceAmount,
         sourceCurrencyCode: quote.sourceCurrencyCode,
-        walletAddress: AccountController.state.address,
+        walletAddress: plainAddress,
         redirectUrl: metadata?.redirect?.universal ?? metadata?.redirect?.native
       };
       const widget = await BlockchainApiController.getOnRampWidget(body);