From 909085635492ab31ce2253991ac68246807da8d3 Mon Sep 17 00:00:00 2001
From: Jessica Xiao <15721063+essj@users.noreply.github.com>
Date: Tue, 10 Jun 2025 07:23:32 +1200
Subject: [PATCH 1/5] chore: Merge `develop` into `staging`

---
 .../deposit/sections/content-section.tsx      | 91 +++++++++++--------
 .../withdraw/sections/content-section.tsx     | 88 ++++++++++--------
 apps/flame-defi/app/globals.css               | 11 +--
 packages/ui/src/components/atoms/input.tsx    |  2 +-
 .../molecules/card/card-figure-input.tsx      |  2 +-
 5 files changed, 112 insertions(+), 82 deletions(-)

diff --git a/apps/flame-defi/app/bridge/modules/deposit/sections/content-section.tsx b/apps/flame-defi/app/bridge/modules/deposit/sections/content-section.tsx
index 3119b431..9ce7d563 100644
--- a/apps/flame-defi/app/bridge/modules/deposit/sections/content-section.tsx
+++ b/apps/flame-defi/app/bridge/modules/deposit/sections/content-section.tsx
@@ -7,7 +7,14 @@ import { isAddress } from "viem";
 import { useSwitchChain } from "wagmi";
 
 import { ChainType, EvmCurrency } from "@repo/flame-types";
-import { AnimatedArrowSpacer, Card } from "@repo/ui/components";
+import {
+  AnimatedArrowSpacer,
+  Button,
+  Card,
+  CardContent,
+  Input,
+  Skeleton,
+} from "@repo/ui/components";
 import { ArrowDownIcon, EditIcon, WalletIcon } from "@repo/ui/icons";
 import { shortenAddress } from "@repo/ui/utils";
 import { AmountInput } from "bridge/components/amount-input";
@@ -341,21 +348,24 @@ export const ContentSection = () => {
 
               {/* Source wallet info - unified display regardless of chain type */}
               {sourceConnection.address && (
-                <div className="mt-3 bg-surface-2 rounded-xl py-2 px-3">
-                  <p className="text-typography-light font-semibold">
+                <Card variant="secondary" className="mt-3 p-6">
+                  <p className="text-sm text-typography-light">
                     Address: {shortenAddress(sourceConnection.address)}
                   </p>
                   {sourceConnection.currency &&
                     sourceConnection.isConnected && (
-                      <p className="mt-2 text-typography-subdued font-semibold">
-                        Balance: {isLoadingSourceBalance && "Loading..."}
+                      <div className="flex mt-2 text-sm text-typography-subdued">
+                        Balance:&nbsp;
+                        {isLoadingSourceBalance && (
+                          <Skeleton className="w-32 h-5" />
+                        )}
                         {!isLoadingSourceBalance &&
                           sourceBalance &&
                           `${sourceBalance.value} ${sourceBalance.symbol}`}
                         {!isLoadingSourceBalance &&
                           !sourceBalance &&
                           `0 ${sourceConnection.currency.coinDenom}`}
-                      </p>
+                      </div>
                     )}
                   {sourceConnection.currency &&
                     sourceConnection.currency instanceof EvmCurrency &&
@@ -368,7 +378,7 @@ export const ContentSection = () => {
                         />
                       </div>
                     )}
-                </div>
+                </Card>
               )}
             </div>
           </div>
@@ -420,28 +430,34 @@ export const ContentSection = () => {
               {destinationConnection.address &&
                 !isRecipientAddressEditable &&
                 !recipientAddressOverride && (
-                  <div className="mt-3 rounded-xl p-4 transition border border-solid border-transparent bg-semi-white hover:border-stroke-default">
+                  <Card
+                    variant="secondary"
+                    className="mt-3 p-6 border border-transparent hover:border-stroke-default"
+                  >
                     <p
-                      className="text-typography-light font-semibold cursor-pointer"
+                      className="flex items-center text-sm text-typography-light cursor-pointer"
                       onKeyDown={handleEditRecipientClick}
                       onClick={handleEditRecipientClick}
                     >
                       <span className="mr-2">
                         Address: {shortenAddress(destinationConnection.address)}
                       </span>
-                      <i className="fas fa-pen-to-square" />
+                      <EditIcon className="inline-block ml-1" size={16} />
                     </p>
                     {destinationConnection.currency &&
                       destinationConnection.isConnected && (
-                        <p className="mt-2 text-typography-subdued font-semibold">
-                          Balance: {isLoadingDestinationBalance && "Loading..."}
+                        <div className="flex mt-2 text-sm text-typography-subdued">
+                          Balance:&nbsp;
+                          {isLoadingDestinationBalance && (
+                            <Skeleton className="w-32 h-5" />
+                          )}
                           {!isLoadingDestinationBalance &&
                             destinationBalance &&
                             `${destinationBalance.value} ${destinationBalance.symbol}`}
                           {!isLoadingDestinationBalance &&
                             !destinationBalance &&
                             `0 ${destinationConnection.currency.coinDenom}`}
-                        </p>
+                        </div>
                       )}
                     {destinationCurrencyOption?.value &&
                       destinationCurrencyOption.value instanceof EvmCurrency &&
@@ -455,62 +471,65 @@ export const ContentSection = () => {
                           />
                         </div>
                       )}
-                  </div>
+                  </Card>
                 )}
               {/* Destination address display - when using manual address */}
               {recipientAddressOverride && !isRecipientAddressEditable && (
-                <div className="mt-3 rounded-xl p-4 transition border border-solid border-transparent bg-semi-white hover:border-stroke-default">
+                <Card
+                  variant="secondary"
+                  className="mt-3 p-6 border border-transparent hover:border-stroke-default"
+                >
                   <p
-                    className="text-typography-light font-semibold cursor-pointer"
+                    className="flex items-center text-sm text-typography-light cursor-pointer"
                     onKeyDown={handleEditRecipientClick}
                     onClick={handleEditRecipientClick}
                   >
                     <span className="mr-2">
                       Address: {shortenAddress(recipientAddressOverride)}
                     </span>
-                    <i className="fas fa-pen-to-square" />
+                    <EditIcon className="inline-block ml-1" size={16} />
                   </p>
                   {!isRecipientAddressValid && hasTouchedForm && (
-                    <div className="text-status-danger mt-2">
-                      Recipient address must be a valid EVM address
+                    <div className="text-xs text-danger mt-2">
+                      Recipient address must be a valid EVM address.
                     </div>
                   )}
                   {destinationConnection.currency && (
-                    <p className="mt-2 text-typography-subdued font-semibold text-sm">
-                      Connect via wallet to show balance
+                    <p className="mt-2 text-typography-subdued text-xs">
+                      Connect wallet to show balance.
                     </p>
                   )}
-                </div>
+                </Card>
               )}
               {/* Address input form when editing */}
               {isRecipientAddressEditable && (
-                <div className="mt-3 rounded-xl p-4 transition border border-solid border-stroke-default bg-semi-white">
-                  <div className="text-typography-light font-semibold">
-                    <input
-                      className="w-full p-3 bg-transparent border border-stroke-default focus:border-stroke-active focus:outline-hidden rounded-xl text-typography-default"
+                <Card variant="secondary" className="mt-3">
+                  <CardContent>
+                    <Input
                       type="text"
                       placeholder="0x..."
                       onChange={updateRecipientAddressOverride}
                       value={recipientAddressOverride}
                     />
                     <div className="mt-3 flex space-x-2">
-                      <button
-                        type="button"
-                        className="px-3 py-1 text-typography-default bg-transparent border border-stroke-default rounded-lg hover:bg-surface-3 hover:border-stroke-active transition"
+                      <Button
+                        size="sm"
+                        className="min-w-24"
                         onClick={handleEditRecipientSave}
                       >
                         Save
-                      </button>
-                      <button
-                        type="button"
-                        className="px-3 py-1 text-typography-default bg-transparent border border-stroke-default rounded-lg hover:bg-surface-3 hover:border-stroke-active transition"
+                      </Button>
+                      <Button
+                        size="sm"
+                        variant="secondary"
+                        className="min-w-24"
                         onClick={handleEditRecipientClear}
                       >
                         Clear
-                      </button>
+                      </Button>
                     </div>
-                  </div>
-                </div>
+                  </CardContent>
+                </Card>
               )}
             </div>
           </div>
diff --git a/apps/flame-defi/app/bridge/modules/withdraw/sections/content-section.tsx b/apps/flame-defi/app/bridge/modules/withdraw/sections/content-section.tsx
index c42b6ee3..263c72e1 100644
--- a/apps/flame-defi/app/bridge/modules/withdraw/sections/content-section.tsx
+++ b/apps/flame-defi/app/bridge/modules/withdraw/sections/content-section.tsx
@@ -6,7 +6,14 @@ import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useSwitchChain } from "wagmi";
 
 import { ChainType, EvmCurrency } from "@repo/flame-types";
-import { AnimatedArrowSpacer, Card } from "@repo/ui/components";
+import {
+  AnimatedArrowSpacer,
+  Button,
+  Card,
+  CardContent,
+  Input,
+  Skeleton,
+} from "@repo/ui/components";
 import { ArrowDownIcon, EditIcon, WalletIcon } from "@repo/ui/icons";
 import { shortenAddress } from "@repo/ui/utils";
 import { AmountInput } from "bridge/components/amount-input";
@@ -342,21 +349,24 @@ export const ContentSection = () => {
               </Card>
               {/* Source wallet info */}
               {sourceConnection.address && (
-                <div className="mt-3 bg-surface-2 rounded-xl py-2 px-3">
-                  <p className="text-typography-light font-semibold">
+                <Card variant="secondary" className="mt-3 p-6">
+                  <p className="text-sm text-typography-light">
                     Address: {shortenAddress(sourceConnection.address)}
                   </p>
                   {sourceConnection.currency &&
                     sourceConnection.isConnected && (
-                      <p className="mt-2 text-typography-subdued font-semibold">
-                        Balance: {isLoadingSourceBalance && "Loading..."}
+                      <div className="flex mt-2 text-sm text-typography-subdued">
+                        Balance:&nbsp;
+                        {isLoadingSourceBalance && (
+                          <Skeleton className="w-32 h-5" />
+                        )}
                         {!isLoadingSourceBalance &&
                           sourceBalance &&
                           `${sourceBalance.value} ${sourceBalance.symbol}`}
                         {!isLoadingSourceBalance &&
                           !sourceBalance &&
                           `0 ${sourceConnection.currency.coinDenom}`}
-                      </p>
+                      </div>
                     )}
                   {sourceConnection.currency instanceof EvmCurrency &&
                     !isLoadingSourceBalance &&
@@ -367,7 +377,7 @@ export const ContentSection = () => {
                         />
                       </div>
                     )}
-                </div>
+                </Card>
               )}
             </div>
           </div>
@@ -420,83 +430,89 @@ export const ContentSection = () => {
               {destinationConnection.address &&
                 !isRecipientAddressEditable &&
                 !recipientAddressOverride && (
-                  <div className="mt-3 bg-surface-2 rounded-xl py-2 px-3">
+                  <Card variant="secondary" className="mt-3 p-6">
                     <p
-                      className="text-typography-light font-semibold cursor-pointer"
+                      className="flex items-center text-sm text-typography-light cursor-pointer"
                       onClick={handleEditRecipientClick}
                     >
                       <span className="mr-2">
                         Address: {shortenAddress(destinationConnection.address)}
                       </span>
-                      <i className="fas fa-pen-to-square" />
+                      <EditIcon className="inline-block ml-1" size={16} />
                     </p>
                     {destinationConnection.currency &&
                       destinationConnection.isConnected && (
-                        <p className="mt-2 text-typography-subdued font-semibold">
-                          Balance: {isLoadingDestinationBalance && "Loading..."}
+                        <div className="flex mt-2 text-sm text-typography-subdued">
+                          Balance:&nbsp;
+                          {isLoadingDestinationBalance && (
+                            <Skeleton className="w-32 h-5" />
+                          )}
                           {!isLoadingDestinationBalance &&
                             destinationBalance &&
                             `${destinationBalance.value} ${destinationBalance.symbol}`}
                           {!isLoadingDestinationBalance &&
                             !destinationBalance &&
                             `0 ${destinationConnection.currency.coinDenom}`}
-                        </p>
+                        </div>
                       )}
-                  </div>
+                  </Card>
                 )}
 
               {/* Destination address display - when using manual address */}
               {recipientAddressOverride && !isRecipientAddressEditable && (
-                <div className="mt-3 bg-surface-2 rounded-xl py-2 px-3">
+                <Card
+                  variant="secondary"
+                  className="mt-3 p-6 border border-transparent hover:border-stroke-default"
+                >
                   <p
-                    className="text-typography-light font-semibold cursor-pointer"
+                    className="flex items-center text-sm text-typography-light cursor-pointer"
                     onClick={handleEditRecipientClick}
                   >
                     <span className="mr-2">
                       Address: {shortenAddress(recipientAddressOverride)}
                     </span>
-                    <i className="fas fa-pen-to-square" />
+                    <EditIcon className="inline-block ml-1" size={16} />
                   </p>
                   {!isRecipientAddressValid && hasTouchedForm && (
-                    <div className="mt-2 text-status-danger text-sm">
-                      Recipient address must be a valid address
+                    <div className="mt-2 text-danger text-xs">
+                      Recipient address must be a valid address.
                     </div>
                   )}
-                  <p className="mt-2 text-typography-subdued font-semibold text-xs">
-                    Connect via wallet to show balance
+                  <p className="mt-2 text-typography-subdued text-xs">
+                    Connect wallet to show balance.
                   </p>
-                </div>
+                </Card>
               )}
 
               {/* Address input form when editing */}
               {isRecipientAddressEditable && (
-                <div className="mt-3 bg-surface-2 rounded-xl p-2">
-                  <div className="text-typography-light font-semibold">
-                    <input
-                      className="w-full p-2 bg-transparent border border-stroke-default rounded-sm text-typography-default"
+                <Card variant="secondary" className="mt-3">
+                  <CardContent>
+                    <Input
                       type="text"
                       placeholder="Enter Address"
                       onChange={updateRecipientAddressOverride}
                       value={recipientAddressOverride}
                     />
                     <div className="mt-3 flex space-x-2">
-                      <button
-                        type="button"
-                        className="px-3 py-1 text-typography-default bg-transparent border border-stroke-default rounded-lg hover:bg-surface-3 hover:border-stroke-active transition"
+                      <Button
+                        size="sm"
+                        className="min-w-24"
                         onClick={handleEditRecipientSave}
                       >
                         Save
-                      </button>
-                      <button
-                        type="button"
-                        className="px-3 py-1 text-white bg-transparent border border-grey-medium rounded-lg hover:bg-grey-darker hover:border-white transition"
+                      </Button>
+                      <Button
+                        size="sm"
+                        variant="secondary"
+                        className="min-w-24"
                         onClick={handleEditRecipientClear}
                       >
                         Clear
-                      </button>
+                      </Button>
                     </div>
-                  </div>
-                </div>
+                  </CardContent>
+                </Card>
               )}
             </div>
           </div>
diff --git a/apps/flame-defi/app/globals.css b/apps/flame-defi/app/globals.css
index 14a455af..bc093c32 100644
--- a/apps/flame-defi/app/globals.css
+++ b/apps/flame-defi/app/globals.css
@@ -267,20 +267,15 @@
   @keyframes lightUpOrange {
     0% {
       opacity: 0.2;
-      box-shadow: none;
-      border-color: #f5f5f5;
+      border-color: var(--color-surface-2);
     }
     50% {
       opacity: 1;
-      box-shadow:
-        0 0 10px #df5822,
-        0 0 20px #f09226;
-      border-color: #f09226;
+      border-color: var(--color-orange);
     }
     100% {
       opacity: 0.2;
-      box-shadow: none;
-      border-color: #f5f5f5;
+      border-color: var(--color-surface-2);
     }
   }
 }
diff --git a/packages/ui/src/components/atoms/input.tsx b/packages/ui/src/components/atoms/input.tsx
index 7125b196..a0c6d151 100644
--- a/packages/ui/src/components/atoms/input.tsx
+++ b/packages/ui/src/components/atoms/input.tsx
@@ -7,7 +7,7 @@ export const inputVariants = cva("", {
   variants: {
     variant: {
       default:
-        "border border-stroke-default bg-surface-1 text-typography focus-visible:border-stroke-active focus-visible:bg-transparent",
+        "border border-stroke-default bg-surface-1 text-typography focus-visible:border-stroke-active focus-visible:bg-background-default",
     },
   },
   defaultVariants: {
diff --git a/packages/ui/src/components/molecules/card/card-figure-input.tsx b/packages/ui/src/components/molecules/card/card-figure-input.tsx
index 99a87885..de4e6651 100644
--- a/packages/ui/src/components/molecules/card/card-figure-input.tsx
+++ b/packages/ui/src/components/molecules/card/card-figure-input.tsx
@@ -17,7 +17,7 @@ export const CardFigureInput = ({
       <TokenAmountInput
         placeholder={placeholder}
         className={cn(
-          "bg-transparent border-none outline-hidden rounded-none shadow-none text-5xl/12 h-12 p-0 font-dot text-typography-default placeholder:text-typography-light",
+          "bg-transparent border-none outline-hidden rounded-none shadow-none text-5xl/12 h-12 p-0 font-dot text-typography-default placeholder:text-typography-light focus-visible:bg-transparent",
           className,
         )}
         {...props}

From 42d838292a8e6fca74c604ad9eb84ff187219a29 Mon Sep 17 00:00:00 2001
From: Jesse Snyder <jessetsnyder@gmail.com>
Date: Mon, 28 Jul 2025 12:35:54 -0600
Subject: [PATCH 2/5] disable tia transfers

---
 .../app/components/eol-banner/eol-banner.tsx           |  3 +++
 .../app/config/chain-configs/chain-configs-dawn.ts     |  6 +++---
 .../app/config/chain-configs/chain-configs-dusk.ts     | 10 +++++-----
 .../app/config/chain-configs/chain-configs-mainnet.ts  |  6 +++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apps/flame-defi/app/components/eol-banner/eol-banner.tsx b/apps/flame-defi/app/components/eol-banner/eol-banner.tsx
index a980e215..185d5d40 100644
--- a/apps/flame-defi/app/components/eol-banner/eol-banner.tsx
+++ b/apps/flame-defi/app/components/eol-banner/eol-banner.tsx
@@ -17,6 +17,9 @@ export const EolBanner = () => {
           deposit TIA for gas, withdraw all assets, close LP positions, and swap
           tokens. However, you can no longer create new LP positions or add
           liquidity.
+          <br />
+          <br />
+          <span className="font-bold">Note: Transfers of TIA are currently disabled due to technical issues on the Celestia network.</span>
         </div>
         {feedbackFormURL && (
           <a
diff --git a/apps/flame-defi/app/config/chain-configs/chain-configs-dawn.ts b/apps/flame-defi/app/config/chain-configs/chain-configs-dawn.ts
index 82b92467..f496081c 100644
--- a/apps/flame-defi/app/config/chain-configs/chain-configs-dawn.ts
+++ b/apps/flame-defi/app/config/chain-configs/chain-configs-dawn.ts
@@ -266,7 +266,7 @@ const NeutronChainInfo: CosmosChainInfo = {
 };
 
 export const cosmosChains: CosmosChains = {
-  "Celestia Mocha-4": CelestiaChainInfo,
+  // "Celestia Mocha-4": CelestiaChainInfo,
   "Noble Testnet": NobleChainInfo,
   "Neutron Testnet": NeutronChainInfo,
 };
@@ -326,8 +326,8 @@ const FlameChainInfo: AstriaChain = {
       isNative: true,
       isWrappedNative: false,
       ibcWithdrawalFeeWei: "10000000000000000",
-      isDepositable: true,
-      isWithdrawable: true,
+      isDepositable: false,
+      isWithdrawable: false,
       IconComponent: CelestiaIcon,
     }),
     WRAPPED_NATIVE_TOKEN,
diff --git a/apps/flame-defi/app/config/chain-configs/chain-configs-dusk.ts b/apps/flame-defi/app/config/chain-configs/chain-configs-dusk.ts
index e9f73b5c..89b66d1d 100644
--- a/apps/flame-defi/app/config/chain-configs/chain-configs-dusk.ts
+++ b/apps/flame-defi/app/config/chain-configs/chain-configs-dusk.ts
@@ -61,8 +61,8 @@ const CelestiaChainInfo: CosmosChainInfo = {
       coinDenom: "TIA",
       coinMinimalDenom: "utia",
       coinDecimals: 6,
-      isDepositable: true,
-      isWithdrawable: true,
+      isDepositable: false,
+      isWithdrawable: false,
       isNative: true,
       ibcChannel: "channel-159",
       sequencerBridgeAccount: "astria17hvahh8lcas4fhl5urqjnhfqwhffkddaw034lh",
@@ -192,7 +192,7 @@ const NobleChainInfo: CosmosChainInfo = {
 };
 
 export const cosmosChains: CosmosChains = {
-  "Celestia Mocha-4": CelestiaChainInfo,
+  // "Celestia Mocha-4": CelestiaChainInfo,
   "Noble Testnet": NobleChainInfo,
 };
 
@@ -249,8 +249,8 @@ const FlameChainInfo: AstriaChain = {
       isNative: true,
       isWrappedNative: false,
       ibcWithdrawalFeeWei: "10000000000000000",
-      isDepositable: true,
-      isWithdrawable: true,
+      isDepositable: false,
+      isWithdrawable: false,
       IconComponent: CelestiaIcon,
     }),
     WRAPPED_NATIVE_TOKEN,
diff --git a/apps/flame-defi/app/config/chain-configs/chain-configs-mainnet.ts b/apps/flame-defi/app/config/chain-configs/chain-configs-mainnet.ts
index 10a8b806..60c50649 100644
--- a/apps/flame-defi/app/config/chain-configs/chain-configs-mainnet.ts
+++ b/apps/flame-defi/app/config/chain-configs/chain-configs-mainnet.ts
@@ -323,7 +323,7 @@ const StrideChainInfo: CosmosChainInfo = {
 };
 
 export const cosmosChains: CosmosChains = {
-  Celestia: CelestiaChainInfo,
+  // Celestia: CelestiaChainInfo,
   Neutron: NeutronChainInfo,
   Noble: NobleChainInfo,
   Osmosis: OsmosisChainInfo,
@@ -390,8 +390,8 @@ const AstriaChainInfo: AstriaChain = {
       isNative: true,
       isWrappedNative: false,
       ibcWithdrawalFeeWei: "10000000000000000",
-      isDepositable: true,
-      isWithdrawable: true,
+      isDepositable: false,
+      isWithdrawable: false,
       IconComponent: CelestiaIcon,
     }),
     WRAPPED_NATIVE_TOKEN,

From 9db54c9c6d6089f54f39135fcf2c6a989758b8c8 Mon Sep 17 00:00:00 2001
From: Jesse Snyder <jessetsnyder@gmail.com>
Date: Mon, 28 Jul 2025 12:41:06 -0600
Subject: [PATCH 3/5] formatting

---
 apps/flame-defi/app/components/eol-banner/eol-banner.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/flame-defi/app/components/eol-banner/eol-banner.tsx b/apps/flame-defi/app/components/eol-banner/eol-banner.tsx
index 185d5d40..a9ee532d 100644
--- a/apps/flame-defi/app/components/eol-banner/eol-banner.tsx
+++ b/apps/flame-defi/app/components/eol-banner/eol-banner.tsx
@@ -19,7 +19,10 @@ export const EolBanner = () => {
           liquidity.
           <br />
           <br />
-          <span className="font-bold">Note: Transfers of TIA are currently disabled due to technical issues on the Celestia network.</span>
+          <span className="font-bold">
+            Note: Transfers of TIA are currently disabled due to technical
+            issues on the Celestia network.
+          </span>
         </div>
         {feedbackFormURL && (
           <a

From b7fad869cec4587c2dbc1776e1391530f30ad846 Mon Sep 17 00:00:00 2001
From: Jesse Snyder <jessetsnyder@gmail.com>
Date: Mon, 28 Jul 2025 12:48:22 -0600
Subject: [PATCH 4/5] comment out unused

---
 .../chain-configs/chain-configs-dawn.ts       | 162 +++++++--------
 .../chain-configs/chain-configs-dusk.ts       | 188 +++++++++---------
 .../chain-configs/chain-configs-mainnet.ts    | 114 +++++------
 3 files changed, 232 insertions(+), 232 deletions(-)

diff --git a/apps/flame-defi/app/config/chain-configs/chain-configs-dawn.ts b/apps/flame-defi/app/config/chain-configs/chain-configs-dawn.ts
index f496081c..eb229a99 100644
--- a/apps/flame-defi/app/config/chain-configs/chain-configs-dawn.ts
+++ b/apps/flame-defi/app/config/chain-configs/chain-configs-dawn.ts
@@ -16,87 +16,87 @@ import {
   WrappedTiaIcon,
 } from "@repo/ui/icons/polychrome";
 
-const CelestiaChainInfo: CosmosChainInfo = {
-  chainType: ChainType.COSMOS,
-  // Chain-id of the celestia chain.
-  chainId: "mocha-4",
-  // The name of the chain to be displayed to the user.
-  chainName: "Celestia Mocha-4",
-  // RPC endpoint of the chain
-  rpc: "wss://rpc-mocha.pops.one",
-  // REST endpoint of the chain.
-  rest: "https://api-mocha.pops.one",
-  // Staking coin information
-  stakeCurrency: {
-    // Coin denomination to be displayed to the user.
-    coinDenom: "TIA",
-    // Actual denom (i.e. uatom, uscrt) used by the blockchain.
-    coinMinimalDenom: "utia",
-    // # of decimal points to convert minimal denomination to user-facing denomination.
-    coinDecimals: 6,
-    // (Optional) Keplr can show the fiat value of the coin if a coingecko id is provided.
-    // You can get id from https://api.coingecko.com/api/v3/coins/list if it is listed.
-    // coinGeckoId: ""
-  },
-  // (Optional) If you have a wallet webpage used to stake the coin then provide the url to the website in `walletUrlForStaking`.
-  // The 'stake' button in Keplr extension will link to the webpage.
-  // walletUrlForStaking: "",
-  // The BIP44 path.
-  bip44: {
-    // You can only set the coin type of BIP44.
-    // 'Purpose' is fixed to 44.
-    coinType: 118,
-  },
-  // The address prefix of the chain.
-  bech32Config: {
-    bech32PrefixAccAddr: "celestia",
-    bech32PrefixAccPub: "celestiapub",
-    bech32PrefixConsAddr: "celestiavalcons",
-    bech32PrefixConsPub: "celestiavalconspub",
-    bech32PrefixValAddr: "celestiavaloper",
-    bech32PrefixValPub: "celestiavaloperpub",
-  },
-  // List of all coin/tokens used in this chain.
-  currencies: [
-    new IbcCurrency({
-      chainId: "mocha-4",
-      coinDenom: "TIA",
-      coinMinimalDenom: "utia",
-      coinDecimals: 6,
-      isDepositable: true,
-      isWithdrawable: true,
-      isNative: true,
-      ibcChannel: "channel-160",
-      sequencerBridgeAccount: "astria1lepnry7tlpzvrukp5xej4v5wp532k2f94vxqnr",
-      title: "TIA",
-      IconComponent: CelestiaIcon,
-    }),
-  ],
-  // List of coin/tokens used as a fee token in this chain.
-  feeCurrencies: [
-    {
-      // Coin denomination to be displayed to the user.
-      coinDenom: "TIA",
-      // Actual denom (i.e. nria, uscrt) used by the blockchain.
-      coinMinimalDenom: "utia",
-      // # of decimal points to convert minimal denomination to user-facing denomination.
-      coinDecimals: 6,
-      // (Optional) Keplr can show the fiat value of the coin if a coingecko id is provided.
-      // You can get id from https://api.coingecko.com/api/v3/coins/list if it is listed.
-      // coinGeckoId: ""
-      // (Optional) This is used to set the fee of the transaction.
-      // If this field is not provided and suggesting chain is not natively integrated, Keplr extension will set the Keplr default gas price (low: 0.01, average: 0.025, high: 0.04).
-      // Currently, Keplr doesn't support dynamic calculation of the gas prices based on on-chain data.
-      // Make sure that the gas prices are higher than the minimum gas prices accepted by chain validators and RPC/REST endpoint.
-      gasPriceStep: {
-        low: 0.01,
-        average: 0.02,
-        high: 0.1,
-      },
-    },
-  ],
-  IconComponent: CelestiaIcon,
-};
+// const CelestiaChainInfo: CosmosChainInfo = {
+//   chainType: ChainType.COSMOS,
+//   // Chain-id of the celestia chain.
+//   chainId: "mocha-4",
+//   // The name of the chain to be displayed to the user.
+//   chainName: "Celestia Mocha-4",
+//   // RPC endpoint of the chain
+//   rpc: "wss://rpc-mocha.pops.one",
+//   // REST endpoint of the chain.
+//   rest: "https://api-mocha.pops.one",
+//   // Staking coin information
+//   stakeCurrency: {
+//     // Coin denomination to be displayed to the user.
+//     coinDenom: "TIA",
+//     // Actual denom (i.e. uatom, uscrt) used by the blockchain.
+//     coinMinimalDenom: "utia",
+//     // # of decimal points to convert minimal denomination to user-facing denomination.
+//     coinDecimals: 6,
+//     // (Optional) Keplr can show the fiat value of the coin if a coingecko id is provided.
+//     // You can get id from https://api.coingecko.com/api/v3/coins/list if it is listed.
+//     // coinGeckoId: ""
+//   },
+//   // (Optional) If you have a wallet webpage used to stake the coin then provide the url to the website in `walletUrlForStaking`.
+//   // The 'stake' button in Keplr extension will link to the webpage.
+//   // walletUrlForStaking: "",
+//   // The BIP44 path.
+//   bip44: {
+//     // You can only set the coin type of BIP44.
+//     // 'Purpose' is fixed to 44.
+//     coinType: 118,
+//   },
+//   // The address prefix of the chain.
+//   bech32Config: {
+//     bech32PrefixAccAddr: "celestia",
+//     bech32PrefixAccPub: "celestiapub",
+//     bech32PrefixConsAddr: "celestiavalcons",
+//     bech32PrefixConsPub: "celestiavalconspub",
+//     bech32PrefixValAddr: "celestiavaloper",
+//     bech32PrefixValPub: "celestiavaloperpub",
+//   },
+//   // List of all coin/tokens used in this chain.
+//   currencies: [
+//     new IbcCurrency({
+//       chainId: "mocha-4",
+//       coinDenom: "TIA",
+//       coinMinimalDenom: "utia",
+//       coinDecimals: 6,
+//       isDepositable: true,
+//       isWithdrawable: true,
+//       isNative: true,
+//       ibcChannel: "channel-160",
+//       sequencerBridgeAccount: "astria1lepnry7tlpzvrukp5xej4v5wp532k2f94vxqnr",
+//       title: "TIA",
+//       IconComponent: CelestiaIcon,
+//     }),
+//   ],
+//   // List of coin/tokens used as a fee token in this chain.
+//   feeCurrencies: [
+//     {
+//       // Coin denomination to be displayed to the user.
+//       coinDenom: "TIA",
+//       // Actual denom (i.e. nria, uscrt) used by the blockchain.
+//       coinMinimalDenom: "utia",
+//       // # of decimal points to convert minimal denomination to user-facing denomination.
+//       coinDecimals: 6,
+//       // (Optional) Keplr can show the fiat value of the coin if a coingecko id is provided.
+//       // You can get id from https://api.coingecko.com/api/v3/coins/list if it is listed.
+//       // coinGeckoId: ""
+//       // (Optional) This is used to set the fee of the transaction.
+//       // If this field is not provided and suggesting chain is not natively integrated, Keplr extension will set the Keplr default gas price (low: 0.01, average: 0.025, high: 0.04).
+//       // Currently, Keplr doesn't support dynamic calculation of the gas prices based on on-chain data.
+//       // Make sure that the gas prices are higher than the minimum gas prices accepted by chain validators and RPC/REST endpoint.
+//       gasPriceStep: {
+//         low: 0.01,
+//         average: 0.02,
+//         high: 0.1,
+//       },
+//     },
+//   ],
+//   IconComponent: CelestiaIcon,
+// };
 
 const NobleChainInfo: CosmosChainInfo = {
   chainType: ChainType.COSMOS,
diff --git a/apps/flame-defi/app/config/chain-configs/chain-configs-dusk.ts b/apps/flame-defi/app/config/chain-configs/chain-configs-dusk.ts
index 89b66d1d..032b3bb9 100644
--- a/apps/flame-defi/app/config/chain-configs/chain-configs-dusk.ts
+++ b/apps/flame-defi/app/config/chain-configs/chain-configs-dusk.ts
@@ -14,100 +14,100 @@ import {
   WrappedTiaIcon,
 } from "@repo/ui/icons/polychrome";
 
-const CelestiaChainInfo: CosmosChainInfo = {
-  chainType: ChainType.COSMOS,
-  // Chain-id of the celestia chain.
-  chainId: "mocha-4",
-  // The name of the chain to be displayed to the user.
-  chainName: "Celestia Mocha-4",
-  // RPC endpoint of the chain
-  rpc: "wss://rpc-mocha.pops.one",
-  // REST endpoint of the chain.
-  rest: "https://api-mocha.pops.one",
-  // Staking coin information
-  stakeCurrency: {
-    // Coin denomination to be displayed to the user.
-    coinDenom: "TIA",
-    // Actual denom (i.e. uatom, uscrt) used by the blockchain.
-    coinMinimalDenom: "utia",
-    // # of decimal points to convert minimal denomination to user-facing denomination.
-    coinDecimals: 6,
-    // (Optional) Keplr can show the fiat value of the coin if a coingecko id is provided.
-    // You can get id from https://api.coingecko.com/api/v3/coins/list if it is listed.
-    // coinGeckoId: ""
-  },
-  // (Optional) If you have a wallet webpage used to stake the coin then provide the url to the website in `walletUrlForStaking`.
-  // The 'stake' button in Keplr extension will link to the webpage.
-  // walletUrlForStaking: "",
-  // The BIP44 path.
-  bip44: {
-    // You can only set the coin type of BIP44.
-    // 'Purpose' is fixed to 44.
-    coinType: 118,
-  },
-  // The address prefix of the chain.
-  bech32Config: {
-    bech32PrefixAccAddr: "celestia",
-    bech32PrefixAccPub: "celestiapub",
-    bech32PrefixConsAddr: "celestiavalcons",
-    bech32PrefixConsPub: "celestiavalconspub",
-    bech32PrefixValAddr: "celestiavaloper",
-    bech32PrefixValPub: "celestiavaloperpub",
-  },
-  // List of all coin/tokens used in this chain.
-  currencies: [
-    new IbcCurrency({
-      chainId: "mocha-4",
-      coinDenom: "TIA",
-      coinMinimalDenom: "utia",
-      coinDecimals: 6,
-      isDepositable: false,
-      isWithdrawable: false,
-      isNative: true,
-      ibcChannel: "channel-159",
-      sequencerBridgeAccount: "astria17hvahh8lcas4fhl5urqjnhfqwhffkddaw034lh",
-      title: "TIA",
-      IconComponent: CelestiaIcon,
-    }),
-    new IbcCurrency({
-      chainId: "mocha-4",
-      coinDenom: "fakeTIA",
-      coinMinimalDenom: "ufaketia",
-      coinDecimals: 6,
-      isDepositable: false,
-      isWithdrawable: true,
-      isNative: false,
-      ibcChannel: "channel-420",
-      sequencerBridgeAccount: "astria17hvahh8lcas4fhl5urqjnhfqwhffkddaw034lh",
-      title: "fakeTIA",
-      IconComponent: CelestiaIcon,
-    }),
-  ],
-  // List of coin/tokens used as a fee token in this chain.
-  feeCurrencies: [
-    {
-      // Coin denomination to be displayed to the user.
-      coinDenom: "TIA",
-      // Actual denom (i.e. nria, uscrt) used by the blockchain.
-      coinMinimalDenom: "utia",
-      // # of decimal points to convert minimal denomination to user-facing denomination.
-      coinDecimals: 6,
-      // (Optional) Keplr can show the fiat value of the coin if a coingecko id is provided.
-      // You can get id from https://api.coingecko.com/api/v3/coins/list if it is listed.
-      // coinGeckoId: ""
-      // (Optional) This is used to set the fee of the transaction.
-      // If this field is not provided and suggesting chain is not natively integrated, Keplr extension will set the Keplr default gas price (low: 0.01, average: 0.025, high: 0.04).
-      // Currently, Keplr doesn't support dynamic calculation of the gas prices based on on-chain data.
-      // Make sure that the gas prices are higher than the minimum gas prices accepted by chain validators and RPC/REST endpoint.
-      gasPriceStep: {
-        low: 0.01,
-        average: 0.02,
-        high: 0.1,
-      },
-    },
-  ],
-  IconComponent: CelestiaIcon,
-};
+// const CelestiaChainInfo: CosmosChainInfo = {
+//   chainType: ChainType.COSMOS,
+//   // Chain-id of the celestia chain.
+//   chainId: "mocha-4",
+//   // The name of the chain to be displayed to the user.
+//   chainName: "Celestia Mocha-4",
+//   // RPC endpoint of the chain
+//   rpc: "wss://rpc-mocha.pops.one",
+//   // REST endpoint of the chain.
+//   rest: "https://api-mocha.pops.one",
+//   // Staking coin information
+//   stakeCurrency: {
+//     // Coin denomination to be displayed to the user.
+//     coinDenom: "TIA",
+//     // Actual denom (i.e. uatom, uscrt) used by the blockchain.
+//     coinMinimalDenom: "utia",
+//     // # of decimal points to convert minimal denomination to user-facing denomination.
+//     coinDecimals: 6,
+//     // (Optional) Keplr can show the fiat value of the coin if a coingecko id is provided.
+//     // You can get id from https://api.coingecko.com/api/v3/coins/list if it is listed.
+//     // coinGeckoId: ""
+//   },
+//   // (Optional) If you have a wallet webpage used to stake the coin then provide the url to the website in `walletUrlForStaking`.
+//   // The 'stake' button in Keplr extension will link to the webpage.
+//   // walletUrlForStaking: "",
+//   // The BIP44 path.
+//   bip44: {
+//     // You can only set the coin type of BIP44.
+//     // 'Purpose' is fixed to 44.
+//     coinType: 118,
+//   },
+//   // The address prefix of the chain.
+//   bech32Config: {
+//     bech32PrefixAccAddr: "celestia",
+//     bech32PrefixAccPub: "celestiapub",
+//     bech32PrefixConsAddr: "celestiavalcons",
+//     bech32PrefixConsPub: "celestiavalconspub",
+//     bech32PrefixValAddr: "celestiavaloper",
+//     bech32PrefixValPub: "celestiavaloperpub",
+//   },
+//   // List of all coin/tokens used in this chain.
+//   currencies: [
+//     new IbcCurrency({
+//       chainId: "mocha-4",
+//       coinDenom: "TIA",
+//       coinMinimalDenom: "utia",
+//       coinDecimals: 6,
+//       isDepositable: false,
+//       isWithdrawable: false,
+//       isNative: true,
+//       ibcChannel: "channel-159",
+//       sequencerBridgeAccount: "astria17hvahh8lcas4fhl5urqjnhfqwhffkddaw034lh",
+//       title: "TIA",
+//       IconComponent: CelestiaIcon,
+//     }),
+//     new IbcCurrency({
+//       chainId: "mocha-4",
+//       coinDenom: "fakeTIA",
+//       coinMinimalDenom: "ufaketia",
+//       coinDecimals: 6,
+//       isDepositable: false,
+//       isWithdrawable: true,
+//       isNative: false,
+//       ibcChannel: "channel-420",
+//       sequencerBridgeAccount: "astria17hvahh8lcas4fhl5urqjnhfqwhffkddaw034lh",
+//       title: "fakeTIA",
+//       IconComponent: CelestiaIcon,
+//     }),
+//   ],
+//   // List of coin/tokens used as a fee token in this chain.
+//   feeCurrencies: [
+//     {
+//       // Coin denomination to be displayed to the user.
+//       coinDenom: "TIA",
+//       // Actual denom (i.e. nria, uscrt) used by the blockchain.
+//       coinMinimalDenom: "utia",
+//       // # of decimal points to convert minimal denomination to user-facing denomination.
+//       coinDecimals: 6,
+//       // (Optional) Keplr can show the fiat value of the coin if a coingecko id is provided.
+//       // You can get id from https://api.coingecko.com/api/v3/coins/list if it is listed.
+//       // coinGeckoId: ""
+//       // (Optional) This is used to set the fee of the transaction.
+//       // If this field is not provided and suggesting chain is not natively integrated, Keplr extension will set the Keplr default gas price (low: 0.01, average: 0.025, high: 0.04).
+//       // Currently, Keplr doesn't support dynamic calculation of the gas prices based on on-chain data.
+//       // Make sure that the gas prices are higher than the minimum gas prices accepted by chain validators and RPC/REST endpoint.
+//       gasPriceStep: {
+//         low: 0.01,
+//         average: 0.02,
+//         high: 0.1,
+//       },
+//     },
+//   ],
+//   IconComponent: CelestiaIcon,
+// };
 
 const NobleChainInfo: CosmosChainInfo = {
   chainType: ChainType.COSMOS,
diff --git a/apps/flame-defi/app/config/chain-configs/chain-configs-mainnet.ts b/apps/flame-defi/app/config/chain-configs/chain-configs-mainnet.ts
index 60c50649..71b07211 100644
--- a/apps/flame-defi/app/config/chain-configs/chain-configs-mainnet.ts
+++ b/apps/flame-defi/app/config/chain-configs/chain-configs-mainnet.ts
@@ -21,63 +21,63 @@ import {
   WrappedTiaIcon,
 } from "@repo/ui/icons/polychrome";
 
-const CelestiaChainInfo: CosmosChainInfo = {
-  chainType: ChainType.COSMOS,
-  chainId: "celestia",
-  chainName: "Celestia",
-  rpc: "https://celestia-rpc.polkachu.com:443",
-  rest: "https://celestia-api.polkachu.com",
-  stakeCurrency: {
-    coinDenom: "TIA",
-    coinMinimalDenom: "utia",
-    coinDecimals: 6,
-    coinGeckoId: "celestia",
-  },
-  // The BIP44 path.
-  bip44: {
-    // You can only set the coin type of BIP44.
-    // 'Purpose' is fixed to 44.
-    coinType: 118,
-  },
-  bech32Config: {
-    bech32PrefixAccAddr: "celestia",
-    bech32PrefixAccPub: "celestiapub",
-    bech32PrefixConsAddr: "celestiavalcons",
-    bech32PrefixConsPub: "celestiavalconspub",
-    bech32PrefixValAddr: "celestiavaloper",
-    bech32PrefixValPub: "celestiavaloperpub",
-  },
-  currencies: [
-    new IbcCurrency({
-      chainId: "celestia",
-      coinDecimals: 6,
-      coinDenom: "TIA",
-      coinGeckoId: "celestia",
-      coinMinimalDenom: "utia",
-      ibcChannel: "channel-48",
-      IconComponent: CelestiaIcon,
-      isDepositable: true,
-      isWithdrawable: true,
-      isNative: true,
-      sequencerBridgeAccount: "astria13vptdafyttpmlwppt0s844efey2cpc0mevy92p",
-      title: "TIA",
-    }),
-  ],
-  feeCurrencies: [
-    {
-      coinDenom: "TIA",
-      coinMinimalDenom: "utia",
-      coinDecimals: 6,
-      coinGeckoId: "celestia",
-      gasPriceStep: {
-        low: 0.01,
-        average: 0.02,
-        high: 0.1,
-      },
-    },
-  ],
-  IconComponent: CelestiaIcon,
-};
+// const CelestiaChainInfo: CosmosChainInfo = {
+//   chainType: ChainType.COSMOS,
+//   chainId: "celestia",
+//   chainName: "Celestia",
+//   rpc: "https://celestia-rpc.polkachu.com:443",
+//   rest: "https://celestia-api.polkachu.com",
+//   stakeCurrency: {
+//     coinDenom: "TIA",
+//     coinMinimalDenom: "utia",
+//     coinDecimals: 6,
+//     coinGeckoId: "celestia",
+//   },
+//   // The BIP44 path.
+//   bip44: {
+//     // You can only set the coin type of BIP44.
+//     // 'Purpose' is fixed to 44.
+//     coinType: 118,
+//   },
+//   bech32Config: {
+//     bech32PrefixAccAddr: "celestia",
+//     bech32PrefixAccPub: "celestiapub",
+//     bech32PrefixConsAddr: "celestiavalcons",
+//     bech32PrefixConsPub: "celestiavalconspub",
+//     bech32PrefixValAddr: "celestiavaloper",
+//     bech32PrefixValPub: "celestiavaloperpub",
+//   },
+//   currencies: [
+//     new IbcCurrency({
+//       chainId: "celestia",
+//       coinDecimals: 6,
+//       coinDenom: "TIA",
+//       coinGeckoId: "celestia",
+//       coinMinimalDenom: "utia",
+//       ibcChannel: "channel-48",
+//       IconComponent: CelestiaIcon,
+//       isDepositable: true,
+//       isWithdrawable: true,
+//       isNative: true,
+//       sequencerBridgeAccount: "astria13vptdafyttpmlwppt0s844efey2cpc0mevy92p",
+//       title: "TIA",
+//     }),
+//   ],
+//   feeCurrencies: [
+//     {
+//       coinDenom: "TIA",
+//       coinMinimalDenom: "utia",
+//       coinDecimals: 6,
+//       coinGeckoId: "celestia",
+//       gasPriceStep: {
+//         low: 0.01,
+//         average: 0.02,
+//         high: 0.1,
+//       },
+//     },
+//   ],
+//   IconComponent: CelestiaIcon,
+// };
 
 const NeutronChainInfo: CosmosChainInfo = {
   chainType: ChainType.COSMOS,

From ee7d18e2299119bfa33ecb5869dd9a91317d78f2 Mon Sep 17 00:00:00 2001
From: Jesse Snyder <jessetsnyder@gmail.com>
Date: Mon, 28 Jul 2025 13:50:40 -0600
Subject: [PATCH 5/5] for e2e tests

---
 apps/flame-defi/app/config/contexts/config-context.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/flame-defi/app/config/contexts/config-context.test.tsx b/apps/flame-defi/app/config/contexts/config-context.test.tsx
index 8ea37f7d..76620db2 100644
--- a/apps/flame-defi/app/config/contexts/config-context.test.tsx
+++ b/apps/flame-defi/app/config/contexts/config-context.test.tsx
@@ -15,7 +15,7 @@ describe("ConfigContextProvider", () => {
 
     const configString = screen.getByText(
       // this string in the mainnet configs, which are used by default
-      /astria13vptdafyttpmlwppt0s844efey2cpc0mevy92p/,
+      /astria15juwcclg07xs38757q257evltequawcejzzs4l/,
     );
     expect(configString).toBeInTheDocument();
     expect(configString).toHaveTextContent("Celestia");