@financial-times/n-conversion-forms 25.0.0 → 25.1.2

package/components/__snapshots__/b2c-partnership-confirmation.spec.js.snap

@@ -7,7 +7,7 @@ exports[`B2CPartnershipConfirmation renders as default 1`] = `
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your three months&#x27; Premium access
+        Welcome to your 30 days&#x27; Premium access
       </h1>
     </div>
   </div>

package/components/__snapshots__/confirmation.spec.js.snap

@@ -11,6 +11,9 @@ exports[`Confirmation renders appropriately if is B2C Partnership 1`] = `
     <h1 class="ncf__header ncf__header--confirmation">
     </h1>
   </div>
+  <p class="ncf__paragraph">
+    We’ve sent confirmation to your email. Make sure you check your spam folder if you don’t receive it.
+  </p>
   <p class="ncf__paragraph">
     Here’s a summary of your  subscription:
   </p>

package/components/accept-terms.jsx

@@ -23,6 +23,7 @@ export function AcceptTerms ({
 	specialTerms = null,
 	isSingleTerm = false,
 	isNewDigitalBuyFlowConsent = false,
+	hideConfirmTermsAndConditions = false,
 }) {
 	const divProps = {
 		id: 'acceptTermsField',
@@ -89,26 +90,28 @@ export function AcceptTerms ({
 					</li>
 				</ul>
 			)}
-			<label className={labelClassName} htmlFor="termsAcceptance">
-				<input {...inputProps} />
-				<span className="o-forms-input__label terms-auth-first-step">
-					I confirm that I am {ageRestriction} years or older and agree to the
-					full{' '}
-					<a
-						className="ncf__link--external"
-						href="http://help.ft.com/help/legal-privacy/terms-conditions/"
-						target={isEmbedded ? '_top' : '_blank'}
-						rel="noopener noreferrer"
-						data-trackable="terms-and-conditions"
-					>
-						Terms &amp; Conditions
-					</a>
-					.
-				</span>
-				<p className="o-forms-input__error">
-					Please accept our terms &amp; conditions
-				</p>
-			</label>
+			{!hideConfirmTermsAndConditions && (
+				<label className={labelClassName} htmlFor="termsAcceptance">
+					<input {...inputProps} />
+					<span className="o-forms-input__label terms-auth-first-step">
+						I confirm that I am {ageRestriction} years or older and agree to the
+						full{' '}
+						<a
+							className="ncf__link--external"
+							href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+							target={isEmbedded ? '_top' : '_blank'}
+							rel="noopener noreferrer"
+							data-trackable="terms-and-conditions"
+						>
+							Terms &amp; Conditions
+						</a>
+						.
+					</span>
+					<p className="o-forms-input__error">
+						Please accept our terms &amp; conditions
+					</p>
+				</label>
+			)}
 		</>
 	);
 
@@ -408,4 +411,5 @@ AcceptTerms.propTypes = {
 	specialTerms: PropTypes.string,
 	isSingleTerm: PropTypes.bool,
 	isNewDigitalBuyFlowConsent: PropTypes.bool,
+	hideConfirmTermsAndConditions: PropTypes.bool,
 };

package/components/accept-terms.stories.js

@@ -11,8 +11,35 @@ export default {
 				options: ['immediate', 'endOfTerm'],
 			},
 		},
+		isAuthFirstAccount: { control: 'boolean' },
+		isAuthFirstPayment: { control: 'boolean' },
+		hasError: { control: 'boolean' },
+		isSignup: { control: 'boolean' },
+		isRegister: { control: 'boolean' },
+		isChecked: { control: 'boolean' },
+		isB2b: { control: 'boolean' },
+		isB2cPartnership: { control: 'boolean' },
+		isEmbedded: { control: 'boolean' },
+		isCorpSignup: { control: 'boolean' },
+		isTrial: { control: 'boolean' },
+		isTransition: { control: 'boolean' },
+		isPrintProduct: { control: 'boolean' },
+		isSingleTerm: { control: 'boolean' },
+		isNewDigitalBuyFlowConsent: { control: 'boolean' },
+		hideConfirmTermsAndConditions: { control: 'boolean' },
 	},
 };
 
 export const Basic = (args) => <AcceptTerms {...args} />;
-Basic.parameters = {};
+Basic.args = {};
+
+export const NewBuyFlow = (args) => <AcceptTerms {...args} />;
+NewBuyFlow.args = {
+	isAuthFirstAccount: true,
+};
+
+export const NewBuyFlowEmailVerification = (args) => <AcceptTerms {...args} />;
+NewBuyFlowEmailVerification.args = {
+	isAuthFirstAccount: true,
+	hideConfirmTermsAndConditions: true,
+};

package/components/b2c-partnership-confirmation.jsx

@@ -19,7 +19,7 @@ export function B2CPartnershipConfirmation ({ ctaElement = null }) {
 				<div className="ncf__paragraph">
 					{
 						<h1 className="ncf__header ncf__header--confirmation">
-							{'Welcome to your three months\' Premium access'}
+							{'Welcome to your 30 days\' Premium access'}
 						</h1>
 					}
 				</div>

package/components/confirmation.jsx

@@ -20,6 +20,8 @@ export function Confirmation ({
 		...(isTrial && { 'data-signup-is-trial': 'true' }),
 	};
 
+	const isB2cPartnershipCopyAvailable = isB2cPartnership && b2cPartnershipCopy.length > 0;
+
 	const detailElements = details && (
 		<React.Fragment>
 			<h2 className="ncf__header2--afterline">Your billing details</h2>
@@ -64,14 +66,14 @@ export function Confirmation ({
 			</div>
 
 			{nextActionTop}
-			{!isB2cPartnership && (
+			{!isB2cPartnershipCopyAvailable && (
 				<p className="ncf__paragraph">
 					We’ve sent confirmation to {email}. Make sure you check your spam folder
 					if you don’t receive it.
 				</p>
 			)}
 
-			{isB2cPartnership && b2cPartnershipCopy.length > 0 ? (
+			{isB2cPartnershipCopyAvailable ? (
 				<p className="ncf__paragraph">
 					{b2cPartnershipCopy[0]}
 					<span className="ncf__legend">{` ${email}. `}</span>

package/components/payment-term.jsx

@@ -194,7 +194,7 @@ export function PaymentTerm ({
 
 		const createB2cDiscountCopy = () => {
 			return (
-				option.b2cPartnership && option.b2cDiscountCopy && (
+				option.name === 'annual' && option.b2cPartnership && option.b2cDiscountCopy && (
 					<span className="ncf__payment-term__discount">
 						{option.b2cDiscountCopy}
 					</span>

package/dist/accept-terms.js

@@ -57,7 +57,9 @@ function AcceptTerms(_ref) {
       _ref$isSingleTerm = _ref.isSingleTerm,
       isSingleTerm = _ref$isSingleTerm === void 0 ? false : _ref$isSingleTerm,
       _ref$isNewDigitalBuyF = _ref.isNewDigitalBuyFlowConsent,
-      isNewDigitalBuyFlowConsent = _ref$isNewDigitalBuyF === void 0 ? false : _ref$isNewDigitalBuyF;
+      isNewDigitalBuyFlowConsent = _ref$isNewDigitalBuyF === void 0 ? false : _ref$isNewDigitalBuyF,
+      _ref$hideConfirmTerms = _ref.hideConfirmTermsAndConditions,
+      hideConfirmTermsAndConditions = _ref$hideConfirmTerms === void 0 ? false : _ref$hideConfirmTerms;
 
   var divProps = _objectSpread(_objectSpread({
     id: 'acceptTermsField',
@@ -103,7 +105,7 @@ function AcceptTerms(_ref) {
     target: "_blank",
     rel: "noopener noreferrer",
     "data-trackable": "terms-and-conditions"
-  }, "cookie"), ' ', "policies."))), /*#__PURE__*/_react["default"].createElement("label", {
+  }, "cookie"), ' ', "policies."))), !hideConfirmTermsAndConditions && /*#__PURE__*/_react["default"].createElement("label", {
     className: labelClassName,
     htmlFor: "termsAcceptance"
   }, /*#__PURE__*/_react["default"].createElement("input", inputProps), /*#__PURE__*/_react["default"].createElement("span", {
@@ -248,5 +250,6 @@ AcceptTerms.propTypes = {
   isPrintProduct: _propTypes["default"].bool,
   specialTerms: _propTypes["default"].string,
   isSingleTerm: _propTypes["default"].bool,
-  isNewDigitalBuyFlowConsent: _propTypes["default"].bool
+  isNewDigitalBuyFlowConsent: _propTypes["default"].bool,
+  hideConfirmTermsAndConditions: _propTypes["default"].bool
 };

package/dist/b2c-partnership-confirmation.js

@@ -32,7 +32,7 @@ function B2CPartnershipConfirmation(_ref) {
     className: "ncf__paragraph"
   }, /*#__PURE__*/_react["default"].createElement("h1", {
     className: "ncf__header ncf__header--confirmation"
-  }, 'Welcome to your three months\' Premium access'))), /*#__PURE__*/_react["default"].createElement("p", {
+  }, 'Welcome to your 30 days\' Premium access'))), /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"
   }, "Please check your email to confirm your account and set your password."), /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"

package/dist/confirmation.js

@@ -45,6 +45,8 @@ function Confirmation(_ref) {
     'data-signup-is-trial': 'true'
   });
 
+  var isB2cPartnershipCopyAvailable = isB2cPartnership && b2cPartnershipCopy.length > 0;
+
   var detailElements = details && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("h2", {
     className: "ncf__header2--afterline"
   }, "Your billing details"), /*#__PURE__*/_react["default"].createElement("dl", {
@@ -79,9 +81,9 @@ function Confirmation(_ref) {
     className: "ncf__paragraph--reduced-padding ncf__paragraph--subscription-confirmation"
   }, "You are now subscribed to:"), /*#__PURE__*/_react["default"].createElement("h1", {
     className: "ncf__header ncf__header--confirmation"
-  }, offer)), nextActionTop, !isB2cPartnership && /*#__PURE__*/_react["default"].createElement("p", {
+  }, offer)), nextActionTop, !isB2cPartnershipCopyAvailable && /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"
-  }, "We\u2019ve sent confirmation to ", email, ". Make sure you check your spam folder if you don\u2019t receive it."), isB2cPartnership && b2cPartnershipCopy.length > 0 ? /*#__PURE__*/_react["default"].createElement("p", {
+  }, "We\u2019ve sent confirmation to ", email, ". Make sure you check your spam folder if you don\u2019t receive it."), isB2cPartnershipCopyAvailable ? /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"
   }, b2cPartnershipCopy[0], /*#__PURE__*/_react["default"].createElement("span", {
     className: "ncf__legend"

package/dist/payment-term.js

@@ -196,7 +196,7 @@ function PaymentTerm(_ref) {
     };
 
     var createB2cDiscountCopy = function createB2cDiscountCopy() {
-      return option.b2cPartnership && option.b2cDiscountCopy && /*#__PURE__*/_react["default"].createElement("span", {
+      return option.name === 'annual' && option.b2cPartnership && option.b2cDiscountCopy && /*#__PURE__*/_react["default"].createElement("span", {
         className: "ncf__payment-term__discount"
       }, option.b2cDiscountCopy);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/n-conversion-forms",
-  "version": "25.0.0",
+  "version": "25.1.2",
   "description": "Containing jsx components and styles for forms included on Accounts and Acqusition apps (next-signup, next-profile, next-retention, etc).",
   "main": "dist/index.js",
   "scripts": {