@financial-times/n-conversion-forms 34.0.0 → 35.0.0

package/.toolkitstate/ci.json

@@ -1,6 +1,6 @@
 {
   "branch": "",
   "repo": "n-conversion-forms",
-  "version": "87d6d8c377b47120dcf4d707275d1df6efaa9fbe",
-  "tag": "v34.0.0"
+  "version": "af7d875e1a63b1079d26119dff56571695dbb911",
+  "tag": "v35.0.0"
 }

package/components/payment-term.jsx

@@ -9,8 +9,6 @@ export function PaymentTerm({
 	isPrintOrBundle = false,
 	isEpaper = false,
 	options = [],
-	isFixedTermOffer = false,
-	offerDisplayName,
 	showLegal = true,
 	largePrice = false,
 	optionsInARow = false,
@@ -133,15 +131,11 @@ export function PaymentTerm({
 				</React.Fragment>
 			),
 			monthlyPrice: () => {},
-			renewsText: (isFixedTermOffer) => {
-				const textToDisplay = isFixedTermOffer
-					? 'This subscription is for 3 months, charged monthly. You can cancel at anytime'
-					: 'Renews monthly unless cancelled';
-
-				return (
-					<p className="ncf__payment-term__renews-text">{textToDisplay}</p>
-				);
-			},
+			renewsText: () => (
+				<p className="ncf__payment-term__renews-text">
+					{'Renews monthly unless cancelled'}
+				</p>
+			),
 		},
 		custom: {
 			price: (price) => (
@@ -235,7 +229,7 @@ export function PaymentTerm({
 						<div className="ncf__payment-term__description">
 							{nameMap[option.name].price(option.price)}
 							{nameMap[option.name].monthlyPrice(option.monthlyPrice)}
-							{nameMap[option.name].renewsText(isFixedTermOffer)}
+							{nameMap[option.name].renewsText()}
 							{/* Remove this discount text temporarily in favour of monthly price */}
 							{/* <br />Save up to 25% when you pay annually */}
 						</div>
@@ -287,13 +281,9 @@ export function PaymentTerm({
 				return labelOverride;
 			}
 
-			const defaultTitle =
+			const title =
 				option.name && nameMap[option.name] ? nameMap[option.name].title : '';
 
-			const title = isFixedTermOffer
-				? `${offerDisplayName} - ${defaultTitle}`
-				: defaultTitle;
-
 			let termDisplayName = '';
 			if (showTrialCopyInTitle) {
 				const termName = option.displayName
@@ -363,7 +353,7 @@ export function PaymentTerm({
 
 			{showLegal && (
 				<div className="ncf__payment-term__legal">
-					{isTermedSubscriptionTermType || isFixedTermOffer ? (
+					{isTermedSubscriptionTermType ? (
 						<p>
 							Find out more about our cancellation policy in our{' '}
 							<a
@@ -434,9 +424,7 @@ PaymentTerm.propTypes = {
 			fulfilmentOption: PropTypes.string,
 		})
 	),
-	isFixedTermOffer: PropTypes.bool,
 	isTermedSubscriptionTermType: PropTypes.bool,
-	offerDisplayName: PropTypes.string,
 	showLegal: PropTypes.bool,
 	largePrice: PropTypes.bool,
 	optionsInARow: PropTypes.bool,

package/components/payment-term.spec.js

@@ -117,42 +117,6 @@ describe('PaymentTerm', () => {
 		});
 	});
 
-	describe('given isFixedTermOffer prop is set to true', () => {
-		const options = [
-			{
-				name: 'monthly',
-				price: '$5.00',
-				value: 'monthly',
-				monthlyPrice: '$5.00',
-			},
-		];
-		const wrapper = shallow(
-			<PaymentTerm
-				isFixedTermOffer={true}
-				options={options}
-				offerDisplayName="Mix & Match"
-			/>
-		);
-
-		it('does not include renewal text', () => {
-			expect(
-				wrapper.find('.ncf__payment-term__renews-text').text()
-			).not.toMatch(/Renews (annually|monthly|quarterly) unless cancelled/);
-		});
-
-		it('renders fixed term renewal text in English', () => {
-			expect(wrapper.find('.ncf__payment-term__renews-text').text()).toMatch(
-				/This subscription is for 3 months, charged monthly. You can cancel at anytime/
-			);
-		});
-
-		it('renders offer name on payment term title', () => {
-			expect(wrapper.find('.ncf__payment-term__title').text()).toMatch(
-				'Mix & Match - Monthly'
-			);
-		});
-	});
-
 	describe('given isTermedSubscriptionTermType is true', () => {
 		describe('options include duration expressed in weeks', () => {
 			const options = [

package/components/payment-term.stories.js

@@ -90,25 +90,6 @@ Basic.args = {
 	],
 };
 
-export const FixedTermOffer = (args) => (
-	<div className="ncf">
-		<Fieldset>
-			<PaymentTerm {...args} />
-		</Fieldset>
-	</div>
-);
-FixedTermOffer.args = {
-	options: [
-		{
-			name: 'monthly',
-			price: '$5.00',
-			value: 5.0,
-		},
-	],
-	isFixedTermOffer: true,
-	offerDisplayName: 'Mix & Match',
-};
-
 export const TermedSubscriptionTermType = (args) => (
 	<div className="ncf">
 		<Fieldset>

package/dist/payment-term.jsx

@@ -23,9 +23,6 @@ function PaymentTerm(_ref) {
     isEpaper = _ref$isEpaper === void 0 ? false : _ref$isEpaper,
     _ref$options = _ref.options,
     options = _ref$options === void 0 ? [] : _ref$options,
-    _ref$isFixedTermOffer = _ref.isFixedTermOffer,
-    isFixedTermOffer = _ref$isFixedTermOffer === void 0 ? false : _ref$isFixedTermOffer,
-    offerDisplayName = _ref.offerDisplayName,
     _ref$showLegal = _ref.showLegal,
     showLegal = _ref$showLegal === void 0 ? true : _ref$showLegal,
     _ref$largePrice = _ref.largePrice,
@@ -142,11 +139,10 @@ function PaymentTerm(_ref) {
         }, price), " per month after the trial period.");
       },
       monthlyPrice: function monthlyPrice() {},
-      renewsText: function renewsText(isFixedTermOffer) {
-        var textToDisplay = isFixedTermOffer ? 'This subscription is for 3 months, charged monthly. You can cancel at anytime' : 'Renews monthly unless cancelled';
+      renewsText: function renewsText() {
         return /*#__PURE__*/_react["default"].createElement("p", {
           className: "ncf__payment-term__renews-text"
-        }, textToDisplay);
+        }, 'Renews monthly unless cancelled');
       }
     },
     custom: {
@@ -205,7 +201,7 @@ 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), nameMap[option.name].renewsText(isFixedTermOffer)) :
+      }, nameMap[option.name].price(option.price), nameMap[option.name].monthlyPrice(option.monthlyPrice), 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", {
@@ -228,8 +224,7 @@ function PaymentTerm(_ref) {
       if (isTrialOfferAsNonTrialOverride && labelOverride) {
         return labelOverride;
       }
-      var defaultTitle = option.name && nameMap[option.name] ? nameMap[option.name].title : '';
-      var title = isFixedTermOffer ? "".concat(offerDisplayName, " - ").concat(defaultTitle) : defaultTitle;
+      var title = option.name && nameMap[option.name] ? nameMap[option.name].title : '';
       var termDisplayName = '';
       if (showTrialCopyInTitle) {
         var termName = option.displayName ? option.displayName : 'Premium Digital';
@@ -275,7 +270,7 @@ function PaymentTerm(_ref) {
     return createPaymentTerm(option);
   })), showLegal && /*#__PURE__*/_react["default"].createElement("div", {
     className: "ncf__payment-term__legal"
-  }, isTermedSubscriptionTermType || isFixedTermOffer ? /*#__PURE__*/_react["default"].createElement("p", null, "Find out more about our cancellation policy in our", ' ', /*#__PURE__*/_react["default"].createElement("a", {
+  }, isTermedSubscriptionTermType ? /*#__PURE__*/_react["default"].createElement("p", null, "Find out more about our cancellation policy in our", ' ', /*#__PURE__*/_react["default"].createElement("a", {
     className: "ncf__link--external",
     href: "https://help.ft.com/legal-privacy/terms-and-conditions/",
     title: "FT Legal Terms and Conditions help page",
@@ -314,9 +309,7 @@ PaymentTerm.propTypes = {
     chargeOnText: _propTypes["default"].string,
     fulfilmentOption: _propTypes["default"].string
   })),
-  isFixedTermOffer: _propTypes["default"].bool,
   isTermedSubscriptionTermType: _propTypes["default"].bool,
-  offerDisplayName: _propTypes["default"].string,
   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": "34.0.0",
+  "version": "35.0.0",
   "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": {