chore: update tests and refactor analytics state

leather-io · Apr 25, 2024 · 07827c2 · 07827c2
1 parent 40e83bf
commit 07827c2
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 42 deletions.
diff --git a/src/app/common/hooks/analytics/use-analytics.ts b/src/app/common/hooks/analytics/use-analytics.ts
@@ -14,7 +14,6 @@ import { analytics, initAnalytics } from '@shared/utils/analytics';
 import { flow, origin } from '@app/common/initial-search-params';
 import { useWalletType } from '@app/common/use-wallet-type';
 import { useCurrentNetworkState } from '@app/store/networks/networks.hooks';
-import { useHasUserExplicitlyDeclinedAnalytics } from '@app/store/settings/settings.selectors';
 
 const IGNORED_PATH_REGEXPS = [/^\/$/];
 
@@ -27,12 +26,10 @@ function isHiroApiUrl(url: string) {
 }
 
 export function useInitalizeAnalytics() {
-  const hasUserDeclinedAnalytics = useHasUserExplicitlyDeclinedAnalytics();
-
   useEffect(() => {
-    if (hasUserDeclinedAnalytics || !SEGMENT_WRITE_KEY || IS_TEST_ENV) return;
+    if (!SEGMENT_WRITE_KEY || IS_TEST_ENV) return;
     initAnalytics();
-  }, [hasUserDeclinedAnalytics]);
+  }, []);
 }
 
 export function useAnalytics() {

diff --git a/src/app/store/settings/settings.selectors.ts b/src/app/store/settings/settings.selectors.ts
@@ -12,15 +12,6 @@ export function useUserSelectedTheme() {
   return useSelector(selectUserSelectedTheme);
 }
 
-const selectHasUserExplicitlyDeclinedAnalytics = createSelector(
-  selectSettings,
-  state => state.hasAllowedAnalytics === false
-);
-
-export function useHasUserExplicitlyDeclinedAnalytics() {
-  return useSelector(selectHasUserExplicitlyDeclinedAnalytics);
-}
-
 const selectDismissedMessageIds = createSelector(
   selectSettings,
   state => state.dismissedMessages ?? []

diff --git a/src/app/store/settings/settings.slice.ts b/src/app/store/settings/settings.slice.ts
@@ -2,16 +2,13 @@ import { PayloadAction, createSlice } from '@reduxjs/toolkit';
 
 import { UserSelectedTheme } from '@app/common/theme-provider';
 
-type HasAcceptedAnalytics = null | boolean;
 interface InitialState {
   userSelectedTheme: UserSelectedTheme;
-  hasAllowedAnalytics: HasAcceptedAnalytics;
   dismissedMessages: string[];
 }
 
 const initialState: InitialState = {
   userSelectedTheme: 'system',
-  hasAllowedAnalytics: null,
   dismissedMessages: [],
 };
 
@@ -22,9 +19,6 @@ export const settingsSlice = createSlice({
     setUserSelectedTheme(state, action: PayloadAction<UserSelectedTheme>) {
       state.userSelectedTheme = action.payload;
     },
-    setHasAllowedAnalytics(state, action: PayloadAction<boolean>) {
-      state.hasAllowedAnalytics = action.payload;
-    },
     messageDismissed(state, action: PayloadAction<string>) {
       if (!Array.isArray(state.dismissedMessages)) state.dismissedMessages = [];
       state.dismissedMessages = [...state.dismissedMessages, action.payload];

diff --git a/src/shared/utils/analytics.ts b/src/shared/utils/analytics.ts
@@ -12,17 +12,13 @@ import { base58 } from '@scure/base';
 import { AnalyticsBrowser } from '@segment/analytics-next';
 import * as Sentry from '@sentry/react';
 import { token } from 'leather-styles/tokens';
-import { getStoredState } from 'redux-persist';
 
 import {
   IS_TEST_ENV,
   SEGMENT_WRITE_KEY,
   SENTRY_DSN,
   WALLET_ENVIRONMENT,
 } from '@shared/environment';
-import { persistConfig } from '@shared/storage/redux-pesist';
-
-import type { RootState } from '@app/store';
 
 export const analytics = new AnalyticsBrowser();
 
@@ -110,11 +106,6 @@ export function initSentry() {
     environment: WALLET_ENVIRONMENT,
     autoSessionTracking: false,
     async beforeSend(event) {
-      const state = (await getStoredState(persistConfig)) as RootState;
-      const hasAllowedAnalytics = state.settings.hasAllowedAnalytics;
-
-      if (!hasAllowedAnalytics) return null;
-
       delete event.user?.ip_address;
       delete event.extra?.ip_address;
 

diff --git a/tests/page-object-models/onboarding.page.ts b/tests/page-object-models/onboarding.page.ts
@@ -40,7 +40,6 @@ export const testSoftwareAccountDefaultWalletState = {
   },
   settings: {
     userSelectedTheme: 'system',
-    hasAllowedAnalytics: false,
     dismissedMessages: [],
   },
   _persist: { version: 2, rehydrated: true },
@@ -225,18 +224,13 @@ export function makeLedgerTestAccountWalletState(keysToInclude: SupportedBlockch
         'Explore apps': 0,
       },
     },
-    settings: { dismissedMessages: [], hasAllowedAnalytics: false, userSelectedTheme: 'system' },
+    settings: { dismissedMessages: [], userSelectedTheme: 'system' },
   };
 }
 
 export class OnboardingPage {
   constructor(readonly page: Page) {}
 
-  async denyAnalytics() {
-    await this.page.getByTestId(OnboardingSelectors.DenyAnalyticsBtn).click();
-    await this.page.waitForURL('**' + RouteUrls.Onboarding);
-  }
-
   async setPassword() {
     await this.page.waitForURL('**' + RouteUrls.SetPassword);
     await this.page.getByTestId(OnboardingSelectors.NewPasswordInput).fill(TEST_PASSWORD);
@@ -245,14 +239,12 @@ export class OnboardingPage {
   }
 
   async signUpNewUser() {
-    await this.denyAnalytics();
     await this.page.getByTestId(OnboardingSelectors.SignUpBtn).click();
     await this.page.waitForURL('**' + RouteUrls.BackUpSecretKey);
     await this.page.getByTestId(OnboardingSelectors.BackUpSecretKeyBtn).click();
     await this.setPassword();
   }
   async initiateSignIn() {
-    await this.denyAnalytics();
     await this.page.getByTestId(OnboardingSelectors.SignInLink).click();
   }
 

diff --git a/tests/selectors/onboarding.selectors.ts b/tests/selectors/onboarding.selectors.ts
@@ -1,7 +1,5 @@
 export enum OnboardingSelectors {
-  AllowAnalyticsBtn = 'allow-analytics-btn',
   BackUpSecretKeyBtn = 'back-up-secret-key-btn',
-  DenyAnalyticsBtn = 'deny-analytics-btn',
   LogoRouteToHome = 'logo-route-to-home',
   NewPasswordInput = 'set-or-enter-password-input',
   NoAssetsFundAccountLink = 'no-assets-fund-account-link',

diff --git a/tests/specs/settings/settings.spec.ts b/tests/specs/settings/settings.spec.ts
@@ -25,7 +25,7 @@ test.describe('Settings menu', () => {
 
   test('that menu item can perform sign out', async ({ homePage, onboardingPage }) => {
     await homePage.signOut();
-    const button = onboardingPage.page.getByTestId(OnboardingSelectors.DenyAnalyticsBtn);
+    const button = onboardingPage.page.getByTestId(OnboardingSelectors.SignUpBtn);
     test.expect(button).toBeTruthy();
   });
 

diff --git a/tests/specs/store-migrations/store-migrations.spec.ts b/tests/specs/store-migrations/store-migrations.spec.ts
@@ -10,7 +10,7 @@ test.describe('Store migrations', () => {
 
   test.describe('Migration 0 --> 2', () => {
     const previousSerializedState =
-      '{"analytics":"{\\"hasStxDeposits\\":{\\"1\\":true,\\"2147483648\\":true}}","chains":"{\\"stx\\":{\\"default\\":{\\"highestAccountIndex\\":16,\\"currentAccountIndex\\":0}}}","keys":"{\\"ids\\":[\\"default\\"],\\"entities\\":{\\"default\\":{\\"type\\":\\"software\\",\\"id\\":\\"default\\",\\"salt\\":\\"c4cccf33166051f7704cd877a2f03f93\\",\\"encryptedSecretKey\\":\\"b7f516798e7160eca15c50b62e588698937f8ecf3930efc42baa690ddc0c7a51b74e3e4b129859274ed272652bc47651c6b6effbddf4d72a3eb9d2ea657b64a833c9bdccb562e45d94f0cc1366154072f12d35290566a99a6f952cd234ca9259\\"}}}","networks":"{\\"ids\\":[],\\"entities\\":{},\\"currentNetworkId\\":\\"mainnet\\"}","onboarding":"{\\"hideSteps\\":true,\\"stepsStatus\\":{\\"Back up secret key\\":1,\\"Add some funds\\":0,\\"Explore apps\\":0,\\"Buy an NFT\\":0}}","settings":"{\\"userSelectedTheme\\":\\"system\\",\\"hasAllowedAnalytics\\":false,\\"dismissedMessages\\":[]}","_persist":"{\\"version\\":1,\\"rehydrated\\":true}"}';
+      '{"analytics":"{\\"hasStxDeposits\\":{\\"1\\":true,\\"2147483648\\":true}}","chains":"{\\"stx\\":{\\"default\\":{\\"highestAccountIndex\\":16,\\"currentAccountIndex\\":0}}}","keys":"{\\"ids\\":[\\"default\\"],\\"entities\\":{\\"default\\":{\\"type\\":\\"software\\",\\"id\\":\\"default\\",\\"salt\\":\\"c4cccf33166051f7704cd877a2f03f93\\",\\"encryptedSecretKey\\":\\"b7f516798e7160eca15c50b62e588698937f8ecf3930efc42baa690ddc0c7a51b74e3e4b129859274ed272652bc47651c6b6effbddf4d72a3eb9d2ea657b64a833c9bdccb562e45d94f0cc1366154072f12d35290566a99a6f952cd234ca9259\\"}}}","networks":"{\\"ids\\":[],\\"entities\\":{},\\"currentNetworkId\\":\\"mainnet\\"}","onboarding":"{\\"hideSteps\\":true,\\"stepsStatus\\":{\\"Back up secret key\\":1,\\"Add some funds\\":0,\\"Explore apps\\":0,\\"Buy an NFT\\":0}}","settings":"{\\"userSelectedTheme\\":\\"system\\",\\"dismissedMessages\\":[]}","_persist":"{\\"version\\":1,\\"rehydrated\\":true}"}';
 
     test('that the app detects old store format', async ({ extensionId, globalPage }) => {
       const { page } = globalPage;