npm - @financial-times/n-conversion-forms - Versions diffs - 41.3.2 → 42.0.0 - Mend

@financial-times/n-conversion-forms 41.3.2 → 42.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (100) hide show

package/.storybook/preview-body.html +3 -0
package/.storybook/preview.js +2 -2
package/.toolkitstate/ci.json +3 -3
package/.toolkitstate/install.json +1 -1
package/components/__snapshots__/accept-terms.spec.js.snap +107 -150
package/components/__snapshots__/b2c-partnership-confirmation.spec.js.snap +36 -72
package/components/__snapshots__/confirmation.spec.js.snap +71 -127
package/components/__snapshots__/continue-reading.spec.js.snap +3 -3
package/components/__snapshots__/customer-care.spec.js.snap +16 -24
package/components/__snapshots__/debug.spec.js.snap +13 -7
package/components/__snapshots__/deferred-billing-terms.spec.js.snap +12 -18
package/components/__snapshots__/error-page.spec.js.snap +12 -18
package/components/__snapshots__/fieldset.spec.js.snap +1 -1
package/components/__snapshots__/ft-edit-registration-confirmation.spec.js.snap +5 -5
package/components/__snapshots__/graduation-date.spec.js.snap +4 -6
package/components/__snapshots__/licence-confirmation.spec.js.snap +17 -28
package/components/__snapshots__/licence-header.spec.js.snap +1 -1
package/components/__snapshots__/licence-sign-in.spec.js.snap +1 -1
package/components/__snapshots__/loader.spec.js.snap +1 -1
package/components/__snapshots__/package-change.spec.js.snap +16 -11
package/components/__snapshots__/payment-term.spec.js.snap +40 -60
package/components/__snapshots__/registration-confirmation.spec.js.snap +9 -7
package/components/__snapshots__/submit.spec.js.snap +6 -6
package/components/accept-terms-business.jsx +2 -3
package/components/accept-terms-business.spec.jsx +3 -1
package/components/accept-terms-privacy-policy.jsx +2 -5
package/components/accept-terms-privacy-policy.spec.js +1 -1
package/components/accept-terms-subscription.jsx +7 -12
package/components/accept-terms-subscription.spec.js +1 -1
package/components/accept-terms.jsx +12 -20
package/components/b2c-partnership-confirmation.jsx +3 -5
package/components/confirmation.jsx +5 -9
package/components/confirmation.stories.js +4 -6
package/components/continue-reading.jsx +1 -1
package/components/customer-care.jsx +4 -4
package/components/debug.jsx +12 -12
package/components/deferred-billing-terms.jsx +3 -6
package/components/error-page.jsx +4 -4
package/components/fieldset.jsx +1 -1
package/components/ft-edit-registration-confirmation.jsx +2 -2
package/components/graduation-date.jsx +2 -4
package/components/index.js +0 -1
package/components/licence-confirmation.jsx +2 -3
package/components/licence-confirmation.stories.js +1 -1
package/components/licence-sign-in.jsx +1 -1
package/components/loader.jsx +4 -1
package/components/package-change.jsx +4 -5
package/components/payment-term.jsx +3 -5
package/components/proceed-with-payment-link.jsx +8 -2
package/components/proceed-with-payment-link.stories.js +1 -1
package/components/registration-confirmation.jsx +5 -3
package/components/submit.jsx +1 -1
package/components/subscription-confirmation-with-payment-link.jsx +1 -1
package/dist/accept-terms-business.jsx +2 -3
package/dist/accept-terms-business.spec.jsx +1 -1
package/dist/accept-terms-privacy-policy.jsx +2 -5
package/dist/accept-terms-subscription.jsx +7 -12
package/dist/accept-terms.jsx +10 -20
package/dist/b2c-partnership-confirmation.jsx +5 -7
package/dist/confirmation.jsx +4 -7
package/dist/continue-reading.jsx +1 -1
package/dist/customer-care.jsx +3 -4
package/dist/debug.jsx +6 -6
package/dist/deferred-billing-terms.jsx +3 -6
package/dist/error-page.jsx +3 -4
package/dist/fieldset.jsx +1 -1
package/dist/ft-edit-registration-confirmation.jsx +2 -2
package/dist/graduation-date.jsx +6 -4
package/dist/index.js +0 -7
package/dist/licence-confirmation.jsx +3 -4
package/dist/licence-sign-in.jsx +1 -1
package/dist/loader.jsx +1 -1
package/dist/package-change.jsx +5 -4
package/dist/payment-term.jsx +6 -4
package/dist/proceed-with-payment-link.jsx +2 -2
package/dist/registration-confirmation.jsx +7 -5
package/dist/submit.jsx +1 -1
package/dist/subscription-confirmation-with-payment-link.jsx +1 -1
package/main.scss +132 -167
package/package.json +3 -6
package/styles/_shared.scss +125 -100
package/styles/accept-terms.scss +6 -5
package/styles/banner.scss +66 -60
package/styles/confirmation.scss +50 -55
package/styles/continue-reading.scss +56 -39
package/styles/error.scss +1 -1
package/styles/forms-additional-field-information.scss +8 -4
package/styles/ft-edit-registration-confirmation.scss +228 -224
package/styles/loader.scss +40 -45
package/styles/package-change.scss +1 -4
package/styles/payment-term.scss +108 -89
package/styles/payment-type.scss +117 -112
package/styles/proceed-with-payment-link.scss +32 -18
package/styles/subscription-confirmation-with-payment-link.scss +64 -24
package/components/__snapshots__/google-sign-in.spec.js.snap +0 -13
package/components/google-sign-in.jsx +0 -21
package/components/google-sign-in.spec.js +0 -14
package/components/google-sign-in.stories.js +0 -13
package/dist/google-sign-in.jsx +0 -24
package/styles/google-sign-in.scss +0 -26

package/.storybook/preview-body.html ADDED Viewed

@@ -0,0 +1,3 @@
+<html data-o3-brand="core">
+</html>

package/.storybook/preview.js CHANGED Viewed

@@ -2,5 +2,5 @@
 import '!style-loader!css-loader!sass-loader!./styles.scss';
 export const parameters = {
-	actions: { argTypesRegex: '^on[A-Z].*' },
-};
+	actions: {argTypesRegex: '^on[A-Z].*'},
+};

package/.toolkitstate/ci.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "branch": "",
   "repo": "n-conversion-forms",
-  "version": "a12fb54978506b0e96b68391147f6642f776b344",
-  "tag": "v41.3.2",
-  "buildNumber": "15999"
+  "version": "666638461e19655a5655e42c55035f7ea8897419",
+  "tag": "v42.0.0",
+  "buildNumber": "16140"
 }

package/.toolkitstate/install.json CHANGED Viewed

@@ -1,5 +1,5 @@
 {
   ".toolkitrc.yml": "XiiIocllEaT8xqKRCTpTbJ+yUyduDo5aEHARUQ3vJFfSe187Ci13PEs3bWL272GFJyNz2QgRQhdov2/+LFRKuw==",
-  "package.json": "TF64fuZhcMaH62zTvMNGEnc1qyrhhepAFW2Fgay+PhKXmkAeMOVjBXeosKPhyN/+ITMHKLN1oNPtTUm6VLwp1w==",
+  "package.json": "1C+ZxQ+EgTxLikMr51JQMLv+Ap3NjSZsO8fkFHMSNi9kYTuumTkB/zM3ws3/MZxdsIOaTUi/N7rNi88mWexMIw==",
   ".circleci/config.yml": "eph42EF3EsL7jvhiiC7D7vG3vGBAGBFVC+Ncmy4Dj4rUNzK8Rls0/cr+bEF/ttMN3J6iSL1xtCXKIJVrtZ4OSQ=="
 }

package/components/__snapshots__/accept-terms.spec.js.snap CHANGED Viewed

@@ -6,10 +6,9 @@ exports[`AcceptTerms renders a component matching snapshot when withPrivacyPolic
      data-validate="required,checked"
 >
   <div class="privacy-policy-terms">
-    <span class="consent-text--top">
+    <span class="o3-type-body-base consent-text--top">
       For more information about how we use your data, please refer to our
-      <a class="ncf__link--external"
-         href="https://help.ft.com/legal-privacy/privacy-policy/"
+      <a href="https://help.ft.com/legal-privacy/privacy-policy/"
          target="_blank"
          rel="noopener noreferrer"
          data-trackable="privacy-policy-info"
@@ -17,8 +16,7 @@ exports[`AcceptTerms renders a component matching snapshot when withPrivacyPolic
         privacy
       </a>
       and
-      <a class="ncf__link--external"
-         href="https://help.ft.com/legal-privacy/cookies/"
+      <a href="https://help.ft.com/legal-privacy/cookies/"
          target="_blank"
          rel="noopener noreferrer"
          data-trackable="cookies-info"
@@ -38,10 +36,9 @@ exports[`AcceptTerms renders a component matching snapshot when withPrivacyPolic
              aria-required="true"
              required
       >
-      <span class="o-forms-input__label">
+      <span class="o-forms-input__label o3-type-body-base">
         I confirm that I am 16 years or older and agree to the full
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -64,12 +61,11 @@ exports[`AcceptTerms renders appropriately if a signup 1`] = `
      data-validate="required,checked"
      data-trackable="sign-up-terms"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -80,10 +76,9 @@ exports[`AcceptTerms renders appropriately if a signup 1`] = `
       </span>
     </li>
     <li>
-      <span class="terms-signup">
+      <span class="terms-signup o3-type-body-base">
         I give consent for my chosen payment method to be charged automatically at the end of each subscription term until I cancel it by contacting
-        <a class="ncf__link--external"
-           href="https://help.ft.com/help/contact-us/"
+        <a href="https://help.ft.com/help/contact-us/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -98,10 +93,9 @@ exports[`AcceptTerms renders appropriately if a signup 1`] = `
       </span>
     </li>
     <li>
-      <span class="terms-signup">
+      <span class="terms-signup o3-type-body-base">
         Find out more about our cancellation policy in our
-        <a class="ncf__link--external"
-           href="https://help.ft.com/legal-privacy/terms-and-conditions/"
+        <a href="https://help.ft.com/legal-privacy/terms-and-conditions/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -138,12 +132,11 @@ exports[`AcceptTerms renders appropriately if a signup for the print product 1`]
      data-validate="required,checked"
      data-trackable="sign-up-terms"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -159,10 +152,9 @@ exports[`AcceptTerms renders appropriately if a signup for the print product 1`]
       </span>
     </li>
     <li>
-      <span class="terms-print">
+      <span class="terms-print o3-type-body-base">
         Find out more about your delivery start date in our
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -199,12 +191,11 @@ exports[`AcceptTerms renders appropriately if a signup for the print product and
      data-validate="required,checked"
      data-trackable="sign-up-terms"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_top"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -220,10 +211,9 @@ exports[`AcceptTerms renders appropriately if a signup for the print product and
       </span>
     </li>
     <li>
-      <span class="terms-print">
+      <span class="terms-print o3-type-body-base">
         Find out more about your delivery start date in our
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_top"
            rel="noopener noreferrer"
         >
@@ -260,12 +250,11 @@ exports[`AcceptTerms renders appropriately if a signup for the print product and
      data-validate="required,checked"
      data-trackable="sign-up-terms"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -281,10 +270,9 @@ exports[`AcceptTerms renders appropriately if a signup for the print product and
       </span>
     </li>
     <li>
-      <span class="terms-print">
+      <span class="terms-print o3-type-body-base">
         Find out more about your delivery start date in our
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -321,12 +309,11 @@ exports[`AcceptTerms renders appropriately if a signup not for the print product
      data-validate="required,checked"
      data-trackable="sign-up-terms"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -337,10 +324,9 @@ exports[`AcceptTerms renders appropriately if a signup not for the print product
       </span>
     </li>
     <li>
-      <span class="terms-signup">
+      <span class="terms-signup o3-type-body-base">
         I give consent for my chosen payment method to be charged automatically at the end of each subscription term until I cancel it by contacting
-        <a class="ncf__link--external"
-           href="https://help.ft.com/help/contact-us/"
+        <a href="https://help.ft.com/help/contact-us/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -355,10 +341,9 @@ exports[`AcceptTerms renders appropriately if a signup not for the print product
       </span>
     </li>
     <li>
-      <span class="terms-signup">
+      <span class="terms-signup o3-type-body-base">
         Find out more about our cancellation policy in our
-        <a class="ncf__link--external"
-           href="https://help.ft.com/legal-privacy/terms-and-conditions/"
+        <a href="https://help.ft.com/legal-privacy/terms-and-conditions/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -395,12 +380,11 @@ exports[`AcceptTerms renders appropriately if a signup not for the print product
      data-validate="required,checked"
      data-trackable="sign-up-terms"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_top"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -411,10 +395,9 @@ exports[`AcceptTerms renders appropriately if a signup not for the print product
       </span>
     </li>
     <li>
-      <span class="terms-signup">
+      <span class="terms-signup o3-type-body-base">
         I give consent for my chosen payment method to be charged automatically at the end of each subscription term until I cancel it by contacting
-        <a class="ncf__link--external"
-           href="https://help.ft.com/help/contact-us/"
+        <a href="https://help.ft.com/help/contact-us/"
            target="_top"
            rel="noopener noreferrer"
         >
@@ -429,10 +412,9 @@ exports[`AcceptTerms renders appropriately if a signup not for the print product
       </span>
     </li>
     <li>
-      <span class="terms-signup">
+      <span class="terms-signup o3-type-body-base">
         Find out more about our cancellation policy in our
-        <a class="ncf__link--external"
-           href="https://help.ft.com/legal-privacy/terms-and-conditions/"
+        <a href="https://help.ft.com/legal-privacy/terms-and-conditions/"
            target="_top"
            rel="noopener noreferrer"
         >
@@ -469,12 +451,11 @@ exports[`AcceptTerms renders appropriately if a signup not for the print product
      data-validate="required,checked"
      data-trackable="sign-up-terms"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -485,10 +466,9 @@ exports[`AcceptTerms renders appropriately if a signup not for the print product
       </span>
     </li>
     <li>
-      <span class="terms-signup">
+      <span class="terms-signup o3-type-body-base">
         I give consent for my chosen payment method to be charged automatically at the end of each subscription term until I cancel it by contacting
-        <a class="ncf__link--external"
-           href="https://help.ft.com/help/contact-us/"
+        <a href="https://help.ft.com/help/contact-us/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -503,10 +483,9 @@ exports[`AcceptTerms renders appropriately if a signup not for the print product
       </span>
     </li>
     <li>
-      <span class="terms-signup">
+      <span class="terms-signup o3-type-body-base">
         Find out more about our cancellation policy in our
-        <a class="ncf__link--external"
-           href="https://help.ft.com/legal-privacy/terms-and-conditions/"
+        <a href="https://help.ft.com/legal-privacy/terms-and-conditions/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -542,12 +521,11 @@ exports[`AcceptTerms renders appropriately if input is checked 1`] = `
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -585,7 +563,7 @@ exports[`AcceptTerms renders appropriately if is B2B 1`] = `
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
       <span class="terms-b2b">
         By submitting this form, you indicate your consent to also being contacted by Financial Times by email, post, or phone about our other products, services or special offers unless you untick this box.
@@ -627,10 +605,9 @@ exports[`AcceptTerms renders appropriately if is B2C Partnership 1`] = `
            aria-required="true"
            required
     >
-    <span class="o-forms-input__label">
+    <span class="o-forms-input__label o3-type-body-base">
       I confirm I am 16 years or older and have read and agree to the
-      <a class="ncf__link--external"
-         href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+      <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
          target="_blank"
          rel="noopener noreferrer"
          data-trackable="terms-and-conditions"
@@ -651,12 +628,11 @@ exports[`AcceptTerms renders appropriately if is corporate signup 1`] = `
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -708,12 +684,11 @@ exports[`AcceptTerms renders appropriately if is corporate signup and not trial
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -765,12 +740,11 @@ exports[`AcceptTerms renders appropriately if is corporate signup and trial 1`]
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -827,12 +801,11 @@ exports[`AcceptTerms renders appropriately if is not B2B (i.e. default terms dis
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -869,12 +842,11 @@ exports[`AcceptTerms renders appropriately if is not B2B (i.e. default terms dis
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 21 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -911,12 +883,11 @@ exports[`AcceptTerms renders appropriately if is not B2B (i.e. default terms dis
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_top"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -953,12 +924,11 @@ exports[`AcceptTerms renders appropriately if is not B2B (i.e. default terms dis
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -995,12 +965,11 @@ exports[`AcceptTerms renders appropriately if is transition 1`] = `
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -1011,10 +980,9 @@ exports[`AcceptTerms renders appropriately if is transition 1`] = `
       </span>
     </li>
     <li>
-      <span class="terms-transition">
+      <span class="terms-transition o3-type-body-base">
         I give consent for my chosen payment method to be charged automatically at the end of each subscription term until I cancel it by contacting
-        <a class="ncf__link--external"
-           href="https://help.ft.com/help/contact-us/"
+        <a href="https://help.ft.com/help/contact-us/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -1029,10 +997,9 @@ exports[`AcceptTerms renders appropriately if is transition 1`] = `
       </span>
     </li>
     <li>
-      <span class="terms-transition">
+      <span class="terms-transition o3-type-body-base">
         Find out more about our cancellation policy in our
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -1068,12 +1035,11 @@ exports[`AcceptTerms renders appropriately if is transition with transition type
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -1084,10 +1050,9 @@ exports[`AcceptTerms renders appropriately if is transition with transition type
       </span>
     </li>
     <li>
-      <span class="terms-transition">
+      <span class="terms-transition o3-type-body-base">
         I give consent for my chosen payment method to be charged automatically at the end of each subscription term until I cancel it by contacting
-        <a class="ncf__link--external"
-           href="https://help.ft.com/help/contact-us/"
+        <a href="https://help.ft.com/help/contact-us/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -1102,10 +1067,9 @@ exports[`AcceptTerms renders appropriately if is transition with transition type
       </span>
     </li>
     <li>
-      <span class="terms-transition">
+      <span class="terms-transition o3-type-body-base">
         Find out more about our cancellation policy in our
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -1141,12 +1105,11 @@ exports[`AcceptTerms renders appropriately if is transition with transition type
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -1157,10 +1120,9 @@ exports[`AcceptTerms renders appropriately if is transition with transition type
       </span>
     </li>
     <li>
-      <span class="terms-transition">
+      <span class="terms-transition o3-type-body-base">
         I give consent for my chosen payment method to be charged automatically at the end of each subscription term until I cancel it by contacting
-        <a class="ncf__link--external"
-           href="https://help.ft.com/help/contact-us/"
+        <a href="https://help.ft.com/help/contact-us/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -1175,10 +1137,9 @@ exports[`AcceptTerms renders appropriately if is transition with transition type
       </span>
     </li>
     <li>
-      <span class="terms-transition">
+      <span class="terms-transition o3-type-body-base">
         Find out more about our cancellation policy in our
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -1214,12 +1175,11 @@ exports[`AcceptTerms renders appropriately if is transition with transition type
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -1235,10 +1195,9 @@ exports[`AcceptTerms renders appropriately if is transition with transition type
       </span>
     </li>
     <li>
-      <span class="terms-transition">
+      <span class="terms-transition o3-type-body-base">
         Find out more about our cancellation policy in our
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
         >
@@ -1274,12 +1233,11 @@ exports[`AcceptTerms renders with an error 1`] = `
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"
@@ -1316,12 +1274,11 @@ exports[`AcceptTerms renders with default props 1`] = `
      class="o-forms-field o-layout-typography ncf__validation-error"
      data-validate="required,checked"
 >
-  <ul class="o-typography-list ncf__accept-terms-list">
+  <ul class="ncf__accept-terms-list">
     <li>
-      <span class="terms-default">
+      <span class="terms-default o3-type-body-base">
         I confirm I am 16 years or older and have read and agree to the
-        <a class="ncf__link--external"
-           href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+        <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
            target="_blank"
            rel="noopener noreferrer"
            data-trackable="terms-and-conditions"