diff --git a/packages/bridge-ui/src/components/buttons/SelectToken.svelte b/packages/bridge-ui/src/components/buttons/SelectToken.svelte
index 07233a77f3c..566c5f02783 100644
--- a/packages/bridge-ui/src/components/buttons/SelectToken.svelte
+++ b/packages/bridge-ui/src/components/buttons/SelectToken.svelte
@@ -56,7 +56,7 @@
 
       const userAddress = await $signer.getAddress();
 
-      // Checks if the contract is a valid ERC20 contract,
+      // This calls makes surethe contract is a valid ERC20 contract,
       // otherwise it throws and gets caught
       await contract.balanceOf(userAddress);
 
diff --git a/packages/bridge-ui/src/components/form/BridgeForm.svelte b/packages/bridge-ui/src/components/form/BridgeForm.svelte
index e1eae0afc0b..4486b1d2ea1 100644
--- a/packages/bridge-ui/src/components/form/BridgeForm.svelte
+++ b/packages/bridge-ui/src/components/form/BridgeForm.svelte
@@ -1,53 +1,53 @@
 <script lang="ts">
-  import { _ } from "svelte-i18n";
-  import { LottiePlayer } from "@lottiefiles/svelte-lottie-player";
+  import { _ } from 'svelte-i18n';
+  import { LottiePlayer } from '@lottiefiles/svelte-lottie-player';
 
-  import { token } from "../../store/token";
-  import { processingFee } from "../../store/fee";
-  import { fromChain, toChain } from "../../store/chain";
+  import { token } from '../../store/token';
+  import { processingFee } from '../../store/fee';
+  import { fromChain, toChain } from '../../store/chain';
   import {
     activeBridge,
     chainIdToTokenVaultAddress,
     bridgeType,
-  } from "../../store/bridge";
-  import { signer } from "../../store/signer";
-  import { BigNumber, Contract, ethers, Signer } from "ethers";
-  import ProcessingFee from "./ProcessingFee.svelte";
-  import { ETH } from "../../domain/token";
-  import SelectToken from "../buttons/SelectToken.svelte";
-
-  import type { Token } from "../../domain/token";
-  import type { BridgeOpts, BridgeType } from "../../domain/bridge";
-  import { chains } from "../../domain/chain";
-
-  import type { Chain } from "../../domain/chain";
-  import { truncateString } from "../../utils/truncateString";
+  } from '../../store/bridge';
+  import { signer } from '../../store/signer';
+  import { BigNumber, Contract, ethers, Signer } from 'ethers';
+  import ProcessingFee from './ProcessingFee.svelte';
+  import { ETH } from '../../domain/token';
+  import SelectToken from '../buttons/SelectToken.svelte';
+
+  import type { Token } from '../../domain/token';
+  import type { BridgeOpts, BridgeType } from '../../domain/bridge';
+  import { chains } from '../../domain/chain';
+
+  import type { Chain } from '../../domain/chain';
+  import { truncateString } from '../../utils/truncateString';
   import {
     pendingTransactions,
     transactions as transactionsStore,
     transactioner,
-  } from "../../store/transactions";
-  import { ProcessingFeeMethod } from "../../domain/fee";
-  import Memo from "./Memo.svelte";
-  import { errorToast, successToast } from "../../utils/toast";
-  import ERC20 from "../../constants/abi/ERC20";
-  import TokenVault from "../../constants/abi/TokenVault";
-  import type { BridgeTransaction } from "../../domain/transactions";
-  import { MessageStatus } from "../../domain/message";
-  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";
+  } from '../../store/transactions';
+  import { ProcessingFeeMethod } from '../../domain/fee';
+  import Memo from './Memo.svelte';
+  import { errorToast, successToast } from '../../utils/toast';
+  import ERC20 from '../../constants/abi/ERC20';
+  import TokenVault from '../../constants/abi/TokenVault';
+  import type { BridgeTransaction } from '../../domain/transactions';
+  import { MessageStatus } from '../../domain/message';
+  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;
   let requiresAllowance: boolean = false;
   let btnDisabled: boolean = true;
   let tokenBalance: string;
-  let customFee: string = "0";
-  let recommendedFee: string = "0";
-  let memo: string = "";
+  let customFee: string = '0';
+  let recommendedFee: string = '0';
+  let memo: string = '';
   let loading: boolean = false;
   let isFaucetModalOpen: boolean = false;
   let memoError: string;
@@ -56,22 +56,22 @@
 
   async function addrForToken() {
     let addr = $token.addresses.find(
-      (t) => t.chainId === $fromChain.id
+      (t) => t.chainId === $fromChain.id,
     ).address;
-    if ($token.symbol !== ETH.symbol && (!addr || addr === "0x00")) {
+    if ($token.symbol !== ETH.symbol && (!addr || addr === '0x00')) {
       const srcChainAddr = $token.addresses.find(
-        (t) => t.chainId === $toChain.id
+        (t) => t.chainId === $toChain.id,
       ).address;
 
       const tokenVault = new Contract(
         $chainIdToTokenVaultAddress.get($fromChain.id),
         TokenVault,
-        $signer
+        $signer,
       );
 
       const bridged = await tokenVault.canonicalToBridged(
         $toChain.id,
-        srcChainAddr
+        srcChainAddr,
       );
 
       addr = bridged;
@@ -81,16 +81,16 @@
   async function getUserBalance(
     signer: ethers.Signer,
     token: Token,
-    fromChain: Chain
+    fromChain: Chain,
   ) {
     if (signer && token) {
       if (token.symbol == ETH.symbol) {
-        const userBalance = await signer.getBalance("latest");
+        const userBalance = await signer.getBalance('latest');
         tokenBalance = ethers.utils.formatEther(userBalance);
       } else {
         const addr = await addrForToken();
         if (addr == ethers.constants.AddressZero) {
-          tokenBalance = "0";
+          tokenBalance = '0';
           return;
         }
         const contract = new Contract(addr, ERC20, signer);
@@ -100,7 +100,14 @@
     }
   }
 
-  $: isBtnDisabled($signer, amount, $token, tokenBalance, requiresAllowance, memoError)
+  $: isBtnDisabled(
+    $signer,
+    amount,
+    $token,
+    tokenBalance,
+    requiresAllowance,
+    memoError,
+  )
     .then((d) => (btnDisabled = d))
     .catch((e) => console.log(e));
 
@@ -113,7 +120,7 @@
     token: Token,
     bridgeType: BridgeType,
     fromChain: Chain,
-    signer: Signer
+    signer: Signer,
   ) {
     if (!fromChain || !amt || !token || !bridgeType || !signer) return false;
 
@@ -144,11 +151,11 @@
     if (isNaN(parseFloat(amount))) return true;
     if (
       BigNumber.from(ethers.utils.parseUnits(tokenBalance, token.decimals)).lt(
-        ethers.utils.parseUnits(amount, token.decimals)
+        ethers.utils.parseUnits(amount, token.decimals),
       )
     )
       return true;
-    if(memoError) {
+    if (memoError) {
       return true;
     }
 
@@ -159,7 +166,7 @@
     try {
       loading = true;
       if (!requiresAllowance)
-        throw Error("does not require additional allowance");
+        throw Error('does not require additional allowance');
 
       const tx = await $activeBridge.Approve({
         amountInWei: ethers.utils.parseUnits(amount, $token.decimals),
@@ -173,20 +180,20 @@
         return store;
       });
 
-      successToast($_("toast.transactionSent"));
+      successToast($_('toast.transactionSent'));
       await $signer.provider.waitForTransaction(tx.hash, 1);
 
       requiresAllowance = false;
     } catch (e) {
       console.log(e);
-      errorToast($_("toast.errorSendingTransaction"));
+      errorToast($_('toast.errorSendingTransaction'));
     } finally {
       loading = false;
     }
   }
 
   async function checkUserHasEnoughBalance(
-    bridgeOpts: BridgeOpts
+    bridgeOpts: BridgeOpts,
   ): Promise<boolean> {
     try {
       const gasEstimate = await $activeBridge.EstimateGas({
@@ -195,13 +202,13 @@
       });
       const feeData = await fetchFeeData();
       const requiredGas = gasEstimate.mul(feeData.gasPrice);
-      const userBalance = await $signer.getBalance("latest");
+      const userBalance = await $signer.getBalance('latest');
 
       let balanceAvailableForTx = userBalance;
 
       if ($token.symbol === ETH.symbol) {
         balanceAvailableForTx = userBalance.sub(
-          ethers.utils.parseEther(amount)
+          ethers.utils.parseEther(amount),
         );
       }
 
@@ -214,13 +221,22 @@
   async function bridge() {
     try {
       loading = true;
-      if (requiresAllowance) throw Error("requires additional allowance");
+      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 destTokenVaultAddress = $chainIdToTokenVaultAddress.get(
+        $toChain.id,
+      );
+      let isBridgedTokenAlreadyDeployed =
+        await checkIfTokenIsDeployedCrossChain(
+          $token,
+          provider,
+          destTokenVaultAddress,
+          $toChain,
+          $fromChain,
+        );
 
       const bridgeOpts = {
         amountInWei: amountInWei,
@@ -231,15 +247,15 @@
         tokenVaultAddress: $chainIdToTokenVaultAddress.get($fromChain.id),
         processingFeeInWei: getProcessingFee(),
         memo: memo,
-        isBridgedTokenAlreadyDeployed
+        isBridgedTokenAlreadyDeployed,
       };
 
       const doesUserHaveEnoughBalance = await checkUserHasEnoughBalance(
-        bridgeOpts
+        bridgeOpts,
       );
 
       if (!doesUserHaveEnoughBalance) {
-        errorToast("Insufficient ETH balance");
+        errorToast('Insufficient ETH balance');
         return;
       }
 
@@ -252,7 +268,7 @@
         await $signer.getAddress()
       ).toLowerCase()}`;
       let transactions: BridgeTransaction[] = JSON.parse(
-        await window.localStorage.getItem(storageKey)
+        await window.localStorage.getItem(storageKey),
       );
 
       const bridgeTransaction: BridgeTransaction = {
@@ -272,7 +288,7 @@
 
       await window.localStorage.setItem(
         storageKey,
-        JSON.stringify(transactions)
+        JSON.stringify(transactions),
       );
 
       pendingTransactions.update((store) => {
@@ -282,16 +298,14 @@
 
       const allTransactions = $transactionsStore;
 
-      transactionsStore.set(
-        [bridgeTransaction, ...allTransactions]
-      );
+      transactionsStore.set([bridgeTransaction, ...allTransactions]);
 
-      successToast($_("toast.transactionSent"));
+      successToast($_('toast.transactionSent'));
       await $signer.provider.waitForTransaction(tx.hash, 1);
-      memo = "";
+      memo = '';
     } catch (e) {
       console.log(e);
-      errorToast($_("toast.errorSendingTransaction"));
+      errorToast($_('toast.errorSendingTransaction'));
     } finally {
       loading = false;
     }
@@ -312,7 +326,7 @@
           memo: memo,
         });
         const requiredGas = gasEstimate.mul(feeData.gasPrice);
-        const userBalance = await $signer.getBalance("latest");
+        const userBalance = await $signer.getBalance('latest');
         const processingFee = getProcessingFee();
         let balanceAvailableForTx = userBalance.sub(requiredGas);
         if (processingFee) {
@@ -356,28 +370,29 @@
 
 <div class="form-control my-4 md:my-8">
   <label class="label" for="amount">
-    <span class="label-text">{$_("bridgeForm.fieldLabel")}</span>
+    <span class="label-text">{$_('bridgeForm.fieldLabel')}</span>
 
     {#if $signer && tokenBalance}
       <div class="label-text ">
         <span>
-          {$_("bridgeForm.balance")}:
+          {$_('bridgeForm.balance')}:
           {tokenBalance.length > 10
             ? `${truncateString(tokenBalance, 6)}...`
             : tokenBalance}
           {$token.symbol}
         </span>
 
-        <button class="btn btn-xs rounded-md hover:border-accent text-xs ml-1 h-[20px]" on:click={useFullAmount}>
-          {$_("bridgeForm.maxLabel")}
+        <button
+          class="btn btn-xs rounded-md hover:border-accent text-xs ml-1 h-[20px]"
+          on:click={useFullAmount}>
+          {$_('bridgeForm.maxLabel')}
         </button>
       </div>
     {/if}
   </label>
 
   <label
-    class="input-group relative rounded-lg bg-dark-2 justify-between items-center pr-4"
-  >
+    class="input-group relative rounded-lg bg-dark-2 justify-between items-center pr-4">
     <input
       type="number"
       placeholder="0.01"
@@ -385,13 +400,12 @@
       on:input={updateAmount}
       class="input input-primary bg-dark-2 input-md md:input-lg w-full focus:ring-0 border-dark-2"
       name="amount"
-      bind:this={amountInput}
-    />
+      bind:this={amountInput} />
     <SelectToken />
   </label>
 </div>
 
-{#if $token.symbol === "HORSE" && $signer && tokenBalance && ethers.utils
+{#if $signer && tokenBalance && ethers.utils
     .parseUnits(tokenBalance, $token.decimals)
     .eq(BigNumber.from(0))}
   <div class="flex" style="flex-direction:row-reverse">
@@ -404,8 +418,7 @@
 
   <FaucetModal
     onMint={async () => await getUserBalance($signer, $token, $fromChain)}
-    bind:isOpen={isFaucetModalOpen}
-  />
+    bind:isOpen={isFaucetModalOpen} />
 {/if}
 
 <ProcessingFee bind:customFee bind:recommendedFee />
@@ -423,31 +436,28 @@
       background="transparent"
       height={26}
       width={26}
-      controlsLayout={[]}
-    />
+      controlsLayout={[]} />
   </button>
 {:else if !requiresAllowance}
   <button
     class="btn btn-accent w-full mt-4"
     on:click={bridge}
-    disabled={btnDisabled}
-  >
-    {$_("home.bridge")}
+    disabled={btnDisabled}>
+    {$_('home.bridge')}
   </button>
 {:else}
   <button
     class="btn btn-accent w-full mt-4"
     on:click={approve}
-    disabled={btnDisabled}
-  >
-    {$_("home.approve")}
+    disabled={btnDisabled}>
+    {$_('home.approve')}
   </button>
 {/if}
 
 <style>
   /* hide number input arrows */
-  input[type="number"]::-webkit-outer-spin-button,
-  input[type="number"]::-webkit-inner-spin-button {
+  input[type='number']::-webkit-outer-spin-button,
+  input[type='number']::-webkit-inner-spin-button {
     -webkit-appearance: none;
     margin: 0;
     -moz-appearance: textfield !important;
diff --git a/packages/bridge-ui/src/components/modals/FaucetModal.svelte b/packages/bridge-ui/src/components/modals/FaucetModal.svelte
index c48afb00a25..f8c8572bf03 100644
--- a/packages/bridge-ui/src/components/modals/FaucetModal.svelte
+++ b/packages/bridge-ui/src/components/modals/FaucetModal.svelte
@@ -19,7 +19,7 @@
 
   async function shouldEnableButton() {
     if (!$signer || !$token) {
-      // Whether signer or token is missing, the button
+      // If signer or token is missing, the button
       // should remained disabled
       disabled = true;
       return;