Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion desktop/src/features/onboarding/ui/MembershipDenied.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@ export function MembershipDenied({
onRetry,
pubkey,
}: MembershipDeniedProps) {
const npub = React.useMemo(() => pubkeyToNpub(pubkey), [pubkey]);
const npub = React.useMemo(() => {
if (!pubkey) {
return "Unknown public key";
}

try {
return pubkeyToNpub(pubkey);
} catch {
return pubkey;
}
}, [pubkey]);
const [copied, setCopied] = React.useState(false);

const handleCopy = React.useCallback(async () => {
Expand Down
31 changes: 26 additions & 5 deletions desktop/src/features/onboarding/ui/OnboardingFlow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,25 @@ import type {
* Returns `true` if denied, `false` if the user is a member (or if the
* relay doesn't enforce membership / isn't reachable).
*/
function isRelayMembershipDeniedError(error: unknown): boolean {
if (!(error instanceof Error)) {
return false;
}

return (
error.message.includes("You must be a relay member") ||
error.message.includes("relay_membership_required") ||
error.message.includes("restricted: not a relay member") ||
error.message.includes("invalid: you are not a relay member")
);
}

async function checkMembershipDenied(): Promise<boolean> {
try {
const { membership, snapshotFound } = await getMyRelayMembershipLookup();
return snapshotFound && membership === null;
} catch (error) {
if (
error instanceof Error &&
error.message.includes("relay returned 403")
) {
if (isRelayMembershipDeniedError(error)) {
return true;
}
// Network errors, 401s, 500s — not membership denials.
Expand Down Expand Up @@ -271,7 +281,18 @@ export function OnboardingFlow({
if (Object.keys(updatePayload).length > 0) {
try {
await profileUpdateMutation.mutateAsync(updatePayload);
} catch {
} catch (error) {
if (isRelayMembershipDeniedError(error)) {
try {
const identity = await getIdentity();
setDeniedPubkey(identity.pubkey);
} catch {
setDeniedPubkey("");
}
setCurrentPage("membership-denied");
return;
}

// Error falls through to the error banner / recovery buttons.
return;
}
Expand Down
Loading