Merge branch 'feat/ddw-1025-matomo-poc' into feat/ddw-809-implement-analytics-part-3

Author: Marcin Mazurek

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

@@ -69,7 +69,10 @@ class SupportSettingsPage extends Component<InjectedProps> {
         disableDownloadLogs={
           this.props.stores.app.isDownloadNotificationVisible
         }
-        analyticsAccepted={this.props.stores.profile.areAnalyticsAccepted}
+        analyticsAccepted={
+          this.props.stores.profile.analyticsAcceptanceStatus ===
+          AnalyticsAcceptanceStatus.ACCEPTED
+        }
       />
     );
   }

source/renderer/app/stores/ProfileStore.ts

@@ -305,17 +305,9 @@ export default class ProfileStore extends Store {
   }
 
   @computed
-  get areAnalyticsAccepted(): boolean {
+  get analyticsAcceptanceStatus(): AnalyticsAcceptanceStatus {
     return (
-      this.getAnalyticsAcceptanceRequest.result ===
-      AnalyticsAcceptanceStatus.ACCEPTED
-    );
-  }
-
-  @computed
-  get wasAnalyticsConsentScreenDisplayed(): boolean {
-    return (
-      this.getAnalyticsAcceptanceRequest.result !==
+      this.getAnalyticsAcceptanceRequest.result ||
       AnalyticsAcceptanceStatus.PENDING
     );
   }
@@ -465,7 +457,7 @@ export default class ProfileStore extends Store {
       !this.isInitialScreen &&
       this.isCurrentLocaleSet &&
       this.areTermsOfUseAccepted &&
-      !this.wasAnalyticsConsentScreenDisplayed
+      this.analyticsAcceptanceStatus === AnalyticsAcceptanceStatus.PENDING
     ) {
       this.actions.router.goToRoute.trigger({
         route: ROUTES.PROFILE.ANALYTICS,
@@ -483,7 +475,7 @@ export default class ProfileStore extends Store {
       isConnected &&
       this.isCurrentLocaleSet &&
       this.areTermsOfUseAccepted &&
-      this.wasAnalyticsConsentScreenDisplayed &&
+      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
@@ -508,7 +500,10 @@ export default class ProfileStore extends Store {
     }
   };
   _redirectToMainUiAfterAnalyticsAreConfirmed = () => {
-    if (this.wasAnalyticsConsentScreenDisplayed && this._isOnAnalyticsPage()) {
+    if (
+      this.analyticsAcceptanceStatus !== AnalyticsAcceptanceStatus.PENDING &&
+      this._isOnAnalyticsPage()
+    ) {
       this._redirectToRoot();
     }
   };