@financial-times/n-conversion-forms 45.3.0 → 46.0.0

package/.toolkitstate/ci.json

@@ -1,7 +1,7 @@
 {
   "branch": "",
   "repo": "n-conversion-forms",
-  "version": "83a1121b7dce87aa2750326ecac8b77d696acb9d",
-  "tag": "v45.3.0",
-  "buildNumber": "18143"
+  "version": "36e9728ddb082df599a9273d3e2c3d5136141d47",
+  "tag": "v46.0.0",
+  "buildNumber": "18221"
 }

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

@@ -97,7 +97,7 @@ exports[`Confirmation renders appropriately if a confirmation email has not been
 </div>
 `;
 
-exports[`Confirmation renders appropriately if is 'Evergreen' subscription term type 1`] = `
+exports[`Confirmation renders appropriately if is auto-renewing subscription term type 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
@@ -147,7 +147,7 @@ exports[`Confirmation renders appropriately if is 'Evergreen' subscription term
 </div>
 `;
 
-exports[`Confirmation renders appropriately if is 'Termed' subscription term type 1`] = `
+exports[`Confirmation renders appropriately if is non-renewing subscription term type 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
@@ -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">

package/components/accept-terms-subscription.jsx

@@ -9,7 +9,7 @@ export function AcceptTermsSubscription({
 	isTrial = false,
 	isPrintProduct = false,
 	isSingleTerm = false,
-	isTermedSubscriptionTermType = false,
+	isNonRenewingSubscriptionTermType = false,
 	isTransition = false,
 	transitionType = null,
 	isDeferredBilling = false,
@@ -61,7 +61,7 @@ export function AcceptTermsSubscription({
 		</li>
 	);
 
-	if (isTermedSubscriptionTermType) {
+	if (isNonRenewingSubscriptionTermType) {
 		return (
 			<div {...divProps}>
 				<ul className="o3-typography-ul ncf__accept-terms-list">
@@ -244,7 +244,7 @@ AcceptTermsSubscription.propTypes = {
 	isTrial: PropTypes.bool,
 	isPrintProduct: PropTypes.bool,
 	isSingleTerm: PropTypes.bool,
-	isTermedSubscriptionTermType: PropTypes.bool,
+	isNonRenewingSubscriptionTermType: PropTypes.bool,
 	isTransition: PropTypes.bool,
 	transitionType: PropTypes.string,
 	isDeferredBilling: PropTypes.bool,

package/components/accept-terms-subscription.spec.js

@@ -92,9 +92,9 @@ describe('AcceptTermsSubscription', () => {
 		expect(transitionTerms.exists()).toBe(true);
 	});
 
-	it('renders the transition terms when isTermedSubscriptionTermType prop is true', () => {
+	it('renders the transition terms when isNonRenewingSubscriptionTermType prop is true', () => {
 		const props = {
-			isTermedSubscriptionTermType: true,
+			isNonRenewingSubscriptionTermType: true,
 		};
 
 		const component = mount(<AcceptTermsSubscription {...props} />);

package/components/accept-terms-subscription.stories.js

@@ -30,12 +30,12 @@ IsSingleTerm.args = {
 	isSingleTerm: true,
 };
 
-export const TermedSubscriptionTermType = (args) => (
+export const NonRenewingTermType = (args) => (
 	<AcceptTermsSubscription {...args} />
 );
 
-TermedSubscriptionTermType.args = {
-	isTermedSubscriptionTermType: true,
+NonRenewingTermType.args = {
+	isNonRenewingSubscriptionTermType: true,
 };
 
 export const IsTransition = (args) => <AcceptTermsSubscription {...args} />;

package/components/confirmation.jsx

@@ -9,8 +9,8 @@ export function Confirmation({
 	isB2cPartnership = false,
 	b2cPartnershipCopy = [],
 	sendConfirmationEmail = true,
-	isEvergreenSubscriptionTermType = true,
-	isTermedSubscriptionTermType = false,
+	isAutoRenewingSubscriptionTermType = true,
+	isNonRenewingSubscriptionTermType = false,
 	offer = '',
 	email = EMAIL_DEFAULT_TEXT,
 	details = null,
@@ -65,8 +65,9 @@ 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">
-					{isEvergreenSubscriptionTermType && 'You are now subscribed to:'}
-					{isTermedSubscriptionTermType && 'Your purchase is complete for:'}
+					{isAutoRenewingSubscriptionTermType && 'You are now subscribed to:'}
+					{isNonRenewingSubscriptionTermType &&
+						'Your purchase is complete for:'}
 				</p>
 				<h1 className="ncf__header ncf__header--confirmation">{offer}</h1>
 			</div>
@@ -92,7 +93,9 @@ export function Confirmation({
 			{newsletterScheduleExplainer}
 
 			<p className="ncf__paragraph">
-				Here’s a summary of your {offer} subscription:
+				Here’s a summary of your {offer}{' '}
+				{isAutoRenewingSubscriptionTermType && 'subscription'}
+				{isNonRenewingSubscriptionTermType && 'purchase'}:
 			</p>
 
 			{detailElements}
@@ -117,7 +120,7 @@ export function Confirmation({
 				</p>
 			</div>
 
-			{isEvergreenSubscriptionTermType && (
+			{isAutoRenewingSubscriptionTermType && (
 				<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{' '}
@@ -142,8 +145,8 @@ Confirmation.propTypes = {
 	isB2cPartnership: PropTypes.bool,
 	b2cPartnershipCopy: PropTypes.array,
 	sendConfirmationEmail: PropTypes.bool,
-	isEvergreenSubscriptionTermType: PropTypes.bool,
-	isTermedSubscriptionTermType: PropTypes.bool,
+	isAutoRenewingSubscriptionTermType: PropTypes.bool,
+	isNonRenewingSubscriptionTermType: PropTypes.bool,
 	offer: PropTypes.string.isRequired,
 	email: PropTypes.string,
 	details: PropTypes.arrayOf(

package/components/confirmation.spec.js

@@ -29,19 +29,19 @@ describe('Confirmation', () => {
 		expect(Confirmation).toRenderCorrectly(props);
 	});
 
-	it("renders appropriately if is 'Evergreen' subscription term type", () => {
+	it('renders appropriately if is auto-renewing subscription term type', () => {
 		const props = {
-			isEvergreenSubscriptionTermType: true,
-			isTermedSubscriptionTermType: false,
+			isAutoRenewingSubscriptionTermType: true,
+			isNonRenewingSubscriptionTermType: false,
 		};
 
 		expect(Confirmation).toRenderCorrectly(props);
 	});
 
-	it("renders appropriately if is 'Termed' subscription term type", () => {
+	it('renders appropriately if is non-renewing subscription term type', () => {
 		const props = {
-			isEvergreenSubscriptionTermType: false,
-			isTermedSubscriptionTermType: true,
+			isAutoRenewingSubscriptionTermType: false,
+			isNonRenewingSubscriptionTermType: true,
 		};
 
 		expect(Confirmation).toRenderCorrectly(props);

package/components/confirmation.stories.js

@@ -63,12 +63,12 @@ Basic.args = {
 	newsletterScheduleExplainer,
 };
 
-export const TermedSubscriptionTermType = (args) => <Confirmation {...args} />;
-TermedSubscriptionTermType.args = {
+export const NonRenewingTermType = (args) => <Confirmation {...args} />;
+NonRenewingTermType.args = {
 	sendConfirmationEmail: false,
-	isEvergreenTermedSubscriptionTermType: false,
-	isTermedSubscriptionTermType: true,
-	offer: 'Single-term subscription',
+	isAutoRenewingSubscriptionTermType: false,
+	isNonRenewingSubscriptionTermType: true,
+	offer: 'Standard Digital',
 	details: [
 		{
 			title: 'End date',

package/components/delivery-option.jsx

@@ -10,8 +10,8 @@ export function DeliveryOption({
 	productCode = undefined,
 	options = [],
 	isSingle = false,
-	isEvergreenSubscriptionTermType = true,
-	isTermedSubscriptionTermType = false,
+	isAutoRenewingSubscriptionTermType = true,
+	isNonRenewingSubscriptionTermType = false,
 }) {
 	const divClassName = classNames([
 		'o-forms-field',
@@ -36,8 +36,8 @@ export function DeliveryOption({
 						option,
 						shippingZone,
 						countryCode,
-						isEvergreenSubscriptionTermType,
-						isTermedSubscriptionTermType,
+						isAutoRenewingSubscriptionTermType,
+						isNonRenewingSubscriptionTermType,
 					});
 
 					if (!isValidDeliveryOption || !deliveryOptionValue) {
@@ -100,6 +100,6 @@ DeliveryOption.propTypes = {
 		})
 	),
 	isSingle: PropTypes.bool,
-	isEvergreenSubscriptionTermType: PropTypes.bool,
-	isTermedSubscriptionTermType: PropTypes.bool,
+	isAutoRenewingSubscriptionTermType: PropTypes.bool,
+	isNonRenewingSubscriptionTermType: PropTypes.bool,
 };

package/components/delivery-option.stories.js

@@ -34,12 +34,12 @@ Basic.args = {
 	],
 };
 
-export const UKPaperVoucherEvergreenDeliveryOptions = (args) => (
+export const UKPaperVoucherAutoReniewingDeliveryOptions = (args) => (
 	<div className="ncf">
 		<DeliveryOption {...args} />
 	</div>
 );
-UKPaperVoucherEvergreenDeliveryOptions.args = {
+UKPaperVoucherAutoReniewingDeliveryOptions.args = {
 	country: 'GBR',
 	options: [
 		{
@@ -47,16 +47,16 @@ UKPaperVoucherEvergreenDeliveryOptions.args = {
 			isValidDeliveryOption: true,
 		},
 	],
-	isEvergreenSubscriptionTermType: true,
-	isTermedSubscriptionTermType: false,
+	isAutoRenewingSubscriptionTermType: true,
+	isNonRenewingSubscriptionTermType: false,
 };
 
-export const UKPaperVoucherTermedDeliveryOptions = (args) => (
+export const UKPaperVoucherNonRenewingDeliveryOptions = (args) => (
 	<div className="ncf">
 		<DeliveryOption {...args} />
 	</div>
 );
-UKPaperVoucherTermedDeliveryOptions.args = {
+UKPaperVoucherNonRenewingDeliveryOptions.args = {
 	country: 'GBR',
 	options: [
 		{
@@ -64,8 +64,8 @@ UKPaperVoucherTermedDeliveryOptions.args = {
 			isValidDeliveryOption: true,
 		},
 	],
-	isEvergreenSubscriptionTermType: false,
-	isTermedSubscriptionTermType: true,
+	isAutoRenewingSubscriptionTermType: false,
+	isNonRenewingSubscriptionTermType: true,
 };
 
 export const UnitedStates5or6DaysWeekDeliveryOptions = (args) => (

package/components/payment-term.jsx

@@ -13,8 +13,8 @@ export function PaymentTerm({
 	largePrice = false,
 	optionsInARow = false,
 	billingCountry = '',
-	isEvergreenSubscriptionTermType = true,
-	isTermedSubscriptionTermType = false,
+	isAutoRenewingSubscriptionTermType = true,
+	isNonRenewingSubscriptionTermType = false,
 }) {
 	/**
 	 * Compute monthly price for given term name
@@ -228,7 +228,7 @@ export function PaymentTerm({
 						<div className="ncf__payment-term__description">
 							{nameMap[option.name].price(option.price)}
 							{nameMap[option.name].monthlyPrice(option.monthlyPrice)}
-							{isEvergreenSubscriptionTermType &&
+							{isAutoRenewingSubscriptionTermType &&
 								nameMap[option.name].renewsText()}
 							{/* Remove this discount text temporarily in favour of monthly price */}
 							{/* <br />Save up to 25% when you pay annually */}
@@ -247,7 +247,7 @@ export function PaymentTerm({
 											option.value
 										)
 							)}
-							{isEvergreenSubscriptionTermType &&
+							{isAutoRenewingSubscriptionTermType &&
 								nameMap['custom'].renewsText(getTimeFromPeriod(option.value))}
 						</div>
 					) : (
@@ -344,7 +344,7 @@ export function PaymentTerm({
 
 			{showLegal && (
 				<div className="ncf__payment-term__legal">
-					{isEvergreenSubscriptionTermType && (
+					{isAutoRenewingSubscriptionTermType && (
 						<React.Fragment>
 							<p>
 								With all subscription types, we will automatically renew your
@@ -368,7 +368,7 @@ export function PaymentTerm({
 						</React.Fragment>
 					)}
 
-					{isTermedSubscriptionTermType && (
+					{isNonRenewingSubscriptionTermType && (
 						<p className="o3-type-body-base">
 							Find out more about our cancellation policy in our{' '}
 							<a
@@ -415,8 +415,8 @@ PaymentTerm.propTypes = {
 			fulfilmentOption: PropTypes.string,
 		})
 	),
-	isEvergreenSubscriptionTermType: PropTypes.bool,
-	isTermedSubscriptionTermType: PropTypes.bool,
+	isAutoRenewingSubscriptionTermType: PropTypes.bool,
+	isNonRenewingSubscriptionTermType: PropTypes.bool,
 	showLegal: PropTypes.bool,
 	largePrice: PropTypes.bool,
 	optionsInARow: PropTypes.bool,

package/components/payment-term.spec.js

@@ -117,7 +117,7 @@ describe('PaymentTerm', () => {
 		});
 	});
 
-	describe('isEvergreenSubscriptionTermType is true; isTermedSubscriptionTermType is false', () => {
+	describe('isAutoRenewingSubscriptionTermType is true; isNonRenewingSubscriptionTermType is false', () => {
 		describe('pre-defined option name (i.e. frequency)', () => {
 			const ANNUAL_FREQUENCY = 'annual';
 			const QUARTERLY_FREQUENCY = 'quarterly';
@@ -144,8 +144,8 @@ describe('PaymentTerm', () => {
 							const wrapper = shallow(
 								<PaymentTerm
 									options={options}
-									isEvergreenSubscriptionTermType={true}
-									isTermedSubscriptionTermType={false}
+									isAutoRenewingSubscriptionTermType={true}
+									isNonRenewingSubscriptionTermType={false}
 								/>
 							);
 							expect(
@@ -174,8 +174,8 @@ describe('PaymentTerm', () => {
 				const wrapper = shallow(
 					<PaymentTerm
 						options={options}
-						isEvergreenSubscriptionTermType={true}
-						isTermedSubscriptionTermType={false}
+						isAutoRenewingSubscriptionTermType={true}
+						isNonRenewingSubscriptionTermType={false}
 					/>
 				);
 				expect(wrapper.find('.ncf__payment-term__renews-text').text()).toBe(
@@ -185,7 +185,7 @@ describe('PaymentTerm', () => {
 		});
 	});
 
-	describe('isEvergreenSubscriptionTermType is false; isTermedSubscriptionTermType is true', () => {
+	describe('isAutoRenewingSubscriptionTermType is false; isNonRenewingSubscriptionTermType is true', () => {
 		describe('options include duration expressed in weeks', () => {
 			const options = [
 				{
@@ -197,8 +197,8 @@ describe('PaymentTerm', () => {
 			const wrapper = shallow(
 				<PaymentTerm
 					options={options}
-					isEvergreenSubscriptionTermType={false}
-					isTermedSubscriptionTermType={true}
+					isAutoRenewingSubscriptionTermType={false}
+					isNonRenewingSubscriptionTermType={true}
 				/>
 			);
 
@@ -208,7 +208,7 @@ describe('PaymentTerm', () => {
 				);
 			});
 
-			it('renders description text that reflects that the termed subscription requires a single payment that expresses the per duration cost for shorter durations', () => {
+			it('renders description text that reflects that the non-renewing subscription requires a single payment that expresses the per duration cost for shorter durations', () => {
 				expect(
 					wrapper.find('.ncf__payment-term__description').text()
 				).toContain(
@@ -228,8 +228,8 @@ describe('PaymentTerm', () => {
 			const wrapper = shallow(
 				<PaymentTerm
 					options={options}
-					isEvergreenSubscriptionTermType={false}
-					isTermedSubscriptionTermType={true}
+					isAutoRenewingSubscriptionTermType={false}
+					isNonRenewingSubscriptionTermType={true}
 				/>
 			);
 
@@ -239,7 +239,7 @@ describe('PaymentTerm', () => {
 				);
 			});
 
-			it('renders description text that reflects that the termed subscription requires a single payment that expresses the per duration cost for shorter durations', () => {
+			it('renders description text that reflects that the non-renewing subscription requires a single payment that expresses the per duration cost for shorter durations', () => {
 				expect(
 					wrapper.find('.ncf__payment-term__description').text()
 				).toContain(
@@ -261,8 +261,8 @@ describe('PaymentTerm', () => {
 				const wrapper = shallow(
 					<PaymentTerm
 						options={options}
-						isEvergreenSubscriptionTermType={false}
-						isTermedSubscriptionTermType={true}
+						isAutoRenewingSubscriptionTermType={false}
+						isNonRenewingSubscriptionTermType={true}
 					/>
 				);
 				expect(wrapper.find('.ncf__payment-term__renews-text').exists()).toBe(

package/components/payment-term.stories.js

@@ -90,14 +90,14 @@ Basic.args = {
 	],
 };
 
-export const TermedSubscriptionTermType = (args) => (
+export const NonRenewingTermType = (args) => (
 	<div className="ncf">
 		<Fieldset>
 			<PaymentTerm {...args} />
 		</Fieldset>
 	</div>
 );
-TermedSubscriptionTermType.args = {
+NonRenewingTermType.args = {
 	options: [
 		{
 			name: '8 weeks',
@@ -106,7 +106,7 @@ TermedSubscriptionTermType.args = {
 			value: 'P8W',
 		},
 	],
-	isTermedSubscriptionTermType: true,
+	isNonRenewingSubscriptionTermType: true,
 };
 
 export const RenewOffers = (args) => (

package/dist/accept-terms-subscription.jsx

@@ -25,8 +25,8 @@ function AcceptTermsSubscription(_ref) {
     isPrintProduct = _ref$isPrintProduct === void 0 ? false : _ref$isPrintProduct,
     _ref$isSingleTerm = _ref.isSingleTerm,
     isSingleTerm = _ref$isSingleTerm === void 0 ? false : _ref$isSingleTerm,
-    _ref$isTermedSubscrip = _ref.isTermedSubscriptionTermType,
-    isTermedSubscriptionTermType = _ref$isTermedSubscrip === void 0 ? false : _ref$isTermedSubscrip,
+    _ref$isNonRenewingSub = _ref.isNonRenewingSubscriptionTermType,
+    isNonRenewingSubscriptionTermType = _ref$isNonRenewingSub === void 0 ? false : _ref$isNonRenewingSub,
     _ref$isTransition = _ref.isTransition,
     isTransition = _ref$isTransition === void 0 ? false : _ref$isTransition,
     _ref$transitionType = _ref.transitionType,
@@ -61,7 +61,7 @@ function AcceptTermsSubscription(_ref) {
     target: isEmbedded ? '_top' : '_blank',
     rel: "noopener noreferrer"
   }, "customer care through chat, phone or email"), "."));
-  if (isTermedSubscriptionTermType) {
+  if (isNonRenewingSubscriptionTermType) {
     return /*#__PURE__*/_react["default"].createElement("div", divProps, /*#__PURE__*/_react["default"].createElement("ul", {
       className: "o3-typography-ul ncf__accept-terms-list"
     }, /*#__PURE__*/_react["default"].createElement("li", null, /*#__PURE__*/_react["default"].createElement("span", {
@@ -135,7 +135,7 @@ AcceptTermsSubscription.propTypes = {
   isTrial: _propTypes["default"].bool,
   isPrintProduct: _propTypes["default"].bool,
   isSingleTerm: _propTypes["default"].bool,
-  isTermedSubscriptionTermType: _propTypes["default"].bool,
+  isNonRenewingSubscriptionTermType: _propTypes["default"].bool,
   isTransition: _propTypes["default"].bool,
   transitionType: _propTypes["default"].string,
   isDeferredBilling: _propTypes["default"].bool,

package/dist/confirmation.jsx

@@ -20,10 +20,10 @@ function Confirmation(_ref) {
     b2cPartnershipCopy = _ref$b2cPartnershipCo === void 0 ? [] : _ref$b2cPartnershipCo,
     _ref$sendConfirmation = _ref.sendConfirmationEmail,
     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$isAutoRenewingSu = _ref.isAutoRenewingSubscriptionTermType,
+    isAutoRenewingSubscriptionTermType = _ref$isAutoRenewingSu === void 0 ? true : _ref$isAutoRenewingSu,
+    _ref$isNonRenewingSub = _ref.isNonRenewingSubscriptionTermType,
+    isNonRenewingSubscriptionTermType = _ref$isNonRenewingSub === void 0 ? false : _ref$isNonRenewingSub,
     _ref$offer = _ref.offer,
     offer = _ref$offer === void 0 ? '' : _ref$offer,
     _ref$email = _ref.email,
@@ -74,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"
-  }, isEvergreenSubscriptionTermType && 'You are now subscribed to:', isTermedSubscriptionTermType && 'Your purchase is complete for:'), /*#__PURE__*/_react["default"].createElement("h1", {
+  }, isAutoRenewingSubscriptionTermType && 'You are now subscribed to:', isNonRenewingSubscriptionTermType && '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"
@@ -84,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, ' ', isAutoRenewingSubscriptionTermType && 'subscription', isNonRenewingSubscriptionTermType && 'purchase', ":"), detailElements, directDebitMandateUrlElement, /*#__PURE__*/_react["default"].createElement("div", {
     className: "ncf__headed-paragraph"
   }, /*#__PURE__*/_react["default"].createElement("h3", {
     className: "ncf__header"
@@ -97,7 +97,7 @@ 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.")), isEvergreenSubscriptionTermType && /*#__PURE__*/_react["default"].createElement("p", {
+  }, "+44 (0) 207 755 6248"), ". Or contact us for additional support.")), isAutoRenewingSubscriptionTermType && /*#__PURE__*/_react["default"].createElement("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", ' ', /*#__PURE__*/_react["default"].createElement("a", {
     href: "http://help.ft.com/help/legal-privacy/terms-conditions/",
@@ -110,8 +110,8 @@ Confirmation.propTypes = {
   isB2cPartnership: _propTypes["default"].bool,
   b2cPartnershipCopy: _propTypes["default"].array,
   sendConfirmationEmail: _propTypes["default"].bool,
-  isEvergreenSubscriptionTermType: _propTypes["default"].bool,
-  isTermedSubscriptionTermType: _propTypes["default"].bool,
+  isAutoRenewingSubscriptionTermType: _propTypes["default"].bool,
+  isNonRenewingSubscriptionTermType: _propTypes["default"].bool,
   offer: _propTypes["default"].string.isRequired,
   email: _propTypes["default"].string,
   details: _propTypes["default"].arrayOf(_propTypes["default"].shape({

package/dist/delivery-option.jsx

@@ -20,10 +20,10 @@ function DeliveryOption(_ref) {
     options = _ref$options === void 0 ? [] : _ref$options,
     _ref$isSingle = _ref.isSingle,
     isSingle = _ref$isSingle === void 0 ? false : _ref$isSingle,
-    _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$isAutoRenewingSu = _ref.isAutoRenewingSubscriptionTermType,
+    isAutoRenewingSubscriptionTermType = _ref$isAutoRenewingSu === void 0 ? true : _ref$isAutoRenewingSu,
+    _ref$isNonRenewingSub = _ref.isNonRenewingSubscriptionTermType,
+    isNonRenewingSubscriptionTermType = _ref$isNonRenewingSub === void 0 ? false : _ref$isNonRenewingSub;
   var divClassName = (0, _classnames["default"])(['o-forms-field', 'ncf__delivery-option', {
     'ncf__delivery-option--single': isSingle
   }]);
@@ -44,8 +44,8 @@ function DeliveryOption(_ref) {
       option: option,
       shippingZone: shippingZone,
       countryCode: countryCode,
-      isEvergreenSubscriptionTermType: isEvergreenSubscriptionTermType,
-      isTermedSubscriptionTermType: isTermedSubscriptionTermType
+      isAutoRenewingSubscriptionTermType: isAutoRenewingSubscriptionTermType,
+      isNonRenewingSubscriptionTermType: isNonRenewingSubscriptionTermType
     });
     if (!isValidDeliveryOption || !deliveryOptionValue) {
       return null;
@@ -88,6 +88,6 @@ DeliveryOption.propTypes = {
     mailDelivery: _propTypes["default"].bool
   })),
   isSingle: _propTypes["default"].bool,
-  isEvergreenSubscriptionTermType: _propTypes["default"].bool,
-  isTermedSubscriptionTermType: _propTypes["default"].bool
+  isAutoRenewingSubscriptionTermType: _propTypes["default"].bool,
+  isNonRenewingSubscriptionTermType: _propTypes["default"].bool
 };

package/dist/payment-term.jsx

@@ -31,10 +31,10 @@ function PaymentTerm(_ref) {
     optionsInARow = _ref$optionsInARow === void 0 ? false : _ref$optionsInARow,
     _ref$billingCountry = _ref.billingCountry,
     billingCountry = _ref$billingCountry === void 0 ? '' : _ref$billingCountry,
-    _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$isAutoRenewingSu = _ref.isAutoRenewingSubscriptionTermType,
+    isAutoRenewingSubscriptionTermType = _ref$isAutoRenewingSu === void 0 ? true : _ref$isAutoRenewingSu,
+    _ref$isNonRenewingSub = _ref.isNonRenewingSubscriptionTermType,
+    isNonRenewingSubscriptionTermType = _ref$isNonRenewingSub === void 0 ? false : _ref$isNonRenewingSub;
   /**
    * Compute monthly price for given term name
    * @param {number} amount price in number format
@@ -199,12 +199,12 @@ function PaymentTerm(_ref) {
         className: "ncf__payment-term__trial-price"
       }, option.trialPrice), /*#__PURE__*/_react["default"].createElement("br", null), nameMap[option.name] && nameMap[option.name].trialPrice(option.price)) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, nameMap[option.name] ? /*#__PURE__*/_react["default"].createElement("div", {
         className: "ncf__payment-term__description"
-      }, nameMap[option.name].price(option.price), nameMap[option.name].monthlyPrice(option.monthlyPrice), isEvergreenSubscriptionTermType && nameMap[option.name].renewsText()) :
+      }, nameMap[option.name].price(option.price), nameMap[option.name].monthlyPrice(option.monthlyPrice), isAutoRenewingSubscriptionTermType && nameMap[option.name].renewsText()) :
       // this should cover the cases different than annual, quarterly and monthly
       // for those containing period on option.value, render custom template, for the rest keep legacy render
       isValidPeriod(option.value) ? /*#__PURE__*/_react["default"].createElement("div", {
         className: "ncf__payment-term__description"
-      }, nameMap['custom'].price(option.price), nameMap['custom'].monthlyPrice(option.monthlyPrice && option.monthlyPrice !== '0' ? Number(option.monthlyPrice) : getMonthlyPriceFromPeriod(option.amount, option.currency, option.value)), isEvergreenSubscriptionTermType && nameMap['custom'].renewsText(getTimeFromPeriod(option.value))) : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", {
+      }, nameMap['custom'].price(option.price), nameMap['custom'].monthlyPrice(option.monthlyPrice && option.monthlyPrice !== '0' ? Number(option.monthlyPrice) : getMonthlyPriceFromPeriod(option.amount, option.currency, option.value)), isAutoRenewingSubscriptionTermType && nameMap['custom'].renewsText(getTimeFromPeriod(option.value))) : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", {
         className: largePrice ? 'ncf__payment-term__large-price' : ''
       }, option.price), option.chargeOnText && /*#__PURE__*/_react["default"].createElement("p", {
         className: "ncf__payment-term__charge-on-text"
@@ -258,14 +258,14 @@ function PaymentTerm(_ref) {
     return createPaymentTerm(option);
   })), showLegal && /*#__PURE__*/_react["default"].createElement("div", {
     className: "ncf__payment-term__legal"
-  }, isEvergreenSubscriptionTermType && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("p", null, "With all subscription types, we will automatically renew your subscription using the payment method provided unless you cancel before your renewal date."), /*#__PURE__*/_react["default"].createElement("p", {
+  }, isAutoRenewingSubscriptionTermType && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("p", null, "With all subscription types, we will automatically renew your subscription using the payment method provided unless you cancel before your renewal date."), /*#__PURE__*/_react["default"].createElement("p", {
     className: "o3-type-body-base"
   }, "We will notify you at least 14 days in advance of any changes to the price in your subscription that would apply upon next renewal. Find out more about our cancellation policy in our", ' ', /*#__PURE__*/_react["default"].createElement("a", {
     href: "https://help.ft.com/legal-privacy/terms-and-conditions/",
     title: "FT Legal Terms and Conditions help page",
     target: "_blank",
     rel: "noopener noreferrer"
-  }, "Terms & Conditions"), ".")), isTermedSubscriptionTermType && /*#__PURE__*/_react["default"].createElement("p", {
+  }, "Terms & Conditions"), ".")), isNonRenewingSubscriptionTermType && /*#__PURE__*/_react["default"].createElement("p", {
     className: "o3-type-body-base"
   }, "Find out more about our cancellation policy in our", ' ', /*#__PURE__*/_react["default"].createElement("a", {
     href: "https://help.ft.com/legal-privacy/terms-and-conditions/",
@@ -299,8 +299,8 @@ PaymentTerm.propTypes = {
     chargeOnText: _propTypes["default"].string,
     fulfilmentOption: _propTypes["default"].string
   })),
-  isEvergreenSubscriptionTermType: _propTypes["default"].bool,
-  isTermedSubscriptionTermType: _propTypes["default"].bool,
+  isAutoRenewingSubscriptionTermType: _propTypes["default"].bool,
+  isNonRenewingSubscriptionTermType: _propTypes["default"].bool,
   showLegal: _propTypes["default"].bool,
   largePrice: _propTypes["default"].bool,
   optionsInARow: _propTypes["default"].bool,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/n-conversion-forms",
-  "version": "45.3.0",
+  "version": "46.0.0",
   "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": {

package/utils/delivery-option-messages.js

@@ -40,19 +40,19 @@ const countryCodeToCustomDeliveryOptionsMap = {
 		PV: {
 			title: 'Paper vouchers',
 			description: ({
-				isEvergreenSubscriptionTermType,
-				isTermedSubscriptionTermType,
+				isAutoRenewingSubscriptionTermType,
+				isNonRenewingSubscriptionTermType,
 			}) => {
-				if (isEvergreenSubscriptionTermType) {
+				if (isAutoRenewingSubscriptionTermType) {
 					return '13-week voucher pack delivered quarterly and redeemable at retailers nationwide.';
 				}
 
-				if (isTermedSubscriptionTermType) {
+				if (isNonRenewingSubscriptionTermType) {
 					// Note: This wording relates to a specific offer: UK Retail Sampling
 					// • Production environment offer ID: f9f6383d-98fd-4655-9bc8-2b22bfda8bab
 					// • Test environment offer ID: 83fd2c19-2899-4e59-8929-aeb1e0cae096
 					// Should in the future there be additional offers for
-					// Termed subscriptions then this approach will need to be revised.
+					// non-renewing subscriptions then this approach will need to be revised.
 					return '6 flexible vouchers that can be exchanged for a copy of FT Weekend over a 13-week period at retailers nationwide.';
 				}
 
@@ -331,8 +331,8 @@ function getDeliveryOption({
 	option,
 	shippingZone,
 	countryCode,
-	isEvergreenSubscriptionTermType,
-	isTermedSubscriptionTermType,
+	isAutoRenewingSubscriptionTermType,
+	isNonRenewingSubscriptionTermType,
 }) {
 	let deliveryOption;
 
@@ -347,8 +347,8 @@ function getDeliveryOption({
 			...deliveryOption,
 			// Set `description` value as string returned from function.
 			description: deliveryOption?.description({
-				isEvergreenSubscriptionTermType,
-				isTermedSubscriptionTermType,
+				isAutoRenewingSubscriptionTermType,
+				isNonRenewingSubscriptionTermType,
 			}),
 		};
 

package/utils/delivery-option-messages.spec.js

@@ -142,8 +142,8 @@ describe('Find Custom Delivery Option', () => {
 	});
 
 	describe('find UK Paper Vouchers delivery option', () => {
-		describe('Evergreen (i.e. recurring) subscription term type', () => {
-			it('returns UK Paper Vouchers delivery option for Evergreen subscription term type', () => {
+		describe('Auto-renewing subscription term type', () => {
+			it('returns UK Paper Vouchers delivery option for auto-renewing subscription term type', () => {
 				const expected = {
 					title: 'Paper vouchers',
 					description:
@@ -155,16 +155,16 @@ describe('Find Custom Delivery Option', () => {
 					option: { value: 'PV' },
 					shippingZone: 'GBR',
 					countryCode: 'GBR',
-					isEvergreenSubscriptionTermType: true,
-					isTermedSubscriptionTermType: false,
+					isAutoRenewingSubscriptionTermType: true,
+					isNonRenewingSubscriptionTermType: false,
 				});
 
 				expect(deliveryOption).toEqual(expected);
 			});
 		});
 
-		describe('Termed (i.e. single-term) subscription term type', () => {
-			it('returns UK Paper Vouchers delivery option for Termed subscription term type', () => {
+		describe('Non-renewing subscription term type', () => {
+			it('returns UK Paper Vouchers delivery option for non-renewing subscription term type', () => {
 				const expected = {
 					title: 'Paper vouchers',
 					description:
@@ -176,8 +176,8 @@ describe('Find Custom Delivery Option', () => {
 					option: { value: 'PV' },
 					shippingZone: 'GBR',
 					countryCode: 'GBR',
-					isEvergreenSubscriptionTermType: false,
-					isTermedSubscriptionTermType: true,
+					isAutoRenewingSubscriptionTermType: false,
+					isNonRenewingSubscriptionTermType: true,
 				});
 
 				expect(deliveryOption).toEqual(expected);