diff --git a/package.json b/package.json index a4651b42..ad43cad4 100644 --- a/package.json +++ b/package.json @@ -56,13 +56,12 @@ "prettier:write": "prettier --write {src,cypress}/**/*.{js,ts,tsx}", "type-check": "tsc --noEmit", "check": "yarn prettier:check && yarn lint && yarn type-check", - "hooks:uninstall": "husky uninstall", - "hooks:install": "husky install", + "hooks:install": "husky", "cypress:open": "env-cmd -f ./.env.test cypress open", "cypress": "yarn build:test && concurrently -k -s first \"yarn preview:test\" \"yarn cypress:run\"", "test": "yarn cypress", "cypress:run": "env-cmd -f ./.env.test cypress run --headless --browser chrome", - "postinstall": "husky install" + "postinstall": "husky" }, "eslintConfig": { "extends": "react-app" diff --git a/src/components/SignUp.tsx b/src/components/SignUp.tsx index 7cacd7ea..a7795232 100644 --- a/src/components/SignUp.tsx +++ b/src/components/SignUp.tsx @@ -64,12 +64,12 @@ const SignUp = () => { const { mutateAsync: signUp, - isLoading: isLoadingSignUp, + isPending: isLoadingSignUp, error: webRegisterError, } = mutations.useSignUp(); const { mutateAsync: mobileSignUp, - isLoading: isLoadingMobileSignUp, + isPending: isLoadingMobileSignUp, error: mobileRegisterError, } = mutations.useMobileSignUp(); const [searchParams] = useSearchParams(); @@ -77,7 +77,7 @@ const SignUp = () => { const { data: invitation, isSuccess: isInvitationSuccess, - isInitialLoading: isLoadingInvitations, + isLoading: isLoadingInvitations, } = hooks.useInvitation(searchParams.get('invitationId') || undefined); useEffect(() => { diff --git a/src/components/requestPasswordReset/RequestPasswordReset.tsx b/src/components/requestPasswordReset/RequestPasswordReset.tsx index e258c3e5..4d776ff4 100644 --- a/src/components/requestPasswordReset/RequestPasswordReset.tsx +++ b/src/components/requestPasswordReset/RequestPasswordReset.tsx @@ -44,7 +44,7 @@ export const RequestPasswordReset = () => { mutate: requestPasswordReset, isError, isSuccess, - isLoading, + isPending: isLoading, } = useCreatePasswordResetRequest(); const resetPassword = async ({ email }: Inputs) => { diff --git a/src/components/requestPasswordReset/ResetPassword.tsx b/src/components/requestPasswordReset/ResetPassword.tsx index 017d2d42..db0eaf69 100644 --- a/src/components/requestPasswordReset/ResetPassword.tsx +++ b/src/components/requestPasswordReset/ResetPassword.tsx @@ -56,7 +56,7 @@ const ResetPassword = () => { const { mutate: resolveRequestPasswordReset, - isLoading, + isPending: isLoading, isError, isSuccess, } = useResolvePasswordResetRequest(); diff --git a/src/components/signIn/MagicLinkForm.tsx b/src/components/signIn/MagicLinkForm.tsx index 3a36a4b3..2395b2dc 100644 --- a/src/components/signIn/MagicLinkForm.tsx +++ b/src/components/signIn/MagicLinkForm.tsx @@ -38,12 +38,12 @@ const MagicLinkForm = () => { const { mutateAsync: signIn, - isLoading: isLoadingSignIn, + isPending: isLoadingSignIn, error: webSignInError, } = mutations.useSignIn(); const { mutateAsync: mobileSignIn, - isLoading: isLoadingMobileSignIn, + isPending: isLoadingMobileSignIn, error: mobileSignInError, } = mutations.useMobileSignIn(); diff --git a/src/components/signIn/PasswordForm.tsx b/src/components/signIn/PasswordForm.tsx index 0b8596c1..6a140f47 100644 --- a/src/components/signIn/PasswordForm.tsx +++ b/src/components/signIn/PasswordForm.tsx @@ -41,13 +41,13 @@ const SignInPasswordForm = () => { const { mutateAsync: signInWithPassword, isSuccess: signInWithPasswordSuccess, - isLoading: isLoadingPasswordSignIn, + isPending: isLoadingPasswordSignIn, error: webPasswordSignInError, } = mutations.useSignInWithPassword(); const { mutateAsync: mobileSignInWithPassword, isSuccess: mobileSignInWithPasswordSuccess, - isLoading: isLoadingMobilePasswordSignIn, + isPending: isLoadingMobilePasswordSignIn, error: mobilePasswordSignInError, } = mutations.useMobileSignInWithPassword();