after merge with develop

DTS-STN · Jun 27, 2024 · ccf78d6 · ccf78d6
2 parents 7df9322 + 98d0ebb
commit ccf78d6
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 83 deletions.
diff --git a/.azuredevops/dynamic-branches.yml b/.azuredevops/dynamic-branches.yml
@@ -97,19 +97,11 @@ steps:
         --resource-group $(webapp.resourceGroup) \
         --slot pr-preview-$(webapp.slotName) \
         --configuration-source $(webapp.name)
-
-        IDENTITY_RESOURCE_ID="/subscriptions/400c5730-25f5-4ee6-a933-8b289b9ccb0d/resourcegroups/rg-eligibilityestimator-dev/providers/microsoft.managedidentity/userassignedidentities/id-eligibilityestimator-dev"
-        ASSIGNED_IDENTITIES=$(az webapp identity show --name $(webapp.name) --resource-group $(webapp.resourceGroup) --slot pr-preview-$(webapp.slotName) --query "userAssignedIdentities" -o tsv)
-
-        if [[ $ASSIGNED_IDENTITIES != *"$IDENTITY_RESOURCE_ID"* ]]; then
-          az webapp identity assign \
-          --resource-group $(webapp.resourceGroup) \
-          --name $(webapp.name) \
-          --slot pr-preview-$(webapp.slotName) \
-          --identities $IDENTITY_RESOURCE_ID
-        else
-          echo "Identity $IDENTITY_RESOURCE_ID is already assigned to the slot."
-        fi
+        az webapp identity assign \
+        --resource-group $(webapp.resourceGroup) \
+        --name $(webapp.name) \
+        --slot pr-preview-$(webapp.slotName) \
+        --identities /subscriptions/400c5730-25f5-4ee6-a933-8b289b9ccb0d/resourcegroups/rg-eligibilityestimator-dev/providers/microsoft.managedidentity/userassignedidentities/id-eligibilityestimator-dev
 
   - task: AzureCLI@2
     displayName: 'Deploy pr image to new slot'

diff --git a/components/Forms/DatePicker.tsx b/components/Forms/DatePicker.tsx
@@ -131,7 +131,9 @@ export const DatePicker: React.FC<DatePickerProps> = (props) => {
               type="number"
               min={props.minYear}
               max={props.maxYear}
+              pattern="[0-9]*"
               onChange={_onYearChange}
+              onKeyUpCapture={restrictNonNumbers}
               className="inputStyles"
             />
           </div>

diff --git a/components/Layout/Breadcrumb.tsx b/components/Layout/Breadcrumb.tsx
@@ -27,7 +27,7 @@ export function Breadcrumb({ locale, items = [] }: BreadcrumbProps) {
             </Link>
 
             {index < items.length - 1 && (
-              <span className="inline-block align-middle text-multi-blue-blue70b">
+              <span className="mx-1 inline-block align-middle text-multi-blue-blue70b">
                 {/* eslint-disable-next-line @next/next/no-img-element */}
                 <img
                   id={`chevron-${index}`}

diff --git a/components/Layout/index.tsx b/components/Layout/index.tsx
@@ -18,8 +18,6 @@ export const Layout: React.VFC<{
   const [prodEnv, setProdEnv] = useState(null)
   const isProduction = process.env.APP_ENV === 'production'
 
-  console.log(hostname, isProduction)
-
   useEffect(() => {
     if (isProduction) {
       setProdEnv(hostname.includes('.alpha.service') ? 'alpha' : 'beta')

diff --git a/i18n/api/en.ts b/i18n/api/en.ts
@@ -327,15 +327,16 @@ const en: Translations = {
   },
   detail: {
     eligible: "You're likely eligible for this benefit.",
-    futureEligible60: "You'll likely be eligible once you turn 60.",
+    futureEligible60:
+      "You'll likely be eligible once you turn {EARLIEST_ELIGIBLE_AGE}.",
     futureEligible:
       "You'll likely be eligible once you turn {EARLIEST_ELIGIBLE_AGE}.",
     eligibleIncomeTooHigh:
       "You're likely eligible for this benefit, but your income is too high to receive a monthly payment at this time.",
     futureEligibleIncomeTooHigh:
-      'You may be eligible once you turn 65. Since your income is too high, you may not receive a monthly payment.',
+      'You may be eligible once you turn {EARLIEST_ELIGIBLE_AGE}. Since your income is too high, you may not receive a monthly payment.',
     futureEligibleIncomeTooHigh2:
-      'You may be eligible once you turn 60. If your income stays the same, you may not receive a monthly payment.',
+      'You may be eligible once you turn {EARLIEST_ELIGIBLE_AGE}. If your income stays the same, you may not receive a monthly payment.',
     eligibleDependingOnIncome:
       "You're likely eligible for this benefit if {INCOME_SINGLE_OR_COMBINED} is less than {INCOME_LESS_THAN}. Depending on your income, you should expect to receive around {ENTITLEMENT_AMOUNT_FOR_BENEFIT} every month.",
     eligibleDependingOnIncomeNoEntitlement:
@@ -433,7 +434,7 @@ const en: Translations = {
       eligibleIncomeTooHigh:
         "You're likely eligible for this benefit, but your income is too high to receive a monthly payment at this time.",
       futureEligibleIncomeTooHigh:
-        'You may be eligible once you turn 65. Since your income is too high, you may not receive a monthly payment.',
+        'You may be eligible once you turn {EARLIEST_ELIGIBLE_AGE}. Since your income is too high, you may not receive a monthly payment.',
       serviceCanadaReviewYourPayment:
         'If you apply, Service Canada will review your payment amount each year based on your income tax return.',
       automaticallyBePaid:
@@ -464,7 +465,7 @@ const en: Translations = {
       incomeTooHigh:
         "You're likely eligible for this benefit, but your income is too high to receive a monthly payment at this time.",
       futureEligibleIncomeTooHigh:
-        'You may be eligible once you turn 65. If your income stays the same, you may not receive a monthly payment.',
+        'You may be eligible once you turn {EARLIEST_ELIGIBLE_AGE}. If your income stays the same, you may not receive a monthly payment.',
       ifYouApply:
         "If you apply, Service Canada will review your income tax return every year. You'll automatically be paid if your income qualifies.",
       canApplyOnline: 'You can apply for this benefit online.',

diff --git a/i18n/api/fr.ts b/i18n/api/fr.ts
@@ -336,15 +336,15 @@ const fr: Translations = {
   detail: {
     eligible: 'Vous êtes probablement admissible à cette prestation.',
     futureEligible60:
-      'Vous serez probablement admissible lorsque vous aurez 60 ans.',
+      'Vous serez probablement admissible lorsque vous aurez {EARLIEST_ELIGIBLE_AGE}.',
     futureEligible:
       'Vous serez probablement admissible lorsque vous aurez {EARLIEST_ELIGIBLE_AGE}.',
     eligibleIncomeTooHigh:
       'Vous êtes probablement admissible à cette prestation, mais votre revenu est trop élevé pour recevoir un paiement mensuel pour le moment.',
     futureEligibleIncomeTooHigh:
-      'Vous pourriez être admissible lorsque vous aurez 65 ans. Puisque votre revenu est trop élevé, vous ne recevrez peut-être pas de paiement mensuel.',
+      'Vous pourriez être admissible lorsque vous aurez {EARLIEST_ELIGIBLE_AGE}. Puisque votre revenu est trop élevé, vous ne recevrez peut-être pas de paiement mensuel.',
     futureEligibleIncomeTooHigh2:
-      'Vous serez probablement admissible lorsque vous aurez 60 ans. Si votre revenu reste le même, vous ne recevrez peut-être pas de paiement mensuel.',
+      'Vous serez probablement admissible lorsque vous aurez {EARLIEST_ELIGIBLE_AGE}. Si votre revenu reste le même, vous ne recevrez peut-être pas de paiement mensuel.',
     eligibleDependingOnIncome:
       'Vous êtes probablement éligible à cette prestation si {INCOME_SINGLE_OR_COMBINED} est inférieur à {INCOME_LESS_THAN}. En fonction de {YOUR_OR_COMPLETE}, vous devriez vous attendre à recevoir environ {ENTITLEMENT_AMOUNT_FOR_BENEFIT} par mois.',
     eligibleDependingOnIncomeNoEntitlement:
@@ -443,7 +443,7 @@ const fr: Translations = {
       eligibleIncomeTooHigh:
         'Vous êtes probablement admissible à cette prestation, mais votre revenu est trop élevé pour recevoir un paiement mensuel pour le moment.',
       futureEligibleIncomeTooHigh:
-        'Vous pourriez être admissible lorsque vous aurez 65 ans. Puisque votre revenu est trop élevé, vous ne recevrez peut-être pas de paiement mensuel.',
+        'Vous pourriez être admissible lorsque vous aurez {EARLIEST_ELIGIBLE_AGE}. Puisque votre revenu est trop élevé, vous ne recevrez peut-être pas de paiement mensuel.',
       serviceCanadaReviewYourPayment:
         'Si vous présentez une demande, Service Canada révisera le montant de votre paiement chaque année en fonction de votre déclaration de revenus.',
       automaticallyBePaid:
@@ -475,7 +475,7 @@ const fr: Translations = {
       incomeTooHigh:
         'Vous êtes probablement admissible à cette prestation, mais votre revenu est trop élevé pour recevoir un paiement mensuel pour le moment.',
       futureEligibleIncomeTooHigh:
-        'Vous pourriez être admissible lorsque vous aurez 65 ans. Si votre revenu reste le même, vous ne recevrez peut-être pas de paiement mensuel.',
+        'Vous pourriez être admissible lorsque vous aurez {EARLIEST_ELIGIBLE_AGE}. Si votre revenu reste le même, vous ne recevrez peut-être pas de paiement mensuel.',
       ifYouApply:
         'Si vous présentez une demande, Service Canada révisera votre déclaration de revenus chaque année. Vous recevrez automatiquement des paiements si votre revenu  est admissible.',
       canApplyOnline:

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -139,10 +139,10 @@ const Home: NextPage<{ adobeAnalyticsUrl: string }> = ({
             >
               <summary
                 key={`summary-shared`}
-                className="text-default-text pt-2 pb-3 px-4 ds-cursor-pointer ds-select-none hover:underline"
+                className="text-[#295376] pt-2 pb-3 px-4 ds-cursor-pointer ds-select-none hover:text-[#0535D2]"
               >
                 <span
-                  className="ds-underline"
+                  className="hover:underline"
                   dangerouslySetInnerHTML={{ __html: tsln.usingSharedDevice }}
                   data-gc-analytics-customclick={`${AA_BUTTON_CLICK_ATTRIBUTE}: shared`}
                 />

diff --git a/styles/globals.css b/styles/globals.css
@@ -7,7 +7,7 @@
   * {
     @apply focus:outline-none;
     @apply focus-visible:ring-4;
-    @apply focus-visible:ring-sky-500;
+    @apply focus-visible:ring-[#009EE1];
   }
 
   .skip-main {

diff --git a/utils/api/scrapers/data/oas-amounts-en.json b/utils/api/scrapers/data/oas-amounts-en.json
@@ -1,39 +1,39 @@
 {
-  "lastupdatedYear": "2022",
-  "lastupdatedQuarter": "April to June 2024",
-  "renewalYearGIS": "2023",
+  "lastupdatedYear": "2023",
+  "lastupdatedQuarter": "July to September 2024",
+  "renewalYearGIS": "2024",
   "oas": {
-    "average": "713.34",
-    "average75": "784.67",
-    "maximum": "134,626",
-    "maximum75": "137,331",
-    "clawback": "81,761"
+    "average": "718.33",
+    "average75": "790.16",
+    "maximum": "142,609",
+    "maximum75": "148,179",
+    "clawback": "86,912"
   },
   "gis": {
-    "single-amount": "1,065.47",
-    "single-limit": "21,624",
-    "spouse-oas-amount": "641.35",
-    "spouse-oas-limit": "28,560",
-    "spouse-no-oas-amount": "1,065.47",
-    "spouse-no-oas-limit": "51,840",
-    "spouse-allowance-amount": "641.35",
-    "spouse-allowance-limit": "39,984"
+    "single-amount": "1,072.93",
+    "single-limit": "21,768",
+    "spouse-oas-amount": "645.84",
+    "spouse-oas-limit": "28,752",
+    "spouse-no-oas-amount": "1,072.93",
+    "spouse-no-oas-limit": "52,176",
+    "spouse-allowance-amount": "645.84",
+    "spouse-allowance-limit": "40,272"
   },
   "allowance": {
-    "spouse-gis-amount": "1,354.69",
-    "spouse-gis-limit": "39,984",
-    "survivor-amount": "1,614.89",
-    "survivor-limit": "29,112"
+    "spouse-gis-amount": "1,364.17",
+    "spouse-gis-limit": "40,272",
+    "survivor-amount": "1,626.20",
+    "survivor-limit": "29,328"
   },
   "topup": {
-    "single": "165.04",
-    "married": "46.76"
+    "single": "166.20",
+    "married": "47.09"
   },
   "delay": {
-    "oas66": "764.70",
-    "oas67": "816.06",
-    "oas68": "867.42",
-    "oas69": "918.78",
-    "oas70": "970.14"
+    "oas66": "770.05",
+    "oas67": "821.77",
+    "oas68": "873.49",
+    "oas69": "925.21",
+    "oas70": "976.93"
   }
 }
diff --git a/utils/api/scrapers/output/legalValuesJson.json b/utils/api/scrapers/output/legalValuesJson.json
@@ -1,39 +1,39 @@
 {
-  "lastUpdatedYear": 2022,
-  "lastUpdatedQuarter": "April to June 2024",
-  "renewalYearGIS": 2023,
+  "lastUpdatedYear": 2023,
+  "lastUpdatedQuarter": "July to September 2024",
+  "renewalYearGIS": 2024,
   "oas": {
-    "amount": 713.34,
-    "amount75": 784.67,
-    "incomeLimit": 134626,
-    "incomeLimit75": 137331,
-    "clawbackIncomeLimit": 81761
+    "amount": 718.33,
+    "amount75": 790.16,
+    "incomeLimit": 142609,
+    "incomeLimit75": 148179,
+    "clawbackIncomeLimit": 86912
   },
   "gis": {
-    "singleAmount": 1065.47,
-    "singleIncomeLimit": 21624,
-    "spouseOasAmount": 641.35,
-    "spouseOasIncomeLimit": 28560,
-    "spouseNoOasAmount": 1065.47,
-    "spouseNoOasIncomeLimit": 51840,
-    "spouseAlwAmount": 641.35,
-    "spouseAlwIncomeLimit": 39984
+    "singleAmount": 1072.93,
+    "singleIncomeLimit": 21768,
+    "spouseOasAmount": 645.84,
+    "spouseOasIncomeLimit": 28752,
+    "spouseNoOasAmount": 1072.93,
+    "spouseNoOasIncomeLimit": 52176,
+    "spouseAlwAmount": 645.84,
+    "spouseAlwIncomeLimit": 40272
   },
   "alw": {
-    "alwAmount": 1354.69,
-    "alwIncomeLimit": 39984,
-    "afsAmount": 1614.89,
-    "afsIncomeLimit": 29112
+    "alwAmount": 1364.17,
+    "alwIncomeLimit": 40272,
+    "afsAmount": 1626.2,
+    "afsIncomeLimit": 29328
   },
   "topUp": {
-    "single": 165.04,
-    "married": 46.76
+    "single": 166.2,
+    "married": 47.09
   },
   "delay": {
-    "oas66": 764.7,
-    "oas67": 816.06,
-    "oas68": 867.42,
-    "oas69": 918.78,
-    "oas70": 970.14
+    "oas66": 770.05,
+    "oas67": 821.77,
+    "oas68": 873.49,
+    "oas69": 925.21,
+    "oas70": 976.93
   }
 }