@financial-times/n-conversion-forms 27.3.0 → 27.3.3

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

@@ -28,7 +28,7 @@ exports[`LicenceConfirmation renders if content id 1`] = `
     <a href="/content/d19dc7a6-c33b-4931-9a7e-4a74674da29a"
        class="ncf__link"
     >
-      Start reading
+      Go to homepage
     </a>
   </p>
 </div>
@@ -62,7 +62,7 @@ exports[`LicenceConfirmation renders if educational licence 1`] = `
     <a href="/"
        class="ncf__link"
     >
-      Start reading
+      Go to homepage
     </a>
   </p>
 </div>
@@ -97,7 +97,7 @@ exports[`LicenceConfirmation renders if is embedded 1`] = `
        class="ncf__link"
        target="_top"
     >
-      Start reading
+      Go to homepage
     </a>
   </p>
 </div>
@@ -131,7 +131,7 @@ exports[`LicenceConfirmation renders if is trial 1`] = `
     <a href="/"
        class="ncf__link"
     >
-      Start reading
+      Go to homepage
     </a>
   </p>
 </div>
@@ -165,7 +165,7 @@ exports[`LicenceConfirmation renders with custom duration value 1`] = `
     <a href="/"
        class="ncf__link"
     >
-      Start reading
+      Go to homepage
     </a>
   </p>
 </div>
@@ -199,7 +199,7 @@ exports[`LicenceConfirmation renders with default props 1`] = `
     <a href="/"
        class="ncf__link"
     >
-      Start reading
+      Go to homepage
     </a>
   </p>
 </div>

package/components/accept-terms.jsx

@@ -22,7 +22,6 @@ export function AcceptTerms ({
 	isPrintProduct = false,
 	specialTerms = null,
 	isSingleTerm = false,
-	isNewDigitalBuyFlowConsent = false,
 	hideConfirmTermsAndConditions = false,
 }) {
 	const divProps = {
@@ -52,15 +51,7 @@ export function AcceptTerms ({
 
 	const authFirstStepTerms = (
 		<>
-			{
-				// TODO: clean up the code in https://financialtimes.atlassian.net/browse/ACQ-1593
-				// isNewDigitalBuyFlowConsent flag for new A/B testing of consents auth first buy flow
-				// after the test it will be one of the conditions for the below flow
-			}
-			{isNewDigitalBuyFlowConsent && (
-				<hr className=" ncf ncf__divider-horizontal" />
-			)}
-			{!isNewDigitalBuyFlowConsent && (
+			{(
 				<ul className="o-typography-list ncf__accept-terms-list">
 					<li>
 						<span className="terms-auth-first-step">
@@ -410,6 +401,5 @@ AcceptTerms.propTypes = {
 	isPrintProduct: PropTypes.bool,
 	specialTerms: PropTypes.string,
 	isSingleTerm: PropTypes.bool,
-	isNewDigitalBuyFlowConsent: PropTypes.bool,
 	hideConfirmTermsAndConditions: PropTypes.bool,
 };

package/components/delivery-city.jsx

@@ -20,8 +20,11 @@ export function DeliveryCity ({
 		GBR: 'e.g. Bath',
 		USA: 'e.g. Los Angeles',
 		CAN: 'e.g. Montreal',
+		ARE: 'e.g. Dubai'
 	};
 
+	const inputLabel = country === 'ARE'? 'Emirate or City':'City';
+
 	return (
 		<label
 			id="deliveryCityField"
@@ -30,7 +33,7 @@ export function DeliveryCity ({
 			htmlFor="deliveryCity"
 		>
 			<span className="o-forms-title">
-				<span className="o-forms-title__main">City</span>
+				<span className="o-forms-title__main">{inputLabel}</span>
 			</span>
 			<span className={inputWrapperClassName}>
 				<input

package/components/delivery-instructions.jsx

@@ -103,12 +103,18 @@ export function DeliveryInstructions ({
 		'o-forms-input--textarea',
 		{ 'o-forms-input--invalid': hasError },
 	]);
-
+	const FTShippingZone = identifyFTShippingZone(country);
 	const extraInstruction =
 		country === 'GBR'
 			? ''
 			: '\u000a- Special handling, e.g. place in plastic bag, 24/7 security on reception';
 	const defaultPlaceholder = {
+		CEMEA_V1: `Enter instructions ${
+			maxlength && `(Max. ${maxlength} characters)`
+		}:\u000a- Door colour, letterbox location\u000a- Door entry codes, etc.`,
+		CEMEA_V2: `Enter instructions ${
+			maxlength && `(Max. ${maxlength} characters)`
+		}:\u000a- Door colour, letterbox location\u000a- Door entry codes, etc.`,
 		GBR: `Enter instructions ${
 			maxlength && `(Max. ${maxlength} characters)`
 		}:\u000a- Door colour, letterbox location\u000a- Placement i.e. letterbox delivery${extraInstruction}`,
@@ -126,7 +132,7 @@ export function DeliveryInstructions ({
 		...(maxlength && { maxLength: maxlength }),
 		...(rows && { rows }),
 		'data-trackable': 'field-deliveryInstructions',
-		placeholder: placeholder ? placeholder : defaultPlaceholder[country],
+		placeholder: placeholder ? placeholder : defaultPlaceholder[FTShippingZone],
 		disabled: isDisabled,
 		defaultValue: value,
 	};
@@ -135,7 +141,7 @@ export function DeliveryInstructions ({
 			Special characters including punctuation cannot be used in the delivery instructions.
 		</span>
 	);
-	const FTShippingZone = identifyFTShippingZone(country);
+
 	return (
 		<label
 			id={fieldId}

package/components/licence-confirmation.jsx

@@ -55,7 +55,7 @@ export function LicenceConfirmation ({
 			)}
 
 			<p className="ncf__paragraph ncf__center">
-				<a {...readingLinkProps}>Start reading</a>
+				<a {...readingLinkProps}>Go to homepage</a>
 			</p>
 		</div>
 	);

package/dist/accept-terms.js

@@ -56,8 +56,6 @@ function AcceptTerms(_ref) {
       specialTerms = _ref$specialTerms === void 0 ? null : _ref$specialTerms,
       _ref$isSingleTerm = _ref.isSingleTerm,
       isSingleTerm = _ref$isSingleTerm === void 0 ? false : _ref$isSingleTerm,
-      _ref$isNewDigitalBuyF = _ref.isNewDigitalBuyFlowConsent,
-      isNewDigitalBuyFlowConsent = _ref$isNewDigitalBuyF === void 0 ? false : _ref$isNewDigitalBuyF,
       _ref$hideConfirmTerms = _ref.hideConfirmTermsAndConditions,
       hideConfirmTermsAndConditions = _ref$hideConfirmTerms === void 0 ? false : _ref$hideConfirmTerms;
 
@@ -87,9 +85,7 @@ function AcceptTerms(_ref) {
     defaultChecked: true
   });
 
-  var authFirstStepTerms = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, isNewDigitalBuyFlowConsent && /*#__PURE__*/_react["default"].createElement("hr", {
-    className: " ncf ncf__divider-horizontal"
-  }), !isNewDigitalBuyFlowConsent && /*#__PURE__*/_react["default"].createElement("ul", {
+  var authFirstStepTerms = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("ul", {
     className: "o-typography-list ncf__accept-terms-list"
   }, /*#__PURE__*/_react["default"].createElement("li", null, /*#__PURE__*/_react["default"].createElement("span", {
     className: "terms-auth-first-step"
@@ -250,6 +246,5 @@ AcceptTerms.propTypes = {
   isPrintProduct: _propTypes["default"].bool,
   specialTerms: _propTypes["default"].string,
   isSingleTerm: _propTypes["default"].bool,
-  isNewDigitalBuyFlowConsent: _propTypes["default"].bool,
   hideConfirmTermsAndConditions: _propTypes["default"].bool
 };

package/dist/delivery-city.js

@@ -30,8 +30,10 @@ function DeliveryCity(_ref) {
   var inputPlaceholder = {
     GBR: 'e.g. Bath',
     USA: 'e.g. Los Angeles',
-    CAN: 'e.g. Montreal'
+    CAN: 'e.g. Montreal',
+    ARE: 'e.g. Dubai'
   };
+  var inputLabel = country === 'ARE' ? 'Emirate or City' : 'City';
   return /*#__PURE__*/_react["default"].createElement("label", {
     id: "deliveryCityField",
     className: "o-forms-field ncf__validation-error",
@@ -41,7 +43,7 @@ function DeliveryCity(_ref) {
     className: "o-forms-title"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__main"
-  }, "City")), /*#__PURE__*/_react["default"].createElement("span", {
+  }, inputLabel)), /*#__PURE__*/_react["default"].createElement("span", {
     className: inputWrapperClassName
   }, /*#__PURE__*/_react["default"].createElement("input", {
     type: "text",

package/dist/delivery-instructions.js

@@ -85,8 +85,11 @@ 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 extraInstruction = country === 'GBR' ? '' : "\n- Special handling, e.g. place in plastic bag, 24/7 security on reception";
   var defaultPlaceholder = {
+    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)
@@ -101,7 +104,7 @@ function DeliveryInstructions(_ref) {
     rows: rows
   }), {}, {
     'data-trackable': 'field-deliveryInstructions',
-    placeholder: placeholder ? placeholder : defaultPlaceholder[country],
+    placeholder: placeholder ? placeholder : defaultPlaceholder[FTShippingZone],
     disabled: isDisabled,
     defaultValue: value
   });
@@ -110,7 +113,6 @@ function DeliveryInstructions(_ref) {
     className: "o-forms-title__prompt"
   }, "Special characters including punctuation cannot be used in the delivery instructions.");
 
-  var FTShippingZone = (0, _supportedCountries.identifyFTShippingZone)(country);
   return /*#__PURE__*/_react["default"].createElement("label", {
     id: fieldId,
     className: "o-forms-field o-forms-field--optional",

package/dist/licence-confirmation.js

@@ -63,7 +63,7 @@ function LicenceConfirmation(_ref) {
     href: "/myft"
   }, "Go to myFT")), /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph ncf__center"
-  }, /*#__PURE__*/_react["default"].createElement("a", readingLinkProps, "Start reading")));
+  }, /*#__PURE__*/_react["default"].createElement("a", readingLinkProps, "Go to homepage")));
 }
 
 LicenceConfirmation.propTypes = {

package/helpers/supportedCountries.js

@@ -4,7 +4,6 @@ const { printRegions } = require('./constants');
 const supportedCountriesMasterList = {
 	cemeaV1: {
 		AUT: 'Austria',
-		ARE: 'United Arab Emirates',
 		BEL: 'Belgium',
 		BGR: 'Bulgaria',
 		HRV: 'Croatia',
@@ -49,7 +48,8 @@ const supportedCountriesMasterList = {
 	other: {
 		GBR: 'United Kingdom',
 		USA: 'United States',
-		CAN: 'Canada'
+		CAN: 'Canada',
+		ARE: 'United Arab Emirates'
 	}
 };
 

package/package.json

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