From 3815d5e7d17c8e29bac38b400fd6ced32671f0dd Mon Sep 17 00:00:00 2001
From: pedromcunha <pedro.spinsomewebs@gmail.com>
Date: Tue, 12 Nov 2024 15:08:04 -0500
Subject: [PATCH 1/2] Ensure chain id is passed in when getting default dead
 address

---
 .../ui/src/components/common/CustomAddressModal.tsx  |  8 ++++----
 .../ui/src/components/widgets/SwapWidgetRenderer.tsx | 12 ++++++++++--
 packages/ui/src/hooks/useCurrencyBalance.ts          |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/ui/src/components/common/CustomAddressModal.tsx b/packages/ui/src/components/common/CustomAddressModal.tsx
index e054409c..b2f64ff9 100644
--- a/packages/ui/src/components/common/CustomAddressModal.tsx
+++ b/packages/ui/src/components/common/CustomAddressModal.tsx
@@ -77,7 +77,7 @@ export const CustomAddressModal: FC<Props> = ({
       setAddress('')
       setInput('')
     } else {
-      if (isValidAddress(toChain?.vmType, toAddress ?? '')) {
+      if (isValidAddress(toChain?.vmType, toAddress ?? '', toChain?.id)) {
         setAddress(toAddress ? toAddress : '')
         setInput(toAddress ? toAddress : '')
       }
@@ -90,7 +90,7 @@ export const CustomAddressModal: FC<Props> = ({
   )
 
   useEffect(() => {
-    if (isValidAddress(toChain?.vmType, input)) {
+    if (isValidAddress(toChain?.vmType, input, toChain?.id)) {
       setAddress(input)
     } else if (resolvedENS?.address) {
       setAddress(resolvedENS.address)
@@ -247,10 +247,10 @@ export const CustomAddressModal: FC<Props> = ({
           ) : null}
         </Flex>
         <Button
-          disabled={!isValidAddress(toChain?.vmType, address)}
+          disabled={!isValidAddress(toChain?.vmType, address, toChain?.id)}
           css={{ justifyContent: 'center' }}
           onClick={() => {
-            if (isValidAddress(toChain?.vmType, address)) {
+            if (isValidAddress(toChain?.vmType, address, toChain?.id)) {
               onConfirmed(address)
               onAnalyticEvent?.(EventNames.ADDRESS_MODAL_CONFIRMED, {
                 address: address,
diff --git a/packages/ui/src/components/widgets/SwapWidgetRenderer.tsx b/packages/ui/src/components/widgets/SwapWidgetRenderer.tsx
index f2d28d13..cefed28b 100644
--- a/packages/ui/src/components/widgets/SwapWidgetRenderer.tsx
+++ b/packages/ui/src/components/widgets/SwapWidgetRenderer.tsx
@@ -340,8 +340,16 @@ const SwapWidgetRenderer: FC<SwapWidgetRendererProps> = ({
     connectorKeyOverrides
   )
 
-  const isValidToAddress = isValidAddress(toChain?.vmType, recipient ?? '')
-  const toAddressWithFallback = addressWithFallback(toChain?.vmType, recipient)
+  const isValidToAddress = isValidAddress(
+    toChain?.vmType,
+    recipient ?? '',
+    toChain?.id
+  )
+  const toAddressWithFallback = addressWithFallback(
+    toChain?.vmType,
+    recipient,
+    toChain?.id
+  )
 
   const externalLiquiditySupport = usePrice(
     relayClient ? relayClient : undefined,
diff --git a/packages/ui/src/hooks/useCurrencyBalance.ts b/packages/ui/src/hooks/useCurrencyBalance.ts
index 197aa0e6..345ad4fc 100644
--- a/packages/ui/src/hooks/useCurrencyBalance.ts
+++ b/packages/ui/src/hooks/useCurrencyBalance.ts
@@ -87,7 +87,7 @@ const useCurrencyBalance = ({
     }
   })
 
-  const _isValidAddress = isValidAddress(chain?.vmType, address)
+  const _isValidAddress = isValidAddress(chain?.vmType, address, chain?.id)
 
   const duneBalances = useDuneBalances(address, {
     enabled: Boolean(

From dce3b7b9d7c3d435d1ce62fdcd7fe91d5056046b Mon Sep 17 00:00:00 2001
From: pedromcunha <pedro.spinsomewebs@gmail.com>
Date: Tue, 12 Nov 2024 15:08:32 -0500
Subject: [PATCH 2/2] feat: changeset

---
 .changeset/fast-coats-peel.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/fast-coats-peel.md

diff --git a/.changeset/fast-coats-peel.md b/.changeset/fast-coats-peel.md
new file mode 100644
index 00000000..10fdf089
--- /dev/null
+++ b/.changeset/fast-coats-peel.md
@@ -0,0 +1,5 @@
+---
+'@reservoir0x/relay-kit-ui': patch
+---
+
+Ensure dead address is properly generated