@newskit-render/core 0.0.0-ae9ce1f41 → 0.0.0-alpha.18e8fdadc

package/Dockerfile.withNewRelic

@@ -4,7 +4,6 @@ WORKDIR /app
 
 ENV NEXT_TELEMETRY_DISABLED 1
 
-RUN npm install @newrelic/next
 COPY .next/standalone ./standalone
 COPY public ./standalone/public
 COPY .next/static ./standalone/.next/static
@@ -12,4 +11,4 @@ COPY .next/static ./standalone/.next/static
 EXPOSE 3000
 ENV PORT 3000
 
-CMD ["node", "-r", "@newrelic/next", "./standalone/server.js"]
+CMD ["node", "./standalone/server.js"]

package/components/header/banner-messages.ts

@@ -25,6 +25,8 @@ export const pastDueBanner = {
     title: 'Your subscription will end soon.',
     phoneNumber: 'XXXX-XXX-XXXX',
     text: 'You have cancelled your subscription and will lose access to all benefits on ##DATE##. To re-activate your subscription call ##PHONE_NUMBER##.',
+    alternativeText:
+      'You have cancelled your subscription and will lose access to all benefits. To re-activate your subscription call ##PHONE_NUMBER##.',
   },
   toBeCancelledWithRefund: {
     title: 'Your subscription will end soon.',
@@ -32,6 +34,10 @@ export const pastDueBanner = {
     text: 'We have successfully cancelled your subscription and will be processing your refund shortly. If you have any question please call ##PHONE_NUMBER##.',
     dismissDays: 7,
   },
+  paymentFailure: {
+    title: 'We haven’t been able to take payment',
+    text: 'Your latest payment has failed. Please update your payment details as soon as possible to keep your membership.',
+  },
   treshold: {
     firstNotice: 26,
     secondNotice: 30,

package/cypress/e2e/account/banners.cy.js

@@ -84,6 +84,19 @@ describe('Banners', () => {
     cy.get('[data-testid="banner-close-button"]').should('be.visible')
   })
 
+  it('Should show cancelled notice with alternative text if the serviceCancellationDate is not updated yet', () => {
+    cy.GetTnlAcsSession('tnl')
+    cy.mockConsent()
+    cy.visitAndOverrideNextData(
+      '/account',
+      'props.pageProps.user.subscriptions[0].status',
+      'Cancellation Requested'
+    )
+    cy.contains(
+      'You have cancelled your subscription and will lose access to all benefits. To re-activate your subscription call XXXX-XXX-XXXX.'
+    )
+  })
+
   it('Should show expired subscription view with terminated notice', () => {
     cy.GetAcsSession('expiredSub')
     cy.mockConsent()

package/cypress/e2e/account/holiday-stops.cy.js

@@ -1,6 +1,6 @@
 import { getTestDates } from '../../fixtures/testDates'
 
-describe('Book a Holiday Stop', () => {
+describe.skip('Book a Holiday Stop', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession('tnl')
     cy.mockConsentAndVisit('/account/holiday-stop')
@@ -13,7 +13,7 @@ describe('Book a Holiday Stop', () => {
   })
 })
 
-describe('Add a Holiday Stop', () => {
+describe.skip('Add a Holiday Stop', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession('tnl')
     cy.mockConsentAndVisit('/account/add/holiday-stop')
@@ -52,7 +52,7 @@ describe('Add a Holiday Stop', () => {
   })
 })
 
-describe('Upcoming Holiday Stops - edit button', () => {
+describe.skip('Upcoming Holiday Stops - edit button', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession('tnl')
     cy.mockConsentAndVisit('/account/holiday-stop')
@@ -86,7 +86,7 @@ describe('Upcoming Holiday Stops - edit button', () => {
   })
 })
 
-describe('Cancel Holiday Stop', () => {
+describe.skip('Cancel Holiday Stop', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession('tnl')
     cy.mockConsentAndVisit('/account/holiday-stop')

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

@@ -1,51 +1,52 @@
-import {
-  registration_blaize_jwt,
-  subscription_blaize_jwt,
-} from '../../support/blaizeJwtValues'
-
 describe('Newsletters page', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession()
     cy.mockConsent()
   })
 
-  it('Should display all the newsletters on the newsletters page when user is subscribed', () => {
-    cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
+  it('Should display all the newsletters on the newsletters page when user has a subscription', () => {
+    cy.mockConsentAndVisit('/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', 20)
+    cy.get('[data-testid="newsletters-grid"] > div > div').should(
+      'have.length.greaterThan',
+      1
+    )
   })
 
-  // 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 only display selected newsletters on the newsletters page when user is registered', () => {
+    cy.GetTnlAcsSession('tnlNoSubscription')
+    cy.mockConsentAndVisit('/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 > div').should(
+      'have.length.greaterThan',
+      1
+    )
+  })
 
   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) => {
+    cy.mockConsentAndVisit('/account/newsletters')
+    cy.get('[data-testid="newsletters-grid-featured"]').then(($parentDiv) => {
       const firstNewsletter = $parentDiv.find('div:first-child')
 
-      cy.wrap(firstNewsletter).contains('Business').should('be.visible')
+      cy.wrap(firstNewsletter).contains('Daily Briefing').should('be.visible')
       cy.wrap(firstNewsletter).contains('Daily').should('be.visible')
       cy.wrap(firstNewsletter)
         .contains(
-          "The business editor's exclusive analysis of all the latest financial and economic news."
+          'Our flagship newsletter with our top stories and exclusive analysis every morning.'
         )
         .should('be.visible')
     })
   })
 
   it('Should successfully subscribe to a newsletter', () => {
-    cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
-    cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
+    cy.mockConsentAndVisit('/account/newsletters')
+    cy.get('[data-testid="newsletters-grid-featured"]').then(($parentDiv) => {
       cy.intercept('POST', '/api/account/mutate', { statusCode: 200, ok: true })
 
       const firstNewsletter = $parentDiv.find('div:first-child')
@@ -58,14 +59,14 @@ describe('Newsletters page', () => {
 
       cy.contains(
         '[data-testid="toast-container"]',
-        'Thank you, you are now signed up to the Business newsletter'
+        'Thank you, you are now signed up to the Daily Briefing newsletter'
       )
     })
   })
 
   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.mockConsentAndVisit('/account/newsletters')
+    cy.get('[data-testid="newsletters-grid-featured"]').then(($parentDiv) => {
       cy.intercept('POST', '/api/account/mutate', {
         statusCode: 500,
         ok: false,
@@ -81,7 +82,7 @@ describe('Newsletters page', () => {
 
       cy.contains(
         '[data-testid="toast-container"]',
-        'Sorry we were unable to sign you up to the Business newsletter, please try again'
+        'Sorry we were unable to sign you up to the Daily Briefing newsletter, please try again'
       )
     })
   })

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

@@ -406,9 +406,12 @@ describe('Personal detail edit pages', () => {
       )
 
       // Change email back to the previous email
+      cy.intercept('POST', '/api/account/mutate').as('updateEmail')
+
       cy.get('[name="email"]').clear()
       cy.get('[name="email"]').type(currentEmail)
       cy.get('[data-testid="primary-button"]').click()
+      cy.wait('@updateEmail')
     })
   })
 

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

@@ -138,15 +138,14 @@ describe('Subscription and billing details for Digital user', () => {
     cy.contains('expiry date 02/27')
   })
 
-  // Skipped due to graphql changes. To be fixed with TMR-1959
-  it.skip('Should display Invoice history section', () => {
-    cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
-    cy.contains('Digital pack')
-    cy.contains('20 Sept 2022')
-    cy.contains('Paid')
-    cy.get('a[data-testid="download-button"]')
-      .should('have.attr', 'href', '#')
-      .contains('View')
+  // Section no longer displayed when Invoice history is empty due to graphql change
+  // Invoices are no longer fetched if older than 1 year
+  // This test would periodically fail as it depends on changing user data
+  it('Should not display empty Invoice history section', () => {
+    cy.get('[data-testid="ContentListIntroduction"]').should(
+      'not.contain',
+      'Invoice history'
+    )
   })
 
   it('Should NOT display Your deliveries section', () => {
@@ -219,7 +218,7 @@ describe('Subscription and billing details for Print user', () => {
     cy.contains('On my doorstep')
     cy.contains('Holiday Stops')
     cy.contains(
-      'You can pause your print delivery at any time by adding a Holiday Stop to your account. Holiday Stops need to be booked before 16:00 GMT the day before you want to pause delivery.'
+      'You can pause your print delivery at any time by adding a Holiday Stop to your account. Holiday Stops need to be booked by 2pm (UK time), two days before your delivery pause begins.'
     )
 
     cy.contains(
@@ -227,17 +226,6 @@ describe('Subscription and billing details for Print user', () => {
     )
   })
 
-  // Skipped due to graphql changes. To be fixed with TMR-1959
-  it.skip('Should display Invoice history section', () => {
-    cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
-    cy.contains('Print pack')
-    cy.contains('24 Apr 2023')
-    cy.contains('Paid')
-    cy.get('a[data-testid="download-button"]')
-      .should('have.attr', 'href', '#')
-      .contains('View')
-  })
-
   it('Should display Your deliveries section for users with vouchers', () => {
     cy.GetTnlAcsSession('printVouchers')
     cy.mockConsentAndVisit('/account/subscription-and-billing')
@@ -245,11 +233,9 @@ describe('Subscription and billing details for Print user', () => {
     cy.contains('[data-testid="ContentListIntroduction"]', 'Your deliveries')
     cy.contains('Address')
     cy.contains('2 Tuke House, Cromwell Road, York, YO1 6DJ, North Yorkshire')
-    cy.contains('Delivery instructions')
-    cy.contains('On my doorstep')
     cy.contains('Holiday Stops')
     cy.contains(
-      'You can pause your print delivery at any time by adding a Holiday Stop to your account. Holiday Stops need to be booked before 16:00 GMT the day before you want to pause delivery.'
+      'You can pause your print delivery at any time by adding a Holiday Stop to your account. Holiday Stops need to be booked by 2pm (UK time), two days before your delivery pause begins.'
     )
     cy.contains('Your vouchers')
     cy.contains(
@@ -279,18 +265,6 @@ describe('Subscription and billing details for Digi-Print user', () => {
     cy.contains('Digi-Print')
     //...rest is same as Print user
   })
-
-  // This test is going to fail on 13.11.2024 due to graphql changes.
-  // To be fixed with TMR-1959
-  it('Should display Invoice history section', () => {
-    cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
-    cy.contains('Digi-Print pack')
-    cy.contains('12 Nov 2023')
-    cy.contains('Paid')
-    cy.get('a[data-testid="download-button"]')
-      .should('have.attr', 'href', '#')
-      .contains('View')
-  })
 })
 
 describe('Subscription and billing details for Paypal user', () => {

package/cypress/support/commands.js

@@ -31,11 +31,6 @@ 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/cypress/support/users.js

@@ -54,5 +54,9 @@ export const userMap = {
     username: 'digi-print-card-15-11-22@yopmail.com',
     password: 'Password123Testing123$',
   },
-  }
-  
+  tnlNoSubscription: {
+    //registered user with no subscription, tests the number of newsletters displayed
+    username: 'tm-test+staging-registered-user@news.co.uk',
+    password: 'Growth123',
+  },
+}

package/helpers/getProviderPropsUtil.ts

@@ -6,8 +6,11 @@ import { publisher } from '../config'
 
 export const getProviderPropsUtil = (context, options?) => {
   if (process.env.NODE_ENV === 'development' && publisher === 'TIMES') {
-    return getProviderPropsTimes(context, {
-      ...options,
+    return getProviderPropsTimes({
+      context,
+      options: {
+        ...options,
+      },
     })
   }
 

package/next.config.js

@@ -29,67 +29,65 @@ module.exports = (phase) => {
   }
 
   const path = require('path')
-  const withTM = require('next-transpile-modules')([
-    '@newskit-render/auth',
-    '@newskit-render/my-account',
-    '@newskit-render/validation',
-  ])
   const withBundleAnalyzer = require('@next/bundle-analyzer')({
     enabled: process.env.ANALYZE === 'true',
   })
 
-  return withBundleAnalyzer(
-    withTM({
-      webpack: (config, options) => {
-        if (options.isServer) {
-          config.externals = ['react', ...config.externals]
-        }
+  return withBundleAnalyzer({
+    transpilePackages: [
+      '@newskit-render/auth',
+      '@newskit-render/my-account',
+      '@newskit-render/validation',
+    ],
+    webpack: (config, options) => {
+      if (options.isServer) {
+        config.externals = ['react', ...config.externals]
+      }
 
-        config.resolve.alias.newskit = path.resolve(
-          __dirname,
-          '.',
-          'node_modules',
-          'newskit'
-        )
-        config.resolve.alias.react = path.resolve(
-          __dirname,
-          '.',
-          'node_modules',
-          'react'
-        )
+      config.resolve.alias.newskit = path.resolve(
+        __dirname,
+        '.',
+        'node_modules',
+        'newskit'
+      )
+      config.resolve.alias.react = path.resolve(
+        __dirname,
+        '.',
+        'node_modules',
+        'react'
+      )
 
-        return config
-      },
-      images,
-      output: 'standalone',
-      async rewrites() {
-        return [
-          {
-            source: '/sitemap.xml',
-            destination: '/api/sitemap',
-          },
-          {
-            source: '/pages-sitemap.xml',
-            destination: '/api/pages-sitemap',
-          },
-          {
-            source: '/competitions-sitemap.xml',
-            destination: '/api/competitions-sitemap',
-          },
-          {
-            source: '/news-sitemap.xml',
-            destination: '/api/news-sitemap',
-          },
-          {
-            source: '/feed',
-            destination: '/api/feed',
-          },
-          {
-            source: '/robots.txt',
-            destination: '/api/robots',
-          },
-        ]
-      },
-    })
-  )
+      return config
+    },
+    images,
+    output: 'standalone',
+    async rewrites() {
+      return [
+        {
+          source: '/sitemap.xml',
+          destination: '/api/sitemap',
+        },
+        {
+          source: '/pages-sitemap.xml',
+          destination: '/api/pages-sitemap',
+        },
+        {
+          source: '/competitions-sitemap.xml',
+          destination: '/api/competitions-sitemap',
+        },
+        {
+          source: '/news-sitemap.xml',
+          destination: '/api/news-sitemap',
+        },
+        {
+          source: '/feed',
+          destination: '/api/feed',
+        },
+        {
+          source: '/robots.txt',
+          destination: '/api/robots',
+        },
+      ]
+    },
+  })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "0.0.0-ae9ce1f41",
+  "version": "0.0.0-alpha.18e8fdadc",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -42,21 +42,21 @@
     "@emotion/styled": "11.9.3",
     "@newrelic/next": "0.5.2",
     "@newrelic/winston-enricher": "4.0.1",
-    "@newskit-render/api": "^1.14.1",
-    "@newskit-render/auth": "^1.8.2",
-    "@newskit-render/checkout": "^3.10.21",
-    "@newskit-render/feature-flags": "^1.11.1",
-    "@newskit-render/feed": "^1.8.14",
-    "@newskit-render/my-account": "^7.82.1",
-    "@newskit-render/shared-components": "^4.35.1",
-    "@newskit-render/standalone-components": "^3.23.4",
-    "@newskit-render/validation": "^1.18.1",
+    "@newskit-render/api": "^0.0.0-alpha.18e8fdadc",
+    "@newskit-render/auth": "^0.0.0-alpha.18e8fdadc",
+    "@newskit-render/checkout": "^0.0.0-alpha.18e8fdadc",
+    "@newskit-render/feature-flags": "^0.0.0-alpha.18e8fdadc",
+    "@newskit-render/feed": "^0.0.0-alpha.18e8fdadc",
+    "@newskit-render/my-account": "^0.0.0-alpha.18e8fdadc",
+    "@newskit-render/shared-components": "^0.0.0-alpha.18e8fdadc",
+    "@newskit-render/standalone-components": "^0.0.0-alpha.18e8fdadc",
+    "@newskit-render/validation": "^0.0.0-alpha.18e8fdadc",
     "cross-fetch": "3.1.5",
     "graphql": "16.6.0",
     "lodash.get": "4.4.2",
     "newrelic": "10.6.1",
     "newskit": "7.7.0",
-    "next": "13.4.4",
+    "next": "13.5.10",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-helmet": "6.1.0",
@@ -100,7 +100,6 @@
     "jest-junit": "15.0.0",
     "jest-watch-typeahead": "2.2.1",
     "lint-staged": "13.1.0",
-    "next-transpile-modules": "10.0.0",
     "prettier": "2.8.3",
     "prettier-eslint": "15.0.1",
     "prettier-eslint-cli": "7.1.0",
@@ -123,5 +122,6 @@
     "@types/react-dom": "18.0.10",
     "@types/pino-std-serializers": "2.4.1",
     "@types/pino-pretty": "4.7.5"
-  }
+  },
+  "gitHead": "b30268bc77d15844b19cb165c1705974543cc38e"
 }

package/pages/account/{family → bonus-accounts}/index.tsx

@@ -9,18 +9,15 @@ const AccountFamily = (props) => <Family {...props} />
 export default AccountFamily
 
 export const getServerSideProps = async (context) => {
-  replaceConsoleAndSetTransactionName('Account: Family')
+  replaceConsoleAndSetTransactionName('Account: Bonus Accounts')
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
 
-  const provider = featureFlags?.enable_invite_family_v2_query
-    ? 'GroupAccountsV2'
-    : 'GroupAccounts'
   /* end cra-effected */
   return getProviderPropsUtil(
     {
       ...context,
-      provider,
+      provider: 'GroupAccountsV2',
     },
     { featureFlags } /* cra-effected */
   )

package/pages/account/cancel/index.tsx

@@ -0,0 +1,14 @@
+import React from 'react'
+import { CancellationStepper } from '@newskit-render/my-account'
+import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
+
+const AccountCancellation = (props) => <CancellationStepper {...props} />
+
+export default AccountCancellation
+
+export const getServerSideProps = async (context) => {
+  replaceConsoleAndSetTransactionName('Account: Cancellation')
+
+  return getProviderPropsUtil({ ...context, provider: 'Cancellation' })
+}

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

@@ -3,15 +3,19 @@ import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
   EditField,
   editComponentMap,
+  broadcastingOnlyEditComponentMap,
   DynamicPage,
 } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
 import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
+import { publisher } from '../../../config'
+import { Publisher } from '@newskit-render/api'
 
 const AccountEditField = (props) => (
   <DynamicPage
     objectMap={editComponentMap}
+    isPageRestricted={props.isPageRestricted}
     pageName={props.data.type}
     Component={EditField}
     componentProps={props}
@@ -27,9 +31,15 @@ export const getServerSideProps = async (context) => {
   } = context
   const doesEditPageExist = Object.keys(editComponentMap).includes(field)
 
+  const isBroadcasting = publisher === Publisher.BROADCASTING
+  const broadcastingOnlyPages = Object.keys(broadcastingOnlyEditComponentMap)
+
+  const isPageRestricted =
+    !isBroadcasting && broadcastingOnlyPages.includes(field)
+
   replaceConsoleAndSetTransactionName(`Account: edit ${field}`)
 
-  if (!doesEditPageExist) {
+  if (!doesEditPageExist || isPageRestricted) {
     context.res.statusCode = 404
     // Logging the error for being captured by New Relic
     console.error(`An error ${context.res.statusCode} occurred on server`)
@@ -40,6 +50,9 @@ export const getServerSideProps = async (context) => {
 
   return getProviderPropsUtil(
     { ...context, provider: 'EditField' },
-    { featureFlags } /* cra-effected */
+    {
+      featureFlags,
+      isPageRestricted,
+    } /* cra-effected */
   )
 }

package/pages/account/index.tsx

@@ -2,8 +2,8 @@ import React from 'react'
 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'
+import { replaceConsoleAndSetTransactionName } from '../../helpers/logger'
 
 const AccountPersonalDetails = (props) => {
   return (

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

@@ -1,12 +1,22 @@
 import React from 'react'
-import { SubscriptionAndBilling } from '@newskit-render/my-account'
+import {
+  SubscriptionAndBilling,
+  subscriptionAndBillingContextSun,
+  subscriptionAndBillingContext,
+} from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { Publisher } from '@newskit-render/api'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
-const AccountSubscriptionAndBilling = (props) => (
-  <SubscriptionAndBilling {...props} />
-)
+const AccountSubscriptionAndBilling = (props) => {
+  const context =
+    props.env.PUBLISHER === Publisher.SUN_UK
+      ? subscriptionAndBillingContextSun
+      : subscriptionAndBillingContext
+
+  return <SubscriptionAndBilling {...props} context={context} />
+}
 
 export default AccountSubscriptionAndBilling
 

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

@@ -14,7 +14,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
   return getProviderPropsUtil(
-    { ...context, provider: 'PersonalDetails' },
+    { ...context, provider: 'UserHub' },
     { featureFlags } /* cra-effected */
   )
 }