Merge pull request #371 from reservoirprotocol/fix/destination-addres…

…s-dead-address Fix/destination address dead address
reservoirprotocol · Nov 12, 2024 · 0786fe8 · 0786fe8
2 parents 421d583 + dce3b7b
commit 0786fe8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/.changeset/fast-coats-peel.md b/.changeset/fast-coats-peel.md
@@ -0,0 +1,5 @@
+---
+'@reservoir0x/relay-kit-ui': patch
+---
+
+Ensure dead address is properly generated
diff --git 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
@@ -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
@@ -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(