Skip to content

Fix/destination address dead address #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedromcunha merged 2 commits into from
Nov 12, 2024
Merged

Fix/destination address dead address #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3815d5e
Ensure chain id is passed in when getting default dead address
pedromcunha Nov 12, 2024
dce3b7b
feat: changeset
pedromcunha Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fast-coats-peel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@reservoir0x/relay-kit-ui': patch
---

Ensure dead address is properly generated
8 changes: 4 additions & 4 deletions packages/ui/src/components/common/CustomAddressModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 : '')
}
Expand All @@ -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)
Expand Down Expand Up @@ -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,
Expand Down
12 changes: 10 additions & 2 deletions packages/ui/src/components/widgets/SwapWidgetRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/hooks/useCurrencyBalance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down