diff --git a/packages/extension/src/libs/market-data/index.ts b/packages/extension/src/libs/market-data/index.ts
index df572b993..fde2311fb 100644
--- a/packages/extension/src/libs/market-data/index.ts
+++ b/packages/extension/src/libs/market-data/index.ts
@@ -35,6 +35,26 @@ class MarketData {
     }
     return "0";
   }
+  async getTokenPrice(
+    coingeckoID: string,
+    currency = "usd"
+  ): Promise<string | null> {
+    const urlParams = new URLSearchParams();
+    urlParams.append("ids", coingeckoID);
+    urlParams.append("vs_currencies", currency);
+
+    return cacheFetch(
+      {
+        url: `${COINGECKO_ENDPOINT}simple/price?include_market_cap=false&include_24hr_vol=false&include_24hr_change=false&include_last_updated_at=false&${urlParams.toString()}`,
+      },
+      REFRESH_DELAY
+    ).then((json) => {
+      if (json[coingeckoID] && json[coingeckoID][currency] !== undefined) {
+        return json[coingeckoID][currency].toString();
+      }
+      return null;
+    });
+  }
   async getMarketInfoByContracts(
     contracts: string[],
     platformId: string
diff --git a/packages/extension/src/providers/ethereum/libs/abi/erc20.ts b/packages/extension/src/providers/ethereum/libs/abi/erc20.ts
index 92edb05a6..8ee9c26f9 100644
--- a/packages/extension/src/providers/ethereum/libs/abi/erc20.ts
+++ b/packages/extension/src/providers/ethereum/libs/abi/erc20.ts
@@ -1,4 +1,23 @@
 export default [
+  {
+    constant: true,
+    inputs: [
+      {
+        name: "_owner",
+        type: "address",
+      },
+    ],
+    name: "balanceOf",
+    outputs: [
+      {
+        name: "balance",
+        type: "uint256",
+      },
+    ],
+    payable: false,
+    stateMutability: "view",
+    type: "function",
+  },
   {
     constant: false,
     inputs: [
diff --git a/packages/extension/src/providers/ethereum/libs/activity-handlers/index.ts b/packages/extension/src/providers/ethereum/libs/activity-handlers/index.ts
new file mode 100644
index 000000000..78276daf5
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/libs/activity-handlers/index.ts
@@ -0,0 +1,3 @@
+import RivetActivity from "./providers/rivet";
+import EtherscanActivity from "./providers/etherscan";
+export { RivetActivity, EtherscanActivity };
diff --git a/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts
new file mode 100644
index 000000000..b7975d380
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts
@@ -0,0 +1,16 @@
+import { NetworkNames } from "@enkryptcom/types";
+
+const NetworkEndpoints = {
+  [NetworkNames.Ethereum]: "https://api.etherscan.io/",
+  [NetworkNames.Ropsten]: "https://api-ropsten.etherscan.io/",
+  [NetworkNames.Rinkeby]: "https://api-rinkeby.etherscan.io/",
+  [NetworkNames.Goerli]: "https://api-goerli.etherscan.io/",
+  [NetworkNames.Kovan]: "https://api-kovan.etherscan.io/",
+  [NetworkNames.Binance]: "https://api.bscscan.com/",
+  [NetworkNames.Matic]: "https://api.polygonscan.com/",
+  [NetworkNames.Moonbeam]: "https://api-moonbeam.moonscan.io/",
+  [NetworkNames.Moonriver]: "https://api-moonriver.moonscan.io/",
+  [NetworkNames.KaruraEVM]: "https://blockscout.karura.network/",
+};
+
+export { NetworkEndpoints };
diff --git a/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/index.ts b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/index.ts
new file mode 100644
index 000000000..f3b1f8db3
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/index.ts
@@ -0,0 +1,80 @@
+import cacheFetch from "@/libs/cache-fetch";
+import { EvmNetwork } from "@/providers/ethereum/types/evm-network";
+import { Activity, ActivityStatus, EthereumRawInfo } from "@/types/activity";
+import { BaseNetwork } from "@/types/base-network";
+import { numberToHex } from "web3-utils";
+import { decodeTx } from "../../../transaction/decoder";
+import { NetworkEndpoints } from "./configs";
+import { EtherscanTxType } from "./types";
+const TTL = 30000;
+const getAddressActivity = async (
+  address: string,
+  endpoint: string
+): Promise<EthereumRawInfo[]> => {
+  return cacheFetch(
+    {
+      url: `${endpoint}api?module=account&action=txlist&address=${address}`,
+    },
+    TTL
+  ).then((res) => {
+    if (res.status === "0") return [];
+    const results = res.result as EtherscanTxType[];
+    const newResults = results.reverse().map((tx) => {
+      const rawTx: EthereumRawInfo = {
+        blockHash: tx.blockHash,
+        blockNumber: numberToHex(tx.blockNumber),
+        contractAddress: tx.contractAddress,
+        data: tx.input,
+        effectiveGasPrice: numberToHex(tx.gasPrice),
+        from: tx.from,
+        to: tx.to === "" ? null : tx.to,
+        gas: numberToHex(tx.gas),
+        gasUsed: numberToHex(tx.gasUsed),
+        nonce: numberToHex(tx.nonce),
+        status: tx.isError === "0" ? "0x1" : "0x0",
+        transactionHash: tx.hash,
+        value: numberToHex(tx.value),
+        timestamp: parseInt(tx.timeStamp) * 1000,
+      };
+      return rawTx;
+    });
+    return newResults.slice(0, 50) as EthereumRawInfo[];
+  });
+};
+export default async (
+  network: BaseNetwork,
+  address: string
+): Promise<Activity[]> => {
+  address = address.toLowerCase();
+  const enpoint =
+    NetworkEndpoints[network.name as keyof typeof NetworkEndpoints];
+  const activities = await getAddressActivity(address, enpoint);
+  const Promises = activities.map((activity) => {
+    return decodeTx(activity, network as EvmNetwork).then((txData) => {
+      return {
+        from: activity.from,
+        to: activity.contractAddress
+          ? activity.contractAddress
+          : txData.tokenTo!,
+        isIncoming: activity.from !== address,
+        network: network.name,
+        rawInfo: activity,
+        status:
+          activity.status === "0x1"
+            ? ActivityStatus.success
+            : ActivityStatus.failed,
+        timestamp: activity.timestamp ? activity.timestamp : 0,
+        value: txData.tokenValue,
+        transactionHash: activity.transactionHash,
+        token: {
+          decimals: txData.tokenDecimals,
+          icon: txData.tokenImage,
+          name: txData.tokenName,
+          symbol: txData.tokenSymbol,
+          price: txData.currentPriceUSD.toString(),
+        },
+      };
+    });
+  });
+  return Promise.all(Promises);
+};
diff --git a/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/types.ts b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/types.ts
new file mode 100644
index 000000000..d27860237
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/types.ts
@@ -0,0 +1,16 @@
+export interface EtherscanTxType {
+  blockNumber: string;
+  timeStamp: string;
+  hash: string;
+  nonce: string;
+  blockHash: string;
+  from: string;
+  to: string;
+  contractAddress: string;
+  value: string;
+  gas: string;
+  gasPrice: string;
+  isError: string;
+  input: string;
+  gasUsed: string;
+}
diff --git a/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/rivet/configs.ts b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/rivet/configs.ts
new file mode 100644
index 000000000..790142b0b
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/rivet/configs.ts
@@ -0,0 +1,11 @@
+import { NetworkNames } from "@enkryptcom/types";
+
+const NetworkEndpoints = {
+  [NetworkNames.Ethereum]: "https://nodes.mewapi.io/rpc/eth",
+  [NetworkNames.Ropsten]: "https://nodes.mewapi.io/rpc/rop",
+  [NetworkNames.Rinkeby]: "https://nodes.mewapi.io/rpc/rinkeby",
+  [NetworkNames.Goerli]: "https://nodes.mewapi.io/rpc/goerli",
+  [NetworkNames.EthereumClassic]: "https://nodes.mewapi.io/rpc/etc",
+};
+
+export { NetworkEndpoints };
diff --git a/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/rivet/index.ts b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/rivet/index.ts
new file mode 100644
index 000000000..2787823c5
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/libs/activity-handlers/providers/rivet/index.ts
@@ -0,0 +1,86 @@
+import { EvmNetwork } from "@/providers/ethereum/types/evm-network";
+import { Activity, ActivityStatus, EthereumRawInfo } from "@/types/activity";
+import { BaseNetwork } from "@/types/base-network";
+import { decodeTx } from "../../../transaction/decoder";
+import { NetworkEndpoints } from "./configs";
+const getAddressActivity = async (
+  address: string,
+  endpoint: string
+): Promise<EthereumRawInfo[]> => {
+  const transactions = fetch(endpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      id: 0,
+      method: "flume_getTransactionsByParticipant",
+      params: [address],
+    }),
+  })
+    .then((res) => res.json())
+    .then((res) => res.result.items as EthereumRawInfo[]);
+
+  const transactionsReceipts = fetch(endpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      id: 0,
+      method: "flume_getTransactionReceiptsByParticipant",
+      params: [address],
+    }),
+  })
+    .then((res) => res.json())
+    .then((res) => res.result.items as EthereumRawInfo[]);
+  return Promise.all([transactions, transactionsReceipts]).then((responses) => {
+    let allInfo = responses[0].reverse().map((item) => {
+      const receipt = responses[1].find(
+        (r) => r.transactionHash === (item as any).hash
+      );
+      if (receipt) return { ...item, ...receipt, data: (item as any).input };
+      return null;
+    });
+    allInfo = allInfo.filter((i) => i !== null);
+    return allInfo.slice(0, 50) as EthereumRawInfo[];
+  });
+};
+export default async (
+  network: BaseNetwork,
+  address: string
+): Promise<Activity[]> => {
+  address = address.toLowerCase();
+  const enpoint =
+    NetworkEndpoints[network.name as keyof typeof NetworkEndpoints];
+  const activities = await getAddressActivity(address, enpoint);
+
+  const Promises = activities.map((activity) => {
+    return decodeTx(activity, network as EvmNetwork).then((txData) => {
+      return {
+        from: activity.from,
+        to: activity.contractAddress
+          ? activity.contractAddress
+          : txData.tokenTo!,
+        isIncoming: activity.from !== address,
+        network: network.name,
+        rawInfo: activity,
+        status:
+          activity.status === "0x1"
+            ? ActivityStatus.success
+            : ActivityStatus.failed,
+        timestamp: activity.timestamp ? activity.timestamp : 0,
+        value: txData.tokenValue,
+        transactionHash: activity.transactionHash,
+        token: {
+          decimals: txData.tokenDecimals,
+          icon: txData.tokenImage,
+          name: txData.tokenName,
+          symbol: txData.tokenSymbol,
+          price: txData.currentPriceUSD.toString(),
+        },
+      };
+    });
+  });
+  return Promise.all(Promises);
+};
diff --git a/packages/extension/src/providers/ethereum/libs/assets-handlers/tokenbalance-mew.ts b/packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts
similarity index 89%
rename from packages/extension/src/providers/ethereum/libs/assets-handlers/tokenbalance-mew.ts
rename to packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts
index e0dca88c4..f21fa21fa 100644
--- a/packages/extension/src/providers/ethereum/libs/assets-handlers/tokenbalance-mew.ts
+++ b/packages/extension/src/providers/ethereum/libs/assets-handlers/assetinfo-mew.ts
@@ -6,7 +6,6 @@ import {
   TokenBalance,
 } from "./types/tokenbalance-mew";
 import MarketData from "@/libs/market-data";
-import cacheFetch from "@/libs/cache-fetch";
 import { fromBase } from "@/libs/utils/units";
 import { toBN } from "web3-utils";
 import BigNumber from "bignumber.js";
@@ -18,12 +17,11 @@ import API from "@/providers/ethereum/libs/api";
 import Sparkline from "@/libs/sparkline";
 import { BaseNetwork } from "@/types/base-network";
 import { EvmNetwork } from "../../types/evm-network";
-import TokenLists from "./token-lists";
+import { getKnownNetworkTokens, TokenList } from "./token-lists";
 import networks from "../../networks";
 import { NetworkNames } from "@enkryptcom/types";
 import { NATIVE_TOKEN_ADDRESS } from "../common";
 const API_ENPOINT = "https://tokenbalance.mewapi.io/";
-const TOKEN_FETCH_TTL = 1000 * 60 * 60;
 export default (
   network: BaseNetwork,
   address: string
@@ -31,17 +29,17 @@ export default (
   const supportedNetworks: Record<SupportedNetworkNames, SupportedNetwork> = {
     [NetworkNames.Binance]: {
       tbName: "bsc",
-      tokenurl: TokenLists[NetworkNames.Binance],
+      tokenurl: TokenList[NetworkNames.Binance],
       cgPlatform: networks.bsc.coingeckoID as string,
     },
     [NetworkNames.Ethereum]: {
       tbName: "eth",
-      tokenurl: TokenLists[NetworkNames.Ethereum],
+      tokenurl: TokenList[NetworkNames.Ethereum],
       cgPlatform: networks.ethereum.coingeckoID as string,
     },
     [NetworkNames.Matic]: {
       tbName: "matic",
-      tokenurl: TokenLists[NetworkNames.Matic],
+      tokenurl: TokenList[NetworkNames.Matic],
       cgPlatform: networks.matic.coingeckoID as string,
     },
   };
@@ -72,19 +70,9 @@ export default (
         marketInfo[NATIVE_TOKEN_ADDRESS] = nativeMarket[0];
 
         const assets: AssetsType[] = [];
-        const tokenInfo: Record<string, CGToken> = await cacheFetch(
-          {
-            url: supportedNetworks[networkName].tokenurl,
-          },
-          TOKEN_FETCH_TTL
-        ).then((json) => {
-          const tokens: CGToken[] = json.tokens;
-          const tObject: Record<string, CGToken> = {};
-          tokens.forEach((t) => {
-            tObject[t.address] = t;
-          });
-          return tObject;
-        });
+        const tokenInfo: Record<string, CGToken> = await getKnownNetworkTokens(
+          network.name
+        );
 
         tokenInfo[NATIVE_TOKEN_ADDRESS] = {
           chainId: (network as EvmNetwork).chainID,
diff --git a/packages/extension/src/providers/ethereum/libs/assets-handlers/token-lists.ts b/packages/extension/src/providers/ethereum/libs/assets-handlers/token-lists.ts
index 21041dc5a..910a41fe1 100644
--- a/packages/extension/src/providers/ethereum/libs/assets-handlers/token-lists.ts
+++ b/packages/extension/src/providers/ethereum/libs/assets-handlers/token-lists.ts
@@ -1,10 +1,30 @@
+import cacheFetch from "@/libs/cache-fetch";
 import { NetworkNames } from "@enkryptcom/types";
-import { SupportedNetworkNames } from "./types/tokenbalance-mew";
-const tokenList: Record<SupportedNetworkNames, string> = {
+import { CGToken, SupportedNetworkNames } from "./types/tokenbalance-mew";
+const TOKEN_FETCH_TTL = 1000 * 60 * 60;
+const TokenList: Record<SupportedNetworkNames, string> = {
   [NetworkNames.Binance]:
     "https://tokens.coingecko.com/binance-smart-chain/all.json",
   [NetworkNames.Ethereum]: "https://tokens.coingecko.com/ethereum/all.json",
   [NetworkNames.Matic]: "https://tokens.coingecko.com/polygon-pos/all.json",
 };
 
-export default tokenList;
+const getKnownNetworkTokens = async (
+  networkName: NetworkNames
+): Promise<Record<string, CGToken>> => {
+  if (!TokenList[networkName as SupportedNetworkNames]) return {};
+  return cacheFetch(
+    {
+      url: TokenList[networkName as SupportedNetworkNames],
+    },
+    TOKEN_FETCH_TTL
+  ).then((json) => {
+    const tokens: CGToken[] = json.tokens;
+    const tObject: Record<string, CGToken> = {};
+    tokens.forEach((t) => {
+      tObject[t.address] = t;
+    });
+    return tObject;
+  });
+};
+export { TokenList, getKnownNetworkTokens };
diff --git a/packages/extension/src/providers/ethereum/libs/assets-handlers/token-mew.ts b/packages/extension/src/providers/ethereum/libs/assets-handlers/token-mew.ts
new file mode 100644
index 000000000..852627db7
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/libs/assets-handlers/token-mew.ts
@@ -0,0 +1,118 @@
+import {
+  CGToken,
+  SupportedNetwork,
+  SupportedNetworkNames,
+  TokenBalance,
+} from "./types/tokenbalance-mew";
+import MarketData from "@/libs/market-data";
+import { toBN } from "web3-utils";
+import API from "@/providers/ethereum/libs/api";
+import { BaseNetwork } from "@/types/base-network";
+import { EvmNetwork } from "../../types/evm-network";
+import { getKnownNetworkTokens, TokenList } from "./token-lists";
+import networks from "../../networks";
+import { NetworkNames } from "@enkryptcom/types";
+import { NATIVE_TOKEN_ADDRESS } from "../common";
+import { Erc20Token } from "../../types/erc20-token";
+const API_ENPOINT = "https://tokenbalance.mewapi.io/";
+
+export default (
+  network: BaseNetwork,
+  address: string
+): Promise<Erc20Token[]> => {
+  const supportedNetworks: Record<SupportedNetworkNames, SupportedNetwork> = {
+    [NetworkNames.Binance]: {
+      tbName: "bsc",
+      tokenurl: TokenList[NetworkNames.Binance],
+      cgPlatform: networks.bsc.coingeckoID as string,
+    },
+    [NetworkNames.Ethereum]: {
+      tbName: "eth",
+      tokenurl: TokenList[NetworkNames.Ethereum],
+      cgPlatform: networks.ethereum.coingeckoID as string,
+    },
+    [NetworkNames.Matic]: {
+      tbName: "matic",
+      tokenurl: TokenList[NetworkNames.Matic],
+      cgPlatform: networks.matic.coingeckoID as string,
+    },
+  };
+  if (!Object.keys(supportedNetworks).includes(network.name))
+    throw new Error("TOKENBALANCE-MEW: network not supported");
+  const networkName = network.name as SupportedNetworkNames;
+  const query = `${API_ENPOINT}${supportedNetworks[networkName].tbName}?address=${address}`;
+  return fetch(query)
+    .then((res) => res.json())
+    .then(async (json) => {
+      if (json.error) throw new Error(`TOKENBALANCE-MEW: ${json.error}`);
+      else {
+        const balances: Record<string, TokenBalance> = (
+          json.result as TokenBalance[]
+        ).reduce((obj, cur) => ({ ...obj, [cur.contract]: cur }), {});
+
+        const marketData = new MarketData();
+        const nativeMarket = await marketData.getMarketData(
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          [network.coingeckoID!] //it wont be null since all supported networks have coingeckoID
+        );
+        const marketInfo = await marketData.getMarketInfoByContracts(
+          Object.keys(balances).filter(
+            (contract) => contract !== NATIVE_TOKEN_ADDRESS
+          ),
+          supportedNetworks[networkName].cgPlatform
+        );
+        marketInfo[NATIVE_TOKEN_ADDRESS] = nativeMarket[0];
+
+        const assets: Erc20Token[] = [];
+        const tokenInfo: Record<string, CGToken> = await getKnownNetworkTokens(
+          network.name
+        );
+        tokenInfo[NATIVE_TOKEN_ADDRESS] = {
+          chainId: (network as EvmNetwork).chainID,
+          name: network.name_long,
+          decimals: 18,
+          address: NATIVE_TOKEN_ADDRESS,
+          logoURI: network.icon,
+          symbol: network.currencyName,
+        };
+        const unknownTokens: string[] = [];
+        let nativeAsset: Erc20Token | null = null;
+        for (const [address, market] of Object.entries(marketInfo)) {
+          if (market && tokenInfo[address]) {
+            const asset = new Erc20Token({
+              balance: toBN(balances[address].balance).toString(),
+              icon: market.image,
+              name: market.name,
+              symbol: market.symbol,
+              contract: address,
+              decimals: tokenInfo[address].decimals,
+              price: market.current_price.toString(),
+            });
+            if (address !== NATIVE_TOKEN_ADDRESS) assets.push(asset);
+            else nativeAsset = asset;
+          } else {
+            unknownTokens.push(address);
+          }
+        }
+        assets.unshift(nativeAsset as Erc20Token);
+        if (unknownTokens.length && network.api) {
+          const api = (await network.api()) as API;
+          const promises = unknownTokens.map((t) => api.getTokenInfo(t));
+          await Promise.all(promises).then((tokenInfo) => {
+            tokenInfo.forEach((tInfo, idx) => {
+              const asset = new Erc20Token({
+                balance: toBN(balances[unknownTokens[idx]].balance).toString(),
+                icon: nativeMarket[0]?.image || "",
+                name: tInfo.name,
+                symbol: tInfo.symbol,
+                decimals: tInfo.decimals,
+                contract: address,
+              });
+              assets.push(asset);
+            });
+          });
+        }
+        return assets;
+      }
+    });
+};
diff --git a/packages/extension/src/providers/ethereum/libs/transaction/data-decoder.ts b/packages/extension/src/providers/ethereum/libs/transaction/data-decoder.ts
index 596ba63ba..4b5de93e5 100644
--- a/packages/extension/src/providers/ethereum/libs/transaction/data-decoder.ts
+++ b/packages/extension/src/providers/ethereum/libs/transaction/data-decoder.ts
@@ -45,12 +45,20 @@ class DataDecode {
     try {
       const params = getParams(sig[0]);
       const decoded = rawDecode(params, hexToBuffer(this.valueData));
-      return {
+      const decodedData: DataDecodeResponse = {
         decoded: true,
         values: decoded.map((a) => toHex(a)),
         function: sig[0],
         isToken: this.isTokenAction,
       };
+      if (this.functionSig === tokenSigs.transfer) {
+        decodedData.tokenValue = decodedData.values[1];
+        decodedData.tokenTo = decodedData.values[0];
+      } else if (this.functionSig === tokenSigs.transferFrom) {
+        decodedData.tokenValue = decodedData.values[2];
+        decodedData.tokenTo = decodedData.values[1];
+      }
+      return decodedData;
     } catch (e) {
       return {
         decoded: false,
diff --git a/packages/extension/src/providers/ethereum/libs/transaction/decoder.ts b/packages/extension/src/providers/ethereum/libs/transaction/decoder.ts
index 9360124d7..8c0ace14b 100644
--- a/packages/extension/src/providers/ethereum/libs/transaction/decoder.ts
+++ b/packages/extension/src/providers/ethereum/libs/transaction/decoder.ts
@@ -1,30 +1,32 @@
 import { EvmNetwork } from "../../types/evm-network";
 import { DecodedTx, EthereumTransaction } from "./types";
-import TokenLists from "../assets-handlers/token-lists";
-import cacheFetch from "@/libs/cache-fetch";
 import {
-  CGToken,
-  SupportedNetworkNames,
-} from "../assets-handlers/types/tokenbalance-mew";
+  getKnownNetworkTokens,
+  TokenList,
+} from "../assets-handlers/token-lists";
+import { SupportedNetworkNames } from "../assets-handlers/types/tokenbalance-mew";
 import DataDecode from "./data-decoder";
 import { bufferToHex } from "@enkryptcom/utils";
 import type EvmApi from "../api";
 import MarketData from "@/libs/market-data";
+import { EthereumRawInfo } from "@/types/activity";
 const decodeTx = async (
-  tx: EthereumTransaction,
+  tx: EthereumTransaction | EthereumRawInfo,
   network: EvmNetwork
 ): Promise<DecodedTx> => {
   const isContractCreation = tx.to ? false : true;
+  let tokenTo = tx.to || null;
   let tokenName: string = network.currencyName;
   let tokenValue: string = tx.value && tx.value != "0x" ? tx.value : "0x0";
   let tokenDecimals: number = network.decimals;
   let tokenImage: string = network.icon;
+  let tokenSymbol: string = network.currencyName;
   let CGToken: string | undefined = network.coingeckoID;
   let currentPriceUSD = 0;
   const marketData = new MarketData();
   const dataDecoder = new DataDecode({
     data: tx.data as string,
-    to: tx.to,
+    to: tx.to!,
     value: tx.value as string,
   });
   const setInfoFromNetwork = (): Promise<void> => {
@@ -32,36 +34,42 @@ const decodeTx = async (
       return api.getTokenInfo(tx.to as string).then((tokenInfo) => {
         tokenName = tokenInfo.name;
         tokenDecimals = tokenInfo.decimals;
-        tokenValue = dataDecoder.decode().values[1];
+        tokenSymbol = tokenInfo.symbol;
+        const decodedInfo = dataDecoder.decode();
+        if (decodedInfo.tokenValue) {
+          tokenValue = decodedInfo.tokenValue;
+          tokenTo = decodedInfo.tokenTo!;
+        }
         CGToken = undefined;
         currentPriceUSD = 0;
       });
     });
   };
   if (tokenValue === "0x0" && dataDecoder.isTokenAction) {
-    if (TokenLists[network.name as SupportedNetworkNames]) {
-      await cacheFetch({
-        url: TokenLists[network.name as SupportedNetworkNames],
-      }).then((json) => {
-        const tokens: CGToken[] = json.tokens;
-        const curToken = tokens.find((t) => t.address === tx.to?.toLowerCase());
-        if (curToken) {
-          tokenName = curToken.name;
-          tokenImage = curToken.logoURI;
-          tokenDecimals = curToken.decimals;
-          tokenValue = dataDecoder.decode().values[1];
-          return marketData
-            .getMarketInfoByContracts([tx.to!], network.coingeckoID!)
-            .then((marketInfo) => {
-              if (marketInfo[tx.to!]) {
-                currentPriceUSD = marketInfo[tx.to!]!.current_price;
-                CGToken = marketInfo[tx.to!]!.id;
-              }
-            });
-        } else {
-          return setInfoFromNetwork();
+    if (TokenList[network.name as SupportedNetworkNames]) {
+      const knownTokens = await getKnownNetworkTokens(network.name);
+      const curToken = knownTokens[tx.to?.toLowerCase() || ""];
+      if (curToken) {
+        tokenName = curToken.name;
+        tokenImage = curToken.logoURI;
+        tokenDecimals = curToken.decimals;
+        tokenSymbol = curToken.symbol;
+        const decodedInfo = dataDecoder.decode();
+        if (decodedInfo.tokenValue) {
+          tokenValue = decodedInfo.tokenValue;
+          tokenTo = decodedInfo.tokenTo!;
         }
-      });
+        await marketData
+          .getMarketInfoByContracts([tx.to!], network.coingeckoID!)
+          .then((marketInfo) => {
+            if (marketInfo[tx.to!]) {
+              currentPriceUSD = marketInfo[tx.to!]!.current_price;
+              CGToken = marketInfo[tx.to!]!.id;
+            }
+          });
+      } else {
+        await setInfoFromNetwork();
+      }
     } else {
       await setInfoFromNetwork();
     }
@@ -74,12 +82,14 @@ const decodeTx = async (
   return {
     isContractCreation,
     dataHex: bufferToHex(dataDecoder.data),
-    toAddress: tx.to,
+    toAddress: tx.to!,
     decodedHex: dataDecoder.decode().values,
     tokenDecimals,
     tokenImage,
     tokenName,
     tokenValue,
+    tokenSymbol,
+    tokenTo,
     currentPriceUSD,
   };
 };
diff --git a/packages/extension/src/providers/ethereum/libs/transaction/types.ts b/packages/extension/src/providers/ethereum/libs/transaction/types.ts
index f4f30618c..bcf581963 100644
--- a/packages/extension/src/providers/ethereum/libs/transaction/types.ts
+++ b/packages/extension/src/providers/ethereum/libs/transaction/types.ts
@@ -47,8 +47,10 @@ export interface DecodedTx {
   currentPriceUSD: number;
   tokenValue: string;
   tokenDecimals: number;
+  tokenSymbol: string;
   tokenName: string;
   tokenImage: string;
+  tokenTo: string | null;
   dataHex: string;
   decodedHex?: string[];
 }
@@ -66,6 +68,8 @@ export interface DataDecodeResponse {
   decoded: boolean;
   values: string[];
   function?: string;
+  tokenValue?: string;
+  tokenTo?: string;
   isToken: boolean;
 }
 
diff --git a/packages/extension/src/providers/ethereum/networks/bsc.ts b/packages/extension/src/providers/ethereum/networks/bsc.ts
index 135d0ff6f..3dced02bf 100644
--- a/packages/extension/src/providers/ethereum/networks/bsc.ts
+++ b/packages/extension/src/providers/ethereum/networks/bsc.ts
@@ -1,6 +1,8 @@
 import { NetworkNames } from "@enkryptcom/types";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
-import tokenbalanceMew from "@/providers/ethereum/libs/assets-handlers/tokenbalance-mew";
+import assetsInfoHandler from "@/providers/ethereum/libs/assets-handlers/assetinfo-mew";
+import tokensHandler from "@/providers/ethereum/libs/assets-handlers/token-mew";
+import { EtherscanActivity } from "../libs/activity-handlers";
 
 const bscOptions: EvmNetworkOptions = {
   name: NetworkNames.Binance,
@@ -16,7 +18,9 @@ const bscOptions: EvmNetworkOptions = {
   gradient: "#E6007A",
   coingeckoID: "binancecoin",
   basePath: "m/44'/714'",
-  assetsHandler: tokenbalanceMew,
+  assetsInfoHandler,
+  tokensHandler,
+  activityHandler: EtherscanActivity,
 };
 
 const bsc = new EvmNetwork(bscOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/etc.ts b/packages/extension/src/providers/ethereum/networks/etc.ts
index 72f97e5d8..0f3d931f2 100644
--- a/packages/extension/src/providers/ethereum/networks/etc.ts
+++ b/packages/extension/src/providers/ethereum/networks/etc.ts
@@ -1,5 +1,6 @@
 import { NetworkNames } from "@enkryptcom/types";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
+import { RivetActivity } from "../libs/activity-handlers";
 
 const etcOptions: EvmNetworkOptions = {
   name: NetworkNames.EthereumClassic,
@@ -10,11 +11,12 @@ const etcOptions: EvmNetworkOptions = {
   chainID: 61,
   isTestNetwork: false,
   currencyName: "ETC",
-  node: "wss://www.ethercluster.com/ws-etc",
+  node: "wss://nodes.mewapi.io/ws/etc",
   icon: require("./icons/etc.svg"),
   gradient: "#53CBC9",
   basePath: "m/44'/61'/0'/0",
   coingeckoID: "ethereum-classic",
+  activityHandler: RivetActivity,
 };
 
 const etc = new EvmNetwork(etcOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/eth.ts b/packages/extension/src/providers/ethereum/networks/eth.ts
index ec76614f5..4766e7075 100644
--- a/packages/extension/src/providers/ethereum/networks/eth.ts
+++ b/packages/extension/src/providers/ethereum/networks/eth.ts
@@ -1,7 +1,9 @@
 import { NetworkNames } from "@enkryptcom/types";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
-import tokenbalanceMew from "@/providers/ethereum/libs/assets-handlers/tokenbalance-mew";
+import assetsInfoHandler from "@/providers/ethereum/libs/assets-handlers/assetinfo-mew";
+import tokensHandler from "@/providers/ethereum/libs/assets-handlers/token-mew";
 import mewNFTHandler from "@/libs/nft-handlers/mew";
+import { EtherscanActivity } from "../libs/activity-handlers";
 
 const ethOptions: EvmNetworkOptions = {
   name: NetworkNames.Ethereum,
@@ -17,7 +19,9 @@ const ethOptions: EvmNetworkOptions = {
   gradient: "#8247E5",
   coingeckoID: "ethereum",
   NFTHandler: mewNFTHandler,
-  assetsHandler: tokenbalanceMew,
+  assetsInfoHandler,
+  tokensHandler,
+  activityHandler: EtherscanActivity,
 };
 
 const eth = new EvmNetwork(ethOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/goerli.ts b/packages/extension/src/providers/ethereum/networks/goerli.ts
index f99c2ecff..5b5395a13 100644
--- a/packages/extension/src/providers/ethereum/networks/goerli.ts
+++ b/packages/extension/src/providers/ethereum/networks/goerli.ts
@@ -1,5 +1,6 @@
 import { NetworkNames } from "@enkryptcom/types";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
+import { RivetActivity } from "../libs/activity-handlers";
 
 const goerliOptions: EvmNetworkOptions = {
   name: NetworkNames.Goerli,
@@ -14,6 +15,7 @@ const goerliOptions: EvmNetworkOptions = {
   icon: require("./icons/eth.svg"),
   gradient: "#C4C4C4",
   coingeckoID: "ethereum",
+  activityHandler: RivetActivity,
 };
 
 const goerli = new EvmNetwork(goerliOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/karura.ts b/packages/extension/src/providers/ethereum/networks/karura.ts
index 266439cd7..0e1d2ce7b 100644
--- a/packages/extension/src/providers/ethereum/networks/karura.ts
+++ b/packages/extension/src/providers/ethereum/networks/karura.ts
@@ -1,4 +1,5 @@
 import { NetworkNames } from "@enkryptcom/types";
+import { EtherscanActivity } from "../libs/activity-handlers";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
 
 const karuraOptions: EvmNetworkOptions = {
@@ -14,6 +15,7 @@ const karuraOptions: EvmNetworkOptions = {
   icon: require("./icons/karura-evm.svg"),
   gradient: "#FF4C3B",
   coingeckoID: "karura",
+  activityHandler: EtherscanActivity,
 };
 
 const karura = new EvmNetwork(karuraOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/kov.ts b/packages/extension/src/providers/ethereum/networks/kov.ts
index 8b30bfe34..2a32cf535 100644
--- a/packages/extension/src/providers/ethereum/networks/kov.ts
+++ b/packages/extension/src/providers/ethereum/networks/kov.ts
@@ -1,5 +1,6 @@
 import { NetworkNames } from "@enkryptcom/types";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
+import { EtherscanActivity } from "../libs/activity-handlers";
 
 const kovOptions: EvmNetworkOptions = {
   name: NetworkNames.Kovan,
@@ -13,6 +14,7 @@ const kovOptions: EvmNetworkOptions = {
   node: "wss://nodes.mewapi.io/ws/kovan",
   icon: require("./icons/eth.svg"),
   gradient: "#E6007A",
+  activityHandler: EtherscanActivity,
 };
 
 const kov = new EvmNetwork(kovOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/matic.ts b/packages/extension/src/providers/ethereum/networks/matic.ts
index 40a6e9644..aa8e6afda 100644
--- a/packages/extension/src/providers/ethereum/networks/matic.ts
+++ b/packages/extension/src/providers/ethereum/networks/matic.ts
@@ -1,7 +1,9 @@
 import { NetworkNames } from "@enkryptcom/types";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
-import tokenbalanceMew from "@/providers/ethereum/libs/assets-handlers/tokenbalance-mew";
+import assetsInfoHandler from "@/providers/ethereum/libs/assets-handlers/assetinfo-mew";
+import tokensHandler from "@/providers/ethereum/libs/assets-handlers/token-mew";
 import RaribleNFTHandler from "@/libs/nft-handlers/rarible";
+import { EtherscanActivity } from "../libs/activity-handlers";
 
 const maticOptions: EvmNetworkOptions = {
   name: NetworkNames.Matic,
@@ -17,7 +19,9 @@ const maticOptions: EvmNetworkOptions = {
   gradient: "#53CBC9",
   coingeckoID: "matic-network",
   NFTHandler: RaribleNFTHandler,
-  assetsHandler: tokenbalanceMew,
+  assetsInfoHandler,
+  tokensHandler,
+  activityHandler: EtherscanActivity,
 };
 
 const matic = new EvmNetwork(maticOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/moonbeam.ts b/packages/extension/src/providers/ethereum/networks/moonbeam.ts
index 35f9a42f7..5051cfa4c 100644
--- a/packages/extension/src/providers/ethereum/networks/moonbeam.ts
+++ b/packages/extension/src/providers/ethereum/networks/moonbeam.ts
@@ -1,4 +1,5 @@
 import { NetworkNames } from "@enkryptcom/types";
+import { EtherscanActivity } from "../libs/activity-handlers";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
 
 const moonbeamOptions: EvmNetworkOptions = {
@@ -14,6 +15,7 @@ const moonbeamOptions: EvmNetworkOptions = {
   icon: require("./icons/moonbeam.svg"),
   gradient: "#8247E5",
   coingeckoID: "moonbeam",
+  activityHandler: EtherscanActivity,
 };
 
 const moonbeam = new EvmNetwork(moonbeamOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/moonriver.ts b/packages/extension/src/providers/ethereum/networks/moonriver.ts
index 941def5b9..e6f103a0b 100644
--- a/packages/extension/src/providers/ethereum/networks/moonriver.ts
+++ b/packages/extension/src/providers/ethereum/networks/moonriver.ts
@@ -1,4 +1,5 @@
 import { NetworkNames } from "@enkryptcom/types";
+import { EtherscanActivity } from "../libs/activity-handlers";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
 
 const moonriverOptions: EvmNetworkOptions = {
@@ -14,6 +15,7 @@ const moonriverOptions: EvmNetworkOptions = {
   icon: require("./icons/moonriver.svg"),
   gradient: "#f2b606",
   coingeckoID: "moonriver",
+  activityHandler: EtherscanActivity,
 };
 
 const moonriver = new EvmNetwork(moonriverOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/rin.ts b/packages/extension/src/providers/ethereum/networks/rin.ts
index 83a07f636..6d4243c08 100644
--- a/packages/extension/src/providers/ethereum/networks/rin.ts
+++ b/packages/extension/src/providers/ethereum/networks/rin.ts
@@ -1,4 +1,5 @@
 import { NetworkNames } from "@enkryptcom/types";
+import { RivetActivity } from "../libs/activity-handlers";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
 
 const rinOptions: EvmNetworkOptions = {
@@ -13,6 +14,7 @@ const rinOptions: EvmNetworkOptions = {
   node: "wss://nodes.mewapi.io/ws/rinkeby",
   icon: require("./icons/eth.svg"),
   gradient: "#C4C4C4",
+  activityHandler: RivetActivity,
 };
 
 const rin = new EvmNetwork(rinOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/rop.ts b/packages/extension/src/providers/ethereum/networks/rop.ts
index 17480ef61..9dfbe0864 100644
--- a/packages/extension/src/providers/ethereum/networks/rop.ts
+++ b/packages/extension/src/providers/ethereum/networks/rop.ts
@@ -1,5 +1,6 @@
 import { NetworkNames } from "@enkryptcom/types";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
+import { RivetActivity } from "../libs/activity-handlers";
 
 const ropOptions: EvmNetworkOptions = {
   name: NetworkNames.Ropsten,
@@ -14,6 +15,7 @@ const ropOptions: EvmNetworkOptions = {
   icon: require("./icons/eth.svg"),
   basePath: "m/44'/1'/0'/0",
   gradient: "#E6007A",
+  activityHandler: RivetActivity,
 };
 
 const rop = new EvmNetwork(ropOptions);
diff --git a/packages/extension/src/providers/ethereum/types/erc20-token.ts b/packages/extension/src/providers/ethereum/types/erc20-token.ts
new file mode 100644
index 000000000..ca2b9e52f
--- /dev/null
+++ b/packages/extension/src/providers/ethereum/types/erc20-token.ts
@@ -0,0 +1,37 @@
+import { BaseToken, BaseTokenOptions } from "@/types/base-token";
+import { BN } from "ethereumjs-util";
+import { numberToHex } from "web3-utils";
+import erc20 from "../libs/abi/erc20";
+import EvmAPI from "../libs/api";
+import { NATIVE_TOKEN_ADDRESS } from "../libs/common";
+
+interface Erc20TokenOptions extends BaseTokenOptions {
+  contract: string;
+}
+
+export class Erc20Token extends BaseToken {
+  public contract: string;
+
+  constructor(options: Erc20TokenOptions) {
+    super(options);
+    this.contract = options.contract;
+  }
+
+  public async getLatestUserBalance(
+    api: EvmAPI,
+    address: string
+  ): Promise<string> {
+    if (this.contract === NATIVE_TOKEN_ADDRESS) return api.getBalance(address);
+    else {
+      const contract = new api.web3.eth.Contract(erc20 as any, this.contract);
+      return contract.methods
+        .balanceOf(address)
+        .call()
+        .then((val: BN) => numberToHex(val));
+    }
+  }
+
+  public async send(): Promise<any> {
+    throw new Error("EVM-send is not implemented here");
+  }
+}
diff --git a/packages/extension/src/providers/ethereum/types/evm-network.ts b/packages/extension/src/providers/ethereum/types/evm-network.ts
index f35ce2ade..a016aa3f2 100644
--- a/packages/extension/src/providers/ethereum/types/evm-network.ts
+++ b/packages/extension/src/providers/ethereum/types/evm-network.ts
@@ -1,5 +1,6 @@
 import { formatFloatingPointValue } from "@/libs/utils/number-formatter";
 import { fromBase } from "@/libs/utils/units";
+import { Activity } from "@/types/activity";
 import { BaseNetwork } from "@/types/base-network";
 import { BaseToken } from "@/types/base-token";
 import { NFTCollection } from "@/types/nft";
@@ -28,21 +29,43 @@ export interface EvmNetworkOptions {
     network: BaseNetwork,
     address: string
   ) => Promise<NFTCollection[]>;
-  assetsHandler?: (
+  assetsInfoHandler?: (
     network: BaseNetwork,
     address: string
   ) => Promise<AssetsType[]>;
+  tokensHandler?: (
+    network: BaseNetwork,
+    address: string
+  ) => Promise<BaseToken[]>;
+  activityHandler: (
+    network: BaseNetwork,
+    address: string
+  ) => Promise<Activity[]>;
 }
 
 export class EvmNetwork extends BaseNetwork {
   public chainID: number;
 
-  private assetsHandler:
-    | ((network: BaseNetwork, address: string) => Promise<AssetsType[]>)
-    | undefined;
-  private NFTHandler:
-    | ((network: BaseNetwork, address: string) => Promise<NFTCollection[]>)
-    | undefined;
+  private assetsInfoHandler?: (
+    network: BaseNetwork,
+    address: string
+  ) => Promise<AssetsType[]>;
+
+  tokensHandler?: (
+    network: BaseNetwork,
+    address: string
+  ) => Promise<BaseToken[]>;
+
+  private NFTHandler?: (
+    network: BaseNetwork,
+    address: string
+  ) => Promise<NFTCollection[]>;
+
+  private activityHandler: (
+    network: BaseNetwork,
+    address: string
+  ) => Promise<Activity[]>;
+
   constructor(options: EvmNetworkOptions) {
     const api = async () => {
       const api = new API(options.node);
@@ -64,17 +87,23 @@ export class EvmNetwork extends BaseNetwork {
     super(baseOptions);
 
     this.chainID = options.chainID;
-    this.assetsHandler = options.assetsHandler;
+    this.assetsInfoHandler = options.assetsInfoHandler;
+    this.tokensHandler = options.tokensHandler;
     this.NFTHandler = options.NFTHandler;
+    this.activityHandler = options.activityHandler;
   }
 
-  public getAllTokens(): BaseToken[] {
-    return [];
+  public getAllTokens(address: string): Promise<BaseToken[]> {
+    if (this.tokensHandler) {
+      return this.tokensHandler(this, address);
+    }
+
+    return Promise.resolve([]);
   }
 
   public async getAllTokenInfo(address: string): Promise<AssetsType[]> {
-    if (this.assetsHandler) {
-      return this.assetsHandler(this, address);
+    if (this.assetsInfoHandler) {
+      return this.assetsInfoHandler(this, address);
     } else {
       const api = await this.api();
       const balance = await (api as API).getBalance(address);
@@ -98,4 +127,7 @@ export class EvmNetwork extends BaseNetwork {
       return [nativeAsset];
     }
   }
+  public getAllActivity(address: string): Promise<Activity[]> {
+    return this.activityHandler(this, address);
+  }
 }
diff --git a/packages/extension/src/providers/ethereum/ui/send-transaction/components/send-token-select.vue b/packages/extension/src/providers/ethereum/ui/send-transaction/components/send-token-select.vue
index 1a1cb52a0..665b98442 100644
--- a/packages/extension/src/providers/ethereum/ui/send-transaction/components/send-token-select.vue
+++ b/packages/extension/src/providers/ethereum/ui/send-transaction/components/send-token-select.vue
@@ -6,7 +6,8 @@
     <div class="send-token-select__info">
       <h5>{{ token.name }}</h5>
       <p>
-        {{ token.balancef }} <span>{{ token.symbol }}</span>
+        {{ balance ? $filters.formatFloatingPointValue(balance).value : "~" }}
+        <span>{{ token.symbol }}</span>
       </p>
     </div>
 
@@ -17,20 +18,28 @@
 </template>
 
 <script setup lang="ts">
-import { PropType } from "vue";
+import { computed, PropType } from "vue";
 import SwitchArrow from "@action/icons/header/switch_arrow.vue";
-import { AssetsType } from "@/types/provider";
+import { Erc20Token } from "@/providers/ethereum/types/erc20-token";
+import { fromBase } from "@/libs/utils/units";
 const emit = defineEmits<{
   (e: "update:toggleTokenSelect"): void;
 }>();
-defineProps({
+
+const props = defineProps({
   token: {
-    type: Object as PropType<Partial<AssetsType>>,
+    type: Object as PropType<Partial<Erc20Token>>,
     default: () => {
       return {};
     },
   },
 });
+
+const balance = computed(() =>
+  props.token && props.token.balance
+    ? fromBase(props.token.balance, props.token.decimals!)
+    : undefined
+);
 </script>
 
 <style lang="less">
diff --git a/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue b/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
index e63e93172..5b1a1709d 100644
--- a/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
@@ -53,7 +53,7 @@
       <send-input-amount
         v-if="isSendToken"
         :amount="amount"
-        :fiat-value="selectedAsset.value"
+        :fiat-value="selectedAsset.price"
         :has-enough-balance="hasEnoughBalance"
         @update:input-amount="inputAmount"
         @update:input-set-max="setMaxValue"
@@ -114,7 +114,7 @@ import { nft } from "@action/types/mock";
 import { GasPriceTypes } from "../../../../providers/ethereum/libs/transaction/types";
 import { GasFeeType } from "../../../../providers/ethereum/ui/types";
 import { EvmNetwork } from "../../types/evm-network";
-import { AssetsType, ProviderName } from "@/types/provider";
+import { Erc20Token } from "../../types/erc20-token";
 import BigNumber from "bignumber.js";
 import { defaultGasCostVals } from "../common/default-vals";
 import Transaction from "@/providers/ethereum/libs/transaction";
@@ -127,6 +127,7 @@ import { formatFloatingPointValue } from "@/libs/utils/number-formatter";
 import { routes as RouterNames } from "@/ui/action/router";
 import getUiPath from "@/libs/utils/get-ui-path";
 import Browser from "webextension-polyfill";
+import { ProviderName } from "@/types/provider";
 
 const props = defineProps({
   network: {
@@ -143,15 +144,18 @@ const addressInput = ref();
 const route = useRoute();
 const router = useRouter();
 const selected: string = route.params.id as string;
-const accountAssets = ref<AssetsType[]>([]);
-const selectedAsset = ref<AssetsType | Partial<AssetsType>>({
-  icon: props.network.icon,
-  balancef: "0.00",
-  balanceUSDf: "0.00",
-  value: "0",
-  name: "loading",
-  decimals: 18,
-});
+const accountAssets = ref<Erc20Token[]>([]);
+const selectedAsset = ref<Erc20Token | Partial<Erc20Token>>(
+  new Erc20Token({
+    icon: props.network.icon,
+    symbol: "Loading",
+    balance: "0",
+    price: "0",
+    name: "loading",
+    contract: "0x0",
+    decimals: 18,
+  })
+);
 const amount = ref<string>("0.00");
 const hasEnoughBalance = computed(() => {
   return toBN(selectedAsset.value.balance || "0").gte(
@@ -202,12 +206,12 @@ const setTransactionFees = (tx: Transaction) => {
   return tx.getGasCosts().then(async (gasvals) => {
     const getConvertedVal = (type: GasPriceTypes) =>
       fromBase(gasvals[type], props.network.decimals);
-    const nativeVal = accountAssets.value[0].value;
+    const nativeVal = accountAssets.value[0].price;
     gasCostValues.value = {
       [GasPriceTypes.ECONOMY]: {
         nativeValue: getConvertedVal(GasPriceTypes.ECONOMY),
         fiatValue: new BigNumber(getConvertedVal(GasPriceTypes.ECONOMY))
-          .times(nativeVal)
+          .times(nativeVal!)
           .toString(),
         nativeSymbol: props.network.currencyName,
         fiatSymbol: "USD",
@@ -215,7 +219,7 @@ const setTransactionFees = (tx: Transaction) => {
       [GasPriceTypes.REGULAR]: {
         nativeValue: getConvertedVal(GasPriceTypes.REGULAR),
         fiatValue: new BigNumber(getConvertedVal(GasPriceTypes.REGULAR))
-          .times(nativeVal)
+          .times(nativeVal!)
           .toString(),
         nativeSymbol: props.network.currencyName,
         fiatSymbol: "USD",
@@ -223,7 +227,7 @@ const setTransactionFees = (tx: Transaction) => {
       [GasPriceTypes.FAST]: {
         nativeValue: getConvertedVal(GasPriceTypes.FAST),
         fiatValue: new BigNumber(getConvertedVal(GasPriceTypes.FAST))
-          .times(nativeVal)
+          .times(nativeVal!)
           .toString(),
         nativeSymbol: props.network.currencyName,
         fiatSymbol: "USD",
@@ -231,7 +235,7 @@ const setTransactionFees = (tx: Transaction) => {
       [GasPriceTypes.FASTEST]: {
         nativeValue: getConvertedVal(GasPriceTypes.FASTEST),
         fiatValue: new BigNumber(getConvertedVal(GasPriceTypes.FASTEST))
-          .times(nativeVal)
+          .times(nativeVal!)
           .toString(),
         nativeSymbol: props.network.currencyName,
         fiatSymbol: "USD",
@@ -257,10 +261,10 @@ const setBaseCosts = () => {
 };
 const fetchAssets = () => {
   return props.network
-    .getAllTokenInfo(props.accountInfo.selectedAccount!.address)
+    .getAllTokens(props.accountInfo.selectedAccount!.address)
     .then((allAssets) => {
-      accountAssets.value = allAssets;
-      selectedAsset.value = allAssets[0];
+      accountAssets.value = allAssets as Erc20Token[];
+      selectedAsset.value = allAssets[0] as Erc20Token;
     });
 };
 
@@ -344,7 +348,7 @@ const selectAccount = (account: string) => {
   isOpenSelectContact.value = false;
 };
 
-const selectToken = (token: AssetsType) => {
+const selectToken = (token: Erc20Token) => {
   inputAmount("0");
   selectedAsset.value = token;
   isOpenSelectToken.value = false;
@@ -372,7 +376,7 @@ const sendAction = async () => {
       amount: amount.value,
       icon: selectedAsset.value.icon as string,
       symbol: selectedAsset.value.symbol || "unknown",
-      valueUSD: new BigNumber(selectedAsset.value.value || "0")
+      valueUSD: new BigNumber(selectedAsset.value.price || "0")
         .times(amount.value)
         .toString(),
     },
diff --git a/packages/extension/src/providers/polkadot/libs/activity-handlers/index.ts b/packages/extension/src/providers/polkadot/libs/activity-handlers/index.ts
new file mode 100644
index 000000000..f5caef164
--- /dev/null
+++ b/packages/extension/src/providers/polkadot/libs/activity-handlers/index.ts
@@ -0,0 +1,3 @@
+import subscanActivity from "./providers/subscan";
+
+export { subscanActivity };
diff --git a/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/configs.ts b/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/configs.ts
new file mode 100644
index 000000000..2e17a8ee9
--- /dev/null
+++ b/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/configs.ts
@@ -0,0 +1,11 @@
+import { NetworkNames } from "@enkryptcom/types";
+
+const NetworkEndpoints = {
+  [NetworkNames.Polkadot]: "https://polkadot.api.subscan.io/",
+  [NetworkNames.Kusama]: "https://kusama.api.subscan.io/",
+  [NetworkNames.Westend]: "https://westend.api.subscan.io/",
+  [NetworkNames.Acala]: "https://acala.api.subscan.io/",
+  [NetworkNames.Karura]: "https://karura.api.subscan.io/",
+};
+
+export { NetworkEndpoints };
diff --git a/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/index.ts b/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/index.ts
new file mode 100644
index 000000000..5dc711f70
--- /dev/null
+++ b/packages/extension/src/providers/polkadot/libs/activity-handlers/providers/subscan/index.ts
@@ -0,0 +1,61 @@
+import cacheFetch from "@/libs/cache-fetch";
+import MarketData from "@/libs/market-data";
+import { toBase } from "@/libs/utils/units";
+import { Activity, ActivityStatus, SubstrateRawInfo } from "@/types/activity";
+import { BaseNetwork } from "@/types/base-network";
+import { numberToHex } from "web3-utils";
+import { NetworkEndpoints } from "./configs";
+const TTL = 30000;
+const getAddressActivity = async (
+  address: string,
+  endpoint: string
+): Promise<SubstrateRawInfo[]> => {
+  return cacheFetch(
+    {
+      url: `${endpoint}api/scan/transfers?address=${address}&row=50`,
+    },
+    TTL
+  ).then((res) => {
+    if (res.message !== "Success") return [];
+    return res.data.transfers ? res.data.transfers : [];
+  });
+};
+export default async (
+  network: BaseNetwork,
+  address: string
+): Promise<Activity[]> => {
+  const enpoint =
+    NetworkEndpoints[network.name as keyof typeof NetworkEndpoints];
+  const activities = await getAddressActivity(address, enpoint);
+  let price = "0";
+  if (network.coingeckoID) {
+    const marketData = new MarketData();
+    await marketData
+      .getTokenPrice(network.coingeckoID)
+      .then((mdata) => (price = mdata || "0"));
+  }
+  console.log(price, activities);
+  return activities.map((activity) => {
+    return {
+      from: activity.from,
+      to: activity.to,
+      isIncoming: activity.from !== address,
+      network: network.name,
+      rawInfo: activity,
+      status: activity.success ? ActivityStatus.success : ActivityStatus.failed,
+      timestamp: activity.block_timestamp * 1000,
+      value: numberToHex(toBase(activity.amount, network.decimals)),
+      transactionHash: activity.hash,
+      token: {
+        decimals: network.decimals,
+        icon: network.icon,
+        name: network.name_long,
+        symbol:
+          activity.asset_symbol !== ""
+            ? activity.asset_symbol
+            : network.currencyName,
+        price: price,
+      },
+    };
+  });
+};
diff --git a/packages/extension/src/providers/polkadot/networks/acala/acala.ts b/packages/extension/src/providers/polkadot/networks/acala/acala.ts
index 83ba8bbe1..3f3c8e85b 100644
--- a/packages/extension/src/providers/polkadot/networks/acala/acala.ts
+++ b/packages/extension/src/providers/polkadot/networks/acala/acala.ts
@@ -4,6 +4,7 @@ import {
   SubstrateNetwork,
   SubstrateNetworkOptions,
 } from "../../types/substrate-network";
+import { subscanActivity } from "../../libs/activity-handlers";
 
 const acalaOptions: SubstrateNetworkOptions = {
   name: NetworkNames.Acala,
@@ -21,6 +22,7 @@ const acalaOptions: SubstrateNetworkOptions = {
   coingeckoID: "acala",
   genesisHash:
     "0xfc41b9bd8ef8fe53d58c7ea67c794c7ec9a73daf05e6d54b14ff6342c99ba64c",
+  activityHandler: subscanActivity,
 };
 
 const acala = new SubstrateNetwork(acalaOptions);
diff --git a/packages/extension/src/providers/polkadot/networks/acala/karura.ts b/packages/extension/src/providers/polkadot/networks/acala/karura.ts
index 3dfa327fd..5ab7ac392 100644
--- a/packages/extension/src/providers/polkadot/networks/acala/karura.ts
+++ b/packages/extension/src/providers/polkadot/networks/acala/karura.ts
@@ -4,6 +4,7 @@ import {
   SubstrateNetwork,
   SubstrateNetworkOptions,
 } from "../../types/substrate-network";
+import { subscanActivity } from "../../libs/activity-handlers";
 
 const karuraOptions: SubstrateNetworkOptions = {
   name: NetworkNames.Karura,
@@ -21,6 +22,7 @@ const karuraOptions: SubstrateNetworkOptions = {
   coingeckoID: "karura",
   genesisHash:
     "0xbaf5aabe40646d11f0ee8abbdc64f4a4b7674925cba08e4a05ff9ebed6e2126b",
+  activityHandler: subscanActivity,
 };
 
 const karura = new SubstrateNetwork(karuraOptions);
diff --git a/packages/extension/src/providers/polkadot/networks/acala/types/acala-orml-asset.ts b/packages/extension/src/providers/polkadot/networks/acala/types/acala-orml-asset.ts
index 338119b05..9f55a635a 100644
--- a/packages/extension/src/providers/polkadot/networks/acala/types/acala-orml-asset.ts
+++ b/packages/extension/src/providers/polkadot/networks/acala/types/acala-orml-asset.ts
@@ -1,6 +1,9 @@
-import { BaseToken, BaseTokenOptions } from "@/types/base-token";
 import { ApiPromise } from "@polkadot/api";
 import { OrmlTokensAccountData } from "@acala-network/types/interfaces/types-lookup";
+import { SubmittableExtrinsic } from "@polkadot/api/types";
+import { ISubmittableResult } from "@polkadot/types/types";
+import { SubstrateToken } from "@/providers/polkadot/types/substrate-token";
+import { BaseTokenOptions } from "@/types/base-token";
 
 type AssetType =
   | "token"
@@ -13,7 +16,7 @@ interface AcalaOrmlAssetOptions extends BaseTokenOptions {
   lookupValue: string | number;
 }
 
-export class AcalaOrmlAsset extends BaseToken {
+export class AcalaOrmlAsset extends SubstrateToken {
   public assetType: AssetType;
   public lookupValue: string | number;
 
@@ -24,16 +27,28 @@ export class AcalaOrmlAsset extends BaseToken {
     this.lookupValue = options.lookupValue;
   }
 
-  public async getUserBalance(api: ApiPromise, address: any): Promise<string> {
+  public async getLatestUserBalance(
+    api: ApiPromise,
+    address: any
+  ): Promise<string> {
     const tokenLookup: Record<string, string | number> = {};
     tokenLookup[this.assetType] = this.lookupValue;
 
     return api.query.tokens.accounts(address, tokenLookup).then((res) => {
-      return (res as unknown as OrmlTokensAccountData).free.toString();
+      const balance = (res as unknown as OrmlTokensAccountData).free.toString();
+      this.balance = balance;
+      return balance;
     });
   }
 
-  public async send(api: any, to: string, amount: string): Promise<any> {
-    return (api as ApiPromise).tx.balances.transferKeepAlive(to, amount);
+  public async send(
+    api: ApiPromise,
+    to: string,
+    amount: string
+  ): Promise<SubmittableExtrinsic<"promise", ISubmittableResult>> {
+    const currencyId: Record<string, string | number> = {};
+    currencyId[this.assetType] = this.lookupValue;
+
+    return (api as ApiPromise).tx.currencies.transfer(to, currencyId, amount);
   }
 }
diff --git a/packages/extension/src/providers/polkadot/networks/kusama.ts b/packages/extension/src/providers/polkadot/networks/kusama.ts
index 97abb567b..8ffc61c41 100644
--- a/packages/extension/src/providers/polkadot/networks/kusama.ts
+++ b/packages/extension/src/providers/polkadot/networks/kusama.ts
@@ -1,5 +1,6 @@
 import { NetworkNames } from "@enkryptcom/types";
 import { toBN } from "web3-utils";
+import { subscanActivity } from "../libs/activity-handlers";
 import { SubstrateNativeToken } from "../types/substrate-native-token";
 import {
   SubstrateNetwork,
@@ -22,6 +23,7 @@ const ksmOptions: SubstrateNetworkOptions = {
   coingeckoID: "kusama",
   genesisHash:
     "0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe",
+  activityHandler: subscanActivity,
 };
 
 const ksm = new SubstrateNetwork(ksmOptions);
diff --git a/packages/extension/src/providers/polkadot/networks/polkadot.ts b/packages/extension/src/providers/polkadot/networks/polkadot.ts
index e1144483f..a03fb6694 100644
--- a/packages/extension/src/providers/polkadot/networks/polkadot.ts
+++ b/packages/extension/src/providers/polkadot/networks/polkadot.ts
@@ -5,6 +5,7 @@ import {
   SubstrateNetwork,
   SubstrateNetworkOptions,
 } from "../types/substrate-network";
+import { subscanActivity } from "../libs/activity-handlers";
 
 const polkadotOptions: SubstrateNetworkOptions = {
   name: NetworkNames.Polkadot,
@@ -22,6 +23,7 @@ const polkadotOptions: SubstrateNetworkOptions = {
   coingeckoID: "polkadot",
   genesisHash:
     "0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3",
+  activityHandler: subscanActivity,
 };
 
 const polkadot = new SubstrateNetwork(polkadotOptions);
diff --git a/packages/extension/src/providers/polkadot/networks/westend.ts b/packages/extension/src/providers/polkadot/networks/westend.ts
index df24bdd5d..a29921136 100644
--- a/packages/extension/src/providers/polkadot/networks/westend.ts
+++ b/packages/extension/src/providers/polkadot/networks/westend.ts
@@ -5,6 +5,7 @@ import {
   SubstrateNetwork,
   SubstrateNetworkOptions,
 } from "../types/substrate-network";
+import { subscanActivity } from "../libs/activity-handlers";
 
 const wndOptions: SubstrateNetworkOptions = {
   name: NetworkNames.Westend,
@@ -21,6 +22,7 @@ const wndOptions: SubstrateNetworkOptions = {
   node: "wss://westend-rpc.dwellir.com",
   genesisHash:
     "0xe143f23803ac50e8f6f8e62695d1ce9e4e1d68aa36c1cd2cfd15340213f3423e",
+  activityHandler: subscanActivity,
 };
 
 const wnd = new SubstrateNetwork(wndOptions);
diff --git a/packages/extension/src/providers/polkadot/types/substrate-native-token.ts b/packages/extension/src/providers/polkadot/types/substrate-native-token.ts
index 856e751b1..6dcc70b66 100644
--- a/packages/extension/src/providers/polkadot/types/substrate-native-token.ts
+++ b/packages/extension/src/providers/polkadot/types/substrate-native-token.ts
@@ -1,21 +1,27 @@
 import {
-  BaseToken,
   BaseTokenOptions,
   SendOptions,
   TransferType,
 } from "@/types/base-token";
 import { ApiPromise } from "@polkadot/api";
 import { AccountInfoWithRefCount } from "@polkadot/types/interfaces";
+import { SubstrateToken } from "./substrate-token";
 
-export class SubstrateNativeToken extends BaseToken {
+export class SubstrateNativeToken extends SubstrateToken {
   constructor(options: BaseTokenOptions) {
     super(options);
   }
 
-  public async getUserBalance(api: ApiPromise, address: any): Promise<string> {
+  public async getLatestUserBalance(
+    api: ApiPromise,
+    address: any
+  ): Promise<string> {
     return api.query.system
       .account<AccountInfoWithRefCount>(address)
-      .then(({ data }) => data.free.toString());
+      .then(({ data }) => {
+        this.balance = data.free.toString();
+        return data.free.toString();
+      });
   }
 
   public async send(
diff --git a/packages/extension/src/providers/polkadot/types/substrate-network.ts b/packages/extension/src/providers/polkadot/types/substrate-network.ts
index 65569974c..745dd42bc 100644
--- a/packages/extension/src/providers/polkadot/types/substrate-network.ts
+++ b/packages/extension/src/providers/polkadot/types/substrate-network.ts
@@ -15,6 +15,7 @@ import {
 } from "@/libs/utils/number-formatter";
 import Sparkline from "@/libs/sparkline";
 import { SubstrateNativeToken } from "./substrate-native-token";
+import { Activity } from "@/types/activity";
 
 export interface SubstrateNetworkOptions {
   name: NetworkNames;
@@ -32,12 +33,20 @@ export interface SubstrateNetworkOptions {
   coingeckoID?: string;
   genesisHash: string;
   transferMethods?: Record<string, (args: any) => any>;
+  activityHandler: (
+    network: BaseNetwork,
+    address: string
+  ) => Promise<Activity[]>;
 }
 
 export class SubstrateNetwork extends BaseNetwork {
   public prefix: number;
   public assets: BaseToken[] = [];
   public genesisHash: string;
+  private activityHandler: (
+    network: BaseNetwork,
+    address: string
+  ) => Promise<Activity[]>;
   public transferMethods: Record<string, (args: any) => any> = {
     "balances.transferKeepAlive": (args: any) => {
       const to = args.dest["Id"];
@@ -83,10 +92,11 @@ export class SubstrateNetwork extends BaseNetwork {
         ...this.transferMethods,
       };
     }
+    this.activityHandler = options.activityHandler;
   }
 
-  public getAllTokens(): BaseToken[] {
-    return this.assets;
+  public getAllTokens(): Promise<BaseToken[]> {
+    return Promise.resolve(this.assets);
   }
 
   public async getAllTokenInfo(address: string): Promise<AssetsType[]> {
@@ -107,7 +117,7 @@ export class SubstrateNetwork extends BaseNetwork {
     const api = await this.api();
 
     const balancePromises = supported.map((token) =>
-      token.getUserBalance((api as SubstrateAPI).api, address)
+      token.getLatestUserBalance((api as SubstrateAPI).api, address)
     );
     const marketData = new MarketData();
     const market = await marketData.getMarketData(
@@ -157,4 +167,7 @@ export class SubstrateNetwork extends BaseNetwork {
 
     return sorted;
   }
+  public getAllActivity(address: string): Promise<Activity[]> {
+    return this.activityHandler(this, address);
+  }
 }
diff --git a/packages/extension/src/providers/polkadot/types/substrate-token.ts b/packages/extension/src/providers/polkadot/types/substrate-token.ts
new file mode 100644
index 000000000..b3d8de9f3
--- /dev/null
+++ b/packages/extension/src/providers/polkadot/types/substrate-token.ts
@@ -0,0 +1,13 @@
+import { BaseToken, SendOptions } from "@/types/base-token";
+import { ApiPromise } from "@polkadot/api";
+import { SubmittableExtrinsic } from "@polkadot/api/types";
+import { ISubmittableResult } from "@polkadot/types/types";
+
+export abstract class SubstrateToken extends BaseToken {
+  public abstract send(
+    api: ApiPromise,
+    to: string,
+    amount: string,
+    options?: SendOptions
+  ): Promise<SubmittableExtrinsic<"promise", ISubmittableResult>>;
+}
diff --git a/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-token-select.vue b/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-token-select.vue
index d2d0c0040..ff0613ad6 100644
--- a/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-token-select.vue
+++ b/packages/extension/src/providers/polkadot/ui/send-transaction/components/send-token-select.vue
@@ -6,7 +6,8 @@
     <div class="send-token-select__info">
       <h5>{{ token!.name }}</h5>
       <p>
-        {{ token!.balancef }} <span>{{ token!.symbol }}</span>
+        {{ balance ? $filters.formatFloatingPointValue(balance).value : "~" }}
+        <span>{{ token!.symbol }}</span>
       </p>
     </div>
 
@@ -14,26 +15,6 @@
       <switch-arrow />
     </div>
   </a>
-  <!-- <a class="send-token-select" @click="open">
-    <div class="send-token-select__image">
-      <img :src="token ? token.icon : ''" alt="" />
-    </div>
-    <div class="send-token-select__info">
-      <h5>{{ token ? token.name : "~" }}</h5>
-      <p>
-        {{
-          tokenBalance
-            ? $filters.formatFloatingPointValue(tokenBalance).value
-            : "~"
-        }}
-        <span>{{ token ? token.symbol : "~" }}</span>
-      </p>
-    </div>
-
-    <div class="send-token-select__arrow">
-      <switch-arrow />
-    </div>
-  </a> -->
 </template>
 
 <script lang="ts">
@@ -44,17 +25,25 @@ export default {
 
 <script setup lang="ts">
 import SwitchArrow from "@action/icons/header/switch_arrow.vue";
-import { AssetsType } from "@/types/provider";
+import { BaseToken } from "@/types/base-token";
+import { computed } from "@vue/reactivity";
+import { fromBase } from "@/libs/utils/units";
 
 const emit = defineEmits<{
   (e: "update:toggleTokenSelect"): void;
 }>();
 
 interface IProps {
-  token?: AssetsType | Partial<AssetsType>;
+  token?: BaseToken | Partial<BaseToken>;
 }
 
-defineProps<IProps>();
+const props = defineProps<IProps>();
+
+const balance = computed(() =>
+  props.token && props.token.balance
+    ? fromBase(props.token.balance, props.token.decimals!)
+    : undefined
+);
 </script>
 
 <style lang="less">
diff --git a/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue b/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
index 526e5aac4..3fca299ed 100644
--- a/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
@@ -41,7 +41,7 @@
 
       <send-input-amount
         :amount="amount"
-        :fiat-value="selectedAsset.value"
+        :fiat-value="selectedAsset.price"
         :has-enough-balance="hasEnough"
         @update:input-amount="inputAmount"
         @update:input-set-max="setSendMax()"
@@ -93,7 +93,6 @@ import { SubstrateNetwork } from "../../types/substrate-network";
 import { toBN } from "web3-utils";
 import { formatFloatingPointValue } from "@/libs/utils/number-formatter";
 import createIcon from "../../libs/blockies";
-import { AssetsType, ProviderName } from "@/types/provider";
 import { fromBase, toBase } from "@/libs/utils/units";
 import BigNumber from "bignumber.js";
 import { VerifyTransactionParams } from "../types";
@@ -101,6 +100,9 @@ import { routes as RouterNames } from "@/ui/action/router";
 import { SendOptions } from "@/types/base-token";
 import Browser from "webextension-polyfill";
 import getUiPath from "@/libs/utils/get-ui-path";
+import { SubstrateToken } from "../../types/substrate-token";
+import { SubstrateNativeToken } from "../../types/substrate-native-token";
+import { ProviderName } from "@/types/provider";
 
 const props = defineProps({
   network: {
@@ -125,15 +127,17 @@ const amount = ref("0");
 const fee = ref<GasFeeInfo | null>(null);
 const edWarn = ref(false);
 const api = shallowRef<SubstrateApi>();
-const accountAssets = ref<AssetsType[]>([]);
-const selectedAsset = ref<AssetsType | Partial<AssetsType>>({
-  icon: props.network.icon,
-  balancef: "0.00",
-  balanceUSDf: "0.00",
-  value: "0",
-  name: "loading",
-  decimals: 18,
-});
+const accountAssets = ref<SubstrateToken[]>([]);
+const selectedAsset = ref<SubstrateToken | Partial<SubstrateToken>>(
+  new SubstrateNativeToken({
+    icon: props.network.icon,
+    balance: "0",
+    price: "0",
+    name: "loading",
+    symbol: "loading",
+    decimals: 12,
+  })
+);
 const hasEnough = ref(true);
 const sendMax = ref(false);
 
@@ -143,14 +147,32 @@ onMounted(async () => {
   props.accountInfo.activeAccounts.forEach((account) => {
     account.address = props.network.displayAddress(account.address);
   });
-  const networkAssets = await props.network.getAllTokenInfo(
-    props.accountInfo.selectedAccount?.address ?? ""
-  );
-  selectedAsset.value = networkAssets[0];
-  accountAssets.value = networkAssets;
+
   const networkApi = await props.network.api();
-  await networkApi.init();
-  api.value = networkApi as SubstrateApi;
+  networkApi.init().then(async () => {
+    api.value = networkApi as SubstrateApi;
+    const networkAssets = await props.network.getAllTokens();
+    const pricePromises = networkAssets.map((asset) => asset.getLatestPrice());
+    const balancePromises = networkAssets.map((asset) => {
+      return asset.getLatestUserBalance(
+        networkApi.api,
+        props.accountInfo.selectedAccount?.address ?? ""
+      );
+    });
+
+    Promise.all([...pricePromises, ...balancePromises]).then(() => {
+      const nonZeroAssets = networkAssets.filter(
+        (asset) => !toBN(asset.balance ?? "0").isZero()
+      );
+
+      if (nonZeroAssets.length == 0) {
+        nonZeroAssets.push(networkAssets[0]);
+      }
+
+      selectedAsset.value = nonZeroAssets[0];
+      accountAssets.value = nonZeroAssets;
+    });
+  });
 });
 
 watch([selectedAsset, amount, address], async () => {
@@ -172,7 +194,7 @@ watch([selectedAsset, amount, address], async () => {
       ? { type: "all" }
       : undefined;
 
-    const tx = await selectedAsset.value.baseToken!.send(
+    const tx = await selectedAsset.value.send!(
       api.value.api,
       address.value,
       rawAmount.toString(),
@@ -182,10 +204,13 @@ watch([selectedAsset, amount, address], async () => {
       await tx.paymentInfo(props.accountInfo.selectedAccount!.address)
     ).toJSON();
 
-    const txFee = toBN(partialFee);
-    const txFeeHuman = fromBase(partialFee, selectedAsset.value.decimals!);
+    const txFee = toBN(partialFee?.toString() ?? "");
+    const txFeeHuman = fromBase(
+      partialFee?.toString() ?? "",
+      selectedAsset.value.decimals!
+    );
 
-    const txPrice = new BigNumber(selectedAsset.value.value!).times(txFeeHuman);
+    const txPrice = new BigNumber(selectedAsset.value.price!).times(txFeeHuman);
 
     fee.value = {
       fiatSymbol: "USD",
@@ -194,7 +219,7 @@ watch([selectedAsset, amount, address], async () => {
       nativeValue: txFeeHuman.toString(),
     };
 
-    const ed = selectedAsset.value.baseToken!.existentialDeposit ?? toBN(0);
+    const ed = selectedAsset.value.existentialDeposit ?? toBN(0);
     const userBalance = toBN(selectedAsset.value.balance ?? 0);
     if (
       !userBalance.eq(rawAmount) &&
@@ -228,7 +253,7 @@ const selectAccount = (account: string) => {
   isOpenSelectContact.value = false;
 };
 
-const selectToken = (token: AssetsType | Partial<AssetsType>) => {
+const selectToken = (token: SubstrateToken | Partial<SubstrateToken>) => {
   selectedAsset.value = token;
   isOpenSelectToken.value = false;
 };
@@ -277,17 +302,14 @@ const isDisabled = () => {
 };
 
 const sendAction = async () => {
-  const sendAmount = toBase(
-    amount.value,
-    selectedAsset.value.baseToken!.decimals
-  );
+  const sendAmount = toBase(amount.value, selectedAsset.value.decimals!);
 
   const sendOptions: SendOptions | undefined = sendMax.value
     ? { type: "all" }
     : undefined;
 
   await api.value?.api.isReady;
-  const tx = await selectedAsset.value.baseToken?.send(
+  const tx = await selectedAsset.value?.send!(
     api.value!.api as ApiPromise,
     address.value,
     sendAmount,
@@ -305,7 +327,7 @@ const sendAction = async () => {
       amount: amount.value,
       icon: selectedAsset.value.icon as string,
       symbol: selectedAsset.value.symbol || "unknown",
-      valueUSD: new BigNumber(selectedAsset.value.value || "0")
+      valueUSD: new BigNumber(selectedAsset.value.price || "0")
         .times(amount.value)
         .toFixed(),
     },
diff --git a/packages/extension/src/providers/polkadot/ui/send-transaction/verify-transaction/index.vue b/packages/extension/src/providers/polkadot/ui/send-transaction/verify-transaction/index.vue
index 3dd299ad7..8c05c767c 100644
--- a/packages/extension/src/providers/polkadot/ui/send-transaction/verify-transaction/index.vue
+++ b/packages/extension/src/providers/polkadot/ui/send-transaction/verify-transaction/index.vue
@@ -79,9 +79,9 @@ import PublicKeyRing from "@/libs/keyring/public-keyring";
 import { getCurrentContext } from "@/libs/messenger/extension";
 import { VerifyTransactionParams } from "@/providers/polkadot/ui/types";
 import { ApiPromise } from "@polkadot/api";
+import { polkadotEncodeAddress } from "@/providers/polkadot/libs/signing-utils";
 import { u8aToHex } from "@polkadot/util";
 import type { SignerResult } from "@polkadot/api/types";
-import { polkadotEncodeAddress } from "@enkryptcom/utils";
 import { getNetworkByName } from "@/libs/utils/networks";
 import { TypeRegistry } from "@polkadot/types";
 import { TransactionSigner } from "../../libs/signer";
@@ -116,6 +116,7 @@ const sendAction = async () => {
   const account = await KeyRing.getAccount(
     polkadotEncodeAddress(txData.fromAddress)
   );
+
   const tx = (api.api as ApiPromise).tx(txData.TransactionData.data);
 
   try {
diff --git a/packages/extension/src/types/activity.ts b/packages/extension/src/types/activity.ts
new file mode 100644
index 000000000..f49639291
--- /dev/null
+++ b/packages/extension/src/types/activity.ts
@@ -0,0 +1,55 @@
+import { NetworkNames } from "@enkryptcom/types";
+import { BaseTokenOptions } from "./base-token";
+
+interface EthereumRawInfo {
+  blockHash: string;
+  blockNumber: string;
+  contractAddress: string | null;
+  effectiveGasPrice: string;
+  from: string;
+  to: string | null;
+  gas: string;
+  gasUsed: string;
+  status: string;
+  transactionHash: string;
+  data: string;
+  nonce: string;
+  value: string;
+  timestamp: number | undefined;
+}
+
+interface SubstrateRawInfo {
+  from: string;
+  to: string;
+  extrinsic_index: string;
+  success: boolean;
+  hash: string;
+  block_num: number;
+  block_timestamp: number;
+  module: string;
+  amount: string;
+  fee: string;
+  nonce: number;
+  asset_symbol: string;
+  asset_type: string;
+}
+
+enum ActivityStatus {
+  pending = "pending",
+  success = "success",
+  failed = "failed",
+}
+interface Activity {
+  network: NetworkNames;
+  from: string;
+  to: string;
+  value: string;
+  timestamp: number;
+  isIncoming: boolean;
+  transactionHash: string;
+  token: BaseTokenOptions;
+  status: ActivityStatus;
+  rawInfo: EthereumRawInfo | SubstrateRawInfo;
+}
+
+export { EthereumRawInfo, SubstrateRawInfo, Activity, ActivityStatus };
diff --git a/packages/extension/src/types/base-network.ts b/packages/extension/src/types/base-network.ts
index df8ce125d..91f1d0a58 100644
--- a/packages/extension/src/types/base-network.ts
+++ b/packages/extension/src/types/base-network.ts
@@ -3,6 +3,7 @@ import SubstrateAPI from "@/providers/polkadot/libs/api";
 import { AssetsType, ProviderName } from "@/types/provider";
 import { SignerType } from "@enkryptcom/types";
 import { NetworkNames } from "@enkryptcom/types";
+import { Activity } from "./activity";
 import { BaseToken } from "./base-token";
 
 export interface BaseNetworkOptions {
@@ -67,6 +68,7 @@ export abstract class BaseNetwork {
     this.api = options.api;
   }
 
-  public abstract getAllTokens(): BaseToken[];
+  public abstract getAllTokens(address: string): Promise<BaseToken[]>;
   public abstract getAllTokenInfo(address: string): Promise<AssetsType[]>;
+  public abstract getAllActivity(address: string): Promise<Activity[]>;
 }
diff --git a/packages/extension/src/types/base-token.ts b/packages/extension/src/types/base-token.ts
index 47179f975..12ff391a0 100644
--- a/packages/extension/src/types/base-token.ts
+++ b/packages/extension/src/types/base-token.ts
@@ -1,6 +1,5 @@
 import EvmAPI from "@/providers/ethereum/libs/api";
 import MarketData from "@/libs/market-data";
-import { FiatMarket } from "@/libs/market-data/types";
 import { ApiPromise } from "@polkadot/api";
 import { BN } from "ethereumjs-util";
 
@@ -17,6 +16,8 @@ export interface BaseTokenOptions {
   icon: string;
   coingeckoID?: string;
   existentialDeposit?: BN;
+  balance?: string;
+  price?: string;
 }
 
 export abstract class BaseToken {
@@ -26,6 +27,8 @@ export abstract class BaseToken {
   public icon: string;
   public coingeckoID: string | undefined;
   public existentialDeposit: BN | undefined;
+  public balance?: string;
+  public price?: string;
 
   constructor(options: BaseTokenOptions) {
     this.name = options.name;
@@ -34,23 +37,33 @@ export abstract class BaseToken {
     this.icon = options.icon;
     this.coingeckoID = options.coingeckoID;
     this.existentialDeposit = options.existentialDeposit;
+    this.price = options.price;
+    this.balance = options.balance;
   }
 
-  public async getTokenPrice(): Promise<FiatMarket | null> {
+  public async getLatestPrice(): Promise<string | null> {
     if (this.coingeckoID) {
       const market = new MarketData();
-      return market.getFiatValue(this.symbol);
+
+      return market.getTokenPrice(this.coingeckoID).then((price) => {
+        if (price) {
+          this.price = price;
+        }
+
+        return price;
+      });
     }
 
     return null;
   }
 
-  public abstract getUserBalance(
+  public abstract getLatestUserBalance(
     api: EvmAPI | ApiPromise,
     address: string
   ): Promise<string>;
+
   public abstract send(
-    api: any,
+    api: EvmAPI | ApiPromise,
     to: string,
     amount: string,
     options?: SendOptions
diff --git a/packages/extension/src/ui/action/App.vue b/packages/extension/src/ui/action/App.vue
index a41635b67..c246c1dc6 100644
--- a/packages/extension/src/ui/action/App.vue
+++ b/packages/extension/src/ui/action/App.vue
@@ -33,8 +33,10 @@
         v-show="showNetworkMenu"
         :account-info="accountHeaderData"
         :network="currentNetwork"
+        :show-deposit="showDepositWindow"
         @update:init="init"
         @address-changed="onSelectedAddressChanged"
+        @toggle:deposit="toggleDepositWindow"
       />
       <router-view v-slot="{ Component }" name="view">
         <transition :name="transitionName" mode="out-in">
@@ -43,6 +45,8 @@
             :network="currentNetwork"
             :account-info="accountHeaderData"
             @update:init="init"
+            @toggle:deposit="toggleDepositWindow"
+            @open:buy-action="openBuyPage"
           />
         </transition>
       </router-view>
@@ -99,11 +103,13 @@ import openOnboard from "@/libs/utils/open-onboard";
 import { EvmNetwork } from "@/providers/ethereum/types/evm-network";
 import { fromBase } from "@/libs/utils/units";
 import { EnkryptAccount } from "@enkryptcom/types";
+import Browser from "webextension-polyfill";
 
 const domainState = new DomainState();
 const networksState = new NetworksState();
 const appMenuRef = ref(null);
 const networkGradient = ref("");
+const showDepositWindow = ref(false);
 const accountHeaderData = ref<AccountsHeaderData>({
   activeAccounts: [],
   inactiveAccounts: [],
@@ -140,7 +146,12 @@ const setActiveNetworks = async () => {
     setNetwork(networks.value[0]);
   }
 };
-
+const toggleDepositWindow = () => {
+  showDepositWindow.value = !showDepositWindow.value;
+};
+const openBuyPage = () => {
+  Browser.tabs.create({ url: "https://ccswap.myetherwallet.com/" });
+};
 const isKeyRingLocked = async (): Promise<boolean> => {
   return await sendToBackgroundFromAction({
     message: JSON.stringify({
diff --git a/packages/extension/src/ui/action/components/accounts-header/components/header-accounts.vue b/packages/extension/src/ui/action/components/accounts-header/components/header-accounts.vue
index 2d77a940c..6ac1a3402 100644
--- a/packages/extension/src/ui/action/components/accounts-header/components/header-accounts.vue
+++ b/packages/extension/src/ui/action/components/accounts-header/components/header-accounts.vue
@@ -22,7 +22,11 @@
       </tooltip>
 
       <tooltip text="Account's QR code">
-        <a showDeposit class="account__actions--copy" @click="showDeposit">
+        <a
+          showDeposit
+          class="account__actions--copy"
+          @click="$emit('toggle:deposit')"
+        >
           <icon-qr />
         </a>
       </tooltip>
@@ -30,12 +34,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkHeaderAccount",
-};
-</script>
-
 <script setup lang="ts">
 import SwitchArrow from "@action/icons/header/switch_arrow.vue";
 import IconQr from "@action/icons/header/qr_icon.vue";
@@ -59,15 +57,14 @@ const props = defineProps({
     type: Function,
     default: () => ({}),
   },
-  toggleDeposit: {
-    type: Function,
-    default: () => ({}),
-  },
   network: {
     type: Object as PropType<BaseNetwork>,
     default: () => ({}),
   },
 });
+defineEmits<{
+  (e: "toggle:deposit"): void;
+}>();
 
 const copy = (address: string) => {
   navigator.clipboard.writeText(address);
@@ -75,9 +72,6 @@ const copy = (address: string) => {
 const showAccounts = () => {
   props.toggleAccounts();
 };
-const showDeposit = () => {
-  props.toggleDeposit();
-};
 const externalLink = computed(() => {
   return props.network.blockExplorerAddr.replace("[[address]]", props.address);
 });
diff --git a/packages/extension/src/ui/action/components/accounts-header/index.vue b/packages/extension/src/ui/action/components/accounts-header/index.vue
index 896c4bf50..f0e0f8c95 100644
--- a/packages/extension/src/ui/action/components/accounts-header/index.vue
+++ b/packages/extension/src/ui/action/components/accounts-header/index.vue
@@ -5,9 +5,9 @@
       :name="accountInfo.selectedAccount.name"
       :address="network.displayAddress(accountInfo.selectedAccount.address)"
       :toggle-accounts="toggleAccounts"
-      :toggle-deposit="toggleDeposit"
       :active="showAccounts"
       :network="network"
+      @toggle:deposit="$emit('toggle:deposit')"
     ></accounts-header-account>
 
     <accounts-list
@@ -23,17 +23,11 @@
       :account="accountInfo.selectedAccount"
       :show-deposit="showDeposit"
       :network="network"
-      :toggle="toggleDeposit"
+      @toggle:deposit="$emit('toggle:deposit')"
     />
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkHeader",
-};
-</script>
-
 <script setup lang="ts">
 import { onMounted, ref, PropType } from "vue";
 import AccountsHeaderAccount from "./components/header-accounts.vue";
@@ -43,9 +37,10 @@ import { useRouter } from "vue-router";
 import type { AccountsHeaderData } from "@action/types/account";
 import { BaseNetwork } from "@/types/base-network";
 const router = useRouter();
-
-let showAccounts = ref(false);
-let showDeposit = ref(false);
+defineEmits<{
+  (e: "toggle:deposit"): void;
+}>();
+const showAccounts = ref(false);
 
 defineProps({
   network: {
@@ -56,6 +51,7 @@ defineProps({
     type: Object as PropType<AccountsHeaderData>,
     default: () => ({}),
   },
+  showDeposit: Boolean,
 });
 
 onMounted(async () => {
@@ -68,10 +64,6 @@ onMounted(async () => {
 const toggleAccounts = () => {
   showAccounts.value = !showAccounts.value;
 };
-
-const toggleDeposit = () => {
-  showDeposit.value = !showDeposit.value;
-};
 </script>
 
 <style lang="less">
diff --git a/packages/extension/src/ui/action/types/mock.ts b/packages/extension/src/ui/action/types/mock.ts
index 7b1805ec2..0ebbefa56 100644
--- a/packages/extension/src/ui/action/types/mock.ts
+++ b/packages/extension/src/ui/action/types/mock.ts
@@ -126,7 +126,7 @@ export const transactionsOne: Transaction[] = [
     direction: TransactionDirection.outgoing,
   },
 ];
-export const transactionsTwo: Transaction[] = [
+export const transactionsTwo2: Transaction[] = [
   {
     from: {
       name: "My Main Account 1",
diff --git a/packages/extension/src/ui/action/views/add-network/components/add-network-search.vue b/packages/extension/src/ui/action/views/add-network/components/add-network-search.vue
index 317505784..4fe828e14 100644
--- a/packages/extension/src/ui/action/views/add-network/components/add-network-search.vue
+++ b/packages/extension/src/ui/action/views/add-network/components/add-network-search.vue
@@ -9,9 +9,9 @@
       </a>
     </div>
     <div v-show="openList" ref="tooltip" class="add-network__search-list">
-      <a class="add-network__search-list-item">
+      <!-- <a class="add-network__search-list-item">
         <custom-network-icon /><span>Custom network</span>
-      </a>
+      </a> -->
       <div class="add-network__search-list-item">
         <test-network-icon /><span>Show testnets</span>
         <Switch :check="testNetwork" :is-checked="false" />
@@ -30,7 +30,7 @@ export default {
 import { ref } from "vue";
 import BaseSearch from "@action/components/base-search/index.vue";
 import SliderIcon from "@action/icons/common/slider-icon.vue";
-import CustomNetworkIcon from "@action/icons/common/custom-network-icon.vue";
+// import CustomNetworkIcon from "@action/icons/common/custom-network-icon.vue";
 import TestNetworkIcon from "@action/icons/common/test-network-icon.vue";
 import Switch from "@action/components/switch/index.vue";
 import { onClickOutside } from "@vueuse/core";
diff --git a/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue b/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue
index 8fcf9be78..68937d5cf 100644
--- a/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue
+++ b/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue
@@ -6,13 +6,14 @@
       <div class="assets-select-list__token-info-name">
         <h4>{{ token.name }}</h4>
         <p>
-          {{ token.balancef }} <span>{{ token.symbol }}</span>
+          {{ balance ? $filters.formatFloatingPointValue(balance).value : "~" }}
+          <span>{{ token.symbol }}</span>
         </p>
       </div>
     </div>
 
     <div class="assets-select-list__token-price">
-      <h4>${{ token.balanceUSDf }}</h4>
+      <h4>${{ price ? $filters.formatFiatValue(price).value : "~" }}</h4>
     </div>
   </a>
 </template>
@@ -24,20 +25,34 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { PropType } from "vue";
-import { AssetsType } from "@/types/provider";
+import { fromBase } from "@/libs/utils/units";
+import { BaseToken } from "@/types/base-token";
+import BigNumber from "bignumber.js";
+import { computed, PropType } from "vue";
 
 const emit = defineEmits<{
-  (e: "update:selectAsset", asset: AssetsType): void;
+  (e: "update:selectAsset", asset: BaseToken): void;
 }>();
 
 const props = defineProps({
   token: {
-    type: Object as PropType<AssetsType>,
+    type: Object as PropType<BaseToken>,
     default: () => ({}),
   },
 });
 
+const balance = computed(() =>
+  props.token.balance
+    ? fromBase(props.token.balance, props.token.decimals)
+    : undefined
+);
+
+const price = computed(() =>
+  balance.value
+    ? new BigNumber(balance.value).times(props.token.price ?? 0).toFixed()
+    : undefined
+);
+
 const select = () => {
   emit("update:selectAsset", props.token);
 };
diff --git a/packages/extension/src/ui/action/views/assets-select-list/index.vue b/packages/extension/src/ui/action/views/assets-select-list/index.vue
index 6c8761447..7cf85c8b8 100644
--- a/packages/extension/src/ui/action/views/assets-select-list/index.vue
+++ b/packages/extension/src/ui/action/views/assets-select-list/index.vue
@@ -41,8 +41,8 @@ import CustomScrollbar from "@action/components/custom-scrollbar/index.vue";
 import AssetsSelectListSearch from "./components/assets-select-list-search.vue";
 import SwapTokenFastList from "@action/views/swap/components/swap-token-fast-list/index.vue";
 import scrollSettings from "@/libs/utils/scroll-settings";
-import { AssetsType } from "@/types/provider";
 import { PropType } from "vue";
+import { BaseToken } from "@/types/base-token";
 
 const emit = defineEmits<{
   (e: "close", close: boolean): void;
@@ -62,7 +62,7 @@ defineProps({
     },
   },
   assets: {
-    type: Array as PropType<AssetsType[]>,
+    type: Array as PropType<BaseToken[]>,
     default: () => [],
   },
 });
diff --git a/packages/extension/src/ui/action/views/deposit/index.vue b/packages/extension/src/ui/action/views/deposit/index.vue
index d1c0d3072..ac4d571d5 100644
--- a/packages/extension/src/ui/action/views/deposit/index.vue
+++ b/packages/extension/src/ui/action/views/deposit/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="deposit" :class="{ show: showDeposit }">
-    <div class="deposit__overlay" @click="(toggle as ()=>void)"></div>
+    <div class="deposit__overlay" @click="$emit('toggle:deposit')"></div>
     <div class="deposit__wrap" :class="{ show: showDeposit }">
-      <a class="deposit__close" @click="(toggle as ()=>void)">
+      <a class="deposit__close" @click="$emit('toggle:deposit')">
         <close-icon />
       </a>
 
@@ -45,12 +45,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "Deposit",
-};
-</script>
-
 <script setup lang="ts">
 import { PropType } from "vue";
 import CloseIcon from "@action/icons/common/close-icon.vue";
@@ -74,12 +68,10 @@ defineProps({
     type: Boolean,
     default: () => false,
   },
-  toggle: {
-    type: Function,
-    default: () => ({}),
-  },
 });
-
+defineEmits<{
+  (e: "toggle:deposit"): void;
+}>();
 const copy = (address: string) => {
   navigator.clipboard.writeText(address);
 };
diff --git a/packages/extension/src/ui/action/views/network-activity/components/network-activity-action.vue b/packages/extension/src/ui/action/views/network-activity/components/network-activity-action.vue
index 495ced2ff..5c6652d0f 100644
--- a/packages/extension/src/ui/action/views/network-activity/components/network-activity-action.vue
+++ b/packages/extension/src/ui/action/views/network-activity/components/network-activity-action.vue
@@ -1,14 +1,11 @@
 <template>
   <div class="network-activity__action">
     <div class="network-activity__action-wrap">
-      <a
-        class="network-activity__action-item"
-        @click="(depositAction as ()=>void)"
-      >
+      <a class="network-activity__action-item" @click="$emit('toggle:deposit')">
         <Deposit />Deposit
       </a>
       <div class="network-activity__action-divider"></div>
-      <a class="network-activity__action-item" @click="(buyAction as ()=>void)">
+      <a class="network-activity__action-item" @click="$emit('open:buyAction')">
         <Buy />Buy
       </a>
       <div class="network-activity__action-divider"></div>
@@ -35,12 +32,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkActivityAction",
-};
-</script>
-
 <script setup lang="ts">
 import Deposit from "@action/icons/actions/deposit.vue";
 import Buy from "@action/icons/actions/buy.vue";
@@ -48,17 +39,10 @@ import Send from "@action/icons/actions/send.vue";
 import Swap from "@action/icons/actions/swap.vue";
 import { useRoute } from "vue-router";
 const route = useRoute();
-
-defineProps({
-  depositAction: {
-    type: Function,
-    default: () => ({}),
-  },
-  buyAction: {
-    type: Function,
-    default: () => ({}),
-  },
-});
+defineEmits<{
+  (e: "toggle:deposit"): void;
+  (e: "open:buyAction"): void;
+}>();
 </script>
 
 <style lang="less">
diff --git a/packages/extension/src/ui/action/views/network-activity/components/network-activity-loading.vue b/packages/extension/src/ui/action/views/network-activity/components/network-activity-loading.vue
new file mode 100644
index 000000000..3a2789aca
--- /dev/null
+++ b/packages/extension/src/ui/action/views/network-activity/components/network-activity-loading.vue
@@ -0,0 +1,41 @@
+<template>
+  <div class="network-activity__loading">
+    <p v-if="!isEmpty">Loading</p>
+    <p v-if="isEmpty">No activity</p>
+  </div>
+</template>
+<script setup lang="ts">
+defineProps({
+  isEmpty: Boolean,
+});
+</script>
+<style lang="less">
+@import "~@action/styles/theme.less";
+
+.network-activity {
+  &__loading {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    padding-bottom: 56px;
+    box-sizing: border-box;
+
+    svg {
+      margin-bottom: 8px;
+    }
+
+    p {
+      font-style: normal;
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 20px;
+      letter-spacing: 0.25px;
+      color: @tertiaryLabel;
+      margin: 0;
+    }
+  }
+}
+</style>
diff --git a/packages/extension/src/ui/action/views/network-activity/components/network-activity-total.vue b/packages/extension/src/ui/action/views/network-activity/components/network-activity-total.vue
index 59a63b391..1f1e089de 100644
--- a/packages/extension/src/ui/action/views/network-activity/components/network-activity-total.vue
+++ b/packages/extension/src/ui/action/views/network-activity/components/network-activity-total.vue
@@ -7,12 +7,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkActivityTotal",
-};
-</script>
-
 <script setup lang="ts">
 defineProps({
   cryptoAmount: {
diff --git a/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue b/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue
index 483693f17..0ca77345d 100644
--- a/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue
+++ b/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue
@@ -1,95 +1,116 @@
 <template>
-  <a href="#" class="network-activity__transaction">
+  <a
+    :href="transactionURL"
+    target="_blank"
+    class="network-activity__transaction"
+  >
     <div class="network-activity__transaction-info">
-      <img src="@action/icons/raw/account.png" />
+      <img
+        :src="
+          network.identicon(activity.isIncoming ? activity.from : activity.to)
+        "
+      />
 
       <div class="network-activity__transaction-info-name">
         <h4>
-          {{ $filters.replaceWithEllipsis(transaction.from.address, 6, 6) }}
+          {{
+            $filters.replaceWithEllipsis(
+              network.displayAddress(
+                activity.isIncoming ? activity.from : activity.to
+              ),
+              6,
+              6
+            )
+          }}
         </h4>
         <p>
           <span
             class="network-activity__transaction-info-status"
-            :class="{ error: transaction.status == 2 }"
+            :class="{ error: activity.status === ActivityStatus.failed }"
             >{{ status }}</span
           >
           <transaction-timer
-            v-if="transaction.status == 0"
-            :date="transaction.date"
+            v-if="activity.status === ActivityStatus.pending"
+            :date="activity.timestamp"
           />
-          <span v-else>{{ date }}</span>
+          <span v-else-if="activity.timestamp !== 0">{{ date }}</span>
         </p>
       </div>
     </div>
 
     <div class="network-activity__transaction-amount">
       <h4>
-        {{ transaction.cryptoAmount }}
-        <span>{{ transaction.token.symbol }}</span>
+        {{
+          $filters.formatFloatingPointValue(
+            fromBase(activity.value, activity.token.decimals)
+          ).value
+        }}
+        <span>{{ activity.token.symbol }}</span>
       </h4>
-      <p>{{ $filters.formatFiatValue(transaction.amount).value }}</p>
+      <p>$ {{ $filters.formatFiatValue(getFiatValue).value }}</p>
     </div>
   </a>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkActivityTransaction",
-};
-</script>
-
 <script setup lang="ts">
-import { PropType } from "vue";
-import {
-  Transaction,
-  TransactionStatus,
-  TransactionDirection,
-} from "@action/types/transaction";
+import { computed, onMounted, PropType, ref } from "vue";
 import moment from "moment";
 import TransactionTimer from "./transaction-timer.vue";
-
+import { Activity, ActivityStatus } from "@/types/activity";
+import { BaseNetwork } from "@/types/base-network";
+import { fromBase } from "@/libs/utils/units";
+import BigNumber from "bignumber.js";
 const props = defineProps({
-  transaction: {
-    type: Object as PropType<Transaction>,
+  activity: {
+    type: Object as PropType<Activity>,
+    default: () => ({}),
+  },
+  network: {
+    type: Object as PropType<BaseNetwork>,
     default: () => ({}),
   },
 });
 
-let status = "";
-let date = "";
-
-if (props.transaction) {
-  date = moment(props.transaction.date).fromNow();
-
-  switch (props.transaction.direction) {
-    case TransactionDirection.incoming:
-      switch (props.transaction.status) {
-        case TransactionStatus.progress:
-          status = "Receiving";
-          break;
-        case TransactionStatus.success:
-          status = "Receive";
-          break;
-        case TransactionStatus.failed:
-          status = "Failed";
-          break;
-      }
-      break;
-    case TransactionDirection.outgoing:
-      switch (props.transaction.status) {
-        case TransactionStatus.progress:
-          status = "Sending";
-          break;
-        case TransactionStatus.success:
-          status = "Sent";
-          break;
-        case TransactionStatus.failed:
-          status = "Failed";
-          break;
-      }
-      break;
+const status = ref("~");
+const date = ref("~");
+
+const transactionURL = computed(() => {
+  return props.network.blockExplorerTX.replace(
+    "[[txHash]]",
+    props.activity.transactionHash
+  );
+});
+const getFiatValue = computed(() => {
+  return new BigNumber(props.activity.token.price || "0").times(
+    fromBase(props.activity.value, props.activity.token.decimals)
+  );
+});
+onMounted(() => {
+  date.value = moment(props.activity.timestamp).fromNow();
+  if (
+    props.activity.status === ActivityStatus.success &&
+    props.activity.isIncoming
+  )
+    status.value = "Received";
+  else if (
+    props.activity.status === ActivityStatus.success &&
+    !props.activity.isIncoming
+  )
+    status.value = "Sent";
+  else if (
+    props.activity.status === ActivityStatus.pending &&
+    props.activity.isIncoming
+  )
+    status.value = "Receiving";
+  else if (
+    props.activity.status === ActivityStatus.pending &&
+    !props.activity.isIncoming
+  )
+    status.value = "Sending";
+  else {
+    status.value = "Failed";
   }
-}
+});
 </script>
 
 <style lang="less">
@@ -123,6 +144,7 @@ if (props.transaction) {
 
       img {
         max-width: 32px;
+        max-height: 32px;
         margin-right: 16px;
         border-radius: 100%;
       }
diff --git a/packages/extension/src/ui/action/views/network-activity/components/transaction-timer.vue b/packages/extension/src/ui/action/views/network-activity/components/transaction-timer.vue
index f4c6ef045..ce20112e9 100644
--- a/packages/extension/src/ui/action/views/network-activity/components/transaction-timer.vue
+++ b/packages/extension/src/ui/action/views/network-activity/components/transaction-timer.vue
@@ -8,12 +8,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "TransactionTimer",
-};
-</script>
-
 <script setup lang="ts">
 import { onMounted } from "vue";
 import moment from "moment";
diff --git a/packages/extension/src/ui/action/views/network-activity/index.vue b/packages/extension/src/ui/action/views/network-activity/index.vue
index 7b39e9562..5bf52138a 100644
--- a/packages/extension/src/ui/action/views/network-activity/index.vue
+++ b/packages/extension/src/ui/action/views/network-activity/index.vue
@@ -11,46 +11,45 @@
           :symbol="props.network.currencyName"
         />
 
-        <network-activity-action
-          :deposit-action="depositAction"
-          :buy-action="buyAction"
-        />
-
-        <network-activity-transaction
-          v-for="(item, index) in transactionsOne"
-          :key="index"
-          :transaction="item"
-        />
-
-        <div class="network-activity__header">July</div>
+        <network-activity-action v-bind="$attrs" />
+        <div v-if="activities.length">
+          <network-activity-transaction
+            v-for="(item, index) in activities"
+            :key="index"
+            :activity="item"
+            :network="network"
+          />
+        </div>
+        <!-- <div class="network-activity__header">July</div>
 
         <network-activity-transaction
           v-for="(item, index) in transactionsTwo"
           :key="index"
           :transaction="item"
-        />
+        /> -->
       </div>
     </custom-scrollbar>
+
+    <network-activity-loading
+      v-if="activities.length === 0"
+      :is-empty="isNoActivity"
+    ></network-activity-loading>
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkActivity",
-};
-</script>
-
 <script setup lang="ts">
 import NetworkActivityTotal from "./components/network-activity-total.vue";
 import NetworkActivityAction from "./components/network-activity-action.vue";
 import NetworkActivityTransaction from "./components/network-activity-transaction.vue";
-import { transactionsOne, transactionsTwo } from "@action/types/mock";
 import CustomScrollbar from "@action/components/custom-scrollbar/index.vue";
-import { PropType, toRef } from "vue";
+import { computed, onMounted, PropType, ref, toRef, watch } from "vue";
 import { AccountsHeaderData } from "../../types/account";
 import accountInfo from "@action/composables/account-info";
 import { BaseNetwork } from "@/types/base-network";
 import scrollSettings from "@/libs/utils/scroll-settings";
+import { Activity } from "@/types/activity";
+import NetworkActivityLoading from "./components/network-activity-loading.vue";
+
 const props = defineProps({
   network: {
     type: Object as PropType<BaseNetwork>,
@@ -61,17 +60,36 @@ const props = defineProps({
     default: () => ({}),
   },
 });
+
 const { cryptoAmount, fiatAmount } = accountInfo(
   toRef(props, "network"),
   toRef(props, "accountInfo")
 );
-
-const depositAction = () => {
-  console.log("depositAction");
-};
-const buyAction = () => {
-  console.log("buyAction");
+const isNoActivity = ref(false);
+const activities = ref<Activity[]>([]);
+const selectedAddress = computed(
+  () => props.accountInfo.selectedAccount?.address || ""
+);
+const selectedNetworkName = computed(() => props.network.name);
+const setActivities = () => {
+  activities.value = [];
+  isNoActivity.value = false;
+  if (props.accountInfo.selectedAccount)
+    props.network
+      .getAllActivity(
+        props.network.displayAddress(props.accountInfo.selectedAccount.address)
+      )
+      .then((all) => {
+        activities.value = all;
+        isNoActivity.value = all.length === 0;
+      });
+  else activities.value = [];
 };
+
+watch([selectedAddress, selectedNetworkName], setActivities);
+onMounted(() => {
+  setActivities();
+});
 </script>
 
 <style lang="less" scoped>
@@ -97,11 +115,14 @@ const buyAction = () => {
     position: relative;
     margin: auto;
     width: 100%;
-    max-height: 600px;
+    max-height: 540px;
     margin: 0;
     padding: 68px 0 0 0 !important;
     box-sizing: border-box;
-
+    .ps__rail-y {
+      right: 3px !important;
+      margin: 59px 0 !important;
+    }
     &.ps--active-y {
       padding-right: 0;
     }
@@ -118,12 +139,3 @@ const buyAction = () => {
   }
 }
 </style>
-
-<style lang="less">
-.network-activity__scroll-area {
-  .ps__rail-y {
-    right: 3px !important;
-    margin: 59px 0 !important;
-  }
-}
-</style>
diff --git a/packages/extension/src/ui/action/views/network-assets/index.vue b/packages/extension/src/ui/action/views/network-assets/index.vue
index 7e8866ce1..8dade0fdf 100644
--- a/packages/extension/src/ui/action/views/network-assets/index.vue
+++ b/packages/extension/src/ui/action/views/network-assets/index.vue
@@ -11,10 +11,7 @@
           :symbol="network.currencyName"
         />
 
-        <network-activity-action
-          :deposit-action="depositAction"
-          :buy-action="buyAction"
-        />
+        <network-activity-action v-bind="$attrs" />
 
         <network-assets-item
           v-for="(item, index) in assets"
@@ -68,12 +65,6 @@ const { cryptoAmount, fiatAmount } = accountInfo(
 );
 const selected: string = route.params.id as string;
 
-const depositAction = () => {
-  console.log("depositAction");
-};
-const buyAction = () => {
-  console.log("buyAction");
-};
 const updateAssets = () => {
   isLoading.value = true;
   props.network
diff --git a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-category-sort-menu.vue b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-category-sort-menu.vue
index 9c771763c..c543631ce 100644
--- a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-category-sort-menu.vue
+++ b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-category-sort-menu.vue
@@ -11,12 +11,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkNftsCategorySortMenu",
-};
-</script>
-
 <script setup lang="ts">
 import { PropType } from "vue";
 import DoneIcon from "@action/icons/common/done_icon.vue";
diff --git a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-category.vue b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-category.vue
index 977a64f15..ec73d0f74 100644
--- a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-category.vue
+++ b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-category.vue
@@ -26,12 +26,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkNftsCategory",
-};
-</script>
-
 <script setup lang="ts">
 import { computed, PropType, ref } from "vue";
 import NetworkNftsItem from "./network-nfts-item.vue";
diff --git a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-empty.vue b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-empty.vue
index dc0d31d07..fbdbe3637 100644
--- a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-empty.vue
+++ b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-empty.vue
@@ -4,14 +4,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkNftsEmpty",
-};
-</script>
-
-<script setup lang="ts"></script>
-
 <style lang="less">
 @import "~@action/styles/theme.less";
 
diff --git a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-favorite.vue b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-favorite.vue
index 46ef3c6cb..8295a375c 100644
--- a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-favorite.vue
+++ b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-favorite.vue
@@ -16,12 +16,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkNftsFavorite",
-};
-</script>
-
 <script setup lang="ts">
 import { PropType, ref } from "vue";
 import NetworkNftsItem from "./network-nfts-item.vue";
diff --git a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-hidden.vue b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-hidden.vue
index 32395a440..05f65929a 100644
--- a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-hidden.vue
+++ b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-hidden.vue
@@ -16,12 +16,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkNftsHidden",
-};
-</script>
-
 <script setup lang="ts">
 import { PropType, ref } from "vue";
 import NetworkNftsItem from "./network-nfts-item.vue";
diff --git a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-item-more-menu.vue b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-item-more-menu.vue
index 9381f9a88..7549ed714 100644
--- a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-item-more-menu.vue
+++ b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-item-more-menu.vue
@@ -23,12 +23,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkNftsItemMoreMenu",
-};
-</script>
-
 <script setup lang="ts">
 import NftMoreSend from "@action/icons/nft/nft-more-send.vue";
 import NftMoreAddToFavorite from "@action/icons/nft/nft-more-add-to-favorite.vue";
diff --git a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-item.vue b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-item.vue
index 48fd7dd37..7fad752a4 100644
--- a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-item.vue
+++ b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-item.vue
@@ -24,12 +24,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-  name: "NetworkNftsItem",
-};
-</script>
-
 <script setup lang="ts">
 import { ref } from "vue";
 import { NFTItem } from "@/types/nft";
diff --git a/packages/extension/src/ui/action/views/network-nfts/index.vue b/packages/extension/src/ui/action/views/network-nfts/index.vue
index a0d98e11f..36e5b1049 100644
--- a/packages/extension/src/ui/action/views/network-nfts/index.vue
+++ b/packages/extension/src/ui/action/views/network-nfts/index.vue
@@ -43,7 +43,6 @@ export default {
 <script setup lang="ts">
 import { useRoute } from "vue-router";
 import CustomScrollbar from "@action/components/custom-scrollbar/index.vue";
-// import NetworkNftsTotal from "./components/network-nfts-total.vue";
 import NetworkNftsCategory from "./components/network-nfts-category.vue";
 import NetworkNftsFavorite from "./components/network-nfts-favorite.vue";
 import NetworkNftsHidden from "./components/network-nfts-hidden.vue";
@@ -126,17 +125,14 @@ const favClicked = async (isFav: boolean, item: NFTItem) => {
     await nftState.setFavoriteNFT(item.contract, item.id);
   } else {
     await nftState.deleteFavoriteNFT(item.contract, item.id);
-    //favoriteNFTs.value = favoriteNFTs.value.filter((i) => i.id !== item.id);
   }
   localUpdate();
 };
 const hideClicked = async (isHidden: boolean, item: NFTItem) => {
   if (isHidden) {
     await nftState.setHiddenNFT(item.contract, item.id);
-    //hiddenNFTs.value.push(item);
   } else {
     await nftState.deleteHiddenNFT(item.contract, item.id);
-    // hiddenNFTs.value = hiddenNFTs.value.filter((i) => i.id !== item.id);
   }
   localUpdate();
 };
@@ -176,9 +172,6 @@ const hideClicked = async (isHidden: boolean, item: NFTItem) => {
     }
   }
 }
-</style>
-
-<style lang="less">
 .network-nfts__scroll-area {
   .ps__rail-y {
     right: 3px !important;
diff --git a/packages/extension/src/ui/onboard/new-wallet.vue b/packages/extension/src/ui/onboard/new-wallet.vue
index 33f1599ea..b4d26d177 100644
--- a/packages/extension/src/ui/onboard/new-wallet.vue
+++ b/packages/extension/src/ui/onboard/new-wallet.vue
@@ -7,7 +7,6 @@
       popular ones, like Ethereum and Polkadot with its Parachains are already
       built in.
     </p>
-    <p>As a user you can always add custom network.</p>
     <p>
       And as a developer you can submit an update to our open-source codebase so
       Enkrypt can start supporting your chain too.