Merge pull request #831 from DTS-STN/develop

Sync develop with Main for release v1.2.1
DTS-STN · Jul 19, 2023 · 15e0253 · 15e0253
2 parents 80a6c26 + ab3195d
commit 15e0253
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/pages/Auth.tsx → components/Layout/Auth.tsx b/pages/Auth.tsx → components/Layout/Auth.tsx
diff --git a/components/ResultsPage/WillBeEligible.tsx b/components/ResultsPage/WillBeEligible.tsx
@@ -60,9 +60,9 @@ export const WillBeEligible: React.VFC<{
             ? tsln.resultsPage.theyToReceive
             : tsln.resultsPage.partnerToReceive
 
-        const text = `${language === 'en' ? enStr : frStr} ${age}, ${
-          partner ? partnerText : tsln.resultsPage.toReceive
-        }`
+        const text = `${language === 'en' ? enStr : frStr} ${age}${
+          language === 'en' ? ',' : ' ans,'
+        } ${partner ? partnerText : tsln.resultsPage.toReceive}`
 
         const resultsArray: BenefitResult[] = Object.keys(resultObj[age]).map(
           (value) => resultObj[age][value]

diff --git a/i18n/api/en.ts b/i18n/api/en.ts
@@ -332,7 +332,7 @@ const en: Translations = {
     sinceYouAreSixty:
       "Since you're {CURRENT_AGE}, you can start receiving your payments right away or wait for up to {WAIT_MONTHS} more {MONTH_MONTHS}.",
     futureDeferralOptions:
-      "You can start receving your payments at 65 or wait until you're 70.",
+      "You can start receiving your payments at 65 or wait until you're 70.",
     youCanAply:
       'You can apply 11 months before the date you want your payments to start.',
     delayMonths:
@@ -386,7 +386,7 @@ const en: Translations = {
       'The Allowance for the Survivor is for widowed individuals between the ages of&nbsp;60 and&nbsp;64 who have not remarried or entered into a new common-law relationship.',
     alwsApply: 'You can apply for this benefit 1 month after you turn 59. ',
     autoEnrollTrue:
-      'Based on what you told us, <strong>you do not need to apply to get this benefit</strong>. You will receive a letter in the mail letting you know of your <strong>automatic enrollment</strong> the month after you turn 64.',
+      'Based on what you told us, <strong>you do not need to apply to get this benefit</strong>. You will receive a letter in the mail letting you know of your <strong>automatic enrolment</strong> the month after you turn 64.',
     autoEnrollFalse:
       'Based on what you told us, <strong>you may have to apply for this benefit</strong>. We may not have enough information to enroll you automatically.',
     expectToReceive:

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -1,30 +1,28 @@
 import type { AppProps } from 'next/app'
 import { SessionProvider } from 'next-auth/react'
 import '../styles/globals.css'
-import Auth from './Auth'
-
-const PRIVATE_PATHS = ['/', '/questions', '/results', '/resultats']
+import Auth from '../components/Layout/Auth'
 
 function MyApp({
   Component,
   pageProps: { session, ...pageProps },
   router: { route },
 }: AppProps) {
   const AuthRequired =
-    process.env.APP_ENV !== 'production' &&
-    process.env.APP_ENV !== 'alpha' &&
-    PRIVATE_PATHS.some((path) => route.startsWith(path))
+    process.env.APP_ENV !== 'production' && process.env.APP_ENV !== 'alpha'
 
   return (
-    <SessionProvider session={session}>
+    <>
       {AuthRequired ? (
-        <Auth>
-          <Component {...pageProps} />
-        </Auth>
+        <SessionProvider session={session}>
+          <Auth>
+            <Component {...pageProps} />
+          </Auth>
+        </SessionProvider>
       ) : (
         <Component {...pageProps} />
       )}
-    </SessionProvider>
+    </>
   )
 }