From ab3db3520bb0605788dc82ed53ecb91b713ca9b9 Mon Sep 17 00:00:00 2001
From: Jeffery Walsh <cyberhorsey@gmail.com>
Date: Thu, 8 Dec 2022 11:39:40 -0800
Subject: [PATCH 1/2] toggle chain fix

---
 .../src/components/form/SelectChain.svelte    | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/bridge-ui/src/components/form/SelectChain.svelte b/packages/bridge-ui/src/components/form/SelectChain.svelte
index c003fbe66d..aaedec2282 100644
--- a/packages/bridge-ui/src/components/form/SelectChain.svelte
+++ b/packages/bridge-ui/src/components/form/SelectChain.svelte
@@ -2,15 +2,25 @@
   import ArrowRight from "../icons/ArrowRight.svelte";
   import { fromChain, toChain } from "../../store/chain";
   import { CHAIN_MAINNET, CHAIN_TKO } from "../../domain/chain";
+  import { ethereum } from "../../store/ethereum";
+  import { signer } from "../../store/signer";
+  import { switchEthereumChain } from "../../utils/switchEthereumChain";
+  import { ethers } from "ethers";
 
-  function toggleChains() {
-    fromChain.update((val) =>
-      val === CHAIN_MAINNET ? CHAIN_TKO : CHAIN_MAINNET
-    );
-    toChain.update((val) =>
-      val === CHAIN_MAINNET ? CHAIN_TKO : CHAIN_MAINNET
-    );
-  }
+  const toggleChains = async () => {
+    const chain = $fromChain === CHAIN_MAINNET ? CHAIN_TKO : CHAIN_MAINNET;
+    await switchEthereumChain($ethereum, chain);
+    const provider = new ethers.providers.Web3Provider(window.ethereum);
+    await provider.send("eth_requestAccounts", []);
+
+    fromChain.set(chain);
+    if (chain === CHAIN_MAINNET) {
+      toChain.set(CHAIN_TKO);
+    } else {
+      toChain.set(CHAIN_MAINNET);
+    }
+    signer.set(provider.getSigner());
+  };
 </script>
 
 <div class="flex items-center justify-between w-full p-8 py-6 text-lg">

From 15dae69ee572fc6ce72b8b671bc8737bbadde860 Mon Sep 17 00:00:00 2001
From: Jeffery Walsh <cyberhorsey@gmail.com>
Date: Thu, 8 Dec 2022 11:39:54 -0800
Subject: [PATCH 2/2] chain dropdown

---
 .../bridge-ui/src/components/ChainDropdown.svelte    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/bridge-ui/src/components/ChainDropdown.svelte b/packages/bridge-ui/src/components/ChainDropdown.svelte
index 7bf0edf1a4..73667a67a6 100644
--- a/packages/bridge-ui/src/components/ChainDropdown.svelte
+++ b/packages/bridge-ui/src/components/ChainDropdown.svelte
@@ -2,7 +2,7 @@
   import { _ } from "svelte-i18n";
 
   import ChevDown from "./icons/ChevDown.svelte";
-  import { fromChain } from "../store/chain";
+  import { fromChain, toChain } from "../store/chain";
   import MetaMask from "./icons/MetaMask.svelte";
   import { switchEthereumChain } from "../utils/switchEthereumChain";
   import { ethereum } from "../store/ethereum";
@@ -15,6 +15,12 @@
     const provider = new ethers.providers.Web3Provider(window.ethereum);
     await provider.send("eth_requestAccounts", []);
 
+    fromChain.set(chain);
+    if (chain === CHAIN_MAINNET) {
+      toChain.set(CHAIN_TKO);
+    } else {
+      toChain.set(CHAIN_MAINNET);
+    }
     signer.set(provider.getSigner());
   };
 </script>
@@ -45,7 +51,7 @@
       >
         <svelte:component this={CHAIN_MAINNET.icon} height={24} />
         <span class="pl-1.5 text-left flex-1">{CHAIN_MAINNET.name}</span>
-          <MetaMask />
+        <MetaMask />
       </button>
     </li>
     <li>
@@ -57,7 +63,7 @@
       >
         <svelte:component this={CHAIN_TKO.icon} height={24} />
         <span class="pl-1.5 text-left flex-1">{CHAIN_TKO.name}</span>
-          <MetaMask />
+        <MetaMask />
       </button>
     </li>
   </ul>