diff --git a/packages/bridge-ui/README.md b/packages/bridge-ui/README.md
index 59cd6eb5f52..876a1df3eb4 100644
--- a/packages/bridge-ui/README.md
+++ b/packages/bridge-ui/README.md
@@ -14,18 +14,22 @@ You can use the following values in the `.env` file to spin up the Bridge UI loc
 
 ```
 VITE_NODE_ENV=dev
-VITE_L1_RPC_URL="https://l1rpc.a1.taiko.xyz/"
-VITE_L2_RPC_URL="https://l2rpc.a1.taiko.xyz/"
-VITE_RELAYER_URL="http://localhost:4102/"
-VITE_TEST_ERC20_ADDRESS_MAINNET="0x3E3a3416DbCc5cb4448B6b171fF15f9Da35Ab72d"
-VITE_MAINNET_CHAIN_ID=31338
-VITE_TAIKO_CHAIN_ID=167003
-VITE_MAINNET_CHAIN_NAME="Ethereum A1"
-VITE_TAIKO_CHAIN_NAME="Taiko A1"
+VITE_L1_RPC_URL="https://l1rpc.internal.taiko.xyz/"
+VITE_L2_RPC_URL="https://l2rpc.internal.taiko.xyz/"
+VITE_RELAYER_URL="https://relayer.internal.taiko.xyz/"
+VITE_TEST_ERC20_ADDRESS_MAINNET="0x1B5Ccd66cc2408A0084047720167F6234Dc5498A"
+VITE_TEST_ERC20_SYMBOL_MAINNET="BULL"
+VITE_TEST_ERC20_NAME_MAINNET="Bull Token"
+VITE_MAINNET_CHAIN_ID=31336
+VITE_TAIKO_CHAIN_ID=167001
+VITE_MAINNET_CHAIN_NAME="Ethereum A2"
+VITE_TAIKO_CHAIN_NAME="Taiko A2"
+VITE_MAINNET_TOKEN_VAULT_ADDRESS="0xAE4C9bD0f7AE5398Df05043079596E2BF0079CE9"
 VITE_TAIKO_TOKEN_VAULT_ADDRESS="0x0000777700000000000000000000000000000002"
-VITE_MAINNET_TOKEN_VAULT_ADDRESS="0xD0dfd5baCf160B97C8eE3ecb463F18c08673160c"
+VITE_MAINNET_HEADER_SYNC_ADDRESS="0xa6421A7f48498cee3aEb6428a8A2DD5fAA3AcE2f"
 VITE_TAIKO_HEADER_SYNC_ADDRESS="0x0000777700000000000000000000000000000001"
-VITE_MAINNET_HEADER_SYNC_ADDRESS="0x7B3AF414448ba906f02a1CA307C56c4ADFF27ce7"
-VITE_MAINNET_BRIDGE_ADDRESS="0x3612E284D763f42f5E4CB72B1602b23DAEC3cA60"
+VITE_MAINNET_BRIDGE_ADDRESS="0x0237443359aB0b11EcDC41A7aF1C90226a88c70f"
 VITE_TAIKO_BRIDGE_ADDRESS="0x0000777700000000000000000000000000000004"
+VITE_MAINNET_SIGNAL_SERVICE_ADDRESS="0x403cc7802725928652a3d116Bb1781005e2e76d3"
+VITE_TAIKO_SIGNAL_SERVICE_ADDRESS="0x0000777700000000000000000000000000000007"
 ```
\ No newline at end of file
diff --git a/packages/bridge-ui/jest.config.js b/packages/bridge-ui/jest.config.js
index 5f01fcc3700..e7adeb038d2 100644
--- a/packages/bridge-ui/jest.config.js
+++ b/packages/bridge-ui/jest.config.js
@@ -39,10 +39,10 @@ export default {
     ],
     coverageThreshold: {
         global: {
-            statements: 96,
-            branches: 79,
-            functions: 91,
-            lines: 97,
+            statements: 95,
+            branches: 72,
+            functions: 89,
+            lines: 96,
         },
     },
     modulePathIgnorePatterns: ["<rootDir>/public/build/"],
diff --git a/packages/bridge-ui/src/App.svelte b/packages/bridge-ui/src/App.svelte
index 4eedd15104b..41fe60d2384 100644
--- a/packages/bridge-ui/src/App.svelte
+++ b/packages/bridge-ui/src/App.svelte
@@ -50,6 +50,9 @@
   import BridgeABI from "./constants/abi/Bridge";
   import { providers } from "./store/providers";
   import HeaderAnnouncement from "./components/HeaderAnnouncement.svelte";
+  import type { TokenService } from "./domain/token";
+  import { CustomTokenService } from "./storage/customTokenService";
+  import { userTokens, tokenService } from "./store/userToken";
 
   const providerMap: Map<number, ethers.providers.JsonRpcProvider> = new Map<
     number,
@@ -130,15 +133,25 @@
     providerMap
   );
 
+  const tokenStore: TokenService = new CustomTokenService(
+    window.localStorage,
+  );
+
+  tokenService.set(tokenStore);
+
   transactioner.set(storageTransactioner);
 
   signer.subscribe(async (store) => {
     if (store) {
+      const userAddress = await store.getAddress();
       const txs = await $transactioner.GetAllByAddress(
-        await store.getAddress()
+        userAddress
       );
 
       transactions.set(txs);
+
+      const tokens = await $tokenService.GetTokens(userAddress)
+      userTokens.set(tokens);
     }
     return store;
   });
@@ -180,7 +193,7 @@
             }
 
             transactionToIntervalMap.set(tx.ethersTx.hash, interval);
-            if (!tx.signal) return;
+            if (!tx.msgHash) return;
 
             const contract = new ethers.Contract(
               chains[tx.toChainId].bridgeAddress,
@@ -189,7 +202,7 @@
             );
 
             const messageStatus: MessageStatus =
-              await contract.getMessageStatus(tx.signal);
+              await contract.getMessageStatus(tx.msgHash);
 
             if (messageStatus === MessageStatus.Done) {
               successToast("Bridge message processed successfully");
diff --git a/packages/bridge-ui/src/app.css b/packages/bridge-ui/src/app.css
index fa8fe6531da..fc03aeddba9 100644
--- a/packages/bridge-ui/src/app.css
+++ b/packages/bridge-ui/src/app.css
@@ -47,6 +47,10 @@
   border-radius: 0.5rem;
 }
 
+ul.token-dropdown li.cursor-pointer:last-child, ul.token-dropdown li.cursor-pointer:first-child {
+  border-radius: 0;
+}
+
 .taiko-banner {
   background-image: url('assets/taiko-banner.svg');
   background-repeat: no-repeat;
diff --git a/packages/bridge-ui/src/assets/erc20.png b/packages/bridge-ui/src/assets/erc20.png
new file mode 100644
index 00000000000..902ed2b9c87
Binary files /dev/null and b/packages/bridge-ui/src/assets/erc20.png differ
diff --git a/packages/bridge-ui/src/components/MessageStatusTooltip.svelte b/packages/bridge-ui/src/components/MessageStatusTooltip.svelte
index 2aca9cde74a..f24fc143129 100644
--- a/packages/bridge-ui/src/components/MessageStatusTooltip.svelte
+++ b/packages/bridge-ui/src/components/MessageStatusTooltip.svelte
@@ -11,8 +11,12 @@
       <ul class="list-disc ml-4">
         <li class="mb-2">
           <strong>Pending</strong>: Your asset is not ready to be bridged. Taiko
-          A1 => Ethereum A1 bridging can take several hours before being ready.
-          Ethereum A1 => Taiko A1 should be available to claim within minutes.
+          A1 => {import.meta.env
+            ? import.meta.env.VITE_MAINNET_CHAIN_NAME
+            : "Ethereum A2"} bridging can take several hours before being ready.
+          {import.meta.env
+            ? import.meta.env.VITE_MAINNET_CHAIN_NAME
+            : "Ethereum A2"} => {import.meta.env ? import.meta.env.VITE_TAIKO_CHAIN_NAME : "Taiko A2"} should be available to claim within minutes.
         </li>
         <li class="mb-2">
           <strong>Claimable</strong>: Your asset is ready to be claimed on the
diff --git a/packages/bridge-ui/src/components/Transaction.svelte b/packages/bridge-ui/src/components/Transaction.svelte
index 0f407949682..7a0d6e6590a 100644
--- a/packages/bridge-ui/src/components/Transaction.svelte
+++ b/packages/bridge-ui/src/components/Transaction.svelte
@@ -25,7 +25,6 @@
   import HeaderSync from "../constants/abi/HeaderSync";
   import { providers } from "../store/providers";
   import { fetchSigner, switchNetwork } from "@wagmi/core";
-  import Tooltip from "./Tooltip.svelte";
   import Bridge from "../constants/abi/Bridge";
   import ButtonWithTooltip from "./ButtonWithTooltip.svelte";
 
@@ -64,7 +63,7 @@
         .Claim({
           signer: $signer,
           message: bridgeTx.message,
-          signal: bridgeTx.signal,
+          msgHash: bridgeTx.msgHash,
           destBridgeAddress:
             chains[bridgeTx.message.destChainId.toNumber()].bridgeAddress,
           srcBridgeAddress:
@@ -109,7 +108,7 @@
       $providers.get(chains[transaction.message.destChainId.toNumber()].id)
     );
 
-    transaction.status = await contract.getMessageStatus(transaction.signal);
+    transaction.status = await contract.getMessageStatus(transaction.msgHash);
     transaction = transaction;
     if (transaction.status === MessageStatus.Done) clearInterval(interval);
   }, 20 * 1000);
diff --git a/packages/bridge-ui/src/components/buttons/SelectToken.svelte b/packages/bridge-ui/src/components/buttons/SelectToken.svelte
index 45351bb3034..fe1febe7e00 100644
--- a/packages/bridge-ui/src/components/buttons/SelectToken.svelte
+++ b/packages/bridge-ui/src/components/buttons/SelectToken.svelte
@@ -1,11 +1,19 @@
 <script lang="ts">
+  import { getProvider } from '@wagmi/core'
   import { token } from "../../store/token";
   import { bridgeType } from "../../store/bridge";
   import { ETH, tokens } from "../../domain/token";
   import type { Token } from "../../domain/token";
   import { BridgeType } from "../../domain/bridge";
-  import { ChevronDown } from "svelte-heros-v2";
-  import { successToast } from "../../utils/toast";
+  import { ChevronDown, PlusCircle } from "svelte-heros-v2";
+  import { errorToast, successToast } from "../../utils/toast";
+  import { ethers } from "ethers";
+  import ERC20 from "../../constants/abi/ERC20";
+  import { signer } from '../../store/signer';
+  import { userTokens, tokenService } from '../../store/userToken';
+  import { fromChain, toChain } from '../../store/chain';
+  import Erc20 from '../icons/ERC20.svelte';
+  import AddCustomErc20 from '../form/AddCustomERC20.svelte';
 
   let dropdownElement: HTMLDivElement;
 
@@ -25,6 +33,64 @@
       document.activeElement.blur();
     }
   }
+
+  let showAddressField = false;
+
+  let loading = false;
+
+  async function addERC20(event: SubmitEvent) {
+    try {
+      loading = true;
+      const eventTarget = event.target as HTMLFormElement;
+      const { customTokenAddress } = eventTarget;
+      const tokenAddress = customTokenAddress.value;
+      if(!ethers.utils.isAddress(tokenAddress)) {
+        throw new Error();
+      }
+      const provider = getProvider();
+      const contract = new ethers.Contract(tokenAddress, ERC20, provider);
+      
+      const userAddress = await $signer.getAddress();
+      const erc20Check = await contract.balanceOf(userAddress);
+      const [tokenName, decimals, symbol] = await Promise.all([
+        contract.name(),
+        contract.decimals(),
+        contract.symbol(),
+      ])
+
+      const token = {
+        name: tokenName,
+        addresses: [
+          {
+            chainId: $fromChain.id,
+            address: tokenAddress,
+          },
+          {
+            chainId: $toChain.id,
+            address: "0x00",
+          }
+        ],
+        decimals: decimals,
+        symbol: symbol,
+        logoComponent: null,
+      }
+      const updateTokensList = await $tokenService.StoreToken(token, userAddress);
+      select(token);
+      userTokens.set(updateTokensList);
+      eventTarget.reset();
+      showAddressField = false;
+    } catch(error) {
+      errorToast("Not a valid ERC20 address");
+      console.error(error);
+    } finally {
+      loading = false;
+    }
+  }
+  let customTokens = [];
+  userTokens.subscribe(value => {
+    if(value)
+      customTokens = value;
+  })
 </script>
 
 <div class="dropdown dropdown-bottom" bind:this={dropdownElement}>
@@ -32,16 +98,20 @@
     tabindex="0"
     class="flex items-center justify-center hover:cursor-pointer"
   >
-    <svelte:component this={$token.logoComponent} />
+    {#if $token.logoComponent}
+      <svelte:component this={$token.logoComponent} />
+    {:else}
+      <Erc20 />
+    {/if}
     <p class="px-2 text-sm">{$token.symbol.toUpperCase()}</p>
     <ChevronDown size='20' />
   </label>
   <ul
     tabindex="0"
-    class="dropdown-content menu my-2 shadow-xl bg-dark-2 rounded-box p-2"
+    class="token-dropdown dropdown-content menu my-2 shadow-xl bg-dark-2 rounded-box p-2"
   >
     {#each tokens as t}
-      <li class="cursor-pointer w-full hover:bg-dark-5 px-4 py-4">
+      <li class="cursor-pointer w-full hover:bg-dark-5 px-4 py-4 rounded-none">
         <button on:click={async () => await select(t)} class="flex hover:bg-dark-5">
           <svelte:component this={t.logoComponent} height={22} width={22} />
           <span class="text-sm font-medium bg-transparent px-2"
@@ -50,5 +120,27 @@
         </button>
       </li>
     {/each}
+    {#each customTokens as t}
+      <li class="cursor-pointer w-full hover:bg-dark-5 px-4 py-4">
+        <button on:click={async () => await select(t)} class="flex hover:bg-dark-5">
+          <Erc20 height={22} width={22} />
+          <span class="text-sm font-medium bg-transparent px-2"
+            >{t.symbol.toUpperCase()}</span
+          >
+        </button>
+      </li>
+    {/each}
+    <li class="cursor-pointer hover:bg-dark-5 px-4 py-4">
+      <button on:click={() => showAddressField = true} class="flex hover:bg-dark-5 justify-between items-center">
+        <PlusCircle size='25' />
+        <span class="text-sm font-medium bg-transparent flex-1 w-[100px] px-0 pl-2"
+          >Add Custom</span
+        >
+      </button>
+    </li>
   </ul>
+
+  {#if showAddressField}
+    <AddCustomErc20 bind:showAddressField addERC20={addERC20} bind:loading />
+  {/if}
 </div>
diff --git a/packages/bridge-ui/src/components/form/AddCustomERC20.svelte b/packages/bridge-ui/src/components/form/AddCustomERC20.svelte
new file mode 100644
index 00000000000..ea180ad7fa7
--- /dev/null
+++ b/packages/bridge-ui/src/components/form/AddCustomERC20.svelte
@@ -0,0 +1,136 @@
+<script lang="ts">
+  import { ETH } from "../../domain/token";
+  import type { Token, TokenDetails } from "../../domain/token";
+  import { Trash } from "svelte-heros-v2";
+  import { signer } from "../../store/signer";
+  import { token as tokenStore } from "../../store/token";
+  import { userTokens, tokenService } from "../../store/userToken";
+  import Erc20 from "../icons/ERC20.svelte";
+  import Modal from "../modals/Modal.svelte";
+  import { LottiePlayer } from "@lottiefiles/svelte-lottie-player";
+  import { ethers } from "ethers";
+  import ERC20 from "../../constants/abi/ERC20";
+  import { errorToast } from "../../utils/toast";
+  import { getProvider } from "@wagmi/core";
+
+  export let showAddressField: boolean = false;
+  export let addERC20: (event: SubmitEvent) => Promise<void>;
+  export let loading: boolean = false;
+  export let loadingTokenDetails: boolean = false;
+  let tokenDetails: TokenDetails = null;
+  let showError: boolean = false;
+  let tokenAddress: string;
+
+  let customTokens: Token[] = [];
+  userTokens.subscribe(tokens => customTokens = tokens);
+
+  async function remove(token) {
+    const address = await $signer.getAddress();
+    const updatedTokensList = $tokenService.RemoveToken(token, address);
+    userTokens.set(updatedTokensList);
+    tokenStore.set(ETH);
+  }
+
+  $: onAddressChange(tokenAddress);
+
+  async function onAddressChange(tokenAddress: string) {
+    showError = false;
+    if(ethers.utils.isAddress(tokenAddress)) {
+      loadingTokenDetails = true;
+      try {
+        const provider = getProvider();
+        const contract = new ethers.Contract(tokenAddress, ERC20, provider);
+        const userAddress = await $signer.getAddress();
+        const [symbol, decimals, userBalance] = await Promise.all([
+          contract.symbol(),
+          contract.decimals(),
+          contract.balanceOf(userAddress)
+        ]);
+        const userTokenBalance = ethers.utils.formatUnits(userBalance, decimals);
+        tokenDetails = {
+          address: tokenAddress,
+          decimals,
+          symbol,
+          userTokenBalance,
+        };
+      } catch(error) {
+        showError = true;
+        errorToast("Couldn't fetch token details");
+        console.error(error);
+      } finally {
+        loadingTokenDetails = false;
+      }
+    } else {
+      tokenDetails = null;
+    }
+  }
+</script>
+
+<Modal title="Add custom ERC20" bind:isOpen={showAddressField}>
+  <form class="flex h-full min-h-tooltip-modal w-full flex-col justify-between" on:submit|preventDefault={addERC20}>
+    <div class="mt-4 mb-2">
+      <input
+        type="text"
+        placeholder="Enter valid ERC20 Address"
+        class="input input-primary bg-dark-2 input-md md:input-lg w-full focus:ring-0"
+        name="customTokenAddress"
+        bind:value={tokenAddress}
+      />
+      {#if tokenDetails}
+        <div class="bg-dark-2 w-full flex items-center justify-between">
+          <span class="bg-dark-2">{tokenDetails.symbol}</span>
+          <span class="bg-dark-2">Balance: {tokenDetails.userTokenBalance}</span>
+        </div>
+      {:else if loadingTokenDetails}
+        <LottiePlayer
+          src="/lottie/loader.json"
+          autoplay={true}
+          loop={true}
+          controls={false}
+          renderer="svg"
+          background="transparent"
+          height={26}
+          width={26}
+          controlsLayout={[]}
+        />
+      {:else if showError}
+        <div class="min-h-[25px] text-error text-sm">Couldn't fetch token details</div>
+      {:else}
+        <div class="min-h-[25px]"></div>
+      {/if}
+    </div>
+    {#if loading}
+      <button class="btn" disabled={true}>
+        <LottiePlayer
+          src="/lottie/loader.json"
+          autoplay={true}
+          loop={true}
+          controls={false}
+          renderer="svg"
+          background="transparent"
+          height={26}
+          width={26}
+          controlsLayout={[]}
+        />
+      </button>
+      {:else}
+        <button class="btn" type="submit">Add</button>
+      {/if}
+  </form>
+  {#if customTokens.length > 0}
+  <div class="flex h-full w-full flex-col justify-between bg-none mt-6">
+    <h3>Tokens already added</h3>
+    {#each customTokens as t}
+      <div class="flex items-center justify-between">
+        <div class="flex items-center">
+          <Erc20 />
+          <span class="bg-transparent">{t.symbol}</span>
+        </div>
+        <button class="btn btn-sm" on:click={() => remove(t)}>
+          <Trash />
+        </button>
+      </div>
+    {/each}
+  </div>
+  {/if}
+</Modal>
\ No newline at end of file
diff --git a/packages/bridge-ui/src/components/form/BridgeForm.svelte b/packages/bridge-ui/src/components/form/BridgeForm.svelte
index e6b09c0a734..f22a3b6b793 100644
--- a/packages/bridge-ui/src/components/form/BridgeForm.svelte
+++ b/packages/bridge-ui/src/components/form/BridgeForm.svelte
@@ -37,6 +37,8 @@
   import { Funnel } from "svelte-heros-v2";
   import FaucetModal from "../modals/FaucetModal.svelte";
   import { fetchFeeData } from "@wagmi/core";
+  import { providers } from "../../store/providers";
+  import { checkIfTokenIsDeployedCrossChain } from "../../utils/checkIfTokenIsDeployedCrossChain";
 
   let amount: string;
   let amountInput: HTMLInputElement;
@@ -215,6 +217,11 @@
       if (requiresAllowance) throw Error("requires additional allowance");
 
       const amountInWei = ethers.utils.parseUnits(amount, $token.decimals);
+
+      const provider = $providers.get($toChain.id);
+      const destTokenVaultAddress = $chainIdToTokenVaultAddress.get($toChain.id);
+      let isBridgedTokenAlreadyDeployed = await checkIfTokenIsDeployedCrossChain($token, provider, destTokenVaultAddress, $toChain, $fromChain);
+
       const bridgeOpts = {
         amountInWei: amountInWei,
         signer: $signer,
@@ -224,6 +231,7 @@
         tokenVaultAddress: $chainIdToTokenVaultAddress.get($fromChain.id),
         processingFeeInWei: getProcessingFee(),
         memo: memo,
+        isBridgedTokenAlreadyDeployed
       };
 
       const doesUserHaveEnoughBalance = await checkUserHasEnoughBalance(
diff --git a/packages/bridge-ui/src/components/form/SelectChain.svelte b/packages/bridge-ui/src/components/form/SelectChain.svelte
index 0ceb87df1e7..1f91976cd5e 100644
--- a/packages/bridge-ui/src/components/form/SelectChain.svelte
+++ b/packages/bridge-ui/src/components/form/SelectChain.svelte
@@ -29,7 +29,7 @@
 </script>
 
 <div
-  class="flex items-center justify-between w-full px-4 md:px-8 py-6 text-sm md:text-lg text-white"
+  class="flex items-center justify-between w-full px-4 md:px-7 py-6 text-sm md:text-lg text-white"
 >
   <div class="flex items-center w-2/5 justify-center">
     {#if $fromChain}
diff --git a/packages/bridge-ui/src/components/icons/ERC20.svelte b/packages/bridge-ui/src/components/icons/ERC20.svelte
new file mode 100644
index 00000000000..3a46357b121
--- /dev/null
+++ b/packages/bridge-ui/src/components/icons/ERC20.svelte
@@ -0,0 +1,6 @@
+<script lang="ts">
+  export let height = 30;
+  export let width = 30;
+</script>
+
+<svg xmlns="http://www.w3.org/2000/svg" class="bg-white !rounded-full" height={height} width={width} preserveAspectRatio="xMidYMid" viewBox="-38.39985 -104.22675 332.7987 625.3605"><path fill="#343434" d="M125.166 285.168l2.795 2.79 127.962-75.638L127.961 0l-2.795 9.5z"/><path fill="#8C8C8C" d="M127.962 287.959V0L0 212.32z"/><path fill="#3C3C3B" d="M126.386 412.306l1.575 4.6L256 236.587l-128.038 75.6-1.575 1.92z"/><path fill="#8C8C8C" d="M0 236.585l127.962 180.32v-104.72z"/><path fill="#141414" d="M127.961 154.159v133.799l127.96-75.637z"/><path fill="#393939" d="M127.96 154.159L0 212.32l127.96 75.637z"/></svg>
\ No newline at end of file
diff --git a/packages/bridge-ui/src/components/modals/FaucetModal.svelte b/packages/bridge-ui/src/components/modals/FaucetModal.svelte
index 5b02cbae6d8..85630aef06f 100644
--- a/packages/bridge-ui/src/components/modals/FaucetModal.svelte
+++ b/packages/bridge-ui/src/components/modals/FaucetModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { BigNumber, ethers, logger, Signer } from "ethers";
-  import { HORSE } from "../../domain/token";
+  import { TEST_ERC20 } from "../../domain/token";
   import { pendingTransactions } from "../../store/transactions";
   import { signer } from "../../store/signer";
   import { errorToast, successToast } from "../../utils/toast";
@@ -28,7 +28,7 @@
     if (!signer) return;
     const balance = await signer.getBalance();
     const contract = new ethers.Contract(
-      HORSE.addresses[0].address,
+      TEST_ERC20.addresses[0].address,
       MintableERC20,
       signer
     );
@@ -47,7 +47,7 @@
 
   async function mint() {
     try {
-      if ($fromChain.id !== HORSE.addresses[0].chainId) {
+      if ($fromChain.id !== TEST_ERC20.addresses[0].chainId) {
         await switchNetwork({
           chainId: CHAIN_MAINNET.id,
         });
@@ -56,7 +56,7 @@
         signer.set(wagmiSigner);
       }
       const contract = new ethers.Contract(
-        HORSE.addresses[0].address,
+        TEST_ERC20.addresses[0].address,
         MintableERC20,
         $signer
       );
@@ -81,8 +81,12 @@
 
 <Modal title={"ERC20 Faucet"} bind:isOpen>
   You can request 1000 {$token.symbol}. {$token.symbol} is only available to be minted
-  on Ethereum A1. If you are on Taiko A1, your network will be changed first. You
-  must have a small amount of ETH in your Ethereum A1 wallet to send the transaction.
+  on {import.meta.env
+    ? import.meta.env.VITE_MAINNET_CHAIN_NAME
+    : "Ethereum A2"}. If you are on {import.meta.env ? import.meta.env.VITE_TAIKO_CHAIN_NAME : "Taiko A2"}, your network will be changed first. You
+  must have a small amount of ETH in your {import.meta.env
+    ? import.meta.env.VITE_MAINNET_CHAIN_NAME
+    : "Ethereum A2"} wallet to send the transaction.
   <br />
   <button
     class="btn btn-dark-5 h-[60px] text-base"
diff --git a/packages/bridge-ui/src/constants/abi/Bridge.ts b/packages/bridge-ui/src/constants/abi/Bridge.ts
index 478f8ef10cf..2e43ccef750 100644
--- a/packages/bridge-ui/src/constants/abi/Bridge.ts
+++ b/packages/bridge-ui/src/constants/abi/Bridge.ts
@@ -1,726 +1,925 @@
 export default [
   {
-    anonymous: false,
-    inputs: [
+    "inputs": [],
+    "name": "RESOLVER_DENIED",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "RESOLVER_INVALID_ADDR",
+    "type": "error"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: true,
-        internalType: "uint256",
-        name: "chainId",
-        type: "uint256",
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "chainId",
+        "type": "uint256"
       },
       {
-        indexed: false,
-        internalType: "bool",
-        name: "enabled",
-        type: "bool",
-      },
+        "indexed": false,
+        "internalType": "bool",
+        "name": "enabled",
+        "type": "bool"
+      }
     ],
-    name: "DestChainEnabled",
-    type: "event",
+    "name": "DestChainEnabled",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
+      },
       {
-        indexed: false,
-        internalType: "uint8",
-        name: "version",
-        type: "uint8",
+        "indexed": false,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
     ],
-    name: "Initialized",
-    type: "event",
+    "name": "EtherReleased",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: true,
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "version",
+        "type": "uint8"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
       },
       {
-        components: [
+        "components": [
           {
-            internalType: "uint256",
-            name: "id",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "id",
+            "type": "uint256"
           },
           {
-            internalType: "address",
-            name: "sender",
-            type: "address",
+            "internalType": "address",
+            "name": "sender",
+            "type": "address"
           },
           {
-            internalType: "uint256",
-            name: "srcChainId",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "srcChainId",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "destChainId",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "destChainId",
+            "type": "uint256"
           },
           {
-            internalType: "address",
-            name: "owner",
-            type: "address",
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
           },
           {
-            internalType: "address",
-            name: "to",
-            type: "address",
+            "internalType": "address",
+            "name": "to",
+            "type": "address"
           },
           {
-            internalType: "address",
-            name: "refundAddress",
-            type: "address",
+            "internalType": "address",
+            "name": "refundAddress",
+            "type": "address"
           },
           {
-            internalType: "uint256",
-            name: "depositValue",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "depositValue",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "callValue",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "callValue",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "processingFee",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "processingFee",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "gasLimit",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "gasLimit",
+            "type": "uint256"
           },
           {
-            internalType: "bytes",
-            name: "data",
-            type: "bytes",
+            "internalType": "bytes",
+            "name": "data",
+            "type": "bytes"
           },
           {
-            internalType: "string",
-            name: "memo",
-            type: "string",
-          },
+            "internalType": "string",
+            "name": "memo",
+            "type": "string"
+          }
         ],
-        indexed: false,
-        internalType: "struct IBridge.Message",
-        name: "message",
-        type: "tuple",
-      },
-    ],
-    name: "MessageSent",
-    type: "event",
+        "indexed": false,
+        "internalType": "struct IBridge.Message",
+        "name": "message",
+        "type": "tuple"
+      }
+    ],
+    "name": "MessageSent",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: true,
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
       },
       {
-        indexed: false,
-        internalType: "enum LibBridgeStatus.MessageStatus",
-        name: "status",
-        type: "uint8",
+        "indexed": false,
+        "internalType": "enum LibBridgeStatus.MessageStatus",
+        "name": "status",
+        "type": "uint8"
       },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "transactor",
+        "type": "address"
+      }
     ],
-    name: "MessageStatusChanged",
-    type: "event",
+    "name": "MessageStatusChanged",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: true,
-        internalType: "address",
-        name: "previousOwner",
-        type: "address",
+        "indexed": true,
+        "internalType": "address",
+        "name": "previousOwner",
+        "type": "address"
       },
       {
-        indexed: true,
-        internalType: "address",
-        name: "newOwner",
-        type: "address",
-      },
+        "indexed": true,
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
     ],
-    name: "OwnershipTransferred",
-    type: "event",
+    "name": "OwnershipTransferred",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: false,
-        internalType: "address",
-        name: "sender",
-        type: "address",
+        "indexed": false,
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
       },
       {
-        indexed: false,
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
-      },
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
+      }
     ],
-    name: "SignalSent",
-    type: "event",
+    "name": "SignalSent",
+    "type": "event"
   },
   {
-    inputs: [],
-    name: "addressManager",
-    outputs: [
+    "inputs": [],
+    "name": "addressManager",
+    "outputs": [
       {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [],
-    name: "context",
-    outputs: [
+    "inputs": [],
+    "name": "context",
+    "outputs": [
       {
-        components: [
+        "components": [
           {
-            internalType: "bytes32",
-            name: "signal",
-            type: "bytes32",
+            "internalType": "bytes32",
+            "name": "msgHash",
+            "type": "bytes32"
           },
           {
-            internalType: "address",
-            name: "sender",
-            type: "address",
+            "internalType": "address",
+            "name": "sender",
+            "type": "address"
           },
           {
-            internalType: "uint256",
-            name: "srcChainId",
-            type: "uint256",
-          },
+            "internalType": "uint256",
+            "name": "srcChainId",
+            "type": "uint256"
+          }
         ],
-        internalType: "struct IBridge.Context",
-        name: "",
-        type: "tuple",
-      },
+        "internalType": "struct IBridge.Context",
+        "name": "",
+        "type": "tuple"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
-      },
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
+      }
     ],
-    name: "getMessageStatus",
-    outputs: [
+    "name": "getMessageStatus",
+    "outputs": [
       {
-        internalType: "enum LibBridgeStatus.MessageStatus",
-        name: "",
-        type: "uint8",
-      },
+        "internalType": "enum LibBridgeStatus.MessageStatus",
+        "name": "",
+        "type": "uint8"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "address",
-        name: "_addressManager",
-        type: "address",
-      },
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
+      }
     ],
-    name: "init",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
+    "name": "getMessageStatusSlot",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "uint256",
-        name: "_chainId",
-        type: "uint256",
-      },
+        "components": [
+          {
+            "internalType": "uint256",
+            "name": "id",
+            "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "sender",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "srcChainId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "destChainId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "to",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "refundAddress",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "depositValue",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "callValue",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "processingFee",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "gasLimit",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes",
+            "name": "data",
+            "type": "bytes"
+          },
+          {
+            "internalType": "string",
+            "name": "memo",
+            "type": "string"
+          }
+        ],
+        "internalType": "struct IBridge.Message",
+        "name": "message",
+        "type": "tuple"
+      }
     ],
-    name: "isDestChainEnabled",
-    outputs: [
+    "name": "hashMessage",
+    "outputs": [
       {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "pure",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
-      },
-      {
-        internalType: "uint256",
-        name: "srcChainId",
-        type: "uint256",
-      },
+        "internalType": "address",
+        "name": "_addressManager",
+        "type": "address"
+      }
+    ],
+    "name": "init",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
-        internalType: "bytes",
-        name: "proof",
-        type: "bytes",
-      },
+        "internalType": "uint256",
+        "name": "_chainId",
+        "type": "uint256"
+      }
     ],
-    name: "isMessageReceived",
-    outputs: [
+    "name": "isDestChainEnabled",
+    "outputs": [
       {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
+        "internalType": "bool",
+        "name": "enabled",
+        "type": "bool"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
       },
-    ],
-    name: "isMessageSent",
-    outputs: [
       {
-        internalType: "bool",
-        name: "",
-        type: "bool",
+        "internalType": "uint256",
+        "name": "destChainId",
+        "type": "uint256"
       },
+      {
+        "internalType": "bytes",
+        "name": "proof",
+        "type": "bytes"
+      }
+    ],
+    "name": "isMessageFailed",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
-      },
+    "inputs": [
       {
-        internalType: "uint256",
-        name: "srcChainId",
-        type: "uint256",
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
       },
       {
-        internalType: "address",
-        name: "sender",
-        type: "address",
+        "internalType": "uint256",
+        "name": "srcChainId",
+        "type": "uint256"
       },
       {
-        internalType: "bytes",
-        name: "proof",
-        type: "bytes",
-      },
+        "internalType": "bytes",
+        "name": "proof",
+        "type": "bytes"
+      }
     ],
-    name: "isSignalReceived",
-    outputs: [
+    "name": "isMessageReceived",
+    "outputs": [
       {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "address",
-        name: "sender",
-        type: "address",
-      },
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
+      }
+    ],
+    "name": "isMessageSent",
+    "outputs": [
       {
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
-      },
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
     ],
-    name: "isSignalSent",
-    outputs: [
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
       {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [],
-    name: "owner",
-    outputs: [
+    "inputs": [
       {
-        internalType: "address",
-        name: "",
-        type: "address",
+        "components": [
+          {
+            "internalType": "uint256",
+            "name": "id",
+            "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "sender",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "srcChainId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "destChainId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "to",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "refundAddress",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "depositValue",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "callValue",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "processingFee",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "gasLimit",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes",
+            "name": "data",
+            "type": "bytes"
+          },
+          {
+            "internalType": "string",
+            "name": "memo",
+            "type": "string"
+          }
+        ],
+        "internalType": "struct IBridge.Message",
+        "name": "message",
+        "type": "tuple"
       },
+      {
+        "internalType": "bytes",
+        "name": "proof",
+        "type": "bytes"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "name": "processMessage",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        components: [
+        "components": [
           {
-            internalType: "uint256",
-            name: "id",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "id",
+            "type": "uint256"
           },
           {
-            internalType: "address",
-            name: "sender",
-            type: "address",
+            "internalType": "address",
+            "name": "sender",
+            "type": "address"
           },
           {
-            internalType: "uint256",
-            name: "srcChainId",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "srcChainId",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "destChainId",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "destChainId",
+            "type": "uint256"
           },
           {
-            internalType: "address",
-            name: "owner",
-            type: "address",
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
           },
           {
-            internalType: "address",
-            name: "to",
-            type: "address",
+            "internalType": "address",
+            "name": "to",
+            "type": "address"
           },
           {
-            internalType: "address",
-            name: "refundAddress",
-            type: "address",
+            "internalType": "address",
+            "name": "refundAddress",
+            "type": "address"
           },
           {
-            internalType: "uint256",
-            name: "depositValue",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "depositValue",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "callValue",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "callValue",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "processingFee",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "processingFee",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "gasLimit",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "gasLimit",
+            "type": "uint256"
           },
           {
-            internalType: "bytes",
-            name: "data",
-            type: "bytes",
+            "internalType": "bytes",
+            "name": "data",
+            "type": "bytes"
           },
           {
-            internalType: "string",
-            name: "memo",
-            type: "string",
-          },
+            "internalType": "string",
+            "name": "memo",
+            "type": "string"
+          }
         ],
-        internalType: "struct IBridge.Message",
-        name: "message",
-        type: "tuple",
+        "internalType": "struct IBridge.Message",
+        "name": "message",
+        "type": "tuple"
       },
       {
-        internalType: "bytes",
-        name: "proof",
-        type: "bytes",
-      },
+        "internalType": "bytes",
+        "name": "proof",
+        "type": "bytes"
+      }
     ],
-    name: "processMessage",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
+    "name": "releaseEther",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    inputs: [],
-    name: "renounceOwnership",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
+    "inputs": [],
+    "name": "renounceOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "string",
-        name: "name",
-        type: "string",
+        "internalType": "string",
+        "name": "name",
+        "type": "string"
       },
+      {
+        "internalType": "bool",
+        "name": "allowZeroAddress",
+        "type": "bool"
+      }
     ],
-    name: "resolve",
-    outputs: [
+    "name": "resolve",
+    "outputs": [
       {
-        internalType: "address payable",
-        name: "",
-        type: "address",
-      },
+        "internalType": "address payable",
+        "name": "",
+        "type": "address"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "uint256",
-        name: "chainId",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "chainId",
+        "type": "uint256"
       },
       {
-        internalType: "string",
-        name: "name",
-        type: "string",
+        "internalType": "string",
+        "name": "name",
+        "type": "string"
       },
+      {
+        "internalType": "bool",
+        "name": "allowZeroAddress",
+        "type": "bool"
+      }
     ],
-    name: "resolve",
-    outputs: [
+    "name": "resolve",
+    "outputs": [
       {
-        internalType: "address payable",
-        name: "",
-        type: "address",
-      },
+        "internalType": "address payable",
+        "name": "",
+        "type": "address"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        components: [
+        "components": [
           {
-            internalType: "uint256",
-            name: "id",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "id",
+            "type": "uint256"
           },
           {
-            internalType: "address",
-            name: "sender",
-            type: "address",
+            "internalType": "address",
+            "name": "sender",
+            "type": "address"
           },
           {
-            internalType: "uint256",
-            name: "srcChainId",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "srcChainId",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "destChainId",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "destChainId",
+            "type": "uint256"
           },
           {
-            internalType: "address",
-            name: "owner",
-            type: "address",
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
           },
           {
-            internalType: "address",
-            name: "to",
-            type: "address",
+            "internalType": "address",
+            "name": "to",
+            "type": "address"
           },
           {
-            internalType: "address",
-            name: "refundAddress",
-            type: "address",
+            "internalType": "address",
+            "name": "refundAddress",
+            "type": "address"
           },
           {
-            internalType: "uint256",
-            name: "depositValue",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "depositValue",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "callValue",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "callValue",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "processingFee",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "processingFee",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "gasLimit",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "gasLimit",
+            "type": "uint256"
           },
           {
-            internalType: "bytes",
-            name: "data",
-            type: "bytes",
+            "internalType": "bytes",
+            "name": "data",
+            "type": "bytes"
           },
           {
-            internalType: "string",
-            name: "memo",
-            type: "string",
-          },
+            "internalType": "string",
+            "name": "memo",
+            "type": "string"
+          }
         ],
-        internalType: "struct IBridge.Message",
-        name: "message",
-        type: "tuple",
+        "internalType": "struct IBridge.Message",
+        "name": "message",
+        "type": "tuple"
       },
       {
-        internalType: "bool",
-        name: "isLastAttempt",
-        type: "bool",
-      },
+        "internalType": "bool",
+        "name": "isLastAttempt",
+        "type": "bool"
+      }
     ],
-    name: "retryMessage",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
+    "name": "retryMessage",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        components: [
+        "components": [
           {
-            internalType: "uint256",
-            name: "id",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "id",
+            "type": "uint256"
           },
           {
-            internalType: "address",
-            name: "sender",
-            type: "address",
+            "internalType": "address",
+            "name": "sender",
+            "type": "address"
           },
           {
-            internalType: "uint256",
-            name: "srcChainId",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "srcChainId",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "destChainId",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "destChainId",
+            "type": "uint256"
           },
           {
-            internalType: "address",
-            name: "owner",
-            type: "address",
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
           },
           {
-            internalType: "address",
-            name: "to",
-            type: "address",
+            "internalType": "address",
+            "name": "to",
+            "type": "address"
           },
           {
-            internalType: "address",
-            name: "refundAddress",
-            type: "address",
+            "internalType": "address",
+            "name": "refundAddress",
+            "type": "address"
           },
           {
-            internalType: "uint256",
-            name: "depositValue",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "depositValue",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "callValue",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "callValue",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "processingFee",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "processingFee",
+            "type": "uint256"
           },
           {
-            internalType: "uint256",
-            name: "gasLimit",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "gasLimit",
+            "type": "uint256"
           },
           {
-            internalType: "bytes",
-            name: "data",
-            type: "bytes",
+            "internalType": "bytes",
+            "name": "data",
+            "type": "bytes"
           },
           {
-            internalType: "string",
-            name: "memo",
-            type: "string",
-          },
+            "internalType": "string",
+            "name": "memo",
+            "type": "string"
+          }
         ],
-        internalType: "struct IBridge.Message",
-        name: "message",
-        type: "tuple",
-      },
+        "internalType": "struct IBridge.Message",
+        "name": "message",
+        "type": "tuple"
+      }
     ],
-    name: "sendMessage",
-    outputs: [
+    "name": "sendMessage",
+    "outputs": [
       {
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
-      },
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
+      }
     ],
-    stateMutability: "payable",
-    type: "function",
+    "stateMutability": "payable",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
-      },
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
     ],
-    name: "sendSignal",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
+    "name": "transferOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    inputs: [
-      {
-        internalType: "address",
-        name: "newOwner",
-        type: "address",
-      },
-    ],
-    name: "transferOwnership",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    stateMutability: "payable",
-    type: "receive",
-  },
-];
+    "stateMutability": "payable",
+    "type": "receive"
+  }
+];
\ No newline at end of file
diff --git a/packages/bridge-ui/src/constants/abi/TokenVault.ts b/packages/bridge-ui/src/constants/abi/TokenVault.ts
index c7cfc30ee6c..18ed573b113 100644
--- a/packages/bridge-ui/src/constants/abi/TokenVault.ts
+++ b/packages/bridge-ui/src/constants/abi/TokenVault.ts
@@ -1,526 +1,685 @@
 export default [
   {
-    anonymous: false,
-    inputs: [
+    "inputs": [],
+    "name": "RESOLVER_DENIED",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "RESOLVER_INVALID_ADDR",
+    "type": "error"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: true,
-        internalType: "uint256",
-        name: "srcChainId",
-        type: "uint256",
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "srcChainId",
+        "type": "uint256"
       },
       {
-        indexed: true,
-        internalType: "address",
-        name: "canonicalToken",
-        type: "address",
+        "indexed": true,
+        "internalType": "address",
+        "name": "canonicalToken",
+        "type": "address"
       },
       {
-        indexed: true,
-        internalType: "address",
-        name: "bridgedToken",
-        type: "address",
+        "indexed": true,
+        "internalType": "address",
+        "name": "bridgedToken",
+        "type": "address"
       },
       {
-        indexed: false,
-        internalType: "string",
-        name: "canonicalTokenSymbol",
-        type: "string",
+        "indexed": false,
+        "internalType": "string",
+        "name": "canonicalTokenSymbol",
+        "type": "string"
       },
       {
-        indexed: false,
-        internalType: "string",
-        name: "canonicalTokenName",
-        type: "string",
+        "indexed": false,
+        "internalType": "string",
+        "name": "canonicalTokenName",
+        "type": "string"
       },
       {
-        indexed: false,
-        internalType: "uint8",
-        name: "canonicalTokenDecimal",
-        type: "uint8",
-      },
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "canonicalTokenDecimal",
+        "type": "uint8"
+      }
     ],
-    name: "BridgedERC20Deployed",
-    type: "event",
+    "name": "BridgedERC20Deployed",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address",
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
       },
       {
-        indexed: false,
-        internalType: "address",
-        name: "from",
-        type: "address",
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
       },
       {
-        indexed: false,
-        internalType: "uint256",
-        name: "srcChainId",
-        type: "uint256",
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
       {
-        indexed: false,
-        internalType: "address",
-        name: "token",
-        type: "address",
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "srcChainId",
+        "type": "uint256"
       },
       {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256",
+        "indexed": false,
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
       },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
     ],
-    name: "ERC20Received",
-    type: "event",
+    "name": "ERC20Received",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address",
-      },
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: false,
-        internalType: "uint256",
-        name: "destChainId",
-        type: "uint256",
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
       },
       {
-        indexed: false,
-        internalType: "address",
-        name: "token",
-        type: "address",
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
       },
       {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256",
+        "indexed": false,
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
       },
       {
-        indexed: false,
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
-      },
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
     ],
-    name: "ERC20Sent",
-    type: "event",
+    "name": "ERC20Released",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: false,
-        internalType: "address",
-        name: "from",
-        type: "address",
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
       },
       {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256",
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
       },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "destChainId",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
     ],
-    name: "EtherReceived",
-    type: "event",
+    "name": "ERC20Sent",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address",
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "msgHash",
+        "type": "bytes32"
       },
       {
-        indexed: false,
-        internalType: "uint256",
-        name: "destChainId",
-        type: "uint256",
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
       },
       {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256",
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
       {
-        indexed: false,
-        internalType: "bytes32",
-        name: "signal",
-        type: "bytes32",
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "destChainId",
+        "type": "uint256"
       },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
     ],
-    name: "EtherSent",
-    type: "event",
+    "name": "EtherSent",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint8",
-        name: "version",
-        type: "uint8",
-      },
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "version",
+        "type": "uint8"
+      }
     ],
-    name: "Initialized",
-    type: "event",
+    "name": "Initialized",
+    "type": "event"
   },
   {
-    anonymous: false,
-    inputs: [
+    "anonymous": false,
+    "inputs": [
       {
-        indexed: true,
-        internalType: "address",
-        name: "previousOwner",
-        type: "address",
+        "indexed": true,
+        "internalType": "address",
+        "name": "previousOwner",
+        "type": "address"
       },
       {
-        indexed: true,
-        internalType: "address",
-        name: "newOwner",
-        type: "address",
-      },
+        "indexed": true,
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
     ],
-    name: "OwnershipTransferred",
-    type: "event",
+    "name": "OwnershipTransferred",
+    "type": "event"
   },
   {
-    inputs: [],
-    name: "addressManager",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
+    "inputs": [],
+    "name": "addressManager",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
     ],
-    name: "bridgedToCanonical",
-    outputs: [
+    "name": "bridgedToCanonical",
+    "outputs": [
       {
-        internalType: "uint256",
-        name: "chainId",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "chainId",
+        "type": "uint256"
       },
       {
-        internalType: "address",
-        name: "addr",
-        type: "address",
+        "internalType": "address",
+        "name": "addr",
+        "type": "address"
       },
       {
-        internalType: "uint8",
-        name: "decimals",
-        type: "uint8",
+        "internalType": "uint8",
+        "name": "decimals",
+        "type": "uint8"
       },
       {
-        internalType: "string",
-        name: "symbol",
-        type: "string",
+        "internalType": "string",
+        "name": "symbol",
+        "type": "string"
       },
       {
-        internalType: "string",
-        name: "name",
-        type: "string",
-      },
+        "internalType": "string",
+        "name": "name",
+        "type": "string"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       },
       {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
     ],
-    name: "canonicalToBridged",
-    outputs: [
+    "name": "canonicalToBridged",
+    "outputs": [
       {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "address",
-        name: "addressManager",
-        type: "address",
-      },
+        "internalType": "address",
+        "name": "addressManager",
+        "type": "address"
+      }
     ],
-    name: "init",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
+    "name": "init",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
     ],
-    name: "isBridgedToken",
-    outputs: [
+    "name": "isBridgedToken",
+    "outputs": [
       {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [],
-    name: "owner",
-    outputs: [
+    "inputs": [
       {
-        internalType: "address",
-        name: "",
-        type: "address",
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "name": "messageDeposits",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
       },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
-        components: [
+        "components": [
           {
-            internalType: "uint256",
-            name: "chainId",
-            type: "uint256",
+            "internalType": "uint256",
+            "name": "chainId",
+            "type": "uint256"
           },
           {
-            internalType: "address",
-            name: "addr",
-            type: "address",
+            "internalType": "address",
+            "name": "addr",
+            "type": "address"
           },
           {
-            internalType: "uint8",
-            name: "decimals",
-            type: "uint8",
+            "internalType": "uint8",
+            "name": "decimals",
+            "type": "uint8"
           },
           {
-            internalType: "string",
-            name: "symbol",
-            type: "string",
+            "internalType": "string",
+            "name": "symbol",
+            "type": "string"
           },
           {
-            internalType: "string",
-            name: "name",
-            type: "string",
-          },
+            "internalType": "string",
+            "name": "name",
+            "type": "string"
+          }
         ],
-        internalType: "struct TokenVault.CannonicalERC20",
-        name: "canonicalToken",
-        type: "tuple",
+        "internalType": "struct TokenVault.CanonicalERC20",
+        "name": "canonicalToken",
+        "type": "tuple"
       },
       {
-        internalType: "address",
-        name: "from",
-        type: "address",
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
       },
       {
-        internalType: "address",
-        name: "to",
-        type: "address",
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
       {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "receiveERC20",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "components": [
+          {
+            "internalType": "uint256",
+            "name": "id",
+            "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "sender",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "srcChainId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "destChainId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "to",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "refundAddress",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "depositValue",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "callValue",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "processingFee",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "gasLimit",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes",
+            "name": "data",
+            "type": "bytes"
+          },
+          {
+            "internalType": "string",
+            "name": "memo",
+            "type": "string"
+          }
+        ],
+        "internalType": "struct IBridge.Message",
+        "name": "message",
+        "type": "tuple"
       },
+      {
+        "internalType": "bytes",
+        "name": "proof",
+        "type": "bytes"
+      }
     ],
-    name: "receiveERC20",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
+    "name": "releaseERC20",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    inputs: [],
-    name: "renounceOwnership",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
+    "inputs": [],
+    "name": "renounceOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "string",
-        name: "name",
-        type: "string",
+        "internalType": "string",
+        "name": "name",
+        "type": "string"
       },
+      {
+        "internalType": "bool",
+        "name": "allowZeroAddress",
+        "type": "bool"
+      }
     ],
-    name: "resolve",
-    outputs: [
+    "name": "resolve",
+    "outputs": [
       {
-        internalType: "address payable",
-        name: "",
-        type: "address",
-      },
+        "internalType": "address payable",
+        "name": "",
+        "type": "address"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "uint256",
-        name: "chainId",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "chainId",
+        "type": "uint256"
       },
       {
-        internalType: "string",
-        name: "name",
-        type: "string",
+        "internalType": "string",
+        "name": "name",
+        "type": "string"
       },
+      {
+        "internalType": "bool",
+        "name": "allowZeroAddress",
+        "type": "bool"
+      }
     ],
-    name: "resolve",
-    outputs: [
+    "name": "resolve",
+    "outputs": [
       {
-        internalType: "address payable",
-        name: "",
-        type: "address",
-      },
+        "internalType": "address payable",
+        "name": "",
+        "type": "address"
+      }
     ],
-    stateMutability: "view",
-    type: "function",
+    "stateMutability": "view",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "uint256",
-        name: "destChainId",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "destChainId",
+        "type": "uint256"
       },
       {
-        internalType: "address",
-        name: "to",
-        type: "address",
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
       {
-        internalType: "address",
-        name: "token",
-        type: "address",
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
       },
       {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
       },
       {
-        internalType: "uint256",
-        name: "gasLimit",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "gasLimit",
+        "type": "uint256"
       },
       {
-        internalType: "uint256",
-        name: "processingFee",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "processingFee",
+        "type": "uint256"
       },
       {
-        internalType: "address",
-        name: "refundAddress",
-        type: "address",
+        "internalType": "address",
+        "name": "refundAddress",
+        "type": "address"
       },
       {
-        internalType: "string",
-        name: "memo",
-        type: "string",
-      },
+        "internalType": "string",
+        "name": "memo",
+        "type": "string"
+      }
     ],
-    name: "sendERC20",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function",
+    "name": "sendERC20",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "uint256",
-        name: "destChainId",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "destChainId",
+        "type": "uint256"
       },
       {
-        internalType: "address",
-        name: "to",
-        type: "address",
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
       {
-        internalType: "uint256",
-        name: "gasLimit",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "gasLimit",
+        "type": "uint256"
       },
       {
-        internalType: "uint256",
-        name: "processingFee",
-        type: "uint256",
+        "internalType": "uint256",
+        "name": "processingFee",
+        "type": "uint256"
       },
       {
-        internalType: "address",
-        name: "refundAddress",
-        type: "address",
+        "internalType": "address",
+        "name": "refundAddress",
+        "type": "address"
       },
       {
-        internalType: "string",
-        name: "memo",
-        type: "string",
-      },
+        "internalType": "string",
+        "name": "memo",
+        "type": "string"
+      }
     ],
-    name: "sendEther",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function",
+    "name": "sendEther",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
   },
   {
-    inputs: [
+    "inputs": [
       {
-        internalType: "address",
-        name: "newOwner",
-        type: "address",
-      },
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
     ],
-    name: "transferOwnership",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-];
+    "name": "transferOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
\ No newline at end of file
diff --git a/packages/bridge-ui/src/domain/bridge.ts b/packages/bridge-ui/src/domain/bridge.ts
index 59890ad54d0..744ae8e5250 100644
--- a/packages/bridge-ui/src/domain/bridge.ts
+++ b/packages/bridge-ui/src/domain/bridge.ts
@@ -25,11 +25,12 @@ type BridgeOpts = {
   processingFeeInWei?: BigNumber;
   tokenId?: string;
   memo?: string;
+  isBridgedTokenAlreadyDeployed?: boolean;
 };
 
 type ClaimOpts = {
   message: Message;
-  signal: string;
+  msgHash: string;
   signer: ethers.Signer;
   destBridgeAddress: string;
   srcBridgeAddress: string;
diff --git a/packages/bridge-ui/src/domain/chain.ts b/packages/bridge-ui/src/domain/chain.ts
index 13842cc70e1..8ec816ddc30 100644
--- a/packages/bridge-ui/src/domain/chain.ts
+++ b/packages/bridge-ui/src/domain/chain.ts
@@ -13,6 +13,26 @@ export const CHAIN_ID_TAIKO = import.meta.env
   ? BigNumber.from(import.meta.env.VITE_TAIKO_CHAIN_ID).toNumber()
   : 167001;
 
+const L1_RPC = import.meta?.env?.VITE_L1_RPC_URL ?? "https://l1rpc.internal.taiko.xyz/";
+
+const L2_RPC = import.meta?.env?.VITE_L2_RPC_URL ?? "https://l2rpc.internal.taiko.xyz/";
+
+const L1_BRIDGE_ADDRESS = import.meta?.env?.VITE_MAINNET_BRIDGE_ADDRESS ?? "0x0237443359aB0b11EcDC41A7aF1C90226a88c70f";
+
+const L2_BRIDGE_ADDRESS = import.meta?.env?.VITE_TAIKO_BRIDGE_ADDRESS ?? "0x0000777700000000000000000000000000000004";
+
+const L1_HEADER_SYNC_ADDRESS = import.meta?.env?.VITE_MAINNET_HEADER_SYNC_ADDRESS ?? "0xa6421A7f48498cee3aEb6428a8A2DD5fAA3AcE2f";
+
+const L2_HEADER_SYNC_ADDRESS = import.meta?.env?.VITE_TAIKO_HEADER_SYNC_ADDRESS ?? "0x0000777700000000000000000000000000000001";
+
+const L1_SIGNAL_SERVICE_ADDRESS = import.meta?.env?.VITE_MAINNET_SIGNAL_SERVICE_ADDRESS ?? "0x403cc7802725928652a3d116Bb1781005e2e76d3";
+
+const L2_SIGNAL_SERVICE_ADDRESS = import.meta?.env?.VITE_TAIKO_SIGNAL_SERVICE_ADDRESS ?? "0x0000777700000000000000000000000000000007";
+
+const L1_EXPLORER_URL = import.meta?.env?.VITE_L1_EXPLORER_URL ?? "https://l1explorer.internal.taiko.xyz/";
+
+const L2_EXPLORER_URL = import.meta?.env?.VITE_L2_EXPLORER_URL ?? "https://l2explorer.internal.taiko.xyz/";
+
 export type Chain = {
   id: number;
   name: string;
@@ -22,6 +42,7 @@ export type Chain = {
   bridgeAddress: string;
   headerSyncAddress: string;
   explorerUrl: string;
+  signalServiceAddress: string,
 };
 
 export const CHAIN_MAINNET = {
@@ -29,31 +50,25 @@ export const CHAIN_MAINNET = {
   name: import.meta.env
     ? import.meta.env.VITE_MAINNET_CHAIN_NAME
     : "Ethereum A1",
-  rpc: "https://l1rpc.a1.taiko.xyz",
+  rpc: L1_RPC,
   enabled: true,
   icon: Eth,
-  bridgeAddress: import.meta.env
-    ? import.meta.env.VITE_MAINNET_BRIDGE_ADDRESS
-    : "0x3612E284D763f42f5E4CB72B1602b23DAEC3cA60",
-  headerSyncAddress: import.meta.env
-    ? import.meta.env.VITE_MAINNET_HEADER_SYNC_ADDRESS
-    : "0x7B3AF414448ba906f02a1CA307C56c4ADFF27ce7",
-  explorerUrl: "https://l1explorer.a1.taiko.xyz",
+  bridgeAddress: L1_BRIDGE_ADDRESS,
+  headerSyncAddress: L1_HEADER_SYNC_ADDRESS,
+  explorerUrl: L1_EXPLORER_URL,
+  signalServiceAddress: L1_SIGNAL_SERVICE_ADDRESS
 };
 
 export const CHAIN_TKO = {
   id: CHAIN_ID_TAIKO,
-  name: import.meta.env ? import.meta.env.VITE_TAIKO_CHAIN_NAME : "Taiko A1",
-  rpc: "https://l2rpc.a1.taiko.xyz",
+  name: import.meta.env ? import.meta.env.VITE_TAIKO_CHAIN_NAME : "Taiko A2",
+  rpc: L2_RPC,
   enabled: true,
   icon: Taiko,
-  bridgeAddress: import.meta.env
-    ? import.meta.env.VITE_TAIKO_BRIDGE_ADDRESS
-    : "0x0000777700000000000000000000000000000004",
-  headerSyncAddress: import.meta.env
-    ? import.meta.env.VITE_TAIKO_HEADER_SYNC_ADDRESS
-    : "0x0000777700000000000000000000000000000001",
-  explorerUrl: "https://l2explorer.a1.taiko.xyz",
+  bridgeAddress: L2_BRIDGE_ADDRESS,
+  headerSyncAddress: L2_HEADER_SYNC_ADDRESS,
+  explorerUrl: L2_EXPLORER_URL,
+  signalServiceAddress: L2_SIGNAL_SERVICE_ADDRESS,
 };
 
 export const chains: Record<string, Chain> = {
@@ -63,18 +78,20 @@ export const chains: Record<string, Chain> = {
 
 export const mainnet: WagmiChain = {
   id: CHAIN_ID_MAINNET,
-  name: "Ethereum A1",
+  name: import.meta.env
+  ? import.meta.env.VITE_MAINNET_CHAIN_NAME
+  : "Ethereum A2",
   network: "",
   nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   rpcUrls: {
     default: {
-      http: ["https://l1rpc.a1.taiko.xyz"],
+      http: [L1_RPC],
     },
   },
   blockExplorers: {
     default: {
       name: "Main",
-      url: "https://l1explorer.a1.taiko.xyz",
+      url: L1_EXPLORER_URL,
     },
   },
   // ens: {
@@ -84,18 +101,18 @@ export const mainnet: WagmiChain = {
 
 export const taiko: WagmiChain = {
   id: CHAIN_ID_TAIKO,
-  name: "Taiko A1",
+  name: import.meta.env ? import.meta.env.VITE_TAIKO_CHAIN_NAME : "Taiko A2",
   network: "",
   nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   rpcUrls: {
     default: {
-      http: ["https://l2rpc.a1.taiko.xyz"],
+      http: [L2_RPC],
     },
   },
   blockExplorers: {
     default: {
       name: "Main",
-      url: "https://l2explorer.a1.taiko.xyz",
+      url: L2_EXPLORER_URL,
     },
   },
   // ens: {
diff --git a/packages/bridge-ui/src/domain/proof.ts b/packages/bridge-ui/src/domain/proof.ts
index 3ea1742061c..96d4641a8ad 100644
--- a/packages/bridge-ui/src/domain/proof.ts
+++ b/packages/bridge-ui/src/domain/proof.ts
@@ -14,12 +14,13 @@ type EthGetProofResponse = {
 };
 
 type GenerateProofOpts = {
-  signal: string;
+  msgHash: string;
   sender: string;
   srcBridgeAddress: string;
   destChain: number;
   destHeaderSyncAddress: string;
   srcChain: number;
+  srcSignalServiceAddress: string;
 };
 
 interface Prover {
diff --git a/packages/bridge-ui/src/domain/token.ts b/packages/bridge-ui/src/domain/token.ts
index db6b3743945..48b00ff1633 100644
--- a/packages/bridge-ui/src/domain/token.ts
+++ b/packages/bridge-ui/src/domain/token.ts
@@ -17,6 +17,13 @@ export type Token = {
   logoComponent: ComponentType;
 };
 
+export type TokenDetails = {
+  symbol: string;
+  decimals: number;
+  address: string;
+  userTokenBalance: string;
+}
+
 export const ETH: Token = {
   name: "Ethereum",
   addresses: [
@@ -51,14 +58,14 @@ export const TKO: Token = {
   logoComponent: Tko,
 };
 
-export const HORSE: Token = {
-  name: "Horse Token",
+export const TEST_ERC20: Token = {
+  name: import.meta.env ? import.meta.env.VITE_TEST_ERC20_NAME_MAINNET : "Bull Token",
   addresses: [
     {
       chainId: CHAIN_MAINNET.id,
       address: import.meta.env
         ? import.meta.env.VITE_TEST_ERC20_ADDRESS_MAINNET
-        : "",
+        : "0x1B5Ccd66cc2408A0084047720167F6234Dc5498A",
     },
     {
       chainId: CHAIN_TKO.id,
@@ -66,8 +73,17 @@ export const HORSE: Token = {
     },
   ],
   decimals: 18,
-  symbol: "HORSE",
+  symbol: import.meta.env ? import.meta.env.VITE_TEST_ERC20_SYMBOL_MAINNET : "BULL",
   logoComponent: Horse,
 };
 
-export const tokens = [ETH, HORSE];
+export interface TokenService {
+  StoreToken(
+    token: Token,
+    address: string
+  ): Promise<Token[]>;
+  GetTokens(address: string): Token[],
+  RemoveToken(token: Token, address: string): Token[],
+}
+
+export const tokens = [ETH, TEST_ERC20];
diff --git a/packages/bridge-ui/src/domain/transactions.ts b/packages/bridge-ui/src/domain/transactions.ts
index 540c0a0f035..b9610aef683 100644
--- a/packages/bridge-ui/src/domain/transactions.ts
+++ b/packages/bridge-ui/src/domain/transactions.ts
@@ -5,7 +5,7 @@ export type BridgeTransaction = {
   ethersTx: ethers.Transaction;
   receipt?: ethers.providers.TransactionReceipt;
   status: MessageStatus;
-  signal?: string;
+  msgHash?: string;
   message?: Message;
   interval?: NodeJS.Timer;
   amountInWei?: BigNumber;
diff --git a/packages/bridge-ui/src/erc20/bridge.spec.ts b/packages/bridge-ui/src/erc20/bridge.spec.ts
index d6186612239..af65843a78e 100644
--- a/packages/bridge-ui/src/erc20/bridge.spec.ts
+++ b/packages/bridge-ui/src/erc20/bridge.spec.ts
@@ -199,7 +199,7 @@ describe("bridge tests", () => {
       "0xfake",
       opts.tokenAddress,
       opts.amountInWei,
-      BigNumber.from(140000),
+      BigNumber.from(2640000),
       opts.processingFeeInWei,
       "0xfake",
       opts.memo,
@@ -235,7 +235,7 @@ describe("bridge tests", () => {
       "0xfake",
       opts.tokenAddress,
       opts.amountInWei,
-      BigNumber.from(0),
+      BigNumber.from(2500000),
       BigNumber.from(0),
       "0xfake",
       "",
@@ -261,7 +261,7 @@ describe("bridge tests", () => {
           destChainId: BigNumber.from(CHAIN_ID_MAINNET),
           gasLimit: BigNumber.from(1),
         } as unknown as Message,
-        signal: "0x",
+        msgHash: "0x",
         srcBridgeAddress: "0x",
         destBridgeAddress: "0x",
         signer: wallet,
@@ -285,7 +285,7 @@ describe("bridge tests", () => {
           destChainId: BigNumber.from(CHAIN_ID_MAINNET),
           gasLimit: BigNumber.from(1),
         } as unknown as Message,
-        signal: "0x",
+        msgHash: "0x",
         srcBridgeAddress: "0x",
         destBridgeAddress: "0x",
         signer: wallet,
@@ -314,7 +314,7 @@ describe("bridge tests", () => {
           destChainId: BigNumber.from(CHAIN_ID_MAINNET),
           gasLimit: BigNumber.from(1),
         } as unknown as Message,
-        signal: "0x",
+        msgHash: "0x",
         srcBridgeAddress: "0x",
         destBridgeAddress: "0x",
         signer: wallet,
@@ -349,7 +349,7 @@ describe("bridge tests", () => {
         sender: "0x01",
         gasLimit: BigNumber.from(1),
       } as unknown as Message,
-      signal: "0x",
+      msgHash: "0x",
       srcBridgeAddress: "0x",
       destBridgeAddress: "0x",
       signer: wallet,
@@ -385,7 +385,7 @@ describe("bridge tests", () => {
         sender: "0x01",
         gasLimit: BigNumber.from(1),
       } as unknown as Message,
-      signal: "0x",
+      msgHash: "0x",
       srcBridgeAddress: "0x",
       destBridgeAddress: "0x",
       signer: wallet,
diff --git a/packages/bridge-ui/src/erc20/bridge.ts b/packages/bridge-ui/src/erc20/bridge.ts
index f060cc9964d..f59c0361f63 100644
--- a/packages/bridge-ui/src/erc20/bridge.ts
+++ b/packages/bridge-ui/src/erc20/bridge.ts
@@ -44,6 +44,10 @@ class ERC20Bridge implements Bridge {
       memo: opts.memo ?? "",
     };
 
+    if(!opts.isBridgedTokenAlreadyDeployed) {
+      message.gasLimit = message.gasLimit.add(BigNumber.from(2500000));
+    }
+
     return { contract, owner, message };
   }
 
@@ -154,7 +158,7 @@ class ERC20Bridge implements Bridge {
     );
 
     const messageStatus: MessageStatus = await contract.getMessageStatus(
-      opts.signal
+      opts.msgHash
     );
 
     if (
@@ -173,14 +177,19 @@ class ERC20Bridge implements Bridge {
     if (messageStatus === MessageStatus.New) {
       const proof = await this.prover.GenerateProof({
         srcChain: opts.message.srcChainId.toNumber(),
-        signal: opts.signal,
+        msgHash: opts.msgHash,
         sender: opts.srcBridgeAddress,
         srcBridgeAddress: opts.srcBridgeAddress,
         destChain: opts.message.destChainId.toNumber(),
         destHeaderSyncAddress:
           chains[opts.message.destChainId.toNumber()].headerSyncAddress,
+          srcSignalServiceAddress: chains[opts.message.srcChainId.toNumber()].signalServiceAddress,
       });
 
+      if(opts.message.gasLimit.gt(BigNumber.from(2500000))) {
+        return await contract.processMessage(opts.message, proof, { gasLimit: opts.message.gasLimit });
+      }
+
       return await contract.processMessage(opts.message, proof);
     } else {
       return await contract.retryMessage(opts.message, false);
diff --git a/packages/bridge-ui/src/eth/bridge.spec.ts b/packages/bridge-ui/src/eth/bridge.spec.ts
index 043b5286e62..458f9155e4e 100644
--- a/packages/bridge-ui/src/eth/bridge.spec.ts
+++ b/packages/bridge-ui/src/eth/bridge.spec.ts
@@ -140,7 +140,7 @@ describe("bridge tests", () => {
           destChainId: BigNumber.from(CHAIN_ID_MAINNET),
           gasLimit: BigNumber.from(1),
         } as unknown as Message,
-        signal: "0x",
+        msgHash: "0x",
         srcBridgeAddress: "0x",
         destBridgeAddress: "0x",
         signer: wallet,
@@ -169,7 +169,7 @@ describe("bridge tests", () => {
           destChainId: BigNumber.from(CHAIN_ID_MAINNET),
           gasLimit: BigNumber.from(1),
         } as unknown as Message,
-        signal: "0x",
+        msgHash: "0x",
         srcBridgeAddress: "0x",
         destBridgeAddress: "0x",
         signer: wallet,
@@ -204,7 +204,7 @@ describe("bridge tests", () => {
         sender: "0x01",
         gasLimit: BigNumber.from(1),
       } as unknown as Message,
-      signal: "0x",
+      msgHash: "0x",
       srcBridgeAddress: "0x",
       destBridgeAddress: "0x",
       signer: wallet,
@@ -240,7 +240,7 @@ describe("bridge tests", () => {
         sender: "0x01",
         gasLimit: BigNumber.from(1),
       } as unknown as Message,
-      signal: "0x",
+      msgHash: "0x",
       srcBridgeAddress: "0x",
       destBridgeAddress: "0x",
       signer: wallet,
diff --git a/packages/bridge-ui/src/eth/bridge.ts b/packages/bridge-ui/src/eth/bridge.ts
index bc9c0937df4..3114f92c4b8 100644
--- a/packages/bridge-ui/src/eth/bridge.ts
+++ b/packages/bridge-ui/src/eth/bridge.ts
@@ -109,7 +109,7 @@ class ETHBridge implements BridgeInterface {
     );
 
     const messageStatus: MessageStatus = await contract.getMessageStatus(
-      opts.signal
+      opts.msgHash
     );
 
     if (messageStatus === MessageStatus.Done) {
@@ -125,12 +125,13 @@ class ETHBridge implements BridgeInterface {
     if (messageStatus === MessageStatus.New) {
       const proofOpts = {
         srcChain: opts.message.srcChainId.toNumber(),
-        signal: opts.signal,
+        msgHash: opts.msgHash,
         sender: opts.srcBridgeAddress,
         srcBridgeAddress: opts.srcBridgeAddress,
         destChain: opts.message.destChainId.toNumber(),
         destHeaderSyncAddress:
           chains[opts.message.destChainId.toNumber()].headerSyncAddress,
+        srcSignalServiceAddress: chains[opts.message.srcChainId.toNumber()].signalServiceAddress,
       };
 
       const proof = await this.prover.GenerateProof(proofOpts);
diff --git a/packages/bridge-ui/src/proof/service.spec.ts b/packages/bridge-ui/src/proof/service.spec.ts
index a14bf3bdd5b..0686380ee6e 100644
--- a/packages/bridge-ui/src/proof/service.spec.ts
+++ b/packages/bridge-ui/src/proof/service.spec.ts
@@ -109,12 +109,13 @@ describe("prover tests", () => {
 
     await expect(
       prover.GenerateProof({
-        signal: ethers.constants.HashZero,
+        msgHash: ethers.constants.HashZero,
         sender: ethers.constants.AddressZero,
         srcBridgeAddress: ethers.constants.AddressZero,
         srcChain: srcChain,
         destChain: destChain,
         destHeaderSyncAddress: ethers.constants.AddressZero,
+        srcSignalServiceAddress: ethers.constants.AddressZero,
       })
     ).rejects.toThrowError("invalid proof");
   });
@@ -135,12 +136,13 @@ describe("prover tests", () => {
     const prover: ProofService = new ProofService(map);
 
     const proof = await prover.GenerateProof({
-      signal: ethers.constants.HashZero,
+      msgHash: ethers.constants.HashZero,
       sender: ethers.constants.AddressZero,
       srcBridgeAddress: ethers.constants.AddressZero,
       srcChain: srcChain,
       destChain: destChain,
       destHeaderSyncAddress: ethers.constants.AddressZero,
+      srcSignalServiceAddress: ethers.constants.AddressZero,
     });
     expect(proof).toBe(expectedProof);
   });
@@ -163,12 +165,13 @@ describe("prover tests", () => {
     const prover: ProofService = new ProofService(map);
 
     const proof = await prover.GenerateProof({
-      signal: ethers.constants.HashZero,
+      msgHash: ethers.constants.HashZero,
       sender: ethers.constants.AddressZero,
       srcBridgeAddress: ethers.constants.AddressZero,
       srcChain: srcChain,
       destChain: destChain,
       destHeaderSyncAddress: ethers.constants.AddressZero,
+      srcSignalServiceAddress: ethers.constants.AddressZero,
     });
     expect(proof).toBe(expectedProofWithBaseFee);
   });
diff --git a/packages/bridge-ui/src/proof/service.ts b/packages/bridge-ui/src/proof/service.ts
index b1ea6b0c5b1..2280f234a0e 100644
--- a/packages/bridge-ui/src/proof/service.ts
+++ b/packages/bridge-ui/src/proof/service.ts
@@ -19,7 +19,7 @@ class ProofService implements Prover {
     const key = ethers.utils.keccak256(
       ethers.utils.solidityPack(
         ["address", "bytes32"],
-        [opts.sender, opts.signal]
+        [opts.sender, opts.msgHash]
       )
     );
 
@@ -61,7 +61,7 @@ class ProofService implements Prover {
 
     // rpc call to get the merkle proof what value is at key on the bridge contract
     const proof: EthGetProofResponse = await provider.send("eth_getProof", [
-      opts.srcBridgeAddress,
+      opts.srcSignalServiceAddress,
       [key],
       block.hash,
     ]);
diff --git a/packages/bridge-ui/src/storage/customTokenService.ts b/packages/bridge-ui/src/storage/customTokenService.ts
new file mode 100644
index 00000000000..1a25f0c959f
--- /dev/null
+++ b/packages/bridge-ui/src/storage/customTokenService.ts
@@ -0,0 +1,47 @@
+import type { Token, TokenService } from "src/domain/token";
+
+interface storage {
+  getItem(key: string): string;
+  setItem(key: string, value: string);
+}
+
+class CustomTokenService implements TokenService {
+  private readonly storage: storage;
+
+  constructor(
+    storage: storage,
+  ) {
+    this.storage = storage;
+  }
+
+  async StoreToken(token: Token, address: string): Promise<Token[]> {
+    const customTokens = this.storage.getItem(`custom-tokens-${address.toLowerCase()}`);
+    let tokens = [];
+    if(customTokens) {
+      tokens = [...JSON.parse(customTokens)];
+    }
+    const doesTokenAlreadyExist = tokens.findIndex(t => t.symbol === token.symbol);
+    if(doesTokenAlreadyExist < 0) {
+      tokens.push({ ...token });
+    }
+    this.storage.setItem(`custom-tokens-${address.toLowerCase()}`, JSON.stringify(tokens));
+    return tokens;
+  }
+
+  GetTokens(address: string): Token[] {
+    return JSON.parse(this.storage.getItem(`custom-tokens-${address.toLowerCase()}`)) ?? [];
+  }
+
+  RemoveToken(token: Token, address: string): Token[] {
+    const customTokens = this.storage.getItem(`custom-tokens-${address.toLowerCase()}`);
+    let tokens = [];
+    if(customTokens) {
+      tokens = [...JSON.parse(customTokens)];
+    }
+    const updatedTokenList = tokens.filter(t => t.symbol !== token.symbol);
+    this.storage.setItem(`custom-tokens-${address.toLowerCase()}`, JSON.stringify(updatedTokenList));
+    return updatedTokenList;
+  }
+}
+
+export { CustomTokenService };
diff --git a/packages/bridge-ui/src/storage/service.spec.ts b/packages/bridge-ui/src/storage/service.spec.ts
index 4b791daa497..0ceeb8f47a7 100644
--- a/packages/bridge-ui/src/storage/service.spec.ts
+++ b/packages/bridge-ui/src/storage/service.spec.ts
@@ -21,6 +21,9 @@ const mockContract = {
   queryFilter: jest.fn(),
   getMessageStatus: jest.fn(),
   symbol: jest.fn(),
+  filters: {
+    ERC20Sent: jest.fn(),
+  }
 };
 
 jest.mock("ethers", () => ({
@@ -71,14 +74,15 @@ const mockEvent = {
     message: {
       owner: "0x123",
     },
-    signal: "0x456",
+    msgHash: "0x456",
+    amount: "100",
   },
 };
 
 const mockErc20Event = {
   args: {
     amount: "100",
-    signal: "0x456",
+    msgHash: "0x456",
   },
 };
 
@@ -271,7 +275,7 @@ describe("storage tests", () => {
         receipt: {
           blockNumber: 1,
         },
-        signal: "0x456",
+        msgHash: "0x456",
         status: 0,
         fromChainId: CHAIN_ID_MAINNET,
         toChainId: CHAIN_ID_TAIKO,
@@ -336,7 +340,7 @@ describe("storage tests", () => {
         receipt: {
           blockNumber: 1,
         },
-        signal: "0x456",
+        msgHash: "0x456",
         status: 0,
         symbol: "TKO",
         fromChainId: CHAIN_ID_MAINNET,
diff --git a/packages/bridge-ui/src/storage/service.ts b/packages/bridge-ui/src/storage/service.ts
index d0376066cdc..423f960dfb0 100644
--- a/packages/bridge-ui/src/storage/service.ts
+++ b/packages/bridge-ui/src/storage/service.ts
@@ -42,6 +42,11 @@ class StorageService implements Transactioner {
 
         const srcProvider = this.providerMap.get(tx.fromChainId);
 
+        // Ignore transactions from chains not supported by the bridge
+        if(!srcProvider) {
+          return null;
+        }
+
         const receipt = await srcProvider.getTransactionReceipt(
           tx.ethersTx.hash
         );
@@ -84,10 +89,10 @@ class StorageService implements Transactioner {
           return;
         }
 
-        const signal = event.args.signal;
+        const msgHash = event.args.msgHash;
 
         const messageStatus: number = await destContract.getMessageStatus(
-          signal
+          msgHash
         );
 
         let amountInWei: BigNumber;
@@ -98,16 +103,16 @@ class StorageService implements Transactioner {
             TokenVault,
             srcProvider
           );
+          const filter = tokenVaultContract.filters.ERC20Sent(msgHash)
           const erc20Events = await tokenVaultContract.queryFilter(
-            "ERC20Sent",
+            filter,
             receipt.blockNumber,
             receipt.blockNumber
           );
 
           const erc20Event = erc20Events.find(
-            (e) => e.args.signal.toLowerCase() === signal.toLowerCase()
+            (e) => e.args.msgHash.toLowerCase() === msgHash.toLowerCase()
           );
-
           if (!erc20Event) return;
 
           const erc20Contract = new Contract(
@@ -122,7 +127,7 @@ class StorageService implements Transactioner {
         const bridgeTx: BridgeTransaction = {
           message: event.args.message,
           receipt: receipt,
-          signal: event.args.signal,
+          msgHash: event.args.msgHash,
           ethersTx: tx.ethersTx,
           status: messageStatus,
           amountInWei: amountInWei,
@@ -132,7 +137,7 @@ class StorageService implements Transactioner {
         };
 
         bridgeTxs.push(bridgeTx);
-      })
+      }).filter(tx => tx)
     );
 
     bridgeTxs.sort((tx) => (tx.status === MessageStatus.New ? -1 : 1));
diff --git a/packages/bridge-ui/src/store/userToken.ts b/packages/bridge-ui/src/store/userToken.ts
new file mode 100644
index 00000000000..a0e9f80685e
--- /dev/null
+++ b/packages/bridge-ui/src/store/userToken.ts
@@ -0,0 +1,6 @@
+import type { Token, TokenService } from "src/domain/token";
+import { writable } from "svelte/store";
+
+const tokenService = writable<TokenService>();
+const userTokens = writable<Token[]>([]);
+export { tokenService, userTokens };
diff --git a/packages/bridge-ui/src/utils/checkIfTokenIsDeployedCrossChain.ts b/packages/bridge-ui/src/utils/checkIfTokenIsDeployedCrossChain.ts
new file mode 100644
index 00000000000..34cbb1c5c05
--- /dev/null
+++ b/packages/bridge-ui/src/utils/checkIfTokenIsDeployedCrossChain.ts
@@ -0,0 +1,27 @@
+import { ethers } from "ethers";
+import TokenVault from "../constants/abi/TokenVault";
+import type { Chain } from "../domain/chain";
+import type { Token } from "../domain/token";
+import { ETH } from '../domain/token';
+
+export const checkIfTokenIsDeployedCrossChain = async (
+  token: Token, 
+  provider: ethers.providers.JsonRpcProvider, 
+  destTokenVaultAddress: string, 
+  toChain: Chain, 
+  fromChain: Chain
+): Promise<boolean> => {
+  if (token.symbol !== ETH.symbol) {
+    const destTokenVaultContract = new ethers.Contract(destTokenVaultAddress, TokenVault, provider);
+    const tokenAddressOnDestChain = token.addresses.find(a => a.chainId === toChain.id);
+    if(tokenAddressOnDestChain && tokenAddressOnDestChain.address === "0x00") {
+      // check if token is already deployed as BridgedERC20 on destination chain
+      const tokenAddressOnSourceChain = token.addresses.find(a => a.chainId === fromChain.id);
+      const bridgedTokenAddress = await destTokenVaultContract.canonicalToBridged(fromChain.id, tokenAddressOnSourceChain.address);
+      if(bridgedTokenAddress !== ethers.constants.AddressZero) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
\ No newline at end of file
diff --git a/packages/bridge-ui/src/utils/recommendProcessingFee.spec.ts b/packages/bridge-ui/src/utils/recommendProcessingFee.spec.ts
index 063c98fba15..935cb7deabc 100644
--- a/packages/bridge-ui/src/utils/recommendProcessingFee.spec.ts
+++ b/packages/bridge-ui/src/utils/recommendProcessingFee.spec.ts
@@ -10,7 +10,7 @@ import { chainIdToTokenVaultAddress } from "../store/bridge";
 import { get } from "svelte/store";
 import { CHAIN_MAINNET, CHAIN_TKO } from "../domain/chain";
 import { ProcessingFeeMethod } from "../domain/fee";
-import { ETH, HORSE } from "../domain/token";
+import { ETH, TEST_ERC20 } from "../domain/token";
 import { signer } from "../store/signer";
 import {
   erc20DeployedGasLimit,
@@ -150,7 +150,7 @@ describe("recommendProcessingFee()", () => {
       CHAIN_TKO,
       CHAIN_MAINNET,
       ProcessingFeeMethod.RECOMMENDED,
-      HORSE,
+      TEST_ERC20,
       mockSigner as unknown as Signer
     );
 
@@ -179,7 +179,7 @@ describe("recommendProcessingFee()", () => {
       CHAIN_TKO,
       CHAIN_MAINNET,
       ProcessingFeeMethod.RECOMMENDED,
-      HORSE,
+      TEST_ERC20,
       mockSigner as unknown as Signer
     );