From 92bf7a9d637ecc9daebb38bbc3434e27fb699965 Mon Sep 17 00:00:00 2001
From: Florian Zia <zia.florian@gmail.com>
Date: Fri, 10 May 2024 16:43:19 +0200
Subject: [PATCH 1/2] fix: Show the CSAT survey banner only to users that an
 active Plus subscription

---
 .../(authenticated)/user/(dashboard)/dashboard/View.tsx   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx
index cd00586eb4a..3a83872729e 100644
--- a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx
+++ b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx
@@ -84,9 +84,10 @@ export const View = (props: Props) => {
   const l10n = useL10n();
   const recordTelemetry = useTelemetry(props.experimentationId);
   const countryCode = useContext(CountryCodeContext);
+  const isPlusUser = hasPremium(props.user);
 
   const adjustedScanResults = props.userScanData.results.map((scanResult) => {
-    if (scanResult.status === "new" && hasPremium(props.user)) {
+    if (scanResult.status === "new" && isPlusUser) {
       // Even if the user has Plus, OneRep won't automatically start removing
       // found exposures; it first sends a request to our webhook, and then the
       // webhook sends an opt-out request to OneRep. Meanwhile, however, we're
@@ -189,7 +190,7 @@ export const View = (props: Props) => {
           isPremiumBrokerRemovalEnabled={props.enabledFeatureFlags.includes(
             "PremiumBrokerRemoval",
           )}
-          isPremiumUser={hasPremium(props.user)}
+          isPremiumUser={isPlusUser}
           isEligibleForPremium={props.isEligibleForPremium}
           resolutionCta={
             <Button
@@ -404,6 +405,7 @@ export const View = (props: Props) => {
   };
 
   const showCsatSurvey =
+    isPlusUser &&
     props.enabledFeatureFlags.includes("CsatSurvey") &&
     selectedTab === "fixed" &&
     typeof props.elapsedTimeInDaysSinceInitialScan !== "undefined";
@@ -448,7 +450,7 @@ export const View = (props: Props) => {
         <DashboardTopBanner
           tabType={selectedTab}
           scanInProgress={initialScanInProgress}
-          isPremiumUser={hasPremium(props.user)}
+          isPremiumUser={isPlusUser}
           isEligibleForPremium={canSubscribeToPremium({
             user: props.user,
             countryCode,

From 032280010ec31030dea3b29754b02eb102a4dcde Mon Sep 17 00:00:00 2001
From: Florian Zia <zia.florian@gmail.com>
Date: Mon, 13 May 2024 13:41:21 +0200
Subject: [PATCH 2/2] chore: Use hasPremium check in place

---
 .../(authenticated)/user/(dashboard)/dashboard/View.tsx  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx
index 3a83872729e..a2ba39999ac 100644
--- a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx
+++ b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx
@@ -84,10 +84,9 @@ export const View = (props: Props) => {
   const l10n = useL10n();
   const recordTelemetry = useTelemetry(props.experimentationId);
   const countryCode = useContext(CountryCodeContext);
-  const isPlusUser = hasPremium(props.user);
 
   const adjustedScanResults = props.userScanData.results.map((scanResult) => {
-    if (scanResult.status === "new" && isPlusUser) {
+    if (scanResult.status === "new" && hasPremium(props.user)) {
       // Even if the user has Plus, OneRep won't automatically start removing
       // found exposures; it first sends a request to our webhook, and then the
       // webhook sends an opt-out request to OneRep. Meanwhile, however, we're
@@ -190,7 +189,7 @@ export const View = (props: Props) => {
           isPremiumBrokerRemovalEnabled={props.enabledFeatureFlags.includes(
             "PremiumBrokerRemoval",
           )}
-          isPremiumUser={isPlusUser}
+          isPremiumUser={hasPremium(props.user)}
           isEligibleForPremium={props.isEligibleForPremium}
           resolutionCta={
             <Button
@@ -405,7 +404,7 @@ export const View = (props: Props) => {
   };
 
   const showCsatSurvey =
-    isPlusUser &&
+    hasPremium(props.user) &&
     props.enabledFeatureFlags.includes("CsatSurvey") &&
     selectedTab === "fixed" &&
     typeof props.elapsedTimeInDaysSinceInitialScan !== "undefined";
@@ -450,7 +449,7 @@ export const View = (props: Props) => {
         <DashboardTopBanner
           tabType={selectedTab}
           scanInProgress={initialScanInProgress}
-          isPremiumUser={isPlusUser}
+          isPremiumUser={hasPremium(props.user)}
           isEligibleForPremium={canSubscribeToPremium({
             user: props.user,
             countryCode,