diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9c140f236..7f82c8f75 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -29,6 +29,7 @@
     "bitcoincash",
     "bitcoincashjs",
     "bitcoinjs",
+    "bitget",
     "blakejs",
     "blockchair",
     "Chunkv",
@@ -49,6 +50,7 @@
     "Pancakeswapeth",
     "Pathv",
     "pino",
+    "polkadotjs",
     "privkey",
     "Ripemd",
     "Stargatearb",
diff --git a/packages/toolboxes/src/substrate/toolbox/index.ts b/packages/toolboxes/src/substrate/toolbox/index.ts
index b818d7f7a..b02aa43f4 100644
--- a/packages/toolboxes/src/substrate/toolbox/index.ts
+++ b/packages/toolboxes/src/substrate/toolbox/index.ts
@@ -1,4 +1,4 @@
-import { Chain, SwapKitNumber } from "@swapkit/helpers";
+import { AssetValue, Chain } from "@swapkit/helpers";
 
 import { ToolboxFactory, type ToolboxParams } from "./baseSubstrateToolbox";
 
@@ -10,16 +10,11 @@ export const ChainflipToolbox = async ({ signer, generic = false }: ToolboxParam
   const toolbox = await ToolboxFactory({ chain: Chain.Chainflip, generic, signer });
 
   async function getBalance(address: string) {
-    const { api, gasAsset } = toolbox;
     // @ts-expect-error @Towan some parts of data missing?
     // biome-ignore lint/correctness/noUnsafeOptionalChaining: @Towan some parts of data missing?
-    const { balance } = await api.query.flip?.account?.(address);
+    const { balance } = await toolbox.api.query.flip?.account?.(address);
 
-    return [
-      toolbox.gasAsset.set(
-        SwapKitNumber.fromBigInt(BigInt(balance.toString()), gasAsset.decimal).getValue("string"),
-      ),
-    ];
+    return [AssetValue.from({ chain: Chain.Chainflip, value: BigInt(balance.toString()) })];
   }
 
   return { ...toolbox, getBalance };
diff --git a/packages/wallets/src/evm-extensions/index.ts b/packages/wallets/src/evm-extensions/index.ts
index 0cdf0ab33..6a24d6a9e 100644
--- a/packages/wallets/src/evm-extensions/index.ts
+++ b/packages/wallets/src/evm-extensions/index.ts
@@ -78,7 +78,6 @@ export const getWeb3WalletMethods = async ({
 
 export const evmWallet = createWallet({
   name: "connectEVMWallet",
-  walletType: undefined,
   supportedChains: [...EVMChains] as EVMChain[],
   connect: ({ addChain, supportedChains }) =>
     async function connectEVMWallet(
diff --git a/packages/wallets/src/keplr/index.ts b/packages/wallets/src/keplr/index.ts
index 2225bd83f..a5eb18b0b 100644
--- a/packages/wallets/src/keplr/index.ts
+++ b/packages/wallets/src/keplr/index.ts
@@ -22,7 +22,6 @@ const keplrSupportedChainIds = [ChainId.Cosmos, ChainId.Kujira, ChainId.THORChai
 
 export const keplrWallet = createWallet({
   name: "connectKeplr",
-  walletType: undefined,
   supportedChains: [Chain.Cosmos, Chain.Kujira, Chain.THORChain],
   connect: ({ addChain, supportedChains }) =>
     async function connectKeplr(