diff --git a/src/routes/CreateNewTeam/components/SearchAndSubmit/index.jsx b/src/routes/CreateNewTeam/components/SearchAndSubmit/index.jsx index f2b58cf..d9d910d 100644 --- a/src/routes/CreateNewTeam/components/SearchAndSubmit/index.jsx +++ b/src/routes/CreateNewTeam/components/SearchAndSubmit/index.jsx @@ -29,9 +29,11 @@ function SearchAndSubmit(props) { const matchedSkills = useMemo(() => { if (skills && matchingRole && matchingRole.matchedSkills) { - return _.compact(_.map(matchingRole.matchedSkills, (s) => - _.find(skills, (skill) => skill.name === s) - )); + return _.compact( + _.map(matchingRole.matchedSkills, (s) => + _.find(skills, (skill) => skill.name === s) + ) + ); } else { return []; } @@ -39,9 +41,11 @@ function SearchAndSubmit(props) { const unMatchedSkills = useMemo(() => { if (skills && matchingRole && matchingRole.unMatchedSkills) { - return _.compact(_.map(matchingRole.unMatchedSkills, (s) => - _.find(skills, (skill) => skill.name === s) - )); + return _.compact( + _.map(matchingRole.unMatchedSkills, (s) => + _.find(skills, (skill) => skill.name === s) + ) + ); } else { return []; } diff --git a/src/routes/CreateNewTeam/pages/CreateTaasPayment/PaymentForm/index.jsx b/src/routes/CreateNewTeam/pages/CreateTaasPayment/PaymentForm/index.jsx index 00f75bc..c34c7b1 100644 --- a/src/routes/CreateNewTeam/pages/CreateTaasPayment/PaymentForm/index.jsx +++ b/src/routes/CreateNewTeam/pages/CreateTaasPayment/PaymentForm/index.jsx @@ -57,7 +57,7 @@ const PaymentForm = ({ calculatedAmount }) => { const [errors, setErrors] = useState({ card: true, cardExpire: true, - cardCvc: true, + cvc: true, }); const [clicked, setClicked] = useState(true); const [projectId, setProjectId] = useState(null); @@ -172,8 +172,8 @@ const PaymentForm = ({ calculatedAmount }) => { fieldValues.name && fieldValues.zipcode && dropdown && - cardValid; - Object.values(errors).every((x) => x === ""); + cardValid && + Object.values(errors).every((x) => x === "" || x === false); return isValid; }; @@ -240,14 +240,20 @@ const PaymentForm = ({ calculatedAmount }) => { - - { - setShowPaymentResultPopup(false); - }} + + {showPaymentResultPopup ? ( + { + setShowPaymentResultPopup(false); + }} + /> + ) : null} ); }; diff --git a/src/routes/CreateNewTeam/pages/CreateTaasPayment/PaymentResultPopup/styles.module.scss b/src/routes/CreateNewTeam/pages/CreateTaasPayment/PaymentResultPopup/styles.module.scss index 669557f..d72c33a 100644 --- a/src/routes/CreateNewTeam/pages/CreateTaasPayment/PaymentResultPopup/styles.module.scss +++ b/src/routes/CreateNewTeam/pages/CreateTaasPayment/PaymentResultPopup/styles.module.scss @@ -1,24 +1,22 @@ @import "styles/include"; .header { - margin-top: -30px; - background-color: #ffffff; - background-image: linear-gradient( -90deg -, #9D41C9, #EF476F); - background-size: 100%; - background-clip: text; - -webkit-text-fill-color: transparent; - font-family: BarlowCondensed; - font-size: 34px; - line-height: 38px; - text-align: center; + margin-top: -30px; + background-color: #ffffff; + background-image: linear-gradient(90deg, #9d41c9, #ef476f); + background-size: 100%; + background-clip: text; + -webkit-text-fill-color: transparent; + font-family: BarlowCondensed; + font-size: 34px; + line-height: 38px; + text-align: center; } .sub-header { @include font-roboto; margin-top: 20px; - color: #2A2A2A; + color: #2a2a2a; font-size: 16px; line-height: 26px; text-align: center; @@ -32,7 +30,7 @@ .time-label { @include font-roboto; margin-top: 10px; - color: #2A2A2A; + color: #2a2a2a; font-size: 14px; line-height: 22px; text-align: center;