From 31fc87bbae2e8761454a0b8ecbdb707a0eea2af4 Mon Sep 17 00:00:00 2001 From: Joyal-George-KJ Date: Sun, 13 Jul 2025 14:34:17 +0530 Subject: [PATCH 01/10] Added: ! for conditional check to match the status --- .../auth/user-[user]/updateStatus.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte index 229109f948..1fee9308c5 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte @@ -46,7 +46,7 @@ await invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ - $user.phoneVerification ? 'unverified' : 'verified' + !$user.phoneVerification ? 'unverified' : 'verified' }`, type: 'success' }); From 8c99e6c31410feef4b219b75c47517f97c8b187d Mon Sep 17 00:00:00 2001 From: Joyal-George-KJ Date: Sun, 13 Jul 2025 14:38:18 +0530 Subject: [PATCH 02/10] Variable for user Name or Email holder --- .../auth/user-[user]/updateStatus.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte index 1fee9308c5..f6fbe9eb97 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte @@ -17,6 +17,7 @@ async function updateVerificationEmail() { showVerificationDropdown = false; + let displayName: string; try { await sdk .forProject(page.params.region, page.params.project) @@ -39,6 +40,7 @@ } async function updateVerificationPhone() { showVerificationDropdown = false; + let displayName: string; try { await sdk .forProject(page.params.region, page.params.project) From 288c76bcc8aa26e5993b438528c208de95549e19 Mon Sep 17 00:00:00 2001 From: Joyal-George-KJ Date: Sun, 13 Jul 2025 14:39:07 +0530 Subject: [PATCH 03/10] Email Verification Pop up display name formatted --- .../auth/user-[user]/updateStatus.svelte | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte index f6fbe9eb97..7fac90758b 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte @@ -23,6 +23,12 @@ .forProject(page.params.region, page.params.project) .users.updateEmailVerification($user.$id, !$user.emailVerification); await invalidate(Dependencies.USER); + + if ($user.name) { + // name formatter + displayName = $user.name; + displayName = `${displayName}${displayName[displayName.length - 1].toLowerCase() === 's' ? "' email" : "'s email"}`; + } addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ !$user.emailVerification ? 'unverified' : 'verified' From f2c57a3a3b1f661ea535fed30f4627a725963d75 Mon Sep 17 00:00:00 2001 From: Joyal-George-KJ Date: Sun, 13 Jul 2025 14:39:30 +0530 Subject: [PATCH 04/10] Phone Verification Pop up display name and email formatted --- .../auth/user-[user]/updateStatus.svelte | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte index 7fac90758b..01314f7ca0 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte @@ -52,6 +52,12 @@ .forProject(page.params.region, page.params.project) .users.updatePhoneVerification($user.$id, !$user.phoneVerification); await invalidate(Dependencies.USER); + + if ($user.name || $user.email) { + // name email formatter + displayName = $user[$user.name ? 'name' : 'email']; + displayName = `${displayName}${displayName[displayName.length - 1].toLowerCase() === 's' ? "' phone" : "'s phone"}`; + } addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ !$user.phoneVerification ? 'unverified' : 'verified' From 5f461eed8c45dcf9cbedcce74b7292da34cc8c04 Mon Sep 17 00:00:00 2001 From: Joyal-George-KJ Date: Sun, 13 Jul 2025 14:39:55 +0530 Subject: [PATCH 05/10] Changes added to Notification function --- .../auth/user-[user]/updateStatus.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte index 01314f7ca0..50ae4579b2 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte @@ -30,7 +30,7 @@ displayName = `${displayName}${displayName[displayName.length - 1].toLowerCase() === 's' ? "' email" : "'s email"}`; } addNotification({ - message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ + message: `${displayName || $user.email || $user.phone} has been ${ !$user.emailVerification ? 'unverified' : 'verified' }`, type: 'success' @@ -59,7 +59,7 @@ displayName = `${displayName}${displayName[displayName.length - 1].toLowerCase() === 's' ? "' phone" : "'s phone"}`; } addNotification({ - message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ + message: `${displayName || $user.phone} has been ${ !$user.phoneVerification ? 'unverified' : 'verified' }`, type: 'success' From 94fa3470d6ef39d90a3de40d608c38dbcc2d9a3d Mon Sep 17 00:00:00 2001 From: Joyal-George-KJ Date: Sun, 13 Jul 2025 16:25:24 +0530 Subject: [PATCH 06/10] emailPassword set to null after update successfull. --- src/routes/(console)/account/updateEmail.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes/(console)/account/updateEmail.svelte b/src/routes/(console)/account/updateEmail.svelte index cad162c361..44a88322f5 100644 --- a/src/routes/(console)/account/updateEmail.svelte +++ b/src/routes/(console)/account/updateEmail.svelte @@ -25,6 +25,7 @@ type: 'success' }); trackEvent(Submit.AccountUpdateEmail); + emailPassword = null; } catch (error) { addNotification({ message: error.message, From f1db6e395189b70616b5016989bf842067cdcc74 Mon Sep 17 00:00:00 2001 From: Joyal-George-KJ Date: Sun, 13 Jul 2025 17:36:43 +0530 Subject: [PATCH 07/10] Removed formatters to impliment discord suggetions --- .../auth/user-[user]/updateStatus.svelte | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte index 50ae4579b2..ca18c5c87d 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte @@ -17,18 +17,12 @@ async function updateVerificationEmail() { showVerificationDropdown = false; - let displayName: string; try { await sdk .forProject(page.params.region, page.params.project) .users.updateEmailVerification($user.$id, !$user.emailVerification); await invalidate(Dependencies.USER); - if ($user.name) { - // name formatter - displayName = $user.name; - displayName = `${displayName}${displayName[displayName.length - 1].toLowerCase() === 's' ? "' email" : "'s email"}`; - } addNotification({ message: `${displayName || $user.email || $user.phone} has been ${ !$user.emailVerification ? 'unverified' : 'verified' @@ -46,18 +40,12 @@ } async function updateVerificationPhone() { showVerificationDropdown = false; - let displayName: string; try { await sdk .forProject(page.params.region, page.params.project) .users.updatePhoneVerification($user.$id, !$user.phoneVerification); await invalidate(Dependencies.USER); - if ($user.name || $user.email) { - // name email formatter - displayName = $user[$user.name ? 'name' : 'email']; - displayName = `${displayName}${displayName[displayName.length - 1].toLowerCase() === 's' ? "' phone" : "'s phone"}`; - } addNotification({ message: `${displayName || $user.phone} has been ${ !$user.phoneVerification ? 'unverified' : 'verified' From f9778df20bf8578d50ee26969fd996e13dc32e77 Mon Sep 17 00:00:00 2001 From: Joyal-George-KJ Date: Sun, 13 Jul 2025 17:38:40 +0530 Subject: [PATCH 08/10] Updated the alert message according to Discord Suggestion --- .../auth/user-[user]/updateStatus.svelte | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte index ca18c5c87d..c711d6214e 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte @@ -24,8 +24,8 @@ await invalidate(Dependencies.USER); addNotification({ - message: `${displayName || $user.email || $user.phone} has been ${ - !$user.emailVerification ? 'unverified' : 'verified' + message: `The email${$user.name && ` for ${$user.name}`} ${ + !$user.emailVerification ? 'is no longer verified' : ' has been verified' }`, type: 'success' }); @@ -47,8 +47,8 @@ await invalidate(Dependencies.USER); addNotification({ - message: `${displayName || $user.phone} has been ${ - !$user.phoneVerification ? 'unverified' : 'verified' + message: `The phone ${$user[$user.name ? 'name' : 'email'] && `for ${$user[$user.name ? 'name' : 'email']}`}${ + !$user.phoneVerification ? ' is no longer verified' : ' has been verified' }`, type: 'success' }); From c0a90ee31892f1d8fecdb5d57361217b90519815 Mon Sep 17 00:00:00 2001 From: Joyal-George-KJ Date: Mon, 14 Jul 2025 22:42:57 +0530 Subject: [PATCH 09/10] Added a condition check and variable for the variable userLabel for readablity --- .../auth/user-[user]/updateStatus.svelte | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte index c711d6214e..0fc82fd66d 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte @@ -22,6 +22,10 @@ .forProject(page.params.region, page.params.project) .users.updateEmailVerification($user.$id, !$user.emailVerification); await invalidate(Dependencies.USER); + let userLabel: string = '' + + if ($user.name) + userLabel = `for ${$user.name}` addNotification({ message: `The email${$user.name && ` for ${$user.name}`} ${ @@ -46,6 +50,11 @@ .users.updatePhoneVerification($user.$id, !$user.phoneVerification); await invalidate(Dependencies.USER); + let userLabel: string = ''; + + if ($user.name || $user.email) + userLabel = `for ${$user[$user.name ? 'name' : 'email']}`; + addNotification({ message: `The phone ${$user[$user.name ? 'name' : 'email'] && `for ${$user[$user.name ? 'name' : 'email']}`}${ !$user.phoneVerification ? ' is no longer verified' : ' has been verified' From 222574687a11285ef58f5c2b74536b03568e0e53 Mon Sep 17 00:00:00 2001 From: Joyal-George-KJ Date: Mon, 14 Jul 2025 22:43:31 +0530 Subject: [PATCH 10/10] Implimented the variable in Popup --- .../auth/user-[user]/updateStatus.svelte | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte index 0fc82fd66d..73f74cbe08 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte @@ -28,8 +28,8 @@ userLabel = `for ${$user.name}` addNotification({ - message: `The email${$user.name && ` for ${$user.name}`} ${ - !$user.emailVerification ? 'is no longer verified' : ' has been verified' + message: `The email ${userLabel} ${ + !$user.emailVerification ? 'is no longer verified' : 'has been verified' }`, type: 'success' }); @@ -56,8 +56,8 @@ userLabel = `for ${$user[$user.name ? 'name' : 'email']}`; addNotification({ - message: `The phone ${$user[$user.name ? 'name' : 'email'] && `for ${$user[$user.name ? 'name' : 'email']}`}${ - !$user.phoneVerification ? ' is no longer verified' : ' has been verified' + message: `The phone ${userLabel} ${ + !$user.phoneVerification ? 'is no longer verified' : 'has been verified' }`, type: 'success' });