diff --git a/src/base/registrations/New.svelte b/src/base/registrations/New.svelte index 76587ef22..99900cefb 100644 --- a/src/base/registrations/New.svelte +++ b/src/base/registrations/New.svelte @@ -20,11 +20,11 @@ } export let config: Config; - export let subdomain: string; + export let name: string; export let owner: string | null; // We only support lower-case names. - subdomain = subdomain.toLowerCase(); + name = name.toLowerCase(); let fee: string; let state = State.CheckingAvailability; @@ -32,7 +32,7 @@ $: registrationOwner = owner || ($session && $session.address); function begin() { - navigate(`/registrations/${subdomain}/submit?${ + navigate(`/registrations/${name}/submit?${ registrationOwner ? new URLSearchParams({ owner: registrationOwner }) : '' }`); } @@ -41,7 +41,7 @@ try { const [_fee, isAvailable] = await Promise.all([ registrationFee(config), - registrar(config).available(subdomain), + registrar(config).available(name), ]); fee = formatBalance(_fee); @@ -59,7 +59,7 @@ - Radicle: Register {subdomain} + Radicle: Register {name} @@ -69,17 +69,17 @@ - {subdomain}.{config.registrar.domain} + {name}.{config.registrar.domain} {#if state === State.NameAvailable} {#if registrationOwner} - The name {subdomain} is available for registration + The name {name} is available for registration under account {formatAddress(registrationOwner)} for {fee} RAD. {:else} - The name {subdomain} is available + The name {name} is available for {fee} RAD. {/if} {:else if state === State.NameUnavailable} diff --git a/src/base/registrations/Routes.svelte b/src/base/registrations/Routes.svelte index bb8a2cc39..240655be5 100644 --- a/src/base/registrations/Routes.svelte +++ b/src/base/registrations/Routes.svelte @@ -18,12 +18,12 @@ - + {#if session} - + {:else} - - + + diff --git a/src/base/registrations/Submit.svelte b/src/base/registrations/Submit.svelte index 4eff08b72..2d061a91d 100644 --- a/src/base/registrations/Submit.svelte +++ b/src/base/registrations/Submit.svelte @@ -13,18 +13,18 @@ import { registerName, State, state } from './registrar'; export let config: Config; - export let subdomain: string; + export let name: string; export let owner: string | null; export let session: Session; let error: Error | null = null; let registrationOwner = owner || session.address; - const view = () => navigate(`/registrations/${subdomain}`, { state: { retry: true } }); + const view = () => navigate(`/registrations/${name}`, { state: { retry: true } }); onMount(async () => { try { - await registerName(subdomain, registrationOwner, config); + await registerName(name, registrationOwner, config); } catch (e: any) { console.error("Error", e); @@ -43,7 +43,7 @@ - {subdomain} + {name} {#if error} @@ -60,7 +60,7 @@ {:else}
🌐
{/if} - {subdomain}.{config.registrar.domain} + {name}.{config.registrar.domain}
@@ -69,7 +69,7 @@ {:else if $state.connection === State.SigningPermit} Approving registration fee. Please confirm in your wallet. {:else if $state.connection === State.SigningCommit} - Committing to {subdomain}. Please confirm transaction in your wallet. + Committing to {name}. Please confirm transaction in your wallet. {:else if $state.connection === State.Committing} Waiting for commit transaction to be processed… {:else if $state.connection === State.WaitingToRegister && $state.commitmentBlock} diff --git a/src/base/registrations/Update.svelte b/src/base/registrations/Update.svelte index 2037e842c..edf8df114 100644 --- a/src/base/registrations/Update.svelte +++ b/src/base/registrations/Update.svelte @@ -8,7 +8,7 @@ import Modal from '@app/Modal.svelte'; import { Status, State } from "@app/utils"; - export let subdomain: string; + export let domain: string; export let config: Config; export let records: EnsRecord[]; export let registration: Registration; @@ -20,7 +20,7 @@ onMount(async () => { try { state.status = Status.Signing; - const tx = await setRecords(subdomain, records, registration.resolver, config); + const tx = await setRecords(domain, records, registration.resolver, config); state.status = Status.Pending; await tx.wait(); state.status = Status.Success; diff --git a/src/base/registrations/View.svelte b/src/base/registrations/View.svelte index 00a28e9da..c5c94e4da 100644 --- a/src/base/registrations/View.svelte +++ b/src/base/registrations/View.svelte @@ -31,10 +31,10 @@ | { status: Status.Found; registration: Registration; owner: string } | { status: Status.Failed; error: string }; - export let subdomain: string; + export let domain: string; export let config: Config; - subdomain = subdomain.toLowerCase(); + domain = domain.toLowerCase(); let state: State = { status: Status.Loading }; let editable = false; @@ -47,9 +47,9 @@ if (r) { let reverseRecord = false; if (r.profile.address) { - reverseRecord = await isReverseRecordSet(r.profile.address, subdomain, config); + reverseRecord = await isReverseRecordSet(r.profile.address, domain, config); } - const owner = await getOwner(subdomain, config); + const owner = await getOwner(domain, config); resolver = r.resolver; fields = [ @@ -59,7 +59,7 @@ { name: "address", validate: "address", placeholder: "Ethereum address, eg. 0x4a9cf21...bc91", description: "The address this name resolves to. " + ( reverseRecord - ? `The reverse record for this address is set to **${subdomain}**` + ? `The reverse record for this address is set to **${domain}**` : "The reverse record for this address is **not set**. " + "For this name to be correctly associated with the address, " + "a reverse record should be set." @@ -100,7 +100,7 @@ } onMount(() => { - getRegistration(subdomain, config, resolver) + getRegistration(domain, config, resolver) .then(parseRecords).catch(err => { state = { status: Status.Failed, error: err }; }); @@ -117,7 +117,7 @@ }; $: if (window.history.state?.retry && state.status === Status.NotFound && retries > 0) { - getRegistration(subdomain, config, resolver).then(parseRecords).catch(err => { + getRegistration(domain, config, resolver).then(parseRecords).catch(err => { state = { status: Status.Failed, error: err }; }); } @@ -150,7 +150,7 @@ - {subdomain} + {domain} {#if state.status === Status.Loading} @@ -163,21 +163,21 @@
🍄
- {subdomain} + {domain}
-

The name {subdomain} is not registered.

+

The name {domain} is not registered.

- Register → + Register →
{:else if state.status === Status.Found}
-

{subdomain}

+

{domain}