feat: new-srp-sentry

app/components/UI/OptinMetrics/index.js

@@ -47,6 +47,11 @@ import Icon, {
   IconColor,
 } from '../../../component-library/components/Icons/Icon';
 import { getConfiguredCaipChainIds } from '../../../util/metrics/MultichainAPI/networkMetricUtils';
+import { setupSentry } from '../../../util/sentry/utils';
+import {
+  flushBufferedTraces,
+  discardBufferedTraces,
+} from '../../../util/trace';
 
 const createStyles = ({ colors }) =>
   StyleSheet.create({
@@ -324,6 +329,8 @@ class OptinMetrics extends PureComponent {
       // and disable analytics
       clearOnboardingEvents();
       await metrics.enable(false);
+      await setupSentry(); // Re-setup Sentry with enabled: false
+      discardBufferedTraces();
     }, 200);
     this.continue();
   };
@@ -340,6 +347,8 @@ class OptinMetrics extends PureComponent {
     } = this.props;
 
     await metrics.enable();
+    await setupSentry(); // Re-setup Sentry with enabled: true
+    await flushBufferedTraces();
 
     // Handle null case for marketing consent
     if (

app/components/UI/OptinMetrics/index.test.tsx

@@ -4,6 +4,7 @@ import { MetaMetrics, MetaMetricsEvents } from '../../../core/Analytics';
 import { fireEvent, screen, waitFor } from '@testing-library/react-native';
 import { strings } from '../../../../locales/i18n';
 import { MetricsEventBuilder } from '../../../core/Analytics/MetricsEventBuilder';
+import storageWrapper from '../../../store/storage-wrapper';
 
 const { InteractionManager } = jest.requireActual('react-native');
 
@@ -62,6 +63,7 @@ describe('OptinMetrics', () => {
           name: strings('privacy_policy.cta_i_agree'),
         }),
       );
+
       await waitFor(() => {
         expect(mockMetrics.trackEvent).toHaveBeenNthCalledWith(
           1,
@@ -85,6 +87,9 @@ describe('OptinMetrics', () => {
     });
 
     it('with marketing consent', async () => {
+      // mock StorageWrapper getItem to return 'agreed' for marketing consent
+      jest.spyOn(storageWrapper, 'getItem').mockResolvedValue('agreed');
+
       renderScreen(OptinMetrics, { name: 'OptinMetrics' }, { state: {} });
       fireEvent.press(screen.getByText(strings('privacy_policy.checkbox')));
       fireEvent.press(
@@ -116,12 +121,16 @@ describe('OptinMetrics', () => {
   });
 
   it('does not call metrics on cancel', async () => {
+    jest.useFakeTimers();
     renderScreen(OptinMetrics, { name: 'OptinMetrics' }, { state: {} });
     fireEvent.press(
       screen.getByRole('button', {
         name: strings('privacy_policy.cta_no_thanks'),
       }),
     );
+
+    jest.advanceTimersByTime(1000);
+
     await waitFor(() => {
       expect(mockMetrics.trackEvent).not.toHaveBeenCalled();
       expect(mockMetrics.addTraitsToUser).not.toHaveBeenCalled();

app/components/Views/AccountBackupStep1/index.js

@@ -45,6 +45,7 @@ import { saveOnboardingEvent } from '../../../actions/onboarding';
 import { CommonActions, useNavigation } from '@react-navigation/native';
 import { useMetrics } from '../../hooks/useMetrics';
 import { ONBOARDING_SUCCESS_FLOW } from '../../../constants/onboarding';
+import { TraceName, bufferedEndTrace } from '../../../util/trace';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -114,6 +115,7 @@ const AccountBackupStep1 = (props) => {
   const [hasFunds, setHasFunds] = useState(false);
   const { colors } = useTheme();
   const styles = createStyles(colors);
+  const { isEnabled: isMetricsEnabled } = useMetrics();
 
   const track = (event, properties) => {
     const eventBuilder = MetricsEventBuilder.createEventBuilder(event);
@@ -175,13 +177,18 @@ const AccountBackupStep1 = (props) => {
     track(MetaMetricsEvents.WALLET_SECURITY_STARTED);
   };
 
-  const { isEnabled: isMetricsEnabled } = useMetrics();
   const skip = async () => {
     track(MetaMetricsEvents.WALLET_SECURITY_SKIP_CONFIRMED);
     // Get onboarding wizard state
     const onboardingWizard = await StorageWrapper.getItem(ONBOARDING_WIZARD);
     !onboardingWizard && props.setOnboardingWizardStep(1);
 
+    bufferedEndTrace({
+      name: TraceName.OnboardingNewSrpCreateWallet,
+      data: { skipBackup: true },
+    });
+    bufferedEndTrace({ name: TraceName.OnboardingJourneyOverall });
+
     const resetAction = CommonActions.reset({
       index: 1,
       routes: [

app/components/Views/ChoosePassword/index.js

@@ -73,6 +73,12 @@ import { TextFieldSize } from '../../../component-library/components/Form/TextFi
 import fox from '../../../animations/Searching_Fox.json';
 import LottieView from 'lottie-react-native';
 import { saveOnboardingEvent } from '../../../actions/onboarding';
+import {
+  TraceName,
+  bufferedEndTrace,
+  bufferedTrace,
+  TraceOperation,
+} from '../../../util/trace';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -236,6 +242,7 @@ class ChoosePassword extends PureComponent {
   };
 
   mounted = true;
+  passwordSetupAttemptTraceCtx = null;
 
   confirmPasswordInput = React.createRef();
   // Flag to know if password in keyring was set or not
@@ -291,6 +298,16 @@ class ChoosePassword extends PureComponent {
   };
 
   async componentDidMount() {
+    const { route } = this.props;
+    const onboardingTraceCtx = route.params?.onboardingTraceCtx;
+    if (onboardingTraceCtx) {
+      this.passwordSetupAttemptTraceCtx = bufferedTrace({
+        name: TraceName.OnboardingPasswordSetupAttempt,
+        op: TraceOperation.OnboardingUserJourney,
+        parentContext: onboardingTraceCtx,
+      });
+    }
+
     const authData = await Authentication.getType();
     const previouslyDisabled = await StorageWrapper.getItem(
       BIOMETRY_CHOICE_DISABLED,
@@ -335,6 +352,10 @@ class ChoosePassword extends PureComponent {
 
   componentWillUnmount() {
     this.mounted = false;
+    if (this.passwordSetupAttemptTraceCtx) {
+      bufferedEndTrace({ name: TraceName.OnboardingPasswordSetupAttempt });
+      this.passwordSetupAttemptTraceCtx = null;
+    }
   }
 
   setSelection = () => {
@@ -421,6 +442,17 @@ class ChoosePassword extends PureComponent {
         wallet_setup_type: 'new',
         error_type: error.toString(),
       });
+
+      const onboardingTraceCtx = this.props.route.params?.onboardingTraceCtx;
+      if (onboardingTraceCtx) {
+        bufferedTrace({
+          name: TraceName.OnboardingPasswordSetupError,
+          op: TraceOperation.OnboardingUserJourney,
+          parentContext: onboardingTraceCtx,
+          tags: { errorMessage: error.toString() },
+        });
+        bufferedEndTrace({ name: TraceName.OnboardingPasswordSetupError });
+      }
     }
   };
 

app/components/Views/ImportFromSecretRecoveryPhrase/index.js

@@ -85,7 +85,7 @@ import { TextFieldSize } from '../../../component-library/components/Form/TextFi
 import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';
 import { LoginOptionsSwitch } from '../../UI/LoginOptionsSwitch';
 import { saveOnboardingEvent } from '../../../actions/onboarding';
-import { CommonActions } from '@react-navigation/native';
+import { CommonActions, useRoute } from '@react-navigation/native';
 import {
   SRP_LENGTHS,
   NUM_COLUMNS,
@@ -97,6 +97,12 @@ import { useMetrics } from '../../hooks/useMetrics';
 import { ONBOARDING_SUCCESS_FLOW } from '../../../constants/onboarding';
 import { useAccountsWithNetworkActivitySync } from '../../hooks/useAccountsWithNetworkActivitySync';
 import { formatSeedPhraseToSingleLine } from '../../../util/string';
+import {
+  TraceName,
+  bufferedEndTrace,
+  bufferedTrace,
+  TraceOperation,
+} from '../../../util/trace';
 
 const checkValidSeedWord = (text) => wordlist.includes(text);
 
@@ -111,14 +117,15 @@ const ImportFromSecretRecoveryPhrase = ({
   setLockTime,
   seedphraseBackedUp,
   setOnboardingWizardStep,
-  route,
   dispatchSaveOnboardingEvent,
 }) => {
+  const route = useRoute();
   const { colors, themeAppearance } = useTheme();
   const styles = createStyles(colors);
 
   const seedPhraseInputRefs = useRef([]);
   const confirmPasswordInput = useRef();
+  const passwordSetupAttemptTraceCtxRef = useRef(null);
 
   const { toastRef } = useContext(ToastContext);
 
@@ -351,6 +358,16 @@ const ImportFromSecretRecoveryPhrase = ({
     termsOfUse();
   }, [termsOfUse]);
 
+  useEffect(
+    () => () => {
+      if (passwordSetupAttemptTraceCtxRef.current) {
+        bufferedEndTrace({ name: TraceName.OnboardingPasswordSetupAttempt });
+        passwordSetupAttemptTraceCtxRef.current = null;
+      }
+    },
+    [],
+  );
+
   const updateBiometryChoice = async (biometryChoice) => {
     await updateAuthTypeStorageFlags(biometryChoice);
     setBiometryChoice(biometryChoice);
@@ -473,6 +490,15 @@ const ImportFromSecretRecoveryPhrase = ({
       return;
     }
     setCurrentStep(currentStep + 1);
+    // Start the trace when moving to the password setup step
+    const onboardingTraceCtx = route.params?.onboardingTraceCtx;
+    if (onboardingTraceCtx) {
+      passwordSetupAttemptTraceCtxRef.current = bufferedTrace({
+        name: TraceName.OnboardingPasswordSetupAttempt,
+        op: TraceOperation.OnboardingUserJourney,
+        parentContext: onboardingTraceCtx,
+      });
+    }
   };
 
   const isContinueButtonDisabled = useMemo(
@@ -556,6 +582,9 @@ const ImportFromSecretRecoveryPhrase = ({
         !onboardingWizard && setOnboardingWizardStep(1);
 
         fetchAccountsWithActivity();
+
+        bufferedEndTrace({ name: TraceName.OnboardingExistingSrpImport });
+        bufferedEndTrace({ name: TraceName.OnboardingJourneyOverall });
         const resetAction = CommonActions.reset({
           index: 1,
           routes: [
@@ -593,6 +622,17 @@ const ImportFromSecretRecoveryPhrase = ({
           wallet_setup_type: 'import',
           error_type: error.toString(),
         });
+
+        const onboardingTraceCtx = route.params?.onboardingTraceCtx;
+        if (onboardingTraceCtx) {
+          bufferedTrace({
+            name: TraceName.OnboardingPasswordSetupError,
+            op: TraceOperation.OnboardingUserJourney,
+            parentContext: onboardingTraceCtx,
+            tags: { errorMessage: error.toString() },
+          });
+          bufferedEndTrace({ name: TraceName.OnboardingPasswordSetupError });
+        }
       }
     }
   };
@@ -1072,10 +1112,6 @@ ImportFromSecretRecoveryPhrase.propTypes = {
    * Action to set onboarding wizard step
    */
   setOnboardingWizardStep: PropTypes.func,
-  /**
-   * Object that represents the current route info like params passed to it
-   */
-  route: PropTypes.object,
   /**
    * Action to save onboarding event
    */

app/components/Views/ImportFromSecretRecoveryPhrase/index.test.tsx

@@ -10,6 +10,7 @@ import Clipboard from '@react-native-clipboard/clipboard';
 import { MIN_PASSWORD_LENGTH } from '../../../util/password';
 import { BIOMETRY_TYPE } from 'react-native-keychain';
 import AUTHENTICATION_TYPE from '../../../constants/userProperties';
+import { TraceName } from '../../../util/trace';
 
 // Mock the clipboard
 jest.mock('@react-native-clipboard/clipboard', () => ({
@@ -36,6 +37,16 @@ jest.mock('../../hooks/useMetrics', () => {
   };
 });
 
+const mockUseRoute = jest.fn().mockReturnValue({ params: {} });
+// mock useRoute
+jest.mock('@react-navigation/native', () => {
+  const actual = jest.requireActual('@react-navigation/native');
+  return {
+    ...actual,
+    useRoute: () => mockUseRoute(),
+  };
+});
+
 describe('ImportFromSecretRecoveryPhrase', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -800,6 +811,14 @@ describe('ImportFromSecretRecoveryPhrase', () => {
 
     it('Import seed phrase with optin metrics flow', async () => {
       mockIsEnabled.mockReturnValue(false);
+      mockUseRoute.mockReturnValue({
+        params: {
+          onboardingTraceCtx: {
+            name: TraceName.OnboardingNewSrpCreateWallet,
+          },
+        },
+      });
+
       const { getByTestId, getByPlaceholderText } =
         await renderCreatePasswordUI();