chore(onboarding-ui): normalize Button loading state

RocketChat · Oct 31, 2023 · d86f502 · d86f502
1 parent 7e84e2e
commit d86f502
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 12 deletions.
diff --git a/packages/onboarding-ui/src/forms/AdminInfoForm/AdminInfoForm.tsx b/packages/onboarding-ui/src/forms/AdminInfoForm/AdminInfoForm.tsx
@@ -240,7 +240,7 @@ const AdminInfoForm = ({
       </Form.Container>
       <Form.Footer>
         <ButtonGroup flexGrow={1}>
-          <Button type='submit' primary disabled={isValidating || isSubmitting}>
+          <Button type='submit' primary loading={isValidating || isSubmitting}>
             {t('component.form.action.next')}
           </Button>
         </ButtonGroup>

diff --git a/packages/onboarding-ui/src/forms/CreateCloudWorkspaceForm/CreateCloudWorkspaceForm.tsx b/packages/onboarding-ui/src/forms/CreateCloudWorkspaceForm/CreateCloudWorkspaceForm.tsx
@@ -253,7 +253,8 @@ const CreateCloudWorkspaceForm = ({
           <Button
             type='submit'
             primary
-            disabled={isValidating || isSubmitting || !isValid}
+            disabled={!isValid}
+            loading={isSubmitting || isValidating}
           >
             {t('component.form.action.next')}
           </Button>

diff --git a/packages/onboarding-ui/src/forms/CreateFirstMemberForm/CreateFirstMemberForm.tsx b/packages/onboarding-ui/src/forms/CreateFirstMemberForm/CreateFirstMemberForm.tsx
@@ -109,7 +109,8 @@ const CreateFirstMemberForm = ({
           <Button
             type='submit'
             primary
-            disabled={isValidating || isSubmitting || !isValid}
+            disabled={!isValid}
+            loading={isSubmitting || isValidating}
             minHeight='x40'
           >
             {isSubmitting ? (

diff --git a/packages/onboarding-ui/src/forms/CreateNewPassword/CreateNewPassword.tsx b/packages/onboarding-ui/src/forms/CreateNewPassword/CreateNewPassword.tsx
@@ -94,7 +94,8 @@ const CreateNewPassword = ({
           <Button
             type='submit'
             primary
-            disabled={isValidating || isSubmitting || !isValid}
+            loading={isValidating || isSubmitting}
+            disabled={!isValid}
           >
             {t('form.createPasswordForm.button.text')}
           </Button>

diff --git a/packages/onboarding-ui/src/forms/LoginForm/LoginForm.tsx b/packages/onboarding-ui/src/forms/LoginForm/LoginForm.tsx
@@ -99,7 +99,8 @@ const LoginForm = ({
         <LoginActionsWrapper>
           <Button
             type='submit'
-            disabled={!isDirty || isValidating || isSubmitting}
+            loading={isValidating || isSubmitting}
+            disabled={!isDirty}
             primary
           >
             {isPasswordLess

diff --git a/packages/onboarding-ui/src/forms/NewAccountForm/NewAccountForm.tsx b/packages/onboarding-ui/src/forms/NewAccountForm/NewAccountForm.tsx
@@ -160,7 +160,8 @@ const NewAccountForm = ({
           <Button
             type='submit'
             primary
-            disabled={isValidating || isSubmitting || !isValid}
+            loading={isValidating || isSubmitting}
+            disabled={!isValid}
           >
             {t('component.form.action.next')}
           </Button>

diff --git a/packages/onboarding-ui/src/forms/OrganizationInfoForm/OrganizationInfoForm.tsx b/packages/onboarding-ui/src/forms/OrganizationInfoForm/OrganizationInfoForm.tsx
@@ -237,7 +237,7 @@ const OrganizationInfoForm = ({
               {t('component.form.action.back')}
             </Button>
           )}
-          <Button type='submit' primary disabled={isValidating || isSubmitting}>
+          <Button type='submit' primary loading={isValidating || isSubmitting}>
             {nextStep ?? t('component.form.action.next')}
           </Button>
           {onClickSkip && (

diff --git a/packages/onboarding-ui/src/forms/RegisterOfflineForm/steps/PasteStep.tsx b/packages/onboarding-ui/src/forms/RegisterOfflineForm/steps/PasteStep.tsx
@@ -59,7 +59,12 @@ const PasteStep = ({ setStep }: PasteStepProps): ReactElement => {
       <Form.Footer>
         <Box display='flex' flexDirection='column'>
           <ButtonGroup vertical={isMobile} flexGrow={1}>
-            <Button type='submit' primary disabled={isSubmitting || !isValid}>
+            <Button
+              type='submit'
+              primary
+              disabled={!isValid}
+              loading={isSubmitting}
+            >
               {t('component.form.action.completeRegistration')}
             </Button>
             <Button type='button' onClick={() => setStep(Steps.COPY)}>

diff --git a/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx b/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
@@ -212,7 +212,7 @@ const RegisterServerForm = ({
               <Button
                 type='submit'
                 primary
-                disabled={isSubmitting || isValidating}
+                loading={isSubmitting || isValidating}
               >
                 {t('component.form.action.registerWorkspace')}
               </Button>

diff --git a/packages/onboarding-ui/src/forms/RequestTrialForm/RequestTrialForm.tsx b/packages/onboarding-ui/src/forms/RequestTrialForm/RequestTrialForm.tsx
@@ -203,7 +203,8 @@ const RequestTrialForm = ({
         <Button
           type='submit'
           primary
-          disabled={isValidating || isSubmitting || !isValid}
+          loading={isValidating || isSubmitting}
+          disabled={!isValid}
         >
           {t('form.requestTrialForm.button.text')}
         </Button>

diff --git a/packages/onboarding-ui/src/forms/ResetPasswordForm/ResetPasswordForm.tsx b/packages/onboarding-ui/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
@@ -74,7 +74,8 @@ const ResetPasswordForm = ({
           <Button
             type='submit'
             primary
-            disabled={isValidating || isSubmitting || !isValid}
+            loading={isValidating || isSubmitting}
+            disabled={!isValid}
           >
             {t('form.resetPasswordForm.action.submit')}
           </Button>

diff --git a/packages/onboarding-ui/src/forms/TotpForm/TotpForm.tsx b/packages/onboarding-ui/src/forms/TotpForm/TotpForm.tsx
@@ -89,7 +89,7 @@ const TotpForm = ({
       </Form.Container>
       <Form.Footer>
         <TotpActionsWrapper>
-          <Button type='submit' disabled={isValidating || isSubmitting} primary>
+          <Button type='submit' loading={isValidating || isSubmitting} primary>
             {t('form.totpForm.button.text')}
           </Button>
           <ActionLink fontScale='p2' onClick={onChangeTotpForm}>