From 1eec5da45da699e6c093016f30c2e8136633b2fe Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 26 Jul 2024 14:14:51 -0500 Subject: [PATCH 1/7] fix: RT-99514 suspended user needs unique state --- .../src/auth/LoginComponent/LoginComponent.tsx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx index fb8340fa9..a373298b3 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx @@ -41,6 +41,23 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({ ); } + if (status === 451) { + return ( +
+ Sorry, you're account is currently unavailable. +
+ Please try again or{' '} + + check your account status + + . +
+ ); + } return (
Sorry. Something went wrong while trying to log in. Please try again From 4008f22a176b4103e057f20498b67f941a16b85c Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 26 Jul 2024 14:22:05 -0500 Subject: [PATCH 2/7] fix: RT-99514 more specific error --- .../src/auth/LoginComponent/LoginComponent.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx index a373298b3..040e9683c 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx @@ -44,15 +44,15 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({ if (status === 451) { return (
- Sorry, you're account is currently unavailable. + Sorry, your account is suspended.
- Please try again or{' '} + Please - check your account status + request account support .
From 7e0bfffce0463e71d4a5ede1cba77862ed812a88 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 26 Jul 2024 14:23:47 -0500 Subject: [PATCH 3/7] fix: RT-99514 error should not be polite TACC portal designers often remind me that we should not say please or sorry or thank you. Jsut tell the user what happenned and what to do. --- .../src/auth/LoginComponent/LoginComponent.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx index 040e9683c..1147536b1 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx @@ -44,17 +44,15 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({ if (status === 451) { return (
- Sorry, your account is suspended. + Your account is suspended.
- Please - request account support + Request account support. - .
); } From f037ced744caff408730b1024bf9c298f83dbf0f Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 26 Jul 2024 14:28:10 -0500 Subject: [PATCH 4/7] fix: RT-99514 unnecessary new line --- libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx index 1147536b1..5594eaa27 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx @@ -44,8 +44,7 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({ if (status === 451) { return (
- Your account is suspended. -
+ Your account is suspended.{' '} Date: Fri, 26 Jul 2024 14:43:46 -0500 Subject: [PATCH 5/7] fix: RT-99514 be a little nicer --- .../src/auth/LoginComponent/LoginComponent.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx index 5594eaa27..cca92578c 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx @@ -44,14 +44,17 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({ if (status === 451) { return ( ); } From 4081132c6fd32a4a18f8f760ed9296ca4460b438 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 26 Jul 2024 14:52:22 -0500 Subject: [PATCH 6/7] Revert "fix: RT-99514 be a little nicer" This reverts commit 07039b01c6c06bb41a894d620c48df0de0008d8f. --- .../src/auth/LoginComponent/LoginComponent.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx index cca92578c..5594eaa27 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx @@ -44,17 +44,14 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({ if (status === 451) { return (
- Sorry, your account is suspended. -
- Please{' '} + Your account is suspended.{' '} - request account support + Request account support. - .
); } From a290672f10bcf0e3ff07a243b6c8f4e98d5d44e0 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 26 Jul 2024 15:03:19 -0500 Subject: [PATCH 7/7] fix: RT-99514 balanced message --- .../src/auth/LoginComponent/LoginComponent.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx index 5594eaa27..8cd02fff0 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx @@ -44,14 +44,15 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({ if (status === 451) { return (
- Your account is suspended.{' '} + Your account has been suspended. Please{' '} - Request account support. + request account support + .
); }