Merge pull request #778 from DTS-STN/develop

Sync for Main code freeze for release Beta 1.0.0
DTS-STN · Jun 21, 2023 · 3e80f8f · 3e80f8f
2 parents 54e9fcd + 0e775a0
commit 3e80f8f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/helm/charts/eligibility-estimator/templates/prod_ingress.yaml b/helm/charts/eligibility-estimator/templates/prod_ingress.yaml
@@ -2,6 +2,7 @@
 {{- $fullName := include "fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
 apiVersion: v1
+kind: List
 items:
 - apiVersion: networking.k8s.io/v1
   kind: Ingress

diff --git a/helmfile/overrides/eligibility-estimator/eligibility-estimator.yaml.gotmpl b/helmfile/overrides/eligibility-estimator/eligibility-estimator.yaml.gotmpl
@@ -18,7 +18,7 @@ extraEnv:
       valueFrom:
         secretKeyRef:
           name: web-example-secret
-          key: example-secret-password         
+          key: example-secret-password
 
 */}}
 image:
@@ -34,7 +34,7 @@ ingress:
     prod_enabled: {{ requiredEnv "PROD_ENABLED" }}
     ssl_cert: service_canada_ca
     prod_url: {{ requiredEnv "SUB_DOMAIN" }}.{{ requiredEnv "BASE_DOMAIN" }}
-    enabled: true
+    enabled: {{ requiredEnv "ALPHA_ENABLED" }}
     annotations: 
       {{ if (eq .Environment.Name "prototype")}}  
       cert-manager.io/cluster-issuer: letsencrypt-prod-alpha-sc

diff --git a/utils/api/benefitHandler.ts b/utils/api/benefitHandler.ts
@@ -876,6 +876,15 @@ export class BenefitHandler {
                     .calculatedBasedOnIndividualIncome
                 )
 
+              if (
+                !allResults.partner.gis.cardDetail.collapsedText.includes(
+                  this.translations.detailWithHeading.partnerEligible
+                )
+              )
+                allResults.partner.gis.cardDetail.collapsedText.unshift(
+                  this.translations.detailWithHeading.partnerEligible
+                )
+
               // If client is eligible for ALW, need to recalculate estimate based on individual income
               if (clientAlw.eligibility.result === 'eligible') {
                 if (