From ac9648e88509328908abe8e4c3f6e0489786f82b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 8 Oct 2024 13:05:45 +0530
Subject: [PATCH] Conv

---
 web/packages/accounts/components/SignUp.tsx       | 13 ++++++++-----
 .../base/components/mui/LoadingButton.tsx         | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/web/packages/accounts/components/SignUp.tsx b/web/packages/accounts/components/SignUp.tsx
index c0262df9f5..303f0347af 100644
--- a/web/packages/accounts/components/SignUp.tsx
+++ b/web/packages/accounts/components/SignUp.tsx
@@ -3,6 +3,7 @@ import { PasswordStrengthHint } from "@/accounts/components/PasswordStrength";
 import { PAGES } from "@/accounts/constants/pages";
 import { isWeakPassword } from "@/accounts/utils";
 import { generateKeyAndSRPAttributes } from "@/accounts/utils/srp";
+import { LoadingButton } from "@/base/components/mui/LoadingButton";
 import log from "@/base/log";
 import { LS_KEYS, setLSUser } from "@ente/shared//storage/localStorage";
 import { VerticallyCentered } from "@ente/shared/components/Container";
@@ -10,7 +11,6 @@ import FormPaperFooter from "@ente/shared/components/Form/FormPaper/Footer";
 import FormPaperTitle from "@ente/shared/components/Form/FormPaper/Title";
 import ShowHidePassword from "@ente/shared/components/Form/ShowHidePassword";
 import LinkButton from "@ente/shared/components/LinkButton";
-import SubmitButton from "@ente/shared/components/SubmitButton";
 import {
     generateAndSaveIntermediateKeyAttributes,
     saveKeyInSessionStore,
@@ -289,15 +289,18 @@ export const SignUp: React.FC<SignUpProps> = ({ router, login, host }) => {
                             </FormGroup>
                         </VerticallyCentered>
                         <Box mb={4}>
-                            <SubmitButton
-                                sx={{ my: 0 }}
-                                buttonText={t("CREATE_ACCOUNT")}
+                            <LoadingButton
+                                size="large"
+                                color="accent"
+                                type="submit"
                                 loading={loading}
                                 disabled={
                                     !acceptTerms ||
                                     isWeakPassword(values.passphrase)
                                 }
-                            />
+                            >
+                                {t("CREATE_ACCOUNT")}
+                            </LoadingButton>
                             {loading && (
                                 <Typography
                                     mt={1}
diff --git a/web/packages/base/components/mui/LoadingButton.tsx b/web/packages/base/components/mui/LoadingButton.tsx
index dddb2b1b07..60053262d2 100644
--- a/web/packages/base/components/mui/LoadingButton.tsx
+++ b/web/packages/base/components/mui/LoadingButton.tsx
@@ -21,12 +21,17 @@ export const LoadingButton: React.FC<ButtonProps & { loading?: boolean }> = ({
 }) => (
     <FocusVisibleButton
         {...{ color }}
-        disabled={loading ?? disabled}
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        disabled={loading || disabled}
         sx={{
-            "&.Mui-disabled": {
-                backgroundColor: `${color}.main`,
-                color: `${color}.contrastText`,
-            },
+            ...(loading
+                ? {
+                      "&.Mui-disabled": {
+                          backgroundColor: `${color}.main`,
+                          color: `${color}.contrastText`,
+                      },
+                  }
+                : {}),
             ...sx,
         }}
         {...rest}