[DDW-809] Fix minor issues

Author: Marcin Mazurek

source/renderer/app/analytics/types.ts

@@ -4,8 +4,7 @@ export interface AnalyticsClient {
 }
 
 export enum AnalyticsAcceptanceStatus {
-  INITIAL_DECISION_REQUIRED = 'INITIAL_DECISION_REQUIRED',
-  DECISION_CHANGE_REQUESTED = 'DECISION_CHANGE_REQUESTED',
+  PENDING = 'PENDING',
   ACCEPTED = 'ACCEPTED',
   REJECTED = 'REJECTED',
 }

source/renderer/app/api/utils/localStorage.ts

@@ -147,14 +147,14 @@ export default class LocalStorageApi {
   getAnalyticsAcceptance = (): Promise<AnalyticsAcceptanceStatus> =>
     LocalStorageApi.get(
       keys.ANALYTICS_ACCEPTANCE,
-      AnalyticsAcceptanceStatus.INITIAL_DECISION_REQUIRED
+      AnalyticsAcceptanceStatus.PENDING
     );
   setAnalyticsAcceptance = (status: AnalyticsAcceptanceStatus): Promise<void> =>
     LocalStorageApi.set(keys.ANALYTICS_ACCEPTANCE, status);
   unsetAnalyticsAcceptance = (): Promise<void> =>
     LocalStorageApi.set(
       keys.ANALYTICS_ACCEPTANCE,
-      AnalyticsAcceptanceStatus.INITIAL_DECISION_REQUIRED
+      AnalyticsAcceptanceStatus.PENDING
     );
   getUserID = async (): Promise<string> => {
     let userId: string = await LocalStorageApi.get(keys.USER_ID, null);

source/renderer/app/components/profile/analytics/AnalyticsConsentForm.scss

@@ -6,6 +6,7 @@
   height: 100%;
   justify-content: center;
   line-height: 1.38;
+  margin: 40px 0;
 }
 
 .centeredBox {

source/renderer/app/containers/MenuUpdater/useMenuUpdater.ts

@@ -35,10 +35,7 @@ const useMenuUpdater = ({
     rebuildApplicationMenu.send({
       isNavigationEnabled:
         profile.areTermsOfUseAccepted &&
-        profile.analyticsAcceptanceStatus !==
-          AnalyticsAcceptanceStatus.INITIAL_DECISION_REQUIRED &&
-        profile.analyticsAcceptanceStatus !==
-          AnalyticsAcceptanceStatus.DECISION_CHANGE_REQUESTED,
+        profile.analyticsAcceptanceStatus !== AnalyticsAcceptanceStatus.PENDING,
       walletSettingsState,
     });
   }, [

source/renderer/app/containers/settings/categories/SupportSettingsPage.tsx

@@ -5,6 +5,7 @@ import SupportSettings from '../../../components/settings/categories/SupportSett
 import { generateSupportRequestLink } from '../../../../../common/utils/reporting';
 import type { InjectedProps } from '../../../types/injectedPropsType';
 import { AnalyticsAcceptanceStatus } from '../../../analytics';
+import { ROUTES } from '../../../routes-config';
 
 const messages = defineMessages({
   supportRequestLinkUrl: {
@@ -28,9 +29,9 @@ class SupportSettingsPage extends Component<InjectedProps> {
   };
 
   handleChangeAnalyticsSettings = () => {
-    this.props.actions.profile.acceptAnalytics.trigger(
-      AnalyticsAcceptanceStatus.DECISION_CHANGE_REQUESTED
-    );
+    this.props.actions.router.goToRoute.trigger({
+      route: ROUTES.PROFILE.ANALYTICS,
+    });
   };
 
   handleSupportRequestClick = async (

source/renderer/app/stores/ProfileStore.ts

@@ -401,13 +401,9 @@ export default class ProfileStore extends Store {
       this.analytics.disableTracking();
     }
 
-    if (
-      previousStatus === AnalyticsAcceptanceStatus.INITIAL_DECISION_REQUIRED
-    ) {
+    if (previousStatus === AnalyticsAcceptanceStatus.PENDING) {
       this._redirectToRoot();
-    } else if (
-      previousStatus === AnalyticsAcceptanceStatus.DECISION_CHANGE_REQUESTED
-    ) {
+    } else {
       this.actions.router.goToRoute.trigger({
         route: ROUTES.SETTINGS.SUPPORT,
       });
@@ -475,10 +471,7 @@ export default class ProfileStore extends Store {
       !this.isInitialScreen &&
       this.isCurrentLocaleSet &&
       this.areTermsOfUseAccepted &&
-      (this.analyticsAcceptanceStatus ===
-        AnalyticsAcceptanceStatus.INITIAL_DECISION_REQUIRED ||
-        this.analyticsAcceptanceStatus ===
-          AnalyticsAcceptanceStatus.DECISION_CHANGE_REQUESTED)
+      this.analyticsAcceptanceStatus === AnalyticsAcceptanceStatus.PENDING
     ) {
       this.actions.router.goToRoute.trigger({
         route: ROUTES.PROFILE.ANALYTICS,
@@ -496,8 +489,7 @@ export default class ProfileStore extends Store {
       isConnected &&
       this.isCurrentLocaleSet &&
       this.areTermsOfUseAccepted &&
-      this.analyticsAcceptanceStatus !==
-        AnalyticsAcceptanceStatus.INITIAL_DECISION_REQUIRED &&
+      this.analyticsAcceptanceStatus !== AnalyticsAcceptanceStatus.PENDING &&
       // @ts-ignore ts-migrate(2339) FIXME: Property 'stores' does not exist on type 'ProfileS... Remove this comment to see the full error message
       this.stores.wallets.hasLoadedWallets &&
       dataLayerMigrationNotAccepted