@financial-times/n-conversion-forms 45.2.0 → 45.3.1

package/.toolkitstate/ci.json

@@ -1,7 +1,7 @@
 {
   "branch": "",
   "repo": "n-conversion-forms",
-  "version": "7cb3814b5ef6dccca5d29636c4cf6cf98eb37b52",
-  "tag": "v45.2.0",
-  "buildNumber": "18122"
+  "version": "3c2271f90caa5a547c81e484c8dda60c39e21c37",
+  "tag": "v45.3.1",
+  "buildNumber": "18164"
 }

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

@@ -153,7 +153,7 @@ exports[`Confirmation renders appropriately if is 'Termed' subscription term typ
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
     </div>
     <p class="ncf__paragraph--reduced-padding ncf__paragraph--subscription-confirmation">
-      You are now subscribed to:
+      Your purchase is complete for:
     </p>
     <h1 class="ncf__header ncf__header--confirmation">
     </h1>
@@ -162,7 +162,7 @@ exports[`Confirmation renders appropriately if is 'Termed' subscription term typ
     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:
+    Here’s a summary of your  purchase:
   </p>
   <div class="ncf__headed-paragraph">
     <h3 class="ncf__header">
@@ -184,16 +184,6 @@ exports[`Confirmation renders appropriately if is 'Termed' subscription term typ
       . Or contact us for additional support.
     </p>
   </div>
-  <p class="ncf__paragraph o3-type-body-base">
-    See our
-    <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
-       target="_top"
-       rel="noopener"
-    >
-      Terms &amp; Conditions
-    </a>
-    for details on how to cancel.
-  </p>
 </div>
 `;
 

package/components/confirmation.jsx

@@ -10,6 +10,7 @@ export function Confirmation({
 	b2cPartnershipCopy = [],
 	sendConfirmationEmail = true,
 	isEvergreenSubscriptionTermType = true,
+	isTermedSubscriptionTermType = false,
 	offer = '',
 	email = EMAIL_DEFAULT_TEXT,
 	details = null,
@@ -64,7 +65,8 @@ export function Confirmation({
 			<div className="ncf__center">
 				<div className="ncf__icon ncf__icon--tick ncf__icon--large"></div>
 				<p className="ncf__paragraph--reduced-padding ncf__paragraph--subscription-confirmation">
-					You are now subscribed to:
+					{isEvergreenSubscriptionTermType && 'You are now subscribed to:'}
+					{isTermedSubscriptionTermType && 'Your purchase is complete for:'}
 				</p>
 				<h1 className="ncf__header ncf__header--confirmation">{offer}</h1>
 			</div>
@@ -90,7 +92,9 @@ export function Confirmation({
 			{newsletterScheduleExplainer}
 
 			<p className="ncf__paragraph">
-				Here’s a summary of your {offer} subscription:
+				Here’s a summary of your {offer}{' '}
+				{isEvergreenSubscriptionTermType && 'subscription'}
+				{isTermedSubscriptionTermType && 'purchase'}:
 			</p>
 
 			{detailElements}
@@ -114,20 +118,22 @@ export function Confirmation({
 					for additional support.
 				</p>
 			</div>
-			<p className="ncf__paragraph o3-type-body-base">
-				{isEvergreenSubscriptionTermType
-					? 'We will automatically renew your subscription using the payment method provided unless you cancel before your renewal date. '
-					: ''}
-				{'See our '}
-				<a
-					href="http://help.ft.com/help/legal-privacy/terms-conditions/"
-					target="_top"
-					rel="noopener"
-				>
-					Terms &amp; Conditions
-				</a>
-				{' for details on how to cancel.'}
-			</p>
+
+			{isEvergreenSubscriptionTermType && (
+				<p className="ncf__paragraph o3-type-body-base">
+					We will automatically renew your subscription using the payment method
+					provided unless you cancel before your renewal date. See our{' '}
+					<a
+						href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+						target="_top"
+						rel="noopener"
+					>
+						Terms &amp; Conditions
+					</a>{' '}
+					for details on how to cancel.
+				</p>
+			)}
+
 			{nextActionBottom}
 		</div>
 	);
@@ -139,6 +145,7 @@ Confirmation.propTypes = {
 	b2cPartnershipCopy: PropTypes.array,
 	sendConfirmationEmail: PropTypes.bool,
 	isEvergreenSubscriptionTermType: PropTypes.bool,
+	isTermedSubscriptionTermType: PropTypes.bool,
 	offer: PropTypes.string.isRequired,
 	email: PropTypes.string,
 	details: PropTypes.arrayOf(

package/components/confirmation.spec.js

@@ -41,7 +41,7 @@ describe('Confirmation', () => {
 	it("renders appropriately if is 'Termed' subscription term type", () => {
 		const props = {
 			isEvergreenSubscriptionTermType: false,
-			isTermedSubscriptionTermType: false,
+			isTermedSubscriptionTermType: true,
 		};
 
 		expect(Confirmation).toRenderCorrectly(props);

package/components/confirmation.stories.js

@@ -66,8 +66,9 @@ Basic.args = {
 export const TermedSubscriptionTermType = (args) => <Confirmation {...args} />;
 TermedSubscriptionTermType.args = {
 	sendConfirmationEmail: false,
+	isEvergreenSubscriptionTermType: false,
 	isTermedSubscriptionTermType: true,
-	offer: 'Single-term subscription',
+	offer: 'Standard Digital',
 	details: [
 		{
 			title: 'End date',

package/dist/confirmation.jsx

@@ -22,6 +22,8 @@ function Confirmation(_ref) {
     sendConfirmationEmail = _ref$sendConfirmation === void 0 ? true : _ref$sendConfirmation,
     _ref$isEvergreenSubsc = _ref.isEvergreenSubscriptionTermType,
     isEvergreenSubscriptionTermType = _ref$isEvergreenSubsc === void 0 ? true : _ref$isEvergreenSubsc,
+    _ref$isTermedSubscrip = _ref.isTermedSubscriptionTermType,
+    isTermedSubscriptionTermType = _ref$isTermedSubscrip === void 0 ? false : _ref$isTermedSubscrip,
     _ref$offer = _ref.offer,
     offer = _ref$offer === void 0 ? '' : _ref$offer,
     _ref$email = _ref.email,
@@ -72,7 +74,7 @@ function Confirmation(_ref) {
     className: "ncf__icon ncf__icon--tick ncf__icon--large"
   }), /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph--reduced-padding ncf__paragraph--subscription-confirmation"
-  }, "You are now subscribed to:"), /*#__PURE__*/_react["default"].createElement("h1", {
+  }, isEvergreenSubscriptionTermType && 'You are now subscribed to:', isTermedSubscriptionTermType && 'Your purchase is complete for:'), /*#__PURE__*/_react["default"].createElement("h1", {
     className: "ncf__header ncf__header--confirmation"
   }, offer)), nextActionTop, sendConfirmationEmail && !isB2cPartnershipCopyAvailable && /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"
@@ -82,7 +84,7 @@ function Confirmation(_ref) {
     className: "ncf__legend"
   }, " ".concat(email, ". ")), b2cPartnershipCopy[1]) : '', newsletterScheduleExplainer, /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"
-  }, "Here\u2019s a summary of your ", offer, " subscription:"), detailElements, directDebitMandateUrlElement, /*#__PURE__*/_react["default"].createElement("div", {
+  }, "Here\u2019s a summary of your ", offer, ' ', isEvergreenSubscriptionTermType && 'subscription', isTermedSubscriptionTermType && 'purchase', ":"), detailElements, directDebitMandateUrlElement, /*#__PURE__*/_react["default"].createElement("div", {
     className: "ncf__headed-paragraph"
   }, /*#__PURE__*/_react["default"].createElement("h3", {
     className: "ncf__header"
@@ -95,13 +97,13 @@ function Confirmation(_ref) {
     "data-trackable": "yourAccount"
   }, "account settings"), ' ', "to view or edit your account. If you need to get in touch call us on", ' ', /*#__PURE__*/_react["default"].createElement("a", {
     href: "tel:+442077556248"
-  }, "+44 (0) 207 755 6248"), ". Or contact us for additional support.")), /*#__PURE__*/_react["default"].createElement("p", {
+  }, "+44 (0) 207 755 6248"), ". Or contact us for additional support.")), isEvergreenSubscriptionTermType && /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph o3-type-body-base"
-  }, isEvergreenSubscriptionTermType ? 'We will automatically renew your subscription using the payment method provided unless you cancel before your renewal date. ' : '', 'See our ', /*#__PURE__*/_react["default"].createElement("a", {
+  }, "We will automatically renew your subscription using the payment method provided unless you cancel before your renewal date. See our", ' ', /*#__PURE__*/_react["default"].createElement("a", {
     href: "http://help.ft.com/help/legal-privacy/terms-conditions/",
     target: "_top",
     rel: "noopener"
-  }, "Terms & Conditions"), ' for details on how to cancel.'), nextActionBottom);
+  }, "Terms & Conditions"), ' ', "for details on how to cancel."), nextActionBottom);
 }
 Confirmation.propTypes = {
   isTrial: _propTypes["default"].bool,
@@ -109,6 +111,7 @@ Confirmation.propTypes = {
   b2cPartnershipCopy: _propTypes["default"].array,
   sendConfirmationEmail: _propTypes["default"].bool,
   isEvergreenSubscriptionTermType: _propTypes["default"].bool,
+  isTermedSubscriptionTermType: _propTypes["default"].bool,
   offer: _propTypes["default"].string.isRequired,
   email: _propTypes["default"].string,
   details: _propTypes["default"].arrayOf(_propTypes["default"].shape({

package/package.json

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