@newskit-render/core 0.0.0-a0d00f7fa → 0.0.0-b34c9a55b

package/CHANGELOG.md

@@ -3,6 +3,118 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.35.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.3-alpha.0...@newskit-render/core@4.35.3) (2024-10-11)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.35.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.2-alpha.0...@newskit-render/core@4.35.2) (2024-10-11)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.35.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.1-alpha.2...@newskit-render/core@4.35.1) (2024-10-10)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.35.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.0-alpha.0...@newskit-render/core@4.35.0) (2024-10-02)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.7-alpha.0...@newskit-render/core@4.34.7) (2024-09-25)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.6-alpha.0...@newskit-render/core@4.34.6) (2024-09-20)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.5-alpha.0...@newskit-render/core@4.34.5) (2024-09-20)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.4-alpha.0...@newskit-render/core@4.34.4) (2024-09-19)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.3-alpha.0...@newskit-render/core@4.34.3) (2024-09-18)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.2-alpha.1...@newskit-render/core@4.34.2) (2024-09-16)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.34.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.1-alpha.0...@newskit-render/core@4.34.1) (2024-09-13)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.34.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.0-alpha.0...@newskit-render/core@4.34.0) (2024-09-12)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.33.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.33.1-alpha.0...@newskit-render/core@4.33.1) (2024-09-10)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.33.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.33.0-alpha.0...@newskit-render/core@4.33.0) (2024-09-10)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 ## [4.32.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.32.1-alpha.1...@newskit-render/core@4.32.1) (2024-09-05)
 
 **Note:** Version bump only for package @newskit-render/core

package/cypress/e2e/account/newsletters-page.cy.js

@@ -1,10 +1,16 @@
+import {
+  registration_blaize_jwt,
+  subscription_blaize_jwt,
+} from '../../support/blaizeJwtValues'
+
 describe('Newsletters page', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession()
-    cy.mockConsentAndVisit('/account/newsletters')
+    cy.mockConsent()
   })
 
-  it('Should display the newsletters page', () => {
+  it('Should display all the newsletters on the newsletters page when user is subscribed', () => {
+    cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
     cy.contains('Newsletters')
     cy.contains(
       'Exclusive content and a curated selection of our top stories straight to your inbox.'
@@ -12,7 +18,18 @@ describe('Newsletters page', () => {
     cy.get('[data-testid="newsletters-grid"] > div').should('have.length', 20)
   })
 
+  // Commented out because Optimizely feature flag with tm-my-account key is causing it to fail in this repo. Test should be re-enabled once feature flag is removed.
+  // it('Should only display selected newsletters on the newsletters page when user is registered', () => {
+  //   cy.mockBlaizeJwtAndVisit(registration_blaize_jwt, '/account/newsletters')
+  //   cy.contains('Newsletters')
+  //   cy.contains(
+  //     'Exclusive content and a curated selection of our top stories straight to your inbox.'
+  //   )
+  //   cy.get('[data-testid="newsletters-grid"] > div').should('have.length', 12)
+  // })
+
   it('Should display all required newsletter text in the first grid card', () => {
+    cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
     cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
       const firstNewsletter = $parentDiv.find('div:first-child')
 
@@ -27,6 +44,7 @@ describe('Newsletters page', () => {
   })
 
   it('Should successfully subscribe to a newsletter', () => {
+    cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
     cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
       cy.intercept('POST', '/api/account/mutate', { statusCode: 200, ok: true })
 
@@ -46,6 +64,7 @@ describe('Newsletters page', () => {
   })
 
   it('Should show the error toast on server error', () => {
+    cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
     cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
       cy.intercept('POST', '/api/account/mutate', {
         statusCode: 500,

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', () => {

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]
 

package/helpers/getProviderPropsUtil.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "0.0.0-a0d00f7fa",
+  "version": "0.0.0-b34c9a55b",
   "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.2",
+    "@newskit-render/api": "^1.14.0",
     "@newskit-render/auth": "^1.8.1",
-    "@newskit-render/checkout": "^3.10.10",
+    "@newskit-render/checkout": "^3.10.16",
     "@newskit-render/feature-flags": "^1.10.0",
-    "@newskit-render/feed": "^1.8.10",
-    "@newskit-render/my-account": "^7.64.1",
-    "@newskit-render/shared-components": "^4.31.4",
-    "@newskit-render/standalone-components": "^3.21.10",
-    "@newskit-render/validation": "^1.17.1",
+    "@newskit-render/feed": "^1.8.13",
+    "@newskit-render/my-account": "^7.72.3",
+    "@newskit-render/shared-components": "^4.32.3",
+    "@newskit-render/standalone-components": "^3.22.4",
+    "@newskit-render/validation": "^1.17.2",
     "cross-fetch": "3.1.5",
     "graphql": "16.6.0",
     "lodash.get": "4.4.2",

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

@@ -1,13 +1,10 @@
 import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import {
-  AddField,
-  addComponentMap,
-  getProviderPropsTimes,
-  // getProviderProps,
-} from '@newskit-render/my-account'
+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
@@ -20,67 +17,27 @@ const AccountAddField = (props) => (
 )
 
 export default AccountAddField
-// export const getServerSideProps = async (context) => {
-//   const {
-//     params: { field },
-//   } = context
-//   const doesAddpageExist = Object.keys(addComponentMap).includes(field)
-//   replaceConsoleAndSetTransactionName(`Account: add ${field}`)
-
-//   if (!doesAddpageExist) {
-//     context.res.statusCode = 404
-//     // Logging the error for being captured by New Relic
-//     console.error(`An error ${context.res.statusCode} occurred on server`)
-//   }
-
-//   return {
-//     props: { data: { type: field } },
-//   }
-// }
-
 export const getServerSideProps = async (context) => {
-  // const featureFlags = await getAllFeatureFlags(
-  //   getUserAttributes(context?.req?.headers)
-  // )
-
   const {
     params: { field },
   } = context
-  const doesAddPageExist = Object.keys(addComponentMap).includes(field)
-
+  const doesAddpageExist = Object.keys(addComponentMap).includes(field)
   replaceConsoleAndSetTransactionName(`Account: add ${field}`)
 
-  const defaultPageResponse = {
-    props: { data: { type: field }, requestHeaders: context.req.headers },
-  }
-
-  const getProviderPropsResponse = (await getProviderPropsTimes({
-    ...context,
-    provider: 'AddField',
-  })) as unknown as { props: unknown }
-  console.log('getProviderPropsResponse', getProviderPropsResponse)
-
-  if (!doesAddPageExist) {
+  if (!doesAddpageExist) {
     context.res.statusCode = 404
     // Logging the error for being captured by New Relic
     console.error(`An error ${context.res.statusCode} occurred on server`)
-
-    // The 404 logic for non-existent [add] components is added in the DynamicPage
-    return defaultPageResponse
   }
 
-  const { isUserFamilyAccountPrimary } =
-    // @ts-ignore
-    getProviderPropsResponse.props.user
+  const featureFlags = await getAllFeatureFlags()
+  const providerProps = (await getProviderPropsUtil(
+    { ...context, provider: 'AddField' },
+    { featureFlags } /* cra-effected */
+  )) as unknown as { props: { data: { type: string } } }
 
-  if (field === 'family' && !isUserFamilyAccountPrimary) {
-    return {
-      redirect: {
-        permanent: false,
-        destination: '/404',
-      },
-    }
+  if (providerProps?.props) {
+    providerProps.props = { ...providerProps.props, data: { type: field } }
   }
-
-  return defaultPageResponse
+  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 { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountCancellation = (props) => (
   <Cancellation {...props} validation={validation} />
@@ -15,7 +16,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   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 { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountNewslettersAndAlerts = (props) => <DreamTeam {...props} />
 
@@ -12,7 +13,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'DreamTeam' },
     { featureFlags } /* cra-effected */
   )

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

@@ -2,13 +2,12 @@ import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
   EditField,
-  // getProviderProps,
-  getProviderPropsTimes,
   editComponentMap,
   DynamicPage,
 } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountEditField = (props) => (
   <DynamicPage
@@ -39,7 +38,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderPropsTimes(
+  return getProviderPropsUtil(
     { ...context, provider: 'EditField' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/family/index.tsx

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

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

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

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

@@ -1,11 +1,8 @@
 import React from 'react'
-import {
-  // getProviderProps,
-  getProviderPropsTimes,
-  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
@@ -19,5 +16,5 @@ export default AccountPreviousHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Previous Holiday Stops')
-  return getProviderPropsTimes({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsUtil({ ...context, provider: 'HolidayStop' })
 }

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

@@ -1,11 +1,8 @@
 import React from 'react'
-import {
-  // getProviderProps,
-  getProviderPropsTimes,
-  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
@@ -19,5 +16,5 @@ export default AccountUpcomingHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Upcoming Holiday Stops')
-  return getProviderPropsTimes({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsUtil({ ...context, provider: 'HolidayStop' })
 }

package/pages/account/index.tsx

@@ -1,12 +1,9 @@
 import React from 'react'
-import {
-  PersonalDetails,
-  getProviderPropsTimes,
-  // getProviderProps,
-} from '@newskit-render/my-account'
+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 { getProviderPropsUtil } from '../../helpers/getProviderPropsUtil'
 
 const AccountPersonalDetails = (props) => {
   return (
@@ -28,7 +25,7 @@ export const getServerSideProps = async (context) => {
 
   const featureFlags = await getAllFeatureFlags()
 
-  return getProviderPropsTimes(
+  return getProviderPropsUtil(
     { ...context, provider: 'PersonalDetails' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/newsletters/index.tsx

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

package/pages/account/newsletters-and-alerts/index.tsx

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

package/pages/account/payment/[paymentMethod].tsx

@@ -1,13 +1,12 @@
 import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
-  // getProviderProps,
-  getProviderPropsTimes,
   Payment,
   paymentMethodsMap,
   DynamicPage,
 } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const PaymentPage = (props) => {
   return (
@@ -28,7 +27,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderPropsTimes(
+  return getProviderPropsUtil(
     {
       ...context,
       provider: 'Payment',

package/pages/account/payment/index.tsx

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

package/pages/account/payment-methods/index.tsx

@@ -1,12 +1,9 @@
 import React from 'react'
-import {
-  // getProviderProps,
-  getProviderPropsTimes,
-  PaymentMethods,
-} from '@newskit-render/my-account'
+import { PaymentMethods } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' // create-render-app effected
 import { paymentMethodContext } from '../../../context/app-context/paymentMethodContext'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountPaymentMethods = (props) => (
   <PaymentMethods {...props} context={paymentMethodContext} />
@@ -18,7 +15,7 @@ export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Payment Methods')
   const featureFlags = await getAllFeatureFlags()
   // create-render-app effected
-  return getProviderPropsTimes(
+  return getProviderPropsUtil(
     { ...context, provider: 'PaymentMethods' },
     { featureFlags } // create-render-app effected
   )

package/pages/account/subscription-and-billing/index.tsx

@@ -1,11 +1,8 @@
 import React from 'react'
-import {
-  SubscriptionAndBilling,
-  getProviderPropsTimes,
-  // getProviderProps,
-} from '@newskit-render/my-account'
+import { SubscriptionAndBilling } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountSubscriptionAndBilling = (props) => (
   <SubscriptionAndBilling {...props} />
@@ -18,7 +15,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  const result = await getProviderPropsTimes(
+  const result = await getProviderPropsUtil(
     {
       ...context,
       provider: 'SubscriptionAndBilling',

package/pages/account/user-hub/index.tsx

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