stellar
diff --git a/‎config/jest/setupTests.tsx‎
Lines changed: 1 addition & 0 deletions b/‎config/jest/setupTests.tsx‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎extension/src/helpers/hooks/useGetOnrampToken.tsx‎
Lines changed: 1 addition & 1 deletion b/‎extension/src/helpers/hooks/useGetOnrampToken.tsx‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎extension/src/helpers/metrics.reconcileUserId.test.ts‎
Lines changed: 207 additions & 0 deletions b/‎extension/src/helpers/metrics.reconcileUserId.test.ts‎
Lines changed: 207 additions & 0 deletions
@@ -86,6 +86,7 @@ jest.mock("@amplitude/analytics-browser", () => ({
 jest.mock("helpers/metrics", () => ({
   registerHandler: () => {},
   emitMetric: () => {},
+  emitScreenViewed: () => {},
   initAmplitude: () => {},
   getUserId: () => "test-user-id",
   metricsMiddleware: jest.fn(
 
@@ -45,7 +45,7 @@ function useGetOnrampToken({ asset }: UseGetOnrampTokenParams) {
 
       setTokenError("");
       const coinbaseUrl = getCoinbaseUrl({ token, asset });
-      emitMetric(METRIC_NAMES.coinbaseOnrampOpened, { asset });
+      emitMetric(METRIC_NAMES.onrampCoinbaseOpened, { asset });
 
       openTab(coinbaseUrl);
     }
 
@@ -0,0 +1,207 @@
+// config/jest/setupTests.tsx globally stubs "helpers/metrics" (and
+// "popup/App") for every test file so unrelated suites don't have to deal
+// with Amplitude/store internals. This file resolves to the same module
+// (by absolute path) via the relative "./metrics" import below, so we must
+// un-mock it here to exercise the real implementation.
+jest.unmock("helpers/metrics");
+
+import * as amplitude from "@amplitude/analytics-browser";
+import * as Sentry from "@sentry/browser";
+
+import { getAnalyticsUserId } from "@shared/api/internal";
+import { METRICS_USER_ID } from "constants/localStorageTypes";
+import {
+  initAmplitude,
+  reconcileAnalyticsUserId,
+  resetAnalyticsUserIdReconciliation,
+} from "./metrics";
+
+jest.mock("@amplitude/analytics-browser", () => ({
+  init: jest.fn(),
+  setUserId: jest.fn(),
+  identify: jest.fn(),
+  Identify: jest.fn().mockImplementation(() => ({ set: jest.fn() })),
+  setOptOut: jest.fn(),
+  track: jest.fn(),
+  flush: jest.fn(),
+}));
+
+jest.mock("@sentry/browser", () => ({
+  setUser: jest.fn(),
+}));
+
+jest.mock("@shared/api/internal", () => ({
+  getAnalyticsUserId: jest.fn(),
+}));
+
+jest.mock("popup/App", () => ({
+  store: {
+    getState: jest.fn().mockReturnValue({}),
+    subscribe: jest.fn(),
+  },
+}));
+
+jest.mock("helpers/experimentClient", () => ({
+  initExperimentClient: jest.fn(),
+}));
+
+jest.mock("popup/ducks/settings", () => ({
+  settingsDataSharingSelector: jest.fn().mockReturnValue(true),
+  settingsNetworkDetailsSelector: jest.fn().mockReturnValue({
+    network: "TESTNET",
+  }),
+}));
+
+jest.mock("popup/ducks/accountServices", () => ({
+  publicKeySelector: jest.fn().mockReturnValue(""),
+}));
+
+const mockGetAnalyticsUserId = getAnalyticsUserId as jest.Mock;
+
+describe("reconcileAnalyticsUserId (auth id migration)", () => {
+  beforeAll(() => {
+    // Flip the module-level `hasInitialized` flag once so the
+    // `hasInitialized && AMPLITUDE_KEY` guard in reconcileAnalyticsUserId
+    // can be exercised. AMPLITUDE_KEY is stubbed truthy in the jest env
+    // (see config/jest/setupTests.tsx).
+    initAmplitude();
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    localStorage.clear();
+    // Clear the once-per-session guard so each case starts from an
+    // un-reconciled session (mirrors a fresh unlock).
+    resetAnalyticsUserIdReconciliation();
+  });
+
+  it("overwrites a random persisted id with the auth id and re-identifies", async () => {
+    localStorage.setItem(METRICS_USER_ID, "4873921"); // existing random id
+    mockGetAnalyticsUserId.mockResolvedValue({
+      analyticsUserId: "a".repeat(64),
+    });
+
+    await reconcileAnalyticsUserId();
+
+    expect(localStorage.getItem(METRICS_USER_ID)).toBe("a".repeat(64));
+    expect(amplitude.setUserId).toHaveBeenCalledWith("a".repeat(64));
+    expect(Sentry.setUser).toHaveBeenCalledWith({ id: "a".repeat(64) });
+  });
+
+  it("is a no-op when the persisted id already equals the auth id", async () => {
+    localStorage.setItem(METRICS_USER_ID, "a".repeat(64));
+    mockGetAnalyticsUserId.mockResolvedValue({
+      analyticsUserId: "a".repeat(64),
+    });
+
+    await reconcileAnalyticsUserId();
+
+    expect(amplitude.setUserId).not.toHaveBeenCalled();
+    expect(Sentry.setUser).not.toHaveBeenCalled();
+  });
+
+  it("is a no-op when locked (null auth id) — keeps the bootstrap id", async () => {
+    localStorage.setItem(METRICS_USER_ID, "4873921");
+    mockGetAnalyticsUserId.mockResolvedValue({ analyticsUserId: null });
+
+    await reconcileAnalyticsUserId();
+
+    expect(localStorage.getItem(METRICS_USER_ID)).toBe("4873921");
+    expect(amplitude.setUserId).not.toHaveBeenCalled();
+    expect(Sentry.setUser).not.toHaveBeenCalled();
+  });
+
+  it("never throws into callers when the background message fails", async () => {
+    localStorage.setItem(METRICS_USER_ID, "4873921");
+    mockGetAnalyticsUserId.mockRejectedValue(new Error("no background"));
+
+    await expect(reconcileAnalyticsUserId()).resolves.toBeUndefined();
+    expect(localStorage.getItem(METRICS_USER_ID)).toBe("4873921");
+    expect(amplitude.setUserId).not.toHaveBeenCalled();
+  });
+
+  it("does NOT call Sentry.setUser when data-sharing is off, but still persists + re-identifies amplitude", async () => {
+    const { settingsDataSharingSelector } = jest.requireMock(
+      "popup/ducks/settings",
+    ) as {
+      settingsDataSharingSelector: jest.Mock;
+    };
+    settingsDataSharingSelector.mockReturnValue(false);
+
+    localStorage.setItem(METRICS_USER_ID, "4873921");
+    mockGetAnalyticsUserId.mockResolvedValue({
+      analyticsUserId: "b".repeat(64),
+    });
+
+    await reconcileAnalyticsUserId();
+
+    expect(localStorage.getItem(METRICS_USER_ID)).toBe("b".repeat(64));
+    expect(amplitude.setUserId).toHaveBeenCalledWith("b".repeat(64));
+    expect(Sentry.setUser).not.toHaveBeenCalled();
+  });
+
+  it("calls Sentry.setUser when data-sharing is on", async () => {
+    const { settingsDataSharingSelector } = jest.requireMock(
+      "popup/ducks/settings",
+    ) as {
+      settingsDataSharingSelector: jest.Mock;
+    };
+    settingsDataSharingSelector.mockReturnValue(true);
+
+    localStorage.setItem(METRICS_USER_ID, "4873921");
+    mockGetAnalyticsUserId.mockResolvedValue({
+      analyticsUserId: "c".repeat(64),
+    });
+
+    await reconcileAnalyticsUserId();
+
+    expect(Sentry.setUser).toHaveBeenCalledWith({ id: "c".repeat(64) });
+  });
+
+  it("reconciles once per session: skips the background round-trip on repeat calls", async () => {
+    localStorage.setItem(METRICS_USER_ID, "4873921");
+    mockGetAnalyticsUserId.mockResolvedValue({
+      analyticsUserId: "d".repeat(64),
+    });
+
+    await reconcileAnalyticsUserId();
+    await reconcileAnalyticsUserId();
+    await reconcileAnalyticsUserId();
+
+    // Only the first call hits the (expensive) background handler.
+    expect(mockGetAnalyticsUserId).toHaveBeenCalledTimes(1);
+    expect(localStorage.getItem(METRICS_USER_ID)).toBe("d".repeat(64));
+  });
+
+  it("does not latch the guard while locked, so a later unlock still reconciles", async () => {
+    localStorage.setItem(METRICS_USER_ID, "4873921");
+    // Locked: background returns a null auth id.
+    mockGetAnalyticsUserId.mockResolvedValueOnce({ analyticsUserId: null });
+    await reconcileAnalyticsUserId();
+    expect(localStorage.getItem(METRICS_USER_ID)).toBe("4873921");
+
+    // Now unlocked: the auth id resolves and reconciliation proceeds.
+    mockGetAnalyticsUserId.mockResolvedValue({
+      analyticsUserId: "e".repeat(64),
+    });
+    await reconcileAnalyticsUserId();
+
+    expect(mockGetAnalyticsUserId).toHaveBeenCalledTimes(2);
+    expect(localStorage.getItem(METRICS_USER_ID)).toBe("e".repeat(64));
+  });
+
+  it("re-reconciles after the guard is reset on lock", async () => {
+    mockGetAnalyticsUserId.mockResolvedValue({
+      analyticsUserId: "f".repeat(64),
+    });
+
+    await reconcileAnalyticsUserId();
+    expect(mockGetAnalyticsUserId).toHaveBeenCalledTimes(1);
+
+    // Simulate a lock transition (SessionLockListener → SESSION_LOCKED).
+    resetAnalyticsUserIdReconciliation();
+
+    await reconcileAnalyticsUserId();
+    expect(mockGetAnalyticsUserId).toHaveBeenCalledTimes(2);
+  });
+});
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ function useGetOnrampToken({ asset }: UseGetOnrampTokenParams) {`
`45`	`45`
`46`	`46`	`setTokenError("");`
`47`	`47`	`const coinbaseUrl = getCoinbaseUrl({ token, asset });`
`48`		`- emitMetric(METRIC_NAMES.coinbaseOnrampOpened, { asset });`
	`48`	`+ emitMetric(METRIC_NAMES.onrampCoinbaseOpened, { asset });`
`49`	`49`
`50`	`50`	`openTab(coinbaseUrl);`
`51`	`51`	`}`