From b4b111e2974a80c9b6c1a6bf310542f243bcefad Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Mon, 20 May 2024 12:05:19 +0530
Subject: [PATCH 1/2] [WEB-1319] chore: auth fixes and enhancement (#4519)

* chore: onboarding invite member button overflow fix

* chore: change password enhancement
---
 web/components/onboarding/invite-members.tsx | 2 +-
 web/pages/profile/change-password.tsx        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/web/components/onboarding/invite-members.tsx b/web/components/onboarding/invite-members.tsx
index 366583f6fd..15d17c7380 100644
--- a/web/components/onboarding/invite-members.tsx
+++ b/web/components/onboarding/invite-members.tsx
@@ -415,7 +415,7 @@ export const InviteMembers: React.FC<Props> = (props) => {
                 Add another
               </button>
             </div>
-            <div className="flex flex-col mx-auto px-8 sm:px-2 items-center justify-center gap-4 w-96">
+            <div className="flex flex-col mx-auto px-8 sm:px-2 items-center justify-center gap-4 w-full max-w-96">
               <Button
                 variant="primary"
                 type="submit"
diff --git a/web/pages/profile/change-password.tsx b/web/pages/profile/change-password.tsx
index 4a493ed598..0d1575de83 100644
--- a/web/pages/profile/change-password.tsx
+++ b/web/pages/profile/change-password.tsx
@@ -68,6 +68,8 @@ const ChangePasswordPage: NextPageWithLayout = observer(() => {
   const password = watch("new_password");
   const confirmPassword = watch("confirm_password");
 
+  const isNewPasswordSameAsOldPassword = oldPassword !== "" && password !== "" && password === oldPassword;
+
   const handleShowPassword = (key: keyof typeof showPassword) =>
     setShowPassword((prev) => ({ ...prev, [key]: !prev[key] }));
 
@@ -211,6 +213,9 @@ const ChangePasswordPage: NextPageWithLayout = observer(() => {
                 )}
               </div>
               {passwordSupport}
+              {isNewPasswordSameAsOldPassword && !isPasswordInputFocused && (
+                <span className="text-xs text-red-500">New password must be different from old password</span>
+              )}
             </div>
             <div className="space-y-1">
               <h4 className="text-sm">Confirm password</h4>

From 603ebeb1235ea6c405cd7ddba0a00e8bdeb8389e Mon Sep 17 00:00:00 2001
From: guru_sainath <gurusainath007@gmail.com>
Date: Mon, 20 May 2024 12:10:54 +0530
Subject: [PATCH 2/2] chore: handled the auto reload issue in auth-wrapper and
 instance wrapper (#4520)

---
 web/lib/wrappers/authentication-wrapper.tsx | 2 +-
 web/lib/wrappers/instance-wrapper.tsx       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/lib/wrappers/authentication-wrapper.tsx b/web/lib/wrappers/authentication-wrapper.tsx
index 30c85cf8e3..8dfd5771aa 100644
--- a/web/lib/wrappers/authentication-wrapper.tsx
+++ b/web/lib/wrappers/authentication-wrapper.tsx
@@ -60,7 +60,7 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((props
     return redirectionRoute;
   };
 
-  if (isUserSWRLoading || isUserLoading)
+  if ((isUserSWRLoading || isUserLoading) && !currentUser?.id)
     return (
       <div className="relative flex h-screen w-full items-center justify-center">
         <LogoSpinner />
diff --git a/web/lib/wrappers/instance-wrapper.tsx b/web/lib/wrappers/instance-wrapper.tsx
index c0343a9e10..892838b7ef 100644
--- a/web/lib/wrappers/instance-wrapper.tsx
+++ b/web/lib/wrappers/instance-wrapper.tsx
@@ -16,12 +16,12 @@ export const InstanceWrapper: FC<TInstanceWrapper> = observer((props) => {
   // store
   const { isLoading, instance, error, fetchInstanceInfo } = useInstance();
 
-  useSWR("INSTANCE_INFORMATION", () => fetchInstanceInfo(), {
+  const { isLoading: isInstanceSWRLoading } = useSWR("INSTANCE_INFORMATION", () => fetchInstanceInfo(), {
     revalidateOnFocus: false,
   });
 
   // loading state
-  if (isLoading)
+  if ((isLoading || isInstanceSWRLoading) && !instance)
     return (
       <div className="relative flex h-screen w-full items-center justify-center">
         <LogoSpinner />