From 321814504074ec5142ad9e03db4d971c3e709446 Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 31 Oct 2024 12:39:51 +0100 Subject: [PATCH 1/3] feat(ceremony): text changes and new log type --- .../src/lib/components/Terminal/Activity.svelte | 4 +++- ceremony/src/lib/components/Terminal/Queue.svelte | 14 +++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ceremony/src/lib/components/Terminal/Activity.svelte b/ceremony/src/lib/components/Terminal/Activity.svelte index ef35a95f62..85ddabb339 100644 --- a/ceremony/src/lib/components/Terminal/Activity.svelte +++ b/ceremony/src/lib/components/Terminal/Activity.svelte @@ -49,7 +49,9 @@ function formatTimestamp(timestamp: string): string { {:else if type === "contribution_submitted"} {user} has submitted their contribution {:else if type === "contribution_verified"} - {user}'s contribution has just been verified + {user} contribution has just been verified + {:else if type === "contribution_expired"} + {user} contribution has expired {/if} {/each} diff --git a/ceremony/src/lib/components/Terminal/Queue.svelte b/ceremony/src/lib/components/Terminal/Queue.svelte index 6420c98a5d..53f2e4c076 100644 --- a/ceremony/src/lib/components/Terminal/Queue.svelte +++ b/ceremony/src/lib/components/Terminal/Queue.svelte @@ -17,11 +17,6 @@ let averages = $state() onMount(async () => { terminal.setStep(8) terminal.updateHistory({ text: "YOU ARE IN QUEUE" }) - terminal.updateHistory({ lineBreak: true, text: "" }) - terminal.updateHistory({ - text: "Do not close this tab or your Terminal. Ensure you have a reliable internet connection and that your computer does not go to sleep.", - type: "warning" - }) axiom.ingest("monitor", [{ user: user.session?.user.id, type: "mount_queue" }]) averages = await getAverageTimes() await contributor.checkUserWallet(contributor.userId) @@ -39,6 +34,15 @@ $effect(() => { }) +{#if contributor.queueState.position} + + {contributor.queueState.position < 78 ? + "Do not close this tab or your Terminal. Ensure you have a reliable internet connection and that your computer does not go to sleep." : + "Your contribution slot is far in the future. You can turn your device off and rejoin later without losing progression. If you are not online when it is your turn, you will lose your slot and not be able to contribute." + } + +{/if} +
 Your place in line: {contributor.queueState.position ?? "LOADING"}{getNumberSuffix(contributor.queueState.position)} From 641e5bab86a5a4209b0edbe87ee8429fd1b81868 Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 31 Oct 2024 12:43:23 +0100 Subject: [PATCH 2/3] fix(cceremony): wording --- ceremony/src/lib/components/Terminal/Queue.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceremony/src/lib/components/Terminal/Queue.svelte b/ceremony/src/lib/components/Terminal/Queue.svelte index 53f2e4c076..2ba7d7bee4 100644 --- a/ceremony/src/lib/components/Terminal/Queue.svelte +++ b/ceremony/src/lib/components/Terminal/Queue.svelte @@ -38,7 +38,7 @@ $effect(() => { {contributor.queueState.position < 78 ? "Do not close this tab or your Terminal. Ensure you have a reliable internet connection and that your computer does not go to sleep." : - "Your contribution slot is far in the future. You can turn your device off and rejoin later without losing progression. If you are not online when it is your turn, you will lose your slot and not be able to contribute." + "Your contribution slot is far in the future. You can turn your device off and return later without losing progression. If you are not online when it is your turn, you will lose your slot and not be able to contribute." } {/if} From 33aaabfaf4ebaf44578edfb02b02be80f13e762b Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 31 Oct 2024 12:44:33 +0100 Subject: [PATCH 3/3] fix(ceremony): position --- ceremony/src/lib/components/Terminal/Queue.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceremony/src/lib/components/Terminal/Queue.svelte b/ceremony/src/lib/components/Terminal/Queue.svelte index 2ba7d7bee4..6e2a2b51f1 100644 --- a/ceremony/src/lib/components/Terminal/Queue.svelte +++ b/ceremony/src/lib/components/Terminal/Queue.svelte @@ -36,7 +36,7 @@ $effect(() => { {#if contributor.queueState.position} - {contributor.queueState.position < 78 ? + {contributor.queueState.position < 50 ? "Do not close this tab or your Terminal. Ensure you have a reliable internet connection and that your computer does not go to sleep." : "Your contribution slot is far in the future. You can turn your device off and return later without losing progression. If you are not online when it is your turn, you will lose your slot and not be able to contribute." }