diff --git a/jest.config.native.js b/jest.config.native.js index 2eb2271f6b..b2ce6822a1 100644 --- a/jest.config.native.js +++ b/jest.config.native.js @@ -42,7 +42,6 @@ module.exports = { '/../../suite-native/connection-status/src/jestSetup.js', '/../../suite-native/react-native-graph/src/jestSetup.js', '/../../suite-native/atoms/src/jestSetup.jsx', - '/../../suite-native/analytics/src/jest.setup.ts', '/../../suite-native/module-trading/src/jest.setup.tsx', '/../../suite-native/module-connect-popup/src/jest.setup.ts', '/../../suite-native/module-device-onboarding/src/jest.setup.ts', diff --git a/packages/suite/src/actions/suite/__tests__/analyticsActions.test.ts b/packages/suite/src/actions/suite/__tests__/analyticsActions.test.ts index fb552843a2..bd6e7f9905 100644 --- a/packages/suite/src/actions/suite/__tests__/analyticsActions.test.ts +++ b/packages/suite/src/actions/suite/__tests__/analyticsActions.test.ts @@ -20,7 +20,7 @@ const getInitialState = (state?: InitialState) => ({ }); type State = ReturnType; -const mockStore = configureStore(); +const mockStore = configureStore([]); const initStore = (state: State) => { const store = mockStore(state); diff --git a/packages/suite/src/actions/suite/analyticsActions.ts b/packages/suite/src/actions/suite/analyticsActions.ts index 5d844e7f38..f5210822ab 100644 --- a/packages/suite/src/actions/suite/analyticsActions.ts +++ b/packages/suite/src/actions/suite/analyticsActions.ts @@ -53,7 +53,6 @@ export const init = () => (dispatch: Dispatch, getState: GetState, extra: ExtraD const hasUserAllowedTracking = selectHasUserAllowedTracking(getState()); const isAnalyticsEnabled = selectIsAnalyticsEnabled(getState()); const isAnalyticsConfirmed = selectIsAnalyticsConfirmed(getState()); - extra.services.legacyAnalytics.init(hasUserAllowedTracking, { instanceId, sessionId, diff --git a/packages/suite/src/components/suite/Preloader/Preloader.tsx b/packages/suite/src/components/suite/Preloader/Preloader.tsx index 3ccb08767b..1f56ba9fa5 100644 --- a/packages/suite/src/components/suite/Preloader/Preloader.tsx +++ b/packages/suite/src/components/suite/Preloader/Preloader.tsx @@ -52,7 +52,6 @@ export const Preloader = ({ children }: PropsWithChildren) => { ); const isAnalyticsConsentConfirmed = useSelector(selectIsAnalyticsConfirmed); - console.log('___', { isAnalyticsConsentConfirmed }); const { device } = useDevice(); useReportDeviceCompromised({ device }); @@ -91,7 +90,6 @@ export const Preloader = ({ children }: PropsWithChildren) => { return ; } - console.log('___', { status: lifecycle.status, loaded: router.loaded, isTransportInitialized }); // @trezor/connect was initialized, but didn't emit "TRANSPORT" event yet (it could take a while) // display Loader as full page view if (lifecycle.status !== 'ready' || !router.loaded || !isTransportInitialized) { diff --git a/packages/suite/src/support/tests/configureStore.tsx b/packages/suite/src/support/tests/configureStore.tsx index 49443b9c4e..faf2e8aa84 100644 --- a/packages/suite/src/support/tests/configureStore.tsx +++ b/packages/suite/src/support/tests/configureStore.tsx @@ -4,6 +4,7 @@ import reduxMockStore, { MockStoreCreator } from 'redux-mock-store'; import { withExtraArgument } from 'redux-thunk'; import type { ExtraDependencies } from '@suite-common/redux-utils'; +import { extraDependenciesMock } from '@suite-common/test-utils'; import { extraDependencies } from '../extraDependencies'; @@ -24,7 +25,11 @@ export const configureStore = ( additionalExtraDeps?: Partial, ): MockStoreCreator => reduxMockStore([ - withExtraArgument({ ...extraDependencies, ...additionalExtraDeps }), + withExtraArgument({ + ...extraDependenciesMock, + ...extraDependencies, + ...additionalExtraDeps, + }), ...(middlewares || []), ]); diff --git a/suite-native/analytics/src/jest.setup.ts b/suite-native/analytics/src/jest.setup.ts deleted file mode 100644 index ba75802a1d..0000000000 --- a/suite-native/analytics/src/jest.setup.ts +++ /dev/null @@ -1 +0,0 @@ -jest.mock('@suite-native/analytics'); diff --git a/suite-native/test-utils/src/BasicProviderForTests.tsx b/suite-native/test-utils/src/BasicProviderForTests.tsx index 5b28a2e4cf..188252f656 100644 --- a/suite-native/test-utils/src/BasicProviderForTests.tsx +++ b/suite-native/test-utils/src/BasicProviderForTests.tsx @@ -5,8 +5,9 @@ import { BottomSheetModalProvider } from '@gorhom/bottom-sheet'; import { NavigationContainer } from '@react-navigation/native'; import { FormatterProvider, FormatterProviderConfig } from '@suite-common/formatters'; +import { extraDependenciesMock } from '@suite-common/test-utils'; import { IntlProviderForTests } from '@suite-native/intl'; -import { NativeServicesProvider } from '@suite-native/services'; +import { NativeServices, NativeServicesProvider } from '@suite-native/services'; import { StylesProvider, createRenderer } from '@trezor/styles'; import { prepareNativeTheme } from '@trezor/theme'; @@ -25,18 +26,14 @@ const DEFAULT_FORMATTERS_CONFIG: FormatterProviderConfig = { is24HourFormat: true, }; -const mockServices = { - analytics: { - report: () => {}, - }, -}; - export const BasicProviderForTests = ({ children, formattersConfig }: ProviderProps) => ( - + {children}