From c4ce80757f5d57c55aac405193594ead8f40c6aa Mon Sep 17 00:00:00 2001
From: AtHeartEngineer <1675654+AtHeartEngineer@users.noreply.github.com>
Date: Tue, 14 Nov 2023 09:28:27 +0300
Subject: [PATCH] password -> unlock for better communication of intent

---
 .../Security/SetPasswordContainer.svelte      |  8 ++---
 src/routes/Footer.svelte                      | 23 +++++----------
 src/routes/Sidebar.svelte                     | 29 +++++++------------
 src/routes/chat/ChatRoom.svelte               |  7 +++++
 src/routes/signup/+page.svelte                |  2 +-
 5 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/src/lib/components/Security/SetPasswordContainer.svelte b/src/lib/components/Security/SetPasswordContainer.svelte
index b2dbd5a..bcf96c6 100644
--- a/src/lib/components/Security/SetPasswordContainer.svelte
+++ b/src/lib/components/Security/SetPasswordContainer.svelte
@@ -3,14 +3,14 @@
 	import Container from '../Utils/Container.svelte';
 </script>
 
-<Container heading="Set A Password">
+<Container heading="Set An Unlock Code">
 	<p class="mt-3">
 		In order to secure your identity and other sensitive data that is stored in your browser, we
-		need you to set a password.
+		need you to set an unlock code.
 	</p>
 	<p class="my-3">
-		This password is only used locally, there is no username and password for your account, so don't
-		forget to <a
+		This unlock code is only used locally, there is no username and password for your account, so
+		don't forget to <a
 			class="link"
 			href="/settings/identity/backup"
 			title="Backup Identity">backup your identity</a
diff --git a/src/routes/Footer.svelte b/src/routes/Footer.svelte
index ec5b2c5..979b951 100644
--- a/src/routes/Footer.svelte
+++ b/src/routes/Footer.svelte
@@ -45,7 +45,7 @@
 		const modal: ModalSettings = {
 			type: 'prompt',
 			title: 'Unlock',
-			body: 'Enter your password to unlock your keystores',
+			body: 'Enter your code to unlock your keystores',
 			value: '',
 			valueAttr: { type: 'password', minlength: 4, required: true },
 			response: async (r: string) => {
@@ -70,8 +70,7 @@
 
 <div
 	class="card p-4 w-72 shadow-xl"
-	data-popup="popupMenu"
->
+	data-popup="popupMenu">
 	<nav class="list-nav">
 		<ul>
 			<li id="will-close">
@@ -118,16 +117,14 @@
 			<TabAnchor
 				href="/chat"
 				selected={$page.url.pathname === '/chat'}
-				title="Chat"
-			>
+				title="Chat">
 				<svelte:fragment slot="lead"><Chat class="rail-icon" /></svelte:fragment>
 				<span>Chat</span>
 			</TabAnchor>
 		{:else}
 			<TabAnchor
 				on:click={drawerOpen}
-				title="Select Room"
-			>
+				title="Select Room">
 				<svelte:fragment slot="lead"><Door class="rail-icon" /></svelte:fragment>
 				<span>Select Room</span>
 			</TabAnchor>
@@ -137,8 +134,7 @@
 				{#if $keyStore instanceof CryptoKey}
 					<TabAnchor
 						on:click={lock}
-						title="Unlocked, click to lock"
-					>
+						title="Unlocked, click to lock">
 						<svelte:fragment slot="lead">
 							<LockOpen class="rail-icon text-warning-300-600-token" />
 						</svelte:fragment>
@@ -147,8 +143,7 @@
 				{:else}
 					<TabAnchor
 						on:click={unlock}
-						title="Locked"
-					>
+						title="Locked">
 						<svelte:fragment slot="lead">
 							<Lock class="rail-icon text-success-500" />
 						</svelte:fragment>
@@ -161,8 +156,7 @@
 		<TabAnchor
 			href="/signup"
 			selected={$page.url.pathname === '/signup'}
-			title="SignUp"
-		>
+			title="SignUp">
 			<svelte:fragment slot="lead"><Mask class="rail-icon" /></svelte:fragment>
 			<span>SignUp</span>
 		</TabAnchor>
@@ -170,8 +164,7 @@
 	<a
 		class="tab-anchor text-center cursor-pointer transition-colors duration-100 flex-1 lg:flex-none px-4 py-2 rounded-tl-container-token rounded-tr-container-token hover:variant-soft-primary"
 		title="Menu"
-		use:popup={popupMenu}
-	>
+		use:popup={popupMenu}>
 		<Menu class="rail-icon" />
 		<span>Menu</span>
 	</a>
diff --git a/src/routes/Sidebar.svelte b/src/routes/Sidebar.svelte
index 9a0e2c2..2a874a4 100644
--- a/src/routes/Sidebar.svelte
+++ b/src/routes/Sidebar.svelte
@@ -25,7 +25,7 @@
 		const modal: ModalSettings = {
 			type: 'prompt',
 			title: 'Unlock',
-			body: 'Enter your password to unlock your keystores',
+			body: 'Enter your code to unlock your keystores',
 			value: '',
 			valueAttr: { type: 'password', minlength: 4, required: true },
 			response: async (r: string) => {
@@ -46,8 +46,7 @@
 	<AppRailAnchor
 		href="/about"
 		selected={$page.url.pathname === '/about'}
-		title="About"
-	>
+		title="About">
 		<svelte:fragment slot="lead"><Information class="rail-icon" /></svelte:fragment>
 		<span>About</span>
 	</AppRailAnchor>
@@ -56,8 +55,7 @@
 		<AppRailAnchor
 			href="/chat"
 			selected={$page.url.pathname === '/chat'}
-			title="Chat"
-		>
+			title="Chat">
 			<svelte:fragment slot="lead"><Chat class="rail-icon" /></svelte:fragment>
 			<span>Chat</span>
 		</AppRailAnchor>
@@ -65,8 +63,7 @@
 		<AppRailAnchor
 			href="/gateways"
 			selected={$page.url.pathname === '/gateways'}
-			title="About"
-		>
+			title="About">
 			<svelte:fragment slot="lead"><Plus class="rail-icon" /></svelte:fragment>
 			<span>Join More</span>
 		</AppRailAnchor>
@@ -75,8 +72,7 @@
 			<AppRailAnchor
 				href="/console"
 				selected={$page.url.pathname === '/console'}
-				title="About"
-			>
+				title="About">
 				<svelte:fragment slot="lead"><Console class="rail-icon" /></svelte:fragment>
 				<span>Console</span>
 			</AppRailAnchor>
@@ -85,8 +81,7 @@
 			<AppRailAnchor
 				href="/admin"
 				selected={$page.url.pathname === '/admin'}
-				title="About"
-			>
+				title="About">
 				<svelte:fragment slot="lead"><ShieldCrown class="rail-icon" /></svelte:fragment>
 				<span>Admin</span>
 			</AppRailAnchor>
@@ -95,8 +90,7 @@
 		<AppRailAnchor
 			href="/signup"
 			selected={$page.url.pathname === '/signup'}
-			title="Sign Up"
-		>
+			title="Sign Up">
 			<svelte:fragment slot="lead"><Mask class="rail-icon" /></svelte:fragment>
 			<span>Sign Up</span>
 		</AppRailAnchor>
@@ -109,8 +103,7 @@
 				{#if $keyStore instanceof CryptoKey}
 					<AppRailAnchor
 						on:click={lock}
-						title="Unlocked, click to lock"
-					>
+						title="Unlocked, click to lock">
 						<svelte:fragment slot="lead">
 							<LockOpen class="rail-icon text-warning-300-600-token" />
 						</svelte:fragment>
@@ -119,8 +112,7 @@
 				{:else}
 					<AppRailAnchor
 						on:click={unlock}
-						title="Locked"
-					>
+						title="Locked">
 						<svelte:fragment slot="lead">
 							<Lock class="rail-icon text-success-500" />
 						</svelte:fragment>
@@ -133,8 +125,7 @@
 				<AppRailAnchor
 					href="/settings"
 					selected={$page.url.pathname === '/settings'}
-					title="Settings"
-				>
+					title="Settings">
 					<svelte:fragment slot="lead"><Settings class="rail-icon" /></svelte:fragment>
 					<span>Settings</span>
 				</AppRailAnchor>
diff --git a/src/routes/chat/ChatRoom.svelte b/src/routes/chat/ChatRoom.svelte
index a7b190a..4753af9 100644
--- a/src/routes/chat/ChatRoom.svelte
+++ b/src/routes/chat/ChatRoom.svelte
@@ -37,6 +37,7 @@
 	let onlineMembers = '?';
 	let epochUpdater: NodeJS.Timeout;
 	let currentEpoch = 0;
+	let key: CryptoKey | undefined = undefined;
 	$: timeLeftInEpoch = '0';
 	$: roomId = $currentSelectedRoom?.roomId!.toString();
 	$: userMessageLimit = $currentSelectedRoom?.userMessageLimit ?? 1;
@@ -50,6 +51,9 @@
 
 	let unsubscribeStore = currentSelectedRoom.subscribe((currentValue) => {
 		updateMessages($selectedServer, roomId);
+		getKey().then((k) => {
+			key = k;
+		});
 	});
 
 	$: try {
@@ -160,6 +164,9 @@
 		epochUpdater = setInterval(() => {
 			updateEpoch();
 		}, 100);
+		getKey().then((k) => {
+			key = k;
+		});
 	});
 
 	onDestroy(() => {
diff --git a/src/routes/signup/+page.svelte b/src/routes/signup/+page.svelte
index 283c7dc..7fc832d 100644
--- a/src/routes/signup/+page.svelte
+++ b/src/routes/signup/+page.svelte
@@ -36,7 +36,7 @@
 		const modal: ModalSettings = {
 			type: 'prompt',
 			title: 'Unlock',
-			body: 'Enter your password to unlock your keystores',
+			body: 'Enter your code to unlock your keystores',
 			value: '',
 			valueAttr: { type: 'password', minlength: 4, required: true },
 			response: async (r: string) => {