@hot-labs/kit 1.0.41 → 1.0.44

package/src/cosmos/connector.ts

@@ -1,9 +1,10 @@
-import type { Keplr } from "@keplr-wallet/provider-extension";
+import { Keplr } from "@keplr-wallet/provider-extension";
 import { TxRaw } from "@keplr-wallet/proto-types/cosmos/tx/v1beta1/tx";
 import { StargateClient } from "@cosmjs/stargate";
+import { runInAction } from "mobx";
 import { hex } from "@scure/base";
 
-import { WalletType } from "../core/config";
+import { chains, WalletType } from "../core/chains";
 import { HotConnector } from "../HotConnector";
 import { ConnectorType, OmniConnector, WC_ICON } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
@@ -11,10 +12,6 @@ import { OmniWallet } from "../OmniWallet";
 import { signAndSendTx } from "./helpers";
 import CosmosWallet from "./wallet";
 
-export interface CosmosConnectorOptions {
-  cosmosChains?: Record<string, { chain: string; rpc: string; denom: string; prefix: string }>;
-}
-
 declare global {
   interface Window {
     keplr?: Keplr;
@@ -42,8 +39,6 @@ const wallets = {
 };
 
 export default class CosmosConnector extends OmniConnector<CosmosWallet> {
-  cosmosChains: Record<string, { chain: string; rpc: string; denom: string; prefix: string }>;
-
   type = ConnectorType.WALLET;
   walletTypes = [WalletType.COSMOS];
   icon = "https://legacy.cosmos.network/presskit/cosmos-brandmark-dynamic-dark.svg";
@@ -51,12 +46,12 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
   isSupported = true;
   id = "cosmos";
 
-  constructor(wibe3: HotConnector, options?: CosmosConnectorOptions) {
+  constructor(wibe3: HotConnector) {
     super(wibe3);
 
     this.options = [
       {
-        name: "keplr" in window ? "Keplr" : "Keplr Mobile",
+        name: "Keplr",
         download: "https://www.keplr.app/get",
         icon: "https://cdn.prod.website-files.com/667dc891bc7b863b5397495b/68a4ca95f93a9ab64dc67ab4_keplr-symbol.svg",
         type: "keplr" in window ? "extension" : "external",
@@ -71,16 +66,23 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
       },
     ];
 
-    this.cosmosChains = {
-      "juno-1": { chain: "juno-1", rpc: "https://juno-rpc.publicnode.com", denom: "ujuno", prefix: "juno" },
-      "gonka-mainnet": { chain: "gonka-mainnet", rpc: "https://dev.herewallet.app/api/v1/evm/rpc/4444119", denom: "ngonka", prefix: "gonka" },
-      "cosmoshub-4": { chain: "cosmoshub-4", rpc: "https://rpc.cosmoshub.certus.one", denom: "uatom", prefix: "cosmos" },
-      ...options?.cosmosChains,
-    };
+    Keplr.getKeplr().then((keplr) => {
+      const option = this.options.find((option) => option.id === "keplr")!;
+      runInAction(() => {
+        option.type = keplr ? "extension" : "external";
+        option.name = keplr ? "Keplr" : "Keplr Mobile";
+      });
+    });
 
-    this.getStorage().then(({ type, address, publicKey }) => {
+    this.getStorage().then(async ({ type, address, publicKey }) => {
       if (!address || !publicKey) return;
-      if (type === "keplr" && window.keplr) this.setKeplrWallet(window.keplr, address, publicKey);
+
+      if (type === "keplr") {
+        const keplr = await Keplr.getKeplr();
+        if (keplr) this.setKeplrWallet(keplr, address, publicKey);
+        else this.disconnect();
+      }
+
       if (type === "leap" && window.leap) this.setKeplrWallet(window.leap, address, publicKey);
     });
 
@@ -101,8 +103,8 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
       .catch(() => {});
   }
 
-  getConfig(chain: string) {
-    return this.cosmosChains[chain];
+  get chains() {
+    return chains.getByType(WalletType.COSMOS).map((t) => t.key);
   }
 
   async setupWalletConnect(id?: "keplr" | "leap"): Promise<CosmosWallet> {
@@ -141,7 +143,10 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
           },
         });
 
-        const client = await StargateClient.connect(this.getConfig(signDoc.chainId)?.rpc || "");
+        const chain = chains.getByKey(signDoc.chainId);
+        if (!chain) throw new Error("Chain not found");
+
+        const client = await StargateClient.connect(chain.rpc);
         const protobufTx = TxRaw.encode({
           bodyBytes: signed.bodyBytes,
           authInfoBytes: signed.authInfoBytes,
@@ -164,8 +169,8 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
         publicKeyHex: publicKey,
         disconnect: () => keplr.disable(),
         sendTransaction: async (signDoc: any) => {
-          await keplr.enable(Object.keys(this.cosmosChains));
-          const rpcEndpoint = this.getConfig(signDoc.chainId)?.rpc || "";
+          await keplr.enable(this.chains);
+          const rpcEndpoint = chains.get(signDoc.chainId)?.rpc || "";
           return await signAndSendTx(keplr, rpcEndpoint, signDoc);
         },
       })
@@ -181,7 +186,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
           cosmos: {
             methods: ["cosmos_getAccounts", "cosmos_signDirect"],
             events: ["chainChanged", "accountsChanged"],
-            chains: Object.keys(this.cosmosChains).map((chain) => `cosmos:${chain}`),
+            chains: this.chains.map((chain) => `cosmos:${chain}`),
             rpcMap: {},
           },
         },
@@ -200,7 +205,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
       chainName: "Gonka",
     });
 
-    await extension.enable(Object.keys(this.cosmosChains));
+    await extension.enable(this.chains);
     const account = await extension.getKey("gonka-mainnet");
     await this.setStorage({ type, address: account.bech32Address, publicKey: hex.encode(account.pubKey) });
     return await this.setKeplrWallet(extension, account.bech32Address, hex.encode(account.pubKey));
@@ -214,7 +219,7 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
           cosmos: {
             methods: ["cosmos_getAccounts", "cosmos_signDirect"],
             events: ["chainChanged", "accountsChanged"],
-            chains: Object.keys(this.cosmosChains).map((chain) => `cosmos:${chain}`),
+            chains: this.chains.map((chain) => `cosmos:${chain}`),
             rpcMap: {},
           },
         },
@@ -222,7 +227,8 @@ export default class CosmosConnector extends OmniConnector<CosmosWallet> {
     }
 
     if (id === "keplr") {
-      return await this.connectKeplr("keplr", window.keplr);
+      const keplr = await Keplr.getKeplr();
+      return await this.connectKeplr("keplr", keplr);
     }
 
     if (id === "leap") {

package/src/cosmos/index.ts

@@ -1,9 +1,8 @@
-import type { CosmosConnectorOptions } from "./connector";
 import CosmosConnector from "./connector";
 import CosmosWallet from "./wallet";
 
 import { HotConnector } from "../HotConnector";
 
-export { CosmosConnector, CosmosConnectorOptions, CosmosWallet };
+export { CosmosConnector, CosmosWallet };
 
-export default (options?: CosmosConnectorOptions) => async (wibe3: HotConnector) => new CosmosConnector(wibe3, options);
+export default () => async (wibe3: HotConnector) => new CosmosConnector(wibe3);

package/src/cosmos/wallet.ts

@@ -1,7 +1,7 @@
 import { StargateClient } from "@cosmjs/stargate";
 
 import { OmniWallet, SignedAuth } from "../OmniWallet";
-import { chainsMap, WalletType } from "../core/config";
+import { chains, WalletType } from "../core/chains";
 import { ReviewFee } from "../core/bridge";
 import CosmosConnector from "./connector";
 
@@ -68,7 +68,7 @@ export default class CosmosWallet extends OmniWallet {
   }
 
   async fetchBalance(chain: number, token: string): Promise<bigint> {
-    const config = this.connector.getConfig(chainsMap[chain].id);
+    const config = chains.get(chain);
     if (!config) throw new Error("Config not found");
     const client = await StargateClient.connect(config.rpc);
     const balance = await client.getBalance(this.address, token);

package/src/evm/connector.ts

@@ -2,7 +2,7 @@ import MetaMaskSDK from "@metamask/sdk";
 import { runInAction } from "mobx";
 
 import { ConnectorType, OmniConnector, WC_ICON } from "../OmniConnector";
-import { Network, WalletType } from "../core/config";
+import { Network, WalletType } from "../core/chains";
 import { isInjected } from "../hot-wallet/iframe";
 import { HotConnector } from "../HotConnector";
 import EvmWallet, { EvmProvider } from "./wallet";

package/src/evm/wallet.ts

@@ -4,7 +4,7 @@ import { JsonRpcSigner } from "ethers";
 
 import { OmniConnector } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
-import { WalletType } from "../core/config";
+import { WalletType } from "../core/chains";
 import { ReviewFee } from "../core/bridge";
 import { Token } from "../core/token";
 import { erc20abi } from "./abi";

package/src/exchange.ts

@@ -2,19 +2,16 @@ import { GetExecutionStatusResponse, OneClickService, ApiError, OpenAPI, QuoteRe
 import { utils } from "@hot-labs/omni-sdk";
 import { hex } from "@scure/base";
 
-import CosmosWallet from "./cosmos/wallet";
-import StellarWallet from "./stellar/wallet";
-import NearWallet from "./near/wallet";
-import EvmWallet from "./evm/wallet";
-
-import { HotConnector } from "./HotConnector";
-import { Network, OmniToken, WalletType } from "./core/config";
-import { bridge, ReviewFee } from "./core/bridge";
+import { Network, OmniToken, WalletType } from "./core/chains";
+import { ReviewFee } from "./core/bridge";
 import { Recipient } from "./core/recipient";
-import { OmniWallet } from "./OmniWallet";
 import { tokens } from "./core/tokens";
 import { Token } from "./core/token";
 
+import StellarWallet from "./stellar/wallet";
+import { HotConnector } from "./HotConnector";
+import { OmniWallet } from "./OmniWallet";
+
 OpenAPI.BASE = "https://1click.chaindefuser.com";
 OpenAPI.TOKEN = "";
 
@@ -78,11 +75,11 @@ export class Exchange {
     const { sender, token, amount, recipient, onMessage } = args;
     onMessage("Sending deposit transaction");
 
-    if (token.type === WalletType.COSMOS && sender instanceof CosmosWallet) {
-      const cosmosBridge = await bridge.cosmos();
+    if (token.type === WalletType.COSMOS && this.wibe3.isCosmosWallet(sender)) {
+      const cosmosBridge = await this.wibe3.hotBridge.cosmos();
       const hash = await cosmosBridge.deposit({
         sendTransaction: async (tx) => sender.sendTransaction(tx),
-        senderPublicKey: hex.decode(sender.publicKey),
+        senderPublicKey: hex.decode(sender.publicKey!),
         intentAccount: recipient.omniAddress,
         sender: sender.address,
         token: token.address,
@@ -91,15 +88,15 @@ export class Exchange {
       });
 
       onMessage("Waiting for deposit");
-      const deposit = await bridge.waitPendingDeposit(token.chain, hash, recipient.omniAddress);
+      const deposit = await this.wibe3.hotBridge.waitPendingDeposit(token.chain, hash, recipient.omniAddress);
       onMessage("Finishing deposit");
-      await bridge.finishDeposit(deposit);
+      await this.wibe3.hotBridge.finishDeposit(deposit);
       onMessage("Deposit finished");
       return;
     }
 
-    if (token.type === WalletType.EVM && sender instanceof EvmWallet) {
-      const hash = await bridge.evm.deposit({
+    if (token.type === WalletType.EVM && this.wibe3.isEvmWallet(sender)) {
+      const hash = await this.wibe3.hotBridge.evm.deposit({
         sendTransaction: async (tx) => sender.sendTransaction(token.chain, tx),
         intentAccount: recipient.omniAddress,
         sender: sender.address,
@@ -110,15 +107,15 @@ export class Exchange {
 
       if (!hash) throw new Error("Failed to deposit");
       onMessage("Waiting for deposit");
-      const deposit = await bridge.waitPendingDeposit(token.chain, hash, recipient.omniAddress);
+      const deposit = await this.wibe3.hotBridge.waitPendingDeposit(token.chain, hash, recipient.omniAddress);
       onMessage("Finishing deposit");
-      await bridge.finishDeposit(deposit);
+      await this.wibe3.hotBridge.finishDeposit(deposit);
       onMessage("Deposit finished");
       return;
     }
 
-    if (token.type === WalletType.NEAR && sender instanceof NearWallet) {
-      return await bridge.near.deposit({
+    if (token.type === WalletType.NEAR && this.wibe3.isNearWallet(sender)) {
+      return await this.wibe3.hotBridge.near.deposit({
         sendTransaction: async (tx: any) => sender.sendTransaction(tx),
         intentAccount: recipient.omniAddress,
         sender: sender.address,
@@ -134,11 +131,11 @@ export class Exchange {
     const { sender, token, amount, recipient } = args;
 
     const receipientWallet = this.wibe3.wallets.find((w) => w.address === recipient.address);
-    if (receipientWallet instanceof NearWallet && token.type === WalletType.NEAR) {
+    if (this.wibe3.isNearWallet(receipientWallet) && token.type === WalletType.NEAR) {
       await receipientWallet.registerToken(token.originalAddress);
     }
 
-    await bridge.withdrawToken({
+    await this.wibe3.hotBridge.withdrawToken({
       signIntents: async (intents) => sender.signIntents(intents),
       intentAccount: sender.omniAddress,
       receiver: recipient.address,
@@ -152,7 +149,7 @@ export class Exchange {
   async withdrawFee(request: BridgeRequest) {
     if (request.sender === "qr") throw new Error("Sender is QR");
     if (request.to.chain === Network.Near || request.to.chain === Network.Hot) return 0n;
-    const gaslessFee = await bridge.getGaslessWithdrawFee({
+    const gaslessFee = await this.wibe3.hotBridge.getGaslessWithdrawFee({
       receiver: request.recipient.address,
       token: request.to.address,
       chain: request.to.chain,
@@ -162,7 +159,7 @@ export class Exchange {
     if (request.to.address === "native") return 0n;
 
     // if withdraw token is not native, we need to swap a bit of it to native to cover the withdraw fee
-    const swap = await bridge.buildSwapExectOutIntent({
+    const swap = await this.wibe3.hotBridge.buildSwapExectOutIntent({
       intentFrom: utils.toOmniIntent(request.to.chain, request.to.address),
       intentTo: utils.toOmniIntent(request.to.chain, "native"),
       amountOut: gaslessFee.gasPrice,
@@ -186,7 +183,7 @@ export class Exchange {
     const noFee = from.symbol === to.symbol;
 
     if (sender !== "qr" && directChains.includes(from.chain) && to.chain === Network.Hot && from.omniAddress === to.omniAddress) {
-      const fee = await bridge.getDepositFee({
+      const fee = await this.wibe3.hotBridge.getDepositFee({
         intentAccount: sender.omniAddress,
         sender: sender.address,
         token: from.address,

package/src/hot-wallet/google.ts

@@ -5,7 +5,7 @@ import uuid4 from "uuid4";
 
 import { ConnectorType, OmniConnector } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
-import { WalletType } from "../core/config";
+import { WalletType } from "../core/chains";
 
 import EvmWallet from "../evm/wallet";
 import NearWallet from "../near/wallet";

package/src/near/connector.ts

@@ -1,7 +1,7 @@
 import { NearConnector } from "@hot-labs/near-connect";
 import { runInAction } from "mobx";
 
-import { WalletType } from "../core/config";
+import { WalletType } from "../core/chains";
 import { ConnectorType, OmniConnector } from "../OmniConnector";
 import { HotConnector } from "../HotConnector";
 import NearWallet from "./wallet";

package/src/near/wallet.ts

@@ -4,7 +4,7 @@ import { Action } from "@near-js/transactions";
 
 import { OmniConnector } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
-import { WalletType } from "../core/config";
+import { WalletType } from "../core/chains";
 import { ReviewFee } from "../core/bridge";
 import { rpc, TGAS } from "../core/nearRpc";
 import { Token } from "../core/token";

package/src/solana/connector.ts

@@ -7,7 +7,7 @@ import { ConnectorType, OmniConnector, WC_ICON } from "../OmniConnector";
 import { HotConnector } from "../HotConnector";
 import { OmniWallet } from "../OmniWallet";
 import { isInjected } from "../hot-wallet/iframe";
-import { WalletType } from "../core/config";
+import { WalletType } from "../core/chains";
 
 import SolanaProtocolWallet from "./protocol";
 import { getWallets } from "./wallets";

package/src/solana/wallet.ts

@@ -13,7 +13,7 @@ import {
   createTransferCheckedInstruction,
 } from "@solana/spl-token";
 
-import { Network, WalletType } from "../core/config";
+import { Network, WalletType } from "../core/chains";
 import { OmniConnector } from "../OmniConnector";
 import { OmniWallet } from "../OmniWallet";
 

package/src/stellar/connector.ts

@@ -1,7 +1,7 @@
 import { sep43Modules, HotWalletModule, StellarWalletsKit, WalletNetwork, ISupportedWallet } from "@creit.tech/stellar-wallets-kit";
 import { Transaction } from "@stellar/stellar-base";
 
-import { WalletType } from "../core/config";
+import { WalletType } from "../core/chains";
 import { HotConnector } from "../HotConnector";
 import { ConnectorType, OmniConnector } from "../OmniConnector";
 import { isInjected } from "../hot-wallet/iframe";

package/src/stellar/wallet.ts

@@ -2,12 +2,12 @@ import { base64, base58, hex, base32 } from "@scure/base";
 import { Address, Asset, BASE_FEE, Claimant, Contract, Memo, nativeToScVal, Networks, Operation, TimeoutInfinite, Transaction, TransactionBuilder, xdr } from "@stellar/stellar-base";
 import { rpc } from "@stellar/stellar-sdk";
 
-import { WalletType } from "../core/config";
+import { WalletType } from "../core/chains";
 import { OmniWallet } from "../OmniWallet";
 import { OmniConnector } from "../OmniConnector";
-import { bridge, ReviewFee } from "../core/bridge";
+import { ReviewFee } from "../core/bridge";
 import { formatter } from "../core/utils";
-import { Network } from "../core/config";
+import { Network } from "../core/chains";
 import { Token } from "../core/token";
 
 interface ProtocolWallet {
@@ -33,6 +33,10 @@ class StellarWallet extends OmniWallet {
     super(connector);
   }
 
+  get rpc() {
+    return this.connector.wibe3.hotBridge.stellar;
+  }
+
   get address() {
     return this.wallet.address;
   }
@@ -81,8 +85,8 @@ class StellarWallet extends OmniWallet {
     const asset = await this.getAssetFromContractId(token);
     const sendAmount = formatter.formatAmount(amount, 7);
 
-    const account = await bridge.stellar.callSoroban((s) => s.getAccount(this.address));
-    const baseFee = await bridge.stellar.callHorizon((h) => h.fetchBaseFee()).catch(() => +BASE_FEE);
+    const account = await this.connector.wibe3.hotBridge.stellar.callSoroban((s) => s.getAccount(this.address));
+    const baseFee = await this.connector.wibe3.hotBridge.stellar.callHorizon((h) => h.fetchBaseFee()).catch(() => +BASE_FEE);
     const builder = new TransactionBuilder(account, {
       memo: memo ? Memo.text(memo) : undefined,
       networkPassphrase: Networks.PUBLIC,
@@ -101,13 +105,13 @@ class StellarWallet extends OmniWallet {
         )
       );
 
-      const tx = await bridge.stellar.callSoroban((s) => s.prepareTransaction(builder.build() as any));
+      const tx = await this.rpc.callSoroban((s) => s.prepareTransaction(builder.build() as any));
       const fee = BigInt(Math.floor(baseFee * tx.operations.length));
       return { fee: new ReviewFee({ baseFee: fee, priorityFee: 0n, gasLimit: 1n, chain: Network.Stellar }), tx: tx as unknown as Transaction };
     }
 
     let needXlm = 0;
-    const receiverAccount = await bridge.stellar.callHorizon((h) => h.loadAccount(receiver)).catch(() => null);
+    const receiverAccount = await this.rpc.callHorizon((h) => h.loadAccount(receiver)).catch(() => null);
     const claimableBalance = Operation.createClaimableBalance({ amount: amount.toString(), claimants: [new Claimant(receiver)], asset });
 
     if (receiverAccount == null) {
@@ -163,7 +167,7 @@ class StellarWallet extends OmniWallet {
     if (!this.wallet.signTransaction) throw "not impl";
     const result = await this.wallet.signTransaction(transaction);
     const txObject = new Transaction(result.signedTxXdr, Networks.PUBLIC);
-    const { hash } = await bridge.stellar.callHorizon((t) => t.submitTransaction(txObject as any));
+    const { hash } = await this.rpc.callHorizon((t) => t.submitTransaction(txObject as any));
     return hash;
   }
 
@@ -195,7 +199,7 @@ class StellarWallet extends OmniWallet {
 
   static async isTokenActivated(address: string, token: string) {
     if (address === "native") return true;
-    const data = await bridge.stellar.callHorizon((h) => h.loadAccount(address));
+    const data = await fetch(`https://horizon.stellar.org/accounts/${address}`).then((res) => res.json());
     return data.balances.some((ft: any) => {
       if (!ft.asset_issuer) return false;
       const asset = new Asset(ft.asset_code, ft.asset_issuer).contractId(Networks.PUBLIC);
@@ -206,7 +210,7 @@ class StellarWallet extends OmniWallet {
   async changeTrustline(address: string) {
     if (address === "native") return;
     const asset = await this.getAssetFromContractId(address);
-    const account = await bridge.stellar.callHorizon((h) => h.loadAccount(this.address));
+    const account = await this.rpc.callHorizon((h) => h.loadAccount(this.address));
     const trustlineOp = Operation.changeTrust({ asset: asset, source: this.address });
     const trustlineTx = new TransactionBuilder(account, { fee: BASE_FEE, networkPassphrase: Networks.PUBLIC }) //
       .addOperation(trustlineOp)
@@ -224,7 +228,7 @@ class StellarWallet extends OmniWallet {
     }
 
     const tx = await this.buildSmartContactTx(ACCOUNT_FOR_SIMULATE, id, ASSET_CONTRACT_METHOD.NAME);
-    const result = (await bridge.stellar.callSoroban((s) => s.simulateTransaction(tx as any))) as unknown as rpc.Api.SimulateTransactionSuccessResponse;
+    const result = (await this.rpc.callSoroban((s) => s.simulateTransaction(tx as any))) as unknown as rpc.Api.SimulateTransactionSuccessResponse;
 
     const value = result?.result?.retval?.value();
     if (!value) throw "Asset not found";
@@ -236,7 +240,7 @@ class StellarWallet extends OmniWallet {
   }
 
   async buildSmartContactTx(publicKey: string, contactId: string, method: string, ...args: any[]) {
-    const account = await bridge.stellar.callSoroban((s) => s.getAccount(publicKey));
+    const account = await this.rpc.callSoroban((s) => s.getAccount(publicKey));
     const contract = new Contract(contactId);
     const builtTx = new TransactionBuilder(account, { fee: BASE_FEE, networkPassphrase: Networks.PUBLIC });
 
@@ -253,7 +257,7 @@ class StellarWallet extends OmniWallet {
       Address.fromString(contract).toScVal()
     );
 
-    const result = (await bridge.stellar.callSoroban((s) => s.simulateTransaction(tx as any))) as unknown as rpc.Api.SimulateTransactionSuccessResponse;
+    const result = (await this.rpc.callSoroban((s) => s.simulateTransaction(tx as any))) as unknown as rpc.Api.SimulateTransactionSuccessResponse;
     if (result) return BigInt(this.i128ToInt(result.result?.retval.value() as xdr.Int128Parts));
     return 0n;
   }

package/src/ton/connector.ts

@@ -1,7 +1,7 @@
 import { TonConnectUI, TonConnect } from "@tonconnect/ui";
 import { runInAction } from "mobx";
 
-import { WalletType } from "../core/config";
+import { WalletType } from "../core/chains";
 import { HotConnector } from "../HotConnector";
 import { ConnectorType, OmniConnector } from "../OmniConnector";
 import { isInjected } from "../hot-wallet/iframe";

package/src/ton/wallet.ts

@@ -5,7 +5,7 @@ import { toUserFriendlyAddress } from "@tonconnect/ui";
 import { base58, base64, hex } from "@scure/base";
 
 import { OmniWallet } from "../OmniWallet";
-import { WalletType } from "../core/config";
+import { WalletType } from "../core/chains";
 import { OmniConnector } from "../OmniConnector";
 import { ReviewFee } from "../core/bridge";
 import { Token } from "../core/token";

package/src/ui/payment/Bridge.tsx

@@ -12,7 +12,7 @@ import { Recipient } from "../../core/recipient";
 import { OmniWallet } from "../../OmniWallet";
 import { BridgeReview } from "../../exchange";
 import { HotConnector } from "../../HotConnector";
-import { WalletType } from "../../core/config";
+import { WalletType } from "../../core/chains";
 import { Token } from "../../core/token";
 
 import Popup from "../Popup";

package/src/ui/payment/Payment.tsx

@@ -6,7 +6,7 @@ import { openBridge, openConnector } from "../router";
 import { Recipient } from "../../core/recipient";
 import { BridgeReview } from "../../exchange";
 import { OmniWallet } from "../../OmniWallet";
-import { Network } from "../../core/config";
+import { Network } from "../../core/chains";
 import { Token } from "../../core/token";
 import Popup from "../Popup";
 

package/src/ui/payment/Profile.tsx

@@ -6,7 +6,7 @@ import { LogoutIcon } from "../icons/logout";
 import { openBridge, openConnector } from "../router";
 import { HotConnector } from "../../HotConnector";
 import { formatter } from "../../core/utils";
-import { OmniToken } from "../../core/config";
+import { OmniToken } from "../../core/chains";
 import { tokens } from "../../core/tokens";
 import Popup from "../Popup";
 

package/src/ui/payment/SelectRecipient.tsx

@@ -7,7 +7,7 @@ import { PopupOption, PopupOptionInfo } from "../styles";
 import { ConnectorType, OmniConnector } from "../../OmniConnector";
 import { HotConnector } from "../../HotConnector";
 import { Recipient } from "../../core/recipient";
-import { WalletType } from "../../core/config";
+import { WalletType } from "../../core/chains";
 import { openWalletPicker } from "../router";
 import { formatter } from "../../core/utils";
 import Popup from "../Popup";

package/src/ui/payment/SelectSender.tsx

@@ -6,7 +6,7 @@ import { PopupOption, PopupOptionInfo } from "../styles";
 
 import { ConnectorType, OmniConnector } from "../../OmniConnector";
 import { OmniWallet } from "../../OmniWallet";
-import { WalletType } from "../../core/config";
+import { WalletType } from "../../core/chains";
 import { HotConnector } from "../../HotConnector";
 import { openWalletPicker } from "../router";
 import { formatter } from "../../core/utils";

package/src/ui/payment/SelectToken.tsx

@@ -6,7 +6,7 @@ import { formatter } from "../../core/utils";
 import { Token } from "../../core/token";
 import { HotConnector } from "../../HotConnector";
 import { OmniWallet } from "../../OmniWallet";
-import { Network, OmniToken } from "../../core/config";
+import { Network, OmniToken } from "../../core/chains";
 import { PopupOption } from "../styles";
 import Popup from "../Popup";
 

package/src/ui/payment/TokenCard.tsx

@@ -1,12 +1,14 @@
 import { observer } from "mobx-react-lite";
 import { useEffect, useState } from "react";
+import styled from "styled-components";
 
+import { chains } from "../../core/chains";
 import { formatter } from "../../core/utils";
 import { Token } from "../../core/token";
+
 import { HotConnector } from "../../HotConnector";
 import { OmniWallet } from "../../OmniWallet";
 import { PopupOption } from "../styles";
-import { chainsMap } from "../../core/config";
 
 const images = {
   cached: new Map<string, Promise<void>>(),
@@ -56,7 +58,7 @@ export const TokenIcon = observer(({ token, wallet }: { token: Token; wallet?: O
     <div style={{ position: "relative", width: 40, height: 40 }}>
       <ImageView src={token.icon} alt={token.symbol} size={40} />
       <ImageView src={token.chainIcon} alt={token.symbol} size={14} style={{ position: "absolute", bottom: 0, right: 0 }} />
-      {token.chain === -4 && wallet?.type && <ImageView src={wallet.icon} alt={chainsMap[wallet.type]?.name || ""} size={14} style={{ position: "absolute", bottom: 0, left: 0 }} />}
+      {token.chain === -4 && wallet?.type && <ImageView src={wallet.icon} alt={chains.get(wallet.type)?.name || ""} size={14} style={{ position: "absolute", bottom: 0, left: 0 }} />}
     </div>
   );
 });
@@ -69,15 +71,28 @@ export const TokenCard = observer(({ token, onSelect, hot, wallet }: { token: To
     <PopupOption key={token.id} onClick={() => onSelect(token, wallet)}>
       <TokenIcon token={token} wallet={wallet} />
 
-      <div style={{ marginTop: -2, display: "flex", flexDirection: "column", gap: 4, textAlign: "left" }}>
+      <TokenWrap style={{ marginTop: -2, textAlign: "left" }}>
         <p style={{ textAlign: "left", fontSize: 20, fontWeight: "bold" }}>{symbol}</p>
         <p style={{ textAlign: "left", fontSize: 14, color: "#c6c6c6" }}>${formatter.amount(token.usd)}</p>
-      </div>
+      </TokenWrap>
 
-      <div style={{ display: "flex", flexDirection: "column", gap: 4, paddingRight: 4, marginLeft: "auto", alignItems: "flex-end" }}>
+      <TokenWrap style={{ paddingRight: 4, marginLeft: "auto", alignItems: "flex-end" }}>
         <p style={{ textAlign: "right", fontSize: 20 }}>{token.readable(balance)}</p>
         <p style={{ textAlign: "right", fontSize: 14, color: "#c6c6c6" }}>${token.readable(balance, token.usd)}</p>
-      </div>
+      </TokenWrap>
     </PopupOption>
   );
 });
+
+const TokenWrap = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+
+  &,
+  p {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+`;

package/src/ui/router.tsx

@@ -3,7 +3,7 @@ import { OmniConnector } from "../OmniConnector";
 import { BridgeReview } from "../exchange";
 import { Token } from "../core/token";
 import { OmniWallet } from "../OmniWallet";
-import { WalletType } from "../core/config";
+import { WalletType } from "../core/chains";
 import { Recipient } from "../core/recipient";
 
 import { present } from "./Popup";