Parcourir la source

change back to setting buttonText instead of children in submit button

Abhinav il y a 3 ans
Parent
commit
68fafe397f

+ 8 - 6
src/components/ChangeEmail.tsx

@@ -116,12 +116,14 @@ function ChangeEmailForm(props: Props) {
                                     disabled={loading}
                                 />
                             )}
-
-                            <SubmitButton loading={loading}>
-                                {!ottInputVisible
-                                    ? constants.SEND_OTT
-                                    : constants.VERIFY}
-                            </SubmitButton>
+                            <SubmitButton
+                                loading={loading}
+                                buttonText={
+                                    !ottInputVisible
+                                        ? constants.SEND_OTT
+                                        : constants.VERIFY
+                                }
+                            />
                         </Container>
                     </form>
                     <LinkButton

+ 4 - 3
src/components/SetPasswordForm.tsx

@@ -85,9 +85,10 @@ function SetPasswordForm(props: Props) {
                                 error={Boolean(errors.confirm)}
                                 helperText={errors.confirm}
                             />
-                            <SubmitButton loading={loading}>
-                                {props.buttonText}
-                            </SubmitButton>
+                            <SubmitButton
+                                loading={loading}
+                                buttonText={props.buttonText}
+                            />
                         </Container>
                     </Container>
                 </form>

+ 3 - 3
src/components/SubmitButton.tsx

@@ -3,13 +3,13 @@ import React, { FC } from 'react';
 
 interface Props {
     loading: boolean;
-    children: any;
+    buttonText: string;
     inline?: any;
     disabled?: boolean;
 }
 const SubmitButton: FC<ButtonProps<'button', Props>> = ({
     loading,
-    children,
+    buttonText,
     inline,
     disabled,
 }: Props) => {
@@ -21,7 +21,7 @@ const SubmitButton: FC<ButtonProps<'button', Props>> = ({
             type="submit"
             fullWidth={!inline}
             disabled={loading || disabled}>
-            {loading ? <CircularProgress size={25} /> : children}
+            {loading ? <CircularProgress size={25} /> : buttonText}
         </Button>
     );
 };