Merged in fix/env-cleanup (pull request #3132)

fix(env): remove SHOW_SITEWIDE_ALERT and USE_NEW_REWARD_MODEL

* fix(env): remove SHOW_SITEWIDE_ALERT and USE_NEW_REWARD_MODEL


Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)

apps/scandic-web/.env.local.example

@@ -53,10 +53,6 @@ GOOGLE_DYNAMIC_MAP_ID=""
 ENABLE_SURPRISES="true"
 ENABLE_DTMC="true"
 
-SHOW_SITE_WIDE_ALERT="false"
-
-USE_NEW_REWARD_MODEL="true"
-
 SAS_POINT_TRANSFER_ENABLED="true"
 SAS_API_ENDPOINT=""
 SAS_AUTH_ENDPOINT=""

apps/scandic-web/.env.test

@@ -38,11 +38,9 @@ GOOGLE_STATIC_MAP_SIGNATURE_SECRET="test"
 GOOGLE_STATIC_MAP_ID="test"
 GOOGLE_DYNAMIC_MAP_ID="test"
 SALESFORCE_PREFERENCE_BASE_URL="test"
-USE_NEW_REWARD_MODEL="true"
 
 TZ=UTC
 ENABLE_SURPRISES="true"
-SHOW_SITE_WIDE_ALERT="false"
 
 NEXT_PUBLIC_SENTRY_ENVIRONMENT="test"
 NEXT_PUBLIC_SENTRY_CLIENT_SAMPLERATE="0"

apps/scandic-web/components/Blocks/DynamicContent/Rewards/CurrentRewards/index.tsx

@@ -1,4 +1,3 @@
-import { env } from "@/env/server"
 import {
   getCurrentRewards,
   getMembershipLevel,
@@ -31,7 +30,7 @@ export default async function CurrentRewardsBlock({
       <SectionHeader title={title} link={link} preamble={subtitle} />
       <ClientCurrentRewards
         rewards={rewardsResponse.rewards}
-        showRedeem={env.USE_NEW_REWARD_MODEL}
+        showRedeem={true}
         membershipNumber={membershipLevel?.membershipNumber}
       />
       <SectionLink link={link} variant="mobile" />

apps/scandic-web/env/server.ts

@@ -92,20 +92,6 @@ export const env = createEnv({
       // transform to boolean
       .transform((s) => s === "true")
       .default("false"),
-    SHOW_SITE_WIDE_ALERT: z
-      .string()
-      // only allow "true" or "false"
-      .refine((s) => s === "true" || s === "false")
-      // transform to boolean
-      .transform((s) => s === "true")
-      .default("false"),
-    USE_NEW_REWARD_MODEL: z
-      .string()
-      // only allow "true" or "false"
-      .refine((s) => s === "true" || s === "false")
-      // transform to boolean
-      .transform((s) => s === "true")
-      .default("false"),
     SENTRY_ENVIRONMENT: z.string().default("development"),
     SENTRY_SERVER_SAMPLERATE: z.coerce.number().default(0.001),
 
@@ -207,9 +193,7 @@ export const env = createEnv({
       process.env.GOOGLE_STATIC_MAP_SIGNATURE_SECRET,
     GOOGLE_STATIC_MAP_ID: process.env.GOOGLE_STATIC_MAP_ID,
     GOOGLE_DYNAMIC_MAP_ID: process.env.GOOGLE_DYNAMIC_MAP_ID,
-    USE_NEW_REWARD_MODEL: process.env.USE_NEW_REWARD_MODEL,
     ENABLE_SURPRISES: process.env.ENABLE_SURPRISES,
-    SHOW_SITE_WIDE_ALERT: process.env.SHOW_SITE_WIDE_ALERT,
     SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
     SENTRY_SERVER_SAMPLERATE: process.env.SENTRY_SERVER_SAMPLERATE,