From 28c1a69bf671d576303258229d80e412e91a636f Mon Sep 17 00:00:00 2001
From: Holger Benl <hbenl@evandor.de>
Date: Wed, 19 Jun 2024 16:38:05 +0200
Subject: [PATCH 1/4] Always use hoverTime for the screenshot when the user is
 hovering (#10578)

---
 .../getGraphicsTimeAndExecutionPoint.ts         | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/ui/components/Video/imperative/getGraphicsTimeAndExecutionPoint.ts b/src/ui/components/Video/imperative/getGraphicsTimeAndExecutionPoint.ts
index b2932e94cfb..d45c0d3e7b4 100644
--- a/src/ui/components/Video/imperative/getGraphicsTimeAndExecutionPoint.ts
+++ b/src/ui/components/Video/imperative/getGraphicsTimeAndExecutionPoint.ts
@@ -21,9 +21,13 @@ export function getGraphicsTimeAndExecutionPoint(
   const pauseTime = getTime(state);
   const currentTime = getCurrentTime(state);
 
-  const isHovering = preferHoverTime;
+  const isHovering = hoverTime != null && preferHoverTime;
   const isPlaying = playbackState != null;
 
+  if (isHovering && !isPlaying) {
+    return { executionPoint: null, time: hoverTime };
+  }
+
   let preferCurrentTime = false;
   if (isPlaying) {
     preferCurrentTime = true;
@@ -51,16 +55,9 @@ export function getGraphicsTimeAndExecutionPoint(
     preferCurrentTime = true;
   }
 
-  let time: number;
-  let executionPoint: string | null = null;
   if (preferCurrentTime) {
-    time = currentTime;
-  } else if (isHovering && hoverTime != null) {
-    time = hoverTime;
+    return { executionPoint: null, time: currentTime };
   } else {
-    time = pauseTime;
-    executionPoint = pauseExecutionPoint;
+    return { executionPoint: pauseExecutionPoint, time: pauseTime };
   }
-
-  return { executionPoint, time };
 }

From 6b6ecb01ca37ca894e201b075d4d2ca55414b3fe Mon Sep 17 00:00:00 2001
From: Holger Benl <hbenl@evandor.de>
Date: Wed, 19 Jun 2024 16:46:14 +0200
Subject: [PATCH 2/4] Fix detection of async parent pauses outside of the focus
 window (#10573)

* Revert "Improve message shown when async stack can't be loaded (#10557)"

This reverts commit 585e560d741d2db812010bc35fe442af8b25a7df.

* Fix detection of async parent pauses outside of the focus window
---
 packages/e2e-tests/examples.json              |  4 ++
 .../helpers/pause-information-panel.ts        | 15 +++++
 packages/e2e-tests/tests/async-stack.test.ts  | 34 +++++++++++
 public/test/examples/doc_async_stack.html     | 13 +++++
 .../SecondaryPanes/Frames/NewFrames.tsx       | 56 +++++++++++--------
 .../client/debugger/src/utils/focus.ts        | 10 ----
 src/ui/suspense/util.ts                       | 16 +++---
 7 files changed, 107 insertions(+), 41 deletions(-)
 create mode 100644 packages/e2e-tests/tests/async-stack.test.ts
 create mode 100644 public/test/examples/doc_async_stack.html
 delete mode 100644 src/devtools/client/debugger/src/utils/focus.ts

diff --git a/packages/e2e-tests/examples.json b/packages/e2e-tests/examples.json
index 09df2d4646d..a79f60422e3 100644
--- a/packages/e2e-tests/examples.json
+++ b/packages/e2e-tests/examples.json
@@ -35,6 +35,10 @@
     "recording": "e1eba430-f744-47b3-a097-e0e26c9992fc",
     "buildId": "linux-chromium-20240418-4747c93165f9-4699f489a2b6"
   },
+  "doc_async_stack.html": {
+    "recording": "02747835-34e8-4ea0-9ed5-432a133aa785",
+    "buildId": "linux-chromium-20240614-d742f2be668d-7ad782ed38d0"
+  },
   "doc_control_flow.html": {
     "recording": "4762689b-f2c2-4205-8229-377992d54b6b",
     "buildId": "linux-chromium-20240418-4747c93165f9-4699f489a2b6"
diff --git a/packages/e2e-tests/helpers/pause-information-panel.ts b/packages/e2e-tests/helpers/pause-information-panel.ts
index b75a7b6cdbb..168d326e569 100644
--- a/packages/e2e-tests/helpers/pause-information-panel.ts
+++ b/packages/e2e-tests/helpers/pause-information-panel.ts
@@ -243,6 +243,21 @@ export async function stepOver(page: Page): Promise<void> {
   await clickCommandBarButton(page, "Step Over");
 }
 
+export function waitForAllFramesToLoad(page: Page) {
+  return waitFor(async () => {
+    expect(await page.locator('[data-test-name="FramesLoading"]').count()).toBe(0);
+  });
+}
+
+export function getAsyncParentCount(page: Page) {
+  return page.locator('[data-test-name="AsyncParentLabel"]').count();
+}
+
+export async function isAsyncParentUnavailable(page: Page) {
+  const asyncParentUnavailable = page.locator('[data-test-name="AsyncParentUnavailable"]');
+  return (await asyncParentUnavailable.count()) > 0;
+}
+
 export async function verifyFramesCount(page: Page, expectedCount: number) {
   const framesPanel = getFramesPanel(page);
   return waitFor(async () => {
diff --git a/packages/e2e-tests/tests/async-stack.test.ts b/packages/e2e-tests/tests/async-stack.test.ts
new file mode 100644
index 00000000000..a8ceef35564
--- /dev/null
+++ b/packages/e2e-tests/tests/async-stack.test.ts
@@ -0,0 +1,34 @@
+import { openDevToolsTab, startTest } from "../helpers";
+import { warpToMessage } from "../helpers/console-panel";
+import {
+  getAsyncParentCount,
+  isAsyncParentUnavailable,
+  waitForAllFramesToLoad,
+} from "../helpers/pause-information-panel";
+import { setFocusRange } from "../helpers/timeline";
+import test, { expect } from "../testFixture";
+
+test.use({ exampleKey: "doc_async_stack.html" });
+
+test(`async-stack: should detect async stacks outside the focus window`, async ({
+  pageWithMeta: { page, recordingId, testScope },
+  exampleKey,
+}) => {
+  await startTest(page, recordingId, testScope);
+  await openDevToolsTab(page);
+
+  await warpToMessage(page, "Starting", 7);
+  await waitForAllFramesToLoad(page);
+  expect(await getAsyncParentCount(page)).toBe(0);
+  expect(await isAsyncParentUnavailable(page)).toBe(false);
+
+  await warpToMessage(page, "ExampleFinished", 9);
+  await waitForAllFramesToLoad(page);
+  expect(await getAsyncParentCount(page)).toBe(1);
+  expect(await isAsyncParentUnavailable(page)).toBe(false);
+
+  await setFocusRange(page, { startTimeString: "00:01" });
+  await waitForAllFramesToLoad(page);
+  expect(await getAsyncParentCount(page)).toBe(1);
+  expect(await isAsyncParentUnavailable(page)).toBe(true);
+});
diff --git a/public/test/examples/doc_async_stack.html b/public/test/examples/doc_async_stack.html
new file mode 100644
index 00000000000..6b3092bf7e1
--- /dev/null
+++ b/public/test/examples/doc_async_stack.html
@@ -0,0 +1,13 @@
+<html lang="en" dir="ltr">
+<body>
+<div id="maindiv" style="padding-top:50px">Hello World!</div>
+</body>
+<script>
+async function foo() {
+  console.log("Starting");
+  await new Promise(resolve => setTimeout(resolve, 2000));
+  console.log("ExampleFinished");
+}
+foo();
+</script>
+</html>
diff --git a/src/devtools/client/debugger/src/components/SecondaryPanes/Frames/NewFrames.tsx b/src/devtools/client/debugger/src/components/SecondaryPanes/Frames/NewFrames.tsx
index 5b23d524af4..6164a42a285 100644
--- a/src/devtools/client/debugger/src/components/SecondaryPanes/Frames/NewFrames.tsx
+++ b/src/devtools/client/debugger/src/components/SecondaryPanes/Frames/NewFrames.tsx
@@ -10,11 +10,9 @@ import {
   getSelectedFrameId,
   getThreadContext,
 } from "devtools/client/debugger/src/selectors";
-import { isFocusWindowApplied } from "devtools/client/debugger/src/utils/focus";
 import { InlineErrorBoundary } from "replay-next/components/errors/InlineErrorBoundary";
 import { copyToClipboard } from "replay-next/components/sources/utils/clipboard";
 import { FocusContext } from "replay-next/src/contexts/FocusContext";
-import { SessionContext } from "replay-next/src/contexts/SessionContext";
 import { useCurrentFocusWindow } from "replay-next/src/hooks/useCurrentFocusWindow";
 import { useIsPointWithinFocusWindow } from "replay-next/src/hooks/useIsPointWithinFocusWindow";
 import { getPointAndTimeForPauseId, pauseIdCache } from "replay-next/src/suspense/PauseCache";
@@ -46,13 +44,16 @@ function FramesRenderer({
   const replayClient = useContext(ReplayClientContext);
   const sourcesState = useAppSelector(state => state.sources);
   const { rangeForSuspense: focusWindow } = useContext(FocusContext);
-  const { endpoint } = useContext(SessionContext);
   const dispatch = useAppDispatch();
 
+  if (focusWindow === null) {
+    return null;
+  }
+
   const asyncSeparator =
     asyncIndex > 0 ? (
       <div role="listitem">
-        <span className="location-async-cause">
+        <span className="location-async-cause" data-test-name="AsyncParentLabel">
           <span className="async-label">async</span>
         </span>
       </div>
@@ -64,30 +65,25 @@ function FramesRenderer({
     asyncIndex,
     focusWindow
   );
-  if (asyncParentPauseId === null) {
+  if (asyncParentPauseId === true) {
     return (
       <>
         {asyncSeparator}
-        <div className="pane-info empty">
-          This part of the call stack is unavailable.
-          {isFocusWindowApplied(focusWindow, endpoint) && (
-            <>
-              {" "}
-              Perhaps it is outside of{" "}
-              <span className="cursor-pointer underline" onClick={() => dispatch(enterFocusMode())}>
-                your debugging window
-              </span>
-              .
-            </>
-          )}
+        <div className="pane-info empty" data-test-name="AsyncParentUnavailable">
+          This part of the call stack is unavailable because it is outside{" "}
+          <span className="cursor-pointer underline" onClick={() => dispatch(enterFocusMode())}>
+            your debugging window
+          </span>
+          .
         </div>
       </>
     );
   }
 
-  let frames = asyncParentPauseId
-    ? getPauseFramesSuspense(replayClient, asyncParentPauseId, sourcesState)
-    : undefined;
+  let frames =
+    typeof asyncParentPauseId === "string"
+      ? getPauseFramesSuspense(replayClient, asyncParentPauseId, sourcesState)
+      : undefined;
   if (asyncIndex > 0) {
     frames = frames?.slice(1);
   }
@@ -108,7 +104,13 @@ function FramesRenderer({
         name="NewFrames"
         fallback={<div className="pane-info empty">Error loading frames :(</div>}
       >
-        <Suspense fallback={<div className="pane-info empty">Loading async frames…</div>}>
+        <Suspense
+          fallback={
+            <div className="pane-info empty" data-test-name="FramesLoading">
+              Loading async frames…
+            </div>
+          }
+        >
           <FramesRenderer panel={panel} pauseId={pauseId} asyncIndex={asyncIndex + 1} />
         </Suspense>
       </InlineErrorBoundary>
@@ -228,7 +230,13 @@ function Frames({ panel, point, time }: FramesProps) {
         name="Frames"
         fallback={<div className="pane-info empty">Error loading frames :((</div>}
       >
-        <Suspense fallback={<div className="pane-info empty">Loading...</div>}>
+        <Suspense
+          fallback={
+            <div className="pane-info empty" data-test-name="FramesLoading">
+              Loading...
+            </div>
+          }
+        >
           <div role="list">
             <FramesRenderer pauseId={pauseId} panel={panel} />
           </div>
@@ -243,7 +251,9 @@ export default function NewFrames(props: FramesProps) {
     <Suspense
       fallback={
         <div className="pane">
-          <div className="pane-info empty">Loading...</div>
+          <div className="pane-info empty" data-test-name="FramesLoading">
+            Loading...
+          </div>
         </div>
       }
     >
diff --git a/src/devtools/client/debugger/src/utils/focus.ts b/src/devtools/client/debugger/src/utils/focus.ts
deleted file mode 100644
index bf3d94d12eb..00000000000
--- a/src/devtools/client/debugger/src/utils/focus.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { TimeStampedPointRange } from "@replayio/protocol";
-
-export function isFocusWindowApplied(
-  focusWindow: TimeStampedPointRange | null,
-  endpoint: string
-): focusWindow is TimeStampedPointRange {
-  return (
-    focusWindow !== null && (focusWindow.begin.point !== "0" || focusWindow.end.point !== endpoint)
-  );
-}
diff --git a/src/ui/suspense/util.ts b/src/ui/suspense/util.ts
index ebf7c885bc2..48c9d78119a 100644
--- a/src/ui/suspense/util.ts
+++ b/src/ui/suspense/util.ts
@@ -6,36 +6,36 @@ import { pauseIdCache } from "replay-next/src/suspense/PauseCache";
 import { isExecutionPointsWithinRange } from "replay-next/src/utils/time";
 import { ReplayClientInterface } from "shared/client/types";
 
-// returns undefined if the async parent pause doesn't exist
-// or null if it is not in a loaded region
+// returns false if the async parent pause doesn't exist
+// or true if it is not in a loaded region
 export function getAsyncParentPauseIdSuspense(
   replayClient: ReplayClientInterface,
   pauseId: PauseId,
   asyncIndex: number,
   focusWindow: TimeStampedPointRange | null
-): PauseId | null {
+): PauseId | boolean {
   while (asyncIndex > 0) {
     const frames = framesCache.read(replayClient, pauseId)!;
     if (!frames?.length) {
-      return null;
+      return false;
     }
 
     const steps = frameStepsCache.read(replayClient, pauseId, frames[frames.length - 1].frameId);
     if (!steps || steps.length === 0) {
-      return null;
+      return false;
     }
 
     const executionPoint = steps[0].point;
     if (
-      focusWindow === null ||
+      focusWindow &&
       !isExecutionPointsWithinRange(executionPoint, focusWindow.begin.point, focusWindow.end.point)
     ) {
-      return null;
+      return true;
     }
 
     const parentPauseId = pauseIdCache.read(replayClient, steps[0].point, steps[0].time);
     if (parentPauseId === pauseId) {
-      return null;
+      return false;
     }
 
     pauseId = parentPauseId;

From 59370c808625d1a09154f08c4b9b9eba9d94bdd4 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 19 Jun 2024 08:34:58 -0700
Subject: [PATCH 3/4] Remove LogRocket from Devtools (#10577)

---
 .../replay-preferences-implementations.md     |  2 -
 package.json                                  |  3 -
 .../replay-next/components/AvatarImage.tsx    |  1 -
 .../SyntaxHighlighter/SyntaxHighlighter.tsx   |  2 +-
 .../components/inspector/Inspector.tsx        |  6 +-
 .../inspector/SourcePreviewInspector.tsx      |  3 +-
 .../search-files/ResultsListRow.tsx           |  3 +-
 .../components/search-files/SearchFiles.tsx   |  3 -
 .../components/sources/PreviewPopup.tsx       |  2 +-
 packages/shared/user-data/GraphQL/config.ts   |  5 --
 pages/_document.tsx                           | 10 ++--
 src/base.css                                  |  5 --
 .../src/components/Editor/EditorPane.tsx      |  7 +--
 .../debugger/src/components/Editor/Tab.tsx    |  7 +--
 .../PrimaryPanes/SourcesTreeItem.tsx          |  5 +-
 .../SecondaryPanes/Breakpoints/Breakpoint.tsx |  2 +-
 .../Breakpoints/BreakpointHeading.tsx         |  3 +-
 .../SecondaryPanes/Frames/Frame.tsx           |  5 +-
 .../components/SecondaryPanes/NewScopes.tsx   |  5 +-
 .../SourceOutline/SourceOutlineFunction.tsx   |  5 +-
 .../src/components/shared/PreviewFunction.js  |  8 +--
 src/ui/actions/session.ts                     |  3 -
 src/ui/components/Avatar.tsx                  |  1 -
 src/ui/components/Comments/CommentCard.tsx    |  1 -
 src/ui/components/Events/Event.tsx            |  1 -
 src/ui/components/Events/ReplayInfo.tsx       |  5 +-
 src/ui/components/Redacted.tsx                | 40 -------------
 src/ui/components/SecondaryToolbox/index.tsx  |  5 +-
 src/ui/components/Video/Video.tsx             |  4 +-
 src/ui/components/shared/APIKeys.tsx          |  2 +-
 .../shared/SharingModal/EmailForm.tsx         |  2 +-
 .../components/BooleanPreference.tsx          |  1 -
 .../UserSettingsModal/panels/Personal.tsx     |  2 +-
 .../UserSettingsModal/panels/Preferences.tsx  | 11 ----
 src/ui/setup/store.ts                         | 10 ----
 src/ui/utils/logrocket.ts                     | 60 -------------------
 src/ui/utils/mixpanel.ts                      |  2 +-
 yarn.lock                                     | 37 ------------
 38 files changed, 37 insertions(+), 242 deletions(-)
 delete mode 100644 src/ui/components/Redacted.tsx
 delete mode 100644 src/ui/utils/logrocket.ts

diff --git a/docs/codebase-notes/replay-preferences-implementations.md b/docs/codebase-notes/replay-preferences-implementations.md
index 08b12c13dc7..4789c523337 100644
--- a/docs/codebase-notes/replay-preferences-implementations.md
+++ b/docs/codebase-notes/replay-preferences-implementations.md
@@ -134,7 +134,6 @@
 export type ExperimentalUserSettings = {
   apiKeys: ApiKey[];
   defaultWorkspaceId: null | string;
-  disableLogRocket: boolean;
   enableTeams: boolean;
   enableLargeText: boolean;
 };
@@ -164,7 +163,6 @@ export type CombinedExperimentalUserSettings = ExperimentalUserSettings &
 
 - `ui/actions/session.ts`: `disableCache`,  `listenForMetrics`
 - `ui/components/DevTools.tsx`: `sidePanelSize`
-- `ui/components/Redacted.tsx`: `showRedactions`
 - `ui/components/SkeletonLoader.tsx`: `sidePanelSize`
 - `ui/components/Viewer.tsx`: `secondaryPanelHeight`,  `sidePanelSize`,  `toolboxSize`
 - `ui/hooks/settings.ts`: all,  passed as key to `useStringPref` and `useBoolPref`
diff --git a/package.json b/package.json
index 506819dbf1b..fa7a3e88b1a 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,6 @@
     "launchdarkly-js-client-sdk": "^3.0.0",
     "lexical": "^0.6.5",
     "lodash": "^4.17.21",
-    "logrocket": "^2.2.1",
-    "logrocket-react": "^5.0.1",
     "memoize-one": "^6.0.0",
     "minimatch": "^9.0.3",
     "mixpanel-browser": "^2.43.0",
@@ -130,7 +128,6 @@
     "@types/isomorphic-fetch": "^0.0.36",
     "@types/jest": "^27.4.1",
     "@types/lodash": "^4.14.181",
-    "@types/logrocket-react": "^3.0.0",
     "@types/mixpanel-browser": "^2.35.6",
     "@types/node": "^18.0.0",
     "@types/react": "^18.0.12",
diff --git a/packages/replay-next/components/AvatarImage.tsx b/packages/replay-next/components/AvatarImage.tsx
index c79c02d8076..2fbbb5d64b2 100644
--- a/packages/replay-next/components/AvatarImage.tsx
+++ b/packages/replay-next/components/AvatarImage.tsx
@@ -47,7 +47,6 @@ export default function AvatarImage({ className, name, src, title, ...rest }: Pr
       <img
         {...rest}
         className={`${styles.Image} ${className}`}
-        data-private
         onError={onError}
         onMouseEnter={onMouseEnter}
         onMouseLeave={onMouseLeave}
diff --git a/packages/replay-next/components/SyntaxHighlighter/SyntaxHighlighter.tsx b/packages/replay-next/components/SyntaxHighlighter/SyntaxHighlighter.tsx
index 9c69c8f03f1..a013ededdf8 100644
--- a/packages/replay-next/components/SyntaxHighlighter/SyntaxHighlighter.tsx
+++ b/packages/replay-next/components/SyntaxHighlighter/SyntaxHighlighter.tsx
@@ -39,7 +39,7 @@ export const SyntaxHighlighter = memo(function SyntaxHighlighter({
   );
 
   return (
-    <div className={`${styles.SyntaxHighlighter} ${className}`} title={code} {...rest} data-private>
+    <div className={`${styles.SyntaxHighlighter} ${className}`} title={code} {...rest}>
       {formattedTokens.map((tokens, index) =>
         lineRenderer({
           className: lineClassName,
diff --git a/packages/replay-next/components/inspector/Inspector.tsx b/packages/replay-next/components/inspector/Inspector.tsx
index d600e3ab8cb..7dac0151fd7 100644
--- a/packages/replay-next/components/inspector/Inspector.tsx
+++ b/packages/replay-next/components/inspector/Inspector.tsx
@@ -37,11 +37,7 @@ export default function Inspector({
     return keyValue;
   } else {
     return (
-      <div
-        className={`${styles.Inspector} ${className || ""}`}
-        data-private
-        data-test-name="InspectorRoot"
-      >
+      <div className={`${styles.Inspector} ${className || ""}`} data-test-name="InspectorRoot">
         {keyValue}
       </div>
     );
diff --git a/packages/replay-next/components/inspector/SourcePreviewInspector.tsx b/packages/replay-next/components/inspector/SourcePreviewInspector.tsx
index c3e25281db8..61acd9723d5 100644
--- a/packages/replay-next/components/inspector/SourcePreviewInspector.tsx
+++ b/packages/replay-next/components/inspector/SourcePreviewInspector.tsx
@@ -33,7 +33,6 @@ export default forwardRef<HTMLDivElement, Props>(function SourcePreviewInspector
       return (
         <div
           className={`${styles.SourcePreviewInspector} ${className}`}
-          data-private
           data-test-name="SourcePreviewInspector"
           ref={ref}
         >
@@ -48,7 +47,7 @@ export default forwardRef<HTMLDivElement, Props>(function SourcePreviewInspector
           data-test-name="SourcePreviewInspector"
           ref={ref}
         >
-          <div className={styles.InspectorWrapper} data-private>
+          <div className={styles.InspectorWrapper}>
             <Suspense fallback={<Loader />}>
               <Inspector
                 className={styles.Inspector}
diff --git a/packages/replay-next/components/search-files/ResultsListRow.tsx b/packages/replay-next/components/search-files/ResultsListRow.tsx
index 4c6c96e426c..f6c6703b6a9 100644
--- a/packages/replay-next/components/search-files/ResultsListRow.tsx
+++ b/packages/replay-next/components/search-files/ResultsListRow.tsx
@@ -108,7 +108,7 @@ function LocationRow({
         header={
           <>
             <Icon className={styles.LocationIcon} type="file" />
-            <div className={styles.Location} data-private title={locationString}>
+            <div className={styles.Location} title={locationString}>
               {locationString}
             </div>
             <div className={styles.Count}>
@@ -153,7 +153,6 @@ function MatchRow({
     <div
       className={styles.MatchRow}
       data-hit-count={hitCount}
-      data-private
       data-test-name="SearchFiles-ResultRow"
       data-test-type="Match"
       onClick={() => {
diff --git a/packages/replay-next/components/search-files/SearchFiles.tsx b/packages/replay-next/components/search-files/SearchFiles.tsx
index 51dc534bbea..aa6cb5a14fe 100644
--- a/packages/replay-next/components/search-files/SearchFiles.tsx
+++ b/packages/replay-next/components/search-files/SearchFiles.tsx
@@ -131,7 +131,6 @@ export default function SearchFiles({ limit }: { limit?: number }) {
           <input
             autoFocus
             className={styles.Input}
-            data-private
             data-test-id="FileSearch-Input"
             onChange={onChange(setQueryForDisplay)}
             onClick={onInputClick}
@@ -168,7 +167,6 @@ export default function SearchFiles({ limit }: { limit?: number }) {
           <Icon className={styles.Icon} type="folder-open" />
           <input
             className={styles.Input}
-            data-private
             data-test-id="FileInclude-Input"
             onChange={onChange(setIncludedFiles)}
             onClick={onInputClick}
@@ -192,7 +190,6 @@ export default function SearchFiles({ limit }: { limit?: number }) {
           <Icon className={styles.Icon} type="folder-closed" />
           <input
             className={styles.Input}
-            data-private
             data-test-id="FileExclude-Input"
             onChange={onChange(setExcludedFiles)}
             onClick={onInputClick}
diff --git a/packages/replay-next/components/sources/PreviewPopup.tsx b/packages/replay-next/components/sources/PreviewPopup.tsx
index 86c12f84e50..e0d7bc88aa1 100644
--- a/packages/replay-next/components/sources/PreviewPopup.tsx
+++ b/packages/replay-next/components/sources/PreviewPopup.tsx
@@ -187,7 +187,7 @@ function SuspendingPreviewPopup({
         showTail={true}
         target={target}
       >
-        <div className={styles.Wrapper} data-private>
+        <div className={styles.Wrapper}>
           <div className={styles.UnavailableMessage}>{valueUnavailableMessage}</div>
         </div>
       </Popup>
diff --git a/packages/shared/user-data/GraphQL/config.ts b/packages/shared/user-data/GraphQL/config.ts
index 5b513dfcb2f..10ff6d6ab2b 100644
--- a/packages/shared/user-data/GraphQL/config.ts
+++ b/packages/shared/user-data/GraphQL/config.ts
@@ -138,11 +138,6 @@ export const config = {
     legacyKey: null,
   },
 
-  global_disableLogRocket: {
-    defaultValue: Boolean(false),
-    label: "Disable LogRocket session replay",
-    legacyKey: "devtools.disableLogRocket",
-  },
   global_enableLargeText: {
     defaultValue: Boolean(false),
     label: "Enable large text for Editor",
diff --git a/pages/_document.tsx b/pages/_document.tsx
index eb143345c19..6f052a2cfe9 100644
--- a/pages/_document.tsx
+++ b/pages/_document.tsx
@@ -26,7 +26,7 @@ const csp = (props: any) => {
   const authHost = getAuthHost();
   return [
     `default-src 'self'`,
-    `connect-src 'self' https://api.replay.io wss://api.replay.io wss://dispatch.replay.io ws://*.replay.prod http://*.replay.prod https://telemetry.replay.io https://${authHost} https://api-js.mixpanel.com https://*.sentry.io https://*.launchdarkly.com https://*.logrocket.io https://*.lr-ingest.io https://*.logrocket.com https://*.lr-in.com https://api.stripe.com https://vitals.vercel-insights.com ${
+    `connect-src 'self' https://api.replay.io wss://api.replay.io wss://dispatch.replay.io ws://*.replay.prod http://*.replay.prod https://telemetry.replay.io https://${authHost} https://api-js.mixpanel.com https://*.sentry.io https://*.launchdarkly.com https://*.lr-ingest.io https://*.lr-in.com https://api.stripe.com https://vitals.vercel-insights.com ${
       // Required to talk to local backend in development. Enabling
       // localhost:8000 for prod to support the ?dispatch parameter when running
       // the local backend
@@ -34,22 +34,22 @@ const csp = (props: any) => {
     }`,
     `frame-src replay: https://js.stripe.com https://hooks.stripe.com https://${authHost} https://www.loom.com/`,
     // Required by some of our external services
-    `script-src 'self' 'unsafe-eval' https://cdn.logrocket.io https://cdn.lr-ingest.io https://cdn.lr-in.com https://js.stripe.com ${hash}`,
+    `script-src 'self' 'unsafe-eval' https://cdn.lr-ingest.io https://cdn.lr-in.com https://js.stripe.com ${hash}`,
     `form-action https://${authHost}`,
 
     // From vercel's CSP config and Google fonts
     `font-src 'self' data: https://fonts.gstatic.com`,
     // Google fonts
     `style-src-elem 'self' 'unsafe-inline' https://fonts.gstatic.com`,
-    // Required by LogRocket
-    `child-src 'self' blob:`,
-    `worker-src 'self' blob:`,
 
     // Required by some of our external services
     `style-src 'self' 'unsafe-inline'`,
 
     // Required to inline images from the database and from external avaters
     `img-src 'self' data: https:`,
+
+    // Required for our logpoint analysis cache (which uses a Web worker)
+    `worker-src 'self' blob:`,
   ]
     .filter(Boolean)
     .join("; ");
diff --git a/src/base.css b/src/base.css
index e3d2d785a9c..b5e3b2b4646 100644
--- a/src/base.css
+++ b/src/base.css
@@ -16,11 +16,6 @@ body {
   scrollbar-color: transparent;
 }
 
-.showRedactions[data-private="true"] {
-  background: black !important;
-  border: 2px solid black !important;
-}
-
 :root {
   --dark-blue: #2d7eff;
   --dark-grey: #696969;
diff --git a/src/devtools/client/debugger/src/components/Editor/EditorPane.tsx b/src/devtools/client/debugger/src/components/Editor/EditorPane.tsx
index 7d0001b0b1a..eb32f94a102 100644
--- a/src/devtools/client/debugger/src/components/Editor/EditorPane.tsx
+++ b/src/devtools/client/debugger/src/components/Editor/EditorPane.tsx
@@ -1,9 +1,8 @@
 import classNames from "classnames";
-import { useLayoutEffect, useRef } from "react";
+import { useRef } from "react";
 
 import { IndeterminateProgressBar } from "replay-next/components/IndeterminateLoader";
 import { userData } from "shared/user-data/GraphQL/UserData";
-import { Redacted } from "ui/components/Redacted";
 import { getToolboxLayout } from "ui/reducers/layout";
 import { getSelectedSourceId, getSourcesUserActionPending } from "ui/reducers/sources";
 import { useAppSelector } from "ui/setup/hooks";
@@ -35,9 +34,9 @@ export const EditorPane = () => {
         {sourcesUserActionPending ? <IndeterminateProgressBar /> : null}
         <EditorTabs />
         {selectedSourceId ? (
-          <Redacted className="h-full">
+          <div className="h-full">
             <NewSourceAdapter />
-          </Redacted>
+          </div>
         ) : (
           <WelcomeBox />
         )}
diff --git a/src/devtools/client/debugger/src/components/Editor/Tab.tsx b/src/devtools/client/debugger/src/components/Editor/Tab.tsx
index 30d35f54a66..5ce91e8a592 100644
--- a/src/devtools/client/debugger/src/components/Editor/Tab.tsx
+++ b/src/devtools/client/debugger/src/components/Editor/Tab.tsx
@@ -8,7 +8,6 @@ import useTabContextMenu from "devtools/client/debugger/src/components/Editor/us
 import useTooltip from "replay-next/src/hooks/useTooltip";
 import { useSourcesById } from "replay-next/src/suspense/SourcesCache";
 import { ReplayClientContext } from "shared/client/ReplayClientContext";
-import { Redacted } from "ui/components/Redacted";
 import { SourceDetails, getSelectedSourceId } from "ui/reducers/sources";
 import { useAppDispatch, useAppSelector } from "ui/setup/hooks";
 import { trackEvent } from "ui/utils/telemetry";
@@ -87,7 +86,7 @@ export default function Tab({
 
   return (
     <>
-      <Redacted
+      <div
         draggable
         onDragOver={onDragOver}
         onDragStart={onDragStart}
@@ -103,7 +102,7 @@ export default function Tab({
         onMouseLeave={onMouseLeave}
         // Accommodate middle click to close tab
         onMouseUp={e => e.button === 1 && closeTab(cx, source)}
-        refToForward={elementRef => setTabRef(sourceId, elementRef as HTMLDivElement | null)}
+        ref={elementRef => setTabRef(sourceId, elementRef as HTMLDivElement | null)}
       >
         <SourceIcon
           source={source}
@@ -111,7 +110,7 @@ export default function Tab({
         />
         <div className="filename">{getTruncatedFileName(source, query)}</div>
         <CloseButton buttonClass="" handleClick={onClickClose} tooltip={"Close tab"} />
-      </Redacted>
+      </div>
       {contextMenu}
       {tooltip}
     </>
diff --git a/src/devtools/client/debugger/src/components/PrimaryPanes/SourcesTreeItem.tsx b/src/devtools/client/debugger/src/components/PrimaryPanes/SourcesTreeItem.tsx
index 1d1c0e06fd5..7bdf9b6e01f 100644
--- a/src/devtools/client/debugger/src/components/PrimaryPanes/SourcesTreeItem.tsx
+++ b/src/devtools/client/debugger/src/components/PrimaryPanes/SourcesTreeItem.tsx
@@ -10,7 +10,6 @@ import { ContextMenuItem, useContextMenu } from "use-context-menu";
 
 import Icon from "replay-next/components/Icon";
 import { copyToClipboard } from "replay-next/components/sources/utils/clipboard";
-import { Redacted } from "ui/components/Redacted";
 import type { SourceDetails } from "ui/reducers/sources";
 
 import { getSourceQueryString } from "../../utils/source";
@@ -196,10 +195,10 @@ function SourceTreeItem2({
         {itemArrow}
         <SourceTreeIcon source={source} depth={depth} item={item} />
 
-        <Redacted className="label">
+        <div className="label">
           {getItemName(item)}
           {query}
-        </Redacted>
+        </div>
       </div>
       {contextMenu}
     </>
diff --git a/src/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoint.tsx b/src/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoint.tsx
index 0dc6f11486d..01c8e588daa 100644
--- a/src/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoint.tsx
+++ b/src/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoint.tsx
@@ -85,7 +85,7 @@ class Breakpoint extends PureComponent<BreakpointProps> {
     const location = `${line}${columnVal}`;
 
     return (
-      <div className={styles.Location} data-private data-test-name="PointLocation">
+      <div className={styles.Location} data-test-name="PointLocation">
         {location}
       </div>
     );
diff --git a/src/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.tsx b/src/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.tsx
index e267ed4cfbe..ffeaa6ae295 100644
--- a/src/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.tsx
+++ b/src/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.tsx
@@ -4,7 +4,6 @@ import { ConnectedProps, connect } from "react-redux";
 
 import type { Context } from "devtools/client/debugger/src/reducers/pause";
 import { Point } from "shared/client/types";
-import { Redacted } from "ui/components/Redacted";
 import { MiniSource, getSourceDetails } from "ui/reducers/sources";
 import type { UIState } from "ui/state";
 
@@ -83,7 +82,7 @@ class BreakpointHeading extends PureComponent<BreakpointsProps> {
         onContextMenu={this.onContextMenu}
         onClick={this.onClick}
       >
-        <Redacted className={styles.Label}>{fileName}</Redacted>
+        <div className={styles.Label}>{fileName}</div>
         {allBreakpointsAreShared || (
           <CloseButton
             handleClick={this.removeBreakpoint}
diff --git a/src/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.tsx b/src/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.tsx
index 3f0cb835e39..88a38983f92 100644
--- a/src/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.tsx
+++ b/src/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.tsx
@@ -6,7 +6,6 @@ import classNames from "classnames";
 import React from "react";
 
 import type { PauseFrame } from "devtools/client/debugger/src/reducers/pause";
-import { Redacted } from "ui/components/Redacted";
 import { trackEvent } from "ui/utils/telemetry";
 
 import { formatDisplayName } from "../../../utils/pause/frames";
@@ -121,7 +120,7 @@ export function FrameComponent({
 
   return (
     <>
-      <Redacted
+      <div
         role="listitem"
         key={frame.id}
         className={className}
@@ -140,7 +139,7 @@ export function FrameComponent({
           {!hideLocation && <FrameLocation frame={frame} displayFullUrl={displayFullUrl} />}
           {isSelectable && <br className="clipboard-only" />}
         </div>
-      </Redacted>
+      </div>
 
       {/*Keep the context menu separate to avoid `onMouseDown`
       bubbling up and causing unwanted frame selection behavior*/}
diff --git a/src/devtools/client/debugger/src/components/SecondaryPanes/NewScopes.tsx b/src/devtools/client/debugger/src/components/SecondaryPanes/NewScopes.tsx
index 15e1b9b4f38..ad0c5994dc8 100644
--- a/src/devtools/client/debugger/src/components/SecondaryPanes/NewScopes.tsx
+++ b/src/devtools/client/debugger/src/components/SecondaryPanes/NewScopes.tsx
@@ -12,7 +12,6 @@ import { sourcesByIdCache } from "replay-next/src/suspense/SourcesCache";
 import { getPreferredLocation, getPreferredSourceId } from "replay-next/src/utils/sources";
 import { ReplayClientContext } from "shared/client/ReplayClientContext";
 import { enterFocusMode } from "ui/actions/timeline";
-import { Redacted } from "ui/components/Redacted";
 import { getPreferredGeneratedSources } from "ui/reducers/sources";
 import { useAppDispatch, useAppSelector } from "ui/setup/hooks";
 import { pickScopes } from "ui/suspense/scopeCache";
@@ -150,7 +149,7 @@ export default function NewScopes() {
 
   return (
     <div className="scopes-content">
-      <Redacted className="pane scopes-list" data-test-name="ScopesList">
+      <div className="pane scopes-list" data-test-name="ScopesList">
         <InlineErrorBoundary
           name="NewScopes"
           key={`${selectedFrameId?.pauseId}:${selectedFrameId?.frameId}`}
@@ -160,7 +159,7 @@ export default function NewScopes() {
             <ScopesRenderer />
           </Suspense>
         </InlineErrorBoundary>
-      </Redacted>
+      </div>
     </div>
   );
 }
diff --git a/src/devtools/client/debugger/src/components/SourceOutline/SourceOutlineFunction.tsx b/src/devtools/client/debugger/src/components/SourceOutline/SourceOutlineFunction.tsx
index 6b2af36631d..d462feb6722 100644
--- a/src/devtools/client/debugger/src/components/SourceOutline/SourceOutlineFunction.tsx
+++ b/src/devtools/client/debugger/src/components/SourceOutline/SourceOutlineFunction.tsx
@@ -2,7 +2,6 @@ import classnames from "classnames";
 import React from "react";
 
 import { FunctionOutlineWithHitCount } from "replay-next/src/suspense/OutlineHitCountsCache";
-import { Redacted } from "ui/components/Redacted";
 
 import PreviewFunction from "../shared/PreviewFunction";
 
@@ -25,9 +24,9 @@ export const SourceOutlineFunction = React.memo(function OutlineFunction({
     >
       <div>
         <span className="outline-list__element-icon">λ</span>
-        <Redacted className="inline-block">
+        <div className="inline-block">
           <PreviewFunction func={func} />
-        </Redacted>
+        </div>
       </div>
       {func.hits !== undefined && (
         <div className="rounded bg-themeMenuHighlight px-2 text-bodyColor">{func.hits}</div>
diff --git a/src/devtools/client/debugger/src/components/shared/PreviewFunction.js b/src/devtools/client/debugger/src/components/shared/PreviewFunction.js
index 5f1d54a0ec7..6456327f7c6 100644
--- a/src/devtools/client/debugger/src/components/shared/PreviewFunction.js
+++ b/src/devtools/client/debugger/src/components/shared/PreviewFunction.js
@@ -5,9 +5,7 @@
 import flatten from "lodash/flatten";
 import times from "lodash/times";
 import zip from "lodash/zip";
-import React, { Component } from "react";
-
-import { RedactedSpan } from "ui/components/Redacted";
+import { Component } from "react";
 
 export default class PreviewFunction extends Component {
   renderFunctionName(func) {
@@ -39,12 +37,12 @@ export default class PreviewFunction extends Component {
   render() {
     const { func } = this.props;
     return (
-      <RedactedSpan className="function-signature">
+      <span className="function-signature">
         {this.renderFunctionName(func)}
         <span className="paren">(</span>
         {this.renderParams(func)}
         <span className="paren">)</span>
-      </RedactedSpan>
+      </span>
     );
   }
 }
diff --git a/src/ui/actions/session.ts b/src/ui/actions/session.ts
index 546f2811111..a6bfda80317 100644
--- a/src/ui/actions/session.ts
+++ b/src/ui/actions/session.ts
@@ -34,7 +34,6 @@ import {
 import { setFocusWindow } from "ui/reducers/timeline";
 import { getMutableParamsFromURL } from "ui/setup/dynamic/url";
 import type { ExpectedError, UnexpectedError } from "ui/state/app";
-import LogRocket from "ui/utils/logrocket";
 import { endMixpanelSession } from "ui/utils/mixpanel";
 import { registerRecording, trackEvent } from "ui/utils/telemetry";
 import { subscriptionExpired } from "ui/utils/workspace";
@@ -176,8 +175,6 @@ export function createSocket(recordingId: string): UIThunkAction {
         dispatch(actions.setRecordingWorkspace(recording.workspace));
       }
 
-      LogRocket.createSession({ recording, userInfo });
-
       registerRecording({ recording });
 
       if (
diff --git a/src/ui/components/Avatar.tsx b/src/ui/components/Avatar.tsx
index 0e40b255e83..389141d3f2a 100644
--- a/src/ui/components/Avatar.tsx
+++ b/src/ui/components/Avatar.tsx
@@ -16,7 +16,6 @@ type AvatarImageProps = Omit<React.ImgHTMLAttributes<HTMLImageElement>, "src"> &
 };
 export const AvatarImage = (props: AvatarImageProps) => (
   <img
-    data-private
     {...props}
     src={props.src || undefined}
     onError={e => (e.currentTarget.src = "/recording/images/clear.png")}
diff --git a/src/ui/components/Comments/CommentCard.tsx b/src/ui/components/Comments/CommentCard.tsx
index e06629248ed..72ba4b64309 100644
--- a/src/ui/components/Comments/CommentCard.tsx
+++ b/src/ui/components/Comments/CommentCard.tsx
@@ -110,7 +110,6 @@ function CommentCard({
         isFocused || styles.UnfocusedDimmed
       )}
       data-highlighted={isHighlighted || undefined}
-      data-private
       data-test-comment-id={comment.id}
       data-test-comment-type={comment.type}
       data-test-id={`CommentCard-${comment.id}`}
diff --git a/src/ui/components/Events/Event.tsx b/src/ui/components/Events/Event.tsx
index bd79a7b56f5..cb9c9a15beb 100644
--- a/src/ui/components/Events/Event.tsx
+++ b/src/ui/components/Events/Event.tsx
@@ -117,7 +117,6 @@ export default memo(function Event({
           "text-lightGrey": currentTime < time,
           "font-semibold text-primaryAccent": isPaused,
         })}
-        data-private
         onClick={onClickSeek}
         onContextMenu={onContextMenu}
         onKeyDown={onKeyDown}
diff --git a/src/ui/components/Events/ReplayInfo.tsx b/src/ui/components/Events/ReplayInfo.tsx
index 387bb0aa098..6263355b2f7 100644
--- a/src/ui/components/Events/ReplayInfo.tsx
+++ b/src/ui/components/Events/ReplayInfo.tsx
@@ -49,10 +49,7 @@ function ReplayInfo({ setModal }: PropsFromRedux) {
 
   const isTest = isTestSuiteReplay(recording);
   return (
-    <div
-      className="flex-column flex items-center overflow-hidden border-splitter bg-bodyBgcolor"
-      data-private
-    >
+    <div className="flex-column flex items-center overflow-hidden border-splitter bg-bodyBgcolor">
       <div className="mt-.5 mb-2 flex w-full cursor-default flex-col self-stretch overflow-hidden px-1.5 pb-0 text-xs">
         <Row>
           {recording.user ? (
diff --git a/src/ui/components/Redacted.tsx b/src/ui/components/Redacted.tsx
deleted file mode 100644
index 71b637202be..00000000000
--- a/src/ui/components/Redacted.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import classnames from "classnames";
-import { HTMLProps, Ref } from "react";
-
-import { useGraphQLUserData } from "shared/user-data/GraphQL/useGraphQLUserData";
-
-type RefProp = {
-  refToForward?: Ref<HTMLElement>;
-};
-
-export function Redacted({
-  className,
-  refToForward,
-  ...rest
-}: HTMLProps<HTMLDivElement> & RefProp) {
-  const [showRedactions] = useGraphQLUserData("global_showRedactions");
-  return (
-    <div
-      {...rest}
-      data-private={true}
-      className={classnames(className, { showRedactions })}
-      ref={refToForward as Ref<HTMLDivElement>}
-    />
-  );
-}
-
-export function RedactedSpan({
-  className,
-  refToForward,
-  ...rest
-}: HTMLProps<HTMLSpanElement> & RefProp) {
-  const [showRedactions] = useGraphQLUserData("global_showRedactions");
-  return (
-    <span
-      {...rest}
-      data-private={true}
-      className={classnames(className, { showRedactions })}
-      ref={refToForward}
-    />
-  );
-}
diff --git a/src/ui/components/SecondaryToolbox/index.tsx b/src/ui/components/SecondaryToolbox/index.tsx
index b361b93eef3..6d6c0d6b8b7 100644
--- a/src/ui/components/SecondaryToolbox/index.tsx
+++ b/src/ui/components/SecondaryToolbox/index.tsx
@@ -25,7 +25,6 @@ import { trackEvent } from "ui/utils/telemetry";
 import { selectors } from "../../reducers";
 import NetworkMonitor from "../NetworkMonitor";
 import { NodePicker } from "../NodePicker";
-import { Redacted } from "../Redacted";
 import ReplayLogo from "../shared/ReplayLogo";
 import WaitForReduxSlice from "../WaitForReduxSlice";
 import NewConsoleRoot from "./NewConsole";
@@ -243,7 +242,7 @@ export default function SecondaryToolbox() {
           <div className="secondary-toolbox-scroll-overflow-gradient"></div>
         </div>
       </header>
-      <Redacted className="secondary-toolbox-content bg-chrome text-xs">
+      <div className="secondary-toolbox-content bg-chrome text-xs">
         <Suspense fallback={<PanelLoader />}>
           {shouldShowNetworkTab && (
             <Panel isActive={selectedPanel === "network"}>
@@ -264,7 +263,7 @@ export default function SecondaryToolbox() {
             </Panel>
           )}
         </Suspense>
-      </Redacted>
+      </div>
     </div>
   );
 }
diff --git a/src/ui/components/Video/Video.tsx b/src/ui/components/Video/Video.tsx
index a739ca447f2..a6caa454e8c 100644
--- a/src/ui/components/Video/Video.tsx
+++ b/src/ui/components/Video/Video.tsx
@@ -1,9 +1,8 @@
-import { MouseEvent, useContext, useLayoutEffect, useState } from "react";
+import { useContext, useLayoutEffect, useState } from "react";
 
 import Icon from "replay-next/components/Icon";
 import { LoadingProgressBar } from "replay-next/components/LoadingProgressBar";
 import { ReplayClientContext } from "shared/client/ReplayClientContext";
-import { stopPlayback } from "ui/actions/timeline";
 import CommentsOverlay from "ui/components/Comments/VideoComments";
 import { NodePickerContext } from "ui/components/NodePickerContext";
 import ReplayLogo from "ui/components/shared/ReplayLogo";
@@ -108,7 +107,6 @@ export default function Video() {
     <div
       id="video"
       className={styles.Container}
-      data-private
       style={{
         cursor: nodePickerStatus === "initializing" ? "progress" : undefined,
       }}
diff --git a/src/ui/components/shared/APIKeys.tsx b/src/ui/components/shared/APIKeys.tsx
index b71c115df06..83c4aa329b9 100644
--- a/src/ui/components/shared/APIKeys.tsx
+++ b/src/ui/components/shared/APIKeys.tsx
@@ -76,7 +76,7 @@ function ApiKeyList({ apiKeys, onDelete }: { apiKeys: ApiKey[]; onDelete: (id: s
               : `(${apiKey.recordingCount} recordings)`;
           return (
             <div className="flex flex-row items-center py-1.5 pr-4" key={apiKey.id}>
-              <span className="flex-auto" data-private>
+              <span className="flex-auto">
                 {apiKey.label}
                 <span className="ml-2 text-bodySubColor">{usage}</span>
               </span>
diff --git a/src/ui/components/shared/SharingModal/EmailForm.tsx b/src/ui/components/shared/SharingModal/EmailForm.tsx
index fc62f785e12..ae0f8653032 100644
--- a/src/ui/components/shared/SharingModal/EmailForm.tsx
+++ b/src/ui/components/shared/SharingModal/EmailForm.tsx
@@ -112,7 +112,7 @@ export default function EmailForm({ recordingId }: { recordingId: RecordingId })
 
   return (
     <form className="new-collaborator-form" onSubmit={handleSubmit}>
-      <TextInput placeholder="Email address" value={inputValue} onChange={onChange} data-private />
+      <TextInput placeholder="Email address" value={inputValue} onChange={onChange} />
       {showAutocomplete ? (
         <div className="autocomplete bg-themeTextFieldBgcolor text-themeTextFieldColor hover:bg-themeTextFieldBgcolorHover">
           <div className="content">{inputValue}</div>
diff --git a/src/ui/components/shared/UserSettingsModal/components/BooleanPreference.tsx b/src/ui/components/shared/UserSettingsModal/components/BooleanPreference.tsx
index 9ece3afd5b1..594558c874e 100644
--- a/src/ui/components/shared/UserSettingsModal/components/BooleanPreference.tsx
+++ b/src/ui/components/shared/UserSettingsModal/components/BooleanPreference.tsx
@@ -37,7 +37,6 @@ export function BooleanPreference({
     <label
       className="flex cursor-pointer flex-col transition-opacity"
       style={{ gridTemplateColumns: "auto minmax(0, 1fr)", gap: "0 0.5rem" }}
-      data-private
       htmlFor={preferencesKey}
       onClick={() => {
         setChecked(!checked);
diff --git a/src/ui/components/shared/UserSettingsModal/panels/Personal.tsx b/src/ui/components/shared/UserSettingsModal/panels/Personal.tsx
index e4263e59c2b..64d804e5e1d 100644
--- a/src/ui/components/shared/UserSettingsModal/panels/Personal.tsx
+++ b/src/ui/components/shared/UserSettingsModal/panels/Personal.tsx
@@ -7,7 +7,7 @@ export function Personal() {
 
   return (
     <div className="space-y-12">
-      <div className="flex flex-row items-center space-x-3" data-private>
+      <div className="flex flex-row items-center space-x-3">
         <AvatarImage src={picture} className="avatar w-12 rounded-full" />
         <div>
           <div className="text-base">{name}</div>
diff --git a/src/ui/components/shared/UserSettingsModal/panels/Preferences.tsx b/src/ui/components/shared/UserSettingsModal/panels/Preferences.tsx
index 9c5f8139bae..ce3f871a819 100644
--- a/src/ui/components/shared/UserSettingsModal/panels/Preferences.tsx
+++ b/src/ui/components/shared/UserSettingsModal/panels/Preferences.tsx
@@ -42,16 +42,6 @@ export function Preferences() {
         />
       </div>
 
-      <div className="space-y-4">
-        <div className="text-lg">Privacy</div>
-        <div className="flex flex-col space-y-2">
-          <BooleanPreference
-            preference={config.global_disableLogRocket}
-            preferencesKey="global_disableLogRocket"
-          />
-        </div>
-      </div>
-
       {unsubscribedEmailTypes ? (
         <div className="space-y-4">
           <div className="text-lg">Notifications</div>
@@ -97,7 +87,6 @@ function EmailNotification({
     <label
       className="grid cursor-pointer items-center transition-opacity"
       style={{ gridTemplateColumns: "auto minmax(0, 1fr)", gap: "0 0.5rem" }}
-      data-private
       htmlFor={emailType}
     >
       <Checkbox id={emailType} checked={checked} onChange={onChange} />
diff --git a/src/ui/setup/store.ts b/src/ui/setup/store.ts
index ac22d3b0553..a392f87bd56 100644
--- a/src/ui/setup/store.ts
+++ b/src/ui/setup/store.ts
@@ -9,7 +9,6 @@ import {
 import { Immer } from "immer";
 
 import tabsReducer from "devtools/client/debugger/src/reducers/tabs";
-import { skipTelemetry } from "shared/utils/environment";
 import { UIAction } from "ui/actions";
 import appReducer from "ui/reducers/app";
 import layoutReducer from "ui/reducers/layout";
@@ -17,7 +16,6 @@ import protocolMessages from "ui/reducers/protocolMessages";
 import sources from "ui/reducers/sources";
 import { context } from "ui/setup/redux/middleware/context";
 import { UIState } from "ui/state";
-import LogRocket from "ui/utils/logrocket";
 import { ThunkExtraArgs, extraThunkArgs } from "ui/utils/thunk";
 
 import { listenerMiddleware } from "./listenerMiddleware";
@@ -99,14 +97,6 @@ export function bootstrapStore(initialState: Partial<UIState>) {
 
       let updatedMiddlewareArray = originalMiddlewareArray.concat([context] as UIStateMiddleware[]);
 
-      const telemetryMiddleware = skipTelemetry()
-        ? undefined
-        : (LogRocket.reduxMiddleware() as UIStateMiddleware);
-
-      if (telemetryMiddleware) {
-        updatedMiddlewareArray = updatedMiddlewareArray.concat(telemetryMiddleware);
-      }
-
       return updatedMiddlewareArray as typeof originalMiddlewareArray;
     },
     devTools: reduxDevToolsOptions,
diff --git a/src/ui/utils/logrocket.ts b/src/ui/utils/logrocket.ts
deleted file mode 100644
index bf062661394..00000000000
--- a/src/ui/utils/logrocket.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import * as Sentry from "@sentry/react";
-import LogRocket from "logrocket";
-import setupLogRocketReact from "logrocket-react";
-
-import { Recording, UserSettings } from "shared/graphql/types";
-import { userData } from "shared/user-data/GraphQL/UserData";
-import { skipTelemetry } from "shared/utils/environment";
-import { UserInfo } from "ui/hooks/users";
-
-let setup = false;
-
-export default {
-  createSession: ({
-    recording,
-    userInfo,
-  }: {
-    recording?: Recording;
-    userInfo?: Omit<UserInfo, "loading">;
-  }) => {
-    // Skip if the recording was either created or viewed by an internal user
-    if (
-      userData.get("global_disableLogRocket") ||
-      recording?.user?.internal ||
-      userInfo?.internal ||
-      skipTelemetry()
-    ) {
-      return;
-    }
-
-    if (setup) {
-      return;
-    }
-
-    setup = true;
-    setupLogRocketReact(LogRocket);
-    LogRocket.init("4sdo4i/replay");
-    LogRocket.getSessionURL(sessionURL => {
-      Sentry.configureScope(scope => {
-        scope.setExtra("sessionURL", sessionURL);
-      });
-    });
-
-    // only identify the session if there is a logged in user
-    if (userInfo) {
-      LogRocket.identify(userInfo.id, {
-        name: userInfo.name || "",
-        email: userInfo.email,
-        id: userInfo.email,
-      });
-    }
-  },
-
-  getSessionURL: (callback: (sessionUrl: string) => void) =>
-    setup && LogRocket.getSessionURL(callback),
-  reduxMiddleware: () =>
-    LogRocket.reduxMiddleware({
-      actionSanitizer: action => ({ type: action.type }),
-      stateSanitizer: () => ({}),
-    }),
-};
diff --git a/src/ui/utils/mixpanel.ts b/src/ui/utils/mixpanel.ts
index 3ff2ba2dc40..c020275c26a 100644
--- a/src/ui/utils/mixpanel.ts
+++ b/src/ui/utils/mixpanel.ts
@@ -145,7 +145,7 @@ export function initializeMixpanel() {
   mixpanel.init("ffaeda9ef8fb976a520ca3a65bba5014");
 
   // Add the recordingId to the event metadata so we have a cookie crumb
-  // trail for following flows in LogRocket.
+  // trail for following in other telemetry systems
   mixpanel.register({ recordingId: getRecordingId() });
 }
 
diff --git a/yarn.lock b/yarn.lock
index 14093cde1df..739595f050d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4510,15 +4510,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/logrocket-react@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@types/logrocket-react@npm:3.0.0"
-  dependencies:
-    logrocket: 1.0.1
-  checksum: 6a7e865e11d28fea0ddd06f22676e5f795ba2a4d783bc3ae407f9282e137bc11eb052e2edf7be930c28c588af97cc184b0158973750f4f398ac05ca93c7bf95e
-  languageName: node
-  linkType: hard
-
 "@types/minimatch@npm:*":
   version: 3.0.5
   resolution: "@types/minimatch@npm:3.0.5"
@@ -12395,31 +12386,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"logrocket-react@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "logrocket-react@npm:5.0.1"
-  peerDependencies:
-    logrocket: ">=2.0"
-    react: ">=17.0"
-    react-dom: ">=17.0"
-  checksum: 28547380bdaffb959dc863e61c0369c1e1680febeef78c9dab3abb7bbbcf13531caa3043acba98532e97904b37675d6872140c9cd146a09fcd351381298f68a9
-  languageName: node
-  linkType: hard
-
-"logrocket@npm:1.0.1":
-  version: 1.0.1
-  resolution: "logrocket@npm:1.0.1"
-  checksum: e1929487e9339eefa5649178707251cca36b28a2e08c87844b870c0ad784dde324f8448300b9ad148e4e54a0acd41467ca64899660c404e30179e125a22c0104
-  languageName: node
-  linkType: hard
-
-"logrocket@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "logrocket@npm:2.2.1"
-  checksum: 23d2880b921e940a17bc711bdd7eef2a87cd607decb98c1e5659bea017baf1ac8225dda7cde9e45ab9b02fcf7a205faed9693db0dc79d77780c45ba4bdd23122
-  languageName: node
-  linkType: hard
-
 "loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0":
   version: 1.4.0
   resolution: "loose-envify@npm:1.4.0"
@@ -14956,7 +14922,6 @@ __metadata:
     "@types/isomorphic-fetch": ^0.0.36
     "@types/jest": ^27.4.1
     "@types/lodash": ^4.14.181
-    "@types/logrocket-react": ^3.0.0
     "@types/mixpanel-browser": ^2.35.6
     "@types/node": ^18.0.0
     "@types/react": ^18.0.12
@@ -15022,8 +14987,6 @@ __metadata:
     launchdarkly-js-client-sdk: ^3.0.0
     lexical: ^0.6.5
     lodash: ^4.17.21
-    logrocket: ^2.2.1
-    logrocket-react: ^5.0.1
     memoize-one: ^6.0.0
     mini-css-extract-plugin: ^2.6.0
     minimatch: ^9.0.3

From ca83c36f3f13e3cefbf3df861ebc3caf4f31e1c4 Mon Sep 17 00:00:00 2001
From: Mark Erikson <mark@isquaredsoftware.com>
Date: Thu, 20 Jun 2024 16:24:35 -0400
Subject: [PATCH 4/4] =?UTF-8?q?Improve=20heuristics=20for=20finding=20the?=
 =?UTF-8?q?=20user=20frame=20that=20dispatched=20a=20Redux=E2=80=A6=20(#10?=
 =?UTF-8?q?576)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Improve heuristics for finding the user frame that dispatched a Redux action

The original logic was iterating backwards across the point stack frames looking for an applyMiddleware frame, and going backwards one more frame from there. This is problematic because I'm seeing variance in whether or not applyMiddleware actually shows up in stack frames. For some reason it shows up in Metabase recording stack traces, but not in our own E2E tests (and we're both using RTK).  That meant that the existing logic could keep right on walking backwards long past the frame it "should" have found.

What I've settled on is using the logic we had that tries to identify "is this function in a Redux middleware" based on source outlines (looking for the triply-nested function signature of a middleware definition), and stopping at the first frame that appears to be not a middleware and not applyMiddleware.  This seems to be producing pretty reasonable results.

* Update to a recent `breakpoints-01` recording

* Force re-running the J2C routine

* Add a util for verifying J2C behavior

* Add a test for Redux J2C behavior

* Ignore wrong lint error

* Update RDT-02 test to match current example recording
---
 packages/e2e-tests/examples.json              |   4 +-
 packages/e2e-tests/helpers/source-panel.ts    |  29 ++++
 .../tests/jump-to-code-01_basic.test.ts       |  38 +----
 .../tests/jump-to-code-02_redux-j2c.test.ts   |  97 ++++++++++++
 .../react_devtools-02-integrations.test.ts    |  25 ++--
 .../redux-devtools/ReduxDevToolsPanel.tsx     |   4 +-
 src/ui/suspense/jumpToLocationCache.ts        | 139 +++++++++---------
 7 files changed, 215 insertions(+), 121 deletions(-)
 create mode 100644 packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts

diff --git a/packages/e2e-tests/examples.json b/packages/e2e-tests/examples.json
index a79f60422e3..5c61784eb2a 100644
--- a/packages/e2e-tests/examples.json
+++ b/packages/e2e-tests/examples.json
@@ -13,8 +13,8 @@
     "buildId": "linux-chromium-20240418-4747c93165f9-4699f489a2b6"
   },
   "breakpoints-01": {
-    "recording": "0dc24b18-85c1-44d0-97bc-5025e80b9250",
-    "buildId": "linux-chromium-20240208-e6ff39de2177-11bb013e140b",
+    "recording": "c44d99c0-6eeb-4dda-bf00-bfed2a4710ea",
+    "buildId": "linux-chromium-20240614-d742f2be668d-7ad782ed38d0",
     "requiresManualUpdate": true
   },
   "cra/dist/index.html": {
diff --git a/packages/e2e-tests/helpers/source-panel.ts b/packages/e2e-tests/helpers/source-panel.ts
index d9e5b8aed52..a8c51b5f101 100644
--- a/packages/e2e-tests/helpers/source-panel.ts
+++ b/packages/e2e-tests/helpers/source-panel.ts
@@ -442,6 +442,35 @@ export async function getSelectedLineNumber(
   return parseInt(textContent, 10);
 }
 
+export async function verifyJumpToCodeResults(
+  page: Page,
+  filename: string,
+  lineNumber: number,
+  expectedHits?: { current: number; total: number }
+) {
+  await waitForSelectedSource(page, filename);
+  // Should highlight the line that ran
+  await waitFor(async () => {
+    const lineNumber = await getSelectedLineNumber(page, true);
+    expect(lineNumber).toBe(lineNumber);
+  });
+
+  if (expectedHits) {
+    // Should also have jumped in time. Since this can vary (slightly different progress %
+    // based on timing differences), we'll add a log statement and verify _which_ hit we're at.
+    await addLogpoint(page, {
+      url: filename,
+      lineNumber,
+    });
+
+    const { current, total } = expectedHits;
+
+    // Should have paused on the handler for the first valid keystroke
+    await verifyLogpointStep(page, `${current}/${total}`, { url: filename, lineNumber });
+    await removeLogPoint(page, { url: filename, lineNumber });
+  }
+}
+
 export function getSourceLocator(page: Page, sourceId: string): Locator {
   return page.locator(getSourceSelector(sourceId));
 }
diff --git a/packages/e2e-tests/tests/jump-to-code-01_basic.test.ts b/packages/e2e-tests/tests/jump-to-code-01_basic.test.ts
index 921d03e40ec..33873c48435 100644
--- a/packages/e2e-tests/tests/jump-to-code-01_basic.test.ts
+++ b/packages/e2e-tests/tests/jump-to-code-01_basic.test.ts
@@ -10,6 +10,7 @@ import { openSourceExplorerPanel } from "../helpers/source-explorer-panel";
 import {
   addLogpoint,
   getSelectedLineNumber,
+  verifyJumpToCodeResults,
   verifyLogpointStep,
   waitForSelectedSource,
 } from "../helpers/source-panel";
@@ -71,7 +72,7 @@ test(`jump-to-code-01: Test basic jumping functionality`, async ({
   const queryParams = new URLSearchParams();
   // Force this test to always re-run the Event Listeners (and other) routines
   // See pref names in packages/shared/user-data/GraphQL/config.ts
-  // queryParams.set("features", "backend_rerunRoutines");
+  queryParams.set("features", "backend_rerunRoutines");
 
   await startTest(page, recordingId, testScope, undefined, queryParams);
   await openDevToolsTab(page);
@@ -140,22 +141,11 @@ test(`jump-to-code-01: Test basic jumping functionality`, async ({
 
   debugPrint(page, "Checking that the first keypress J2C jumps to the correct line");
   await firstValidKeypressJumpButton.click();
-  await waitForSelectedSource(page, "Header.tsx");
-  // Should highlight the line that ran
-  await waitFor(async () => {
-    const lineNumber = await getSelectedLineNumber(page, true);
-    expect(lineNumber).toBe(12);
-  });
 
+  // Should have paused on the handler for the first valid keystroke.
   // Should also have jumped in time. Since this can vary (slightly different progress %
   // based on timing differences), we'll add a log statement and verify _which_ hit we're at.
-  await addLogpoint(page, {
-    url: "Header.tsx",
-    lineNumber: 12,
-  });
-
-  // Should have paused on the handler for the first valid keystroke
-  await verifyLogpointStep(page, "1/22", { url: "Header.tsx", lineNumber: 12 });
+  await verifyJumpToCodeResults(page, "Header.tsx", 12, { current: 1, total: 22 });
 
   // the next clicks were on real buttons, so there is a handler
   debugPrint(page, "Checking for an enabled click 'Jump' button");
@@ -164,24 +154,6 @@ test(`jump-to-code-01: Test basic jumping functionality`, async ({
 
   debugPrint(page, "Checking that the first click J2C jumps to the correct line");
   await firstValidClickJumpButton.click();
-  await waitForSelectedSource(page, "TodoListItem.tsx");
-  // Should highlight the line that ran
-  await waitFor(async () => {
-    const lineNumber = await getSelectedLineNumber(page, true);
-    expect(lineNumber).toBe(22);
-  });
 
-  // Should also have jumped in time
-  // Should also have jumped in time. Since this can vary (slightly different progress %
-  // based on timing differences), we'll add a log statement and verify _which_ hit we're at.
-  await addLogpoint(page, {
-    url: "TodoListItem.tsx",
-    lineNumber: 22,
-  });
-
-  // Should have paused on the handler for the first valid click
-  await verifyLogpointStep(page, "1/2", {
-    url: "TodoListItem.tsx",
-    lineNumber: 22,
-  });
+  await verifyJumpToCodeResults(page, "TodoListItem.tsx", 22, { current: 1, total: 2 });
 });
diff --git a/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts b/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts
new file mode 100644
index 00000000000..34e861b9d87
--- /dev/null
+++ b/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts
@@ -0,0 +1,97 @@
+import { Locator, Page, expect } from "@playwright/test";
+
+import { openDevToolsTab, startTest } from "../helpers";
+import { getEventJumpButton } from "../helpers/info-event-panel";
+import { getReduxActions, openReduxDevtoolsPanel } from "../helpers/redux-devtools-panel";
+import { closeSource, verifyJumpToCodeResults } from "../helpers/source-panel";
+import { getByTestName, waitFor } from "../helpers/utils";
+import test from "../testFixture";
+
+// trunk-ignore(gitleaks/generic-api-key)
+test.use({ exampleKey: "breakpoints-01" });
+
+async function checkForJumpButton(actionListItem: Locator, shouldBeEnabled: boolean) {
+  const jumpButton = getEventJumpButton(actionListItem);
+  expect(await jumpButton.isVisible()).toBe(true);
+  await jumpButton.hover();
+
+  await waitFor(async () => {
+    const buttonText = await getByTestName(jumpButton, "JumpToCodeButtonLabel").innerText();
+    const expectedText = shouldBeEnabled ? "Jump to code" : "No results";
+    expect(buttonText).toBe(expectedText);
+  });
+
+  return jumpButton;
+}
+
+async function clickReduxActionJumpButton(page: Page, actionListItem: Locator) {
+  await actionListItem.scrollIntoViewIfNeeded();
+  await actionListItem.hover();
+  const jumpButton = await checkForJumpButton(actionListItem, true);
+  await jumpButton.click();
+}
+
+async function jumpToReduxDispatch(page: Page, actionType: string, index = 0) {
+  const reduxListItemsLocator = getReduxActions(page);
+  const reduxSearchInput = page.locator("#redux-searchbox");
+
+  await reduxSearchInput.fill(actionType);
+  const actionListItem = reduxListItemsLocator.filter({ hasText: actionType }).nth(index);
+  await clickReduxActionJumpButton(page, actionListItem);
+}
+
+test(`jump-to-code-02: Redux J2C functionality`, async ({
+  pageWithMeta: { page, recordingId, testScope },
+  exampleKey,
+}) => {
+  await startTest(page, recordingId, testScope);
+  await openDevToolsTab(page);
+
+  await openReduxDevtoolsPanel(page);
+
+  const reduxListItemsLocator = getReduxActions(page);
+
+  await waitFor(async () => {
+    const numListItems = await reduxListItemsLocator.count();
+    expect(numListItems).toBeGreaterThan(0);
+  });
+
+  // Inside of a thunk
+  await jumpToReduxDispatch(page, "app/setRecordingId");
+  await verifyJumpToCodeResults(page, "session.ts", 170, { current: 1, total: 1 });
+  await closeSource(page, "session.ts");
+
+  // Inside of the same thunk, after several awaits
+  await jumpToReduxDispatch(page, "app/setRecordingTarget");
+  await verifyJumpToCodeResults(page, "session.ts", 363, { current: 1, total: 1 });
+  await closeSource(page, "session.ts");
+
+  // Inside of one of the bootstrapping functions that receives the store
+  // should be "debugger/src/client/index.ts"
+  await jumpToReduxDispatch(page, "sources/allSourcesReceived");
+  await verifyJumpToCodeResults(page, "index.ts", 13, { current: 1, total: 1 });
+  await closeSource(page, "index.ts");
+
+  // Inside of an RTK listener middleware effect
+  jumpToReduxDispatch(page, "tabs/tabsRestored");
+  await verifyJumpToCodeResults(page, "newSources.ts", 43, { current: 1, total: 1 });
+  await closeSource(page, "newSources.ts");
+
+  // Inside of a `useEffect`
+  jumpToReduxDispatch(page, "set_selected_primary_panel");
+  await verifyJumpToCodeResults(page, "SidePanel.tsx", 57, { current: 1, total: 1 });
+  await closeSource(page, "SidePanel.tsx");
+
+  // Inside of a `connect()`ed class component, with `this.props.setExpandedState()`.
+  // Note that this appears to be one or two execution ticks off, so the line hit won't
+  // line up perfectly, but it should still _display_ as "1/4"
+  jumpToReduxDispatch(page, "SET_EXPANDED_STATE");
+  await verifyJumpToCodeResults(page, "SourcesTree.tsx", 196, { current: 1, total: 4 });
+  await closeSource(page, "SourcesTree.tsx");
+
+  // Inside of an adapter that passes dispatch-wrapped actions to <QuickOpenModal>
+  // This is also one tick off, but should still _display_ as "1/3"
+  jumpToReduxDispatch(page, "quickOpen/setQuickOpenQuery");
+  await verifyJumpToCodeResults(page, "QuickOpenModal.tsx", 551, { current: 1, total: 3 });
+  await closeSource(page, "QuickOpenModal.tsx");
+});
diff --git a/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts b/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts
index d16accb5790..4f2fac25636 100644
--- a/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts
+++ b/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts
@@ -32,10 +32,7 @@ test("react_devtools-02: RDT integrations (Chromium)", async ({
 
   await openDevToolsTab(page);
 
-  await warpToMessage(
-    page,
-    "Waiting for breakpoint at doc_rr_basic_chromium.html:21 (waitForBreakpoint)"
-  );
+  await warpToMessage(page, "Waiting for breakpoint at doc_rr_basic.html:21 (waitForBreakpoint)");
 
   // If the "React" tab shows up, we know that the routine ran
   await openReactDevtoolsPanel(page);
@@ -79,14 +76,14 @@ test("react_devtools-02: RDT integrations (Chromium)", async ({
     "SystemProvider",
     "Head",
     "SideEffect",
-    "Auth0Provider",
-    "Auth0Provider",
+    // Tough transpiled variable, apparently: `export var ApolloProvider = function (_a) {`
+    "c",
+    "ApolloContext.Consumer",
+    "ApolloContext.Provider",
+    "ConfirmProvider",
     "Context.Provider",
-    "Context.Consumer",
-    "SSRRecordingPage",
-    "RecordingHead",
-    "Head",
-    "SideEffect",
+    "Routing",
+    "Provider",
   ];
 
   debugPrint(page, "Checking list of rewritten component names");
@@ -143,7 +140,7 @@ test("react_devtools-02: RDT integrations (Chromium)", async ({
   await searchComponents(page, "Anonymous"); // Search and select 1st result
   await verifySearchResults(page, {
     currentNumber: 1,
-    totalNumber: 15,
+    totalNumber: 16,
   });
 
   await componentSearchInput.focus();
@@ -152,7 +149,7 @@ test("react_devtools-02: RDT integrations (Chromium)", async ({
   await componentSearchInput.press("Enter");
   await verifySearchResults(page, {
     currentNumber: 4,
-    totalNumber: 15,
+    totalNumber: 16,
   });
 
   await viewSourceButton.click();
@@ -161,7 +158,7 @@ test("react_devtools-02: RDT integrations (Chromium)", async ({
   await waitForSelectedSource(page, "SourcesTreeItem.tsx");
   await waitFor(async () => {
     const lineNumber = await getSelectedLineNumber(page, false);
-    expect(lineNumber).toBe(133);
+    expect(lineNumber).toBe(132);
   });
 
   list.evaluate(el => (el.scrollTop = 0));
diff --git a/src/ui/components/SecondaryToolbox/redux-devtools/ReduxDevToolsPanel.tsx b/src/ui/components/SecondaryToolbox/redux-devtools/ReduxDevToolsPanel.tsx
index 7384ac34b5b..6e0175ff556 100644
--- a/src/ui/components/SecondaryToolbox/redux-devtools/ReduxDevToolsPanel.tsx
+++ b/src/ui/components/SecondaryToolbox/redux-devtools/ReduxDevToolsPanel.tsx
@@ -15,7 +15,7 @@ import { ReduxDevToolsContents } from "ui/components/SecondaryToolbox/redux-devt
 import { ReduxDevToolsList } from "ui/components/SecondaryToolbox/redux-devtools/ReduxDevToolsList";
 import { useAppSelector } from "ui/setup/hooks";
 import { reduxDevToolsAnnotationsCache } from "ui/suspense/annotationsCaches";
-import { applyMiddlewareDeclCache } from "ui/suspense/jumpToLocationCache";
+import { reduxStoreDetailsCache } from "ui/suspense/jumpToLocationCache";
 
 import styles from "./ReduxDevToolsPanel.module.css";
 
@@ -84,7 +84,7 @@ export default function ReduxDevToolsPanel() {
   useEffect(() => {
     // Preload the cache for where `applyMiddleware` is defined
     // This will speed up the first click on a Redux "J2C" button
-    applyMiddlewareDeclCache.prefetch(client);
+    reduxStoreDetailsCache.prefetch(client);
   }, [client]);
 
   return (
diff --git a/src/ui/suspense/jumpToLocationCache.ts b/src/ui/suspense/jumpToLocationCache.ts
index f76e96e2cca..ddfab66f262 100644
--- a/src/ui/suspense/jumpToLocationCache.ts
+++ b/src/ui/suspense/jumpToLocationCache.ts
@@ -10,64 +10,84 @@ import { createCache, createSingleEntryCache } from "suspense";
 
 import { sourceOutlineCache } from "replay-next/src/suspense/SourceOutlineCache";
 import { sourcesByIdCache } from "replay-next/src/suspense/SourcesCache";
-import { getPreferredLocation } from "replay-next/src/utils/sources";
 import { ReplayClientInterface } from "shared/client/types";
 import { IGNORABLE_PARTIAL_SOURCE_URLS } from "ui/actions/eventListeners/eventListenerUtils";
 import { findFunctionOutlineForLocation } from "ui/actions/eventListeners/jumpToCode";
 import { FormattedPointStackFrame, formattedPointStackCache } from "ui/suspense/frameCache";
 
-interface ApplyMiddlewareDecl {
+interface FunctionBoundaries {
   location: SourceLocationRange;
   sourceId: string;
 }
 
-export const applyMiddlewareDeclCache = createSingleEntryCache<
+export const reduxStoreDetailsCache = createSingleEntryCache<
   [replayClient: ReplayClientInterface],
-  ApplyMiddlewareDecl | null
+  FunctionBoundaries[] | null
 >({
-  debugLabel: "ApplyMiddlewareDecl",
+  debugLabel: "ReduxStoreDetails",
   load: async ([replayClient]) => {
-    const dispatchMatches: FunctionMatch[] = [];
-
     const sourcesById = await sourcesByIdCache.readAsync(replayClient);
-    const reduxSources = Array.from(sourcesById.values()).filter(source =>
-      source.url?.includes("/redux/")
+
+    const reduxSources = Array.from(sourcesById.values()).filter(
+      source => source.url?.includes("/redux/") && source.isSourceMapped
     );
 
     if (reduxSources.length === 0) {
       return null;
     }
 
+    const replaceReducerMatches: FunctionMatch[] = [];
     await replayClient.searchFunctions(
-      { query: "dispatch", sourceIds: reduxSources.map(source => source.id) },
+      // This is a good function to look for to find the actual `createStore` method
+      { query: "replaceReducer", sourceIds: reduxSources.map(source => source.id) },
       matches => {
-        dispatchMatches.push(...matches);
+        replaceReducerMatches.push(...matches);
       }
     );
 
-    const [firstMatch] = dispatchMatches;
-    if (!firstMatch) {
+    if (replaceReducerMatches.length === 0) {
       return null;
     }
-    const preferredLocation = getPreferredLocation(sourcesById, [], [firstMatch.loc]);
-    const reduxSource = sourcesById.get(preferredLocation.sourceId)!;
-    const fileOutline = await sourceOutlineCache.readAsync(replayClient, reduxSource.id);
 
-    const applyMiddlwareFunction = fileOutline.functions.find(o => o.name === "applyMiddleware")!;
+    // Find _all_ `applyMiddleware` definitions across whatever original or pretty-printed
+    // versions of `redux.js` we have.
+    const applyMiddlewareLocations: FunctionBoundaries[] = (
+      await Promise.all(
+        replaceReducerMatches.map(async m => {
+          const sourceOutline = await sourceOutlineCache.readAsync(replayClient, m.loc.sourceId);
+          const applyMiddlewareFunction = sourceOutline.functions.find(
+            o => o.name === "applyMiddleware"
+          );
+
+          if (!applyMiddlewareFunction) {
+            return null;
+          }
+
+          return {
+            sourceId: m.loc.sourceId,
+            location: applyMiddlewareFunction.location,
+          };
+        })
+      )
+    ).filter(Boolean);
+
+    if (applyMiddlewareLocations.length === 0) {
+      return null;
+    }
 
-    return {
-      sourceId: reduxSource.sourceId,
-      location: applyMiddlwareFunction.location,
-    };
+    return applyMiddlewareLocations;
   },
 });
 
-function isFrameInDecl(decl: ApplyMiddlewareDecl, frame: FormattedPointStackFrame) {
-  return (
-    frame.executionLocation.line >= decl.location.begin.line &&
-    frame.executionLocation.line < decl.location.end.line &&
-    frame.executionLocation.sourceId === decl.sourceId
-  );
+function isFrameInDecl(functions: FunctionBoundaries[], frame: FormattedPointStackFrame) {
+  // Check to see if the frame is inside any of the listed function definitions
+  return functions.some(decl => {
+    return (
+      frame.executionLocation.line >= decl.location.begin.line &&
+      frame.executionLocation.line < decl.location.end.line &&
+      frame.executionLocation.sourceId === decl.sourceId
+    );
+  });
 }
 
 function isNestedInside(child: SourceLocationRange, parent: SourceLocationRange) {
@@ -81,28 +101,34 @@ function isNestedInside(child: SourceLocationRange, parent: SourceLocationRange)
   return startsBefore && endsAfter;
 }
 
-async function searchingCallstackForDispatch(
+async function findLikelyAppDispatchFrame(
   pauseFrames: FormattedPointStackFrame[],
   replayClient: ReplayClientInterface
 ) {
-  // The first 2 elements in filtered pause frames are from replay's redux stub, so they should be ignored
-  // The 3rd element is the user function that calls it, and will most likely be the `dispatch` call
-  let preferredFrameIdx = 2;
-  const applyMiddlewareDecl = await applyMiddlewareDeclCache.readAsync(replayClient);
+  const applyMiddlewareLocations = await reduxStoreDetailsCache.readAsync(replayClient);
 
-  if (!applyMiddlewareDecl) {
+  if (!applyMiddlewareLocations) {
     return null;
   }
 
-  for (let frameIdx = 2; frameIdx < pauseFrames.length; frameIdx++) {
-    const frame = pauseFrames[frameIdx];
+  // The first 2 elements in filtered pause frames are from replay's redux stub, so they should be ignored
+  // The 3rd element is the user function that calls it, and will most likely be the `dispatch` call
+  const framesWithoutReplayStub = pauseFrames.slice(2);
+
+  for (const frame of framesWithoutReplayStub) {
+    const isMiddleware = await isReduxMiddleware(replayClient, frame.executionLocation);
+    if (isMiddleware) {
+      continue;
+    }
 
-    if (isFrameInDecl(applyMiddlewareDecl, frame)) {
+    if (isFrameInDecl(applyMiddlewareLocations, frame)) {
       // this is the frame inside `applyMiddleware` where the initial dispatch occurs
       // the frame just before this one is the user `dispatch`
-      preferredFrameIdx = frameIdx + 1;
-      return preferredFrameIdx;
+      continue;
     }
+
+    // Return the first frame that is _not_ a middleware or `applyMiddleware`
+    return frame;
   }
 
   return null;
@@ -151,29 +177,6 @@ async function isReduxMiddleware(replayClient: ReplayClientInterface, location:
   return false;
 }
 
-async function searchSourceOutlineForDispatch(
-  pauseFrames: FormattedPointStackFrame[],
-  replayClient: ReplayClientInterface
-) {
-  // The first 2 elements in filtered pause frames are from replay's redux stub, so they should be ignored
-  // The 3rd element is the user function that calls it, and will most likely be the `dispatch` call
-  let preferredFrameIdx = 2;
-  let isMiddleware = true;
-
-  while (isMiddleware && preferredFrameIdx < pauseFrames.length) {
-    let preferredFrame = pauseFrames[preferredFrameIdx];
-
-    if (await isReduxMiddleware(replayClient, preferredFrame.executionLocation)) {
-      isMiddleware = true;
-      preferredFrameIdx++;
-    } else {
-      isMiddleware = false;
-    }
-  }
-
-  return preferredFrameIdx;
-}
-
 export const reduxDispatchJumpLocationCache = createCache<
   [replayClient: ReplayClientInterface, point: ExecutionPoint, time: number],
   PointDescription | undefined
@@ -194,15 +197,11 @@ export const reduxDispatchJumpLocationCache = createCache<
     );
     const { filteredFrames: filteredPauseFrames } = frames;
 
-    let preferredFrameIdx = await searchingCallstackForDispatch(filteredPauseFrames, replayClient);
-
-    if (preferredFrameIdx === null) {
-      // couldn't find the frame through the call stack
-      // now try finding a function in the call stack
-      // that matches (store => next => action => {})
-      preferredFrameIdx = await searchSourceOutlineForDispatch(filteredPauseFrames, replayClient);
-    }
+    const possibleDispatchFrame = await findLikelyAppDispatchFrame(
+      filteredPauseFrames,
+      replayClient
+    );
 
-    return filteredPauseFrames[preferredFrameIdx].point;
+    return possibleDispatchFrame?.point;
   },
 });