From af8601b118d69f7791244ccf1435057db0eda16d Mon Sep 17 00:00:00 2001
From: jesse snyder <jessetsnyder@gmail.com>
Date: Wed, 23 Oct 2024 12:41:25 -0600
Subject: [PATCH 1/2] Release 10/23/24-3 (#27)

* use fakeTIA

* rename contract address properties to be more clear (#23)

* add noble to dawn configs (#25)

* use correct flame rpc url
---
 web/src/config/chainConfigs/ChainConfigsDawn.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/config/chainConfigs/ChainConfigsDawn.ts b/web/src/config/chainConfigs/ChainConfigsDawn.ts
index 4412384..ef10c27 100644
--- a/web/src/config/chainConfigs/ChainConfigsDawn.ts
+++ b/web/src/config/chainConfigs/ChainConfigsDawn.ts
@@ -172,7 +172,7 @@ export const ibcChains: IbcChains = {
 const FlameChainInfo: EvmChainInfo = {
   chainId: 16604737732183,
   chainName: "Flame Dawn-1",
-  rpcUrls: ["https://rpc.evm.dawn-1.devnet.astria.org"],
+  rpcUrls: ["https://rpc.flame.dawn-1.astria.org"],
   currencies: [
     {
       coinDenom: "TIA",

From 0b3d32c9e61e92791459bc9db4033591978b9999 Mon Sep 17 00:00:00 2001
From: jesse snyder <jessetsnyder@gmail.com>
Date: Wed, 23 Oct 2024 15:30:08 -0600
Subject: [PATCH 2/2] Feature/ensure correct receiver token (#30) (#31)

* receiver currency selection is now controlled by sender currency selection

* receiver token defined by sender token selection

* disable submission if coins dont match
---
 web/src/components/DepositCard/DepositCard.tsx   | 6 ++++--
 web/src/components/WithdrawCard/WithdrawCard.tsx | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/web/src/components/DepositCard/DepositCard.tsx b/web/src/components/DepositCard/DepositCard.tsx
index 353525c..d7dcfd5 100644
--- a/web/src/components/DepositCard/DepositCard.tsx
+++ b/web/src/components/DepositCard/DepositCard.tsx
@@ -351,7 +351,7 @@ export default function DepositCard(): React.ReactElement {
               {/* NOTE - the placeholder happens to only be shown when there isn't a matching */}
               {/* evm currency. It's also always disabled because it's controlled by sender currency selection. */}
               <Dropdown
-                placeholder="No matching EVM token"
+                placeholder="No matching token"
                 options={evmCurrencyOptions}
                 defaultOption={defaultEvmCurrencyOption}
                 onSelect={selectEvmCurrency}
@@ -405,7 +405,9 @@ export default function DepositCard(): React.ReactElement {
             !isAmountValid ||
             !isRecipientAddressValid ||
             !fromAddress ||
-            !recipientAddress
+            !recipientAddress ||
+            selectedIbcCurrency?.coinDenom !==
+              selectedEvmCurrencyOption?.value?.coinDenom
           }
         >
           {isLoading ? "Processing..." : "Deposit"}
diff --git a/web/src/components/WithdrawCard/WithdrawCard.tsx b/web/src/components/WithdrawCard/WithdrawCard.tsx
index f322208..62c8518 100644
--- a/web/src/components/WithdrawCard/WithdrawCard.tsx
+++ b/web/src/components/WithdrawCard/WithdrawCard.tsx
@@ -374,7 +374,7 @@ export default function WithdrawCard(): React.ReactElement {
             {selectedIbcChain && ibcCurrencyOptions && (
               <div className="ml-3">
                 <Dropdown
-                  placeholder="No matching IBC token"
+                  placeholder="No matching token"
                   options={ibcCurrencyOptions}
                   defaultOption={defaultIbcCurrencyOption}
                   onSelect={selectIbcCurrency}
@@ -440,7 +440,9 @@ export default function WithdrawCard(): React.ReactElement {
             !isRecipientAddressValid ||
             isLoading ||
             !fromAddress ||
-            !recipientAddress
+            !recipientAddress ||
+            selectedEvmCurrency?.coinDenom !==
+              selectedIbcCurrencyOption?.value?.coinDenom
           }
         >
           {isLoading ? "Processing..." : "Withdraw"}