Skip to content
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

Dev --> Main #409

Merged
merged 4 commits into from
Nov 22, 2023
Merged

Dev --> Main #409

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21ad753
Set `invalid` state when name lookups fail
rygine Nov 21, 2023
4296b46
Add try/catch blocks to some calls
rygine Nov 21, 2023
7e2103b
Look for UNS name before ENS
rygine Nov 21, 2023
781a489
Merge pull request #408 from xmtp-labs/rygine/fix-invalid-name-lookups
rygine Nov 21, 2023
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
71 changes: 47 additions & 24 deletions src/hooks/useAddressInput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
throttledFetchEnsAvatar,
throttledFetchEnsName,
throttledFetchUnsAddress,
throttledFetchUnsName,
} from "../helpers";
import { useXmtpStore } from "../store/xmtp";

Expand Down Expand Up @@ -39,33 +40,51 @@ export const useAddressInput = () => {
const fetchAddressIdentity = async () => {
// must have a valid recipient address
if (recipientAddress) {
// no name
if (!recipientName) {
setRecipientState("loading");
// check for name
const name = await throttledFetchEnsName({
address: recipientAddress,
});
setRecipientName(name);
try {
// no name
if (!recipientName) {
setRecipientState("loading");
// check for UNS name
const unsName = await throttledFetchUnsName(recipientAddress);
if (unsName) {
setRecipientName(unsName);
} else {
// check for ENS name
const ensName = await throttledFetchEnsName({
address: recipientAddress,
});
setRecipientName(ensName);
}
}
} catch (e) {
console.error(e);
}
// no avatar
if (!recipientAvatar && recipientName) {
setRecipientState("loading");
// check for avatar
const avatar = await throttledFetchEnsAvatar({
name: recipientName,
});
setRecipientAvatar(avatar);
try {
// no avatar
if (!recipientAvatar && recipientName) {
setRecipientState("loading");
// check for avatar
const avatar = await throttledFetchEnsAvatar({
name: recipientName,
});
setRecipientAvatar(avatar);
}
} catch (e) {
console.error(e);
}
// make sure we can message the recipient
if (!recipientOnNetwork) {
setRecipientState("loading");
const validRecipient = await canMessage(recipientAddress);
if (validRecipient) {
setRecipientOnNetwork(true);
} else {
setRecipientOnNetwork(false);
try {
// make sure we can message the recipient
if (!recipientOnNetwork) {
setRecipientState("loading");
const validRecipient = await canMessage(recipientAddress);
if (validRecipient) {
setRecipientOnNetwork(true);
} else {
setRecipientOnNetwork(false);
}
}
} catch (e) {
console.error(e);
}
setRecipientState("valid");
}
Expand All @@ -92,6 +111,8 @@ export const useAddressInput = () => {
if (address) {
setRecipientAddress(address);
setRecipientName(recipientInput);
} else {
setRecipientState("invalid");
}
} else if (isEnsName(recipientInput)) {
setRecipientState("loading");
Expand All @@ -102,6 +123,8 @@ export const useAddressInput = () => {
if (address) {
setRecipientAddress(address);
setRecipientName(recipientInput);
} else {
setRecipientState("invalid");
}
}
} catch {
Expand Down
Loading