@financial-times/n-conversion-forms 27.0.2 → 27.0.5

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

@@ -8,7 +8,7 @@ exports[`LicenceHeader renders if is isB2cPartnershipLicence 1`] = `
 
 exports[`LicenceHeader renders if is trial 1`] = `
 <h1 class="ncf__header ncf__center">
-  Start your free trial
+  Welcome to the Financial Times
 </h1>
 `;
 

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

@@ -8,7 +8,7 @@ exports[`LicenceTitle renders if is isB2cPartnershipLicence 1`] = `
 
 exports[`LicenceTitle renders if is trial 1`] = `
 <h1 class="ncf__header ncf__center">
-  Start your free trial
+  Welcome to the Financial Times
 </h1>
 `;
 

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

@@ -120,7 +120,7 @@ exports[`RegistrationConfirmation renders with a custom email 1`] = `
      class="ncf__confirmation--finish ncf__button ncf__button--submit"
      data-trackable="register-finish"
   >
-    Finish
+    Start reading
   </a>
 </div>
 `;
@@ -245,7 +245,7 @@ exports[`RegistrationConfirmation renders with default props 1`] = `
      class="ncf__confirmation--finish ncf__button ncf__button--submit"
      data-trackable="register-finish"
   >
-    Finish
+    Start reading
   </a>
 </div>
 `;

package/components/licence-title.jsx

@@ -9,10 +9,7 @@ export function LicenceTitle ({
 	if (isB2cPartnershipLicence || isTrial) {
 		return (
 			<h1 className="ncf__header ncf__center">
-				{displayName !== '' && `${displayName} | `}
-				{isB2cPartnershipLicence
-					? 'Welcome to the Financial Times'
-					: 'Start your free trial'}
+				{displayName || 'Welcome to the Financial Times'}
 			</h1>
 		);
 	}

package/components/registration-confirmation.jsx

@@ -122,7 +122,7 @@ export function RegistrationConfirmation ({
 				className="ncf__confirmation--finish ncf__button ncf__button--submit"
 				data-trackable="register-finish"
 			>
-				Finish
+				Start reading
 			</a>
 		</div>
 	);

package/dist/licence-title.js

@@ -22,7 +22,7 @@ function LicenceTitle(_ref) {
   if (isB2cPartnershipLicence || isTrial) {
     return /*#__PURE__*/_react["default"].createElement("h1", {
       className: "ncf__header ncf__center"
-    }, displayName !== '' && "".concat(displayName, " | "), isB2cPartnershipLicence ? 'Welcome to the Financial Times' : 'Start your free trial');
+    }, displayName || 'Welcome to the Financial Times');
   }
 
   {

package/dist/registration-confirmation.js

@@ -106,7 +106,7 @@ function RegistrationConfirmation(_ref) {
     target: "_parent",
     className: "ncf__confirmation--finish ncf__button ncf__button--submit",
     "data-trackable": "register-finish"
-  }, "Finish"));
+  }, "Start reading"));
 }
 
 RegistrationConfirmation.propTypes = {

package/helpers/supportedPostcodeExamples.js

@@ -2,27 +2,27 @@ const { flattenObj } = require('./utilities');
 
 const supportedPostcodeExamples = {
 	cemeaV1: {
-		AUT: '17087',
+		AUT: '1708',
 		ARE: '', //match anything
 		BEL: '6596',
 		BGR: '4000',
 		HRV: '10000',
-		CZE: '00 100',
+		CZE: '122 00',
 		DNK: '1819',
 		FIN: '39500',
 		DEU: '17087',
 		GRC: '241 00',
 		HUN: '3821',
-		ISL: '60411',
+		ISL: '149',
 		ITA: '23844',
-		LIE: '9480',
+		LIE: '9485',
 		LTU: 'LT-12345',
 		NLD: '6971 HJ',
 		NOR: '1608',
 		POL: '43-190',
 		PRT: '2525-517',
 		QAT: '',//match anything
-		ROU: '71234',
+		ROU: '712341',
 		RUS: '191028',
 		SVK: '98401',
 		SVN: '8263',
@@ -41,7 +41,7 @@ const supportedPostcodeExamples = {
 		KOR: '46500',
 		MYS: '59100',
 		PHL: '2799',
-		SGP: '58416',
+		SGP: '584163',
 		TWN: '100',
 		THA: '10330'
 	},
@@ -54,4 +54,4 @@ const supportedPostcodeExamples = {
 
 const allSupportedPostcodeExamples = flattenObj(supportedPostcodeExamples);
 
-module.exports = { allSupportedPostcodeExamples };
+module.exports = { allSupportedPostcodeExamples, supportedPostcodeExamples };

package/helpers/supportedPostcodeValidators.js

@@ -1,47 +1,47 @@
 const supportedPostcodeValidators = {
 	cemeaV1: {
-		AUT: /^\\d{4}$/,
+		AUT: /^\d{4}$/,
 		ARE: /.*$/, //match anything
-		BEL: /^\\d{4}$/,
-		BGR: /^\\d{4}$/,
-		HRV: /^\\d{5}$/,
-		CZE: /^\\d{5}\\s\\(\\d{3}\\s\\d{2}\\)$/,
-		DNK: /^\\d{4}$/,
-		FIN: /^\\d{5}$/,
-		DEU: /^\\d{5}$/,
-		GRC: /^\\d{3}\\s{0,1}\\d{2}$/,
-		HUN: /^\\d{4}$/,
-		ISL: /^\\d{3}$/,
-		ITA: /^\\d{5}$/,
-		LIE: /^\\d{4}$/,
-		LTU: /^[Ll][Tt][- ]{0,1}\\d{5}$/,
-		NLD: /^\\d{4}\\s{0,1}[A-Za-z]{2}$/,
-		NOR: /^\\d{4}$/,
-		POL: /^\\d{2}[- ]{0,1}\\d{3}$/,
-		PRT: /^\\d{4}$/,
+		BEL: /^\d{4}$/,
+		BGR: /^\d{4}$/,
+		HRV: /^\d{5}$/,
+		CZE: /^\d{3}[ ]?\d{2}$/,
+		DNK: /^\d{4}$/,
+		FIN: /^\d{5}$/,
+		DEU: /^\d{5}$/,
+		GRC: /^\d{3}[ ]?\d{2}$/,
+		HUN: /^\d{4}$/,
+		ISL: /^\d{3}$/,
+		ITA: /^\d{5}$/,
+		LIE: /^(948[5-9])|(949[0-7])$/,
+		LTU: /^[Ll][Tt][- ]{0,1}\d{5}$/,
+		NLD: /\d{4}\s{0,1}[A-Za-z]{2}$/,
+		NOR: /^\d{4}$/,
+		POL: /^\d{2}-\d{3}$/,
+		PRT: /^\d{4}([\-]\d{3})?$/,
 		QAT: /.*$/,//match anything
-		ROU: /^\\d{6}$/,
-		RUS: /^\\d{6}$/,
-		SVK: /^\\d{5}\\s\\(\\d{3}\\s\\d{2}\\)$/,
-		SVN: /^([Ss][Ii][- ]{0,1}){0,1}\\d{4}$/,
-		ZAF: /^\\d{4}$/,
-		ESP: /^\\d{5}$/,
-		SWE: /^\\d{3}\\s*\\d{2}$/,
-		CHE: /^\\d{4}$/
+		ROU: /^\d{6}$/,
+		RUS: /^\d{6}$/,
+		SVK: /^\d{3}[ ]?\d{2}$/,
+		SVN: /^\d{4}$/,
+		ZAF: /^\d{4}$/,
+		ESP: /^\d{5}$/,
+		SWE: /^\d{3}[ ]?\d{2}$/,
+		CHE: /^\d{4}$/
 	},
-	cemeaV2: { FRA: /^[0-9]{5}$/, LUX: /^\\d{4}$/, MCO: /^980\\d{2}$/ },
+	cemeaV2: { FRA: /^[0-9]{5}$/, LUX: /^\d{4}$/, MCO: /^980\d{2}$/ },
 	apac: {
-		CHN: /^\\d{6}$/,
+		CHN: /^\d{6}$/,
 		HKG: /.*$/, //match anything
-		IND: /^\\d{6}$/,
-		IDN: /^\\d{5}$/,
-		JPN: /^\\d{7}\\s\\(\\d{3}-\\d{4}\\)$/,
-		KOR: /^\\d{6}\\s\\(\\d{3}-\\d{3}\\)$/,
-		MYS: /^\\d{5}$/,
-		PHL: /^\\d{4}$/,
-		SGP: /^\\d{2}$/,
-		TWN: /^\\d{5}$/,
-		THA: /^\\d{5}$/
+		IND: /^\d{6}$/,
+		IDN: /^\d{5}$/,
+		JPN: /^\d{3}-\d{4}$/,
+		KOR: /^\d{5}$/,
+		MYS: /^\d{5}$/,
+		PHL: /^\d{4}$/,
+		SGP: /^\d{6}$/,
+		TWN: /^\d{3}(\d{2})?$/,
+		THA: /^\d{5}$/
 	},
 	other: {
 		GBR: /^[A-Za-z]{1,2}[0-9][0-9A-Za-z]?[\s-]?[0-9][A-Za-z]{2}$/,

package/helpers/supportedPostcodeValidators.spec.js

@@ -0,0 +1,26 @@
+const { supportedPostcodeValidators } = require('./supportedPostcodeValidators');
+const { supportedPostcodeExamples } = require('./supportedPostcodeExamples');
+
+describe('supportedPostcodeValidators', () => {
+	it('should validate every cemeaV1 supportedPostcodeExamples', () => {
+		const cemeaV1PostcodeCountryCodes = Object.keys(supportedPostcodeExamples.cemeaV1);
+
+		for ( const cemeaV1PostcodeCountryCode of cemeaV1PostcodeCountryCodes ) {
+			expect(supportedPostcodeValidators.cemeaV1[cemeaV1PostcodeCountryCode].test(supportedPostcodeExamples.cemeaV1[cemeaV1PostcodeCountryCode])).toBe(true);
+		}
+	});
+	it('should validate every cemeaV2 supportedPostcodeExamples', () => {
+		const cemeaV2PostcodeCountryCodes = Object.keys(supportedPostcodeExamples.cemeaV2);
+
+		for ( const cemeaV2PostcodeCountryCode of cemeaV2PostcodeCountryCodes ) {
+			expect(supportedPostcodeValidators.cemeaV2[cemeaV2PostcodeCountryCode].test(supportedPostcodeExamples.cemeaV2[cemeaV2PostcodeCountryCode])).toBe(true);
+		}
+	});
+	it('should validate every apac supportedPostcodeExamples', () => {
+		const apacPostcodeCountryCodes = Object.keys(supportedPostcodeExamples.apac);
+
+		for ( const apacPostcodeCountryCode of apacPostcodeCountryCodes ) {
+			expect(supportedPostcodeValidators.apac[apacPostcodeCountryCode].test(supportedPostcodeExamples.apac[apacPostcodeCountryCode])).toBe(true);
+		}
+	});
+});

package/package.json

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