From 66afed30705199219832e5fdc390aed49adc4228 Mon Sep 17 00:00:00 2001
From: pwei1018 <patrick.wei@gov.bc.ca>
Date: Thu, 29 Sep 2022 15:00:34 -0700
Subject: [PATCH] Update for PR.

---
 .env.example           | 2 +-
 assets/scss/base.scss  | 2 +-
 cloudbuild-cd.yaml     | 2 +-
 cloudbuild-pr.yaml     | 2 +-
 layouts/default.vue    | 7 +++----
 nuxt.config.js         | 2 +-
 utils/feature-flags.ts | 4 +++-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.env.example b/.env.example
index 9c01514..d4d9586 100644
--- a/.env.example
+++ b/.env.example
@@ -14,7 +14,7 @@ REGISTRY_ACCOUNT_CREATE_URL = "https://dev.bcregistry.ca/business/auth/choose-au
 KEYCLOAK_CONFIG_PATH = "keycloak-dev.json"
 AUTH_API_URL = "https://auth-api-dev.apps.silver.devops.gov.bc.ca/api/v1/"
 STATUS_API_URL = "https://status-api-dev.apps.silver.devops.gov.bc.ca/api/v1/"
-BCROS_LD_CLIENT_ID = ""
+BCREGISTRY_LD_CLIENT_ID = ""
 RPT_URL="https://staging.www.etax.gov.bc.ca/bts/Web.BCOnl/WebServices/BCO/login"
 BUSINESS_SEARCH_URL = "https://dev.bcregistry.ca/business/search"
 BUS_SEARCH_LEARN_MORE = "https://www2.gov.bc.ca/gov/content?id=B75BE1375F084B138B60D62C0094D9E8"
diff --git a/assets/scss/base.scss b/assets/scss/base.scss
index ce70d7d..c9162fa 100644
--- a/assets/scss/base.scss
+++ b/assets/scss/base.scss
@@ -434,6 +434,6 @@ a.link {
   visibility: inherit;
 }
 
-.colour-dk-text {
+.color-dk-text {
   color: $dk-text !important;
 }
\ No newline at end of file
diff --git a/cloudbuild-cd.yaml b/cloudbuild-cd.yaml
index 4a01f23..7a660f3 100644
--- a/cloudbuild-cd.yaml
+++ b/cloudbuild-cd.yaml
@@ -25,7 +25,7 @@ steps:
     - 'STATUS_API_URL=$_STATUS_API_URL'
     - 'ADDRESSCHANGE_URL=$_ADDRESSCHANGE_URL'
     - 'BUSINESS_URL=$_BUSINESS_URL'
-    - 'BCROS_LD_CLIENT_ID=$_BCROS_LD_CLIENT_ID'
+    - 'BCREGISTRY_LD_CLIENT_ID=$_BCREGISTRY_LD_CLIENT_ID'
     - 'RPT_URL=$_RPT_URL'
     - 'BUSINESS_SEARCH_URL=$_BUSINESS_SEARCH_URL'
     - 'BUS_SEARCH_LEARN_MORE=$_BUS_SEARCH_LEARN_MORE'
diff --git a/cloudbuild-pr.yaml b/cloudbuild-pr.yaml
index 32d8835..c2b289b 100644
--- a/cloudbuild-pr.yaml
+++ b/cloudbuild-pr.yaml
@@ -25,7 +25,7 @@ steps:
     - 'STATUS_API_URL=$_STATUS_API_URL'
     - 'ADDRESSCHANGE_URL=$_ADDRESSCHANGE_URL'
     - 'BUSINESS_URL=$_BUSINESS_URL'
-    - 'BCROS_LD_CLIENT_ID=$BCROS_LD_CLIENT_ID'
+    - 'BCREGISTRY_LD_CLIENT_ID=$BCREGISTRY_LD_CLIENT_ID'
     - 'RPT_URL=$_RPT_URL'
     - 'BUSINESS_SEARCH_URL=$_BUSINESS_SEARCH_URL'
     - 'BUS_SEARCH_LEARN_MORE=$_BUS_SEARCH_LEARN_MORE'
diff --git a/layouts/default.vue b/layouts/default.vue
index ff68684..5edf4bd 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,14 +1,13 @@
 <template>
   <v-app id="app">
-    <SbcHeader class="sbc-header" :in-auth="false" />
+    <SbcHeader class="sbc-header" />
 
     <!-- Alert banner -->
     <v-alert
       v-if="bannerText"
       tile dense
-      icon=" "
       type="warning"
-      class="mb-0 text-center colour-dk-text"
+      class="mb-0 text-center color-dk-text"
       v-html="bannerText"
     />
 
@@ -37,7 +36,7 @@ export default {
     isShowBreadcrumb (): boolean {
       return !isLoginRoute()
     },
-    bannerText (): string | null {
+    bannerText (): string {
       const bannerText: string = getFeatureFlag('banner-text')
 
       // remove spaces so that " " becomes falsy
diff --git a/nuxt.config.js b/nuxt.config.js
index fec43df..5f6fae8 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -160,7 +160,7 @@ export default {
     regAccountCreateURL: process.env.REGISTRY_ACCOUNT_CREATE_URL,
     authAPIURL: process.env.AUTH_API_URL,
     statusAPIURL: process.env.STATUS_API_URL,
-    ldClientId: process.env.BCROS_LD_CLIENT_ID,
+    ldClientId: process.env.BCREGISTRY_LD_CLIENT_ID,
     // as composite variables:
     keycloakConfigPath: process.env.BCROS_BASE_URL + process.env.KEYCLOAK_CONFIG_PATH
       + `?${new Date().getTime()}`,
diff --git a/utils/feature-flags.ts b/utils/feature-flags.ts
index 91bba49..41c423f 100644
--- a/utils/feature-flags.ts
+++ b/utils/feature-flags.ts
@@ -12,7 +12,9 @@ const defaultFlagSet: LDFlagSet = {
   'bcregistry-ui-bus-search-coming-soon-chip': false,
   'bcregistry-ui-ppr-new-chip': true,
   'bcregistry-ui-rpt-new-chip': true,
-  'bcregistry-ui-wills-new-chip': true
+  'bcregistry-ui-wills-new-chip': true,
+  'banner-text': ' ',
+  'whats-new': ' '
 }
 
 /**