@newskit-render/core 0.0.0-d55b7d88 → 0.0.0-d95e48a4a

package/cypress/e2e/account/personal-details.cy.js

@@ -317,44 +317,7 @@ describe('Personal detail edit pages', () => {
         expect(loc.pathname).to.eq('/account')
       })
     })
-    it('Should change user email', () => {
-      const currentEmail = 'cmp-digi-card-20-09-22@yopmail.com'
-      const notRegistredEmail = 'not-registered-email@yopmail.com'
-
-      cy.get('a[href="/account/edit/email"]').should('be.visible').click()
-
-      cy.get('[name="email"]').clear()
-      cy.get('[name="email"]').type(notRegistredEmail)
-      cy.get('[data-testid="primary-button"]').click()
-
-      cy.contains('[data-testid="toast-container"]', 'Updating your email...')
-
-      // Redirects to Personal details page
-      cy.location().should((loc) => {
-        expect(loc.pathname).to.eq('/account')
-      })
-      cy.contains(notRegistredEmail).should('have.length', 1)
-      cy.contains(
-        '[data-testid="toast-container"]',
-        'Your email address was successfully updated'
-      )
-
-      // Back to edit email page
 
-      cy.get('a[href="/account/edit/email"]')
-        .should('be.visible')
-        .click({ force: true })
-
-      // Check the message for verification link
-      cy.contains(
-        `Email sent to ${notRegistredEmail} with a verification link. If you haven't received it yet, check again later or contact customer services on xxxx-xxx-xxxx`
-      )
-
-      // Change email back to the previous email
-      cy.get('[name="email"]').clear()
-      cy.get('[name="email"]').type(currentEmail)
-      cy.get('[data-testid="primary-button"]').click()
-    })
     it('Should NOT change user email if input value is already registered mail', () => {
       const alreadyRegistredEmail = 'cmp-digi-direct-20-09-22@yopmail.com'
 
@@ -370,6 +333,7 @@ describe('Personal detail edit pages', () => {
         'This email address is already in use. Try a different one or contact customer support at 1234-1234'
       )
     })
+
     it('Should show input validation error messages when user tries to add invalid email', () => {
       cy.get('a[href="/account/edit/email"]').should('be.visible').click()
 
@@ -391,6 +355,7 @@ describe('Personal detail edit pages', () => {
         'Updating your email...'
       ).should('not.exist')
     })
+
     it('Should show error toast when updating email if internal server error occures', () => {
       cy.intercept('POST', '/api/account/mutate', { statusCode: 500 })
 
@@ -406,6 +371,45 @@ describe('Personal detail edit pages', () => {
         "Sorry, we're unable to save your email right now. Please try again or come back later."
       )
     })
+
+    it('Should change user email', () => {
+      const currentEmail = 'cmp-digi-card-20-09-22@yopmail.com'
+      const notRegistredEmail = 'not-registered-email@yopmail.com'
+
+      cy.get('a[href="/account/edit/email"]').should('be.visible').click()
+
+      cy.get('[name="email"]').clear()
+      cy.get('[name="email"]').type(notRegistredEmail)
+      cy.get('[data-testid="primary-button"]').click()
+
+      cy.contains('[data-testid="toast-container"]', 'Updating your email...')
+
+      // Redirects to Personal details page
+      cy.location().should((loc) => {
+        expect(loc.pathname).to.eq('/account')
+      })
+      cy.contains(notRegistredEmail).should('have.length', 1)
+      cy.contains(
+        '[data-testid="toast-container"]',
+        'Your email address was successfully updated'
+      )
+
+      // Back to edit email page
+
+      cy.get('a[href="/account/edit/email"]')
+        .should('be.visible')
+        .click({ force: true })
+
+      // Check the message for verification link
+      cy.contains(
+        `Email sent to ${notRegistredEmail} with a verification link. If you haven't received it yet, check again later or contact customer services on xxxx-xxx-xxxx`
+      )
+
+      // Change email back to the previous email
+      cy.get('[name="email"]').clear()
+      cy.get('[name="email"]').type(currentEmail)
+      cy.get('[data-testid="primary-button"]').click()
+    })
   })
 
   describe('Edit password', () => {
@@ -864,7 +868,9 @@ describe('Personal detail edit pages', () => {
       cy.get('[data-testid="select-country"]').click()
       cy.get('[data-testid="United Kingdom"]').should('be.visible')
 
-      cy.get('[data-testid="United States of America"]').click()
+      cy.get('[data-testid="select-panel"]').within(() => {
+        cy.get('[data-testid="United States of America"]').click()
+      })
 
       cy.contains('Save').click()
 
@@ -977,7 +983,9 @@ describe('Personal detail edit pages', () => {
       cy.get('[data-testid="select-country"]').click()
       cy.get('[data-testid="United Kingdom"]').should('be.visible')
 
-      cy.get('[data-testid="United States of America"]').click()
+      cy.get('[data-testid="select-panel"]').within(() => {
+        cy.get('[data-testid="United States of America"]').click()
+      })
 
       cy.contains('Save').click()
 
@@ -1018,6 +1026,12 @@ describe('Personal detail edit pages', () => {
       cy.get('input[name="county"]').type('North Yorkshire')
       cy.get('input[name="postcode"]').clear()
       cy.get('input[name="postcode"]').type('YO1 6DJ')
+      cy.get('[data-testid="select-country"]').click()
+      cy.get('[data-testid="United Kingdom"]').should('be.visible')
+
+      cy.get('[data-testid="select-panel"]').within(() => {
+        cy.get('[data-testid="United Kingdom"]').click()
+      })
 
       cy.contains('Save').click()
 
@@ -1055,6 +1069,10 @@ describe('Personal detail edit pages', () => {
       cy.get('input[name="city"]').type('London')
       cy.get('input[name="postcode"]').clear()
       cy.get('input[name="postcode"]').type('SE1')
+      cy.get('[data-testid="select-country"]').click()
+      cy.get('[data-testid="select-panel"]').within(() => {
+        cy.get('[data-testid="United Kingdom"]').click()
+      })
 
       cy.contains('Save').click()
 

package/cypress/e2e/account/subscription-and-billing.cy.js

@@ -134,8 +134,8 @@ describe('Subscription and billing details for Digital user', () => {
     cy.contains('[data-testid="ContentListIntroduction"]', 'Billing details')
     cy.contains('Payment method')
     cy.get('[data-testid="visa-icon"]').should('exist')
-    cy.contains('************1111')
-    cy.contains('expiry date 03/30')
+    cy.contains('************4242')
+    cy.contains('expiry date 02/27')
   })
 
   it('Should display Invoice history section', () => {
@@ -213,7 +213,7 @@ describe('Subscription and billing details for Print user', () => {
   it('Should display Your deliveries section', () => {
     cy.contains('[data-testid="ContentListIntroduction"]', 'Your deliveries')
     cy.contains('Address')
-    cy.contains('Buckingham Palace, London, SW1A 1AA')
+    cy.contains('Buckingham Palace, London, SW1A')
     cy.contains('Delivery instructions')
     cy.contains('On my doorstep')
     cy.contains('Holiday Stops')
@@ -254,7 +254,7 @@ describe('Subscription and billing details for Print user', () => {
       'If your voucher booklet hasn’t arrived within three days of your booklet start date, or you have any issues regarding your vouchers, please contact us.'
     )
     cy.contains('Voucher booklet start date')
-    cy.contains('16/06/24')
+    cy.contains('20/09/2022')
     cy.contains(
       'Your contact address will be used for any of your deliveries. This can be managed via Personal details'
     )
@@ -307,7 +307,8 @@ describe('Subscription and billing details for Paypal user', () => {
     cy.get('a[href="/account/payment"]').should('be.visible').click()
     cy.contains(
       '[data-testid="Zuora-inline"]',
-      'To update your Paypal credentials, please speak to one of our advisors on xxxx-xxx-xxxx or add a new payment method via credit/debit card using the form below.'
+      'To update your Paypal credentials, please speak to one of our advisors on xxxx-xxx-xxxx or add a new payment method via credit/debit card using the form below.',
+      { timeout: 15000 }
     )
   })
 })

package/cypress/support/blaizeJwtValues.js

@@ -0,0 +1,3 @@
+export const subscription_blaize_jwt = 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ7XCJjcG5cIjpcIkFBQUEwMjU1OTcwNDVcIixcInByb2R1Y3RzXCI6W1wiVGhlIFRpbWVzIFNpdGUgUHJvZHVjdFwiLFwiVGltZXMgU3BvcnRzIEFwcFwiLFwiVGhlIFRpbWVzIEVQTCBWaWRlbyBQcm9kdWN0XCIsXCJUaGUgU3VuZGF5IFRpbWVzIGlQaG9uZSBhcHAgcHJvZHVjdFwiLFwiRW1haWwgQnVsbGV0aW5zIFByb2R1Y3RcIixcIlRoZSBTdW5kYXkgVGltZXMgTW9iaSBQcm9kdWN0XCIsXCJUaGUgU3VuZGF5IFRpbWVzIGlQYWQgYXBwIHByb2R1Y3RcIixcImUtcGFwZXIgUHJvZHVjdFwiLFwiRGFpbHkgQ3Jvc3N3b3JkIFByb2R1Y3RcIixcIlRoZSBTdW5kYXkgVGltZXMgU2l0ZSBQcm9kdWN0XCIsXCJUaGUgVGltZXMgTW9iaSBQcm9kdWN0XCIsXCJUaGUgVGltZXMgaVBhZCBhcHAgUHJvZHVjdFwiLFwiRGlnaXRhbCBTdWJzY3JpcHRpb24gUHJvZHVjdFwiLFwiVGhlIFRpbWVzIGlQaG9uZSBhcHAgcHJvZHVjdFwiLFwiVGltZXMrIG1lbWJlcnNoaXAgYmVuZWZpdHMgUHJvZHVjdFwiXX0iLCJodHRwczpcL1wvdGhldGltZXMuY28udWtcL2NwbiI6IkFBQUEwMjU1OTcwNDUiLCJodHRwczpcL1wvdGhldGltZXMuY28udWtcL3N1YnNjcmlwdGlvbiI6IlNVQi0wMDEwOTcyNjQ0IiwiaXNzIjoiLnRoZXRpbWVzLmNvbSIsImh0dHBzOlwvXC90aGV0aW1lcy5jby51a1wvcHJvZHVjdHMiOlsiVGhlIFRpbWVzIFNpdGUgUHJvZHVjdCIsIlRpbWVzIFNwb3J0cyBBcHAiLCJUaGUgVGltZXMgRVBMIFZpZGVvIFByb2R1Y3QiLCJUaGUgU3VuZGF5IFRpbWVzIGlQaG9uZSBhcHAgcHJvZHVjdCIsIkVtYWlsIEJ1bGxldGlucyBQcm9kdWN0IiwiVGhlIFN1bmRheSBUaW1lcyBNb2JpIFByb2R1Y3QiLCJUaGUgU3VuZGF5IFRpbWVzIGlQYWQgYXBwIHByb2R1Y3QiLCJlLXBhcGVyIFByb2R1Y3QiLCJEYWlseSBDcm9zc3dvcmQgUHJvZHVjdCIsIlRoZSBTdW5kYXkgVGltZXMgU2l0ZSBQcm9kdWN0IiwiVGhlIFRpbWVzIE1vYmkgUHJvZHVjdCIsIlRoZSBUaW1lcyBpUGFkIGFwcCBQcm9kdWN0IiwiRGlnaXRhbCBTdWJzY3JpcHRpb24gUHJvZHVjdCIsIlRoZSBUaW1lcyBpUGhvbmUgYXBwIHByb2R1Y3QiLCJUaW1lcysgbWVtYmVyc2hpcCBiZW5lZml0cyBQcm9kdWN0Il0sImV4cCI6MTcxNjk4ODc3OSwiaWF0IjoxNzE2MzgzOTc5fQ.JTqe7UJo985At-2JkuMrH-6H__qzwZwBGRnEJXl4CSM'
+
+export const registration_blaize_jwt = 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ7XCJjcG5cIjpcIkNQTi1YNlpOWFBRUlFcIixcInByb2R1Y3RzXCI6W119IiwiaHR0cHM6XC9cL3RoZXRpbWVzLmNvLnVrXC9jcG4iOiJDUE4tWDZaTlhQUVJRIiwiaHR0cHM6XC9cL3RoZXRpbWVzLmNvLnVrXC9zdWJzY3JpcHRpb24iOiJFR0FDQy1DUzAwMDAxMzQ0NjI4IiwiaXNzIjoiLnRoZXRpbWVzLmNvLnVrIiwiaHR0cHM6XC9cL3RoZXRpbWVzLmNvLnVrXC9wcm9kdWN0cyI6W10sImV4cCI6MTcyNTQ1NDgwNCwiaWF0IjoxNzI0ODUwMDA0fQ.XGTv2XooQ8VELZsc7bl35D0A9FlOvEWpexNlYpCCK1Q'

package/cypress/support/commands.js

@@ -1,4 +1,4 @@
-//Note: Check periodically if these consent cookie values exprire
+//Note: Check periodically if these consent cookie values expire
 import _ from 'lodash'
 import {
   consentUUIDValue,
@@ -31,6 +31,11 @@ Cypress.Commands.add('mockConsent', () => {
   setConsentLocalStorage()
 })
 
+Cypress.Commands.add('mockBlaizeJwtAndVisit', (jwtValue, url) => {
+  cy.setCookie('blaize_jwt', jwtValue)
+  cy.visit(url)
+})
+
 Cypress.Commands.add('GetAcsSession', (user = 'default') => {
   const { username, password } = userMap[user]
 
@@ -60,13 +65,13 @@ Cypress.Commands.add('GetTnlAcsSession', (user = 'tnl') => {
 
   cy.request({
     method: 'POST',
-    url: 'https://login.staging-thetimes.co.uk/services/session',
+    url: 'https://login.staging-thetimes.com/services/session',
     headers: {
       'Content-Type': 'application/vnd.newsuk.acs.createsession-v1+json',
     },
     body: {
       rememberMe: false,
-      gotoUrl: 'https://login.staging-thetimes.co.uk/',
+      gotoUrl: 'https://login.staging-thetimes.com/',
       sso: false,
       authCredentials: {
         username,

package/cypress/support/users.js

@@ -22,37 +22,37 @@ export const userMap = {
   },
   tnl: {
     username: 'cmp1aug2022printstag@yopmail.com', //Print user
-    password: 'Password123',
+    password: 'Password123Testing123$',
   },
   digitalCard: {
     //dtc=false
     username: 'cmp-digi-card-20-09-22@yopmail.com',
-    password: 'Password123',
+    password: 'Password123Testing123$',
   },
   digitalDirectDebit: {
     //dtc=false
     username: 'cmp-digi-direct-20-09-22@yopmail.com',
-    password: 'Password123',
+    password: 'Password123Testing123$',
   },
   print: {
     //dtc=true
     username: 'cmp-dtc-card-20-09-22@yopmail.com',
-    password: 'Password123',
+    password: 'Password123Testing123$',
   },
   printVouchers: {
     //dtc=false
     username: 'cmp-test-direct-20-09-22@yopmail.com',
-    password: 'Password123',
+    password: 'Password123Testing123$',
   },
   digiprint: {
     //dtc=true
     username: 'digi-print.dtc.test@yopmail.com',
-    password: 'Password123',
+    password: 'Password123Testing123$',
   },
   digiprintVouchers: {
     //dtc=false
     username: 'digi-print-card-15-11-22@yopmail.com',
-    password: 'Password123',
+    password: 'Password123Testing123$',
   },
   }
   

package/helpers/getProviderPropsUtil.ts

@@ -0,0 +1,17 @@
+import {
+  getProviderProps,
+  getProviderPropsTimes,
+} from '@newskit-render/my-account'
+import { publisher } from '../config'
+
+export const getProviderPropsUtil = (context, options?) => {
+  if (process.env.NODE_ENV === 'development' && publisher === 'TIMES') {
+    return getProviderPropsTimes(context, {
+      ...options,
+    })
+  }
+
+  return getProviderProps(context, {
+    ...options,
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "0.0.0-d55b7d88",
+  "version": "0.0.0-d95e48a4a",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -42,15 +42,15 @@
     "@emotion/styled": "11.9.3",
     "@newrelic/next": "0.5.2",
     "@newrelic/winston-enricher": "4.0.1",
-    "@newskit-render/api": "^1.12.1",
-    "@newskit-render/auth": "^1.8.0",
-    "@newskit-render/checkout": "^3.9.34-alpha.0",
-    "@newskit-render/feature-flags": "^1.8.1-alpha.1",
-    "@newskit-render/feed": "^1.8.9",
-    "@newskit-render/my-account": "^7.54.0-alpha.1",
-    "@newskit-render/shared-components": "^4.28.0-alpha.0",
-    "@newskit-render/standalone-components": "^3.20.27-alpha.0",
-    "@newskit-render/validation": "^1.17.0",
+    "@newskit-render/api": "^1.14.0",
+    "@newskit-render/auth": "^1.8.1",
+    "@newskit-render/checkout": "^3.10.19",
+    "@newskit-render/feature-flags": "^1.10.0",
+    "@newskit-render/feed": "^1.8.13",
+    "@newskit-render/my-account": "^7.80.0",
+    "@newskit-render/shared-components": "^4.34.0",
+    "@newskit-render/standalone-components": "^3.23.2",
+    "@newskit-render/validation": "^1.18.0",
     "cross-fetch": "3.1.5",
     "graphql": "16.6.0",
     "lodash.get": "4.4.2",

package/pages/account/add/[field].tsx

@@ -3,6 +3,8 @@ import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { AddField, addComponentMap } from '@newskit-render/my-account'
 import validation from '../../../validation'
 import { DynamicPage } from '@newskit-render/my-account'
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountAddField = (props) => (
   <DynamicPage
@@ -28,7 +30,14 @@ export const getServerSideProps = async (context) => {
     console.error(`An error ${context.res.statusCode} occurred on server`)
   }
 
-  return {
-    props: { data: { type: field } },
+  const featureFlags = await getAllFeatureFlags()
+  const providerProps = (await getProviderPropsUtil(
+    { ...context, provider: 'AddField' },
+    { featureFlags } /* cra-effected */
+  )) as unknown as { props: { data: { type: string } } }
+
+  if (providerProps?.props) {
+    providerProps.props = { ...providerProps.props, data: { type: field } }
   }
+  return providerProps
 }

package/pages/account/cancellation/index.tsx

@@ -1,8 +1,9 @@
 import React from 'react'
-import { Cancellation, getProviderProps } from '@newskit-render/my-account'
+import { Cancellation } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountCancellation = (props) => (
   <Cancellation {...props} validation={validation} />
@@ -13,9 +14,9 @@ export default AccountCancellation
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Cancellation')
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'Cancellation' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/delete/confirm/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  ConfirmAccountDeletion,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { ConfirmAccountDeletion } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
 
 const ConfirmDeletion = (props) => <ConfirmAccountDeletion {...props} />
 
@@ -12,5 +10,5 @@ export default ConfirmDeletion
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion - Confirmation')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/delete/error/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  AccountDeletionError,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { AccountDeletionError } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
 
 const Error = (props) => <AccountDeletionError {...props} />
 
@@ -12,5 +10,5 @@ export default Error
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion - Error')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/delete/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  InitiateAccountDeletion,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { InitiateAccountDeletion } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountDeletion = (props) => <InitiateAccountDeletion {...props} />
 
@@ -12,5 +10,5 @@ export default AccountDeletion
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/delete/success/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  AccountDeletionSuccess,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { AccountDeletionSuccess } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
 
 const Success = (props) => <AccountDeletionSuccess {...props} />
 
@@ -12,5 +10,5 @@ export default Success
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion - Success')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/dream-team/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { DreamTeam, getProviderProps } from '@newskit-render/my-account'
+import { DreamTeam } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountNewslettersAndAlerts = (props) => <DreamTeam {...props} />
 
@@ -10,9 +11,9 @@ export default AccountNewslettersAndAlerts
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Dream Team')
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'DreamTeam' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/edit/[field].tsx

@@ -2,12 +2,12 @@ import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
   EditField,
-  getProviderProps,
   editComponentMap,
   DynamicPage,
 } from '@newskit-render/my-account'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountEditField = (props) => (
   <DynamicPage
@@ -35,10 +35,10 @@ export const getServerSideProps = async (context) => {
     console.error(`An error ${context.res.statusCode} occurred on server`)
   }
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'EditField' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/family/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { Family, getProviderProps } from '@newskit-render/my-account'
+import { Family } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountFamily = (props) => <Family {...props} />
 
@@ -10,10 +11,13 @@ export default AccountFamily
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Family')
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
-    { ...context, provider: 'GroupAccounts' },
+  return getProviderPropsUtil(
+    {
+      ...context,
+      provider: 'GroupAccounts',
+    },
     { featureFlags } /* cra-effected */
   )
 }

package/pages/account/holiday-stop/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { getProviderProps, HolidayStop } from '@newskit-render/my-account'
+import { HolidayStop } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountHolidayStop = (props) => <HolidayStop {...props} />
 
@@ -10,9 +11,9 @@ export default AccountHolidayStop
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Book a Holiday Stop')
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'HolidayStop' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/holiday-stop/previous-holiday-stops.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
+import { HolidayStopList } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountPreviousHolidayStops = (props) => (
   <HolidayStopList
@@ -15,5 +16,5 @@ export default AccountPreviousHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Previous Holiday Stops')
-  return getProviderProps({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsUtil({ ...context, provider: 'HolidayStop' })
 }

package/pages/account/holiday-stop/upcoming-holiday-stops.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
+import { HolidayStopList } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountUpcomingHolidayStops = (props) => (
   <HolidayStopList
@@ -15,5 +16,5 @@ export default AccountUpcomingHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Upcoming Holiday Stops')
-  return getProviderProps({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsUtil({ ...context, provider: 'HolidayStop' })
 }

package/pages/account/index.tsx

@@ -1,9 +1,9 @@
 import React from 'react'
-import { PersonalDetails, getProviderProps } from '@newskit-render/my-account'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { PersonalDetails } from '@newskit-render/my-account'
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import { AccountDropdown } from '../../components/AccountDropdown' /* cra-disabled */
 import { replaceConsoleAndSetTransactionName } from '../../helpers/logger'
-import { closeFlagsInstance } from '@newskit-render/feature-flags'
+import { getProviderPropsUtil } from '../../helpers/getProviderPropsUtil'
 
 const AccountPersonalDetails = (props) => {
   return (
@@ -23,10 +23,9 @@ export default AccountPersonalDetails
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Personal details')
 
-  const featureFlags = await getFlagsAll()
-  await closeFlagsInstance()
+  const featureFlags = await getAllFeatureFlags()
 
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'PersonalDetails' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/newsletters/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { Newsletters, getProviderProps } from '@newskit-render/my-account'
+import { Newsletters } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountNewsletters = (props) => <Newsletters {...props} />
 
@@ -10,9 +11,9 @@ export default AccountNewsletters
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Newsletters')
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'Newsletters' },
     { featureFlags } /* cra-effected */
   )