fix: newsletter check [WPB-11942] (#18582)

* fix: newsletter check * fix(PropertiesRepository): update marketing consent loading logic
wireapp · Jan 14, 2025 · 54c1432 · 54c1432
1 parent de37c66
commit 54c1432
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/script/auth/page/SetHandle.tsx b/src/script/auth/page/SetHandle.tsx
@@ -38,7 +38,9 @@ import {
   Text,
 } from '@wireapp/react-ui-kit';
 
+import {StorageKey} from 'src/script/storage';
 import {t} from 'Util/LocalizerUtil';
+import {storeValue} from 'Util/StorageUtil';
 import {isBackendError} from 'Util/TypePredicateUtil';
 
 import {Page} from './Page';
@@ -105,6 +107,16 @@ const SetHandleComponent = ({
     setHandle(event.target.value);
   };
 
+  const handleAcceptNewletterConsent = () => {
+    void updateConsent(ConsentType.MARKETING, 1);
+    storeValue(StorageKey.INITIAL_MAKRETING_CONSENT_ACCEPTED, true);
+  };
+
+  const handleDeclineNewletterConsent = () => {
+    void updateConsent(ConsentType.MARKETING, 0);
+    storeValue(StorageKey.INITIAL_MAKRETING_CONSENT_ACCEPTED, false);
+  };
+
   if (hasSelfHandle) {
     return null;
   }
@@ -143,10 +155,7 @@ const SetHandleComponent = ({
         {error && parseError(error)}
       </ContainerXS>
       {!isFetching && hasUnsetMarketingConsent && (
-        <AcceptNewsModal
-          onConfirm={() => updateConsent(ConsentType.MARKETING, 1)}
-          onDecline={() => updateConsent(ConsentType.MARKETING, 0)}
-        />
+        <AcceptNewsModal onConfirm={handleAcceptNewletterConsent} onDecline={handleDeclineNewletterConsent} />
       )}
     </Page>
   );

diff --git a/src/script/properties/PropertiesRepository.ts b/src/script/properties/PropertiesRepository.ts
@@ -32,12 +32,14 @@ import {deepMerge} from 'Util/deepMerge';
 import {Environment} from 'Util/Environment';
 import {replaceLink, t} from 'Util/LocalizerUtil';
 import {getLogger, Logger} from 'Util/Logger';
+import {loadValue} from 'Util/StorageUtil';
 
 import type {PropertiesService} from './PropertiesService';
 import {PROPERTIES_TYPE, UserConsentStatus} from './PropertiesType';
 
 import type {User} from '../entity/User';
 import type {SelfService} from '../self/SelfService';
+import {StorageKey} from '../storage';
 import {isTelemetryEnabledAtCurrentEnvironment} from '../tracking/Telemetry.helpers';
 import {ConsentValue} from '../user/ConsentValue';
 import {CONVERSATION_TYPING_INDICATOR_MODE} from '../user/TypingIndicatorMode';
@@ -98,7 +100,9 @@ export class PropertiesRepository {
         },
         privacy: {
           telemetry_data_sharing: undefined,
-          marketing_consent: PropertiesRepository.CONFIG.WIRE_MARKETING_CONSENT.defaultValue,
+          marketing_consent:
+            loadValue(StorageKey.INITIAL_MAKRETING_CONSENT_ACCEPTED) ??
+            PropertiesRepository.CONFIG.WIRE_MARKETING_CONSENT.defaultValue,
         },
         sound: {
           alerts: AudioPreference.ALL,

diff --git a/src/script/storage/StorageKey.ts b/src/script/storage/StorageKey.ts
@@ -42,6 +42,7 @@ export const StorageKey = {
   INPUT: {
     SHOW_FORMATTING: 'z.storage.StorageKey.INPUT.SHOW_FORMATTING',
   },
+  INITIAL_MAKRETING_CONSENT_ACCEPTED: 'z.storage.StorageKey.INITIAL_MAKRETING_CONSENT_ACCEPTED',
 };
 
 export const ROOT_FONT_SIZE_KEY = 'root-font-size';