more

src/Components/Modals/ConfirmModal.js

@@ -20,6 +20,7 @@ const ConfirmModal = ({
   reportDoc,
   titleText,
   isPromoModal,
+  cancelButtonText,
 }) => {
   const title = titleText ? titleText : "Confirmation";
 
@@ -73,7 +74,7 @@ const ConfirmModal = ({
           disabled={isBusy}
           className="secondary-button"
           onClick={onCancel}
-          labelText="Cancel"
+          labelText={cancelButtonText ? cancelButtonText : "Cancel"}
         />
         <Button
           disabled={isBusy}

src/Components/SignupPage/SignupPage.js

@@ -416,9 +416,7 @@ const SignupPage = () => {
     }
   };
 
-  const handlePromoSignup = async (e) => {
+  const handlePromoSignup = async () => {
-    e.preventDefault();
-
     let dataValues = validateUserData();
     if (dataValues === null) {
       return;
@@ -434,7 +432,7 @@ const SignupPage = () => {
         const subscriptionCreated = today;
         const subscriptionPeriodStart = today;
         const subscriptionPeriodEnd = today.setDate(today.getDate() + 30);
-        const subscriptionId = `promo-${uuidv4()}`;
+        const subscriptionId = uuidv4();
         const isPromotionalMebership = true;
 
         const userCredential = await createUserWithEmailAndPassword(
@@ -444,7 +442,7 @@ const SignupPage = () => {
         );
 
         const user = userCredential.user;
-        dataValues = { ...dataValues, ...data };
+        dataValues = { ...dataValues };
         const res = await saveUserData(
           user.uid,
           dataValues,
@@ -738,6 +736,7 @@ const SignupPage = () => {
           issueText={issueText}
           setIssueText={setIssueText}
           onConfirm={handleConfirmPromoCode}
+          cancelButtonText="I don't have a code"
         />
       ) : (
         <></>