Merge pull request #36 from kjannette/raidModal

Raid modal

src/Components/Modals/PaymentModal.js

@@ -20,8 +20,15 @@ const PaymentModal = ({
 }) => {
   const fieldsChunkSize = 2;
 
-  const ModalForm = () => {
-    return splitEvery(Object.keys(paymentfields), fieldsChunkSize).map(
+  return (
+    <Modal show="true" size="lg">
+      <Modal.Header closeButton>
+        <Modal.Title>Enter Payment Information</Modal.Title>
+      </Modal.Header>
+      <Modal.Body>
+        <div className="payment-modal-text-wrapper">{modalText}</div>
+        <Form className="payment-form">
+          {splitEvery(Object.keys(paymentfields), fieldsChunkSize).map(
             (names, j) => (
               <Row key={`row${j}-modal`}>
                 {names.map((name, i) => (
@@ -49,18 +56,7 @@ const PaymentModal = ({
                 ))}
               </Row>
             )
-    );
-  };
-
-  return (
-    <Modal show="true" size="lg">
-      <Modal.Header closeButton>
-        <Modal.Title>Enter Payment Information</Modal.Title>
-      </Modal.Header>
-      <Modal.Body>
-        <div className="payment-modal-text-wrapper">{modalText}</div>
-        <Form className="payment-form">
-          <ModalForm />
+          )}
         </Form>
       </Modal.Body>
       <Modal.Footer>
@@ -82,7 +78,3 @@ const PaymentModal = ({
 };
 
 export default PaymentModal;
-
-/*
- onHide={onCancel} 
- */

src/Components/SignupPage/SignupPage.js

@@ -116,6 +116,7 @@ const SignupPage = () => {
     if (isBusy) {
       return;
     }
+
     const dataValues = validateData();
     if (dataValues === null) {
       return;
@@ -136,10 +137,12 @@ const SignupPage = () => {
     if (paymentDataValues === null) {
       return;
     }
+
     const dataValues = validateData();
     if (dataValues === null) {
       return;
     }
+
     setIsBusy(true);
     const paymentSuccess = handleStripeAuthorization(paymentDataValues);
     if (paymentSuccess) {