@financial-times/n-conversion-forms 38.0.0 → 39.1.0

package/.toolkitstate/ci.json

@@ -1,6 +1,6 @@
 {
   "branch": "",
   "repo": "n-conversion-forms",
-  "version": "31e041f551d5077e705e60bc10e33df6fe32fd0f",
-  "tag": "v38.0.0"
+  "version": "2ce80553a6a4138f542dce9682a45bf0b108fe43",
+  "tag": "v39.1.0"
 }

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

@@ -1,13 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`B2CPartnershipConfirmation renders FT access if subscription prop is null 1`] = `
+exports[`B2CPartnershipConfirmation renders Digital Edition access for Digital Edition subscription lowercase 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your FT access
+        Welcome to your Digital Edition access
       </h1>
     </div>
   </div>
@@ -40,14 +40,14 @@ exports[`B2CPartnershipConfirmation renders FT access if subscription prop is nu
 </div>
 `;
 
-exports[`B2CPartnershipConfirmation renders FT access if subscription prop is undefined 1`] = `
+exports[`B2CPartnershipConfirmation renders Digital Edition access for Digital Edition subscription uppercase 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your FT access
+        Welcome to your Digital Edition access
       </h1>
     </div>
   </div>
@@ -80,14 +80,14 @@ exports[`B2CPartnershipConfirmation renders FT access if subscription prop is un
 </div>
 `;
 
-exports[`B2CPartnershipConfirmation renders Premium access for premium subscription lowercase 1`] = `
+exports[`B2CPartnershipConfirmation renders FT access if subscription prop is null 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your Premium access
+        Welcome to your FT access
       </h1>
     </div>
   </div>
@@ -120,14 +120,14 @@ exports[`B2CPartnershipConfirmation renders Premium access for premium subscript
 </div>
 `;
 
-exports[`B2CPartnershipConfirmation renders Premium access for premium subscription uppercase 1`] = `
+exports[`B2CPartnershipConfirmation renders FT access if subscription prop is undefined 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your Premium access
+        Welcome to your FT access
       </h1>
     </div>
   </div>
@@ -160,14 +160,14 @@ exports[`B2CPartnershipConfirmation renders Premium access for premium subscript
 </div>
 `;
 
-exports[`B2CPartnershipConfirmation renders Standard access for standard subscription lowercase 1`] = `
+exports[`B2CPartnershipConfirmation renders Premium access for premium subscription lowercase 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your Standard access
+        Welcome to your Premium access
       </h1>
     </div>
   </div>
@@ -200,14 +200,14 @@ exports[`B2CPartnershipConfirmation renders Standard access for standard subscri
 </div>
 `;
 
-exports[`B2CPartnershipConfirmation renders Standard access for standard subscription uppercase 1`] = `
+exports[`B2CPartnershipConfirmation renders Premium access for premium subscription uppercase 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your Standard access
+        Welcome to your Premium access
       </h1>
     </div>
   </div>
@@ -240,14 +240,14 @@ exports[`B2CPartnershipConfirmation renders Standard access for standard subscri
 </div>
 `;
 
-exports[`B2CPartnershipConfirmation renders as default 1`] = `
+exports[`B2CPartnershipConfirmation renders Standard access for standard subscription lowercase 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your FT access
+        Welcome to your Standard access
       </h1>
     </div>
   </div>
@@ -280,14 +280,14 @@ exports[`B2CPartnershipConfirmation renders as default 1`] = `
 </div>
 `;
 
-exports[`B2CPartnershipConfirmation renders ePaper access for ePaper subscription lowercase 1`] = `
+exports[`B2CPartnershipConfirmation renders Standard access for standard subscription uppercase 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your ePaper access
+        Welcome to your Standard access
       </h1>
     </div>
   </div>
@@ -320,14 +320,14 @@ exports[`B2CPartnershipConfirmation renders ePaper access for ePaper subscriptio
 </div>
 `;
 
-exports[`B2CPartnershipConfirmation renders ePaper access for ePaper subscription uppercase 1`] = `
+exports[`B2CPartnershipConfirmation renders as default 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">
     <div class="ncf__icon ncf__icon--tick ncf__icon--large">
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your ePaper access
+        Welcome to your FT access
       </h1>
     </div>
   </div>

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

@@ -383,7 +383,7 @@ exports[`Confirmation renders appropriately if nextActionBottom is supplied 1`]
     </a>
     for details on how to cancel.
   </p>
-  i might take you to the ePaper
+  i might take you to the Digital Edition
 </div>
 `;
 

package/components/__snapshots__/delivery-option.spec.js.snap

@@ -1,5 +1,35 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`DeliveryOption renders a print offer HD for LUX country 1`] = `
+<div id="deliveryOptionField"
+     class="o-forms-field ncf__delivery-option"
+     role="group"
+     aria-label="Delivery options"
+>
+  <span class="o-forms-input o-forms-input--radio-round">
+    <label class="ncf__delivery-option__item"
+           for="HD"
+    >
+      <input type="radio"
+             id="HD"
+             name="deliveryOption"
+             value="HD"
+             class="ncf__delivery-option__input"
+             checked
+      >
+      <span class="o-forms-input__label ncf__delivery-option__label">
+        <span class="ncf__delivery-option__title o-forms-title__main">
+          Hand delivery
+        </span>
+        <div class="ncf__delivery-option__description">
+          Enjoy delivery of the newspaper daily to your home or office address.
+        </div>
+      </span>
+    </label>
+  </span>
+</div>
+`;
+
 exports[`DeliveryOption renders with USA print offer 1`] = `
 <div id="deliveryOptionField"
      class="o-forms-field ncf__delivery-option"
@@ -40,7 +70,7 @@ exports[`DeliveryOption renders with USA print offer 1`] = `
           Mail
         </span>
         <div class="ncf__delivery-option__description">
-          We can only deliver the FT Weekend newspaper to your location by postal mail which means your delivery will arrive up to 5 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT&#x27;s control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT ePaper - a digital replica of the print edition.
+          We can only deliver the FT Weekend newspaper to your location by postal mail which means your delivery will arrive up to 5 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT&#x27;s control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT Digital Edition - a digital replica of the print edition.
         </div>
       </span>
     </label>

package/components/b2c-partnership-confirmation.jsx

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 const productCodeMapping = {
 	P1: 'Standard',
 	P2: 'Premium',
-	EP: 'ePaper',
+	EP: 'Digital Edition',
 };
 
 export function B2CPartnershipConfirmation({
@@ -23,7 +23,7 @@ export function B2CPartnershipConfirmation({
 
 	// Welcome to your Standard access
 	// Welcome to your Premium access
-	// Welcome to your ePaper access
+	// Welcome to your Digital Edition access
 	// Welcome to your FT access (default)
 	const accessType = productCodeMapping[productCode?.toUpperCase()] || 'FT';
 

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

@@ -34,13 +34,13 @@ describe('B2CPartnershipConfirmation', () => {
 		expect(B2CPartnershipConfirmation).toRenderCorrectly(props);
 	});
 
-	it('renders ePaper access for ePaper subscription lowercase', () => {
+	it('renders Digital Edition access for Digital Edition subscription lowercase', () => {
 		const props = { ctaElement: 'hello', productCode: 'ep' };
 
 		expect(B2CPartnershipConfirmation).toRenderCorrectly(props);
 	});
 
-	it('renders ePaper access for ePaper subscription uppercase', () => {
+	it('renders Digital Edition access for Digital Edition subscription uppercase', () => {
 		const props = { ctaElement: 'hello', productCode: 'EP' };
 
 		expect(B2CPartnershipConfirmation).toRenderCorrectly(props);

package/components/confirmation.spec.js

@@ -5,7 +5,7 @@ expect.extend(expectToRenderCorrectly);
 
 const OFFER_TEXT = 'Offer text';
 const nextActionTop = ['i might take you to tailor your experience'];
-const nextActionBottom = ['i might take you to the ePaper'];
+const nextActionBottom = ['i might take you to the Digital Edition'];
 const newsletterScheduleExplainer = [
 	'You will receive your first newsletter on the next weekday to foo@bar.com',
 ];

package/components/delivery-address.jsx

@@ -7,10 +7,7 @@ import {
 	addressLine2AutoComplete,
 	addressLine3AutoComplete,
 } from '../helpers/constants';
-import {
-	identifyFTShippingZone,
-	countriesSupportedISO,
-} from '../helpers/supportedCountries';
+import { identifyShippingZone } from '../helpers/supportedCountries';
 
 export function DeliveryAddress({
 	fieldId = 'deliveryAddressFields',
@@ -29,7 +26,7 @@ export function DeliveryAddress({
 		'o-forms-input--text',
 		{ 'o-forms-input--invalid': hasError },
 	]);
-	const FTShippingZone = identifyFTShippingZone(country);
+	const shippingZone = identifyShippingZone(country);
 
 	const addressLine1 = (
 		<label
@@ -38,7 +35,7 @@ export function DeliveryAddress({
 		>
 			<span className="o-forms-title">
 				<span className="o-forms-title__main">
-					{deliveryAddressMap[addressType].addressLine1Title[FTShippingZone] ||
+					{deliveryAddressMap[addressType].addressLine1Title[shippingZone] ||
 						'Address line 1'}
 				</span>
 			</span>
@@ -51,8 +48,8 @@ export function DeliveryAddress({
 					autoComplete={addressLine1AutoComplete}
 					placeholder={
 						deliveryAddressMap[addressType].addressLine1Placeholder[
-							FTShippingZone
-						]
+							shippingZone
+						] || ''
 					}
 					maxLength={50}
 					aria-required="true"
@@ -83,12 +80,12 @@ export function DeliveryAddress({
 					data-trackable="field-deliveryAddressLine2"
 					autoComplete={
 						deliveryAddressMap[addressType].addressLine2AutoComplete[
-							FTShippingZone
+							shippingZone
 						] || addressLine2AutoComplete
 					}
 					placeholder={
 						deliveryAddressMap[addressType].addressLine2Placeholder[
-							FTShippingZone
+							shippingZone
 						] || ''
 					}
 					maxLength={50}
@@ -106,10 +103,10 @@ export function DeliveryAddress({
 		>
 			<span className="o-forms-title">
 				<span className="o-forms-title__main">
-					{deliveryAddressMap[addressType].addressLine3Title[FTShippingZone]}
+					{deliveryAddressMap[addressType].addressLine3Title[shippingZone]}
 				</span>
 				<span className="o-forms-title__prompt">
-					{deliveryAddressMap[addressType].addressLine3Prompt[FTShippingZone]}
+					{deliveryAddressMap[addressType].addressLine3Prompt[shippingZone]}
 				</span>
 			</span>
 			<span className={inputWrapperClassNames}>
@@ -120,12 +117,12 @@ export function DeliveryAddress({
 					data-trackable="field-deliveryAddressLine3"
 					autoComplete={
 						deliveryAddressMap[addressType].addressLine3AutoComplete[
-							FTShippingZone
+							shippingZone
 						] || addressLine3AutoComplete
 					}
 					placeholder={
 						deliveryAddressMap[addressType].addressLine3Placeholder[
-							FTShippingZone
+							shippingZone
 						] || 'e.g. Apt. 1'
 					}
 					maxLength={
@@ -141,7 +138,7 @@ export function DeliveryAddress({
 		addressLine1,
 		addressLine2,
 		addressLine3,
-		FTShippingZone
+		shippingZone
 	);
 
 	return (
@@ -159,6 +156,6 @@ DeliveryAddress.propTypes = {
 	line3: PropTypes.string,
 	isDisabled: PropTypes.bool,
 	isHidden: PropTypes.bool,
-	country: PropTypes.oneOf(countriesSupportedISO),
+	country: PropTypes.string,
 	addressType: PropTypes.oneOf(['home', 'company', 'pobox']),
 };

package/components/delivery-city.jsx

@@ -1,10 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import {
-	countriesSupportedISO,
-	identifyFTShippingZone,
-} from '../helpers/supportedCountries';
+import { identifyShippingZone } from '../helpers/supportedCountries';
 
 export function DeliveryCity({
 	hasError = false,
@@ -24,15 +21,15 @@ export function DeliveryCity({
 		CAN: 'e.g. Montreal',
 		ARE: 'e.g. Dubai',
 	};
-	const FTShippingZone = identifyFTShippingZone(country);
+	const shippingZone = identifyShippingZone(country);
 
 	const labelMapping = {
 		ARE: 'Emirate or City',
 		APAC: 'City/Prefecture',
 		DEFAULT: 'City',
 	};
-	const inputLabel = labelMapping[FTShippingZone]
-		? labelMapping[FTShippingZone]
+	const inputLabel = labelMapping[shippingZone]
+		? labelMapping[shippingZone]
 		: labelMapping['DEFAULT'];
 
 	return (
@@ -72,5 +69,5 @@ DeliveryCity.propTypes = {
 	value: PropTypes.string,
 	isDisabled: PropTypes.bool,
 	maxlength: PropTypes.number,
-	country: PropTypes.oneOf(countriesSupportedISO),
+	country: PropTypes.string,
 };

package/components/delivery-instructions.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { identifyFTShippingZone } from '../helpers/supportedCountries';
+import { identifyShippingZone } from '../helpers/supportedCountries';
 
 const spanMessageByCountry = {
 	GBR: (
@@ -99,7 +99,7 @@ export function DeliveryInstructions({
 	fieldId = 'deliveryInstructionsField',
 	hasError = false,
 	inputId = 'deliveryInstructions',
-	maxlength = null,
+	maxlength = '',
 	rows = null,
 	isDisabled = false,
 	placeholder = '',
@@ -111,12 +111,12 @@ export function DeliveryInstructions({
 		'o-forms-input--textarea',
 		{ 'o-forms-input--invalid': hasError },
 	]);
-	const FTShippingZone = identifyFTShippingZone(country);
+	const shippingZone = identifyShippingZone(country);
 	const extraInstruction =
 		country === 'GBR'
 			? ''
 			: '\u000a- Special handling, e.g. place in plastic bag, 24/7 security on reception';
-	const defaultPlaceholder = {
+	const shippingZoneToPlaceholderMap = {
 		CEMEA_V1: `Enter instructions ${
 			maxlength && `(Max. ${maxlength} characters)`
 		}:\u000a- Door colour, letterbox location\u000a- Door entry codes, etc.`,
@@ -134,13 +134,20 @@ export function DeliveryInstructions({
 		}:\u000a- Door colour, driveway signage\u000a- Cross street${extraInstruction}`,
 	};
 
+	const defaultPlaceholder = `Enter instructions ${
+		maxlength && `(Max. ${maxlength} characters)`
+	}:\u000a- Door colour, letterbox location\u000a- Door entry codes, etc.`;
+
 	const textAreaProps = {
 		id: inputId,
 		name: inputId,
 		...(maxlength && { maxLength: maxlength }),
 		...(rows && { rows }),
 		'data-trackable': 'field-deliveryInstructions',
-		placeholder: placeholder ? placeholder : defaultPlaceholder[FTShippingZone],
+		placeholder:
+			placeholder ||
+			shippingZoneToPlaceholderMap[shippingZone] ||
+			defaultPlaceholder,
 		disabled: isDisabled,
 		defaultValue: value,
 	};
@@ -160,7 +167,7 @@ export function DeliveryInstructions({
 		>
 			<span className="o-forms-title">
 				<span className="o-forms-title__main">Delivery instructions</span>
-				{spanMessageByCountry[FTShippingZone]}
+				{spanMessageByCountry[shippingZone]}
 				{country === 'GBR' && deliveryInstructionsMessage}
 			</span>
 
@@ -177,5 +184,5 @@ DeliveryInstructions.propTypes = {
 	rows: PropTypes.number,
 	isDisabled: PropTypes.bool,
 	value: PropTypes.string,
-	country: PropTypes.oneOf(['GBR', 'USA', 'CAN']).isRequired,
+	country: PropTypes.string.isRequired,
 };

package/components/delivery-instructions.stories.js

@@ -10,17 +10,38 @@ export default {
 	},
 };
 
-export const Basic = (args) => <DeliveryInstructions {...args} />;
-Basic.args = {
+export const GreatBritainDeliveryInstructions = (args) => (
+	<DeliveryInstructions {...args} />
+);
+GreatBritainDeliveryInstructions.args = {
 	country: 'GBR',
+	maxlength: 50,
 };
 
-export const SpanMessageForUSA = (args) => <DeliveryInstructions {...args} />;
-SpanMessageForUSA.args = {
+export const UnitedStatesDeliveryInstructions = (args) => (
+	<DeliveryInstructions {...args} />
+);
+UnitedStatesDeliveryInstructions.args = {
 	country: 'USA',
 };
 
-export const SpanMessageForCAN = (args) => <DeliveryInstructions {...args} />;
-SpanMessageForCAN.args = {
+export const CanadaDeliveryInstructions = (args) => (
+	<DeliveryInstructions {...args} />
+);
+CanadaDeliveryInstructions.args = {
 	country: 'CAN',
 };
+
+export const LuxembourgDeliveryInstructions = (args) => (
+	<DeliveryInstructions {...args} />
+);
+LuxembourgDeliveryInstructions.args = {
+	country: 'LUX',
+};
+
+export const BosniaDeliveryInstructions = (args) => (
+	<DeliveryInstructions {...args} />
+);
+BosniaDeliveryInstructions.args = {
+	country: 'BIH',
+};

package/components/delivery-option.jsx

@@ -2,10 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { getDeliveryOption } from '../utils/delivery-option-messages';
-import {
-	identifyFTShippingZone,
-	countriesSupportedISO,
-} from '../helpers/supportedCountries';
+import { identifyShippingZone } from '../helpers/supportedCountries';
 
 export function DeliveryOption({
 	fieldId = 'deliveryOptionField',
@@ -20,7 +17,7 @@ export function DeliveryOption({
 		{ 'ncf__delivery-option--single': isSingle },
 	]);
 
-	const shippingZone = identifyFTShippingZone(countryCode);
+	const shippingZone = identifyShippingZone(countryCode);
 
 	return (
 		<div
@@ -87,7 +84,7 @@ export function DeliveryOption({
 }
 
 DeliveryOption.propTypes = {
-	country: PropTypes.oneOf(countriesSupportedISO).isRequired,
+	country: PropTypes.string.isRequired,
 	productCode: PropTypes.string,
 	options: PropTypes.arrayOf(
 		PropTypes.shape({

package/components/delivery-option.spec.js

@@ -128,4 +128,23 @@ describe('DeliveryOption', () => {
 
 		expect(DeliveryOption).toRenderCorrectly(props);
 	});
+
+	it('renders a print offer HD for LUX country', () => {
+		const props = {
+			country: 'LUX',
+			productCode: 'EPNWE',
+			options: [
+				{
+					value: 'HD',
+					isSelected: true,
+					isValidDeliveryOption: true,
+					deliveryOnPublicationDate: false,
+					flightMarket: true,
+					mailDelivery: false,
+				},
+			],
+		};
+
+		expect(DeliveryOption).toRenderCorrectly(props);
+	});
 });

package/components/delivery-option.stories.js

@@ -104,3 +104,23 @@ JapanDeliveryOptions.args = {
 		},
 	],
 };
+
+export const LuxembourgDeliveryOptions = (args) => (
+	<div className="ncf">
+		<DeliveryOption {...args} />
+	</div>
+);
+LuxembourgDeliveryOptions.args = {
+	country: 'LUX',
+	productCode: 'EPNWE',
+	options: [
+		{
+			value: 'HD',
+			isSelected: true,
+			isValidDeliveryOption: true,
+			deliveryOnPublicationDate: false,
+			flightMarket: true,
+			mailDelivery: false,
+		},
+	],
+};

package/components/payment-term.jsx

@@ -7,7 +7,7 @@ export function PaymentTerm({
 	fieldId = 'paymentTermField',
 	inputName = 'paymentTerm',
 	isPrintOrBundle = false,
-	isEpaper = false,
+	isDigitalEdition = false,
 	options = [],
 	showLegal = true,
 	largePrice = false,
@@ -278,7 +278,7 @@ export function PaymentTerm({
 
 		const getTermDisplayName = () => {
 			const showTrialCopyInTitle =
-				option.isTrial && !isPrintOrBundle && !isEpaper;
+				option.isTrial && !isPrintOrBundle && !isDigitalEdition;
 
 			// https://financialtimes.atlassian.net/browse/ACQ-2592
 			// We need to have one specific trial offer to have terms displayed as non-trial.
@@ -410,7 +410,7 @@ PaymentTerm.propTypes = {
 	fieldId: PropTypes.string,
 	inputName: PropTypes.string,
 	isPrintOrBundle: PropTypes.bool,
-	isEpaper: PropTypes.bool,
+	isDigitalEdition: PropTypes.bool,
 	options: PropTypes.arrayOf(
 		PropTypes.shape({
 			b2cDiscountCopy: PropTypes.string,

package/dist/b2c-partnership-confirmation.jsx

@@ -10,7 +10,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var productCodeMapping = {
   P1: 'Standard',
   P2: 'Premium',
-  EP: 'ePaper'
+  EP: 'Digital Edition'
 };
 function B2CPartnershipConfirmation(_ref) {
   var _ref$ctaElement = _ref.ctaElement,
@@ -28,7 +28,7 @@ function B2CPartnershipConfirmation(_ref) {
 
   // Welcome to your Standard access
   // Welcome to your Premium access
-  // Welcome to your ePaper access
+  // Welcome to your Digital Edition access
   // Welcome to your FT access (default)
   var accessType = productCodeMapping[productCode === null || productCode === void 0 ? void 0 : productCode.toUpperCase()] || 'FT';
   return /*#__PURE__*/_react["default"].createElement("div", {

package/dist/delivery-address.jsx

@@ -36,7 +36,7 @@ function DeliveryAddress(_ref) {
   var inputWrapperClassNames = (0, _classnames["default"])(['o-forms-input', 'o-forms-input--text', {
     'o-forms-input--invalid': hasError
   }]);
-  var FTShippingZone = (0, _supportedCountries.identifyFTShippingZone)(country);
+  var shippingZone = (0, _supportedCountries.identifyShippingZone)(country);
   var addressLine1 = /*#__PURE__*/_react["default"].createElement("label", {
     className: "o-forms-field ncf__validation-error",
     htmlFor: "deliveryAddressLine1"
@@ -44,7 +44,7 @@ function DeliveryAddress(_ref) {
     className: "o-forms-title"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__main"
-  }, _deliveryAddressMap["default"][addressType].addressLine1Title[FTShippingZone] || 'Address line 1')), /*#__PURE__*/_react["default"].createElement("span", {
+  }, _deliveryAddressMap["default"][addressType].addressLine1Title[shippingZone] || 'Address line 1')), /*#__PURE__*/_react["default"].createElement("span", {
     className: inputWrapperClassNames
   }, /*#__PURE__*/_react["default"].createElement("input", {
     type: "text",
@@ -52,7 +52,7 @@ function DeliveryAddress(_ref) {
     name: "deliveryAddressLine1",
     "data-trackable": "field-deliveryAddressLine1",
     autoComplete: _constants.addressLine1AutoComplete,
-    placeholder: _deliveryAddressMap["default"][addressType].addressLine1Placeholder[FTShippingZone],
+    placeholder: _deliveryAddressMap["default"][addressType].addressLine1Placeholder[shippingZone] || '',
     maxLength: 50,
     "aria-required": "true",
     required: true,
@@ -75,8 +75,8 @@ function DeliveryAddress(_ref) {
     id: "deliveryAddressLine2",
     name: "deliveryAddressLine2",
     "data-trackable": "field-deliveryAddressLine2",
-    autoComplete: _deliveryAddressMap["default"][addressType].addressLine2AutoComplete[FTShippingZone] || _constants.addressLine2AutoComplete,
-    placeholder: _deliveryAddressMap["default"][addressType].addressLine2Placeholder[FTShippingZone] || '',
+    autoComplete: _deliveryAddressMap["default"][addressType].addressLine2AutoComplete[shippingZone] || _constants.addressLine2AutoComplete,
+    placeholder: _deliveryAddressMap["default"][addressType].addressLine2Placeholder[shippingZone] || '',
     maxLength: 50,
     disabled: isDisabled,
     defaultValue: line2
@@ -88,22 +88,22 @@ function DeliveryAddress(_ref) {
     className: "o-forms-title"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__main"
-  }, _deliveryAddressMap["default"][addressType].addressLine3Title[FTShippingZone]), /*#__PURE__*/_react["default"].createElement("span", {
+  }, _deliveryAddressMap["default"][addressType].addressLine3Title[shippingZone]), /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__prompt"
-  }, _deliveryAddressMap["default"][addressType].addressLine3Prompt[FTShippingZone])), /*#__PURE__*/_react["default"].createElement("span", {
+  }, _deliveryAddressMap["default"][addressType].addressLine3Prompt[shippingZone])), /*#__PURE__*/_react["default"].createElement("span", {
     className: inputWrapperClassNames
   }, /*#__PURE__*/_react["default"].createElement("input", {
     type: "text",
     id: "deliveryAddressLine3",
     name: "deliveryAddressLine3",
     "data-trackable": "field-deliveryAddressLine3",
-    autoComplete: _deliveryAddressMap["default"][addressType].addressLine3AutoComplete[FTShippingZone] || _constants.addressLine3AutoComplete,
-    placeholder: _deliveryAddressMap["default"][addressType].addressLine3Placeholder[FTShippingZone] || 'e.g. Apt. 1',
+    autoComplete: _deliveryAddressMap["default"][addressType].addressLine3AutoComplete[shippingZone] || _constants.addressLine3AutoComplete,
+    placeholder: _deliveryAddressMap["default"][addressType].addressLine3Placeholder[shippingZone] || 'e.g. Apt. 1',
     maxLength: _deliveryAddressMap["default"][addressType].addressLine3MaxLength[country] || 50,
     disabled: isDisabled,
     defaultValue: line3
   })));
-  var addressLines = _deliveryAddressMap["default"][addressType].template(addressLine1, addressLine2, addressLine3, FTShippingZone);
+  var addressLines = _deliveryAddressMap["default"][addressType].template(addressLine1, addressLine2, addressLine3, shippingZone);
   return /*#__PURE__*/_react["default"].createElement("div", {
     id: fieldId,
     "data-validate": "required",
@@ -118,6 +118,6 @@ DeliveryAddress.propTypes = {
   line3: _propTypes["default"].string,
   isDisabled: _propTypes["default"].bool,
   isHidden: _propTypes["default"].bool,
-  country: _propTypes["default"].oneOf(_supportedCountries.countriesSupportedISO),
+  country: _propTypes["default"].string,
   addressType: _propTypes["default"].oneOf(['home', 'company', 'pobox'])
 };

package/dist/delivery-city.jsx

@@ -27,13 +27,13 @@ function DeliveryCity(_ref) {
     CAN: 'e.g. Montreal',
     ARE: 'e.g. Dubai'
   };
-  var FTShippingZone = (0, _supportedCountries.identifyFTShippingZone)(country);
+  var shippingZone = (0, _supportedCountries.identifyShippingZone)(country);
   var labelMapping = {
     ARE: 'Emirate or City',
     APAC: 'City/Prefecture',
     DEFAULT: 'City'
   };
-  var inputLabel = labelMapping[FTShippingZone] ? labelMapping[FTShippingZone] : labelMapping['DEFAULT'];
+  var inputLabel = labelMapping[shippingZone] ? labelMapping[shippingZone] : labelMapping['DEFAULT'];
   return /*#__PURE__*/_react["default"].createElement("label", {
     id: "deliveryCityField",
     className: "o-forms-field ncf__validation-error",
@@ -66,5 +66,5 @@ DeliveryCity.propTypes = {
   value: _propTypes["default"].string,
   isDisabled: _propTypes["default"].bool,
   maxlength: _propTypes["default"].number,
-  country: _propTypes["default"].oneOf(_supportedCountries.countriesSupportedISO)
+  country: _propTypes["default"].string
 };

package/dist/delivery-instructions.jsx

@@ -62,7 +62,7 @@ function DeliveryInstructions(_ref) {
     _ref$inputId = _ref.inputId,
     inputId = _ref$inputId === void 0 ? 'deliveryInstructions' : _ref$inputId,
     _ref$maxlength = _ref.maxlength,
-    maxlength = _ref$maxlength === void 0 ? null : _ref$maxlength,
+    maxlength = _ref$maxlength === void 0 ? '' : _ref$maxlength,
     _ref$rows = _ref.rows,
     rows = _ref$rows === void 0 ? null : _ref$rows,
     _ref$isDisabled = _ref.isDisabled,
@@ -75,15 +75,16 @@ function DeliveryInstructions(_ref) {
   var textAreaWrapperClassNames = (0, _classnames["default"])(['o-forms-input', 'o-forms-input--textarea', {
     'o-forms-input--invalid': hasError
   }]);
-  var FTShippingZone = (0, _supportedCountries.identifyFTShippingZone)(country);
+  var shippingZone = (0, _supportedCountries.identifyShippingZone)(country);
   var extraInstruction = country === 'GBR' ? '' : "\n- Special handling, e.g. place in plastic bag, 24/7 security on reception";
-  var defaultPlaceholder = {
+  var shippingZoneToPlaceholderMap = {
     CEMEA_V1: "Enter instructions ".concat(maxlength && "(Max. ".concat(maxlength, " characters)"), ":\n- Door colour, letterbox location\n- Door entry codes, etc."),
     CEMEA_V2: "Enter instructions ".concat(maxlength && "(Max. ".concat(maxlength, " characters)"), ":\n- Door colour, letterbox location\n- Door entry codes, etc."),
     GBR: "Enter instructions ".concat(maxlength && "(Max. ".concat(maxlength, " characters)"), ":\n- Door colour, letterbox location\n- Placement i.e. letterbox delivery").concat(extraInstruction),
     USA: "Enter instructions ".concat(maxlength && "(Max. ".concat(maxlength, " characters)"), ":\n- Door colour, driveway signage\n- Cross street").concat(extraInstruction),
     CAN: "Enter instructions ".concat(maxlength && "(Max. ".concat(maxlength, " characters)"), ":\n- Door colour, driveway signage\n- Cross street").concat(extraInstruction)
   };
+  var defaultPlaceholder = "Enter instructions ".concat(maxlength && "(Max. ".concat(maxlength, " characters)"), ":\n- Door colour, letterbox location\n- Door entry codes, etc.");
   var textAreaProps = _objectSpread(_objectSpread(_objectSpread({
     id: inputId,
     name: inputId
@@ -93,7 +94,7 @@ function DeliveryInstructions(_ref) {
     rows: rows
   }), {}, {
     'data-trackable': 'field-deliveryInstructions',
-    placeholder: placeholder ? placeholder : defaultPlaceholder[FTShippingZone],
+    placeholder: placeholder || shippingZoneToPlaceholderMap[shippingZone] || defaultPlaceholder,
     disabled: isDisabled,
     defaultValue: value
   });
@@ -109,7 +110,7 @@ function DeliveryInstructions(_ref) {
     className: "o-forms-title"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__main"
-  }, "Delivery instructions"), spanMessageByCountry[FTShippingZone], country === 'GBR' && deliveryInstructionsMessage), /*#__PURE__*/_react["default"].createElement("span", {
+  }, "Delivery instructions"), spanMessageByCountry[shippingZone], country === 'GBR' && deliveryInstructionsMessage), /*#__PURE__*/_react["default"].createElement("span", {
     className: textAreaWrapperClassNames
   }, /*#__PURE__*/_react["default"].createElement("textarea", textAreaProps)));
 }
@@ -119,5 +120,5 @@ DeliveryInstructions.propTypes = {
   rows: _propTypes["default"].number,
   isDisabled: _propTypes["default"].bool,
   value: _propTypes["default"].string,
-  country: _propTypes["default"].oneOf(['GBR', 'USA', 'CAN']).isRequired
+  country: _propTypes["default"].string.isRequired
 };

package/dist/delivery-option.jsx

@@ -23,7 +23,7 @@ function DeliveryOption(_ref) {
   var divClassName = (0, _classnames["default"])(['o-forms-field', 'ncf__delivery-option', {
     'ncf__delivery-option--single': isSingle
   }]);
-  var shippingZone = (0, _supportedCountries.identifyFTShippingZone)(countryCode);
+  var shippingZone = (0, _supportedCountries.identifyShippingZone)(countryCode);
   return /*#__PURE__*/_react["default"].createElement("div", {
     id: fieldId,
     className: divClassName,
@@ -72,7 +72,7 @@ function DeliveryOption(_ref) {
   })));
 }
 DeliveryOption.propTypes = {
-  country: _propTypes["default"].oneOf(_supportedCountries.countriesSupportedISO).isRequired,
+  country: _propTypes["default"].string.isRequired,
   productCode: _propTypes["default"].string,
   options: _propTypes["default"].arrayOf(_propTypes["default"].shape({
     value: _propTypes["default"].oneOf(['PV', 'HD', 'EV']),

package/dist/payment-term.jsx

@@ -19,8 +19,8 @@ function PaymentTerm(_ref) {
     inputName = _ref$inputName === void 0 ? 'paymentTerm' : _ref$inputName,
     _ref$isPrintOrBundle = _ref.isPrintOrBundle,
     isPrintOrBundle = _ref$isPrintOrBundle === void 0 ? false : _ref$isPrintOrBundle,
-    _ref$isEpaper = _ref.isEpaper,
-    isEpaper = _ref$isEpaper === void 0 ? false : _ref$isEpaper,
+    _ref$isDigitalEdition = _ref.isDigitalEdition,
+    isDigitalEdition = _ref$isDigitalEdition === void 0 ? false : _ref$isDigitalEdition,
     _ref$options = _ref.options,
     options = _ref$options === void 0 ? [] : _ref$options,
     _ref$showLegal = _ref.showLegal,
@@ -221,7 +221,7 @@ function PaymentTerm(_ref) {
       }, option.chargeOnText)));
     };
     var getTermDisplayName = function getTermDisplayName() {
-      var showTrialCopyInTitle = option.isTrial && !isPrintOrBundle && !isEpaper;
+      var showTrialCopyInTitle = option.isTrial && !isPrintOrBundle && !isDigitalEdition;
 
       // https://financialtimes.atlassian.net/browse/ACQ-2592
       // We need to have one specific trial offer to have terms displayed as non-trial.
@@ -296,7 +296,7 @@ PaymentTerm.propTypes = {
   fieldId: _propTypes["default"].string,
   inputName: _propTypes["default"].string,
   isPrintOrBundle: _propTypes["default"].bool,
-  isEpaper: _propTypes["default"].bool,
+  isDigitalEdition: _propTypes["default"].bool,
   options: _propTypes["default"].arrayOf(_propTypes["default"].shape({
     b2cDiscountCopy: _propTypes["default"].string,
     isB2cPartnership: _propTypes["default"].bool,

package/helpers/index.js

@@ -4,8 +4,7 @@ module.exports = {
 	cemeaV1ISO: require('./supportedCountries').cemeaV1ISO,
 	cemeaV2ISO: require('./supportedCountries').cemeaV2ISO,
 	apacISO: require('./supportedCountries').apacISO,
-	identifyFTShippingZone: require('./supportedCountries')
-		.identifyFTShippingZone,
+	identifyShippingZone: require('./supportedCountries').identifyShippingZone,
 	countriesSupported: require('./supportedCountries').countriesSupported,
 	countriesSupportedISO: require('./supportedCountries').countriesSupportedISO,
 	supportedPostcodeValidators: require('./supportedPostcodeValidators')

package/helpers/index.spec.js

@@ -31,8 +31,8 @@ describe('helpers', () => {
 		expect(helpers).toHaveProperty('apacISO');
 	});
 
-	it('export identifyFTShippingZone', () => {
-		expect(helpers).toHaveProperty('identifyFTShippingZone');
+	it('export identifyShippingZone', () => {
+		expect(helpers).toHaveProperty('identifyShippingZone');
 	});
 
 	it('export countriesSupported', () => {

package/helpers/supportedCountries.js

@@ -60,7 +60,7 @@ const apacISO = Object.keys(supportedCountriesMasterList.apac);
 const countriesSupported = flattenObj(supportedCountriesMasterList);
 const countriesSupportedISO = Object.keys(countriesSupported);
 
-const identifyFTShippingZone = (country) => {
+const identifyShippingZone = (country) => {
 	if (cemeaV1ISO.includes(country)) {
 		return printRegions.cemeaV1;
 	}
@@ -79,5 +79,5 @@ module.exports = {
 	apacISO,
 	countriesSupported,
 	countriesSupportedISO,
-	identifyFTShippingZone,
+	identifyShippingZone,
 };

package/package.json

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

@@ -171,7 +171,7 @@ const deliveryOptionMessages = [
 		customId: 'ML',
 		flightMarket: true,
 		description:
-			'Enjoy delivery of the newspaper to your home or office address. Note this is a postal delivery - expect delivery after the day of publication. If you would prefer to read the newspaper on the day of publication, purchase an FT ePaper subscription, our digital replica of each daily edition.',
+			'Enjoy delivery of the newspaper to your home or office address. Note this is a postal delivery - expect delivery after the day of publication. If you would prefer to read the newspaper on the day of publication, purchase an FT Digital Edition subscription, our digital replica of each daily edition.',
 	},
 	{
 		deliveryFrequency: [
@@ -197,7 +197,7 @@ const deliveryOptionMessages = [
 		title: 'Mail',
 		customId: 'ML',
 		description:
-			"We can only deliver the newspaper to your location by postal mail which means your delivery will arrive up to 5 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT's control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT ePaper - a digital replica of the print edition.",
+			"We can only deliver the newspaper to your location by postal mail which means your delivery will arrive up to 5 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT's control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT Digital Edition - a digital replica of the print edition.",
 	},
 	{
 		deliveryFrequency: [ONLY_WEEKEND_DELIVERY_FREQ],
@@ -246,10 +246,19 @@ const deliveryOptionMessages = [
 		title: 'Mail',
 		customId: 'ML',
 		description:
-			"We can only deliver the FT Weekend newspaper to your location by postal mail which means your delivery will arrive up to 5 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT's control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT ePaper - a digital replica of the print edition.",
+			"We can only deliver the FT Weekend newspaper to your location by postal mail which means your delivery will arrive up to 5 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT's control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT Digital Edition - a digital replica of the print edition.",
 	},
 ];
 
+// Default delivery options based on delivery type
+const defaultDeliveryOptionsMap = {
+	HD: {
+		title: 'Hand delivery',
+		description:
+			'Enjoy delivery of the newspaper daily to your home or office address.',
+	},
+};
+
 function includesDeliveryFrequency(productCode = '', item) {
 	return item.deliveryFrequency.find((freq) => {
 		const productCodePattern = deliveryFrequencyProductsMapping[freq];
@@ -308,7 +317,10 @@ function getDeliveryOption({ productCode, option, shippingZone, countryCode }) {
 		return countryCodeToCustomDeliveryOptionsMap[countryCode][option.value];
 	}
 
-	return findCustomDeliveryOption(productCode, option, shippingZone);
+	return (
+		findCustomDeliveryOption(productCode, option, shippingZone) ||
+		defaultDeliveryOptionsMap[option.value]
+	);
 }
 
 module.exports = {

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

@@ -1,5 +1,11 @@
 const { getDeliveryOption } = require('./delivery-option-messages');
 
+const defaultHandDeliveryOption = {
+	title: 'Hand delivery',
+	description:
+		'Enjoy delivery of the newspaper daily to your home or office address.',
+};
+
 describe('Find Custom Delivery Option', () => {
 	const stubOption = { value: 'HD' };
 	const sixDaysProductCode = 'P2N6D';
@@ -20,7 +26,7 @@ describe('Find Custom Delivery Option', () => {
 					shippingZone: 'AAA',
 					countryCode: 'AAA',
 				})
-			).toBeUndefined();
+			).toEqual(defaultHandDeliveryOption);
 		});
 
 		it('returns undefined when invalid distributor type code', () => {
@@ -45,7 +51,7 @@ describe('Find Custom Delivery Option', () => {
 					shippingZone: 'AAA',
 					countryCode: 'AAA',
 				})
-			).toBeUndefined();
+			).toEqual(defaultHandDeliveryOption);
 		});
 	});
 
@@ -103,7 +109,7 @@ describe('Find Custom Delivery Option', () => {
 				title: 'Mail',
 				customId: 'ML',
 				description:
-					"We can only deliver the newspaper to your location by postal mail which means your delivery will arrive up to 5 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT's control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT ePaper - a digital replica of the print edition.",
+					"We can only deliver the newspaper to your location by postal mail which means your delivery will arrive up to 5 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT's control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT Digital Edition - a digital replica of the print edition.",
 			};
 
 			const deliveryOption = getDeliveryOption({
@@ -121,7 +127,7 @@ describe('Find Custom Delivery Option', () => {
 				title: 'Mail',
 				customId: 'ML',
 				description:
-					"We can only deliver the FT Weekend newspaper to your location by postal mail which means your delivery will arrive up to 5 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT's control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT ePaper - a digital replica of the print edition.",
+					"We can only deliver the FT Weekend newspaper to your location by postal mail which means your delivery will arrive up to 5 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT's control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT Digital Edition - a digital replica of the print edition.",
 			};
 
 			const deliveryOption = getDeliveryOption({
@@ -200,7 +206,7 @@ describe('Find Custom Delivery Option', () => {
 				title: 'Mail Delivery',
 				customId: 'ML',
 				description:
-					'Enjoy delivery of the newspaper to your home or office address. Note this is a postal delivery - expect delivery after the day of publication. If you would prefer to read the newspaper on the day of publication, purchase an FT ePaper subscription, our digital replica of each daily edition.',
+					'Enjoy delivery of the newspaper to your home or office address. Note this is a postal delivery - expect delivery after the day of publication. If you would prefer to read the newspaper on the day of publication, purchase an FT Digital Edition subscription, our digital replica of each daily edition.',
 			};
 
 			const deliveryOption = getDeliveryOption({