Radish alpha
r
Radicle web interface
Radicle
Git (anonymous pull)
Log in to clone via SSH
Copy and UX fixes
Alexis Sellier committed 4 years ago
commit 28bfe1f81bce168df0dd2e57aad6f7aa2ca6709f
parent 44fe3624c3163b790a2be01ab653097c04db1739
7 files changed +32 -21
modified src/Error.svelte
@@ -32,8 +32,10 @@
  </span>

  <span slot="actions">
-
    <button on:click={() => dispatch('close')}>
-
      {action}
-
    </button>
+
    <slot name="actions">
+
      <button on:click={() => dispatch('close')}>
+
        {action}
+
      </button>
+
    </slot>
  </span>
</Modal>
modified src/Header.svelte
@@ -118,9 +118,8 @@
  <div class="left">
    <a use:link href="/"><Logo /></a>
    <div class="nav">
-
      <a use:link href="/registrations">Register</a>
-
      <a use:link href="/vesting/">Vesting</a>
      <a use:link href="/orgs/">Orgs</a>
+
      <a use:link href="/registrations">Register</a>
    </div>
  </div>

modified src/base/orgs/Create.svelte
@@ -28,15 +28,15 @@
  const orgTypes = [
    { label: "Single-signature",
      description: [
-
        `Creates an org with the specified address as the only owner.`,
-
        `Org transactions such as anchoring can be signed and executed directly from your wallet.`
+
        `Creates an org with the specified address as the sole owner.`,
+
        `Org transactions such as anchoring are signed and executed directly from the owner's wallet.`
      ],
      value: Governance.BDFL
    },
    { label: "Multi-signature",
      description: [
-
        "Creates an org with a multi-signature contract as its owner, and the specified address as its only member.",
-
        "A [Gnosis Safe](https://gnosis-safe.io) contract will be deployed for your org.",
+
        "Creates an org with a multi-signature contract as its owner, and the specified address as the first member.",
+
        "A [Gnosis Safe](https://gnosis-safe.io) will be deployed for your org.",
        "Transactions such as anchoring have to be approved by a quorum of signers."
      ],
      value: Governance.Quorum
@@ -150,7 +150,7 @@
      {#if state === State.Idle}
        <div class="highlight">Select a governance model</div>
      {:else if state === State.Signing}
-
        <div class="highlight">Confirm transaction in your wallet</div>
+
        <div class="highlight">Please confirm the transaction in your wallet.</div>
      {:else if state === State.Pending}
        <div class="highlight">Waiting for transaction to be processed...</div>
      {/if}
@@ -165,7 +165,7 @@
                     on:changed={onGovernanceChanged} />
          </div>

-
          <label class="input" for="address">Org owner or member Ethereum address</label>
+
          <label class="input" for="address">Ethereum address</label>
          <input name="address" class="small" type="text" maxlength="42" bind:value={owner} />
        </div>
      {:else}
modified src/base/orgs/TransferOwnership.svelte
@@ -86,7 +86,7 @@
      {#if state == State.Signing}
        Please confirm the transaction in your wallet.
      {:else if state == State.Pending}
-
        Transaction is being processed by the network...
+
        Waiting for transaction to be processed...
      {:else if state == State.Idle}
        Transfer the ownership of Org <strong>{formatAddress(org.address)}</strong> to a new address.
      {:else if state == State.Failed}
modified src/base/registrations/Submit.svelte
@@ -61,17 +61,17 @@
      {#if $state.connection === State.Connecting}
        Connecting...
      {:else if $state.connection === State.Committing}
-
        Committing...
+
        Committing... Please confirm in your wallet.
      {:else if $state.connection === State.WaitingToRegister && $state.commitmentBlock}
-
        Waiting for commitment time...
+
        Waiting for commitment time... This may take a moment.
      {:else if $state.connection === State.Registering}
-
        Registering name...
+
        Registering name... Please confirm the transaction in your wallet.
      {/if}
    </span>

    <span slot="body" class="loader">
      {#if $state.connection === State.Registered}
-
        The name has been successfully registered to
+
        This name has been successfully registered to
        <span class="highlight">{registrationOwner}</span>
      {:else if $state.connection === State.WaitingToRegister && $state.commitmentBlock}
        <BlockTimer {config} startBlock={$state.commitmentBlock} duration={$state.minAge} />
modified src/base/registrations/Update.svelte
@@ -61,7 +61,7 @@
    {#if state.status === Status.Signing}
      <p>Please confirm the transaction in your wallet</p>
    {:else if state.status === Status.Pending}
-
      <p>Transaction is being processed by the network...</p>
+
      <p>Waiting for transaction to be processed...</p>
    {:else if state.status === Status.Success}
      <p>Your registration was successfully updated.</p>
    {:else if state.status === Status.Failed}
modified src/ens/SetName.svelte
@@ -1,5 +1,6 @@
<script lang="ts">
  import { createEventDispatcher } from 'svelte';
+
  import { navigate } from 'svelte-routing';
  import Modal from '@app/Modal.svelte';
  import type { Config } from '@app/config';
  import { formatAddress, isAddressEqual } from '@app/utils';
@@ -102,11 +103,20 @@
    </div>
  </Modal>
{:else if state === State.Mismatch}
-
  <Error floating title="🖊️" action="Okay" on:close>
+
  <Error floating title="🖊️" on:close>
    The name <strong>{name}.{config.registrar.domain}</strong> does not
-
    resolve to <strong>{formatAddress(org.address)}</strong>. Please update
-
    The ENS record for {name}.{config.registrar.domain} to
+
    resolve to <strong>{org.address}</strong>. Please update
+
    the ENS record for {name}.{config.registrar.domain} to
    point to the correct address and try again.
+

+
    <div slot="actions">
+
      <button on:click={() => navigate(`/registrations/${name}`)}>
+
        Go to registration &rarr;
+
      </button>
+
      <button on:click={() => dispatch('close')} class="text">
+
        Close
+
      </button>
+
    </div>
  </Error>
{:else if state === State.Failed && error}
  <Error floating title="Transaction failed" message={error} on:close />
@@ -120,7 +130,7 @@
      {#if state == State.Signing}
        Please confirm the transaction in your wallet.
      {:else if state == State.Pending}
-
        Transaction is being processed by the network...
+
        Waiting for transaction to be processed...
      {:else if state == State.Proposing}
        Proposal is being submitted to the safe
        <strong>{formatAddress(org.owner)}</strong>,