diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d1bfce0f68a0..9a7b27d8e79a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -856,8 +856,6 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /.agents/skills/lint-fix/                              @getsentry/design-engineering
 /.agents/skills/lint-new/                              @getsentry/design-engineering
 /.agents/skills/react-component-documentation/         @getsentry/design-engineering
-# Orphaned files we had to touch to fix errors
-/static/gsAdmin/views/sentryAppDetails.spec.tsx        @getsentry/design-engineering
 ## End of Frontend Platform
 
 # Coding Workflows
diff --git a/.github/actions/setup-devservices/action.yml b/.github/actions/setup-devservices/action.yml
deleted file mode 100644
index 061ff20d9b72..000000000000
--- a/.github/actions/setup-devservices/action.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: 'Early Devservices'
-description: 'Starts devservices in the background so image pulls overlap with venv setup'
-inputs:
-  mode:
-    description: 'devservices mode (must match the mode passed to setup-sentry)'
-    required: true
-  timeout-minutes:
-    description: 'Maximum minutes for devservices up'
-    required: false
-    default: '10'
-
-runs:
-  using: 'composite'
-  steps:
-    - uses: astral-sh/setup-uv@884ad927a57e558e7a70b92f2bccf9198a4be546 # v6
-      with:
-        version: '0.9.28'
-        enable-cache: false
-
-    - name: Start devservices in background
-      shell: bash --noprofile --norc -euo pipefail {0}
-      run: |
-        DS_VERSION=$(python3 -c "
-        import tomllib
-        with open('uv.lock', 'rb') as f:
-            lock = tomllib.load(f)
-        for pkg in lock['package']:
-            if pkg['name'] == 'devservices':
-                print(pkg['version'])
-                break
-        ")
-        echo "Installing devservices==${DS_VERSION}"
-        uv venv /tmp/ds-venv --python python3 -q
-        uv pip install --python /tmp/ds-venv/bin/python -q \
-          --index-url https://pypi.devinfra.sentry.io/simple \
-          "devservices==${DS_VERSION}"
-        (set +e; timeout ${{ inputs.timeout-minutes }}m /tmp/ds-venv/bin/devservices up --mode ${{ inputs.mode }}; echo $? > /tmp/ds-exit) \
-          > /tmp/ds.log 2>&1 &
diff --git a/.github/actions/setup-devservices/bootstrap-snuba.py b/.github/actions/setup-devservices/bootstrap-snuba.py
deleted file mode 100755
index c0f4ea8a7e7b..000000000000
--- a/.github/actions/setup-devservices/bootstrap-snuba.py
+++ /dev/null
@@ -1,250 +0,0 @@
-#!/usr/bin/env python3
-"""Bootstrap per-worker Snuba instances for CI.
-
-Overlaps the expensive ClickHouse table setup with the devservices
-health-check wait.
-
-Phase 1 (early): As soon as ClickHouse is accepting queries, create
-  per-worker databases and run ``snuba bootstrap --force``.
-Phase 2 (after devservices): Stop snuba-snuba-1 and start per-worker
-  API containers.  We must wait for devservices to finish first —
-  stopping the container while devservices is health-checking it would
-  cause a timeout.
-
-Requires: XDIST_WORKERS env var
-Reads:    /tmp/ds-exit (written by setup-devservices/wait.sh)
-Writes:   /tmp/snuba-bootstrap-exit
-"""
-
-from __future__ import annotations
-
-import os
-import subprocess
-import sys
-import time
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from functools import partial
-from pathlib import Path
-from typing import Any, Callable
-from urllib.error import URLError
-from urllib.request import urlopen
-
-DS_EXIT = Path("/tmp/ds-exit")
-SNUBA_EXIT = Path("/tmp/snuba-bootstrap-exit")
-
-SNUBA_ENV = {
-    "CLICKHOUSE_HOST": "clickhouse",
-    "CLICKHOUSE_PORT": "9000",
-    "CLICKHOUSE_HTTP_PORT": "8123",
-    "DEFAULT_BROKERS": "kafka:9093",
-    "REDIS_HOST": "redis",
-    "REDIS_PORT": "6379",
-    "REDIS_DB": "1",
-    "SNUBA_SETTINGS": "docker",
-}
-
-ENV_ARGS = [flag for k, v in SNUBA_ENV.items() for flag in ("-e", f"{k}={v}")]
-
-
-def retry(
-    fn: Callable[[], Any], *, attempts: int = 3, delay: int = 5, label: str = "operation"
-) -> Any:
-    for i in range(attempts):
-        try:
-            return fn()
-        except Exception:
-            if i == attempts - 1:
-                raise
-            log(f"{label} failed (attempt {i + 1}/{attempts}), retrying in {delay}s...")
-            time.sleep(delay)
-
-
-def log(msg: str) -> None:
-    print(msg, flush=True)
-
-
-def fail(msg: str) -> None:
-    log(f"::error::{msg}")
-    SNUBA_EXIT.write_text("1")
-    sys.exit(1)
-
-
-def http_ok(url: str) -> bool:
-    try:
-        with urlopen(url, timeout=3):
-            return True
-    except (URLError, OSError):
-        return False
-
-
-def docker(
-    *args: str, check: bool = False, timeout: int | None = None
-) -> subprocess.CompletedProcess[str]:
-    return subprocess.run(
-        ["docker", *args], capture_output=True, text=True, check=check, timeout=timeout
-    )
-
-
-def docker_inspect(container: str, fmt: str) -> str:
-    r = docker("inspect", container, "--format", fmt)
-    return r.stdout.strip() if r.returncode == 0 else ""
-
-
-def inspect_snuba_container() -> tuple[str, str]:
-    image = docker_inspect("snuba-snuba-1", "{{.Config.Image}}")
-    network = docker_inspect(
-        "snuba-snuba-1",
-        "{{range $k, $v := .NetworkSettings.Networks}}{{$k}}{{end}}",
-    )
-    if not image or not network:
-        fail("Could not inspect snuba-snuba-1 container")
-    return image, network
-
-
-def run_parallel(fn: Callable[[int], Any], workers: range, *, fail_fast: bool = True) -> int:
-    """Run fn(i) in parallel for each i in workers. Returns 0 on full success."""
-    rc = 0
-    with ThreadPoolExecutor(max_workers=len(workers)) as pool:
-        futs = {pool.submit(fn, i): i for i in workers}
-        for fut in as_completed(futs):
-            try:
-                fut.result()
-            except Exception as e:
-                if fail_fast:
-                    fail(str(e))
-                log(f"ERROR: {e}")
-                rc = 1
-    return rc
-
-
-def wait_for_prerequisites(timeout: int = 300) -> None:
-    log("Waiting for ClickHouse and Snuba container...")
-    start = time.monotonic()
-    while True:
-        if time.monotonic() - start > timeout:
-            fail("Timed out waiting for Snuba bootstrap prerequisites")
-        if http_ok("http://localhost:8123/") and docker_inspect("snuba-snuba-1", "{{.Id}}"):
-            break
-        time.sleep(2)
-    log(f"Prerequisites ready ({time.monotonic() - start:.0f}s)")
-
-
-def wait_for_devservices(timeout: int = 300) -> None:
-    start = time.monotonic()
-    while not DS_EXIT.exists():
-        if time.monotonic() - start > timeout:
-            fail("Timed out waiting for devservices to finish")
-        time.sleep(1)
-    rc = int(DS_EXIT.read_text().strip())
-    if rc != 0:
-        fail(f"devservices failed (exit {rc}), skipping Phase 2")
-
-
-def bootstrap_worker(worker_id: int, *, image: str, network: str) -> None:
-    """Create a ClickHouse database and run snuba bootstrap."""
-    db = f"default_gw{worker_id}"
-
-    def create_db() -> None:
-        with urlopen(
-            "http://localhost:8123/", f"CREATE DATABASE IF NOT EXISTS {db}".encode(), timeout=30
-        ):
-            pass
-
-    retry(create_db, label=f"CREATE DATABASE {db}")
-
-    def run_bootstrap() -> None:
-        r = docker(
-            "run",
-            "--rm",
-            "--network",
-            network,
-            "-e",
-            f"CLICKHOUSE_DATABASE={db}",
-            *ENV_ARGS,
-            image,
-            "bootstrap",
-            "--force",
-        )
-        for line in (r.stdout + r.stderr).strip().splitlines()[-3:]:
-            log(line)
-        if r.returncode != 0:
-            raise RuntimeError(f"snuba bootstrap failed for worker {worker_id}")
-
-    retry(run_bootstrap, label=f"snuba bootstrap gw{worker_id}")
-
-
-def start_worker_container(worker_id: int, *, image: str, network: str) -> None:
-    """Start a per-worker Snuba API container and wait for health."""
-    db = f"default_gw{worker_id}"
-    port = 1230 + worker_id
-    name = f"snuba-gw{worker_id}"
-
-    docker("rm", "-f", name)
-
-    r = docker(
-        "run",
-        "-d",
-        "--name",
-        name,
-        "--network",
-        network,
-        "-p",
-        f"{port}:1218",
-        "-e",
-        f"CLICKHOUSE_DATABASE={db}",
-        *ENV_ARGS,
-        "-e",
-        "DEBUG=1",
-        image,
-        "api",
-    )
-    if r.returncode != 0:
-        raise RuntimeError(f"docker run {name} failed: {r.stderr.strip()}")
-
-    for attempt in range(1, 31):
-        if http_ok(f"http://127.0.0.1:{port}/health"):
-            log(f"{name} healthy on port {port}")
-            return
-        if attempt == 30:
-            r = docker("logs", name)
-            for line in (r.stdout + r.stderr).strip().splitlines()[-20:]:
-                log(line)
-            raise RuntimeError(f"{name} failed health check after 30 attempts")
-        time.sleep(2)
-
-
-def main() -> None:
-    workers_str = os.environ.get("XDIST_WORKERS")
-    if not workers_str:
-        fail("XDIST_WORKERS must be set")
-    workers = range(int(workers_str))
-    start = time.monotonic()
-
-    wait_for_prerequisites()
-    image, network = inspect_snuba_container()
-
-    log("Phase 1: bootstrapping ClickHouse databases")
-    run_parallel(partial(bootstrap_worker, image=image, network=network), workers)
-    log(f"Phase 1 done ({time.monotonic() - start:.0f}s)")
-
-    wait_for_devservices()
-    try:
-        docker("stop", "snuba-snuba-1", timeout=30)
-    except subprocess.TimeoutExpired:
-        log("WARNING: docker stop snuba-snuba-1 timed out, killing")
-        docker("kill", "snuba-snuba-1")
-
-    log("Phase 2: starting per-worker Snuba API containers")
-    rc = run_parallel(
-        partial(start_worker_container, image=image, network=network),
-        workers,
-        fail_fast=False,
-    )
-
-    log(f"Snuba bootstrap complete ({time.monotonic() - start:.0f}s total)")
-    SNUBA_EXIT.write_text(str(rc))
-    sys.exit(rc)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/.github/actions/setup-devservices/wait.sh b/.github/actions/setup-devservices/wait.sh
deleted file mode 100755
index 00c319469d73..000000000000
--- a/.github/actions/setup-devservices/wait.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Wait for the background devservices process started by the setup-devservices action.
-# Usage: wait.sh [timeout_seconds]
-TIMEOUT=${1:-600}
-
-SECONDS=0
-while [ ! -f /tmp/ds-exit ]; do
-  if [ $SECONDS -gt "$TIMEOUT" ]; then
-    echo "::error::Timed out waiting for devservices after ${TIMEOUT}s"
-    cat /tmp/ds.log
-    exit 1
-  fi
-  sleep 2
-done
-
-DS_RC=$(< /tmp/ds-exit)
-if [ "$DS_RC" -ne 0 ]; then
-  echo "::error::devservices up failed (exit $DS_RC)"
-  cat /tmp/ds.log
-  exit 1
-fi
-
-echo "DJANGO_LIVE_TEST_SERVER_ADDRESS=$(docker network inspect bridge --format='{{(index .IPAM.Config 0).Gateway}}')" >> "$GITHUB_ENV"
-docker ps -a
diff --git a/.github/codeowners-coverage-baseline.txt b/.github/codeowners-coverage-baseline.txt
index 734fcb38d43f..1f28e295e561 100644
--- a/.github/codeowners-coverage-baseline.txt
+++ b/.github/codeowners-coverage-baseline.txt
@@ -591,6 +591,7 @@ static/app/components/events/breadcrumbs/testUtils.tsx
 static/app/components/events/breadcrumbs/utils.tsx
 static/app/components/events/device.tsx
 static/app/components/events/errorLevel.tsx
+static/app/components/events/eventAnnotation.tsx
 static/app/components/events/eventAttachmentActions.tsx
 static/app/components/events/eventAttachments.spec.tsx
 static/app/components/events/eventAttachments.tsx
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
index 652d2ca72b93..8bad8cfafc06 100644
--- a/.github/workflows/acceptance.yml
+++ b/.github/workflows/acceptance.yml
@@ -68,12 +68,6 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         name: Checkout sentry
 
-      - run: mkdir -p config/chartcuterie
-
-      - uses: ./.github/actions/setup-devservices
-        with:
-          mode: acceptance-ci
-
       - name: Step configurations
         id: config
         run: |
@@ -104,12 +98,6 @@ jobs:
         id: setup
         with:
           mode: acceptance-ci
-          skip-devservices: 'true'
-
-      - name: Wait for devservices
-        run: |
-          sentry init
-          ./.github/actions/setup-devservices/wait.sh
 
       - name: Run acceptance tests (#${{ steps.setup.outputs.matrix-instance-number }} of ${{ steps.setup.outputs.matrix-instance-total }})
         run: make run-acceptance
@@ -117,11 +105,6 @@ jobs:
       - name: Inspect failure
         if: failure()
         run: |
-          if [ -f /tmp/ds.log ]; then
-            echo "--- devservices startup log ---"
-            cat /tmp/ds.log
-          fi
-
           if command -v devservices; then
             devservices logs
           fi
diff --git a/.github/workflows/backend-with-coverage.yml b/.github/workflows/backend-with-coverage.yml
new file mode 100644
index 000000000000..65f1496ce765
--- /dev/null
+++ b/.github/workflows/backend-with-coverage.yml
@@ -0,0 +1,199 @@
+name: backend - with test coverage
+
+on:
+  workflow_dispatch:
+  workflow_call:
+  # Every 30 minutes
+  schedule:
+    - cron: '0,30 * * * *'
+
+env:
+  SENTRY_SKIP_SELENIUM_PLUGIN: '1'
+
+jobs:
+  # Skip generating coverage if already exists in GCS
+  check-existing-coverage:
+    name: check for existing coverage
+    runs-on: ubuntu-24.04
+    timeout-minutes: 5
+    permissions:
+      contents: read
+      id-token: write
+    outputs:
+      has-coverage: ${{ steps.check-coverage.outputs.exists }}
+      commit-sha: ${{ steps.get-sha.outputs.sha }}
+    steps:
+      - name: Determine commit SHA
+        id: get-sha
+        run: |
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            COMMIT_SHA="${{ github.event.pull_request.head.sha }}"
+          else
+            COMMIT_SHA="${{ github.sha }}"
+          fi
+          echo "sha=${COMMIT_SHA}" >> "$GITHUB_OUTPUT"
+
+      - name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2.1.3
+        with:
+          project_id: sentry-dev-tooling
+          workload_identity_provider: ${{ secrets.SENTRY_GCP_DEV_WORKLOAD_IDENTITY_POOL }}
+          service_account: ${{ secrets.COLLECT_TEST_DATA_SERVICE_ACCOUNT_EMAIL }}
+
+      - name: Check if coverage exists
+        id: check-coverage
+        env:
+          COMMIT_SHA: ${{ steps.get-sha.outputs.sha }}
+        run: |
+          if gcloud storage ls "gs://sentry-coverage-data/${COMMIT_SHA}/.coverage.combined" &>/dev/null; then
+            echo "Coverage already exists for commit ${COMMIT_SHA}, skipping test run"
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "No coverage found for commit ${COMMIT_SHA}, will run tests"
+            echo "exists=false" >> "$GITHUB_OUTPUT"
+          fi
+
+  calculate-shards:
+    name: calculate test shards
+    if: needs.check-existing-coverage.outputs.has-coverage != 'true'
+    needs: [check-existing-coverage]
+    runs-on: ubuntu-24.04
+    timeout-minutes: 5
+    outputs:
+      shard-count: ${{ steps.calculate-shards.outputs.shard-count }}
+      shard-indices: ${{ steps.calculate-shards.outputs.shard-indices }}
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Setup sentry env
+        uses: ./.github/actions/setup-sentry
+        id: setup
+        with:
+          mode: backend-ci
+          skip-devservices: true
+
+      - name: Calculate test shards
+        id: calculate-shards
+        run: python3 .github/workflows/scripts/calculate-backend-test-shards.py
+
+  backend-test-with-cov-context:
+    name: backend test
+    if: needs.check-existing-coverage.outputs.has-coverage != 'true'
+    runs-on: ubuntu-24.04
+    needs: [check-existing-coverage, calculate-shards]
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        instance: ${{ fromJSON(needs.calculate-shards.outputs.shard-indices) }}
+    env:
+      MATRIX_INSTANCE_TOTAL: ${{ needs.calculate-shards.outputs.shard-count }}
+      TEST_GROUP_STRATEGY: roundrobin
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Setup sentry env
+        uses: ./.github/actions/setup-sentry
+        id: setup
+        with:
+          mode: backend-ci
+
+      - name: Download odiff binary
+        run: |
+          curl -sL https://registry.npmjs.org/odiff-bin/-/odiff-bin-4.3.2.tgz \
+            | tar -xz --strip-components=2 package/raw_binaries/odiff-linux-x64
+          sudo install -m 755 odiff-linux-x64 /usr/local/bin/odiff
+          rm odiff-linux-x64
+
+      - name: Run backend test with coverage (${{ steps.setup.outputs.matrix-instance-number }} of ${{ steps.setup.outputs.matrix-instance-total }})
+        run: make test-backend-ci-with-coverage
+
+      - name: Validate coverage database
+        if: always()
+        run: |
+          set -euxo pipefail
+          if [[ ! -f .coverage ]]; then
+            echo "Error: No .coverage file found after tests"
+            exit 1
+          fi
+          python -c "import sqlite3; sqlite3.connect('.coverage').execute('SELECT COUNT(*) FROM file')"
+
+      - name: Upload raw coverage sqlite as artifact
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: pycoverage-sqlite-${{ github.run_id }}-${{ steps.setup.outputs.matrix-instance-number }}
+          path: .coverage
+          if-no-files-found: error
+          retention-days: 7
+          include-hidden-files: true
+
+  combine-coverage:
+    name: combine coverage
+    # Only upload coverage if all test shards pass - incomplete coverage could cause selective testing to skip tests incorrectly
+    if: needs.check-existing-coverage.outputs.has-coverage != 'true'
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+      id-token: write
+      actions: read # used for DIM metadata
+    needs: [check-existing-coverage, backend-test-with-cov-context, calculate-shards]
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - uses: astral-sh/setup-uv@884ad927a57e558e7a70b92f2bccf9198a4be546 # v6
+        with:
+          version: '0.9.28'
+          enable-cache: false
+
+      - name: Download all coverage artifacts
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          pattern: pycoverage-sqlite-${{ github.run_id }}-*
+          path: .artifacts/all-coverage
+
+      - name: Verify all shards produced coverage
+        env:
+          EXPECTED_SHARD_COUNT: ${{ needs.calculate-shards.outputs.shard-count }}
+        run: |
+          set -euxo pipefail
+
+          echo "Downloaded coverage artifacts:"
+          ls -la .artifacts/all-coverage || true
+
+          COVERAGE_FILE_COUNT=$(find .artifacts/all-coverage -name ".coverage" -type f | wc -l)
+          echo "Found ${COVERAGE_FILE_COUNT} coverage files, expected ${EXPECTED_SHARD_COUNT}"
+
+          if [[ "$COVERAGE_FILE_COUNT" -ne "$EXPECTED_SHARD_COUNT" ]]; then
+            echo "Error: Missing coverage files. Expected ${EXPECTED_SHARD_COUNT}, found ${COVERAGE_FILE_COUNT}"
+            echo "This indicates some test shards failed to produce coverage."
+            find .artifacts/all-coverage -name ".coverage" -type f
+            exit 1
+          fi
+
+      - name: Combine all coverage databases
+        run: |
+          set -euxo pipefail
+          uvx --with covdefaults --with sentry-covdefaults-disable-branch-coverage \
+            coverage combine $(find .artifacts/all-coverage -name ".coverage" -type f)
+
+          if [[ ! -f .coverage ]]; then
+            echo "Error: Combined coverage file was not created"
+            exit 1
+          fi
+
+          mv .coverage ".coverage.combined"
+
+      - name: Authenticate to Google Cloud
+        id: gcloud-auth
+        uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2.1.3
+        with:
+          project_id: sentry-dev-tooling
+          workload_identity_provider: ${{ secrets.SENTRY_GCP_DEV_WORKLOAD_IDENTITY_POOL }}
+          service_account: ${{ secrets.COLLECT_TEST_DATA_SERVICE_ACCOUNT_EMAIL }}
+
+      - name: Upload coverage to GCS
+        uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2.2.4
+        with:
+          path: .coverage.combined
+          destination: sentry-coverage-data/${{ needs.check-existing-coverage.outputs.commit-sha }}
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index fbcde1793f94..23b62cfad424 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -59,23 +59,11 @@ jobs:
           node-version-file: '.node-version'
 
       - uses: pnpm/action-setup@9b5745cdf0a2e8c2620f0746130f809adb911c19 # v4
-
-      - name: Start devservices early
-        uses: ./.github/actions/setup-devservices
-        with:
-          mode: default
-
       - name: Setup sentry python env
         uses: ./.github/actions/setup-sentry
         id: setup
         with:
           mode: default
-          skip-devservices: 'true'
-
-      - name: Wait for devservices
-        run: |
-          sentry init
-          ./.github/actions/setup-devservices/wait.sh
 
       - name: Run API docs tests
         run: |
@@ -246,28 +234,11 @@ jobs:
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-      - name: Start devservices early
-        uses: ./.github/actions/setup-devservices
-        with:
-          mode: backend-ci
-
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup
         with:
           mode: backend-ci
-          skip-devservices: 'true'
-
-      - name: Wait for devservices
-        run: |
-          sentry init
-          # Start Snuba per-worker bootstrap in background — it polls for
-          # ClickHouse readiness itself, so it can begin before all containers
-          # are healthy, overlapping with the remaining devservices health checks.
-          if [ "${XDIST_PER_WORKER_SNUBA}" = "1" ]; then
-            python3 ./.github/actions/setup-devservices/bootstrap-snuba.py &
-          fi
-          ./.github/actions/setup-devservices/wait.sh
 
       - name: Download odiff binary
         run: |
@@ -276,23 +247,59 @@ jobs:
           sudo install -m 755 odiff-linux-x64 /usr/local/bin/odiff
           rm odiff-linux-x64
 
-      - name: Wait for Snuba bootstrap
+      - name: Bootstrap per-worker Snuba instances
         if: env.XDIST_PER_WORKER_SNUBA == '1'
         run: |
-          SECONDS=0
-          while [ ! -f /tmp/snuba-bootstrap-exit ]; do
-            if [ $SECONDS -gt 600 ]; then
-              echo "::error::Timed out waiting for Snuba bootstrap after 600s"
-              exit 1
-            fi
-            sleep 2
-          done
-          SNUBA_RC=$(cat /tmp/snuba-bootstrap-exit)
-          if [ "$SNUBA_RC" -ne 0 ]; then
-            echo "::error::Snuba per-worker bootstrap failed"
+          set -eo pipefail
+          SNUBA_IMAGE=$(docker inspect snuba-snuba-1 --format '{{.Config.Image}}')
+          SNUBA_NETWORK=$(docker inspect snuba-snuba-1 --format '{{range $k, $v := .NetworkSettings.Networks}}{{$k}}{{end}}')
+          if [ -z "$SNUBA_IMAGE" ] || [ -z "$SNUBA_NETWORK" ]; then
+            echo "ERROR: Could not inspect snuba-snuba-1 container. Is devservices running?"
             exit 1
           fi
 
+          docker stop snuba-snuba-1 || true
+
+          PIDS=()
+          for i in $(seq 0 $(( ${XDIST_WORKERS} - 1 ))); do
+            (
+              WORKER_DB="default_gw${i}"
+              WORKER_PORT=$((1230 + i))
+              curl -sf 'http://localhost:8123/' --data-binary "CREATE DATABASE IF NOT EXISTS ${WORKER_DB}"
+              docker run --rm --network "$SNUBA_NETWORK" \
+                -e "CLICKHOUSE_DATABASE=${WORKER_DB}" -e "CLICKHOUSE_HOST=clickhouse" \
+                -e "CLICKHOUSE_PORT=9000" -e "CLICKHOUSE_HTTP_PORT=8123" \
+                -e "DEFAULT_BROKERS=kafka:9093" -e "REDIS_HOST=redis" \
+                -e "REDIS_PORT=6379" -e "REDIS_DB=1" -e "SNUBA_SETTINGS=docker" \
+                "$SNUBA_IMAGE" bootstrap --force 2>&1 | tail -3
+              docker run -d --name "snuba-gw${i}" --network "$SNUBA_NETWORK" \
+                -p "${WORKER_PORT}:1218" \
+                -e "CLICKHOUSE_DATABASE=${WORKER_DB}" -e "CLICKHOUSE_HOST=clickhouse" \
+                -e "CLICKHOUSE_PORT=9000" -e "CLICKHOUSE_HTTP_PORT=8123" \
+                -e "DEFAULT_BROKERS=kafka:9093" -e "REDIS_HOST=redis" \
+                -e "REDIS_PORT=6379" -e "REDIS_DB=1" -e "SNUBA_SETTINGS=docker" \
+                -e "DEBUG=1" "$SNUBA_IMAGE" api
+
+              for attempt in $(seq 1 30); do
+                if curl -sf "http://127.0.0.1:${WORKER_PORT}/health" > /dev/null 2>&1; then
+                  echo "snuba-gw${i} healthy on port ${WORKER_PORT}"
+                  break
+                fi
+                if [ "$attempt" -eq 30 ]; then
+                  echo "ERROR: snuba-gw${i} failed health check after 30 attempts"
+                  docker logs "snuba-gw${i}" 2>&1 | tail -20 || true
+                  exit 1
+                fi
+                sleep 2
+              done
+            ) &
+            PIDS+=($!)
+          done
+
+          for pid in "${PIDS[@]}"; do
+            wait "$pid" || { echo "ERROR: Snuba bootstrap subshell (PID $pid) failed"; exit 1; }
+          done
+
       - name: Download selected tests artifact
         if: needs.select-tests.outputs.has-selected-tests == 'true'
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
@@ -332,11 +339,6 @@ jobs:
       - name: Inspect failure
         if: failure()
         run: |
-          if [ -f /tmp/ds.log ]; then
-            echo "--- devservices startup log ---"
-            cat /tmp/ds.log
-          fi
-
           if command -v devservices; then
             devservices logs
           fi
@@ -373,22 +375,11 @@ jobs:
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-      - name: Start devservices early
-        uses: ./.github/actions/setup-devservices
-        with:
-          mode: default
-
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup
         with:
           mode: default
-          skip-devservices: 'true'
-
-      - name: Wait for devservices
-        run: |
-          sentry init
-          ./.github/actions/setup-devservices/wait.sh
 
       - name: run tests
         run: |
@@ -422,22 +413,11 @@ jobs:
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-      - name: Start devservices early
-        uses: ./.github/actions/setup-devservices
-        with:
-          mode: migrations
-
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup
         with:
           mode: migrations
-          skip-devservices: 'true'
-
-      - name: Wait for devservices
-        run: |
-          sentry init
-          ./.github/actions/setup-devservices/wait.sh
 
       - name: Run test
         env:
@@ -509,21 +489,10 @@ jobs:
 
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-      - name: Start devservices early
-        uses: ./.github/actions/setup-devservices
-        with:
-          mode: backend-ci
-
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         with:
           mode: backend-ci
-          skip-devservices: 'true'
-
-      - name: Wait for devservices
-        run: |
-          sentry init
-          ./.github/actions/setup-devservices/wait.sh
 
       - name: Sync API Urls to TypeScript
         run: |
@@ -546,22 +515,11 @@ jobs:
       - name: Checkout sentry
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-      - name: Start devservices early
-        uses: ./.github/actions/setup-devservices
-        with:
-          mode: migrations
-
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup
         with:
           mode: migrations
-          skip-devservices: 'true'
-
-      - name: Wait for devservices
-        run: |
-          sentry init
-          ./.github/actions/setup-devservices/wait.sh
 
       - name: Migration & lockfile checks
         env:
@@ -591,22 +549,11 @@ jobs:
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-      - name: Start devservices early
-        uses: ./.github/actions/setup-devservices
-        with:
-          mode: migrations
-
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         id: setup
         with:
           mode: migrations
-          skip-devservices: 'true'
-
-      - name: Wait for devservices
-        run: |
-          sentry init
-          ./.github/actions/setup-devservices/wait.sh
 
       - name: Run test
         run: |
diff --git a/.github/workflows/changelog-preview.yml b/.github/workflows/changelog-preview.yml
new file mode 100644
index 000000000000..63088abe3b5a
--- /dev/null
+++ b/.github/workflows/changelog-preview.yml
@@ -0,0 +1,21 @@
+name: Changelog Preview
+on:
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - edited
+      - labeled
+      - unlabeled
+permissions:
+  contents: write
+  pull-requests: write
+  statuses: write
+
+jobs:
+  changelog-preview:
+    uses: getsentry/craft/.github/workflows/changelog-preview.yml@f4889d04564e47311038ecb6b910fef6b6cf1363 # v2
+    with:
+      comment: false
+    secrets: inherit
diff --git a/.github/workflows/codeowners-coverage.yml b/.github/workflows/codeowners-coverage.yml
index ed6e31c42858..e66921860362 100644
--- a/.github/workflows/codeowners-coverage.yml
+++ b/.github/workflows/codeowners-coverage.yml
@@ -6,8 +6,7 @@ on:
   # push:
   #   branches:
   #     - master
-  # pull_request:
-  workflow_dispatch:
+  pull_request:
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
diff --git a/.github/workflows/openapi-diff.yml b/.github/workflows/openapi-diff.yml
index 556d036b53b4..9c510beafba3 100644
--- a/.github/workflows/openapi-diff.yml
+++ b/.github/workflows/openapi-diff.yml
@@ -27,25 +27,12 @@ jobs:
           token: ${{ github.token }}
           filters: .github/file-filters.yml
 
-      - name: Start devservices early
-        uses: ./.github/actions/setup-devservices
-        if: steps.changes.outputs.api_docs == 'true'
-        with:
-          mode: migrations
-
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         with:
           mode: migrations
-          skip-devservices: 'true'
         if: steps.changes.outputs.api_docs == 'true'
 
-      - name: Wait for devservices
-        if: steps.changes.outputs.api_docs == 'true'
-        run: |
-          sentry init
-          ./.github/actions/setup-devservices/wait.sh
-
       - name: Checkout getsentry/sentry-api-schema
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         if: steps.changes.outputs.api_docs == 'true'
diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml
index 1ed5a0720e9a..35a7bad47fde 100644
--- a/.github/workflows/openapi.yml
+++ b/.github/workflows/openapi.yml
@@ -32,25 +32,12 @@ jobs:
           token: ${{ github.token }}
           filters: .github/file-filters.yml
 
-      - name: Start devservices early
-        uses: ./.github/actions/setup-devservices
-        if: steps.changes.outputs.api_docs == 'true'
-        with:
-          mode: migrations
-
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         with:
           mode: migrations
-          skip-devservices: 'true'
         if: steps.changes.outputs.api_docs == 'true'
 
-      - name: Wait for devservices
-        if: steps.changes.outputs.api_docs == 'true'
-        run: |
-          sentry init
-          ./.github/actions/setup-devservices/wait.sh
-
       - name: Checkout getsentry/sentry-api-schema
         if: steps.changes.outputs.api_docs == 'true'
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
diff --git a/AGENTS.md b/AGENTS.md
index 017e343af6c1..535b35d1917e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -130,19 +130,13 @@ make reset-db
 #### Development Setup
 
 ```bash
-# Start the full development server (requires devservices up)
+# Start the development server
 pnpm run dev
 
 # Start only the UI development server with hot reload
-# Proxies API requests to production sentry.io
 pnpm run dev-ui
 ```
 
-**Dev server URLs:**
-
-- Full devserver: http://dev.getsentry.net:8000
-- Frontend-only (`dev-ui`): https://sentry.dev.getsentry.net:7999/
-
 #### Typechecking
 
 Typechecking only works on the entire project. Individual files cannot be checked.
diff --git a/eslint.config.ts b/eslint.config.ts
index e965a5c74563..f2f7497d420f 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -405,7 +405,6 @@ export default typescript.config([
       'prefer-promise-reject-errors': 'off', // Disabled in favor of @typescript-eslint/prefer-promise-reject-errors
       'object-shorthand': ['error', 'properties'],
       'prefer-arrow-callback': ['error', {allowNamedFunctions: true}],
-      quotes: ['error', 'single', {avoidEscape: true, allowTemplateLiterals: false}],
       radix: 'error',
       'require-await': 'off', // Disabled in favor of @typescript-eslint/require-await
       'spaced-comment': [
diff --git a/jest.config.ts b/jest.config.ts
index 006dc2c36b22..04d12ff49b36 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -273,14 +273,7 @@ if (
  * node_modules, but some packages which use ES6 syntax only NEED to be
  * transformed.
  */
-const ESM_NODE_MODULES = [
-  'screenfull',
-  'cbor2',
-  'nuqs',
-  'color',
-  'marked',
-  '@sentry\\+sqlish',
-];
+const ESM_NODE_MODULES = ['screenfull', 'cbor2', 'nuqs', 'color', 'marked'];
 
 const config: Config.InitialOptions = {
   verbose: false,
@@ -308,11 +301,6 @@ const config: Config.InitialOptions = {
     '^echarts/(.*)': '<rootDir>/tests/js/sentry-test/mocks/echartsMock.js',
     '^zrender/(.*)': '<rootDir>/tests/js/sentry-test/mocks/echartsMock.js',
 
-    // @sentry/sqlish is ESM-only with `exports` that only define `import`
-    // conditions. Jest's CJS resolver can't follow them without explicit mapping.
-    '^@sentry/sqlish/react$': '<rootDir>/node_modules/@sentry/sqlish/dist/react.js',
-    '^@sentry/sqlish$': '<rootDir>/node_modules/@sentry/sqlish/dist/index.js',
-
     // Disabled @sentry/toolbar in tests. It depends on iframes and global
     // window/cookies state.
     '@sentry/toolbar': '<rootDir>/tests/js/sentry-test/mocks/sentryToolbarMock.js',
diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt
index 921fc0bf5d34..cfa5664e557e 100644
--- a/migrations_lockfile.txt
+++ b/migrations_lockfile.txt
@@ -31,7 +31,7 @@ replays: 0007_organizationmember_replay_access
 
 seer: 0005_delete_seerorganizationsettings
 
-sentry: 1064_eventattachment_date_expires_now
+sentry: 1063_remove_customdynamicsamplingrule
 
 social_auth: 0003_social_auth_json_field
 
diff --git a/package.json b/package.json
index cb6d7974503f..2584865f8c2d 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,6 @@
     "@sentry/node": "10.41.0-beta.0",
     "@sentry/react": "10.41.0-beta.0",
     "@sentry/release-parser": "^1.3.1",
-    "@sentry/sqlish": "1.0.1",
     "@sentry/status-page-list": "^0.6.1",
     "@sentry/toolbar": "1.0.0-beta.16",
     "@sentry/webpack-plugin": "4.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a00fd18d152f..21ac43b1c167 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -210,9 +210,6 @@ importers:
       '@sentry/release-parser':
         specifier: ^1.3.1
         version: 1.3.1
-      '@sentry/sqlish':
-        specifier: 1.0.1
-        version: 1.0.1(react@19.2.3)
       '@sentry/status-page-list':
         specifier: ^0.6.1
         version: 0.6.1
@@ -3503,14 +3500,6 @@ packages:
   '@sentry/release-parser@1.3.1':
     resolution: {integrity: sha512-/dGpCq+j3sJhqQ14RNEEL45Ot/rgq3jAlZDD/8ufeqq+W8p4gUhSrbGWCRL82NEIWY9SYwxYXGXjRcVPSHiA1Q==}
 
-  '@sentry/sqlish@1.0.1':
-    resolution: {integrity: sha512-8Ioewv2Qo4Y18T/O8M9FdoUD70VFUs+gu3XKsXQmEqFbgLl1fVkInmk1IL98fJzNADGCyRXsHGptsISPVW8OsA==}
-    peerDependencies:
-      react: '>=17'
-    peerDependenciesMeta:
-      react:
-        optional: true
-
   '@sentry/status-page-list@0.6.1':
     resolution: {integrity: sha512-MCDLIEvzFKeDae1rSEU30O8QpcWqSECvDQaViW3eeGGLzxhr9rEI7rdKuHmouWT9hXCmYEK1W1DWKE534+Vv1g==}
     engines: {node: '>=14'}
@@ -13266,10 +13255,6 @@ snapshots:
 
   '@sentry/release-parser@1.3.1': {}
 
-  '@sentry/sqlish@1.0.1(react@19.2.3)':
-    optionalDependencies:
-      react: 19.2.3
-
   '@sentry/status-page-list@0.6.1': {}
 
   '@sentry/toolbar@1.0.0-beta.16(react@19.2.3)':
diff --git a/scripts/analyze-styled.ts b/scripts/analyze-styled.ts
index 2dafee92cbbf..54b30c56c5b7 100644
--- a/scripts/analyze-styled.ts
+++ b/scripts/analyze-styled.ts
@@ -422,7 +422,7 @@ if (!config.startDate) {
     if (config.targetFile) {
       logger.fatal(`❌ File not found: ${config.targetFile}`);
     } else {
-      logger.fatal('❌ No .tsx files found in search directory');
+      logger.fatal(`❌ No .tsx files found in search directory`);
     }
     process.exit(1);
   }
diff --git a/scripts/build-js-loader.ts b/scripts/build-js-loader.ts
index a64776b652fc..c8805d7f7807 100644
--- a/scripts/build-js-loader.ts
+++ b/scripts/build-js-loader.ts
@@ -17,7 +17,7 @@ import * as ts from 'typescript';
  * then verify the build output of both generated `js.tmpl` files and check all three files in.
  */
 
-const header = '{% load sentry_helpers %}';
+const header = `{% load sentry_helpers %}`;
 const loaderScriptPath = './src/sentry/templates/sentry/js-sdk-loader.ts';
 const loaderTmplPath = './src/sentry/templates/sentry/js-sdk-loader.js.tmpl';
 const loaderMinTmplPath = './src/sentry/templates/sentry/js-sdk-loader.min.js.tmpl';
diff --git a/scripts/routes.ts b/scripts/routes.ts
index 7ed56c4a0bae..5cb174a233b1 100644
--- a/scripts/routes.ts
+++ b/scripts/routes.ts
@@ -148,7 +148,7 @@ const useDefaults = (values.defaults as boolean) ?? false;
 if (!showAll && Object.keys(userParams).length === 0 && !useDefaults) {
   const bin = path.basename(process.argv[1] ?? '');
   console.error(`Usage: node ${bin} [OPTIONS] --<param> <value> [...]`);
-  console.error('Run with --help for full usage.');
+  console.error(`Run with --help for full usage.`);
   process.exit(1);
 }
 
diff --git a/scripts/type-coverage-diff.ts b/scripts/type-coverage-diff.ts
index 4d67ad2bc719..1734df6a932f 100644
--- a/scripts/type-coverage-diff.ts
+++ b/scripts/type-coverage-diff.ts
@@ -529,7 +529,7 @@ async function main() {
 
     console.log(
       colors.dim(
-        '\n📝 Note: Only showing type issues on lines that were literally added (+) or removed (-) in git diff'
+        `\n📝 Note: Only showing type issues on lines that were literally added (+) or removed (-) in git diff`
       )
     );
 
diff --git a/src/sentry/analytics/events/__init__.py b/src/sentry/analytics/events/__init__.py
index 52be4e1b0c1e..b3d4d362bce5 100644
--- a/src/sentry/analytics/events/__init__.py
+++ b/src/sentry/analytics/events/__init__.py
@@ -8,7 +8,6 @@
 from .api_token_deleted import *  # noqa: F401,F403
 from .auth_v2 import *  # noqa: F401,F403
 from .autofix_automation_events import *  # noqa: F401,F403
-from .autofix_events import *  # noqa: F401,F403
 from .checkin_processing_error_stored import *  # noqa: F401,F403
 from .codeowners_assignment import *  # noqa: F401,F403
 from .codeowners_created import *  # noqa: F401,F403
diff --git a/src/sentry/analytics/events/autofix_events.py b/src/sentry/analytics/events/autofix_events.py
deleted file mode 100644
index 09e52c9acc53..000000000000
--- a/src/sentry/analytics/events/autofix_events.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from sentry import analytics
-
-
-@analytics.eventclass()
-class AiAutofixPhaseEvent(analytics.Event):
-    organization_id: int
-    project_id: int
-    group_id: int
-    referrer: str | None
-
-
-@analytics.eventclass("ai.autofix.root_cause.started")
-class AiAutofixRootCauseStartedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.solution.started")
-class AiAutofixSolutionStartedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.code_changes.started")
-class AiAutofixCodeChangesStartedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.root_cause.completed")
-class AiAutofixRootCauseCompletedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.solution.completed")
-class AiAutofixSolutionCompletedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.code_changes.completed")
-class AiAutofixCodeChangesCompletedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.impact_assessment.started")
-class AiAutofixImpactAssessmentStartedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.impact_assessment.completed")
-class AiAutofixImpactAssessmentCompletedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.triage.started")
-class AiAutofixTriageStartedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.triage.completed")
-class AiAutofixTriageCompletedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.pr_created.started")
-class AiAutofixPrCreatedStartedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.pr_created.completed")
-class AiAutofixPrCreatedCompletedEvent(AiAutofixPhaseEvent):
-    pass
-
-
-@analytics.eventclass("ai.autofix.agent_handoff")
-class AiAutofixAgentHandoffEvent(AiAutofixPhaseEvent):
-    pass
-
-
-analytics.register(AiAutofixRootCauseStartedEvent)
-analytics.register(AiAutofixSolutionStartedEvent)
-analytics.register(AiAutofixCodeChangesStartedEvent)
-analytics.register(AiAutofixRootCauseCompletedEvent)
-analytics.register(AiAutofixSolutionCompletedEvent)
-analytics.register(AiAutofixCodeChangesCompletedEvent)
-analytics.register(AiAutofixImpactAssessmentStartedEvent)
-analytics.register(AiAutofixImpactAssessmentCompletedEvent)
-analytics.register(AiAutofixTriageStartedEvent)
-analytics.register(AiAutofixTriageCompletedEvent)
-analytics.register(AiAutofixPrCreatedStartedEvent)
-analytics.register(AiAutofixPrCreatedCompletedEvent)
-analytics.register(AiAutofixAgentHandoffEvent)
diff --git a/src/sentry/api/base.py b/src/sentry/api/base.py
index 5d1069ce0749..0fdaf25536f3 100644
--- a/src/sentry/api/base.py
+++ b/src/sentry/api/base.py
@@ -75,7 +75,6 @@
     "all_silo_endpoint",
     "internal_cell_silo_endpoint",
     "internal_all_silo_endpoint",
-    "internal_control_silo_endpoint",
 ]
 
 PAGINATION_DEFAULT_PER_PAGE = 100
@@ -724,12 +723,6 @@ def __call__(self, decorated_obj: Any) -> Any:
 mode 404s will be returned.
 """
 
-internal_control_silo_endpoint = EndpointSiloLimit(SiloMode.CONTROL, internal=True)
-"""
-Apply to endpoints that exist in CONTROL silo that
-should not be included in the frontend URL mapping
-"""
-
 cell_silo_endpoint = EndpointSiloLimit(SiloMode.CELL)
 """
 Apply to endpoints that exist in CELL silo.
diff --git a/src/sentry/api/bases/organization_events.py b/src/sentry/api/bases/organization_events.py
index 355501cdff00..291dfa07692f 100644
--- a/src/sentry/api/bases/organization_events.py
+++ b/src/sentry/api/bases/organization_events.py
@@ -29,7 +29,7 @@
 from sentry.api.helpers.teams import get_teams
 from sentry.api.serializers.snuba import SnubaTSResultSerializer
 from sentry.api.utils import handle_query_errors
-from sentry.discover.arithmetic import is_equation, parse_arithmetic, strip_equation
+from sentry.discover.arithmetic import is_equation, strip_equation
 from sentry.discover.models import (
     DatasetSourcesTypes,
     DiscoverSavedQuery,
@@ -52,7 +52,7 @@
 from sentry.search.eap.occurrences.rollout_utils import EAPOccurrencesComparator
 from sentry.search.eap.types import AdditionalQueries, SupportedTraceItemType
 from sentry.search.events.constants import DURATION_UNITS, SIZE_UNITS
-from sentry.search.events.fields import get_function_alias, is_function
+from sentry.search.events.fields import get_function_alias
 from sentry.search.events.types import SAMPLING_MODES, SnubaParams
 from sentry.snuba import discover
 from sentry.snuba.dataset import Dataset
@@ -346,25 +346,22 @@ def handle_unit_meta(
 
     def _get_rate_unit(self, field: str) -> str | None:
         """Get the rate unit for a field by checking for known rate functions."""
-        per_second_fns = {"eps", "sps", "tps", "sample_eps", "per_second", "per_second_if"}
-        per_minute_fns = {"epm", "spm", "tpm", "sample_epm", "per_minute", "per_minute_if"}
-
+        # Only use the opening parenthesis to identify rate functions because
+        # some functions may contain arguments, making a direct string match not work.
+        per_second_fns = {"eps(", "sps(", "tps(", "sample_eps(", "per_second("}
+        per_minute_fns = {"epm(", "spm(", "tpm(", "sample_epm(", "per_minute("}
+
+        if any(field.startswith(fn) for fn in per_second_fns):
+            return "1/second"
+        if any(field.startswith(fn) for fn in per_minute_fns):
+            return "1/minute"
         # For equation fields, check if any known rate function appears in the expression
-        if is_equation(field):
-            _, _, functions = parse_arithmetic(strip_equation(field))
-            for function in functions:
-                if function_match := is_function(function):
-                    function_name = function_match.group("function")
-                    if function_name in per_second_fns:
-                        return "1/second"
-                    elif function_name in per_minute_fns:
-                        return "1/minute"
-        else:
-            if function_match := is_function(field):
-                function_name = function_match.group("function")
-                if function_name in per_second_fns:
+        if field.startswith("equation|"):
+            for fn in per_second_fns:
+                if fn in field:
                     return "1/second"
-                if function_name in per_minute_fns:
+            for fn in per_minute_fns:
+                if fn in field:
                     return "1/minute"
         return None
 
diff --git a/src/sentry/api/endpoints/internal/rpc.py b/src/sentry/api/endpoints/internal/rpc.py
index aadac806d60d..14040dbf7a36 100644
--- a/src/sentry/api/endpoints/internal/rpc.py
+++ b/src/sentry/api/endpoints/internal/rpc.py
@@ -17,7 +17,6 @@
 )
 from sentry.hybridcloud.rpc.sig import SerializableFunctionValueException
 from sentry.utils.env import in_test_environment
-from sentry.viewer_context import ViewerContext, viewer_context_scope
 
 
 @internal_all_silo_endpoint
@@ -62,18 +61,8 @@ def post(self, request: Request, service_name: str, method_name: str) -> Respons
                 sentry_sdk.capture_exception()
                 raise ParseError from e
 
-        meta = request.data.get("meta") or {}
-        vc_data = meta.get("viewer_context")
-        vc = ViewerContext()
-        if vc_data:
-            try:
-                vc = ViewerContext.deserialize(vc_data)
-            except Exception as e:
-                sentry_sdk.capture_exception()
-                raise ParseError from e
-
         try:
-            with viewer_context_scope(vc), auth_context.applied_to_request(request):
+            with auth_context.applied_to_request(request):
                 result = dispatch_to_local_service(service_name, method_name, arguments)
         except RpcValidationException as e:
             return Response(
diff --git a/src/sentry/api/endpoints/organization_ai_conversation_details.py b/src/sentry/api/endpoints/organization_ai_conversation_details.py
index 5d1fc3ca5816..d36e96b5be78 100644
--- a/src/sentry/api/endpoints/organization_ai_conversation_details.py
+++ b/src/sentry/api/endpoints/organization_ai_conversation_details.py
@@ -12,7 +12,6 @@
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
-from sentry.search.eap.occurrences.query_utils import build_escaped_term_filter
 from sentry.search.eap.types import SearchResolverConfig
 from sentry.snuba.referrer import Referrer
 from sentry.snuba.spans_rpc import Spans
@@ -126,7 +125,7 @@ def _fetch_conversation_spans(
     ):
         result = Spans.run_table_query(
             params=snuba_params,
-            query_string=build_escaped_term_filter("gen_ai.conversation.id", [conversation_id]),
+            query_string=f"gen_ai.conversation.id:{conversation_id}",
             selected_columns=selected_columns,
             orderby=["precise.start_ts"],
             offset=offset,
diff --git a/src/sentry/api/endpoints/organization_ai_conversations.py b/src/sentry/api/endpoints/organization_ai_conversations.py
index 59ca71c75d86..d3a48688f8c2 100644
--- a/src/sentry/api/endpoints/organization_ai_conversations.py
+++ b/src/sentry/api/endpoints/organization_ai_conversations.py
@@ -17,7 +17,6 @@
 from sentry.api.serializers.rest_framework import OrganizationAIConversationsSerializer
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
-from sentry.search.eap.occurrences.query_utils import build_escaped_term_filter
 from sentry.search.eap.resolver import SearchResolver
 from sentry.search.eap.types import EAPResponse, SearchResolverConfig
 from sentry.search.events.constants import NON_FAILURE_STATUS
@@ -342,7 +341,7 @@ def _build_aggregations_query(
     ) -> TableQuery:
         return TableQuery(
             name="aggregations",
-            query_string=build_escaped_term_filter("gen_ai.conversation.id", conversation_ids),
+            query_string=f"gen_ai.conversation.id:[{','.join(conversation_ids)}]",
             selected_columns=[
                 "gen_ai.conversation.id",
                 "failure_count()",
@@ -366,7 +365,7 @@ def _build_enrichment_query(
     ) -> TableQuery:
         return TableQuery(
             name="enrichment",
-            query_string=f"{build_escaped_term_filter('gen_ai.conversation.id', conversation_ids)} has:gen_ai.operation.type",
+            query_string=f"gen_ai.conversation.id:[{','.join(conversation_ids)}] has:gen_ai.operation.type",
             selected_columns=[
                 "gen_ai.conversation.id",
                 "gen_ai.operation.type",
@@ -393,7 +392,7 @@ def _build_first_last_io_query(
     ) -> TableQuery:
         return TableQuery(
             name="first_last_io",
-            query_string=f"{build_escaped_term_filter('gen_ai.conversation.id', conversation_ids)} gen_ai.operation.type:ai_client",
+            query_string=f"gen_ai.conversation.id:[{','.join(conversation_ids)}] gen_ai.operation.type:ai_client",
             selected_columns=[
                 "gen_ai.conversation.id",
                 "gen_ai.input.messages",
diff --git a/src/sentry/api/endpoints/organization_insights_tree.py b/src/sentry/api/endpoints/organization_insights_tree.py
index a0dbf053fbd7..f089e7cb8533 100644
--- a/src/sentry/api/endpoints/organization_insights_tree.py
+++ b/src/sentry/api/endpoints/organization_insights_tree.py
@@ -1,6 +1,5 @@
 import logging
 import re
-from typing import NamedTuple
 
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -13,33 +12,6 @@
 logger = logging.getLogger(__name__)
 
 
-class _ExtractionPattern(NamedTuple):
-    """Extraction pattern for component type and path from span.description.
-    group(1) = kind/type (mapped through kind_map when present), group(2) = path.
-    """
-
-    regex: re.Pattern[str]
-    kind_map: dict[str, str] | None = None
-
-
-# SDK <10.32.0: '{component_type} ({path})'
-# e.g. 'Page Server Component (/dashboard)'
-_ParenthesisPattern = _ExtractionPattern(
-    regex=re.compile(r"^(.*?)\s+\((.*?)\)$"),
-)
-
-# SDK >=10.32.0: 'resolve {page|root layout|layout} server component "{route_or_segment}"'
-# e.g. 'resolve page server component "/dashboard"'
-_ResolvePattern = _ExtractionPattern(
-    regex=re.compile(r'^resolve (page|root layout|layout) server component(?:\s+"(.*)")?$'),
-    kind_map={
-        "page": "Page Server Component",
-        "layout": "Layout Server Component",
-        "root layout": "Layout Server Component",
-    },
-)
-
-
 @cell_silo_endpoint
 class OrganizationInsightsTreeEndpoint(OrganizationEventsEndpoint):
     """
@@ -69,27 +41,22 @@ def get(self, request: Request, organization: Organization) -> Response:
         response = super().get(request, organization)
         return self._separate_span_description_info(response)
 
-    _EXTRACTION_PATTERNS = (_ParenthesisPattern, _ResolvePattern)
-
-    @staticmethod
-    def _parse_path(path: str | None) -> list[str]:
-        if not path:
-            return []
-        parts = path.strip("/").split("/")
-        return parts if parts != [""] else []
-
     def _separate_span_description_info(self, response):
-        for line in response.data["data"]:
-            component_type = None
-            path_components: list[str] = []
-
-            for pattern, kind_map in self._EXTRACTION_PATTERNS:
-                match = pattern.match(line["span.description"])
-                if match:
-                    component_type = kind_map[match.group(1)] if kind_map else match.group(1)
-                    path_components = self._parse_path(match.group(2))
-                    break
+        # Regex to split string into '{component_type}{space}({path})'
+        pattern = re.compile(r"^(.*?)\s+\((.*?)\)$")
 
+        for line in response.data["data"]:
+            match = pattern.match(line["span.description"])
+            if match:
+                component_type = match.group(1)
+                path = match.group(2)
+                path_components = path.strip("/").split("/")
+                if not path_components or (len(path_components) == 1 and path_components[0] == ""):
+                    path_components = []  # Handle root path case
+
+            else:
+                component_type = None
+                path_components = []
             line["function.nextjs.component_type"] = component_type
             line["function.nextjs.path"] = path_components
 
diff --git a/src/sentry/api/serializers/models/groupsearchview.py b/src/sentry/api/serializers/models/groupsearchview.py
index 1035985595b4..a8f3f88f0868 100644
--- a/src/sentry/api/serializers/models/groupsearchview.py
+++ b/src/sentry/api/serializers/models/groupsearchview.py
@@ -1,8 +1,6 @@
 from collections.abc import MutableMapping
 from typing import Any, TypedDict
 
-from django.db.models import prefetch_related_objects
-
 from sentry.api.serializers import Serializer, register
 from sentry.models.groupsearchview import GroupSearchView
 from sentry.models.groupsearchviewlastvisited import GroupSearchViewLastVisited
@@ -35,7 +33,6 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def get_attrs(self, item_list, user, **kwargs) -> MutableMapping[Any, Any]:
-        prefetch_related_objects(item_list, "projects")
         attrs: MutableMapping[Any, Any] = {}
 
         last_visited_views = GroupSearchViewLastVisited.objects.filter(
@@ -71,7 +68,7 @@ def get_attrs(self, item_list, user, **kwargs) -> MutableMapping[Any, Any]:
         return attrs
 
     def serialize(self, obj, attrs, user, **kwargs) -> GroupSearchViewSerializerResponse:
-        projects = [-1] if obj.is_all_projects else [p.id for p in obj.projects.all()]
+        projects = [-1] if obj.is_all_projects else list(obj.projects.values_list("id", flat=True))
 
         return {
             "id": str(obj.id),
diff --git a/src/sentry/api/serializers/models/groupsearchviewstarred.py b/src/sentry/api/serializers/models/groupsearchviewstarred.py
index 361ba0eab860..2335a063b8f0 100644
--- a/src/sentry/api/serializers/models/groupsearchviewstarred.py
+++ b/src/sentry/api/serializers/models/groupsearchviewstarred.py
@@ -3,6 +3,7 @@
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.api.serializers.models.groupsearchview import (
     GroupSearchViewSerializer,
+    GroupSearchViewSerializerResponse,
 )
 from sentry.models.groupsearchviewstarred import GroupSearchViewStarred
 from sentry.models.savedsearch import SORT_LITERALS
@@ -27,14 +28,13 @@ def __init__(self, *args, **kwargs):
         self.organization = kwargs.pop("organization", None)
         super().__init__(*args, **kwargs)
 
-    def get_attrs(self, item_list, user, **kwargs):
-        views = [item.group_search_view for item in item_list]
-        serialized_views = serialize(
-            views,
+    def serialize(self, obj, attrs, user, **kwargs) -> GroupSearchViewStarredSerializerResponse:
+        serialized_view: GroupSearchViewSerializerResponse = serialize(
+            obj.group_search_view,
             user,
-            serializer=GroupSearchViewSerializer(organization=self.organization),
+            serializer=GroupSearchViewSerializer(
+                organization=self.organization,
+            ),
         )
-        return dict(zip(item_list, serialized_views))
 
-    def serialize(self, obj, attrs, user, **kwargs) -> GroupSearchViewStarredSerializerResponse:
-        return attrs
+        return serialized_view
diff --git a/src/sentry/api/serializers/models/team.py b/src/sentry/api/serializers/models/team.py
index 50125537f5f6..750394497ba4 100644
--- a/src/sentry/api/serializers/models/team.py
+++ b/src/sentry/api/serializers/models/team.py
@@ -249,9 +249,7 @@ def get_attrs(
 
         if self._expand("projects"):
             project_teams = ProjectTeam.objects.get_for_teams_with_org_cache(item_list)
-
-            # A project can be on multiple teams, dedupe before serializing
-            projects = list({pt.project_id: pt.project for pt in project_teams}.values())
+            projects = [pt.project for pt in project_teams]
 
             projects_by_id = {
                 project.id: data
diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
index 938539fc20af..fad013d5f153 100644
--- a/src/sentry/conf/server.py
+++ b/src/sentry/conf/server.py
@@ -990,8 +990,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "sentry.workflow_engine.tasks.cleanup",
     "sentry.tasks.seer.explorer_index",
     "sentry.tasks.seer.context_engine_index",
-    "sentry.tasks.seer.lightweight_rca_cluster",
-    "sentry.tasks.seer.night_shift",
     # Used for tests
     "sentry.taskworker.tasks.examples",
 )
@@ -1174,11 +1172,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
         # Run once a month at midnight
         "schedule": crontab("0", "0", "*", "1", "*"),
     },
-    "seer-night-shift": {
-        "task": "seer:sentry.tasks.seer.night_shift.schedule_night_shift",
-        # Run daily at 10:00 AM UTC (2/3 AM Pacific)
-        "schedule": crontab("0", "10", "*", "*", "*"),
-    },
     "refresh-artifact-bundles-in-use": {
         "task": "attachments:sentry.debug_files.tasks.refresh_artifact_bundles_in_use",
         "schedule": crontab("*/1", "*", "*", "*", "*"),
diff --git a/src/sentry/dashboards/models/generate_dashboard_artifact.py b/src/sentry/dashboards/models/generate_dashboard_artifact.py
index 76f8dd4cd3b9..3f54da0d96e7 100644
--- a/src/sentry/dashboards/models/generate_dashboard_artifact.py
+++ b/src/sentry/dashboards/models/generate_dashboard_artifact.py
@@ -1,39 +1,33 @@
 from __future__ import annotations
 
-from typing import Any, Literal, TypeAlias
+from typing import Any, Literal
 
-from pydantic import BaseModel, Field, root_validator, validator
+from pydantic import BaseModel, Field, validator
 
 from sentry.models.dashboard import Dashboard
-from sentry.models.dashboard_widget import DashboardWidgetDisplayTypes, DashboardWidgetTypes
 
 GRID_WIDTH = 6
 
-DISPLAY_TYPE_BLOCKLIST: set[str] = {
-    "details",
-    "server_tree",
-    "rage_and_dead_clicks",
-    "wheel",
-    "agents_traces_table",
-}
-
-# Most of these are deprecated, not selectable in the UI, or don't make sense for generated dashboards.
-WIDGET_TYPE_BLOCKLIST: set[str] = {
-    "discover",
-    "metrics",
-    "transaction-like",
-    "preprod-app-size",
-}
-
-_ALLOWED_DISPLAY_TYPES = tuple(
-    t for t in DashboardWidgetDisplayTypes.TYPE_NAMES if t not in DISPLAY_TYPE_BLOCKLIST
-)
-_ALLOWED_WIDGET_TYPES = tuple(
-    t for t in DashboardWidgetTypes.TYPE_NAMES if t not in WIDGET_TYPE_BLOCKLIST
-)
-
-DisplayType: TypeAlias = Literal[tuple(_ALLOWED_DISPLAY_TYPES)]  # type: ignore[valid-type]
-WidgetType: TypeAlias = Literal[tuple(_ALLOWED_WIDGET_TYPES)]  # type: ignore[valid-type]
+# Hardcode maintained lists for now, not all display types are well suited for dashboard generation.
+DisplayType = Literal[
+    "line",
+    "area",
+    "stacked_area",
+    "bar",
+    "table",
+    "big_number",
+    "top_n",
+    "categorical_bar",
+]
+
+# Hardcode maintained lists for now, not all widget types are well suited for dashboard generation.
+WidgetType = Literal[
+    "issue",
+    "error-events",
+    "spans",
+    "logs",
+    "tracemetrics",
+]
 
 Intervals = Literal["5m", "15m", "30m", "1h", "4h", "12h", "24h"]
 
@@ -95,9 +89,7 @@ class GeneratedWidgetLayout(BaseModel):
         le=GRID_WIDTH,
     )
     h: int = Field(
-        default=2,
-        description="Height in rows (1+). A height of 2 is approximately 256px. For non big_number widgets, this should be at least 2.",
-        ge=1,
+        default=2, description="Height in rows (1+). A height of 2 is approximately 256px.", ge=1
     )
     min_h: int = Field(default=2, description="Minimum height in rows (1+).")
 
@@ -130,13 +122,12 @@ class GeneratedWidget(BaseModel):
 
     title: str = Field(..., max_length=255)  # Matches serializer
     description: str = Field(
-        ...,
-        description="A short description of the widget. This is displayed in the dashboard UI as a hoverable tooltip. For text widget types, this is the markdown text content displayed to the user. Should not exceed 255 characters for non-text widgets.",
-    )
+        ..., max_length=255
+    )  # Length matches serializer, required field for generation
     display_type: DisplayType
-    widget_type: WidgetType | None = Field(
+    widget_type: WidgetType = Field(
         ...,
-        description="Dataset to query. Use 'spans' as the default — it covers most use cases. Use 'error-events' for error-specific data, 'issue' for issue tracking, 'logs' for log data, 'tracemetrics' for trace metrics. Text widgets do not have a widget_type and should be set to None. Required for non-text widgets.",
+        description="Dataset to query. Use 'spans' as the default — it covers most use cases. Use 'error-events' for error-specific data, 'issue' for issue tracking, 'logs' for log data, 'tracemetrics' for trace metrics.",
     )
     queries: list[GeneratedWidgetQuery]
     layout: GeneratedWidgetLayout
@@ -148,37 +139,9 @@ class GeneratedWidget(BaseModel):
     )
     interval: Intervals = Field(default="1h")
 
-    @root_validator
-    def check_text_widget_constraints(cls, values: dict[str, Any]) -> dict[str, Any]:
-        display_type = values.get("display_type")
-        is_text = display_type == "text"
-
-        description = values.get("description", "")
-        if not is_text and len(description) > 255:
-            raise ValueError(
-                f"Description must not exceed 255 characters for non-text widgets (got {len(description)})"
-            )
-
-        widget_type = values.get("widget_type")
-        if not is_text and widget_type is None:
-            raise ValueError("widget_type is required for non-text widgets")
-
-        if is_text and widget_type is not None:
-            raise ValueError("widget_type is not allowed for text widgets")
-
-        return values
-
 
 class GeneratedDashboard(BaseModel):
     """A complete dashboard definition on a 6-column grid. Widget widths per row must sum to 6. This is the sole output artifact."""
 
     title: str = Field(..., max_length=255)  # Matches serializer
-    projects: list[int] = Field(
-        default=[],
-        description='Project ids to scope the dashboard to. Empty list means "My Projects".',
-    )
-    environment: list[str] = Field(
-        default=[],
-        description="Environment names to filter by (e.g. ['production', 'staging']). Empty list means all environments.",
-    )
     widgets: list[GeneratedWidget] = Field(..., max_items=Dashboard.MAX_WIDGETS)
diff --git a/src/sentry/dashboards/on_completion_hook.py b/src/sentry/dashboards/on_completion_hook.py
index 9e4142945b85..a148cdf86447 100644
--- a/src/sentry/dashboards/on_completion_hook.py
+++ b/src/sentry/dashboards/on_completion_hook.py
@@ -37,15 +37,8 @@ def _validate_with_serializer(
 
     if project is None:
         return None
-    # Strip fields that require request-scoped context (project permissions,
-    # environment access) which we don't have in the completion hook.
-    # The serializer validation here targets widget-level correctness.
-    artifact_data = artifact.dict()
-    artifact_data.pop("projects", None)
-    artifact_data.pop("environment", None)
-
     serializer = DashboardSerializer(
-        data=artifact_data,
+        data=artifact.dict(),
         context={
             "organization": organization,
             "request": SimpleNamespace(user=None),  # mock request to satisfy serializer
diff --git a/src/sentry/deletions/defaults/detector.py b/src/sentry/deletions/defaults/detector.py
index 305f117f53fa..359100a8dd56 100644
--- a/src/sentry/deletions/defaults/detector.py
+++ b/src/sentry/deletions/defaults/detector.py
@@ -10,29 +10,10 @@ class DetectorDeletionTask(ModelDeletionTask[Detector]):
     manager_name = "objects_for_deletion"
 
     def get_child_relations(self, instance: Detector) -> list[BaseRelation]:
-        from sentry.incidents.models.alert_rule import AlertRule
-        from sentry.workflow_engine.models import (
-            AlertRuleDetector,
-            DataConditionGroup,
-            DataSource,
-        )
+        from sentry.workflow_engine.models import DataConditionGroup, DataSource
 
         model_relations: list[BaseRelation] = []
 
-        # If this detector was dual-written from an AlertRule, cascade deletion
-        # to the AlertRule. AlertRuleDeletionTask will handle cleaning up
-        # AlertRuleDetector, AlertRuleWorkflow, triggers, and incidents.
-        # NOTE: AlertRule must be deleted before DataSource so that
-        # QuerySubscriptionDeletionTask sees no remaining AlertRule referencing
-        # the SnubaQuery and can safely delete it.
-        alert_rule_ids = list(
-            AlertRuleDetector.objects.filter(detector_id=instance.id).values_list(
-                "alert_rule_id", flat=True
-            )
-        )
-        if alert_rule_ids:
-            model_relations.append(ModelRelation(AlertRule, {"id__in": alert_rule_ids}))
-
         # check that no other rows are related to the data source
         data_source_ids = DataSource.objects.filter(detector=instance.id).values_list(
             "id", flat=True
@@ -45,9 +26,9 @@ def get_child_relations(self, instance: Detector) -> list[BaseRelation]:
             ):
                 model_relations.append(ModelRelation(DataSource, {"detector": instance.id}))
 
-        if instance.workflow_condition_group_id:
+        if instance.workflow_condition_group:
             model_relations.append(
-                ModelRelation(DataConditionGroup, {"id": instance.workflow_condition_group_id})
+                ModelRelation(DataConditionGroup, {"id": instance.workflow_condition_group.id})
             )
 
         return model_relations
diff --git a/src/sentry/deletions/defaults/workflow.py b/src/sentry/deletions/defaults/workflow.py
index 57244fd59ff0..8f0b43555145 100644
--- a/src/sentry/deletions/defaults/workflow.py
+++ b/src/sentry/deletions/defaults/workflow.py
@@ -21,9 +21,9 @@ def get_child_relations(self, instance: Workflow) -> list[BaseRelation]:
 
             model_relations.append(ModelRelation(DataConditionGroup, {"id__in": action_filter_ids}))
 
-        if instance.when_condition_group_id:
+        if instance.when_condition_group:
             model_relations.append(
-                ModelRelation(DataConditionGroup, {"id": instance.when_condition_group_id})
+                ModelRelation(DataConditionGroup, {"id": instance.when_condition_group.id})
             )
 
         return model_relations
diff --git a/src/sentry/event_manager.py b/src/sentry/event_manager.py
index 07576521edb3..e5800f7556f5 100644
--- a/src/sentry/event_manager.py
+++ b/src/sentry/event_manager.py
@@ -2006,7 +2006,7 @@ def _get_severity_metadata_for_group(
 
     Returns {} if conditions aren't met or on exception.
     """
-    from sentry.workflow_engine.receivers.project_workflows import PLATFORMS_WITH_PRIORITY_ALERTS
+    from sentry.receivers.rules import PLATFORMS_WITH_PRIORITY_ALERTS
 
     if killswitch_matches_context(
         "issues.severity.skip-seer-requests", {"project_id": event.project_id}
diff --git a/src/sentry/features/temporary.py b/src/sentry/features/temporary.py
index f48a566b091f..25d5dd4152b3 100644
--- a/src/sentry/features/temporary.py
+++ b/src/sentry/features/temporary.py
@@ -92,8 +92,6 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:dashboards-text-widgets", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable AI-powered dashboard generation via Seer
     manager.add("organizations:dashboards-ai-generate", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable AI-powered dashboard editing via Seer
-    manager.add("organizations:dashboards-ai-generate-edit", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Data Secrecy
     manager.add("organizations:data-secrecy", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Data Secrecy v2 (with Break the Glass feature)
@@ -300,8 +298,6 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:seer-explorer", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable Seer Explorer Index job
     manager.add("organizations:seer-explorer-index", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable Seer Night Shift nightly autofix cron
-    manager.add("organizations:seer-night-shift", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable streaming responses for Seer Explorer
     manager.add("organizations:seer-explorer-streaming", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable context engine for Seer Explorer
@@ -330,6 +326,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:autofix-on-explorer-v2", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable Seer Workflows in Slack
     manager.add("organizations:seer-slack-workflows", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable new compact issue alert UI in Slack
+    manager.add("organizations:slack-compact-alerts", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable Seer Explorer in Slack via @mentions
     manager.add("organizations:seer-slack-explorer", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable search query attribute validation
@@ -462,17 +460,11 @@ def register_temporary_features(manager: FeatureManager) -> None:
     # Use workflow engine exclusively for legacy issue alert rule.get results.
     # See src/sentry/workflow_engine/docs/legacy_backport.md for context.
     manager.add("organizations:workflow-engine-issue-alert-endpoints-get", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
-    # Use workflow engine exclusively for OrganizationIncidentIndexEndpoint.get results.
-    # See src/sentry/workflow_engine/docs/legacy_backport.md for context.
-    manager.add("organizations:workflow-engine-orgincidentindex-get", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Use workflow engine exclusively for OrganizationAlertRuleDetailsEndpoint.get results.
     # See src/sentry/workflow_engine/docs/legacy_backport.md for context.
     manager.add("organizations:workflow-engine-orgalertruledetails-get", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable metric detector limits by plan type
     manager.add("organizations:workflow-engine-metric-detector-limit", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Use workflow engine exclusively for OrganizationAlertRuleIndexEndpoint.get results.
-    # See src/sentry/workflow_engine/docs/legacy_backport.md for context.
-    manager.add("organizations:workflow-engine-orgalertruleindex-get", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable EventUniqueUserFrequencyConditionWithConditions special alert condition
     manager.add("organizations:event-unique-user-frequency-condition-with-conditions", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable our logs product (known internally as ourlogs) in UI and backend
diff --git a/src/sentry/hybridcloud/rpc/service.py b/src/sentry/hybridcloud/rpc/service.py
index 34070c61d1c6..5a4bb2058ce3 100644
--- a/src/sentry/hybridcloud/rpc/service.py
+++ b/src/sentry/hybridcloud/rpc/service.py
@@ -35,7 +35,6 @@
 from sentry.types.cell import Cell, CellMappingNotFound
 from sentry.utils import json, metrics
 from sentry.utils.env import in_test_environment
-from sentry.viewer_context import get_viewer_context
 
 if TYPE_CHECKING:
     from sentry.hybridcloud.rpc.resolvers import CellResolutionStrategy
@@ -572,13 +571,8 @@ def get_method_timeout(self) -> float:
         return settings.RPC_TIMEOUT
 
     def _send_to_remote_silo(self, use_test_client: bool) -> Any:
-        vc = get_viewer_context()
-        meta: dict[str, Any] = {}
-        if vc is not None:
-            meta["viewer_context"] = vc.serialize()
-
         request_body = {
-            "meta": meta,
+            "meta": {},  # reserved for future use
             "args": self.serial_arguments,
         }
         data = json.dumps(request_body).encode(_RPC_CONTENT_CHARSET)
diff --git a/src/sentry/identity/oauth2.py b/src/sentry/identity/oauth2.py
index a6b29b09c93d..03f59c1c0a41 100644
--- a/src/sentry/identity/oauth2.py
+++ b/src/sentry/identity/oauth2.py
@@ -147,24 +147,22 @@ def get_pipeline_views(self) -> list[PipelineView[IdentityPipeline]]:
             ),
         ]
 
-    def make_oauth_api_step(self, **kwargs: Any) -> OAuth2ApiStep:
+    def get_pipeline_api_steps(self) -> list[OAuth2ApiStep]:
         redirect_url = self.config.get(
             "redirect_url",
             reverse("sentry-extension-setup", kwargs={"provider_id": "default"}),
         )
-        return OAuth2ApiStep(
-            authorize_url=self.get_oauth_authorize_url(),
-            client_id=self.get_oauth_client_id(),
-            client_secret=self.get_oauth_client_secret(),
-            access_token_url=self.get_oauth_access_token_url(),
-            scope=" ".join(self.get_oauth_scopes()),
-            redirect_url=redirect_url,
-            verify_ssl=self.config.get("verify_ssl", True),
-            **kwargs,
-        )
-
-    def get_pipeline_api_steps(self) -> list[OAuth2ApiStep]:
-        return [self.make_oauth_api_step()]
+        return [
+            OAuth2ApiStep(
+                authorize_url=self.get_oauth_authorize_url(),
+                client_id=self.get_oauth_client_id(),
+                client_secret=self.get_oauth_client_secret(),
+                access_token_url=self.get_oauth_access_token_url(),
+                scope=" ".join(self.get_oauth_scopes()),
+                redirect_url=redirect_url,
+                verify_ssl=self.config.get("verify_ssl", True),
+            ),
+        ]
 
     def get_refresh_token_params(
         self, refresh_token: str, identity: Identity | RpcIdentity, **kwargs: Any
diff --git a/src/sentry/incidents/endpoints/organization_alert_rule_index.py b/src/sentry/incidents/endpoints/organization_alert_rule_index.py
index ca4b2ba50b8f..ca0662b1ed06 100644
--- a/src/sentry/incidents/endpoints/organization_alert_rule_index.py
+++ b/src/sentry/incidents/endpoints/organization_alert_rule_index.py
@@ -235,10 +235,6 @@ class AlertRuleFetchMixin(Endpoint):
     Can be used with any endpoint base class (OrganizationEndpoint, ProjectEndpoint, etc).
     """
 
-    # Subclasses may set a per-method granular flag (e.g. for GET) that is OR'd
-    # with the broad workflow-engine-rule-serializers flag.
-    workflow_engine_method_flags: dict[str, str] = {}
-
     def fetch_metric_alerts(
         self,
         request: Request,
@@ -256,11 +252,8 @@ def fetch_metric_alerts(
                 extra={"organization": organization.id},
             )
 
-        method_flag = self.workflow_engine_method_flags.get(request.method or "")
-        use_workflow_engine = (
-            features.has("organizations:workflow-engine-rule-serializers", organization)
-            or method_flag is not None
-            and features.has(method_flag, organization)
+        use_workflow_engine = features.has(
+            "organizations:workflow-engine-rule-serializers", organization
         )
 
         if use_workflow_engine:
@@ -915,9 +908,6 @@ class OrganizationAlertRuleIndexEndpoint(OrganizationAlertRuleBaseEndpoint, Aler
         "POST": ApiPublishStatus.PUBLIC,
     }
     permission_classes = (OrganizationAlertRulePermission,)
-    workflow_engine_method_flags = {
-        "GET": "organizations:workflow-engine-orgalertruleindex-get",
-    }
 
     @extend_schema(
         operation_id="(DEPRECATED) List an Organization's Metric Alert Rules",
diff --git a/src/sentry/incidents/endpoints/organization_incident_index.py b/src/sentry/incidents/endpoints/organization_incident_index.py
index 7eddb7f2d9ae..756adf3aa3e5 100644
--- a/src/sentry/incidents/endpoints/organization_incident_index.py
+++ b/src/sentry/incidents/endpoints/organization_incident_index.py
@@ -81,7 +81,7 @@ def get(self, request: Request, organization: Organization) -> Response:
 
         use_workflow_engine = features.has(
             "organizations:workflow-engine-rule-serializers", organization
-        ) or features.has("organizations:workflow-engine-orgincidentindex-get", organization)
+        )
 
         if use_workflow_engine:
             return self._get_workflow_engine(
diff --git a/src/sentry/incidents/serializers/alert_rule.py b/src/sentry/incidents/serializers/alert_rule.py
index 313510949d5a..38098ea15515 100644
--- a/src/sentry/incidents/serializers/alert_rule.py
+++ b/src/sentry/incidents/serializers/alert_rule.py
@@ -211,6 +211,13 @@ def validate(self, data):
             )
             self._validate_critical_warning_triggers(threshold_type, critical, warning)
 
+        if data.get("dataset") == Dataset.EventsAnalyticsPlatform:
+            time_window = data["time_window"]
+            if time_window < 5:
+                raise serializers.ValidationError(
+                    "Invalid Time Window: Time window for this alert type must be at least 5 minutes."
+                )
+
         return data
 
     def _translate_thresholds(self, threshold_type, comparison_delta, triggers, data):
diff --git a/src/sentry/integrations/api/endpoints/integration_proxy.py b/src/sentry/integrations/api/endpoints/integration_proxy.py
index 030f70d8f676..18a427d92b76 100644
--- a/src/sentry/integrations/api/endpoints/integration_proxy.py
+++ b/src/sentry/integrations/api/endpoints/integration_proxy.py
@@ -17,7 +17,7 @@
 
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import Endpoint, internal_control_silo_endpoint
+from sentry.api.base import Endpoint, control_silo_endpoint
 from sentry.auth.exceptions import IdentityNotValid
 from sentry.constants import ObjectStatus
 from sentry.integrations.models.organization_integration import OrganizationIntegration
@@ -72,7 +72,7 @@ class IntegrationProxyFailureMetricType(StrEnum):
     FAILED_VALIDATION = "failed_validation"
 
 
-@internal_control_silo_endpoint
+@control_silo_endpoint
 class InternalIntegrationProxyEndpoint(Endpoint):
     publish_status = defaultdict(lambda: ApiPublishStatus.PRIVATE)
     owner = ApiOwner.HYBRID_CLOUD
diff --git a/src/sentry/integrations/github/tasks/sync_repos.py b/src/sentry/integrations/github/tasks/sync_repos.py
index c008433b1308..06740e1c7a49 100644
--- a/src/sentry/integrations/github/tasks/sync_repos.py
+++ b/src/sentry/integrations/github/tasks/sync_repos.py
@@ -246,7 +246,7 @@ def github_repo_sync_beat() -> None:
         name="github_repo_sync",
         schedule_key="github-repo-sync-beat",
         queryset=OrganizationIntegration.objects.filter(
-            integration__provider__in=["github", "github_enterprise"],
+            integration__provider="github",
             integration__status=ObjectStatus.ACTIVE,
             status=ObjectStatus.ACTIVE,
         ),
diff --git a/src/sentry/integrations/github/webhook.py b/src/sentry/integrations/github/webhook.py
index 06b3b70bee15..a73d4c583266 100644
--- a/src/sentry/integrations/github/webhook.py
+++ b/src/sentry/integrations/github/webhook.py
@@ -13,7 +13,6 @@
 import orjson
 import sentry_sdk
 from dateutil.parser import parse as parse_date
-from django.conf import settings
 from django.db import IntegrityError, router, transaction
 from django.http import HttpRequest, HttpResponse
 from django.utils.crypto import constant_time_compare
@@ -1159,7 +1158,6 @@ def handle(self, request: HttpRequest) -> HttpResponse:
                 "type": IntegrationProviderSlug.GITHUB.value,
             },
             silo="region" if SiloMode.get_current_mode() == SiloMode.CELL else "control",
-            is_dev=settings.IS_DEV,
         )
 
         return HttpResponse(status=204)
diff --git a/src/sentry/integrations/github_enterprise/webhook.py b/src/sentry/integrations/github_enterprise/webhook.py
index fc9c005b0ccc..61c3b59ef649 100644
--- a/src/sentry/integrations/github_enterprise/webhook.py
+++ b/src/sentry/integrations/github_enterprise/webhook.py
@@ -8,7 +8,6 @@
 
 import orjson
 import sentry_sdk
-from django.conf import settings
 from django.http import HttpRequest, HttpResponse
 from django.utils.crypto import constant_time_compare
 from django.utils.decorators import method_decorator
@@ -22,7 +21,6 @@
 from sentry.integrations.github.webhook import (
     GitHubWebhook,
     InstallationEventWebhook,
-    InstallationRepositoriesEventWebhook,
     IssuesEventWebhook,
     PullRequestEventWebhook,
     PushEventWebhook,
@@ -108,12 +106,6 @@ class GitHubEnterpriseInstallationEventWebhook(GitHubEnterpriseWebhook, Installa
     pass
 
 
-class GitHubEnterpriseInstallationRepositoriesEventWebhook(
-    GitHubEnterpriseWebhook, InstallationRepositoriesEventWebhook
-):
-    pass
-
-
 class GitHubEnterprisePushEventWebhook(GitHubEnterpriseWebhook, PushEventWebhook):
     pass
 
@@ -341,7 +333,6 @@ def _handle(self, request: HttpRequest) -> HttpResponse:
                 "type": IntegrationProviderSlug.GITHUB_ENTERPRISE.value,
             },
             silo="region",
-            is_dev=settings.IS_DEV,
         )
 
         return HttpResponse(status=204)
@@ -357,7 +348,6 @@ class GitHubEnterpriseWebhookEndpoint(GitHubEnterpriseWebhookBase):
         "push": GitHubEnterprisePushEventWebhook,
         "pull_request": GitHubEnterprisePullRequestEventWebhook,
         "installation": GitHubEnterpriseInstallationEventWebhook,
-        "installation_repositories": GitHubEnterpriseInstallationRepositoriesEventWebhook,
         "issues": GitHubEnterpriseIssuesEventWebhook,
     }
 
diff --git a/src/sentry/integrations/slack/integration.py b/src/sentry/integrations/slack/integration.py
index 0108de382649..6d04539c69f6 100644
--- a/src/sentry/integrations/slack/integration.py
+++ b/src/sentry/integrations/slack/integration.py
@@ -10,7 +10,6 @@
 from slack_sdk.errors import SlackApiError
 
 from sentry.identity.pipeline import IdentityPipeline
-from sentry.identity.slack.provider import SlackIdentityProvider
 from sentry.integrations.base import (
     FeatureDescription,
     IntegrationData,
@@ -37,7 +36,7 @@
 )
 from sentry.notifications.platform.target import IntegrationNotificationTarget
 from sentry.organizations.services.organization.model import RpcOrganization
-from sentry.pipeline.views.base import ApiPipelineSteps, PipelineView
+from sentry.pipeline.views.base import PipelineView
 from sentry.pipeline.views.nested import NestedPipelineView
 from sentry.shared_integrations.exceptions import IntegrationError
 from sentry.utils.http import absolute_uri
@@ -336,7 +335,6 @@ def _get_oauth_scopes(self) -> frozenset[str]:
         return self.identity_oauth_scopes
 
     setup_dialog_config = {"width": 600, "height": 900}
-    setup_url_path = "/extensions/slack/setup/"
 
     def _identity_pipeline_view(self) -> PipelineView[IntegrationPipeline]:
         return NestedPipelineView(
@@ -346,28 +344,13 @@ def _identity_pipeline_view(self) -> PipelineView[IntegrationPipeline]:
             config={
                 "oauth_scopes": self._get_oauth_scopes(),
                 "user_scopes": self.user_scopes,
-                "redirect_url": absolute_uri(self.setup_url_path),
+                "redirect_url": absolute_uri("/extensions/slack/setup/"),
             },
         )
 
     def get_pipeline_views(self) -> Sequence[PipelineView[IntegrationPipeline]]:
         return [self._identity_pipeline_view()]
 
-    def _make_identity_provider(self) -> SlackIdentityProvider:
-        return SlackIdentityProvider(
-            oauth_scopes=self._get_oauth_scopes(),
-            redirect_url=absolute_uri(self.setup_url_path),
-        )
-
-    def get_pipeline_api_steps(self) -> ApiPipelineSteps[IntegrationPipeline]:
-        provider = self._make_identity_provider()
-        return [
-            provider.make_oauth_api_step(
-                bind_key="oauth_data",
-                extra_authorize_params={"user_scope": " ".join(self.user_scopes)},
-            ),
-        ]
-
     def _get_team_info(self, access_token: str) -> Any:
         # Manually add authorization since this method is part of slack installation
 
@@ -382,13 +365,7 @@ def _get_team_info(self, access_token: str) -> Any:
             raise IntegrationError("Could not retrieve Slack team information.")
 
     def build_integration(self, state: Mapping[str, Any]) -> IntegrationData:
-        # TODO: legacy views write token data to state["identity"]["data"] via
-        # NestedPipelineView. API steps write directly to state["oauth_data"].
-        # Remove the legacy path once the old views are retired.
-        if "oauth_data" in state:
-            data = state["oauth_data"]
-        else:
-            data = state["identity"]["data"]
+        data = state["identity"]["data"]
         assert data["ok"]
 
         access_token = data["access_token"]
diff --git a/src/sentry/integrations/slack/staging/integration.py b/src/sentry/integrations/slack/staging/integration.py
index 68ebee8e77f6..a0914bd9827b 100644
--- a/src/sentry/integrations/slack/staging/integration.py
+++ b/src/sentry/integrations/slack/staging/integration.py
@@ -5,7 +5,6 @@
 from typing import Any
 
 from sentry.identity.pipeline import IdentityPipeline
-from sentry.identity.slack.provider import SlackStagingIdentityProvider
 from sentry.integrations.base import (
     IntegrationData,
 )
@@ -23,17 +22,10 @@ class SlackStagingIntegrationProvider(SlackIntegrationProvider):
     key = IntegrationProviderSlug.SLACK_STAGING.value
     name = "Slack (Staging)"
     requires_feature_flag = True
-    setup_url_path = "/extensions/slack-staging/setup/"
 
     def _get_oauth_scopes(self) -> frozenset[str]:
         return self.identity_oauth_scopes | self.extended_oauth_scopes
 
-    def _make_identity_provider(self) -> SlackStagingIdentityProvider:
-        return SlackStagingIdentityProvider(
-            oauth_scopes=self._get_oauth_scopes(),
-            redirect_url=absolute_uri(self.setup_url_path),
-        )
-
     def _identity_pipeline_view(self) -> PipelineView[IntegrationPipeline]:
         return NestedPipelineView(
             bind_key="identity",
@@ -42,7 +34,7 @@ def _identity_pipeline_view(self) -> PipelineView[IntegrationPipeline]:
             config={
                 "oauth_scopes": self._get_oauth_scopes(),
                 "user_scopes": self.user_scopes,
-                "redirect_url": absolute_uri(self.setup_url_path),
+                "redirect_url": absolute_uri("/extensions/slack-staging/setup/"),
             },
         )
 
diff --git a/src/sentry/management/commands/generate_controlsilo_urls.py b/src/sentry/management/commands/generate_controlsilo_urls.py
index 5b66c8911525..c9b9aa335af2 100644
--- a/src/sentry/management/commands/generate_controlsilo_urls.py
+++ b/src/sentry/management/commands/generate_controlsilo_urls.py
@@ -133,11 +133,7 @@ def handle(self, **options):
                 continue
 
             silo_limit = view_func.silo_limit
-            if (
-                len(silo_limit.modes) == 1
-                and SiloMode.CONTROL in silo_limit.modes
-                and not silo_limit.internal
-            ):
+            if len(silo_limit.modes) == 1 and SiloMode.CONTROL in silo_limit.modes:
                 simple_pattern = simplify_regex(info.pattern)
                 url_patterns.append(simple_pattern)
 
diff --git a/src/sentry/migrations/1060_eventattachment_date_expires.py b/src/sentry/migrations/1060_eventattachment_date_expires.py
index f65eee772f4e..e238ab8a268a 100644
--- a/src/sentry/migrations/1060_eventattachment_date_expires.py
+++ b/src/sentry/migrations/1060_eventattachment_date_expires.py
@@ -2,16 +2,9 @@
 
 import datetime
 
-import django.db.models.expressions
-import django.db.models.functions.datetime
 from django.db import migrations, models
 
 from sentry.new_migrations.migrations import CheckedMigration
-from sentry.objectstore import default_attachment_retention
-
-# Initial default applies to existing attachments. New rows will be written with
-# a runtime-defined default, so we follow-up with a static 30d default.
-_RETENTION_DAYS = default_attachment_retention()
 
 
 class Migration(CheckedMigration):
@@ -38,22 +31,7 @@ class Migration(CheckedMigration):
             model_name="eventattachment",
             name="date_expires",
             field=models.DateTimeField(
-                db_default=django.db.models.expressions.CombinedExpression(
-                    django.db.models.functions.datetime.Now(),
-                    "+",
-                    models.Value(datetime.timedelta(days=_RETENTION_DAYS)),
-                ),
-            ),
-        ),
-        migrations.AlterField(
-            model_name="eventattachment",
-            name="date_expires",
-            field=models.DateTimeField(
-                db_default=django.db.models.expressions.CombinedExpression(
-                    django.db.models.functions.datetime.Now(),
-                    "+",
-                    models.Value(datetime.timedelta(days=30)),
-                ),
+                db_default=datetime.datetime(1970, 1, 1, 0, 0, tzinfo=datetime.timezone.utc),
             ),
         ),
     ]
diff --git a/src/sentry/migrations/1061_eventattachment_date_expires_index.py b/src/sentry/migrations/1061_eventattachment_date_expires_index.py
index 62967a337149..72d7de02889f 100644
--- a/src/sentry/migrations/1061_eventattachment_date_expires_index.py
+++ b/src/sentry/migrations/1061_eventattachment_date_expires_index.py
@@ -1,9 +1,6 @@
 # Generated by Django 5.2.12 on 2026-04-01 12:13
 
 import datetime
-
-import django.db.models.expressions
-import django.db.models.functions.datetime
 from django.db import migrations, models
 
 from sentry.new_migrations.migrations import CheckedMigration
@@ -33,11 +30,7 @@ class Migration(CheckedMigration):
             model_name="eventattachment",
             name="date_expires",
             field=models.DateTimeField(
-                db_default=django.db.models.expressions.CombinedExpression(
-                    django.db.models.functions.datetime.Now(),
-                    "+",
-                    models.Value(datetime.timedelta(days=30)),
-                ),
+                db_default=datetime.datetime(1970, 1, 1, 0, 0, tzinfo=datetime.timezone.utc),
                 db_index=True,
             ),
         ),
diff --git a/src/sentry/migrations/1062_backfill_eventattachment_date_expires.py b/src/sentry/migrations/1062_backfill_eventattachment_date_expires.py
index 379260677e4a..543a4aee51e1 100644
--- a/src/sentry/migrations/1062_backfill_eventattachment_date_expires.py
+++ b/src/sentry/migrations/1062_backfill_eventattachment_date_expires.py
@@ -1,9 +1,61 @@
+from __future__ import annotations
+
+from datetime import datetime, timedelta
+from datetime import timezone as dt_timezone
+
+import itertools
+
+import click
 from django.db import migrations
+from django.db.backends.base.schema import BaseDatabaseSchemaEditor
+from django.db.migrations.state import StateApps
+from django.db.models import ExpressionWrapper, F
+from django.db.models.fields import DateTimeField
 
 from sentry.new_migrations.migrations import CheckedMigration
 
+BATCH_SIZE = 10_000
+SENTINEL = datetime(1970, 1, 1, 0, 0, 0, tzinfo=dt_timezone.utc)
+DEFAULT_RETENTION_DAYS = 30
+
+
+def backfill_eventattachment_date_expires(
+    apps: StateApps, schema_editor: BaseDatabaseSchemaEditor
+) -> None:
+    EventAttachment = apps.get_model("sentry", "EventAttachment")
+
+    total_updated = 0
+    for i in itertools.count():
+        batch = EventAttachment.objects.filter(date_expires=SENTINEL).values("id")[:BATCH_SIZE]
+        updated = EventAttachment.objects.filter(id__in=batch).update(
+            date_expires=ExpressionWrapper(
+                F("date_added") + timedelta(days=DEFAULT_RETENTION_DAYS),
+                output_field=DateTimeField(),
+            )
+        )
+        if not updated:
+            break
+
+        total_updated += updated
+        if i % 100 == 0:
+            click.echo(f"Backfilled {total_updated} rows so far...")
+
+    click.echo(f"Done. Backfilled {total_updated} rows total.")
+
 
 class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
     is_post_deployment = True
 
     dependencies = [
@@ -12,7 +64,7 @@ class Migration(CheckedMigration):
 
     operations = [
         migrations.RunPython(
-            migrations.RunPython.noop,
+            backfill_eventattachment_date_expires,
             migrations.RunPython.noop,
             hints={"tables": ["sentry_eventattachment"]},
         ),
diff --git a/src/sentry/migrations/1064_eventattachment_date_expires_now.py b/src/sentry/migrations/1064_eventattachment_date_expires_now.py
deleted file mode 100644
index 6355479b1014..000000000000
--- a/src/sentry/migrations/1064_eventattachment_date_expires_now.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated by Django 5.2.12 on 2026-04-07 11:17
-
-import datetime
-import django.db.models.expressions
-import django.db.models.functions.datetime
-from django.db import migrations, models
-
-from sentry.new_migrations.migrations import CheckedMigration
-
-
-class Migration(CheckedMigration):
-    # This flag is used to mark that a migration shouldn't be automatically run in production.
-    # This should only be used for operations where it's safe to run the migration after your
-    # code has deployed. So this should not be used for most operations that alter the schema
-    # of a table.
-    # Here are some things that make sense to mark as post deployment:
-    # - Large data migrations. Typically we want these to be run manually so that they can be
-    #   monitored and not block the deploy for a long period of time while they run.
-    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
-    #   run this outside deployments so that we don't block them. Note that while adding an index
-    #   is a schema change, it's completely safe to run the operation after the code has deployed.
-    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
-
-    is_post_deployment = False
-
-    dependencies = [
-        ("sentry", "1063_remove_customdynamicsamplingrule"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="eventattachment",
-            name="date_expires",
-            field=models.DateTimeField(
-                db_default=django.db.models.expressions.CombinedExpression(
-                    django.db.models.functions.datetime.Now(),
-                    "+",
-                    models.Value(datetime.timedelta(days=30)),
-                ),
-                db_index=True,
-            ),
-        ),
-    ]
diff --git a/src/sentry/models/eventattachment.py b/src/sentry/models/eventattachment.py
index 350c934b5a47..d556750ede0b 100644
--- a/src/sentry/models/eventattachment.py
+++ b/src/sentry/models/eventattachment.py
@@ -3,7 +3,8 @@
 import mimetypes
 import os
 from dataclasses import dataclass
-from datetime import timedelta
+from datetime import datetime, timedelta
+from datetime import timezone as dt_timezone
 from hashlib import sha1
 from io import BytesIO
 from typing import IO, Any
@@ -12,7 +13,6 @@
 from django.core.cache import cache
 from django.db import models
 from django.db.models.expressions import DatabaseDefault
-from django.db.models.functions import Now
 from django.utils import timezone
 from objectstore_client import TimeToLive
 
@@ -26,6 +26,9 @@
 from sentry.objectstore.metrics import measure_storage_operation
 from sentry.options.rollout import in_random_rollout
 
+# Sentinel value stored in `date_expires` to mean "no explicit expiry — use default retention".
+DATE_EXPIRES_SENTINEL = datetime(1970, 1, 1, 0, 0, 0, tzinfo=dt_timezone.utc)
+
 # Attachment file types that are considered a crash report (PII relevant)
 CRASH_REPORT_TYPES = ("event.minidump", "event.applecrashreport")
 
@@ -103,7 +106,7 @@ class EventAttachment(Model):
 
     date_added = models.DateTimeField(default=timezone.now, db_index=True)
     date_expires = models.DateTimeField(
-        db_default=Now() + timedelta(days=30),
+        db_default=DATE_EXPIRES_SENTINEL,
         db_index=True,
     )
 
diff --git a/src/sentry/options/defaults.py b/src/sentry/options/defaults.py
index 8725c6ad5c15..bdacbbe0554a 100644
--- a/src/sentry/options/defaults.py
+++ b/src/sentry/options/defaults.py
@@ -1373,25 +1373,6 @@
     default=0.0,
     flags=FLAG_MODIFIABLE_RATE | FLAG_AUTOMATOR_MODIFIABLE,
 )
-register(
-    "seer.night_shift.enable",
-    type=Bool,
-    default=False,
-    flags=FLAG_MODIFIABLE_BOOL | FLAG_AUTOMATOR_MODIFIABLE,
-)
-register(
-    "seer.night_shift.issues_per_org",
-    default=5,
-    flags=FLAG_AUTOMATOR_MODIFIABLE,
-)
-
-# Supergroups / Lightweight RCA
-register(
-    "supergroups.lightweight-enabled-orgs",
-    type=Sequence,
-    default=[],
-    flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
-)
 
 # ## sentry.killswitches
 #
diff --git a/src/sentry/preprod/api/endpoints/preprod_artifact_snapshot.py b/src/sentry/preprod/api/endpoints/preprod_artifact_snapshot.py
index c5703b8cc596..b52166275c28 100644
--- a/src/sentry/preprod/api/endpoints/preprod_artifact_snapshot.py
+++ b/src/sentry/preprod/api/endpoints/preprod_artifact_snapshot.py
@@ -394,11 +394,9 @@ def get(self, request: Request, organization: Organization, snapshot_id: str) ->
                             source="github",
                         )
                     )
-            is_auto_approved = any((a.extras or {}).get("auto_approval") is True for a in approved)
             approval_info = SnapshotApprovalInfo(
                 status="approved",
                 approvers=approver_list,
-                is_auto_approved=is_auto_approved,
             )
         elif all_approvals:
             # If records exist but none are APPROVED, they must be NEEDS_APPROVAL
diff --git a/src/sentry/preprod/api/models/snapshots/project_preprod_snapshot_models.py b/src/sentry/preprod/api/models/snapshots/project_preprod_snapshot_models.py
index 054b91e89347..a9c3c8efc98c 100644
--- a/src/sentry/preprod/api/models/snapshots/project_preprod_snapshot_models.py
+++ b/src/sentry/preprod/api/models/snapshots/project_preprod_snapshot_models.py
@@ -59,7 +59,6 @@ class SnapshotApprover(BaseModel):
 class SnapshotApprovalInfo(BaseModel):
     status: Literal["approved", "requires_approval"]
     approvers: list[SnapshotApprover] = []
-    is_auto_approved: bool = False
 
 
 class SnapshotDetailsApiResponse(BaseModel):
diff --git a/src/sentry/preprod/snapshots/tasks.py b/src/sentry/preprod/snapshots/tasks.py
index d93b513e5381..5ce11f0f8b4a 100644
--- a/src/sentry/preprod/snapshots/tasks.py
+++ b/src/sentry/preprod/snapshots/tasks.py
@@ -7,13 +7,12 @@
 import orjson
 from django.db import IntegrityError
 from django.utils import timezone
-from objectstore_client import Session
 from objectstore_client.client import RequestError
 from pydantic import ValidationError
 from taskbroker_client.retry import Retry
 
 from sentry.objectstore import get_preprod_session
-from sentry.preprod.models import PreprodArtifact, PreprodComparisonApproval
+from sentry.preprod.models import PreprodArtifact
 from sentry.preprod.snapshots.image_diff.compare import compare_images_batch
 from sentry.preprod.snapshots.image_diff.odiff import OdiffServer
 from sentry.preprod.snapshots.manifest import (
@@ -114,128 +113,6 @@ def _create_pixel_batches(
     return batches
 
 
-class ImageFingerprint(NamedTuple):
-    name: str
-    status: str
-    head_hash: str | None = None
-    previous_image_file_name: str | None = None
-
-
-def _build_comparison_fingerprints(manifest: ComparisonManifest) -> set[ImageFingerprint]:
-    fingerprints: set[ImageFingerprint] = set()
-    for name, image in manifest.images.items():
-        if image.status == "unchanged":
-            continue
-        if image.status in ("changed", "added"):
-            if not image.head_hash:
-                continue
-            fingerprints.add(ImageFingerprint(name, image.status, image.head_hash))
-        elif image.status == "renamed":
-            if not image.head_hash or not image.previous_image_file_name:
-                continue
-            fingerprints.add(
-                ImageFingerprint(name, "renamed", image.head_hash, image.previous_image_file_name)
-            )
-        else:
-            fingerprints.add(ImageFingerprint(name, image.status))
-    return fingerprints
-
-
-def _try_auto_approve_snapshot(
-    head_artifact: PreprodArtifact,
-    comparison_manifest: ComparisonManifest,
-    session: Session,
-) -> None:
-    cc = head_artifact.commit_comparison
-    if not cc or not cc.pr_number or not cc.head_repo_name:
-        return
-
-    head_fingerprints = _build_comparison_fingerprints(comparison_manifest)
-    if not head_fingerprints:
-        return
-
-    approved_sibling = (
-        PreprodArtifact.objects.filter(
-            project_id=head_artifact.project_id,
-            app_id=head_artifact.app_id,
-            build_configuration=head_artifact.build_configuration,
-            commit_comparison__pr_number=cc.pr_number,
-            commit_comparison__head_repo_name=cc.head_repo_name,
-            preprodcomparisonapproval__preprod_feature_type=PreprodComparisonApproval.FeatureType.SNAPSHOTS,
-            preprodcomparisonapproval__approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-            preprodsnapshotmetrics__snapshot_comparisons_head_metrics__state=PreprodSnapshotComparison.State.SUCCESS,
-        )
-        .exclude(id=head_artifact.id)
-        .order_by("-date_added")
-        .first()
-    )
-
-    if not approved_sibling:
-        return
-
-    sibling_comparison = (
-        PreprodSnapshotComparison.objects.filter(
-            head_snapshot_metrics__preprod_artifact=approved_sibling,
-            state=PreprodSnapshotComparison.State.SUCCESS,
-        )
-        .order_by("-date_updated")
-        .first()
-    )
-
-    if not sibling_comparison:
-        return
-
-    sibling_comparison_key = (sibling_comparison.extras or {}).get("comparison_key")
-    if not sibling_comparison_key:
-        return
-
-    try:
-        sibling_manifest = ComparisonManifest(
-            **orjson.loads(session.get(sibling_comparison_key).payload.read())
-        )
-    except Exception:
-        logger.exception(
-            "auto_approve: failed to load sibling comparison manifest",
-            extra={
-                "head_artifact_id": head_artifact.id,
-                "sibling_artifact_id": approved_sibling.id,
-                "comparison_key": sibling_comparison_key,
-            },
-        )
-        return
-
-    sibling_fingerprints = _build_comparison_fingerprints(sibling_manifest)
-
-    if head_fingerprints != sibling_fingerprints:
-        logger.info(
-            "auto_approve: fingerprints do not match",
-            extra={
-                "head_artifact_id": head_artifact.id,
-                "sibling_artifact_id": approved_sibling.id,
-            },
-        )
-        return
-
-    PreprodComparisonApproval.objects.create(
-        preprod_artifact=head_artifact,
-        preprod_feature_type=PreprodComparisonApproval.FeatureType.SNAPSHOTS,
-        approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        approved_at=timezone.now(),
-        extras={
-            "auto_approval": True,
-            "prev_approved_artifact_id": approved_sibling.id,
-        },
-    )
-
-    logger.info(
-        "auto_approve: snapshot auto-approved",
-        extra={
-            "head_artifact_id": head_artifact.id,
-            "prev_approved_artifact_id": approved_sibling.id,
-        },
-    )
-
-
 @instrumented_task(
     name="sentry.preprod.tasks.compare_snapshots",
     namespace=preprod_tasks,
@@ -704,14 +581,6 @@ def _fetch_hash(h: str) -> None:
         ):
             metrics.incr("preprod.snapshots.diff.zero_changes", sample_rate=1.0, tags=metric_tags)
 
-        try:
-            _try_auto_approve_snapshot(head_artifact, comparison_manifest, session)
-        except Exception:
-            logger.exception(
-                "Auto-approve failed after successful comparison",
-                extra={"head_artifact_id": head_artifact_id},
-            )
-
         create_preprod_snapshot_status_check_task.apply_async(
             kwargs={
                 "preprod_artifact_id": head_artifact_id,
diff --git a/src/sentry/preprod/tasks.py b/src/sentry/preprod/tasks.py
index 64b7ac77d80c..b6bbc37641a7 100644
--- a/src/sentry/preprod/tasks.py
+++ b/src/sentry/preprod/tasks.py
@@ -562,7 +562,6 @@ def _assemble_preprod_artifact_size_analysis(
                 "was_created": was_created,
                 "project_id": project.id,
                 "organization_id": org_id,
-                "organization_slug": organization.slug,
             },
         )
 
diff --git a/src/sentry/preprod/vcs/pr_comments/tasks.py b/src/sentry/preprod/vcs/pr_comments/tasks.py
index 4bd9b715e6d1..951158ea1767 100644
--- a/src/sentry/preprod/vcs/pr_comments/tasks.py
+++ b/src/sentry/preprod/vcs/pr_comments/tasks.py
@@ -130,7 +130,7 @@ def create_preprod_pr_comment_task(
             return
 
         existing_comment_id = _find_existing_comment_id(all_for_pr)
-        comment_body = format_pr_comment(installable_siblings, project=artifact.project)
+        comment_body = format_pr_comment(installable_siblings)
 
         try:
             if existing_comment_id:
diff --git a/src/sentry/preprod/vcs/pr_comments/templates.py b/src/sentry/preprod/vcs/pr_comments/templates.py
index c57206eca37c..dd6508e99340 100644
--- a/src/sentry/preprod/vcs/pr_comments/templates.py
+++ b/src/sentry/preprod/vcs/pr_comments/templates.py
@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-from sentry.models.project import Project
 from sentry.preprod.models import PreprodArtifact
 from sentry.preprod.url_utils import get_preprod_artifact_url
 
 
-def format_pr_comment(artifacts: list[PreprodArtifact], project: Project) -> str:
+def format_pr_comment(artifacts: list[PreprodArtifact]) -> str:
     if not artifacts:
         raise ValueError("No installable artifacts to format")
 
@@ -47,9 +46,4 @@ def format_pr_comment(artifacts: list[PreprodArtifact], project: Project) -> str
         else:
             sections.append(f"{header}\n{separator}\n" + "\n".join(android_rows))
 
-    settings_url = project.organization.absolute_url(
-        f"/settings/projects/{project.slug}/mobile-builds/", query="tab=distribution"
-    )
-    sections.append(f"[Configure {project.name} build distribution settings]({settings_url})")
-
     return "\n\n".join(sections)
diff --git a/src/sentry/processing_errors/detection.py b/src/sentry/processing_errors/detection.py
index a5ae79e72afa..4a02464b0575 100644
--- a/src/sentry/processing_errors/detection.py
+++ b/src/sentry/processing_errors/detection.py
@@ -161,20 +161,6 @@ def _detect_for_config(
             if result.is_triggered:
                 _set_detector_triggered(config, project_id)
                 metrics.incr(f"processing_errors.{config.slug}.triggered")
-                error_types = sorted(
-                    config.handler_cls.error_types.intersection(
-                        filter(None, (e.get("type") for e in errors))
-                    )
-                )
-                logger.info(
-                    "processing_errors.%s.occurrence_created",
-                    config.slug,
-                    extra={
-                        "organization_slug": event.project.organization.slug,
-                        "project_id": project_id,
-                        "error_types": error_types,
-                    },
-                )
 
 
 def detect_processing_issues(job: PostProcessJob) -> None:
diff --git a/src/sentry/receivers/__init__.py b/src/sentry/receivers/__init__.py
index e9af536ddc46..83b66df9be09 100644
--- a/src/sentry/receivers/__init__.py
+++ b/src/sentry/receivers/__init__.py
@@ -11,6 +11,7 @@
 from .owners import *  # noqa: F401,F403
 from .releases import *  # noqa: F401,F403
 from .rule_snooze import *  # noqa: F401,F403
+from .rules import *  # noqa: F401,F403
 from .sentry_apps import *  # noqa: F401,F403
 from .stats import *  # noqa: F401,F403
 from .superuser import *  # noqa: F401,F403
diff --git a/src/sentry/workflow_engine/receivers/project_workflows.py b/src/sentry/receivers/rules.py
similarity index 66%
rename from src/sentry/workflow_engine/receivers/project_workflows.py
rename to src/sentry/receivers/rules.py
index 021f294c88c3..b9699cb29c94 100644
--- a/src/sentry/workflow_engine/receivers/project_workflows.py
+++ b/src/sentry/receivers/rules.py
@@ -1,5 +1,4 @@
 import logging
-from typing import Any
 
 from django.db import router, transaction
 
@@ -8,8 +7,7 @@
 from sentry.notifications.types import FallthroughChoiceType
 from sentry.signals import alert_rule_created, project_created
 from sentry.users.services.user.model import RpcUser
-from sentry.workflow_engine.defaults.workflows import ensure_default_workflows
-from sentry.workflow_engine.models import AlertRuleWorkflow
+from sentry.workflow_engine.migration_helpers.issue_alert_migration import IssueAlertMigrator
 
 logger = logging.getLogger("sentry")
 
@@ -36,38 +34,21 @@
 PLATFORMS_WITH_PRIORITY_ALERTS = ["python", "javascript"]
 
 
-def create_default_workflows(
-    project: Project,
-    default_rules: bool = True,
-    RuleModel: type[Rule] = Rule,
-    **kwargs: Any,
-) -> None:
-    rule_data = DEFAULT_RULE_DATA
-
+def create_default_rules(project: Project, default_rules=True, RuleModel=Rule, **kwargs):
     if not default_rules:
         return
 
+    rule_data = DEFAULT_RULE_DATA
+
     with transaction.atomic(router.db_for_write(RuleModel)):
-        workflows = ensure_default_workflows(project)
+        rule = RuleModel.objects.create(project=project, label=DEFAULT_RULE_LABEL, data=rule_data)
 
-        # TODO - we can remove the legacy code below once
-        # we launch the new UI (and stop referencing legacy models)
-        rule = RuleModel.objects.create(
-            project=project,
-            label=DEFAULT_RULE_LABEL,
-            data=rule_data,
+        workflow = IssueAlertMigrator(rule).run()
+        logger.info(
+            "workflow_engine.default_issue_alert.migrated",
+            extra={"rule_id": rule.id, "workflow_id": workflow.id},
         )
 
-        legacy_references = [
-            AlertRuleWorkflow(
-                rule_id=rule.id,
-                workflow=workflow,
-            )
-            for workflow in workflows
-        ]
-
-        AlertRuleWorkflow.objects.bulk_create(legacy_references)
-
     try:
         user: RpcUser = project.organization.get_default_owner()
     except IndexError:
@@ -90,8 +71,4 @@ def create_default_workflows(
     )
 
 
-project_created.connect(
-    create_default_workflows,
-    dispatch_uid="create_default_workflows",
-    weak=False,
-)
+project_created.connect(create_default_rules, dispatch_uid="create_default_rules", weak=False)
diff --git a/src/sentry/runner/commands/cleanup.py b/src/sentry/runner/commands/cleanup.py
index 061e7f630f88..103630fbcecf 100644
--- a/src/sentry/runner/commands/cleanup.py
+++ b/src/sentry/runner/commands/cleanup.py
@@ -739,10 +739,8 @@ def remove_old_nodestore_values(days: int) -> None:
 def remove_cross_project_bulk_query_models(
     bulk_query_deletes: list[tuple[type[BaseModel], str, str | None]],
 ) -> list[tuple[type[BaseModel], str, str | None]]:
-    from sentry.models.groupopenperiodactivity import GroupOpenPeriodActivity
     from sentry.workflow_engine.models.workflow_fire_history import WorkflowFireHistory
 
-    bulk_query_deletes.remove((GroupOpenPeriodActivity, "date_added", None))
     bulk_query_deletes.remove((WorkflowFireHistory, "date_added", None))
     return bulk_query_deletes
 
@@ -751,7 +749,6 @@ def generate_bulk_query_deletes() -> list[tuple[type[BaseModel], str, str | None
     from django.apps import apps
 
     from sentry.models.groupemailthread import GroupEmailThread
-    from sentry.models.groupopenperiodactivity import GroupOpenPeriodActivity
     from sentry.models.userreport import UserReport
     from sentry.workflow_engine.models.workflow_fire_history import WorkflowFireHistory
 
@@ -766,7 +763,6 @@ def generate_bulk_query_deletes() -> list[tuple[type[BaseModel], str, str | None
     BULK_QUERY_DELETES = [
         (UserReport, "date_added", None),
         (GroupEmailThread, "date", None),
-        (GroupOpenPeriodActivity, "date_added", None),
         (WorkflowFireHistory, "date_added", None),
     ] + additional_bulk_query_deletes
 
diff --git a/src/sentry/scm/errors.py b/src/sentry/scm/errors.py
index 05fd94a15e2e..491de34507e2 100644
--- a/src/sentry/scm/errors.py
+++ b/src/sentry/scm/errors.py
@@ -42,12 +42,6 @@ class SCMProviderException(SCMError):
     pass
 
 
-class SCMProviderEventNotSupported(SCMError):
-    def __init__(self, message: str) -> None:
-        self.message = message
-        super().__init__(message)
-
-
 class SCMProviderNotSupported(SCMError):
     def __init__(self, message: str) -> None:
         self.message = message
diff --git a/src/sentry/scm/private/ipc.py b/src/sentry/scm/private/ipc.py
index 844103258eb2..ef795ee1851f 100644
--- a/src/sentry/scm/private/ipc.py
+++ b/src/sentry/scm/private/ipc.py
@@ -16,7 +16,7 @@
 import msgspec
 import sentry_sdk
 
-from sentry.scm.errors import SCMProviderEventNotSupported, SCMProviderNotSupported
+from sentry.scm.errors import SCMProviderNotSupported
 from sentry.scm.private.event_stream import SourceCodeManagerEventStream, scm_event_stream
 from sentry.scm.private.webhooks.github import deserialize_github_event
 from sentry.scm.types import (
@@ -356,8 +356,10 @@ def produce_to_listeners(
     """
     parsed_event = deserialize_raw_event(event)
 
+    # Most events are not supported. We drop them. They could be processed elsewhere but they're
+    # not processed by the unified SCM platform.
     if parsed_event is None:
-        raise SCMProviderEventNotSupported(f"Unsupported event type `{event['event_type_hint']}`.")
+        return None
 
     message = serialize_event(parsed_event)
 
diff --git a/src/sentry/scm/private/stream_producer.py b/src/sentry/scm/private/stream_producer.py
index 7dd4fbbb8c89..0ec687c7b030 100644
--- a/src/sentry/scm/private/stream_producer.py
+++ b/src/sentry/scm/private/stream_producer.py
@@ -1,7 +1,6 @@
-import logging
 from collections.abc import Callable
 
-from sentry.scm.errors import SCMProviderEventNotSupported, SCMProviderNotSupported
+from sentry.scm.errors import SCMProviderNotSupported
 from sentry.scm.private.ipc import (
     PRODUCE_TO_LISTENER,
     produce_to_listener,
@@ -12,7 +11,6 @@
 from sentry.scm.types import HybridCloudSilo, SubscriptionEvent
 from sentry.scm.utils import check_rollout_option
 
-logger = logging.getLogger("sentry.scm")
 PREFIX = "sentry.scm.produce_event_to_scm_stream"
 
 
@@ -20,7 +18,6 @@ def produce_event_to_scm_stream(
     event: SubscriptionEvent,
     silo: HybridCloudSilo,
     *,
-    is_dev: bool = False,
     produce_to_listener: PRODUCE_TO_LISTENER = produce_to_listener,
     record_count: Callable[[str, int, dict[str, str]], None] = record_count_metric,
     report_error: Callable[[Exception], None] = report_error_to_sentry,
@@ -40,25 +37,11 @@ def produce_event_to_scm_stream(
     try:
         produce_to_listeners(event, silo, produce_to_listener=produce_to_listener)
         record_count(f"{PREFIX}.success", 1, {})
-        if is_dev:
-            logger.info(f"Successfully processed SCM webhook event: {event['event_type_hint']}.")
     except SCMProviderNotSupported:
-        record_count(
-            f"{PREFIX}.failed", 1, {"reason": "provider-not-supported", "provider": event["type"]}
-        )
-        if is_dev:
-            logger.exception("Failed to process SCM webhook event.")
-    except SCMProviderEventNotSupported:
-        record_count(
-            f"{PREFIX}.failed", 1, {"reason": "event-not-supported", "provider": event["type"]}
-        )
-        if is_dev:
-            logger.exception("Failed to process SCM webhook event.")
+        record_count(f"{PREFIX}.failed", 1, {"reason": "not-supported", "provider": event["type"]})
     except Exception as e:
         record_count(f"{PREFIX}.failed", 1, {"reason": "processing"})
         report_error(e)
-        if is_dev:
-            logger.exception("Failed to process SCM webhook event.")
 
 
 __all__ = [
diff --git a/src/sentry/search/eap/columns.py b/src/sentry/search/eap/columns.py
index 80485a3e13d2..c53a264dd99c 100644
--- a/src/sentry/search/eap/columns.py
+++ b/src/sentry/search/eap/columns.py
@@ -43,7 +43,6 @@ class ResolverSettings(TypedDict):
     snuba_params: SnubaParams
     query_result_cache: dict[str, EAPResponse]
     search_config: SearchResolverConfig
-    conditional: bool
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -252,31 +251,45 @@ class ResolvedTraceMetricAggregate(ResolvedFunction):
 
     is_aggregate: bool = field(default=True, init=False)
     trace_metric: TraceMetric | None
-    trace_filter: TraceItemFilter | None
 
     @property
     def proto_definition(self) -> AttributeAggregation | AttributeConditionalAggregation:
-        if self.trace_metric is None and self.trace_filter is None:
+        if self.trace_metric is None:
             return AttributeAggregation(
                 aggregate=self.internal_name,
                 key=self.key,
                 label=self.public_alias,
                 extrapolation_mode=self.extrapolation_mode,
             )
+        return AttributeConditionalAggregation(
+            aggregate=self.internal_name,
+            key=self.key,
+            filter=self.trace_metric.get_filter(),
+            label=self.public_alias,
+            extrapolation_mode=self.extrapolation_mode,
+        )
 
-        if self.trace_filter is None and self.trace_metric is not None:
-            trace_filter = self.trace_metric.get_filter()
-        elif self.trace_filter is not None and self.trace_metric is None:
-            trace_filter = self.trace_filter
-        elif self.trace_filter is not None and self.trace_metric is not None:
-            trace_filter = TraceItemFilter(
-                and_filter=AndFilter(filters=[self.trace_metric.get_filter(), self.trace_filter])
-            )
 
+@dataclass(frozen=True, kw_only=True)
+class ResolvedConditionalTraceMetricAggregate(ResolvedTraceMetricAggregate):
+    trace_filter: TraceItemFilter
+
+    @property
+    def proto_definition(self) -> AttributeAggregation | AttributeConditionalAggregation:
+        if self.trace_metric is None:
+            return AttributeConditionalAggregation(
+                aggregate=self.internal_name,
+                key=self.key,
+                filter=self.trace_filter,
+                label=self.public_alias,
+                extrapolation_mode=self.extrapolation_mode,
+            )
         return AttributeConditionalAggregation(
             aggregate=self.internal_name,
             key=self.key,
-            filter=trace_filter,
+            filter=TraceItemFilter(
+                and_filter=AndFilter(filters=[self.trace_metric.get_filter(), self.trace_filter])
+            ),
             label=self.public_alias,
             extrapolation_mode=self.extrapolation_mode,
         )
@@ -421,6 +434,27 @@ def resolve(
         snuba_params: SnubaParams,
         query_result_cache: dict[str, EAPResponse],
         search_config: SearchResolverConfig,
+    ) -> ResolvedFunction:
+        return self._resolve(
+            alias,
+            search_type,
+            resolved_arguments,
+            snuba_params,
+            query_result_cache,
+            search_config,
+            ResolvedTraceMetricAggregate,
+        )
+
+    def _resolve(
+        self,
+        alias: str,
+        search_type: constants.SearchType,
+        resolved_arguments: ResolvedArguments,
+        snuba_params: SnubaParams,
+        query_result_cache: dict[str, EAPResponse],
+        search_config: SearchResolverConfig,
+        aggregate: type[ResolvedConditionalTraceMetricAggregate]
+        | type[ResolvedTraceMetricAggregate],
     ) -> ResolvedFunction:
         if not isinstance(resolved_arguments[self.offset], AttributeKey):
             raise InvalidSearchQuery(
@@ -449,21 +483,22 @@ def resolve(
             ):
                 resolved_search_type = cast(constants.SearchType, trace_metric.metric_unit)
 
-        return ResolvedTraceMetricAggregate(
-            public_alias=alias,
-            internal_name=self.internal_function,
-            search_type=resolved_search_type,
-            internal_type=self.internal_type,
-            processor=self.processor,
-            extrapolation_mode=resolve_extrapolation_mode(
+        kwargs = {
+            "public_alias": alias,
+            "internal_name": self.internal_function,
+            "search_type": resolved_search_type,
+            "internal_type": self.internal_type,
+            "processor": self.processor,
+            "extrapolation_mode": resolve_extrapolation_mode(
                 search_config, self.extrapolation_mode_override
             ),
-            key=cast(AttributeKey, resolved_attribute),
-            trace_metric=trace_metric,
-            trace_filter=cast(TraceItemFilter, resolved_arguments[0])
-            if isinstance(self, ConditionalTraceMetricAggregateDefinition)
-            else None,
-        )
+            "key": resolved_attribute,
+            "trace_metric": trace_metric,
+        }
+        if aggregate == ResolvedConditionalTraceMetricAggregate:
+            kwargs["trace_filter"] = resolved_arguments[0]
+
+        return aggregate(**kwargs)  # type: ignore[arg-type]
 
 
 @dataclass(kw_only=True)
@@ -471,6 +506,25 @@ class ConditionalTraceMetricAggregateDefinition(TraceMetricAggregateDefinition):
     offset = 1
     expected_args = 5
 
+    def resolve(
+        self,
+        alias: str,
+        search_type: constants.SearchType,
+        resolved_arguments: ResolvedArguments,
+        snuba_params: SnubaParams,
+        query_result_cache: dict[str, EAPResponse],
+        search_config: SearchResolverConfig,
+    ) -> ResolvedFunction:
+        return self._resolve(
+            alias,
+            search_type,
+            resolved_arguments,
+            snuba_params,
+            query_result_cache,
+            search_config,
+            ResolvedConditionalTraceMetricAggregate,
+        )
+
 
 @dataclass(kw_only=True)
 class ConditionalAggregateDefinition(AggregateDefinition):
@@ -536,7 +590,6 @@ def resolve(
             snuba_params=snuba_params,
             query_result_cache=query_result_cache,
             search_config=search_config,
-            conditional=False,
         )
 
         return ResolvedFormula(
@@ -551,13 +604,8 @@ def resolve(
 
 @dataclass(kw_only=True)
 class TraceMetricFormulaDefinition(FormulaDefinition):
-    offset = 0
-    expected_args = 4
-
     def __post_init__(self) -> None:
-        validate_trace_metric_aggregate_arguments(
-            self.arguments, offset=self.offset, expected_args=self.expected_args
-        )
+        validate_trace_metric_aggregate_arguments(self.arguments)
 
     def resolve(
         self,
@@ -575,20 +623,14 @@ def resolve(
             snuba_params=snuba_params,
             query_result_cache=query_result_cache,
             search_config=search_config,
-            conditional=isinstance(self, ConditionalTraceMetricFormulaDefinition),
         )
 
-        trace_metric = extract_trace_metric_aggregate_arguments(
-            resolved_arguments, offset=self.offset
-        )
+        trace_metric = extract_trace_metric_aggregate_arguments(resolved_arguments)
 
         return ResolvedTraceMetricFormula(
             public_alias=alias,
             search_type=search_type,
-            formula=self.formula_resolver(
-                resolved_arguments,
-                resolver_settings,
-            ),
+            formula=self.formula_resolver(resolved_arguments, resolver_settings),
             is_aggregate=self.is_aggregate,
             internal_type=self.internal_type,
             processor=self.processor,
@@ -596,12 +638,6 @@ def resolve(
         )
 
 
-@dataclass(kw_only=True)
-class ConditionalTraceMetricFormulaDefinition(TraceMetricFormulaDefinition):
-    offset = 1
-    expected_args = 5
-
-
 def simple_sentry_field(
     field: str,
     search_type: constants.SearchType = "string",
diff --git a/src/sentry/search/eap/trace_metrics/aggregates.py b/src/sentry/search/eap/trace_metrics/aggregates.py
index 4d1aa1de6207..7df48923658a 100644
--- a/src/sentry/search/eap/trace_metrics/aggregates.py
+++ b/src/sentry/search/eap/trace_metrics/aggregates.py
@@ -376,7 +376,7 @@ def if_query_validator(term: str) -> bool:
 
 def if_combinator(definition: AggregateDefinition) -> AggregateDefinition:
     # Copy the TraceMetricAggregateDefinition but make it Conditional
-    return ConditionalTraceMetricAggregateDefinition(
+    if_definition = ConditionalTraceMetricAggregateDefinition(
         attribute_resolver=definition.attribute_resolver,
         default_search_type=definition.default_search_type,
         extrapolation_mode_override=definition.extrapolation_mode_override,
@@ -390,16 +390,16 @@ def if_combinator(definition: AggregateDefinition) -> AggregateDefinition:
             *definition.arguments,
         ],
     )
+    return if_definition
 
 
-TRACE_METRICS_AGGREGATE_COMBINATORS: dict[
-    str, Callable[[AggregateDefinition], AggregateDefinition]
-] = {
+TRACE_METRICS_COMBINATORS: dict[str, Callable[[AggregateDefinition], AggregateDefinition]] = {
     "if": if_combinator,
 }
 
+
 combinator_aggregate_definitions: dict[str, AggregateDefinition] = {}
-for combinator, apply_combinator in TRACE_METRICS_AGGREGATE_COMBINATORS.items():
+for combinator, apply_combinator in TRACE_METRICS_COMBINATORS.items():
     for function, definition in TRACE_METRICS_AGGREGATE_DEFINITIONS.items():
         combinator_aggregate_definitions[f"{function}_{combinator}"] = apply_combinator(definition)
 
diff --git a/src/sentry/search/eap/trace_metrics/formulas.py b/src/sentry/search/eap/trace_metrics/formulas.py
index fe844f497d73..8de72543fb10 100644
--- a/src/sentry/search/eap/trace_metrics/formulas.py
+++ b/src/sentry/search/eap/trace_metrics/formulas.py
@@ -1,5 +1,3 @@
-from typing import Callable, cast
-
 from sentry_protos.snuba.v1.attribute_conditional_aggregation_pb2 import (
     AttributeConditionalAggregation,
 )
@@ -10,12 +8,10 @@
     AttributeKey,
     Function,
 )
-from sentry_protos.snuba.v1.trace_item_filter_pb2 import AndFilter, TraceItemFilter
 
 from sentry.exceptions import InvalidSearchQuery
 from sentry.search.eap.columns import (
     AttributeArgumentDefinition,
-    ConditionalTraceMetricFormulaDefinition,
     FormulaDefinition,
     ResolvedArguments,
     ResolverSettings,
@@ -46,49 +42,31 @@ def _rate_internal(
         else settings["snuba_params"].interval
     )
 
-    trace_metric = search_config.metric or extract_trace_metric_aggregate_arguments(
-        args, offset=0 if not settings["conditional"] else 1
-    )
-
-    trace_filter: TraceItemFilter | None
-    if trace_metric is not None:
-        trace_filter = (
-            TraceItemFilter(
-                and_filter=AndFilter(
-                    filters=[cast(TraceItemFilter, args[0]), trace_metric.get_filter()]
-                )
-            )
-            if settings["conditional"]
-            else trace_metric.get_filter()
-        )
-        if trace_metric.metric_type == "counter":
-            aggregate = Function.FUNCTION_SUM
-            key = AttributeKey(type=AttributeKey.TYPE_DOUBLE, name="sentry.value")
-        else:
-            aggregate = Function.FUNCTION_COUNT
-            key = AttributeKey(name="sentry.project_id", type=AttributeKey.Type.TYPE_INT)
-    else:
-        if settings["conditional"]:
-            trace_filter = cast(TraceItemFilter, args[0])
-        else:
-            trace_filter = None
-        aggregate = Function.FUNCTION_COUNT
-        key = AttributeKey(name="sentry.project_id", type=AttributeKey.Type.TYPE_INT)
+    trace_metric = search_config.metric or extract_trace_metric_aggregate_arguments(args)
 
-    if trace_filter is None:
+    if trace_metric is None:
         left = Column(
             aggregation=AttributeAggregation(
                 aggregate=Function.FUNCTION_COUNT,
-                key=key,
+                key=AttributeKey(name="sentry.project_id", type=AttributeKey.Type.TYPE_INT),
+                extrapolation_mode=extrapolation_mode,
+            )
+        )
+    elif trace_metric.metric_type == "counter":
+        left = Column(
+            conditional_aggregation=AttributeConditionalAggregation(
+                aggregate=Function.FUNCTION_SUM,
+                key=AttributeKey(type=AttributeKey.TYPE_DOUBLE, name="sentry.value"),
+                filter=trace_metric.get_filter(),
                 extrapolation_mode=extrapolation_mode,
             )
         )
     else:
         left = Column(
             conditional_aggregation=AttributeConditionalAggregation(
-                aggregate=aggregate,
-                key=key,
-                filter=trace_filter,
+                aggregate=Function.FUNCTION_COUNT,
+                key=AttributeKey(name="sentry.project_id", type=AttributeKey.Type.TYPE_INT),
+                filter=trace_metric.get_filter(),
                 extrapolation_mode=extrapolation_mode,
             )
         )
@@ -176,39 +154,3 @@ def per_minute(args: ResolvedArguments, settings: ResolverSettings) -> Column.Bi
         infer_search_type_from_arguments=False,
     ),
 }
-
-
-def if_query_validator(term: str) -> bool:
-    if not term.startswith("`") or not term.endswith("`"):
-        return False
-    return True
-
-
-def if_combinator(formula: FormulaDefinition) -> FormulaDefinition:
-    return ConditionalTraceMetricFormulaDefinition(
-        formula_resolver=formula.formula_resolver,
-        is_aggregate=formula.is_aggregate,
-        default_search_type=formula.default_search_type,
-        infer_search_type_from_arguments=formula.infer_search_type_from_arguments,
-        internal_type=formula.internal_type,
-        extrapolation_mode_override=formula.extrapolation_mode_override,
-        processor=formula.processor,
-        private=formula.private,
-        arguments=[
-            ValueArgumentDefinition(argument_types={"query"}, validator=if_query_validator),
-            *formula.arguments,
-        ],
-    )
-
-
-TRACE_METRICS_FORMULA_COMBINATORS: dict[str, Callable[[FormulaDefinition], FormulaDefinition]] = {
-    "if": if_combinator,
-}
-
-combinator_formula_definitions: dict[str, FormulaDefinition] = {}
-for combinator, apply_combinator in TRACE_METRICS_FORMULA_COMBINATORS.items():
-    for formula, definition in TRACE_METRICS_FORMULA_DEFINITIONS.items():
-        if definition.is_aggregate:
-            combinator_formula_definitions[f"{formula}_{combinator}"] = apply_combinator(definition)
-
-TRACE_METRICS_FORMULA_DEFINITIONS.update(combinator_formula_definitions)
diff --git a/src/sentry/seer/autofix/autofix_agent.py b/src/sentry/seer/autofix/autofix_agent.py
index 6cda53499d28..2e0898cc375f 100644
--- a/src/sentry/seer/autofix/autofix_agent.py
+++ b/src/sentry/seer/autofix/autofix_agent.py
@@ -8,22 +8,6 @@
 from pydantic import BaseModel
 from rest_framework.exceptions import PermissionDenied
 
-from sentry import analytics
-from sentry.analytics.events.autofix_events import (
-    AiAutofixAgentHandoffEvent,
-    AiAutofixCodeChangesCompletedEvent,
-    AiAutofixCodeChangesStartedEvent,
-    AiAutofixImpactAssessmentCompletedEvent,
-    AiAutofixImpactAssessmentStartedEvent,
-    AiAutofixPhaseEvent,
-    AiAutofixPrCreatedStartedEvent,
-    AiAutofixRootCauseCompletedEvent,
-    AiAutofixRootCauseStartedEvent,
-    AiAutofixSolutionCompletedEvent,
-    AiAutofixSolutionStartedEvent,
-    AiAutofixTriageCompletedEvent,
-    AiAutofixTriageStartedEvent,
-)
 from sentry.constants import ENABLE_SEER_CODING_DEFAULT
 from sentry.seer.autofix.artifact_schemas import (
     ImpactAssessmentArtifact,
@@ -98,14 +82,10 @@ def __init__(
         artifact_schema: type[BaseModel] | None,
         prompt_fn: Callable[..., str],
         enable_coding: bool = False,
-        started_event: type[AiAutofixPhaseEvent] | None = None,
-        completed_event: type[AiAutofixPhaseEvent] | None = None,
     ):
         self.artifact_schema = artifact_schema
         self.prompt_fn = prompt_fn
         self.enable_coding = enable_coding
-        self.started_event = started_event
-        self.completed_event = completed_event
 
 
 # Step configurations mapping step to its artifact schema and prompt
@@ -113,33 +93,23 @@ def __init__(
     AutofixStep.ROOT_CAUSE: StepConfig(
         artifact_schema=RootCauseArtifact,
         prompt_fn=root_cause_prompt,
-        started_event=AiAutofixRootCauseStartedEvent,
-        completed_event=AiAutofixRootCauseCompletedEvent,
     ),
     AutofixStep.SOLUTION: StepConfig(
         artifact_schema=SolutionArtifact,
         prompt_fn=solution_prompt,
-        started_event=AiAutofixSolutionStartedEvent,
-        completed_event=AiAutofixSolutionCompletedEvent,
     ),
     AutofixStep.CODE_CHANGES: StepConfig(
         artifact_schema=None,  # Code changes read from file_patches
         prompt_fn=code_changes_prompt,
         enable_coding=True,
-        started_event=AiAutofixCodeChangesStartedEvent,
-        completed_event=AiAutofixCodeChangesCompletedEvent,
     ),
     AutofixStep.IMPACT_ASSESSMENT: StepConfig(
         artifact_schema=ImpactAssessmentArtifact,
         prompt_fn=impact_assessment_prompt,
-        started_event=AiAutofixImpactAssessmentStartedEvent,
-        completed_event=AiAutofixImpactAssessmentCompletedEvent,
     ),
     AutofixStep.TRIAGE: StepConfig(
         artifact_schema=TriageArtifact,
         prompt_fn=triage_prompt,
-        started_event=AiAutofixTriageStartedEvent,
-        completed_event=AiAutofixTriageCompletedEvent,
     ),
 }
 
@@ -230,7 +200,6 @@ def trigger_autofix_explorer(
     stopping_point: AutofixStoppingPoint | None = None,
     intelligence_level: Literal["low", "medium", "high"] = "low",
     user_context: str | None = None,
-    insert_index: int | None = None,
 ) -> int:
     """
     Start or continue an Explorer-based autofix run.
@@ -246,16 +215,6 @@ def trigger_autofix_explorer(
     """
 
     config = STEP_CONFIGS[step]
-
-    if config.started_event is not None:
-        analytics.record(
-            config.started_event(
-                organization_id=group.organization.id,
-                project_id=group.project_id,
-                group_id=group.id,
-                referrer=referrer.value,
-            )
-        )
     client = get_autofix_explorer_client(
         group,
         intelligence_level=intelligence_level,
@@ -288,7 +247,6 @@ def trigger_autofix_explorer(
             prompt_metadata=prompt_metadata,
             artifact_key=artifact_key,
             artifact_schema=artifact_schema,
-            insert_index=insert_index,
         )
 
     payload = {
@@ -542,15 +500,6 @@ def trigger_coding_agent_handoff(
         auto_create_pr=auto_create_pr,
     )
 
-    analytics.record(
-        AiAutofixAgentHandoffEvent(
-            organization_id=group.organization.id,
-            project_id=group.project_id,
-            group_id=group.id,
-            referrer=referrer.value,
-        )
-    )
-
     metrics.incr(
         "autofix.explorer.trigger",
         tags={"step": "coding_agent_handoff", "referrer": referrer.value},
@@ -583,15 +532,6 @@ def trigger_push_changes(
     if group_id != group.id:
         raise SeerPermissionError("Unknown run id for group")
 
-    analytics.record(
-        AiAutofixPrCreatedStartedEvent(
-            organization_id=group.organization.id,
-            project_id=group.project_id,
-            group_id=group.id,
-            referrer=referrer.value,
-        )
-    )
-
     client.push_changes(
         run_id,
         repo_name=repo_name,
diff --git a/src/sentry/seer/autofix/constants.py b/src/sentry/seer/autofix/constants.py
index bc37d7be38c4..28c08290afcf 100644
--- a/src/sentry/seer/autofix/constants.py
+++ b/src/sentry/seer/autofix/constants.py
@@ -54,7 +54,6 @@ class AutofixReferrer(enum.StrEnum):
     ISSUE_SUMMARY_POST_PROCESS_FIXABILITY = "issue_summary.post_process_fixability"
     SLACK = "slack"
     ON_COMPLETION_HOOK = "autofix.on_completion_hook"
-    NIGHT_SHIFT = "night_shift"
     UNKNOWN = "unknown"
 
 
@@ -62,4 +61,3 @@ class SeerAutomationSource(enum.Enum):
     ISSUE_DETAILS = "issue_details"
     ALERT = "alert"
     POST_PROCESS = "post_process"
-    NIGHT_SHIFT = "night_shift"
diff --git a/src/sentry/seer/autofix/issue_summary.py b/src/sentry/seer/autofix/issue_summary.py
index 677e3ce7e273..08361e53317b 100644
--- a/src/sentry/seer/autofix/issue_summary.py
+++ b/src/sentry/seer/autofix/issue_summary.py
@@ -45,7 +45,7 @@
     make_signed_seer_api_request,
     make_summarize_issue_request,
 )
-from sentry.seer.supergroups.explorer_lightweight_rca import trigger_explorer_lightweight_rca
+from sentry.seer.supergroups.lightweight_rca import trigger_lightweight_rca
 from sentry.services import eventstore
 from sentry.services.eventstore.models import Event, GroupEvent
 from sentry.tasks.base import instrumented_task
@@ -226,10 +226,10 @@ def _trigger_autofix_task(
                 stopping_point=stopping_point,
             )
             try:
-                trigger_explorer_lightweight_rca(group)
+                trigger_lightweight_rca(group)
             except Exception:
                 logger.exception(
-                    "explorer_lightweight_rca.trigger_error_in_trigger_autofix_task",
+                    "lightweight_rca.trigger_error_in_trigger_autofix_task",
                     extra={"group_id": group_id},
                 )
         else:
diff --git a/src/sentry/seer/autofix/on_completion_hook.py b/src/sentry/seer/autofix/on_completion_hook.py
index b392eedd63f5..0f86910bb207 100644
--- a/src/sentry/seer/autofix/on_completion_hook.py
+++ b/src/sentry/seer/autofix/on_completion_hook.py
@@ -5,13 +5,11 @@
 
 from django.utils import timezone
 
-from sentry import analytics, features
-from sentry.analytics.events.autofix_events import AiAutofixPrCreatedCompletedEvent
+from sentry import features
 from sentry.models.group import Group
 from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.seer.autofix.autofix_agent import (
-    STEP_CONFIGS,
     AutofixStep,
     trigger_autofix_explorer,
     trigger_coding_agent_handoff,
@@ -138,8 +136,6 @@ def _send_step_webhook(
         # to find which step just completed
         webhook_action_type: SeerActionType | None = None
 
-        is_pr_created = False
-
         if current_step is not None:
             artifact = cls.find_latest_artifact_for_step(state, current_step)
             if artifact is not None:
@@ -170,15 +166,6 @@ def _send_step_webhook(
                     }
                     for pull_request in state.repo_pr_states.values()
                 ]
-                is_pr_created = True
-                analytics.record(
-                    AiAutofixPrCreatedCompletedEvent(
-                        organization_id=organization.id,
-                        project_id=group.project_id,
-                        group_id=group.id,
-                        referrer=None if current_referrer is None else current_referrer.value,
-                    )
-                )
             else:
                 webhook_action_type = SeerActionType.CODING_COMPLETED
                 diffs_by_repo = state.get_diffs_by_repo()
@@ -243,21 +230,11 @@ def _send_step_webhook(
                 },
             )
 
-        if current_step is not None and not is_pr_created:
+        if current_step is not None:
             referrer = current_referrer.value if current_referrer is not None else None
             metrics.incr(
                 "autofix.explorer.complete", tags={"step": current_step.value, "referrer": referrer}
             )
-            completed_event_cls = STEP_CONFIGS[current_step].completed_event
-            if completed_event_cls is not None:
-                analytics.record(
-                    completed_event_cls(
-                        organization_id=organization.id,
-                        project_id=group.project_id,
-                        group_id=group.id,
-                        referrer=referrer,
-                    )
-                )
 
     @classmethod
     def _maybe_trigger_supergroups_embedding(
diff --git a/src/sentry/seer/endpoints/group_ai_autofix.py b/src/sentry/seer/endpoints/group_ai_autofix.py
index a9c3bc6fa20b..d2ccb4f613c8 100644
--- a/src/sentry/seer/endpoints/group_ai_autofix.py
+++ b/src/sentry/seer/endpoints/group_ai_autofix.py
@@ -129,10 +129,6 @@ class ExplorerAutofixRequestSerializer(CamelSnakeSerializer):
         required=False,
         help_text="Optional repository name for which to create the pull request. Do not pass a repository name to create pull requests in all relevant repositories.",
     )
-    insert_index = serializers.IntegerField(
-        required=False,
-        help_text="Block index to insert at. When provided, truncates blocks after this point for retry-from-step.",
-    )
 
     def validate(self, data: dict[str, Any]) -> dict[str, Any]:
         stopping_point = data.get("stopping_point", None)
@@ -293,7 +289,6 @@ def _post_explorer(self, request: Request, group: Group) -> Response:
                 run_id=run_id,
                 intelligence_level=data["intelligence_level"],
                 user_context=data.get("user_context"),
-                insert_index=data.get("insert_index"),
             )
             return Response({"run_id": run_id}, status=status.HTTP_202_ACCEPTED)
         except SeerPermissionError as e:
diff --git a/src/sentry/seer/explorer/client_utils.py b/src/sentry/seer/explorer/client_utils.py
index fa0be21574d6..c05971dab8bc 100644
--- a/src/sentry/seer/explorer/client_utils.py
+++ b/src/sentry/seer/explorer/client_utils.py
@@ -345,7 +345,7 @@ def poll_until_done(
 def _render_node(node: dict[str, Any], depth: int) -> str:
     """Recursively render an LLMContextSnapshot node and its children as markdown."""
     heading = "#" * min(depth + 1, 6)
-    lines = [f"{heading} {(node.get('nodeType') or 'unknown').capitalize()}"]
+    lines = [f"{heading} {node.get('nodeType', 'unknown')}"]
 
     data = node.get("data")
     if isinstance(data, dict):
diff --git a/src/sentry/seer/signed_seer_api.py b/src/sentry/seer/signed_seer_api.py
index 33752a24de8b..f69c3bb11a0d 100644
--- a/src/sentry/seer/signed_seer_api.py
+++ b/src/sentry/seer/signed_seer_api.py
@@ -376,14 +376,6 @@ class SupergroupsEmbeddingRequest(TypedDict):
     artifact_data: dict[str, Any]
 
 
-class LightweightRCAClusterRequest(TypedDict):
-    group_id: int
-    issue: dict[str, Any]
-    organization_slug: str
-    organization_id: int
-    project_id: int
-
-
 class SupergroupsGetRequest(TypedDict):
     organization_id: int
     supergroup_id: int
@@ -394,22 +386,6 @@ class SupergroupsGetByGroupIdsRequest(TypedDict):
     group_ids: list[int]
 
 
-class SupergroupDetailData(TypedDict):
-    id: int
-    title: str
-    summary: str
-    error_type: str
-    code_area: str
-    group_ids: list[int]
-    project_ids: list[int]
-    created_at: str
-    updated_at: str
-
-
-class SupergroupsByGroupIdsResponse(TypedDict):
-    data: list[SupergroupDetailData]
-
-
 class ServiceMapUpdateRequest(TypedDict):
     organization_id: int
     nodes: list[dict[str, Any]]
@@ -509,20 +485,6 @@ def make_supergroups_embedding_request(
     )
 
 
-def make_lightweight_rca_cluster_request(
-    body: LightweightRCAClusterRequest,
-    timeout: int | float | None = None,
-    viewer_context: SeerViewerContext | None = None,
-) -> BaseHTTPResponse:
-    return make_signed_seer_api_request(
-        seer_autofix_default_connection_pool,
-        "/v0/issues/supergroups/cluster-lightweight",
-        body=orjson.dumps(body, option=orjson.OPT_NON_STR_KEYS),
-        timeout=timeout,
-        viewer_context=viewer_context,
-    )
-
-
 def make_supergroups_get_request(
     body: SupergroupsGetRequest,
     viewer_context: SeerViewerContext,
diff --git a/src/sentry/seer/supergroups/endpoints/organization_supergroups_by_group.py b/src/sentry/seer/supergroups/endpoints/organization_supergroups_by_group.py
index fc2c50de7a59..c3cadbddde86 100644
--- a/src/sentry/seer/supergroups/endpoints/organization_supergroups_by_group.py
+++ b/src/sentry/seer/supergroups/endpoints/organization_supergroups_by_group.py
@@ -16,7 +16,6 @@
 from sentry.models.organization import Organization
 from sentry.seer.signed_seer_api import (
     SeerViewerContext,
-    SupergroupsByGroupIdsResponse,
     make_supergroups_get_by_group_ids_request,
 )
 
@@ -56,19 +55,21 @@ def get(self, request: Request, organization: Organization) -> Response:
                 status=status_codes.HTTP_400_BAD_REQUEST,
             )
 
-        status_param = request.GET.get("status")
-        if status_param is not None and status_param not in STATUS_QUERY_CHOICES:
-            return Response(
-                {"detail": "Invalid status parameter"},
-                status=status_codes.HTTP_400_BAD_REQUEST,
-            )
-
-        valid_group_ids = set(
-            Group.objects.filter(
-                id__in=group_ids,
-                project__organization=organization,
-            ).values_list("id", flat=True)
+        group_qs = Group.objects.filter(
+            id__in=group_ids,
+            project__organization=organization,
         )
+
+        status_param = request.GET.get("status")
+        if status_param is not None:
+            if status_param not in STATUS_QUERY_CHOICES:
+                return Response(
+                    {"detail": "Invalid status parameter"},
+                    status=status_codes.HTTP_400_BAD_REQUEST,
+                )
+            group_qs = group_qs.filter(status=STATUS_QUERY_CHOICES[status_param])
+
+        valid_group_ids = set(group_qs.values_list("id", flat=True))
         group_ids = [gid for gid in group_ids if gid in valid_group_ids]
 
         if not group_ids:
@@ -89,31 +90,4 @@ def get(self, request: Request, organization: Organization) -> Response:
                 status=response.status,
             )
 
-        data: SupergroupsByGroupIdsResponse = orjson.loads(response.data)
-
-        if not status_param:
-            return Response(data)
-
-        # Seer returns all group_ids per supergroup regardless of status.
-        # We can't filter before the Seer call because Seer expands group_ids
-        # to include the full supergroup membership, not just the requested IDs.
-        # Instead, collect every group_id from the response, check status in
-        # bulk, and strip out non-matching ones.
-        all_response_group_ids: list[int] = []
-        for sg in data["data"]:
-            all_response_group_ids.extend(sg["group_ids"])
-
-        matching_ids = set(
-            Group.objects.filter(
-                id__in=all_response_group_ids,
-                project__organization=organization,
-                status=STATUS_QUERY_CHOICES[status_param],
-            ).values_list("id", flat=True)
-        )
-
-        for sg in data["data"]:
-            sg["group_ids"] = [gid for gid in sg["group_ids"] if gid in matching_ids]
-        # Drop supergroups that have no matching groups after filtering
-        data["data"] = [sg for sg in data["data"] if sg["group_ids"]]
-
-        return Response(data)
+        return Response(orjson.loads(response.data))
diff --git a/src/sentry/seer/supergroups/explorer_lightweight_rca.py b/src/sentry/seer/supergroups/lightweight_rca.py
similarity index 91%
rename from src/sentry/seer/supergroups/explorer_lightweight_rca.py
rename to src/sentry/seer/supergroups/lightweight_rca.py
index b7459db4394d..26cf86b9715a 100644
--- a/src/sentry/seer/supergroups/explorer_lightweight_rca.py
+++ b/src/sentry/seer/supergroups/lightweight_rca.py
@@ -10,7 +10,7 @@
 logger = logging.getLogger(__name__)
 
 
-def trigger_explorer_lightweight_rca(group: Group) -> int | None:
+def trigger_lightweight_rca(group: Group) -> int | None:
     """
     Trigger a lightweight Explorer RCA run for the given group.
 
@@ -26,7 +26,7 @@ def trigger_explorer_lightweight_rca(group: Group) -> int | None:
     """
     has_feature = features.has("projects:supergroup-lightweight-rca", group.project)
     logger.info(
-        "explorer_lightweight_rca.feature_flag_check",
+        "lightweight_rca.feature_flag_check",
         extra={
             "group_id": group.id,
             "project_id": group.project.id,
@@ -66,7 +66,7 @@ def trigger_explorer_lightweight_rca(group: Group) -> int | None:
         )
 
         logger.info(
-            "explorer_lightweight_rca.starting_run",
+            "lightweight_rca.starting_run",
             extra={
                 "group_id": group.id,
                 "project_id": group.project.id,
@@ -83,7 +83,7 @@ def trigger_explorer_lightweight_rca(group: Group) -> int | None:
         )
 
         logger.info(
-            "explorer_lightweight_rca.run_started",
+            "lightweight_rca.run_started",
             extra={
                 "group_id": group.id,
                 "project_id": group.project.id,
@@ -94,7 +94,7 @@ def trigger_explorer_lightweight_rca(group: Group) -> int | None:
         return run_id
     except Exception:
         logger.exception(
-            "explorer_lightweight_rca.trigger_failed",
+            "lightweight_rca.trigger_failed",
             extra={
                 "group_id": group.id,
                 "organization_id": group.organization.id,
diff --git a/src/sentry/seer/supergroups/lightweight_rca_cluster.py b/src/sentry/seer/supergroups/lightweight_rca_cluster.py
deleted file mode 100644
index e8920463d998..000000000000
--- a/src/sentry/seer/supergroups/lightweight_rca_cluster.py
+++ /dev/null
@@ -1,68 +0,0 @@
-from __future__ import annotations
-
-import logging
-
-from sentry.api.serializers import EventSerializer, serialize
-from sentry.eventstore import backend as eventstore
-from sentry.models.group import Group
-from sentry.seer.models import SeerApiError
-from sentry.seer.signed_seer_api import (
-    LightweightRCAClusterRequest,
-    SeerViewerContext,
-    make_lightweight_rca_cluster_request,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def trigger_lightweight_rca_cluster(group: Group) -> None:
-    """
-    Call Seer's lightweight RCA clustering endpoint for the given group.
-
-    Sends issue event data to Seer, which generates a lightweight root cause analysis
-    and clusters the issue into supergroups based on embedding similarity.
-    """
-    event = group.get_latest_event()
-    if not event:
-        logger.info(
-            "lightweight_rca_cluster.no_event",
-            extra={"group_id": group.id},
-        )
-        return
-
-    ready_event = eventstore.get_event_by_id(group.project.id, event.event_id, group_id=group.id)
-    if not ready_event:
-        logger.info(
-            "lightweight_rca_cluster.event_not_ready",
-            extra={"group_id": group.id, "event_id": event.event_id},
-        )
-        return
-
-    serialized_event = serialize(ready_event, None, EventSerializer())
-
-    body = LightweightRCAClusterRequest(
-        group_id=group.id,
-        issue={
-            "id": group.id,
-            "title": group.title,
-            "short_id": group.qualified_short_id,
-            "events": [serialized_event],
-        },
-        organization_slug=group.organization.slug,
-        organization_id=group.organization.id,
-        project_id=group.project.id,
-    )
-    viewer_context = SeerViewerContext(organization_id=group.organization.id)
-
-    response = make_lightweight_rca_cluster_request(body, timeout=30, viewer_context=viewer_context)
-    if response.status >= 400:
-        raise SeerApiError("Lightweight RCA cluster request failed", response.status)
-
-    logger.info(
-        "lightweight_rca_cluster.success",
-        extra={
-            "group_id": group.id,
-            "project_id": group.project.id,
-            "organization_id": group.organization.id,
-        },
-    )
diff --git a/src/sentry/snuba/snuba_query_validator.py b/src/sentry/snuba/snuba_query_validator.py
index bb906fc01d23..6f151d6ccfe3 100644
--- a/src/sentry/snuba/snuba_query_validator.py
+++ b/src/sentry/snuba/snuba_query_validator.py
@@ -24,7 +24,6 @@
 )
 from sentry.incidents.utils.constants import INCIDENTS_SNUBA_SUBSCRIPTION_TYPE
 from sentry.models.project import Project
-from sentry.search.eap.constants import VALID_GRANULARITIES
 from sentry.search.eap.trace_metrics.validator import validate_trace_metrics_aggregate
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.entity_subscription import (
@@ -52,13 +51,6 @@
 # Allowed time windows (in seconds) for crash rate alerts
 CRASH_RATE_ALERTS_ALLOWED_TIME_WINDOWS = [1800, 3600, 7200, 14400, 43200, 86400]
 
-MIN_EAP_ALERT_TIME_WINDOW_SECONDS = 300
-
-# Valid time windows for EAP alerts: valid Snuba granularities at or above the alert minimum.
-EAP_ALERTS_ALLOWED_TIME_WINDOWS = sorted(
-    g for g in VALID_GRANULARITIES if g >= MIN_EAP_ALERT_TIME_WINDOW_SECONDS
-)
-
 
 QUERY_TYPE_VALID_DATASETS = {
     SnubaQuery.Type.ERROR: {Dataset.Events},
@@ -338,8 +330,6 @@ def _validate_query(self, data: dict[str, Any]) -> None:
         # TODO(edward): Bypass snql query validation for EAP queries. Do we need validation for rpc requests?
         if dataset != Dataset.EventsAnalyticsPlatform:
             self._validate_snql_query(data, entity_subscription, projects)
-        else:
-            self._validate_time_window(data["time_window"], dataset)
 
     def _validate_snql_query(
         self,
@@ -401,10 +391,9 @@ def _validate_time_window(self, value: int, dataset: Dataset) -> int:
                     "30min, 1h, 2h, 4h, 12h and 24h"
                 )
         if dataset == Dataset.EventsAnalyticsPlatform:
-            if time_window_seconds not in EAP_ALERTS_ALLOWED_TIME_WINDOWS:
+            if time_window_seconds < 300:
                 raise serializers.ValidationError(
-                    f"Invalid Time Window: Allowed time windows (in seconds) for this alert type are: "
-                    f"{EAP_ALERTS_ALLOWED_TIME_WINDOWS}"
+                    "Invalid Time Window: Time window for this alert type must be at least 5 minutes."
                 )
         return time_window_seconds
 
diff --git a/src/sentry/spans/consumers/process_segments/factory.py b/src/sentry/spans/consumers/process_segments/factory.py
index a4132c15f4ed..808ad9441035 100644
--- a/src/sentry/spans/consumers/process_segments/factory.py
+++ b/src/sentry/spans/consumers/process_segments/factory.py
@@ -115,10 +115,7 @@ def _process_message(
     try:
         value = message.payload.value
         segment = orjson.loads(value)
-        skip_enrichment = segment.get("skip_enrichment", False)
-        processed = process_segment(
-            segment["spans"], skip_produce=skip_produce, skip_enrichment=skip_enrichment
-        )
+        processed = process_segment(segment["spans"], skip_produce=skip_produce)
         return [_serialize_payload(span, message.timestamp) for span in processed]
     except Exception:
         logger.exception("segments.invalid-message")
diff --git a/src/sentry/spans/consumers/process_segments/message.py b/src/sentry/spans/consumers/process_segments/message.py
index 84e7a7b37590..dc86f59face9 100644
--- a/src/sentry/spans/consumers/process_segments/message.py
+++ b/src/sentry/spans/consumers/process_segments/message.py
@@ -50,7 +50,7 @@
 
 @metrics.wraps("spans.consumers.process_segments.process_segment")
 def process_segment(
-    unprocessed_spans: list[SpanEvent], skip_produce: bool = False, skip_enrichment: bool = False
+    unprocessed_spans: list[SpanEvent], skip_produce: bool = False
 ) -> list[CompatibleSpan]:
     sample_rate = (
         settings.SENTRY_PROCESS_SEGMENTS_TRANSACTIONS_SAMPLE_RATE
@@ -62,17 +62,14 @@ def process_segment(
             "sample_rate": sample_rate,
         },
     ):
-        return _process_segment(unprocessed_spans, skip_produce, skip_enrichment)
+        return _process_segment(unprocessed_spans, skip_produce)
 
 
 def _process_segment(
-    unprocessed_spans: list[SpanEvent], skip_produce: bool, skip_enrichment: bool
+    unprocessed_spans: list[SpanEvent], skip_produce: bool
 ) -> list[CompatibleSpan]:
     _verify_compatibility(unprocessed_spans)
 
-    if skip_enrichment:
-        return [make_compatible(span) for span in unprocessed_spans]
-
     if unprocessed_spans:
         project_id = unprocessed_spans[0].get("project_id")
         if project_id in options.get("spans.process-segments.skip-enrichment-projects"):
diff --git a/src/sentry/synapse/endpoints/org_cell_mappings.py b/src/sentry/synapse/endpoints/org_cell_mappings.py
index c713117440a1..41ca5ff65623 100644
--- a/src/sentry/synapse/endpoints/org_cell_mappings.py
+++ b/src/sentry/synapse/endpoints/org_cell_mappings.py
@@ -3,7 +3,7 @@
 
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import Endpoint, internal_control_silo_endpoint
+from sentry.api.base import Endpoint, control_silo_endpoint
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.synapse.endpoints.authentication import (
     SynapseAuthPermission,
@@ -13,7 +13,7 @@
 from sentry.types.cell import get_global_directory
 
 
-@internal_control_silo_endpoint
+@control_silo_endpoint
 class OrgCellMappingsEndpoint(Endpoint):
     """
     Returns the organization-to-cell mappings for all orgs in pages.
diff --git a/src/sentry/synapse/endpoints/project_key_cell_mappings.py b/src/sentry/synapse/endpoints/project_key_cell_mappings.py
index ab90438737ba..207c32bd7ad3 100644
--- a/src/sentry/synapse/endpoints/project_key_cell_mappings.py
+++ b/src/sentry/synapse/endpoints/project_key_cell_mappings.py
@@ -3,7 +3,7 @@
 
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
-from sentry.api.base import Endpoint, internal_control_silo_endpoint
+from sentry.api.base import Endpoint, control_silo_endpoint
 from sentry.models.projectkeymapping import ProjectKeyMapping
 from sentry.synapse.endpoints.authentication import (
     SynapseAuthPermission,
@@ -13,7 +13,7 @@
 from sentry.types.cell import get_global_directory
 
 
-@internal_control_silo_endpoint
+@control_silo_endpoint
 class ProjectKeyCellMappingsEndpoint(Endpoint):
     """
     Returns the project-key-to-cell mappings for all project keys in pages.
diff --git a/src/sentry/tasks/post_process.py b/src/sentry/tasks/post_process.py
index a7d5ac582ad2..f4d8390e65c6 100644
--- a/src/sentry/tasks/post_process.py
+++ b/src/sentry/tasks/post_process.py
@@ -1584,22 +1584,6 @@ def kick_off_seer_automation(job: PostProcessJob) -> None:
             )
 
 
-def kick_off_lightweight_rca_cluster(job: PostProcessJob) -> None:
-    from sentry.tasks.seer.lightweight_rca_cluster import trigger_lightweight_rca_cluster_task
-
-    if not job["group_state"]["is_new"]:
-        return
-
-    event = job["event"]
-    group = event.group
-
-    enabled_orgs: list[int] = options.get("supergroups.lightweight-enabled-orgs")
-    if group.organization.id not in enabled_orgs:
-        return
-
-    trigger_lightweight_rca_cluster_task.delay(group.id)
-
-
 GROUP_CATEGORY_POST_PROCESS_PIPELINE: dict[
     GroupCategory, list[Callable[[PostProcessJob], None]]
 ] = {
@@ -1612,7 +1596,6 @@ def kick_off_lightweight_rca_cluster(job: PostProcessJob) -> None:
         handle_owner_assignment,
         handle_auto_assignment,
         kick_off_seer_automation,
-        kick_off_lightweight_rca_cluster,
         process_workflow_engine_issue_alerts,
         process_resource_change_bounds,
         process_data_forwarding,
diff --git a/src/sentry/tasks/seer/lightweight_rca_cluster.py b/src/sentry/tasks/seer/lightweight_rca_cluster.py
deleted file mode 100644
index 9d8abcbb4dc7..000000000000
--- a/src/sentry/tasks/seer/lightweight_rca_cluster.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import logging
-
-from sentry.models.group import Group
-from sentry.seer.supergroups.lightweight_rca_cluster import trigger_lightweight_rca_cluster
-from sentry.tasks.base import instrumented_task
-from sentry.taskworker.namespaces import ingest_errors_tasks
-
-logger = logging.getLogger(__name__)
-
-
-@instrumented_task(
-    name="sentry.tasks.seer.lightweight_rca_cluster.trigger_lightweight_rca_cluster_task",
-    namespace=ingest_errors_tasks,
-)
-def trigger_lightweight_rca_cluster_task(group_id: int, **kwargs) -> None:
-    try:
-        group = Group.objects.get(id=group_id)
-    except Group.DoesNotExist:
-        logger.info(
-            "lightweight_rca_cluster_task.group_not_found",
-            extra={"group_id": group_id},
-        )
-        return
-
-    try:
-        trigger_lightweight_rca_cluster(group)
-    except Exception:
-        logger.exception(
-            "lightweight_rca_cluster_task.failed",
-            extra={"group_id": group_id},
-        )
-        raise
diff --git a/src/sentry/tasks/seer/night_shift.py b/src/sentry/tasks/seer/night_shift.py
deleted file mode 100644
index 74407c0b4ba2..000000000000
--- a/src/sentry/tasks/seer/night_shift.py
+++ /dev/null
@@ -1,116 +0,0 @@
-from __future__ import annotations
-
-import logging
-from collections.abc import Sequence
-from datetime import timedelta
-
-import sentry_sdk
-
-from sentry import features, options
-from sentry.models.organization import Organization, OrganizationStatus
-from sentry.tasks.base import instrumented_task
-from sentry.taskworker.namespaces import seer_tasks
-from sentry.utils.iterators import chunked
-from sentry.utils.query import RangeQuerySetWrapper
-
-logger = logging.getLogger("sentry.tasks.seer.night_shift")
-
-NIGHT_SHIFT_DISPATCH_STEP_SECONDS = 37
-NIGHT_SHIFT_SPREAD_DURATION = timedelta(hours=4)
-
-FEATURE_NAMES = [
-    "organizations:seer-night-shift",
-    "organizations:gen-ai-features",
-]
-
-
-@instrumented_task(
-    name="sentry.tasks.seer.night_shift.schedule_night_shift",
-    namespace=seer_tasks,
-    processing_deadline_duration=15 * 60,
-)
-def schedule_night_shift() -> None:
-    """
-    Nightly scheduler: iterates active orgs in batches, checks feature flags
-    in bulk, and dispatches per-org worker tasks with jitter.
-    """
-    if not options.get("seer.night_shift.enable"):
-        return
-
-    spread_seconds = int(NIGHT_SHIFT_SPREAD_DURATION.total_seconds())
-    batch_index = 0
-
-    for org_batch in chunked(
-        RangeQuerySetWrapper[Organization](
-            Organization.objects.filter(status=OrganizationStatus.ACTIVE),
-            step=1000,
-        ),
-        100,
-    ):
-        for org in _get_eligible_orgs_from_batch(org_batch):
-            if bool(org.get_option("sentry:hide_ai_features")):
-                continue
-
-            delay = (batch_index * NIGHT_SHIFT_DISPATCH_STEP_SECONDS) % spread_seconds
-
-            run_night_shift_for_org.apply_async(
-                args=[org.id],
-                countdown=delay,
-            )
-            batch_index += 1
-
-    logger.info(
-        "night_shift.schedule_complete",
-        extra={"orgs_dispatched": batch_index},
-    )
-
-
-@instrumented_task(
-    name="sentry.tasks.seer.night_shift.run_night_shift_for_org",
-    namespace=seer_tasks,
-    processing_deadline_duration=5 * 60,
-)
-def run_night_shift_for_org(organization_id: int) -> None:
-    try:
-        organization = Organization.objects.get(
-            id=organization_id, status=OrganizationStatus.ACTIVE
-        )
-    except Organization.DoesNotExist:
-        return
-
-    sentry_sdk.set_tags(
-        {
-            "organization_id": organization.id,
-            "organization_slug": organization.slug,
-        }
-    )
-
-    logger.info(
-        "night_shift.org_dispatched",
-        extra={
-            "organization_id": organization_id,
-            "organization_slug": organization.slug,
-        },
-    )
-
-
-def _get_eligible_orgs_from_batch(
-    orgs: Sequence[Organization],
-) -> list[Organization]:
-    """
-    Check feature flags for a batch of orgs using batch_has_for_organizations.
-    Returns orgs that have all required feature flags enabled.
-    """
-    eligible = list(orgs)
-
-    for feature_name in FEATURE_NAMES:
-        batch_result = features.batch_has_for_organizations(feature_name, eligible)
-        if batch_result is None:
-            raise RuntimeError(f"batch_has_for_organizations returned None for {feature_name}")
-
-        eligible = [org for org in eligible if batch_result.get(f"organization:{org.id}", False)]
-
-        if not eligible:
-            return []
-
-    return eligible
diff --git a/src/sentry/viewer_context.py b/src/sentry/viewer_context.py
index 0e1926a67c06..b3c28788efc0 100644
--- a/src/sentry/viewer_context.py
+++ b/src/sentry/viewer_context.py
@@ -62,19 +62,6 @@ def serialize(self) -> dict[str, Any]:
             result["token"] = {"kind": self.token.kind, "scopes": list(self.token.get_scopes())}
         return result
 
-    @classmethod
-    def deserialize(cls, data: dict[str, Any]) -> ViewerContext:
-        """Reconstruct from a serialized dict. Token is not deserialized."""
-        try:
-            actor_type = ActorType(data.get("actor_type", "unknown"))
-        except ValueError:
-            actor_type = ActorType.UNKNOWN
-        return cls(
-            organization_id=data.get("organization_id"),
-            user_id=data.get("user_id"),
-            actor_type=actor_type,
-        )
-
 
 @contextlib.contextmanager
 def viewer_context_scope(ctx: ViewerContext) -> Generator[None]:
diff --git a/src/sentry/workflow_engine/defaults/workflows.py b/src/sentry/workflow_engine/defaults/workflows.py
deleted file mode 100644
index 058cec2654c3..000000000000
--- a/src/sentry/workflow_engine/defaults/workflows.py
+++ /dev/null
@@ -1,116 +0,0 @@
-from typing import Sequence
-
-from django.db import router, transaction
-
-from sentry.models.organization import Organization
-from sentry.models.project import Project
-from sentry.notifications.models.notificationaction import ActionTarget
-from sentry.notifications.types import FallthroughChoiceType
-from sentry.workflow_engine.defaults.detectors import _ensure_detector
-from sentry.workflow_engine.models import (
-    Action,
-    DataCondition,
-    DataConditionGroup,
-    DataConditionGroupAction,
-    DetectorWorkflow,
-    Workflow,
-    WorkflowDataConditionGroup,
-)
-from sentry.workflow_engine.models.data_condition import Condition
-from sentry.workflow_engine.typings.grouptype import IssueStreamGroupType
-
-DEFAULT_WORKFLOW_LABEL = "Send a notification for high priority issues"
-
-
-def connect_workflows_to_issue_stream(
-    project: Project,
-    workflows: list[Workflow],
-) -> Sequence[DetectorWorkflow]:
-    # Because we don't know if this signal is handled already or not...
-    issue_stream_detector = _ensure_detector(project, IssueStreamGroupType.slug)
-
-    connections = [
-        DetectorWorkflow(
-            workflow=workflow,
-            detector=issue_stream_detector,
-        )
-        for workflow in workflows
-    ]
-    return DetectorWorkflow.objects.bulk_create(
-        connections,
-        ignore_conflicts=True,
-    )
-
-
-def create_priority_workflow(org: Organization) -> Workflow:
-    existing = Workflow.objects.filter(organization=org, name=DEFAULT_WORKFLOW_LABEL).first()
-    if existing:
-        return existing
-
-    with transaction.atomic(router.db_for_write(Workflow)):
-        when_condition_group = DataConditionGroup.objects.create(
-            logic_type=DataConditionGroup.Type.ANY_SHORT_CIRCUIT,
-            organization=org,
-        )
-
-        workflow = Workflow.objects.create(
-            organization=org,
-            name=DEFAULT_WORKFLOW_LABEL,
-            when_condition_group=when_condition_group,
-            config={"frequency": 0},
-        )
-
-        # Create the workflow trigger conditions
-        conditions: list[DataCondition] = []
-        conditions.append(
-            DataCondition(
-                type=Condition.NEW_HIGH_PRIORITY_ISSUE,
-                condition_group=workflow.when_condition_group,
-                comparison=True,
-                condition_result=True,
-            )
-        )
-        conditions.append(
-            DataCondition(
-                type=Condition.EXISTING_HIGH_PRIORITY_ISSUE,
-                condition_group=workflow.when_condition_group,
-                comparison=True,
-                condition_result=True,
-            )
-        )
-        DataCondition.objects.bulk_create(conditions)
-
-        # Create the Action
-        action_filter = DataConditionGroup.objects.create(
-            logic_type=DataConditionGroup.Type.ANY_SHORT_CIRCUIT,
-            organization=org,
-        )
-
-        action = Action.objects.create(
-            type=Action.Type.EMAIL,
-            config={
-                "target_type": ActionTarget.ISSUE_OWNERS,
-                "target_identifier": None,
-            },
-            data={
-                "fallthrough_type": FallthroughChoiceType.ACTIVE_MEMBERS.value,
-            },
-        )
-        DataConditionGroupAction.objects.create(
-            action=action,
-            condition_group=action_filter,
-        )
-
-        WorkflowDataConditionGroup.objects.create(
-            workflow=workflow,
-            condition_group=action_filter,
-        )
-
-    return workflow
-
-
-def ensure_default_workflows(project: Project) -> list[Workflow]:
-    workflows = [create_priority_workflow(project.organization)]
-    connect_workflows_to_issue_stream(project, workflows)
-
-    return workflows
diff --git a/src/sentry/workflow_engine/migration_helpers/issue_alert_migration.py b/src/sentry/workflow_engine/migration_helpers/issue_alert_migration.py
index 88966534a528..29a4edf3354c 100644
--- a/src/sentry/workflow_engine/migration_helpers/issue_alert_migration.py
+++ b/src/sentry/workflow_engine/migration_helpers/issue_alert_migration.py
@@ -77,7 +77,7 @@ def run(self) -> Workflow:
 
         return workflow
 
-    def _create_detector_lookups(self) -> list[Detector]:
+    def _create_detector_lookups(self) -> list[Detector | None]:
         if self.rule.source == RuleSource.CRON_MONITOR:
             # Find the cron detector that was created before the rule
             monitor_slug = None
@@ -87,7 +87,7 @@ def _create_detector_lookups(self) -> list[Detector]:
                     break
 
             if not monitor_slug:
-                return []
+                return [None]
 
             try:
                 with in_test_hide_transaction_boundary():
@@ -105,7 +105,7 @@ def _create_detector_lookups(self) -> list[Detector]:
             except (Monitor.DoesNotExist, Detector.DoesNotExist):
                 pass
 
-            return []
+            return [None]
 
         if self.is_dry_run:
             error_detector = Detector.objects.filter(
@@ -135,30 +135,13 @@ def _create_detector_lookups(self) -> list[Detector]:
                 defaults={"config": {}, "name": ISSUE_STREAM_DETECTOR_NAME},
             )
 
-        # We are not returning the error_detector here to simplify
-        # _connect_default_detectors
-        return [issue_stream_detector]
+        return [error_detector, issue_stream_detector]
 
     def _connect_default_detectors(self, workflow: Workflow) -> None:
         default_detectors = self._create_detector_lookups()
-
-        # do not add references to both issue stream and error group types
-        # it seems like other types might be relying on this as well,
-        # so this just says not to link the error groups.
-        # TODO - provide helpers to more easily create these classes
-        # and references in code, so we can remove the reliance on this code
-        references_to_create = [
-            DetectorWorkflow(
-                detector=detector,
-                workflow=workflow,
-            )
-            for detector in default_detectors
-        ]
-
-        DetectorWorkflow.objects.bulk_create(
-            references_to_create,
-            ignore_conflicts=True,
-        )
+        for detector in default_detectors:
+            if detector:
+                DetectorWorkflow.objects.get_or_create(detector=detector, workflow=workflow)
 
     def _bulk_create_data_conditions(
         self,
diff --git a/src/sentry/workflow_engine/receivers/__init__.py b/src/sentry/workflow_engine/receivers/__init__.py
index f5aadccdd370..0434ce88dd83 100644
--- a/src/sentry/workflow_engine/receivers/__init__.py
+++ b/src/sentry/workflow_engine/receivers/__init__.py
@@ -6,6 +6,5 @@
 from .detector import *  # NOQA
 from .detector_workflow import *  # NOQA
 from .project_detectors import *  # noqa: F401,F403
-from .project_workflows import *  # noqa: F401,F403
 from .workflow import *  # NOQA
 from .workflow_data_condition_group import *  # NOQA
diff --git a/static/app/actionCreators/organizations.tsx b/static/app/actionCreators/organizations.tsx
index 427732153421..738deb780471 100644
--- a/static/app/actionCreators/organizations.tsx
+++ b/static/app/actionCreators/organizations.tsx
@@ -234,7 +234,7 @@ export async function fetchOrganizations(api: Client, query?: Record<string, any
   const regions = ConfigStore.get('memberRegions');
   const results = await Promise.all(
     regions.map(region =>
-      api.requestPromise('/organizations/', {
+      api.requestPromise(`/organizations/`, {
         host: region.url,
         query,
         // Authentication errors can happen as we span regions.
diff --git a/static/app/bootstrap/initializeSdk.spec.tsx b/static/app/bootstrap/initializeSdk.spec.tsx
index 4b4c48eb784a..b4bb71e5a1db 100644
--- a/static/app/bootstrap/initializeSdk.spec.tsx
+++ b/static/app/bootstrap/initializeSdk.spec.tsx
@@ -162,7 +162,7 @@ describe('isFilteredRequestErrorEvent', () => {
   });
 
   describe('non-matching error type, non-matching message', () => {
-    it('rejects other errors', () => {
+    it(`rejects other errors`, () => {
       const event = {
         exception: {
           values: [{type: 'UncaughtSquirrelError', value: 'Squirrel was not caught'}],
@@ -172,7 +172,7 @@ describe('isFilteredRequestErrorEvent', () => {
       expect(isFilteredRequestErrorEvent(event)).toBeFalsy();
     });
 
-    it('rejects other errors as causes', () => {
+    it(`rejects other errors as causes`, () => {
       const event = {
         exception: {
           values: [
diff --git a/static/app/components/aiPrivacyTooltip.tsx b/static/app/components/aiPrivacyTooltip.tsx
index 64eabddb91bb..0d1b1a902c99 100644
--- a/static/app/components/aiPrivacyTooltip.tsx
+++ b/static/app/components/aiPrivacyTooltip.tsx
@@ -33,7 +33,7 @@ export function AiPrivacyNotice({linkProps = {}}: AiPrivacyNoticeProps) {
  * A shortened version of the privacy noice, useful for tooltips or places where space is limited.
  */
 function AiPrivacyNoticeShort({linkProps = {}}: AiPrivacyNoticeProps) {
-  return tct('Powered by genAI. [link:Learn more.]', {
+  return tct(`Powered by genAI. [link:Learn more.]`, {
     link: <ExternalLink href={AI_PRIVACY_NOTICE_LINK} {...linkProps} />,
   });
 }
diff --git a/static/app/components/alerts/unsupportedAlert.tsx b/static/app/components/alerts/unsupportedAlert.tsx
index a578b7cc1068..7bc8084d9949 100644
--- a/static/app/components/alerts/unsupportedAlert.tsx
+++ b/static/app/components/alerts/unsupportedAlert.tsx
@@ -13,10 +13,10 @@ export function UnsupportedAlert({featureName, projectSlug}: Props) {
     <Alert.Container>
       <Alert data-test-id="unsupported-alert" variant="info" icon={<IconInfo />}>
         {projectSlug ? (
-          <strong>{t("%s isn't available for %s.", featureName, projectSlug)}</strong>
+          <strong>{t(`%s isn't available for %s.`, featureName, projectSlug)}</strong>
         ) : (
           <strong>
-            {t("%s isn't available for the selected projects.", featureName)}
+            {t(`%s isn't available for the selected projects.`, featureName)}
           </strong>
         )}
       </Alert>
diff --git a/static/app/components/animatedSentryLogo.tsx b/static/app/components/animatedSentryLogo.tsx
deleted file mode 100644
index afc089e5b5f1..000000000000
--- a/static/app/components/animatedSentryLogo.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import {useId} from 'react';
-import {useTheme} from '@emotion/react';
-
-interface AnimatedSentryLogoProps {
-  /**
-   * Draw progress from 0 (no stroke) to 1 (fully drawn).
-   * Uses the stroke-dashoffset technique from the app loading screen.
-   */
-  progress: number;
-  className?: string;
-  size?: number;
-}
-
-const DASH_TOTAL = 1150;
-
-// Filled glyph (same path as index.ejs base + mask)
-const SENTRY_GLYPH =
-  'M223.687 85.56a28.02 28.02 0 0 0-24-13.559 28.02 28.02 0 0 0-24 13.559l-39.48 67.62a193.26 193.26 0 0 1 106.5 159.96h-27.72a166.07 166.07 0 0 0-92.76-136.32L85.687 240a95.52 95.52 0 0 1 55.38 73.02h-63.66a4.55 4.55 0 0 1-3.659-2.325 4.56 4.56 0 0 1-.06-4.335l17.64-30a64.4 64.4 0 0 0-20.16-11.4l-17.46 30a27.24 27.24 0 0 0 2.023 30.435 27.2 27.2 0 0 0 8.116 7.005 27.96 27.96 0 0 0 13.56 3.6h87.18a116.41 116.41 0 0 0-48-103.86l13.86-24a143.22 143.22 0 0 1 61.8 127.86h73.86a215.28 215.28 0 0 0-98.46-190.8l28.02-48a4.62 4.62 0 0 1 6.3-1.62c3.18 1.74 121.74 208.62 123.96 211.02a4.562 4.562 0 0 1-4.08 6.78h-28.56q.54 11.46 0 22.86h28.68a27.54 27.54 0 0 0 27.72-27.66 26.94 26.94 0 0 0-3.72-13.68z';
-
-// Stroke paths that trace the logo outline (one group from index.ejs)
-const STROKE_PATHS = [
-  'm82.8 253.5-12.7 22-12.5 21.2-.2.3v.1l-.2.2v.3a24 24 0 00.3 22.4l.3.6A24 24 0 0076.4 332h87l-3.2-21.8A115 115 0 00112 233l17.6-30.4a147 147 0 0166.8 112l1.3 17.5h65.6l-1.3-20.2a212 212 0 00-99.3-165.8l29.6-50.8a9 9 0 013.3-3.1 9 9 0 0112.1 3.1l122.2 209.2h.1a8 8 0 011 4v.2a8.5 8.5 0 01-8.6 8.5h-38.9',
-  'M92.5 268.7 88 276.6 71.4 305v.1a8 8 0 000 7.2l.2.4a8 8 0 006 3.4h67.3l-.6-3.4A99 99 0 0097.2 242.5l-6.8-4 33.4-57.8 6.9 4a163 163 0 0181.6 128.8l.2 2.7h33.7L246 313A196 196 0 00147.8 155.7l-7-4L178.6 87v-.1a25 25 0 0133-9.1l.8.3a25 25 0 019 8.9h.1v.2L343.7 296.4a24 24 0 013.3 12v.4a24.5 24.5 0 01-24.6 24.4H291.5',
-  'M85.7 264.5l-8.7 15-12.5 21.3-.1.2-.1.3A15.6 15.6 0 0076.9 324h77.2l-1.8-12.6a107 107 0 00-51-75.8l25.5-44.1A155 155 0 01204.3 314l.8 10.1h49.7l-.8-11.7A204 204 0 00151.8 148.9l33.6-57.7a17 17 0 0129.2 0L336.8 300.4a16 16 0 012.2 8.2 16.5 16.5 0 01-16.6 16.6H291.5',
-];
-
-/**
- * Sentry brand mark with stroke-draw progress, adapted from the app
- * loading animation in static/index.ejs. Single color, progress-driven
- * instead of the looping multicolor original.
- */
-export function AnimatedSentryLogo({
-  progress,
-  size = 72,
-  className,
-}: AnimatedSentryLogoProps) {
-  const theme = useTheme();
-  const id = useId();
-  const gooId = `goo-layer-${id}`;
-  const maskId = `mask-layer-${id}`;
-
-  const dashOffset = DASH_TOTAL * (1 - progress);
-
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 400 400"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      className={className}
-      role="img"
-      aria-label="Sentry"
-    >
-      <defs>
-        <filter id={gooId}>
-          <feGaussianBlur in="SourceGraphic" stdDeviation="8" result="blur" />
-          <feColorMatrix
-            in="blur"
-            type="matrix"
-            values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 36 -4"
-            result="goo"
-          />
-          <feComposite in="SourceGraphic" in2="goo" operator="atop" />
-        </filter>
-      </defs>
-
-      <mask
-        id={maskId}
-        width="300"
-        height="265"
-        x="50"
-        y="72"
-        maskUnits="userSpaceOnUse"
-        style={{maskType: 'alpha'}}
-      >
-        <path fill={theme.tokens.content.accent} d={SENTRY_GLYPH} />
-      </mask>
-
-      {/* Muted base shape */}
-      <path fill={theme.tokens.graphics.neutral.muted} d={SENTRY_GLYPH} />
-
-      {/* Stroke-draw overlay, masked to the logo shape */}
-      <g
-        mask={`url(#${maskId})`}
-        filter={`url(#${gooId})`}
-        stroke={theme.tokens.content.accent}
-        strokeWidth="5"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      >
-        {STROKE_PATHS.map((d, i) => (
-          <path
-            key={i}
-            d={d}
-            strokeDasharray={DASH_TOTAL}
-            strokeDashoffset={dashOffset}
-            style={{transition: 'stroke-dashoffset 600ms ease-out'}}
-          />
-        ))}
-      </g>
-    </svg>
-  );
-}
diff --git a/static/app/components/assistant/getGuidesContent.tsx b/static/app/components/assistant/getGuidesContent.tsx
index 39b7e0ff26af..5d03a5aefc89 100644
--- a/static/app/components/assistant/getGuidesContent.tsx
+++ b/static/app/components/assistant/getGuidesContent.tsx
@@ -26,7 +26,7 @@ export function getGuidesContent(): GuidesContent {
           title: t('Find problematic releases'),
           target: 'issue_sidebar_releases',
           description: t(
-            'See which release introduced the issue and which release it last appeared in.'
+            `See which release introduced the issue and which release it last appeared in.`
           ),
         },
         {
@@ -42,7 +42,7 @@ export function getGuidesContent(): GuidesContent {
           title: t('Pinpoint hotspots'),
           target: 'issue_sidebar_tags',
           description: t(
-            'Tags are key/value string pairs that are automatically indexed and searchable in Sentry.'
+            `Tags are key/value string pairs that are automatically indexed and searchable in Sentry.`
           ),
         },
         {
@@ -98,14 +98,14 @@ export function getGuidesContent(): GuidesContent {
           title: t('Event Breakdown'),
           target: 'trace_view_guide_breakdown',
           description: t(
-            'The event breakdown shows you the breakdown of event types within a trace.'
+            `The event breakdown shows you the breakdown of event types within a trace.`
           ),
         },
         {
           title: t('Events'),
           target: 'trace_view_guide_row',
           description: t(
-            'You can quickly see errors and transactions in a trace alongside the project, transaction duration and any errors or performance issues related to the transaction.'
+            `You can quickly see errors and transactions in a trace alongside the project, transaction duration and any errors or performance issues related to the transaction.`
           ),
         },
         {
diff --git a/static/app/components/carousel.tsx b/static/app/components/carousel.tsx
index eaf62146f2b6..ffff09b23639 100644
--- a/static/app/components/carousel.tsx
+++ b/static/app/components/carousel.tsx
@@ -97,7 +97,7 @@ const CarouselItems = styled('div')`
 
 const StyledArrowButton = styled(Button)<{direction: string}>`
   position: absolute;
-  ${p => (p.direction === 'left' ? 'left: 0;' : 'right: 0;')}
+  ${p => (p.direction === 'left' ? `left: 0;` : `right: 0;`)}
   top: 0;
   bottom: 0;
   height: 36px;
diff --git a/static/app/components/charts/chartWidgetLoader.stories.tsx b/static/app/components/charts/chartWidgetLoader.stories.tsx
index 6d2417a9c210..14a362dbe60d 100644
--- a/static/app/components/charts/chartWidgetLoader.stories.tsx
+++ b/static/app/components/charts/chartWidgetLoader.stories.tsx
@@ -31,7 +31,7 @@ export default Storybook.story('ChartWidgetLoader', story => {
           render these chart widgets).
         </p>
 
-        <CodeBlock language="tsx">{'<ChartWidgetLoader id="chart-id" />'}</CodeBlock>
+        <CodeBlock language="tsx">{`<ChartWidgetLoader id="chart-id" />`}</CodeBlock>
       </Fragment>
     );
   });
diff --git a/static/app/components/charts/components/xAxis.tsx b/static/app/components/charts/components/xAxis.tsx
index d0cdb8e72e4c..c70815e87507 100644
--- a/static/app/components/charts/components/xAxis.tsx
+++ b/static/app/components/charts/components/xAxis.tsx
@@ -37,7 +37,7 @@ export function XAxis({
     const showDate = firstItem ? true : !computeShortInterval({start, end, period});
 
     if (isGroupedByDate) {
-      const dateFormat = useShortDate ? 'MMM Do' : 'MMM D';
+      const dateFormat = useShortDate ? 'MMM Do' : `MMM D`;
       const dateString = getFormattedDate(value, dateFormat, {local: !utc});
 
       const timeFormat = getTimeFormat({seconds: addSecondsToTimeFormat});
diff --git a/static/app/components/commitRow.tsx b/static/app/components/commitRow.tsx
index bff7479364cb..77dc1c3552b5 100644
--- a/static/app/components/commitRow.tsx
+++ b/static/app/components/commitRow.tsx
@@ -50,7 +50,7 @@ function CommitRow({
   const handleInviteClick = useCallback(() => {
     if (!commit.author?.email) {
       Sentry.captureException(
-        new Error('Commit author has no email or id, invite flow is broken.')
+        new Error(`Commit author has no email or id, invite flow is broken.`)
       );
       return;
     }
diff --git a/static/app/components/contextPickerModal.spec.tsx b/static/app/components/contextPickerModal.spec.tsx
index eb1a128063db..db044f9d2fe5 100644
--- a/static/app/components/contextPickerModal.spec.tsx
+++ b/static/app/components/contextPickerModal.spec.tsx
@@ -252,7 +252,7 @@ describe('ContextPickerModal', () => {
 
     const provider = {slug: 'github'};
     const configQueryKey = [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: org.slug},
       }),
       {query: {provider_key: provider.slug, includeConfig: 0}},
@@ -299,7 +299,7 @@ describe('ContextPickerModal', () => {
 
     const provider = {slug: 'github'};
     const configQueryKey = [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: org.slug},
       }),
       {query: {provider_key: provider.slug, includeConfig: 0}},
@@ -337,7 +337,7 @@ describe('ContextPickerModal', () => {
 
     const provider = {slug: 'github'};
     const configQueryKey = [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: org.slug},
       }),
       {query: {provider_key: provider.slug, includeConfig: 0}},
diff --git a/static/app/components/core/code/__stories__/components.tsx b/static/app/components/core/code/__stories__/components.tsx
index 2dd47d9303ae..03928f58235c 100644
--- a/static/app/components/core/code/__stories__/components.tsx
+++ b/static/app/components/core/code/__stories__/components.tsx
@@ -21,7 +21,7 @@ export function OnTabClickExample() {
       onTabClick={handleTabClick}
       language="bash"
     >
-      {tab === 'npm' ? 'npm install --save @sentry/browser' : 'yarn add @sentry/browser'}
+      {tab === 'npm' ? `npm install --save @sentry/browser` : 'yarn add @sentry/browser'}
     </CodeBlock>
   );
 }
diff --git a/static/app/components/core/code/codeBlock.mdx b/static/app/components/core/code/codeBlock.mdx
index b9e8ef50f7d2..d2e52b368d00 100644
--- a/static/app/components/core/code/codeBlock.mdx
+++ b/static/app/components/core/code/codeBlock.mdx
@@ -84,7 +84,7 @@ Display a filename at the top of the code block using the `filename` prop.
 
 <Storybook.Demo>
   <CodeBlock filename="index.tsx" language="javascript">
-    {"const myVariable = 'testing';"}
+    {`const myVariable = 'testing';`}
   </CodeBlock>
 </Storybook.Demo>
 ```jsx
@@ -97,7 +97,7 @@ Display a filename at the top of the code block using the `filename` prop.
 
 <Storybook.Demo>
   <CodeBlock dark filename="index.tsx" language="javascript">
-    {"const myVariable = 'testing';"}
+    {`const myVariable = 'testing';`}
   </CodeBlock>
 </Storybook.Demo>
 ```jsx
@@ -122,7 +122,7 @@ export function TabExample() {
       onTabClick={t => setTab(t)}
       language="bash"
     >
-      {tab === 'npm' ? 'npm install --save @sentry/browser' : 'yarn add @sentry/browser'}
+      {tab === 'npm' ? `npm install --save @sentry/browser` : 'yarn add @sentry/browser'}
     </CodeBlock>
   );
 }
diff --git a/static/app/components/core/compactSelect/compactSelect.spec.tsx b/static/app/components/core/compactSelect/compactSelect.spec.tsx
index 995a13dd51e6..f64ea44fb9e2 100644
--- a/static/app/components/core/compactSelect/compactSelect.spec.tsx
+++ b/static/app/components/core/compactSelect/compactSelect.spec.tsx
@@ -881,11 +881,11 @@ describe('CompactSelect', () => {
         expect(screen.getByPlaceholderText('Search…')).toHaveFocus();
       });
       // Option Three is not reachable via keyboard, focus wraps back to Option One
-      await userEvent.keyboard('{ArrowDown}');
+      await userEvent.keyboard(`{ArrowDown}`);
       await waitFor(() => {
         expect(screen.getByRole('option', {name: 'Option One'})).toHaveFocus();
       });
-      await userEvent.keyboard('{ArrowDown>2}');
+      await userEvent.keyboard(`{ArrowDown>2}`);
       await waitFor(() => {
         expect(screen.getByRole('option', {name: 'Option One'})).toHaveFocus();
       });
@@ -1318,9 +1318,9 @@ describe('CompactSelect', () => {
         expect(screen.getByPlaceholderText('Search…')).toHaveFocus();
       });
       // Option Three is not reachable via keyboard, focus wraps back to Option One
-      await userEvent.keyboard('{ArrowDown}');
+      await userEvent.keyboard(`{ArrowDown}`);
       expect(screen.getByRole('row', {name: 'Option One'})).toHaveFocus();
-      await userEvent.keyboard('{ArrowDown>2}');
+      await userEvent.keyboard(`{ArrowDown>2}`);
       expect(screen.getByRole('row', {name: 'Option One'})).toHaveFocus();
 
       // Option Three is still available via search
diff --git a/static/app/components/core/compactSelect/control.tsx b/static/app/components/core/compactSelect/control.tsx
index e3032495eb7e..bc99eecc9b20 100644
--- a/static/app/components/core/compactSelect/control.tsx
+++ b/static/app/components/core/compactSelect/control.tsx
@@ -683,7 +683,7 @@ const StyledOverlay = styled(Overlay, {
   ${p => p.width && `width: ${withUnits(p.width)};`}
   ${p => p.height && `height: ${withUnits(p.height)};`}
   ${p => p.minWidth && `min-width: ${withUnits(p.minWidth)};`}
-  max-width: ${p => (p.maxWidth ? `min(${withUnits(p.maxWidth)}, 100%)` : '100%')};
+  max-width: ${p => (p.maxWidth ? `min(${withUnits(p.maxWidth)}, 100%)` : `100%`)};
   max-height: ${p =>
     p.maxHeight
       ? `min(${withUnits(p.maxHeight)}, ${withUnits(p.maxHeightProp)})`
diff --git a/static/app/components/core/input/inputGroup.tsx b/static/app/components/core/input/inputGroup.tsx
index 90ffa88078ba..cd4bdaa8d1ba 100644
--- a/static/app/components/core/input/inputGroup.tsx
+++ b/static/app/components/core/input/inputGroup.tsx
@@ -80,7 +80,7 @@ const StyledLeadingItemsWrap = styled(InputItemsWrap)<{
   disablePointerEvents?: boolean;
 }>`
   left: ${p => p.theme.form[p.size].paddingLeft + 1}px;
-  ${p => p.disablePointerEvents && 'pointer-events: none;'}
+  ${p => p.disablePointerEvents && `pointer-events: none;`}
 `;
 
 const StyledTrailingItemsWrap = styled(InputItemsWrap)<{
@@ -88,7 +88,7 @@ const StyledTrailingItemsWrap = styled(InputItemsWrap)<{
   disablePointerEvents?: boolean;
 }>`
   right: ${p => p.theme.form[p.size].paddingRight + 1}px;
-  ${p => p.disablePointerEvents && 'pointer-events: none;'}
+  ${p => p.disablePointerEvents && `pointer-events: none;`}
 `;
 
 interface InputContext {
diff --git a/static/app/components/core/loader/indeterminateLoader.tsx b/static/app/components/core/loader/indeterminateLoader.tsx
index 337a8b0f34e3..232594ffce01 100644
--- a/static/app/components/core/loader/indeterminateLoader.tsx
+++ b/static/app/components/core/loader/indeterminateLoader.tsx
@@ -16,8 +16,7 @@ interface IndeterminateLoaderProps extends React.HTMLAttributes<HTMLDivElement>
   variant?: 'vibrant' | 'monochrome';
 }
 
-const SQUIGGLE_TILE =
-  "url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='1 0 16 8'%3E%3Cpath stroke='%23fff' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M17 6c-4 0-4-4-8-4S5 6 1 6'/%3E%3C/svg%3E\")";
+const SQUIGGLE_TILE = `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='1 0 16 8'%3E%3Cpath stroke='%23fff' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M17 6c-4 0-4-4-8-4S5 6 1 6'/%3E%3C/svg%3E")`;
 
 const indeterminateSlow = keyframes`
   0% { left: -35%; right: 100%; }
diff --git a/static/app/components/core/menuListItem/menuListItem.tsx b/static/app/components/core/menuListItem/menuListItem.tsx
index 4e3bbc029893..2644c12c2531 100644
--- a/static/app/components/core/menuListItem/menuListItem.tsx
+++ b/static/app/components/core/menuListItem/menuListItem.tsx
@@ -87,7 +87,7 @@ const StyledInnerWrap = styled('div', {
     box-shadow: none;
     outline: none;
   }
-  ${p => p.disabled && 'cursor: default;'}
+  ${p => p.disabled && `cursor: default;`}
 
   &::before {
     content: '';
@@ -134,7 +134,7 @@ const StyledLeadingItems = styled('div')<{
   flex-shrink: 0;
   align-items: flex-start;
 
-  ${p => p.disabled && 'opacity: 0.5;'}
+  ${p => p.disabled && `opacity: 0.5;`}
 `;
 
 const StyledLabel = styled('div')`
@@ -431,7 +431,7 @@ const TrailingItems = styled('div')<{disabled: boolean}>`
   gap: ${p => p.theme.space.md};
   margin-right: ${p => p.theme.space.xs};
 
-  ${p => p.disabled && 'opacity: 0.5;'}
+  ${p => p.disabled && `opacity: 0.5;`}
 `;
 
 export const LeadingItems = StyledLeadingItems;
diff --git a/static/app/components/core/slot/slot.tsx b/static/app/components/core/slot/slot.tsx
index 8ecd3cf31aa0..7c0aab1589a2 100644
--- a/static/app/components/core/slot/slot.tsx
+++ b/static/app/components/core/slot/slot.tsx
@@ -226,7 +226,7 @@ function makeSlotProvider<T extends Slot>(
     return <context.Provider value={contextValue}>{children}</context.Provider>;
   }
 
-  SlotProvider.displayName = 'Slot.Provider';
+  SlotProvider.displayName = `Slot.Provider`;
   return SlotProvider as (props: SlotProviderProps) => React.ReactNode;
 }
 
diff --git a/static/app/components/createAlertButton.spec.tsx b/static/app/components/createAlertButton.spec.tsx
index 199781b4ccfc..1ca0a78e05c5 100644
--- a/static/app/components/createAlertButton.spec.tsx
+++ b/static/app/components/createAlertButton.spec.tsx
@@ -151,14 +151,14 @@ describe('CreateAlertFromViewButton', () => {
           location: {
             pathname: '/organizations/org-slug/issues/alerts/wizard/',
           },
-          route: '/organizations/:orgId/issues/alerts/wizard/',
+          route: `/organizations/:orgId/issues/alerts/wizard/`,
         },
       }
     );
     await userEvent.click(screen.getByRole('button'));
     expect(router.location).toEqual(
       expect.objectContaining({
-        pathname: '/organizations/org-slug/issues/alerts/wizard/',
+        pathname: `/organizations/org-slug/issues/alerts/wizard/`,
         query: {},
       })
     );
@@ -202,7 +202,7 @@ describe('CreateAlertFromViewButton', () => {
     await userEvent.click(screen.getByRole('button'));
     expect(router.location).toEqual(
       expect.objectContaining({
-        pathname: '/organizations/org-slug/issues/alerts/new/metric/',
+        pathname: `/organizations/org-slug/issues/alerts/new/metric/`,
         query: expect.objectContaining({
           query: 'event.type:error ',
           project: 'project-slug',
diff --git a/static/app/components/discover/transactionsTable.tsx b/static/app/components/discover/transactionsTable.tsx
index cc8f1d4e0d81..967bf22fb576 100644
--- a/static/app/components/discover/transactionsTable.tsx
+++ b/static/app/components/discover/transactionsTable.tsx
@@ -92,7 +92,7 @@ export function TransactionsTable(props: Props) {
                       size="xs"
                       position="top"
                       title={t(
-                        'Span durations are summed over the course of an entire transaction. Any overlapping spans are only counted once.'
+                        `Span durations are summed over the course of an entire transaction. Any overlapping spans are only counted once.`
                       )}
                     />
                   </Fragment>
diff --git a/static/app/components/events/autofix/preferences/hooks/useBulkAutofixAutomationSettings.ts b/static/app/components/events/autofix/preferences/hooks/useBulkAutofixAutomationSettings.ts
index 54983017d123..95874e90c17f 100644
--- a/static/app/components/events/autofix/preferences/hooks/useBulkAutofixAutomationSettings.ts
+++ b/static/app/components/events/autofix/preferences/hooks/useBulkAutofixAutomationSettings.ts
@@ -114,7 +114,7 @@ export function useUpdateBulkAutofixAutomationSettings(
       return fetchMutation({
         method: 'POST',
         url: getApiUrl(
-          '/organizations/$organizationIdOrSlug/autofix/automation-settings/',
+          `/organizations/$organizationIdOrSlug/autofix/automation-settings/`,
           {
             path: {organizationIdOrSlug: organization.slug},
           }
@@ -141,7 +141,7 @@ export function useUpdateBulkAutofixAutomationSettings(
         // Invalidate the query for ProjectOptions to Settings>Project>Seer details page
         queryClient.invalidateQueries({
           queryKey: [
-            getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/', {
+            getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/`, {
               path: {
                 organizationIdOrSlug: organization.slug,
                 projectIdOrSlug: project.slug,
@@ -153,7 +153,7 @@ export function useUpdateBulkAutofixAutomationSettings(
         queryClient.invalidateQueries({
           queryKey: [
             getApiUrl(
-              '/projects/$organizationIdOrSlug/$projectIdOrSlug/seer/preferences/',
+              `/projects/$organizationIdOrSlug/$projectIdOrSlug/seer/preferences/`,
               {
                 path: {
                   organizationIdOrSlug: organization.slug,
diff --git a/static/app/components/events/autofix/useAutofixSetup.tsx b/static/app/components/events/autofix/useAutofixSetup.tsx
index 6fa22f9388ea..9604abff5ebf 100644
--- a/static/app/components/events/autofix/useAutofixSetup.tsx
+++ b/static/app/components/events/autofix/useAutofixSetup.tsx
@@ -34,7 +34,7 @@ function makeAutofixSetupQueryKey(
   checkWriteAccess?: boolean
 ): ApiQueryKey {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/issues/$issueId/autofix/setup/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/issues/$issueId/autofix/setup/`, {
       path: {organizationIdOrSlug: orgSlug, issueId: groupId},
     }),
     {
diff --git a/static/app/components/events/autofix/v2/artifactCards.tsx b/static/app/components/events/autofix/v2/artifactCards.tsx
index a2093b6f582d..dbf2d8aa5ae8 100644
--- a/static/app/components/events/autofix/v2/artifactCards.tsx
+++ b/static/app/components/events/autofix/v2/artifactCards.tsx
@@ -432,7 +432,7 @@ const TreeKeyTrunk = styled('div')<{spacerCount: number}>`
   display: grid;
   height: 100%;
   align-items: center;
-  grid-template-columns: ${p => (p.spacerCount > 0 ? 'auto 1rem 1fr' : '1fr')};
+  grid-template-columns: ${p => (p.spacerCount > 0 ? `auto 1rem 1fr` : '1fr')};
 `;
 
 const TreeValue = styled('div')`
diff --git a/static/app/components/events/autofix/v3/autofixCards.tsx b/static/app/components/events/autofix/v3/autofixCards.tsx
index 1b1f73ba0db5..8e1d8a377018 100644
--- a/static/app/components/events/autofix/v3/autofixCards.tsx
+++ b/static/app/components/events/autofix/v3/autofixCards.tsx
@@ -280,12 +280,7 @@ export function PullRequestsCard({section}: AutofixCardProps) {
         ) {
           return (
             <Flex key={pullRequest.repo_name} gap="xs" align="center">
-              <LinkButton
-                external
-                href={pullRequest.pr_url}
-                priority="primary"
-                icon={<IconOpen />}
-              >
+              <LinkButton external href={pullRequest.pr_url} priority="primary">
                 {t('View %s#%s', pullRequest.repo_name, pullRequest.pr_number)}
               </LinkButton>
               <Button
diff --git a/static/app/components/events/breadcrumbs/breadcrumbsDataSection.tsx b/static/app/components/events/breadcrumbs/breadcrumbsDataSection.tsx
index 54b4a3f39eb8..531a692d94c1 100644
--- a/static/app/components/events/breadcrumbs/breadcrumbsDataSection.tsx
+++ b/static/app/components/events/breadcrumbs/breadcrumbsDataSection.tsx
@@ -97,7 +97,7 @@ export function BreadcrumbsDataSection({
         ),
         {
           ariaLabel: 'breadcrumb drawer',
-          drawerKey: 'breadcrumbs-drawer',
+          drawerKey: `breadcrumbs-drawer`,
           // We prevent a click on the 'View All' button from closing the drawer so that
           // we don't reopen it immediately, and instead let the button handle this itself.
           shouldCloseOnInteractOutside: element => {
@@ -105,11 +105,6 @@ export function BreadcrumbsDataSection({
             if (viewAllButton?.contains(element)) {
               return false;
             }
-            // Third-party packages (e.g. Pendo) use a container with id "pendo-guide-container".
-            // If the click is inside that container, treat it as an internal click.
-            if (element.closest('#pendo-guide-container')) {
-              return false;
-            }
             return true;
           },
         }
diff --git a/static/app/components/events/contexts/utils.tsx b/static/app/components/events/contexts/utils.tsx
index 1f11d156f8dc..2f9eab135721 100644
--- a/static/app/components/events/contexts/utils.tsx
+++ b/static/app/components/events/contexts/utils.tsx
@@ -579,5 +579,4 @@ const RelativeTime = styled('span')`
   margin-left: ${p => p.theme.space.xs};
 `;
 
-export const CONTEXT_DOCS_LINK =
-  'https://docs.sentry.io/platform-redirect/?next=/enriching-events/context/';
+export const CONTEXT_DOCS_LINK = `https://docs.sentry.io/platform-redirect/?next=/enriching-events/context/`;
diff --git a/static/app/components/events/eventAnnotation.tsx b/static/app/components/events/eventAnnotation.tsx
new file mode 100644
index 000000000000..ae97a3321987
--- /dev/null
+++ b/static/app/components/events/eventAnnotation.tsx
@@ -0,0 +1,16 @@
+import styled from '@emotion/styled';
+
+export const EventAnnotation = styled('span')`
+  font-size: ${p => p.theme.font.size.sm};
+  border-left: 1px solid ${p => p.theme.tokens.border.secondary};
+  padding-left: ${p => p.theme.space.md};
+  color: ${p => p.theme.tokens.content.secondary};
+
+  a {
+    color: ${p => p.theme.tokens.content.secondary};
+
+    &:hover {
+      color: ${p => p.theme.tokens.content.secondary};
+    }
+  }
+`;
diff --git a/static/app/components/events/eventReplay/replayClipPreview.spec.tsx b/static/app/components/events/eventReplay/replayClipPreview.spec.tsx
index f424c1134d55..fabd8aff4941 100644
--- a/static/app/components/events/eventReplay/replayClipPreview.spec.tsx
+++ b/static/app/components/events/eventReplay/replayClipPreview.spec.tsx
@@ -9,24 +9,21 @@ import {render as baseRender, screen, userEvent} from 'sentry-test/reactTestingL
 import {useLoadReplayReader} from 'sentry/utils/replays/hooks/useLoadReplayReader';
 import {ReplayReader} from 'sentry/utils/replays/replayReader';
 import type {RequestError} from 'sentry/utils/requestError/requestError';
+import {useRoutes} from 'sentry/utils/useRoutes';
 
 import ReplayClipPreview from './replayClipPreview';
 
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useMatches: jest.fn(() => [
-    {
-      id: '0',
-      pathname: '/organizations/sentry-emerging-tech/issues/',
-      params: {},
-      data: undefined,
-      handle: {path: '/organizations/:orgId/issues/:groupId/'},
-    },
-  ]),
-}));
 jest.mock('sentry/utils/replays/hooks/useLoadReplayReader');
+jest.mock('sentry/utils/useRoutes');
 
 const mockUseLoadReplayReader = jest.mocked(useLoadReplayReader);
+jest
+  .mocked(useRoutes)
+  .mockImplementation(() => [
+    {path: '/'},
+    {path: '/organizations/:orgId/issues/:groupId/'},
+    {path: 'replays/'},
+  ]);
 
 const mockOrgSlug = 'sentry-emerging-tech';
 const mockReplaySlug = 'replays:761104e184c64d439ee1014b72b4d83b';
@@ -35,7 +32,7 @@ const mockReplayId = '761104e184c64d439ee1014b72b4d83b';
 const mockEventTimestamp = new Date('2022-09-22T16:59:41Z');
 const mockEventTimestampMs = mockEventTimestamp.getTime();
 
-const mockButtonHref = `/organizations/${mockOrgSlug}/explore/replays/761104e184c64d439ee1014b72b4d83b/?referrer=%2Forganizations%2F%3AorgId%2Fissues%2F%3AgroupId%2F&t=57&t_main=errors`;
+const mockButtonHref = `/organizations/${mockOrgSlug}/explore/replays/761104e184c64d439ee1014b72b4d83b/?referrer=%2Forganizations%2F%3AorgId%2Fissues%2F%3AgroupId%2Freplays%2F&t=57&t_main=errors`;
 
 // Get replay data with the mocked replay reader params
 const mockReplay = ReplayReader.factory({
diff --git a/static/app/components/events/eventReplay/replayPreviewPlayer.tsx b/static/app/components/events/eventReplay/replayPreviewPlayer.tsx
index 15b9e88f09e9..ca903244f7f2 100644
--- a/static/app/components/events/eventReplay/replayPreviewPlayer.tsx
+++ b/static/app/components/events/eventReplay/replayPreviewPlayer.tsx
@@ -1,6 +1,5 @@
 import type {ComponentProps} from 'react';
 import {useEffect, useRef, useState} from 'react';
-import {useMatches} from 'react-router-dom';
 import styled from '@emotion/styled';
 import type {Query} from 'history';
 
@@ -28,6 +27,7 @@ import {TimelineScaleContextProvider} from 'sentry/utils/replays/hooks/useTimeli
 import {useReplayReader} from 'sentry/utils/replays/playback/providers/replayReaderProvider';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {useFullscreen} from 'sentry/utils/window/useFullscreen';
 import {useIsFullscreen} from 'sentry/utils/window/useIsFullscreen';
 import {Breadcrumbs} from 'sentry/views/replays/detail/breadcrumbs';
@@ -59,7 +59,7 @@ export function ReplayPreviewPlayer({
   query?: Query;
   showNextAndPrevious?: boolean;
 }) {
-  const matches = useMatches();
+  const routes = useRoutes();
   const organization = useOrganization();
   const [isSidebarOpen, setIsSidebarOpen] = useState(true);
   const replay = useReplayReader();
@@ -73,7 +73,7 @@ export function ReplayPreviewPlayer({
   const isFullscreen = useIsFullscreen();
   const startOffsetMs = replay?.getStartOffsetMs() ?? 0;
 
-  const referrer = getRouteStringFromRoutes({matches});
+  const referrer = getRouteStringFromRoutes(routes);
   const fromFeedback = referrer === '/issues/feedback/';
 
   const {groupId} = useParams<{groupId: string}>();
@@ -118,7 +118,7 @@ export function ReplayPreviewPlayer({
               organization,
             }),
             query: {
-              referrer,
+              referrer: getRouteStringFromRoutes(routes),
               t_main: fromFeedback ? TabKey.BREADCRUMBS : TabKey.ERRORS,
               t: (currentTime + startOffsetMs) / 1000,
               groupId,
diff --git a/static/app/components/events/eventReplay/staticReplayPreview.tsx b/static/app/components/events/eventReplay/staticReplayPreview.tsx
index 3be201a3e651..97bf53ebc47e 100644
--- a/static/app/components/events/eventReplay/staticReplayPreview.tsx
+++ b/static/app/components/events/eventReplay/staticReplayPreview.tsx
@@ -1,5 +1,4 @@
 import {Fragment, useMemo} from 'react';
-import {useMatches} from 'react-router-dom';
 import styled from '@emotion/styled';
 
 import {LinkButton, type LinkButtonProps} from '@sentry/scraps/button';
@@ -14,6 +13,7 @@ import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
 import {TabKey} from 'sentry/utils/replays/hooks/useActiveReplayTab';
 import type {ReplayReader} from 'sentry/utils/replays/replayReader';
 import {useOrganization} from 'sentry/utils/useOrganization';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {FluidHeight} from 'sentry/views/replays/detail/layout/fluidHeight';
 import {makeReplaysPathname} from 'sentry/views/replays/pathnames';
 
@@ -37,14 +37,14 @@ export function StaticReplayPreview({
   replay,
 }: StaticReplayPreviewProps) {
   const organization = useOrganization();
-  const matches = useMatches();
+  const routes = useRoutes();
   const fullReplayUrl = {
     pathname: makeReplaysPathname({
       path: `/${replayId}/`,
       organization,
     }),
     query: {
-      referrer: getRouteStringFromRoutes({matches}),
+      referrer: getRouteStringFromRoutes(routes),
       t_main: focusTab ?? TabKey.ERRORS,
       t: initialTimeOffsetMs / 1000,
     },
diff --git a/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx b/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx
index 2800c8d3a45b..ba2d98e332a4 100644
--- a/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx
+++ b/static/app/components/events/eventStatisticalDetector/eventDifferentialFlamegraph.tsx
@@ -498,8 +498,8 @@ function DifferentialFlamegraphExplanationBar(
     <DifferentialFlamegraphExplanationBarContainer>
       <div>
         {props.negated
-          ? t('Flamegraph is showing how stack frequency will change.')
-          : t('Flamegraph is showing how stack frequency has changed.')}
+          ? t(`Flamegraph is showing how stack frequency will change.`)
+          : t(`Flamegraph is showing how stack frequency has changed.`)}
       </div>
       <DifferentialFlamegraphLegend />
     </DifferentialFlamegraphExplanationBarContainer>
diff --git a/static/app/components/events/eventTags/eventTagsTree.spec.tsx b/static/app/components/events/eventTags/eventTagsTree.spec.tsx
index b4ebe367a1df..36c50af23755 100644
--- a/static/app/components/events/eventTags/eventTagsTree.spec.tsx
+++ b/static/app/components/events/eventTags/eventTagsTree.spec.tsx
@@ -150,7 +150,7 @@ describe('EventTagsTree', () => {
       validateLink: () => {
         const linkElement = screen.getByRole('link', {name: 'abc123'});
         const href = linkElement.attributes.getNamedItem('href');
-        expect(href?.value).toContain('/organizations/org-slug/insights/summary/');
+        expect(href?.value).toContain(`/organizations/org-slug/insights/summary/`);
         expect(href?.value).toContain(`project=${project.id}`);
         expect(href?.value).toContain('transaction=abc123');
         expect(href?.value).toContain(`referrer=${referrer}`);
diff --git a/static/app/components/events/eventTags/eventTagsTreeRow.tsx b/static/app/components/events/eventTags/eventTagsTreeRow.tsx
index cbf1bef44068..54ef01ab02d3 100644
--- a/static/app/components/events/eventTags/eventTagsTreeRow.tsx
+++ b/static/app/components/events/eventTags/eventTagsTreeRow.tsx
@@ -241,14 +241,14 @@ function EventTagsTreeRowDropdown({
           {
             onError: () => {
               addErrorMessage(
-                tct("Failed to update '[projectName]' project", {
+                tct(`Failed to update '[projectName]' project`, {
                   projectName: project.name,
                 })
               );
             },
             onSuccess: () => {
               addSuccessMessage(
-                tct("Successfully updated '[projectName]' project", {
+                tct(`Successfully updated '[projectName]' project`, {
                   projectName: project.name,
                 })
               );
@@ -489,7 +489,7 @@ const TreeKeyTrunk = styled('div')<{spacerCount: number}>`
   display: grid;
   height: 100%;
   align-items: center;
-  grid-template-columns: ${p => (p.spacerCount > 0 ? 'auto 1rem 1fr' : '1fr')};
+  grid-template-columns: ${p => (p.spacerCount > 0 ? `auto 1rem 1fr` : '1fr')};
 `;
 
 const TreeValueTrunk = styled('div')`
diff --git a/static/app/components/events/eventTags/util.tsx b/static/app/components/events/eventTags/util.tsx
index c5e530eefb40..b2a74f72fcd6 100644
--- a/static/app/components/events/eventTags/util.tsx
+++ b/static/app/components/events/eventTags/util.tsx
@@ -3,8 +3,7 @@ import {useResizeObserver} from '@react-aria/utils';
 
 import type {EventTag, EventTagWithMeta} from 'sentry/types/event';
 
-export const TAGS_DOCS_LINK =
-  'https://docs.sentry.io/platform-redirect/?next=/enriching-events/tags';
+export const TAGS_DOCS_LINK = `https://docs.sentry.io/platform-redirect/?next=/enriching-events/tags`;
 
 export enum TagFilter {
   ALL = 'All',
diff --git a/static/app/components/events/featureFlags/eventFeatureFlagDrawer.spec.tsx b/static/app/components/events/featureFlags/eventFeatureFlagDrawer.spec.tsx
index 0a2f0e22a4d5..c2f2f98d0d78 100644
--- a/static/app/components/events/featureFlags/eventFeatureFlagDrawer.spec.tsx
+++ b/static/app/components/events/featureFlags/eventFeatureFlagDrawer.spec.tsx
@@ -40,7 +40,7 @@ describe('FeatureFlagDrawer', () => {
       body: {data: []},
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/tags/',
+      url: `/organizations/org-slug/issues/1/tags/`,
       body: TagsFixture(),
     });
   });
diff --git a/static/app/components/events/featureFlags/eventFeatureFlagSection.spec.tsx b/static/app/components/events/featureFlags/eventFeatureFlagSection.spec.tsx
index 6e09d3e06b4b..ef1536784d2d 100644
--- a/static/app/components/events/featureFlags/eventFeatureFlagSection.spec.tsx
+++ b/static/app/components/events/featureFlags/eventFeatureFlagSection.spec.tsx
@@ -51,7 +51,7 @@ describe('EventFeatureFlagList', () => {
       body: {data: {dismissed_ts: null}},
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/tags/',
+      url: `/organizations/org-slug/issues/1/tags/`,
       body: TagsFixture(),
     });
   });
diff --git a/static/app/components/events/highlights/editHighlightsModal.tsx b/static/app/components/events/highlights/editHighlightsModal.tsx
index a67c6899c571..9c75c8cef262 100644
--- a/static/app/components/events/highlights/editHighlightsModal.tsx
+++ b/static/app/components/events/highlights/editHighlightsModal.tsx
@@ -441,14 +441,14 @@ export function EditHighlightsModal({
                 {
                   onError: () => {
                     addErrorMessage(
-                      tct("Failed to update '[projectName]' project", {
+                      tct(`Failed to update '[projectName]' project`, {
                         projectName: project.name,
                       })
                     );
                   },
                   onSuccess: () => {
                     addSuccessMessage(
-                      tct("Successfully updated '[projectName]' project", {
+                      tct(`Successfully updated '[projectName]' project`, {
                         projectName: project.name,
                       })
                     );
diff --git a/static/app/components/events/highlights/highlightsSettingsForm.tsx b/static/app/components/events/highlights/highlightsSettingsForm.tsx
index 56b4ffdc1bf4..7c04dd74b1e8 100644
--- a/static/app/components/events/highlights/highlightsSettingsForm.tsx
+++ b/static/app/components/events/highlights/highlightsSettingsForm.tsx
@@ -58,7 +58,7 @@ export function HighlightsSettingsForm({projectSlug}: HighlightsSettingsFormProp
     <Form {...formProps}>
       <TextBlock>
         {t(
-          'Setup Highlights to promote your event data to the top of the issue page for quicker debugging.'
+          `Setup Highlights to promote your event data to the top of the issue page for quicker debugging.`
         )}
       </TextBlock>
       <JsonForm
diff --git a/static/app/components/events/interfaces/crashContent/exception/actionableItems.spec.tsx b/static/app/components/events/interfaces/crashContent/exception/actionableItems.spec.tsx
index 3262a6ee06f9..8b4605993e15 100644
--- a/static/app/components/events/interfaces/crashContent/exception/actionableItems.spec.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/actionableItems.spec.tsx
@@ -238,7 +238,7 @@ describe('Actionable Items', () => {
       method: 'GET',
     });
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/files/dsyms/',
+      url: `/projects/org-slug/project-slug/files/dsyms/`,
       body: [],
     });
 
diff --git a/static/app/components/events/interfaces/crashContent/stackTrace/rawContent.tsx b/static/app/components/events/interfaces/crashContent/stackTrace/rawContent.tsx
index ed0737355c05..a4016d183596 100644
--- a/static/app/components/events/interfaces/crashContent/stackTrace/rawContent.tsx
+++ b/static/app/components/events/interfaces/crashContent/stackTrace/rawContent.tsx
@@ -50,7 +50,7 @@ function getRubyFrame(frame: Frame, includeLocation: boolean): string {
     result += ':' + frame.lineNo;
   }
   if (defined(frame.function)) {
-    result += ":in '" + frame.function + "'";
+    result += `:in '` + frame.function + "'";
   }
   return result;
 }
diff --git a/static/app/components/events/interfaces/frame/frameVariables.spec.tsx b/static/app/components/events/interfaces/frame/frameVariables.spec.tsx
index 380f79201615..b7d4a08e5e38 100644
--- a/static/app/components/events/interfaces/frame/frameVariables.spec.tsx
+++ b/static/app/components/events/interfaces/frame/frameVariables.spec.tsx
@@ -18,7 +18,7 @@ describe('Frame Variables', () => {
     });
     const initialRouterConfig = {
       location: {
-        pathname: '/organizations/org-slug/issues/1/',
+        pathname: `/organizations/org-slug/issues/1/`,
         query: {project: project.id},
       },
       route: '/organizations/:orgId/issues/:groupId/',
diff --git a/static/app/components/events/interfaces/nativeFrame.tsx b/static/app/components/events/interfaces/nativeFrame.tsx
index 1cfcd9c4d1dc..d1ec8b6e37c5 100644
--- a/static/app/components/events/interfaces/nativeFrame.tsx
+++ b/static/app/components/events/interfaces/nativeFrame.tsx
@@ -468,8 +468,8 @@ export default withSentryAppComponents(NativeFrame, {componentType: 'stacktrace-
 
 const AddressCell = styled('div')`
   font-family: ${p => p.theme.font.family.mono};
-  ${p => p.onClick && 'cursor: pointer'};
-  ${p => p.onClick && 'color:' + p.theme.tokens.interactive.link.accent.rest};
+  ${p => p.onClick && `cursor: pointer`};
+  ${p => p.onClick && `color:` + p.theme.tokens.interactive.link.accent.rest};
 `;
 
 const FunctionNameCell = styled('div')`
@@ -549,7 +549,7 @@ const RowHeader = styled('span')<{
   padding: ${p => p.theme.space.md};
   color: ${p => (p.isInAppFrame ? '' : p.theme.tokens.content.secondary)};
   font-style: ${p => (p.isInAppFrame ? '' : 'italic')};
-  ${p => p.expandable && 'cursor: pointer;'};
+  ${p => p.expandable && `cursor: pointer;`};
 
   @media (min-width: ${p => p.theme.breakpoints.sm}) {
     grid-template-columns: auto 150px 120px 4fr repeat(3, auto) ${p => p.theme.space.xl}; /* Matches the updated desktop layout */
diff --git a/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx b/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx
index ffdd8d2411a4..ad64bccd1e31 100644
--- a/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx
+++ b/static/app/components/events/interfaces/performance/eventTraceView.spec.tsx
@@ -90,7 +90,7 @@ describe('EventTraceView', () => {
       },
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events-facets/',
+      url: `/organizations/org-slug/events-facets/`,
       method: 'GET',
       asyncDelay: 1,
       body: {},
diff --git a/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.spec.tsx b/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.spec.tsx
index bb2e736a0cd6..a164d6f34f03 100644
--- a/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.spec.tsx
+++ b/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.spec.tsx
@@ -66,7 +66,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId('span-evidence-key-value-list.transaction').querySelector('a')
       ).toHaveAttribute(
         'href',
-        '/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29'
+        `/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
       );
       expect(screen.getByRole('button', {name: 'View Full Trace'})).toHaveAttribute(
         'href',
@@ -140,7 +140,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId('span-evidence-key-value-list.transaction').querySelector('a')
       ).toHaveAttribute(
         'href',
-        '/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29'
+        `/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
       );
       expect(screen.getByRole('button', {name: 'View Full Trace'})).toHaveAttribute(
         'href',
@@ -222,7 +222,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId('span-evidence-key-value-list.transaction').querySelector('a')
       ).toHaveAttribute(
         'href',
-        '/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29'
+        `/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
       );
       expect(screen.getByRole('button', {name: 'View Full Trace'})).toHaveAttribute(
         'href',
@@ -311,7 +311,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId('span-evidence-key-value-list.transaction').querySelector('a')
       ).toHaveAttribute(
         'href',
-        '/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29'
+        `/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
       );
       expect(screen.getByRole('button', {name: 'View Full Trace'})).toHaveAttribute(
         'href',
@@ -463,7 +463,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId('span-evidence-key-value-list.transaction').querySelector('a')
       ).toHaveAttribute(
         'href',
-        '/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29'
+        `/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
       );
       expect(screen.getByRole('button', {name: 'View Full Trace'})).toHaveAttribute(
         'href',
@@ -623,7 +623,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId('span-evidence-key-value-list.transaction').querySelector('a')
       ).toHaveAttribute(
         'href',
-        '/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29'
+        `/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
       );
       expect(screen.getByRole('button', {name: 'View Full Trace'})).toHaveAttribute(
         'href',
@@ -676,7 +676,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId('span-evidence-key-value-list.transaction').querySelector('a')
       ).toHaveAttribute(
         'href',
-        '/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29'
+        `/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
       );
       expect(screen.getByRole('button', {name: 'View Full Trace'})).toHaveAttribute(
         'href',
@@ -740,7 +740,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId('span-evidence-key-value-list.transaction').querySelector('a')
       ).toHaveAttribute(
         'href',
-        '/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29'
+        `/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
       );
       expect(screen.getByRole('button', {name: 'View Full Trace'})).toHaveAttribute(
         'href',
@@ -840,7 +840,7 @@ describe('SpanEvidenceKeyValueList', () => {
         screen.getByTestId('span-evidence-key-value-list.transaction').querySelector('a')
       ).toHaveAttribute(
         'href',
-        '/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29'
+        `/organizations/org-slug/insights/summary/?project=123&referrer=performance-transaction-summary&transaction=%2F&unselectedSeries=p100%28%29&unselectedSeries=avg%28%29`
       );
       expect(screen.getByRole('button', {name: 'View Full Trace'})).toHaveAttribute(
         'href',
diff --git a/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx b/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx
index 670007744daf..e85961069f8c 100644
--- a/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx
+++ b/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx
@@ -39,7 +39,7 @@ import type {Organization} from 'sentry/types/organization';
 import {formatBytesBase2} from 'sentry/utils/bytes/formatBytesBase2';
 import {generateLinkToEventInTraceView} from 'sentry/utils/discover/urls';
 import {toRoundedPercent} from 'sentry/utils/number/toRoundedPercent';
-import {SQLishFormatter} from 'sentry/utils/sqlish';
+import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
 import {safeURL} from 'sentry/utils/url/safeURL';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
diff --git a/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx b/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx
index e39ba610b622..47dd9de49bee 100644
--- a/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx
+++ b/static/app/components/events/interfaces/sourceMapsDebuggerModal.tsx
@@ -210,13 +210,11 @@ function getPlatform({
 export function getSourceMapsDocLinks(platform: string) {
   if (platform === 'react-native') {
     return {
-      sourcemaps: 'https://docs.sentry.io/platforms/react-native/sourcemaps/',
-      legacyUploadingMethods:
-        'https://docs.sentry.io/platforms/react-native/sourcemaps/troubleshooting/legacy-uploading-methods/',
-      sentryCli: 'https://docs.sentry.io/platforms/react-native/sourcemaps/uploading/',
-      bundlerPluginRepoLink:
-        'https://docs.sentry.io/platforms/react-native/manual-setup/metro/',
-      debugIds: 'https://docs.sentry.io/platforms/react-native/sourcemaps/debug-ids/',
+      sourcemaps: `https://docs.sentry.io/platforms/react-native/sourcemaps/`,
+      legacyUploadingMethods: `https://docs.sentry.io/platforms/react-native/sourcemaps/troubleshooting/legacy-uploading-methods/`,
+      sentryCli: `https://docs.sentry.io/platforms/react-native/sourcemaps/uploading/`,
+      bundlerPluginRepoLink: `https://docs.sentry.io/platforms/react-native/manual-setup/metro/`,
+      debugIds: `https://docs.sentry.io/platforms/react-native/sourcemaps/debug-ids/`,
     };
   }
 
@@ -230,8 +228,7 @@ export function getSourceMapsDocLinks(platform: string) {
     // Although we have a few specific sourcemap pages (see: https://github.com/getsentry/sentry-docs/tree/master/platform-includes/sourcemaps/primer),
     // they don't include the Sentry bundler section. All the others just render content for JavaScript.
     // Therefore, we have a static link here.
-    sentryBundleSupport:
-      'https://docs.sentry.io/platforms/javascript/sourcemaps/#sentry-bundler-support',
+    sentryBundleSupport: `https://docs.sentry.io/platforms/javascript/sourcemaps/#sentry-bundler-support`,
     // cordova and capacitor are not supported. (see: https://github.com/getsentry/sentry-docs/blob/c64fb081cad715dc9dd7639265e09c372c3a65e3/docs/platforms/javascript/common/sourcemaps/troubleshooting_js/artifact-bundles.mdx?plain=1#L4-L6)
     debugIds: ['cordova', 'capacitor'].includes(platform)
       ? undefined
@@ -269,8 +266,7 @@ export function getSourceMapsDocLinks(platform: string) {
     ].includes(platform)
       ? undefined
       : `${basePlatformUrl}/sourcemaps/uploading/hosting-publicly/`,
-    bundlerPluginRepoLink:
-      'https://github.com/getsentry/sentry-javascript-bundler-plugins',
+    bundlerPluginRepoLink: `https://github.com/getsentry/sentry-javascript-bundler-plugins`,
   };
 }
 
diff --git a/static/app/components/events/meta/annotatedText/redaction.tsx b/static/app/components/events/meta/annotatedText/redaction.tsx
index 99fe84f43c0d..825fc050472a 100644
--- a/static/app/components/events/meta/annotatedText/redaction.tsx
+++ b/static/app/components/events/meta/annotatedText/redaction.tsx
@@ -2,5 +2,5 @@ import styled from '@emotion/styled';
 
 export const Redaction = styled('span')<{withoutBackground?: boolean}>`
   cursor: default;
-  ${p => !p.withoutBackground && 'background: rgba(255, 0, 0, 0.05);'}
+  ${p => !p.withoutBackground && `background: rgba(255, 0, 0, 0.05);`}
 `;
diff --git a/static/app/components/events/metrics/metricsSection.spec.tsx b/static/app/components/events/metrics/metricsSection.spec.tsx
index df0a65221f57..8df94ffdd507 100644
--- a/static/app/components/events/metrics/metricsSection.spec.tsx
+++ b/static/app/components/events/metrics/metricsSection.spec.tsx
@@ -60,7 +60,7 @@ describe('MetricsSection', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/projects/',
+      url: `/projects/`,
       body: [project],
     });
 
diff --git a/static/app/components/events/ourlogs/ourlogsSection.spec.tsx b/static/app/components/events/ourlogs/ourlogsSection.spec.tsx
index 42a24c8a508a..4e6da88799f2 100644
--- a/static/app/components/events/ourlogs/ourlogsSection.spec.tsx
+++ b/static/app/components/events/ourlogs/ourlogsSection.spec.tsx
@@ -132,7 +132,7 @@ describe('OurlogsSection', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/projects/',
+      url: `/projects/`,
       body: [project],
     });
 
diff --git a/static/app/components/externalIssues/ticketRuleModal.spec.tsx b/static/app/components/externalIssues/ticketRuleModal.spec.tsx
index f3d3bbffdae0..961f2a2db5ba 100644
--- a/static/app/components/externalIssues/ticketRuleModal.spec.tsx
+++ b/static/app/components/externalIssues/ticketRuleModal.spec.tsx
@@ -186,7 +186,7 @@ describe('ProjectAlerts -> TicketRuleModal', () => {
             {
               label: 'Labels',
               required: false,
-              choices: [['bug', 'bug']],
+              choices: [['bug', `bug`]],
               default: undefined,
               type: 'select',
               multiple: true,
@@ -198,7 +198,7 @@ describe('ProjectAlerts -> TicketRuleModal', () => {
 
       await renderTicketRuleModal();
       expect(
-        screen.queryAllByText('Could not fetch saved option for Labels. Please reselect.')
+        screen.queryAllByText(`Could not fetch saved option for Labels. Please reselect.`)
       ).toHaveLength(0);
       await selectEvent.select(
         screen.getByRole('textbox', {name: 'Issue Type'}),
diff --git a/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx b/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx
index dbe388548939..33adbe2f26e3 100644
--- a/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackItemUsername.tsx
@@ -97,12 +97,12 @@ export function FeedbackItemUsername({className, feedbackIssue, style}: Props) {
         </Tooltip>
       </Flex>
       {email ? (
-        <Tooltip title={t('Email %s', user)} containerDisplayMode="flex">
+        <Tooltip title={t(`Email %s`, user)} containerDisplayMode="flex">
           <LinkButton
             href={mailToHref}
             external
             icon={<IconMail variant="muted" />}
-            aria-label={t('Email %s', user)}
+            aria-label={t(`Email %s`, user)}
             priority="transparent"
             size="zero"
           />
diff --git a/static/app/components/feedback/summaryCategories/feedbackSummaryCategories.tsx b/static/app/components/feedback/summaryCategories/feedbackSummaryCategories.tsx
index 31259b5fc709..cb2784fe5701 100644
--- a/static/app/components/feedback/summaryCategories/feedbackSummaryCategories.tsx
+++ b/static/app/components/feedback/summaryCategories/feedbackSummaryCategories.tsx
@@ -30,7 +30,7 @@ export function FeedbackSummaryCategories() {
         aria-label={t('Give feedback on the AI-powered summary')}
         icon={<IconThumb direction={type === 'positive' ? 'up' : 'down'} />}
         tooltipProps={{
-          title: type === 'positive' ? t('I like this') : t("I don't like this"),
+          title: type === 'positive' ? t('I like this') : t(`I don't like this`),
         }}
         size="xs"
         feedbackOptions={{
diff --git a/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx b/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx
index cfa63fdd7003..0ee1886143d2 100644
--- a/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx
+++ b/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx
@@ -25,15 +25,15 @@ describe('SentryMemberTeamSelectorField', () => {
     OrganizationStore.onUpdate(org, {replace: true});
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/user-teams/',
+      url: `/organizations/org-slug/user-teams/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/teams/',
+      url: `/organizations/org-slug/teams/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/members/',
+      url: `/organizations/org-slug/members/`,
       body: [],
     });
   });
diff --git a/static/app/components/group/sentryAppExternalIssueForm.spec.tsx b/static/app/components/group/sentryAppExternalIssueForm.spec.tsx
index 819cddcf0c6f..930522f8a44a 100644
--- a/static/app/components/group/sentryAppExternalIssueForm.spec.tsx
+++ b/static/app/components/group/sentryAppExternalIssueForm.spec.tsx
@@ -33,7 +33,7 @@ describe('SentryAppExternalIssueForm', () => {
       body: {},
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/external-issues/',
+      url: `/organizations/org-slug/issues/1/external-issues/`,
       body: [],
     });
   });
@@ -170,7 +170,7 @@ describe('SentryAppExternalIssueForm Async Field', () => {
   beforeEach(() => {
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/external-issues/',
+      url: `/organizations/org-slug/issues/1/external-issues/`,
       body: [],
     });
   });
@@ -221,7 +221,7 @@ describe('SentryAppExternalIssueForm Dependent fields', () => {
   beforeEach(() => {
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/external-issues/',
+      url: `/organizations/org-slug/issues/1/external-issues/`,
       body: [],
     });
   });
diff --git a/static/app/components/group/sentryAppExternalIssueModal.spec.tsx b/static/app/components/group/sentryAppExternalIssueModal.spec.tsx
index af97f383bf2d..4eba02f891ec 100644
--- a/static/app/components/group/sentryAppExternalIssueModal.spec.tsx
+++ b/static/app/components/group/sentryAppExternalIssueModal.spec.tsx
@@ -42,7 +42,7 @@ describe('openSentryAppIssueModal', () => {
       method: 'POST',
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/external-issues/',
+      url: `/organizations/org-slug/issues/1/external-issues/`,
       body: [],
     });
   });
diff --git a/static/app/components/groupMetaRow.spec.tsx b/static/app/components/groupMetaRow.spec.tsx
index d521271497fc..4832e907e9f3 100644
--- a/static/app/components/groupMetaRow.spec.tsx
+++ b/static/app/components/groupMetaRow.spec.tsx
@@ -1,12 +1,11 @@
 import {ActorFixture} from 'sentry-fixture/actor';
 import {GroupFixture} from 'sentry-fixture/group';
-import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
 
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import {GroupMetaRow} from 'sentry/components/groupMetaRow';
-import {GroupStatus, IssueCategory} from 'sentry/types/group';
+import {GroupStatus} from 'sentry/types/group';
 
 describe('GroupMetaRow', () => {
   it('renders last and first seen', () => {
@@ -107,32 +106,6 @@ describe('GroupMetaRow', () => {
     expect(screen.getByText('Assigned to Assignee Name')).toBeInTheDocument();
   });
 
-  it('should only make one replay-count API request', async () => {
-    const organization = OrganizationFixture({
-      features: ['session-replay'],
-    });
-    const mockReplayCount = MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/replay-count/`,
-      body: {groupId: 5},
-    });
-
-    render(
-      <GroupMetaRow
-        data={GroupFixture({
-          project: ProjectFixture({id: 'projectId', platform: 'javascript'}),
-          id: 'groupId',
-          issueCategory: IssueCategory.ERROR,
-          lastSeen: '2017-07-25T22:56:12Z',
-          firstSeen: '2017-07-01T02:06:02Z',
-        })}
-      />,
-      {organization}
-    );
-
-    expect(await screen.findByLabelText('replay-count')).toBeInTheDocument();
-    expect(mockReplayCount).toHaveBeenCalledTimes(1);
-  });
-
   it('details subscription reason when mentioned', () => {
     render(
       <GroupMetaRow
@@ -149,7 +122,7 @@ describe('GroupMetaRow', () => {
 
     expect(screen.getByRole('link', {name: '14'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/issues/groupId/activity/?filter=comments'
+      `/organizations/org-slug/issues/groupId/activity/?filter=comments`
     );
   });
 });
diff --git a/static/app/components/groupMetaRow.tsx b/static/app/components/groupMetaRow.tsx
index 5a6a53f2d75f..125c66974d7f 100644
--- a/static/app/components/groupMetaRow.tsx
+++ b/static/app/components/groupMetaRow.tsx
@@ -1,3 +1,4 @@
+import {Fragment} from 'react';
 import styled from '@emotion/styled';
 
 import {ExternalLink, Link} from '@sentry/scraps/link';
@@ -6,6 +7,7 @@ import {
   getAutofixRunExists,
   isIssueQuickFixable,
 } from 'sentry/components/events/autofix/utils';
+import {EventAnnotation} from 'sentry/components/events/eventAnnotation';
 import {ShortId} from 'sentry/components/group/inboxBadges/shortId';
 import {TimesTag} from 'sentry/components/group/inboxBadges/timesTag';
 import {UnhandledTag} from 'sentry/components/group/inboxBadges/unhandledTag';
@@ -17,7 +19,9 @@ import {Placeholder} from 'sentry/components/placeholder';
 import {IconChat} from 'sentry/icons';
 import {tct} from 'sentry/locale';
 import type {Group} from 'sentry/types/group';
+import {defined} from 'sentry/utils';
 import {getTitle} from 'sentry/utils/events';
+import {useReplayCountForIssues} from 'sentry/utils/replayCount/useReplayCountForIssues';
 import {projectCanLinkToReplay} from 'sentry/utils/replays/projectSupportsReplay';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
@@ -68,10 +72,13 @@ export function GroupMetaRow({data, showAssignee, showLifetime = true}: Props) {
   const location = useLocation();
 
   const issuesPath = `/organizations/${organization.slug}/issues/`;
+  const {getReplayCountForIssue} = useReplayCountForIssues();
 
   const showReplayCount =
     organization.features.includes('session-replay') &&
-    projectCanLinkToReplay(organization, project);
+    projectCanLinkToReplay(organization, project) &&
+    data.issueCategory &&
+    !!getReplayCountForIssue(data.id, data.issueCategory);
 
   const autofixRunExists = getAutofixRunExists(data);
   const seerFixable = isIssueQuickFixable(data);
@@ -82,62 +89,76 @@ export function GroupMetaRow({data, showAssignee, showLifetime = true}: Props) {
 
   const {subtitle} = getTitle(data);
 
-  return (
-    <GroupExtra>
-      {shortId ? (
-        <ShortId
-          shortId={shortId}
-          avatar={
-            project && (
-              <ShadowlessProjectBadge project={project} avatarSize={12} hideName />
-            )
-          }
+  const items = [
+    shortId ? (
+      <ShortId
+        shortId={shortId}
+        avatar={
+          project && <ShadowlessProjectBadge project={project} avatarSize={12} hideName />
+        }
+      />
+    ) : null,
+    isUnhandled ? <UnhandledTag /> : null,
+    showLifetime ? (
+      <Lifetime firstSeen={firstSeen} lastSeen={lastSeen} lifetime={lifetime} />
+    ) : null,
+    subtitle ? <Location>{subtitle}</Location> : null,
+    numComments > 0 ? (
+      <CommentsLink
+        to={{
+          pathname: `${issuesPath}${id}/activity/`,
+          // Filter activity to only show comments
+          query: {filter: 'comments'},
+        }}
+      >
+        <IconChat
+          size="xs"
+          variant={subscriptionDetails?.reason === 'mentioned' ? 'success' : undefined}
         />
-      ) : null}
-      {isUnhandled ? <UnhandledTag /> : null}
-      {showLifetime ? (
-        <Lifetime firstSeen={firstSeen} lastSeen={lastSeen} lifetime={lifetime} />
-      ) : null}
-      {subtitle ? <Location>{subtitle}</Location> : null}
-      {numComments > 0 ? (
-        <CommentsLink
+        <span>{numComments}</span>
+      </CommentsLink>
+    ) : null,
+    showReplayCount ? <IssueReplayCount group={data} /> : null,
+    showSeer ? <IssueSeerBadge group={data} key="issue-seer-badge" /> : null,
+    logger ? (
+      <LoggerAnnotation>
+        <Link
           to={{
-            pathname: `${issuesPath}${id}/activity/`,
-            query: {filter: 'comments'},
+            pathname: issuesPath,
+            query: {
+              ...extractSelectionParameters(location.query),
+              query: `logger:${logger}`,
+            },
           }}
         >
-          <IconChat
-            size="xs"
-            variant={subscriptionDetails?.reason === 'mentioned' ? 'success' : undefined}
-          />
-          <span>{numComments}</span>
-        </CommentsLink>
-      ) : null}
-      {showReplayCount ? <IssueReplayCount group={data} /> : null}
-      {showSeer ? <IssueSeerBadge group={data} /> : null}
-      {logger ? (
-        <LoggerAnnotation>
-          <Link
-            to={{
-              pathname: issuesPath,
-              query: {
-                ...extractSelectionParameters(location.query),
-                query: `logger:${logger}`,
-              },
-            }}
-          >
-            {logger}
-          </Link>
-        </LoggerAnnotation>
-      ) : null}
-      {annotations?.map((annotation, key) => (
-        <Annotation key={key}>
-          <ExternalLink href={annotation.url}>{annotation.displayName}</ExternalLink>
-        </Annotation>
-      ))}
-      {showAssignee && assignedTo ? (
-        <div>{tct('Assigned to [name]', {name: assignedTo.name})}</div>
-      ) : null}
+          {logger}
+        </Link>
+      </LoggerAnnotation>
+    ) : null,
+    ...(annotations?.map((annotation, key) => (
+      <AnnotationNoMargin key={key}>
+        <ExternalLink href={annotation.url}>{annotation.displayName}</ExternalLink>
+      </AnnotationNoMargin>
+    )) ?? []),
+    showAssignee && assignedTo ? (
+      <div>{tct('Assigned to [name]', {name: assignedTo.name})}</div>
+    ) : null,
+  ].filter(defined);
+
+  return (
+    <GroupExtra>
+      {items.map((item, i) => {
+        if (!item) {
+          return null;
+        }
+
+        return (
+          <Fragment key={i}>
+            {item}
+            {i < items.length - 1 ? <Separator /> : null}
+          </Fragment>
+        );
+      })}
     </GroupExtra>
   );
 }
@@ -145,6 +166,7 @@ export function GroupMetaRow({data, showAssignee, showLifetime = true}: Props) {
 const GroupExtra = styled('div')`
   display: inline-grid;
   grid-auto-flow: column dense;
+  gap: ${p => p.theme.space.sm};
   justify-content: start;
   align-items: center;
   color: ${p => p.theme.tokens.content.secondary};
@@ -162,27 +184,19 @@ const GroupExtra = styled('div')`
     color: ${p => p.theme.tokens.interactive.link.accent.hover};
   }
 
-  /* Adds a 1px vertical separator between visible siblings, automatically
-     skipping children that render null */
-  & > * + * {
-    margin-left: ${p => p.theme.space.sm};
-    padding-left: ${p => p.theme.space.sm};
-    /* eslint-disable @sentry/scraps/use-semantic-token */
-    background-image: linear-gradient(
-      ${p => p.theme.tokens.border.secondary},
-      ${p => p.theme.tokens.border.secondary}
-    );
-    /* eslint-enable @sentry/scraps/use-semantic-token */
-    background-position: left center;
-    background-size: 1px 10px;
-    background-repeat: no-repeat;
-  }
-
   @media (min-width: ${p => p.theme.breakpoints.xl}) {
     line-height: 1;
   }
 `;
 
+const Separator = styled('div')`
+  height: 10px;
+  width: 1px;
+  /* eslint-disable-next-line @sentry/scraps/use-semantic-token */
+  background-color: ${p => p.theme.tokens.border.secondary};
+  border-radius: 1px;
+`;
+
 const ShadowlessProjectBadge = styled(ProjectBadge)`
   * > img {
     box-shadow: none;
@@ -198,18 +212,20 @@ const CommentsLink = styled(Link)`
   position: relative;
 `;
 
-const Annotation = styled('span')`
-  a {
-    color: ${p => p.theme.tokens.content.secondary};
-  }
+const AnnotationNoMargin = styled(EventAnnotation)`
+  margin-left: 0;
+  padding-left: 0;
+  border-left: none;
+  position: relative;
 
-  a:hover {
+  & > a:hover {
     color: ${p => p.theme.tokens.interactive.link.accent.hover};
   }
 `;
 
-const LoggerAnnotation = styled(Annotation)`
+const LoggerAnnotation = styled(AnnotationNoMargin)`
   color: ${p => p.theme.tokens.content.primary};
+  position: relative;
   min-width: 10px;
   display: block;
   width: 100%;
diff --git a/static/app/components/groupPreviewTooltip/evidencePreview.spec.tsx b/static/app/components/groupPreviewTooltip/evidencePreview.spec.tsx
index 8249e72d9406..7baac6ae80f5 100644
--- a/static/app/components/groupPreviewTooltip/evidencePreview.spec.tsx
+++ b/static/app/components/groupPreviewTooltip/evidencePreview.spec.tsx
@@ -37,7 +37,7 @@ describe('EvidencePreview', () => {
     });
 
     const mockApi = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/group-id/events/recommended/',
+      url: `/organizations/org-slug/issues/group-id/events/recommended/`,
       body: event,
     });
 
diff --git a/static/app/components/groupPreviewTooltip/spanEvidencePreview.spec.tsx b/static/app/components/groupPreviewTooltip/spanEvidencePreview.spec.tsx
index 285185376213..9625f8963d14 100644
--- a/static/app/components/groupPreviewTooltip/spanEvidencePreview.spec.tsx
+++ b/static/app/components/groupPreviewTooltip/spanEvidencePreview.spec.tsx
@@ -17,7 +17,7 @@ describe('SpanEvidencePreview', () => {
 
   it('does not fetch before hover', async () => {
     const mock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/group-id/events/recommended/',
+      url: `/organizations/org-slug/issues/group-id/events/recommended/`,
       body: {},
     });
 
@@ -30,7 +30,7 @@ describe('SpanEvidencePreview', () => {
 
   it.isKnownFlake('shows error when request fails', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/group-id/events/recommended/',
+      url: `/organizations/org-slug/issues/group-id/events/recommended/`,
       body: {},
       statusCode: 500,
     });
@@ -97,7 +97,7 @@ describe('SpanEvidencePreview', () => {
       .getEventFixture();
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/group-id/events/recommended/',
+      url: `/organizations/org-slug/issues/group-id/events/recommended/`,
       body: event,
     });
 
diff --git a/static/app/components/groupPreviewTooltip/stackTracePreview.spec.tsx b/static/app/components/groupPreviewTooltip/stackTracePreview.spec.tsx
index b4d87cda5632..d15011b93e08 100644
--- a/static/app/components/groupPreviewTooltip/stackTracePreview.spec.tsx
+++ b/static/app/components/groupPreviewTooltip/stackTracePreview.spec.tsx
@@ -17,7 +17,7 @@ beforeEach(() => {
 describe('StackTracePreview', () => {
   it('renders error message', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/123/events/recommended/',
+      url: `/organizations/org-slug/issues/123/events/recommended/`,
       statusCode: 400,
     });
 
@@ -30,7 +30,7 @@ describe('StackTracePreview', () => {
 
   it('warns about no stacktrace', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/123/events/recommended/',
+      url: `/organizations/org-slug/issues/123/events/recommended/`,
       body: EventFixture({id: '456', entries: []}),
     });
 
@@ -94,7 +94,7 @@ describe('StackTracePreview', () => {
     } as EventError;
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/123/events/recommended/',
+      url: `/organizations/org-slug/issues/123/events/recommended/`,
       body: EventFixture(errorEvent),
     });
 
diff --git a/static/app/components/guidedSteps/guidedSteps.tsx b/static/app/components/guidedSteps/guidedSteps.tsx
index 74a41eebf37c..03a3658b4292 100644
--- a/static/app/components/guidedSteps/guidedSteps.tsx
+++ b/static/app/components/guidedSteps/guidedSteps.tsx
@@ -299,8 +299,8 @@ const StepWrapper = styled('div')`
 const StepButton = styled('button')<{hasTrailingItems: boolean}>`
   ${p =>
     p.hasTrailingItems
-      ? 'flex: 1; min-width: 0; text-align: left;'
-      : 'grid-area: heading;'}
+      ? `flex: 1; min-width: 0; text-align: left;`
+      : `grid-area: heading;`}
 
   position: relative;
   background: none;
diff --git a/static/app/components/modals/bulkEditMonitorsModal.tsx b/static/app/components/modals/bulkEditMonitorsModal.tsx
index 8d3dc88c1d60..9c7b307f5189 100644
--- a/static/app/components/modals/bulkEditMonitorsModal.tsx
+++ b/static/app/components/modals/bulkEditMonitorsModal.tsx
@@ -1,7 +1,6 @@
 import {Fragment, useState} from 'react';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
-import {useQuery, useQueryClient} from '@tanstack/react-query';
 
 import {Button} from '@sentry/scraps/button';
 import {Checkbox} from '@sentry/scraps/checkbox';
@@ -16,7 +15,7 @@ import {PanelTable} from 'sentry/components/panels/panelTable';
 import {Placeholder} from 'sentry/components/placeholder';
 import {SearchBar} from 'sentry/components/searchBar';
 import {t, tct, tn} from 'sentry/locale';
-import {selectJsonWithHeaders} from 'sentry/utils/api/apiOptions';
+import {setApiQueryData, useApiQuery, useQueryClient} from 'sentry/utils/queryClient';
 import {useApi} from 'sentry/utils/useApi';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
@@ -26,7 +25,7 @@ import {
   SortSelector,
 } from 'sentry/views/insights/crons/components/overviewTimeline/sortSelector';
 import type {Monitor} from 'sentry/views/insights/crons/types';
-import {monitorListApiOptions} from 'sentry/views/insights/crons/utils';
+import {makeMonitorListQueryKey} from 'sentry/views/insights/crons/utils';
 import {scheduleAsText} from 'sentry/views/insights/crons/utils/scheduleAsText';
 
 interface Props extends ModalRenderProps {}
@@ -47,12 +46,10 @@ export function BulkEditMonitorsModal({Header, Body, Footer, closeModal}: Props)
     sort: MonitorSortOption;
   }>({sort: MonitorSortOption.STATUS, order: MonitorSortOrder.ASCENDING});
 
-  const monitorListOptions = monitorListApiOptions(organization, {
-    cursor,
+  const queryKey = makeMonitorListQueryKey(organization, {
+    ...location.query,
     query: searchQuery,
-    project: location.query.project,
-    environment: location.query.environment,
-    owner: location.query.owner,
+    cursor,
     sort: sortSelection.sort,
     asc: sortSelection.order,
   });
@@ -87,28 +84,24 @@ export function BulkEditMonitorsModal({Header, Body, Footer, closeModal}: Props)
     setSelectedMonitors([]);
 
     if (resp?.updated) {
-      queryClient.setQueryData(monitorListOptions.queryKey, previous => {
-        if (!previous) {
-          return previous;
-        }
-        return {
-          ...previous,
-          json: previous.json.map(
-            monitor =>
-              resp.updated.find(newMonitor => newMonitor.slug === monitor.slug) ?? monitor
-          ),
-        };
+      setApiQueryData<Monitor[]>(queryClient, queryKey, oldMonitorList => {
+        return oldMonitorList?.map(
+          monitor =>
+            resp.updated.find(newMonitor => newMonitor.slug === monitor.slug) ?? monitor
+        );
       });
     }
     setIsUpdating(false);
   };
 
-  const {data, isPending} = useQuery({
-    ...monitorListOptions,
-    select: selectJsonWithHeaders,
+  const {
+    data: monitorList,
+    getResponseHeader: monitorListHeaders,
+    isPending,
+  } = useApiQuery<Monitor[]>(queryKey, {
+    staleTime: 0,
   });
-  const monitorList = data?.json;
-  const monitorPageLinks = data?.headers.Link;
+  const monitorPageLinks = monitorListHeaders?.('Link');
 
   const headers = [t('Monitor'), t('State'), t('Muted'), t('Schedule')];
   const shouldDisable = selectedMonitors.every(monitor => monitor.status !== 'disabled');
diff --git a/static/app/components/modals/dataWidgetViewerModal.spec.tsx b/static/app/components/modals/dataWidgetViewerModal.spec.tsx
index d3111b5bf04b..28df659371cd 100644
--- a/static/app/components/modals/dataWidgetViewerModal.spec.tsx
+++ b/static/app/components/modals/dataWidgetViewerModal.spec.tsx
@@ -1154,7 +1154,7 @@ describe('Modals -> DataWidgetViewerModal', () => {
     beforeEach(() => {
       mockQuery = {
         conditions: '',
-        fields: ['sum(session)'],
+        fields: [`sum(session)`],
         columns: [],
         aggregates: ['sum(session)'],
         name: 'Query Name',
@@ -1253,7 +1253,7 @@ describe('Modals -> DataWidgetViewerModal', () => {
         widget: mockWidget,
       });
       await waitFor(() => expect(metricsMock).toHaveBeenCalledTimes(2));
-      await userEvent.click(await screen.findByText('sum(session)'), {delay: null});
+      await userEvent.click(await screen.findByText(`sum(session)`), {delay: null});
       await waitFor(() => expect(metricsMock).toHaveBeenCalledTimes(3));
       expect(router.location.query).toEqual(
         expect.objectContaining({sort: '-sum(session)'})
@@ -1263,7 +1263,7 @@ describe('Modals -> DataWidgetViewerModal', () => {
     it('should add release column and call metrics API with groupBy release', async () => {
       mockQuery = {
         conditions: '',
-        fields: ['sum(session)'],
+        fields: [`sum(session)`],
         columns: [],
         aggregates: ['sum(session)'],
         name: 'Query Name',
diff --git a/static/app/components/modals/diffModal.spec.tsx b/static/app/components/modals/diffModal.spec.tsx
index 9c705672aaf1..2d16661ea9b5 100644
--- a/static/app/components/modals/diffModal.spec.tsx
+++ b/static/app/components/modals/diffModal.spec.tsx
@@ -30,7 +30,7 @@ describe('DiffModal', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/',
+      url: `/projects/org-slug/project-slug/`,
       body: {features: []},
     });
 
diff --git a/static/app/components/modals/inviteMembersModal/index.spec.tsx b/static/app/components/modals/inviteMembersModal/index.spec.tsx
index cbec63460dd4..7b92f92babcb 100644
--- a/static/app/components/modals/inviteMembersModal/index.spec.tsx
+++ b/static/app/components/modals/inviteMembersModal/index.spec.tsx
@@ -174,7 +174,7 @@ describe('InviteMembersModal', () => {
     expect(mockPostApi).toHaveBeenCalled();
 
     expect(mockPostApi).toHaveBeenCalledWith(
-      '/organizations/org-slug/members/',
+      `/organizations/org-slug/members/`,
       expect.objectContaining({
         data: {email: 'test1@test.com', role: 'admin', teams: []},
       })
@@ -194,7 +194,7 @@ describe('InviteMembersModal', () => {
     const mockPostApi = mocks[1];
     expect(mockPostApi).toHaveBeenCalled();
     expect(mockPostApi).toHaveBeenCalledWith(
-      '/organizations/org-slug/members/',
+      `/organizations/org-slug/members/`,
       expect.objectContaining({
         data: {email: 'test1@test.com', role: 'admin', teams: ['team-slug']},
       })
@@ -268,7 +268,7 @@ describe('InviteMembersModal', () => {
 
     const apiMock = mocks[1];
     expect(apiMock).toHaveBeenCalledWith(
-      '/organizations/org-slug/members/',
+      `/organizations/org-slug/members/`,
       expect.objectContaining({
         data: {email: initialEmail, role: 'member', teams: ['team-slug']},
       })
@@ -304,7 +304,7 @@ describe('InviteMembersModal', () => {
 
     const apiMock = mocks[1];
     expect(apiMock).toHaveBeenCalledWith(
-      '/organizations/org-slug/members/',
+      `/organizations/org-slug/members/`,
       expect.objectContaining({
         data: {email: initialEmail, role, teams: [TeamFixture().slug]},
       })
diff --git a/static/app/components/modals/sentryAppPublishRequestModal/sentryAppPublishRequestModal.tsx b/static/app/components/modals/sentryAppPublishRequestModal/sentryAppPublishRequestModal.tsx
index fd151b34c4ee..b968e7aff4d5 100644
--- a/static/app/components/modals/sentryAppPublishRequestModal/sentryAppPublishRequestModal.tsx
+++ b/static/app/components/modals/sentryAppPublishRequestModal/sentryAppPublishRequestModal.tsx
@@ -221,6 +221,6 @@ const Footer = styled('div')`
   font-size: ${p => p.theme.font.size.md};
 `;
 
-const FooterParagraph = styled('p')`
+const FooterParagraph = styled(`p`)`
   margin-bottom: ${p => p.theme.space.md};
 `;
diff --git a/static/app/components/onboarding/frameworkSuggestionModal.spec.tsx b/static/app/components/onboarding/frameworkSuggestionModal.spec.tsx
index f55293579f1f..0cbaac4bf798 100644
--- a/static/app/components/onboarding/frameworkSuggestionModal.spec.tsx
+++ b/static/app/components/onboarding/frameworkSuggestionModal.spec.tsx
@@ -52,7 +52,7 @@ describe('Framework suggestion modal', () => {
 
     expect(screen.getByText(languageDescriptions.javascript!)).toBeInTheDocument();
 
-    expect(screen.getByRole('radio', {name: 'Nope, Vanilla'})).toBeChecked();
+    expect(screen.getByRole('radio', {name: `Nope, Vanilla`})).toBeChecked();
 
     const frameworks = platforms.filter(
       platform => platform.type === 'framework' && platform.language === 'javascript'
diff --git a/static/app/components/onboarding/gettingStartedDoc/feedback/altCrashReportCallout.tsx b/static/app/components/onboarding/gettingStartedDoc/feedback/altCrashReportCallout.tsx
index 8624f8fbdc4b..d15304220c6d 100644
--- a/static/app/components/onboarding/gettingStartedDoc/feedback/altCrashReportCallout.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/feedback/altCrashReportCallout.tsx
@@ -8,7 +8,7 @@ export function altCrashReportCallout() {
     <Alert.Container>
       <Alert variant="info">
         {tct(
-          'Want to add an embeddable, JavaScript-based, crash-report modal to your website instead? [link:Read the docs] to learn how.',
+          `Want to add an embeddable, JavaScript-based, crash-report modal to your website instead? [link:Read the docs] to learn how.`,
           {
             link: (
               <ExternalLink href="https://docs.sentry.io/platforms/dotnet/user-feedback/#crash-report-modal" />
diff --git a/static/app/components/onboarding/gettingStartedDoc/feedback/crashReportCallout.tsx b/static/app/components/onboarding/gettingStartedDoc/feedback/crashReportCallout.tsx
index 0a1eeb61360f..5bc4d50ac169 100644
--- a/static/app/components/onboarding/gettingStartedDoc/feedback/crashReportCallout.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/feedback/crashReportCallout.tsx
@@ -8,7 +8,7 @@ export function crashReportCallout({link}: {link: string}) {
     <Alert.Container>
       <Alert variant="info">
         {tct(
-          'Interested in receiving feedback only when an error happens? [link:Read the docs] to learn how to set up our crash-report modal.',
+          `Interested in receiving feedback only when an error happens? [link:Read the docs] to learn how to set up our crash-report modal.`,
           {
             link: <ExternalLink href={link} />,
           }
diff --git a/static/app/components/onboarding/gettingStartedDoc/feedback/widgetCallout.tsx b/static/app/components/onboarding/gettingStartedDoc/feedback/widgetCallout.tsx
index 28b64d619abb..61b14b76f434 100644
--- a/static/app/components/onboarding/gettingStartedDoc/feedback/widgetCallout.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/feedback/widgetCallout.tsx
@@ -8,7 +8,7 @@ export function widgetCalloutBlock({link}: {link: string}): ContentBlock {
     type: 'alert',
     alertType: 'info',
     text: tct(
-      'Want to receive user feedback at any time, not just when an error happens? [link:Read the docs] to learn how to set up our customizable widget.',
+      `Want to receive user feedback at any time, not just when an error happens? [link:Read the docs] to learn how to set up our customizable widget.`,
       {
         link: <ExternalLink href={link} />,
       }
diff --git a/static/app/components/onboarding/gettingStartedDoc/onboardingCodeSnippet.tsx b/static/app/components/onboarding/gettingStartedDoc/onboardingCodeSnippet.tsx
index 65d8a523efc1..43c564ce09c7 100644
--- a/static/app/components/onboarding/gettingStartedDoc/onboardingCodeSnippet.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/onboardingCodeSnippet.tsx
@@ -26,7 +26,7 @@ export function replaceTokensWithSpan(element: HTMLElement) {
   );
 
   return Array.from<HTMLSpanElement>(
-    element.querySelectorAll('[data-token="___ORG_AUTH_TOKEN___"]')
+    element.querySelectorAll(`[data-token="___ORG_AUTH_TOKEN___"]`)
   );
 }
 
diff --git a/static/app/components/onboarding/gettingStartedDoc/onboardingLayout.spec.tsx b/static/app/components/onboarding/gettingStartedDoc/onboardingLayout.spec.tsx
index c87f27c538ce..7de4f32d3a22 100644
--- a/static/app/components/onboarding/gettingStartedDoc/onboardingLayout.spec.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/onboardingLayout.spec.tsx
@@ -67,7 +67,7 @@ function renderLayout(docsConfig: Docs, features: string[] = []) {
         location: {
           pathname: `/organizations/${organization.slug}/projects/${project.slug}/getting-started/`,
         },
-        route: '/organizations/:orgId/projects/:projectId/getting-started/',
+        route: `/organizations/:orgId/projects/:projectId/getting-started/`,
       },
     }
   );
diff --git a/static/app/components/onboarding/gettingStartedDoc/replay/tracePropagationMessage.tsx b/static/app/components/onboarding/gettingStartedDoc/replay/tracePropagationMessage.tsx
index c602b3fe6cee..a5c29d6af73a 100644
--- a/static/app/components/onboarding/gettingStartedDoc/replay/tracePropagationMessage.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/replay/tracePropagationMessage.tsx
@@ -7,7 +7,7 @@ export const tracePropagationBlock: ContentBlock = {
   type: 'alert',
   alertType: 'info',
   text: tct(
-    'To see replays for backend errors, ensure that you have set up trace propagation. To learn more, [link:read the docs].',
+    `To see replays for backend errors, ensure that you have set up trace propagation. To learn more, [link:read the docs].`,
     {
       link: (
         <ExternalLink href="https://docs.sentry.io/product/explore/session-replay/web/getting-started/#replays-for-backend-errors" />
diff --git a/static/app/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding.tsx b/static/app/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding.tsx
index c9c364632b3b..3afbc153e04d 100644
--- a/static/app/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/utils/feedbackOnboarding.tsx
@@ -81,7 +81,7 @@ export function FeedbackOnboardingWebApiBanner() {
     <Alert.Container>
       <Alert variant="info">
         {tct(
-          'When a user experiences an error, Sentry provides the ability to collect additional feedback. You can use an endpoint in Sentry to submit it. [link:Read our docs] to learn more.',
+          `When a user experiences an error, Sentry provides the ability to collect additional feedback. You can use an endpoint in Sentry to submit it. [link:Read our docs] to learn more.`,
           {
             link: (
               <ExternalLink href="https://docs.sentry.io/api/projects/submit-user-feedback/" />
@@ -330,7 +330,7 @@ export const getCrashReportPHPInstallSteps = (params: any): OnboardingStep[] =>
           {
             label: 'PHP',
             language: 'php',
-            code: '\\Sentry\\SentrySdk::getCurrentHub()->getLastEventId();',
+            code: `\\Sentry\\SentrySdk::getCurrentHub()->getLastEventId();`,
           },
         ],
       },
diff --git a/static/app/components/onboarding/gettingStartedDoc/utils/replayOnboarding.tsx b/static/app/components/onboarding/gettingStartedDoc/utils/replayOnboarding.tsx
index 144b61a252cf..bfabc3284026 100644
--- a/static/app/components/onboarding/gettingStartedDoc/utils/replayOnboarding.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/utils/replayOnboarding.tsx
@@ -106,7 +106,7 @@ export const getReplayConfigOptions = ({
   mask?: boolean;
 } = {}) => {
   if (mask && block) {
-    return '';
+    return ``;
   }
   if (mask) {
     return `{
diff --git a/static/app/components/onboardingWizard/content.spec.tsx b/static/app/components/onboardingWizard/content.spec.tsx
index 222a5b33a2aa..2c0ba1057f32 100644
--- a/static/app/components/onboardingWizard/content.spec.tsx
+++ b/static/app/components/onboardingWizard/content.spec.tsx
@@ -49,7 +49,7 @@ describe('OnboardingSidebarContent', () => {
       },
     });
     MockApiClient.addMockResponse({
-      url: '/assistant/',
+      url: `/assistant/`,
       body: [],
     });
   });
@@ -106,7 +106,7 @@ describe('OnboardingSidebarContent', () => {
       },
     });
     MockApiClient.addMockResponse({
-      url: '/assistant/',
+      url: `/assistant/`,
       body: [],
     });
 
diff --git a/static/app/components/onboardingWizard/taskConfig.tsx b/static/app/components/onboardingWizard/taskConfig.tsx
index ccecd6c5865d..a0b258f7c75b 100644
--- a/static/app/components/onboardingWizard/taskConfig.tsx
+++ b/static/app/components/onboardingWizard/taskConfig.tsx
@@ -60,7 +60,7 @@ function getOnboardingInstructionsUrl({projects, organization}: Options) {
   // he needs to select the platform again since it is not available as a parameter here
   if (!projects?.length) {
     return makeProjectsPathname({
-      path: '/:projectId/getting-started/',
+      path: `/:projectId/getting-started/`,
       organization,
     });
   }
@@ -70,7 +70,7 @@ function getOnboardingInstructionsUrl({projects, organization}: Options) {
   // we ask the user to pick a project before navigating to the instructions
   if (allProjectsWithoutErrors) {
     return makeProjectsPathname({
-      path: '/:projectId/getting-started/',
+      path: `/:projectId/getting-started/`,
       organization,
     });
   }
diff --git a/static/app/components/overlay.tsx b/static/app/components/overlay.tsx
index 56b4a57de2d3..d30c94e31bda 100644
--- a/static/app/components/overlay.tsx
+++ b/static/app/components/overlay.tsx
@@ -82,7 +82,7 @@ function computeOriginFromArrow(
     case 'right':
       return {originX: 0, originY: y ? `${y}px` : '50%'};
     default:
-      return {originX: '50%', originY: '50%'};
+      return {originX: `50%`, originY: '50%'};
   }
 }
 
diff --git a/static/app/components/overlayArrow.tsx b/static/app/components/overlayArrow.tsx
index 847d922ee061..829f44a6b0e0 100644
--- a/static/app/components/overlayArrow.tsx
+++ b/static/app/components/overlayArrow.tsx
@@ -62,13 +62,13 @@ const OverlayArrowWrap = styled('div')<{
   transform-origin: center;
 
   ${p =>
-    p.placement?.startsWith('top') && 'top: 100%; left: 50%; transform: rotate(0deg);'}
+    p.placement?.startsWith('top') && `top: 100%; left: 50%; transform: rotate(0deg);`}
   ${p =>
     p.placement?.startsWith('bottom') &&
-    'bottom: 100%; left: 50%; transform: rotate(180deg);'}
+    `bottom: 100%; left: 50%; transform: rotate(180deg);`}
   ${p =>
-    p.placement?.startsWith('left') && 'left: 100%; top: 50%; transform: rotate(-90deg);'}
+    p.placement?.startsWith('left') && `left: 100%; top: 50%; transform: rotate(-90deg);`}
   ${p =>
     p.placement?.startsWith('right') &&
-    'right: 100%; top: 50%; transform: rotate(90deg);'}
+    `right: 100%; top: 50%; transform: rotate(90deg);`}
 `;
diff --git a/static/app/components/pageFilters/environment/environmentPageFilter.tsx b/static/app/components/pageFilters/environment/environmentPageFilter.tsx
index 8efd90901fc2..1d1118fd3bdf 100644
--- a/static/app/components/pageFilters/environment/environmentPageFilter.tsx
+++ b/static/app/components/pageFilters/environment/environmentPageFilter.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useMemo, useRef} from 'react';
-import {useMatches} from 'react-router-dom';
 import {isAppleDevice} from '@react-aria/utils';
 import isEqual from 'lodash/isEqual';
 import sortBy from 'lodash/sortBy';
@@ -27,6 +26,7 @@ import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {useProjects} from 'sentry/utils/useProjects';
+import {useRouter} from 'sentry/utils/useRouter';
 
 export interface EnvironmentPageFilterProps extends Partial<
   Omit<MultipleSelectProps<string>, 'onChange'>
@@ -64,7 +64,7 @@ export function EnvironmentPageFilter({
   storageNamespace,
   ...selectProps
 }: EnvironmentPageFilterProps) {
-  const matches = useMatches();
+  const router = useRouter();
   const location = useLocation();
   const navigate = useNavigate();
   const organization = useOrganization();
@@ -129,7 +129,7 @@ export function EnvironmentPageFilter({
 
       trackAnalytics('environmentselector.update', {
         count: newValue.length,
-        path: getRouteStringFromRoutes({matches}),
+        path: getRouteStringFromRoutes(router.routes),
         organization,
       });
 
@@ -145,12 +145,12 @@ export function EnvironmentPageFilter({
     [
       envPageFilterValue,
       resetParamsOnChange,
+      router,
       location,
       navigate,
       organization,
       onChange,
       storageNamespace,
-      matches,
     ]
   );
 
@@ -158,19 +158,19 @@ export function EnvironmentPageFilter({
     (newValue: any) => {
       trackAnalytics('environmentselector.toggle', {
         action: newValue.length > value.length ? 'added' : 'removed',
-        path: getRouteStringFromRoutes({matches}),
+        path: getRouteStringFromRoutes(router.routes),
         organization,
       });
     },
-    [value, matches, organization]
+    [value, router.routes, organization]
   );
 
   const onReplace = useCallback(() => {
     trackAnalytics('environmentselector.direct_selection', {
-      path: getRouteStringFromRoutes({matches}),
+      path: getRouteStringFromRoutes(router.routes),
       organization,
     });
-  }, [matches, organization]);
+  }, [router.routes, organization]);
 
   const options = useMemo(
     () =>
diff --git a/static/app/components/pageFilters/project/projectPageFilter.tsx b/static/app/components/pageFilters/project/projectPageFilter.tsx
index ec4622e5d7af..67d5a329722d 100644
--- a/static/app/components/pageFilters/project/projectPageFilter.tsx
+++ b/static/app/components/pageFilters/project/projectPageFilter.tsx
@@ -1,5 +1,4 @@
 import {Fragment, useCallback, useMemo, useRef, useState} from 'react';
-import {useMatches} from 'react-router-dom';
 import {isAppleDevice} from '@react-aria/utils';
 import sortBy from 'lodash/sortBy';
 import xor from 'lodash/xor';
@@ -34,6 +33,7 @@ import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {useProjects} from 'sentry/utils/useProjects';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {makeProjectsPathname} from 'sentry/views/projects/pathname';
 
 /**
@@ -77,7 +77,7 @@ export function ProjectPageFilter({
   // External context/state
   const location = useLocation();
   const navigate = useNavigate();
-  const matches = useMatches();
+  const routes = useRoutes();
   const organization = useOrganization();
   // Project data s
   const {projects, initiallyLoaded: projectsLoaded} = useProjects();
@@ -376,7 +376,7 @@ export function ProjectPageFilter({
     organization,
   ]);
 
-  const routePath = useMemo(() => getRouteStringFromRoutes({matches}), [matches]);
+  const routePath = useMemo(() => getRouteStringFromRoutes(routes), [routes]);
 
   // Selection staging and commit behavior
   const selectionLimitExceeded = useMemo(() => {
@@ -541,7 +541,7 @@ export function ProjectPageFilter({
         {selectionLimitExceeded && (
           <MenuComponents.Alert variant="warning">
             {tct(
-              "You've selected [count] projects, but only up to [limit] can be selected at a time. Select All Projects to view all projects.",
+              `You've selected [count] projects, but only up to [limit] can be selected at a time. Select All Projects to view all projects.`,
               {
                 limit: SELECTION_COUNT_LIMIT,
                 count: stagedSelect.value.length,
diff --git a/static/app/components/pageOverlay.tsx b/static/app/components/pageOverlay.tsx
index 3fde5aee1061..2429dcef2828 100644
--- a/static/app/components/pageOverlay.tsx
+++ b/static/app/components/pageOverlay.tsx
@@ -157,8 +157,8 @@ export function PageOverlay({
       // Absolute position the container, this avoids the browser having to reflow
       // the component
       wrapperRef.current.style.position = 'absolute';
-      wrapperRef.current.style.left = '0px';
-      wrapperRef.current.style.top = '0px';
+      wrapperRef.current.style.left = `0px`;
+      wrapperRef.current.style.top = `0px`;
 
       const mainRect = contentRef.current.getBoundingClientRect();
       const anchorRect = anchorRef.current.getBoundingClientRect();
diff --git a/static/app/components/pipeline/pipelineIntegrationBitbucket.spec.tsx b/static/app/components/pipeline/pipelineIntegrationBitbucket.spec.tsx
deleted file mode 100644
index f97acd8fbbec..000000000000
--- a/static/app/components/pipeline/pipelineIntegrationBitbucket.spec.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-import {act, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
-
-import {bitbucketIntegrationPipeline} from './pipelineIntegrationBitbucket';
-import type {PipelineStepProps} from './types';
-
-const BitbucketAuthorizeStep = bitbucketIntegrationPipeline.steps[0].component;
-
-function makeStepProps<D, A>(
-  overrides: Partial<PipelineStepProps<D, A>> & {stepData: D}
-): PipelineStepProps<D, A> {
-  return {
-    advance: jest.fn(),
-    advanceError: null,
-    isAdvancing: false,
-    stepIndex: 0,
-    totalSteps: 1,
-    ...overrides,
-  };
-}
-
-let mockPopup: Window;
-
-function dispatchPipelineMessage({
-  data,
-  origin = document.location.origin,
-  source = mockPopup,
-}: {
-  data: Record<string, string>;
-  origin?: string;
-  source?: Window | MessageEventSource | null;
-}) {
-  act(() => {
-    const event = new MessageEvent('message', {data, origin});
-    Object.defineProperty(event, 'source', {value: source});
-    window.dispatchEvent(event);
-  });
-}
-
-beforeEach(() => {
-  mockPopup = {
-    closed: false,
-    close: jest.fn(),
-    focus: jest.fn(),
-  } as unknown as Window;
-  jest.spyOn(window, 'open').mockReturnValue(mockPopup);
-});
-
-afterEach(() => {
-  jest.restoreAllMocks();
-});
-
-describe('BitbucketAuthorizeStep', () => {
-  it('renders the authorize button', () => {
-    render(
-      <BitbucketAuthorizeStep
-        {...makeStepProps({
-          stepData: {
-            authorizeUrl:
-              'https://bitbucket.org/site/addons/authorize?descriptor_uri=test',
-          },
-        })}
-      />
-    );
-
-    expect(screen.getByRole('button', {name: 'Authorize Bitbucket'})).toBeInTheDocument();
-  });
-
-  it('calls advance with JWT on callback', async () => {
-    const advance = jest.fn();
-    render(
-      <BitbucketAuthorizeStep
-        {...makeStepProps({
-          stepData: {
-            authorizeUrl:
-              'https://bitbucket.org/site/addons/authorize?descriptor_uri=test',
-          },
-          advance,
-        })}
-      />
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Authorize Bitbucket'}));
-
-    dispatchPipelineMessage({
-      data: {
-        _pipeline_source: 'sentry-pipeline',
-        jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test',
-      },
-    });
-
-    expect(advance).toHaveBeenCalledWith({
-      jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test',
-    });
-  });
-
-  it('shows reopen button when waiting for callback', async () => {
-    render(
-      <BitbucketAuthorizeStep
-        {...makeStepProps({
-          stepData: {
-            authorizeUrl:
-              'https://bitbucket.org/site/addons/authorize?descriptor_uri=test',
-          },
-        })}
-      />
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Authorize Bitbucket'}));
-
-    expect(
-      screen.getByRole('button', {name: 'Reopen authorization window'})
-    ).toBeInTheDocument();
-  });
-
-  it('shows loading state when isAdvancing is true', () => {
-    render(
-      <BitbucketAuthorizeStep
-        {...makeStepProps({
-          stepData: {
-            authorizeUrl:
-              'https://bitbucket.org/site/addons/authorize?descriptor_uri=test',
-          },
-          isAdvancing: true,
-        })}
-      />
-    );
-
-    expect(screen.getByRole('button', {name: 'Authorizing...'})).toBeDisabled();
-  });
-
-  it('disables authorize button when authorizeUrl is not provided', () => {
-    render(<BitbucketAuthorizeStep {...makeStepProps({stepData: {}})} />);
-
-    expect(screen.getByRole('button', {name: 'Authorize Bitbucket'})).toBeDisabled();
-  });
-
-  it('shows popup blocked notice when popup fails to open', async () => {
-    jest.spyOn(window, 'open').mockReturnValue(null);
-    render(
-      <BitbucketAuthorizeStep
-        {...makeStepProps({
-          stepData: {
-            authorizeUrl:
-              'https://bitbucket.org/site/addons/authorize?descriptor_uri=test',
-          },
-        })}
-      />
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Authorize Bitbucket'}));
-
-    expect(screen.getByText(/authorization popup was blocked/)).toBeInTheDocument();
-  });
-});
diff --git a/static/app/components/pipeline/pipelineIntegrationBitbucket.tsx b/static/app/components/pipeline/pipelineIntegrationBitbucket.tsx
deleted file mode 100644
index 87cdf53b59fb..000000000000
--- a/static/app/components/pipeline/pipelineIntegrationBitbucket.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import {useCallback} from 'react';
-
-import {Button} from '@sentry/scraps/button';
-import {Stack} from '@sentry/scraps/layout';
-import {Text} from '@sentry/scraps/text';
-
-import {t} from 'sentry/locale';
-import type {IntegrationWithConfig} from 'sentry/types/integrations';
-
-import {useRedirectPopupStep} from './shared/useRedirectPopupStep';
-import type {PipelineDefinition, PipelineStepProps} from './types';
-import {pipelineComplete} from './types';
-
-interface AuthorizeStepData {
-  authorizeUrl?: string;
-}
-
-interface AuthorizeAdvanceData {
-  jwt: string;
-}
-
-function BitbucketAuthorizeStep({
-  stepData,
-  advance,
-  isAdvancing,
-}: PipelineStepProps<AuthorizeStepData, AuthorizeAdvanceData>) {
-  const handleCallback = useCallback(
-    (data: Record<string, string>) => {
-      if (data.jwt) {
-        advance({jwt: data.jwt});
-      }
-    },
-    [advance]
-  );
-
-  const {openPopup, isWaitingForCallback, popupStatus} = useRedirectPopupStep({
-    redirectUrl: stepData.authorizeUrl,
-    onCallback: handleCallback,
-  });
-
-  return (
-    <Stack gap="lg" align="start">
-      <Stack gap="sm">
-        <Text>
-          {t(
-            'Connect your Bitbucket account by authorizing the Sentry add-on for Bitbucket.'
-          )}
-        </Text>
-        {isWaitingForCallback && (
-          <Text variant="muted" size="sm">
-            {t('A popup should have opened to authorize with Bitbucket.')}
-          </Text>
-        )}
-        {popupStatus === 'failed-to-open' && (
-          <Text variant="danger" size="sm">
-            {t(
-              'The authorization popup was blocked by your browser. Please ensure popups are allowed and try again.'
-            )}
-          </Text>
-        )}
-      </Stack>
-      {isAdvancing ? (
-        <Button size="sm" disabled>
-          {t('Authorizing...')}
-        </Button>
-      ) : isWaitingForCallback ? (
-        <Button size="sm" onClick={openPopup}>
-          {t('Reopen authorization window')}
-        </Button>
-      ) : (
-        <Button
-          size="sm"
-          priority="primary"
-          onClick={openPopup}
-          disabled={!stepData.authorizeUrl}
-        >
-          {t('Authorize Bitbucket')}
-        </Button>
-      )}
-    </Stack>
-  );
-}
-
-export const bitbucketIntegrationPipeline = {
-  type: 'integration',
-  provider: 'bitbucket',
-  actionTitle: t('Installing Bitbucket Integration'),
-  getCompletionData: pipelineComplete<IntegrationWithConfig>,
-  steps: [
-    {
-      stepId: 'authorize',
-      shortDescription: t('Authorizing Bitbucket'),
-      component: BitbucketAuthorizeStep,
-    },
-  ],
-} as const satisfies PipelineDefinition;
diff --git a/static/app/components/pipeline/pipelineIntegrationGitLab.spec.tsx b/static/app/components/pipeline/pipelineIntegrationGitLab.spec.tsx
deleted file mode 100644
index fbf423de03f9..000000000000
--- a/static/app/components/pipeline/pipelineIntegrationGitLab.spec.tsx
+++ /dev/null
@@ -1,366 +0,0 @@
-import {act, render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import {gitlabIntegrationPipeline} from './pipelineIntegrationGitLab';
-import type {PipelineStepProps} from './types';
-
-const InstallationConfigStep = gitlabIntegrationPipeline.steps[0].component;
-const GitLabOAuthLoginStep = gitlabIntegrationPipeline.steps[1].component;
-
-function makeStepProps<D, A>(
-  overrides: Partial<PipelineStepProps<D, A>> & {stepData: D}
-): PipelineStepProps<D, A> {
-  return {
-    advance: jest.fn(),
-    advanceError: null,
-    isAdvancing: false,
-    stepIndex: 0,
-    totalSteps: 2,
-    ...overrides,
-  };
-}
-
-let mockPopup: Window;
-
-function dispatchPipelineMessage({
-  data,
-  origin = document.location.origin,
-  source = mockPopup,
-}: {
-  data: Record<string, string>;
-  origin?: string;
-  source?: Window | MessageEventSource | null;
-}) {
-  act(() => {
-    const event = new MessageEvent('message', {data, origin});
-    Object.defineProperty(event, 'source', {value: source});
-    window.dispatchEvent(event);
-  });
-}
-
-beforeEach(() => {
-  mockPopup = {
-    closed: false,
-    close: jest.fn(),
-    focus: jest.fn(),
-  } as unknown as Window;
-  jest.spyOn(window, 'open').mockReturnValue(mockPopup);
-});
-
-afterEach(() => {
-  jest.restoreAllMocks();
-});
-
-describe('InstallationConfigStep', () => {
-  it('renders the guided steps and config form', () => {
-    render(
-      <InstallationConfigStep
-        {...makeStepProps({
-          stepData: {
-            setupValues: [
-              {
-                label: 'Redirect URI',
-                value: 'https://sentry.io/extensions/gitlab/setup/',
-              },
-            ],
-          },
-        })}
-      />
-    );
-
-    expect(
-      screen.getByText(
-        'To connect Sentry with your GitLab instance, you need to create an OAuth application in GitLab.'
-      )
-    ).toBeInTheDocument();
-
-    expect(screen.getByText('Open GitLab application settings')).toBeInTheDocument();
-    expect(screen.getByText('Create a new application')).toBeInTheDocument();
-    expect(screen.getByText('Configure the integration')).toBeInTheDocument();
-  });
-
-  it('renders setup values in the create step', async () => {
-    render(
-      <InstallationConfigStep
-        {...makeStepProps({
-          stepData: {
-            setupValues: [
-              {
-                label: 'Redirect URI',
-                value: 'https://sentry.io/extensions/gitlab/setup/',
-              },
-              {label: 'Scopes', value: 'api'},
-            ],
-          },
-        })}
-      />
-    );
-
-    // Navigate to the create step
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-
-    expect(screen.getByText('Redirect URI')).toBeInTheDocument();
-    expect(
-      screen.getByText('https://sentry.io/extensions/gitlab/setup/')
-    ).toBeInTheDocument();
-    expect(screen.getByText('Scopes')).toBeInTheDocument();
-    expect(screen.getByText('api')).toBeInTheDocument();
-  });
-
-  it('submits config with required fields and calls advance', async () => {
-    const advance = jest.fn();
-    render(
-      <InstallationConfigStep
-        {...makeStepProps({
-          stepData: {setupValues: []},
-          advance,
-        })}
-      />
-    );
-
-    // Navigate through guided steps to the configure step
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-
-    await userEvent.type(
-      screen.getByRole('textbox', {name: 'GitLab Application ID'}),
-      'my-app-id'
-    );
-    await userEvent.type(screen.getByLabelText('GitLab Application Secret'), 'my-secret');
-
-    await userEvent.click(screen.getByRole('button', {name: 'Continue'}));
-
-    await waitFor(() => {
-      expect(advance).toHaveBeenCalledWith({
-        url: undefined,
-        verify_ssl: undefined,
-        group: '',
-        include_subgroups: undefined,
-        client_id: 'my-app-id',
-        client_secret: 'my-secret',
-      });
-    });
-  });
-
-  it('submits with group and include_subgroups when group is set', async () => {
-    const advance = jest.fn();
-    render(
-      <InstallationConfigStep
-        {...makeStepProps({
-          stepData: {setupValues: []},
-          advance,
-        })}
-      />
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-
-    await userEvent.type(
-      screen.getByRole('textbox', {name: 'GitLab Application ID'}),
-      'my-app-id'
-    );
-    await userEvent.type(screen.getByLabelText('GitLab Application Secret'), 'my-secret');
-    await userEvent.type(
-      screen.getByRole('textbox', {name: 'GitLab Group Path'}),
-      'my-group/sub'
-    );
-
-    // Include Subgroups toggle should now be visible
-    await userEvent.click(screen.getByRole('checkbox', {name: 'Include Subgroups'}));
-
-    await userEvent.click(screen.getByRole('button', {name: 'Continue'}));
-
-    await waitFor(() => {
-      expect(advance).toHaveBeenCalledWith(
-        expect.objectContaining({
-          group: 'my-group/sub',
-          include_subgroups: true,
-          client_id: 'my-app-id',
-          client_secret: 'my-secret',
-        })
-      );
-    });
-  });
-
-  it('does not show include_subgroups toggle when group is empty', async () => {
-    render(<InstallationConfigStep {...makeStepProps({stepData: {setupValues: []}})} />);
-
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-
-    expect(
-      screen.queryByRole('checkbox', {name: 'Include Subgroups'})
-    ).not.toBeInTheDocument();
-  });
-
-  it('shows self-hosted fields when self-hosted toggle is enabled', async () => {
-    render(<InstallationConfigStep {...makeStepProps({stepData: {setupValues: []}})} />);
-
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-
-    // Self-hosted fields should not be visible initially
-    expect(screen.queryByRole('textbox', {name: 'GitLab URL'})).not.toBeInTheDocument();
-
-    await userEvent.click(screen.getByRole('checkbox', {name: 'Self-Hosted Instance'}));
-
-    expect(screen.getByRole('textbox', {name: 'GitLab URL'})).toBeInTheDocument();
-    expect(screen.getByRole('checkbox', {name: 'Verify SSL'})).toBeInTheDocument();
-  });
-
-  it('submits self-hosted config with URL and verify_ssl', async () => {
-    const advance = jest.fn();
-    render(
-      <InstallationConfigStep
-        {...makeStepProps({
-          stepData: {setupValues: []},
-          advance,
-        })}
-      />
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-
-    await userEvent.type(
-      screen.getByRole('textbox', {name: 'GitLab Application ID'}),
-      'my-app-id'
-    );
-    await userEvent.type(screen.getByLabelText('GitLab Application Secret'), 'my-secret');
-
-    await userEvent.click(screen.getByRole('checkbox', {name: 'Self-Hosted Instance'}));
-
-    await userEvent.type(
-      screen.getByRole('textbox', {name: 'GitLab URL'}),
-      'https://gitlab.example.com/'
-    );
-
-    // Verify SSL is on by default, turn it off
-    await userEvent.click(screen.getByRole('checkbox', {name: 'Verify SSL'}));
-
-    await userEvent.click(screen.getByRole('button', {name: 'Continue'}));
-
-    await waitFor(() => {
-      expect(advance).toHaveBeenCalledWith(
-        expect.objectContaining({
-          url: 'https://gitlab.example.com',
-          verify_ssl: false,
-          client_id: 'my-app-id',
-          client_secret: 'my-secret',
-        })
-      );
-    });
-  });
-
-  it('strips trailing slashes from self-hosted URL', async () => {
-    const advance = jest.fn();
-    render(
-      <InstallationConfigStep
-        {...makeStepProps({
-          stepData: {setupValues: []},
-          advance,
-        })}
-      />
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-
-    await userEvent.type(
-      screen.getByRole('textbox', {name: 'GitLab Application ID'}),
-      'id'
-    );
-    await userEvent.type(screen.getByLabelText('GitLab Application Secret'), 'secret');
-
-    await userEvent.click(screen.getByRole('checkbox', {name: 'Self-Hosted Instance'}));
-
-    await userEvent.type(
-      screen.getByRole('textbox', {name: 'GitLab URL'}),
-      'https://gitlab.example.com///'
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Continue'}));
-
-    await waitFor(() => {
-      expect(advance).toHaveBeenCalledWith(
-        expect.objectContaining({
-          url: 'https://gitlab.example.com',
-        })
-      );
-    });
-  });
-
-  it('shows submitting state when isAdvancing is true', async () => {
-    render(
-      <InstallationConfigStep
-        {...makeStepProps({
-          stepData: {setupValues: []},
-          isAdvancing: true,
-        })}
-      />
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-    await userEvent.click(screen.getByRole('button', {name: 'Next'}));
-
-    expect(screen.getByRole('button', {name: 'Submitting...'})).toBeDisabled();
-  });
-});
-
-describe('GitLabOAuthLoginStep', () => {
-  it('renders the OAuth login step for GitLab', () => {
-    render(
-      <GitLabOAuthLoginStep
-        {...makeStepProps({stepData: {oauthUrl: 'https://gitlab.com/oauth/authorize'}})}
-      />
-    );
-
-    expect(screen.getByRole('button', {name: 'Authorize GitLab'})).toBeInTheDocument();
-  });
-
-  it('calls advance with code and state on OAuth callback', async () => {
-    const advance = jest.fn();
-    render(
-      <GitLabOAuthLoginStep
-        {...makeStepProps({
-          stepData: {oauthUrl: 'https://gitlab.com/oauth/authorize'},
-          advance,
-        })}
-      />
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Authorize GitLab'}));
-
-    dispatchPipelineMessage({
-      data: {
-        _pipeline_source: 'sentry-pipeline',
-        code: 'auth-code-123',
-        state: 'state-xyz',
-      },
-    });
-
-    expect(advance).toHaveBeenCalledWith({
-      code: 'auth-code-123',
-      state: 'state-xyz',
-    });
-  });
-
-  it('shows loading state when isAdvancing is true', () => {
-    render(
-      <GitLabOAuthLoginStep
-        {...makeStepProps({
-          stepData: {oauthUrl: 'https://gitlab.com/oauth/authorize'},
-          isAdvancing: true,
-        })}
-      />
-    );
-
-    expect(screen.getByRole('button', {name: 'Authorizing...'})).toBeDisabled();
-  });
-
-  it('disables authorize button when oauthUrl is not provided', () => {
-    render(<GitLabOAuthLoginStep {...makeStepProps({stepData: {}})} />);
-
-    expect(screen.getByRole('button', {name: 'Authorize GitLab'})).toBeDisabled();
-  });
-});
diff --git a/static/app/components/pipeline/pipelineIntegrationGitLab.tsx b/static/app/components/pipeline/pipelineIntegrationGitLab.tsx
deleted file mode 100644
index 2a34cdbf4122..000000000000
--- a/static/app/components/pipeline/pipelineIntegrationGitLab.tsx
+++ /dev/null
@@ -1,294 +0,0 @@
-import {useCallback} from 'react';
-import {z} from 'zod';
-
-import {CodeBlock} from '@sentry/scraps/code';
-import {defaultFormOptions, useScrapsForm} from '@sentry/scraps/form';
-import {Flex, Stack} from '@sentry/scraps/layout';
-import {Text} from '@sentry/scraps/text';
-
-import {GuidedSteps} from 'sentry/components/guidedSteps/guidedSteps';
-import {t, tct} from 'sentry/locale';
-import type {IntegrationWithConfig} from 'sentry/types/integrations';
-
-import type {OAuthCallbackData} from './shared/oauthLoginStep';
-import {OAuthLoginStep} from './shared/oauthLoginStep';
-import type {PipelineDefinition, PipelineStepProps} from './types';
-import {pipelineComplete} from './types';
-
-const installationConfigSchema = z
-  .object({
-    selfHosted: z.boolean(),
-    url: z.string(),
-    group: z.string(),
-    includeSubgroups: z.boolean(),
-    verifySsl: z.boolean(),
-    clientId: z.string().min(1, t('Application ID is required')),
-    clientSecret: z.string().min(1, t('Application Secret is required')),
-  })
-  .refine(data => !data.selfHosted || z.httpUrl().safeParse(data.url).success, {
-    path: ['url'],
-    message: t('A valid GitLab URL is required for self-hosted instances'),
-  });
-
-interface InstallationConfigStepData {
-  defaults?: {
-    includeSubgroups?: boolean;
-    verifySsl?: boolean;
-  };
-  setupValues?: Array<{label: string; value: string}>;
-}
-
-interface InstallationConfigAdvanceData {
-  client_id: string;
-  client_secret: string;
-  group: string;
-  include_subgroups?: boolean;
-  url?: string;
-  verify_ssl?: boolean;
-}
-
-function InstallationConfigStep({
-  stepData,
-  advance,
-  isAdvancing,
-}: PipelineStepProps<InstallationConfigStepData, InstallationConfigAdvanceData>) {
-  const defaults = stepData.defaults ?? {};
-  const setupValues = stepData.setupValues ?? [];
-
-  const form = useScrapsForm({
-    ...defaultFormOptions,
-    defaultValues: {
-      selfHosted: false,
-      url: '',
-      group: '',
-      includeSubgroups: defaults.includeSubgroups ?? false,
-      verifySsl: defaults.verifySsl ?? true,
-      clientId: '',
-      clientSecret: '',
-    },
-    validators: {onDynamic: installationConfigSchema},
-    onSubmit: ({value}) => {
-      advance({
-        url: value.selfHosted ? value.url.replace(/\/+$/, '') : undefined,
-        verify_ssl: value.selfHosted ? value.verifySsl : undefined,
-        group: value.group,
-        include_subgroups: value.group ? value.includeSubgroups : undefined,
-        client_id: value.clientId,
-        client_secret: value.clientSecret,
-      });
-    },
-  });
-
-  const configForm = (
-    <form.AppForm form={form}>
-      <Stack gap="lg">
-        <form.AppField name="clientId">
-          {field => (
-            <field.Layout.Stack label={t('GitLab Application ID')} required>
-              <field.Input
-                value={field.state.value}
-                onChange={field.handleChange}
-                placeholder={t('Application ID from your GitLab OAuth application')}
-              />
-            </field.Layout.Stack>
-          )}
-        </form.AppField>
-        <form.AppField name="clientSecret">
-          {field => (
-            <field.Layout.Stack label={t('GitLab Application Secret')} required>
-              <field.Input
-                type="password"
-                value={field.state.value}
-                onChange={field.handleChange}
-                placeholder={t('Application Secret from your GitLab OAuth application')}
-              />
-            </field.Layout.Stack>
-          )}
-        </form.AppField>
-        <form.AppField name="group">
-          {field => (
-            <field.Layout.Stack
-              label={t('GitLab Group Path')}
-              hintText={t(
-                'Limit this integration to a specific group. Found in the URL of your group page (e.g. my-group/my-subgroup). Leave empty to integrate all accessible projects.'
-              )}
-            >
-              <field.Input
-                value={field.state.value}
-                onChange={field.handleChange}
-                placeholder="my-group/my-subgroup"
-              />
-            </field.Layout.Stack>
-          )}
-        </form.AppField>
-        <form.Subscribe selector={state => state.values.group}>
-          {group =>
-            group ? (
-              <form.AppField name="includeSubgroups">
-                {field => (
-                  <field.Layout.Stack
-                    label={t('Include Subgroups')}
-                    hintText={t('Include projects in subgroups of the GitLab group.')}
-                  >
-                    <field.Switch
-                      checked={field.state.value}
-                      onChange={field.handleChange}
-                    />
-                  </field.Layout.Stack>
-                )}
-              </form.AppField>
-            ) : null
-          }
-        </form.Subscribe>
-        <form.AppField name="selfHosted">
-          {field => (
-            <field.Layout.Stack
-              label={t('Self-Hosted Instance')}
-              hintText={t(
-                'Enable this if you are connecting to a self-hosted GitLab instance instead of gitlab.com.'
-              )}
-            >
-              <field.Switch checked={field.state.value} onChange={field.handleChange} />
-            </field.Layout.Stack>
-          )}
-        </form.AppField>
-        <form.Subscribe selector={state => state.values.selfHosted}>
-          {isSelfHosted =>
-            isSelfHosted ? (
-              <Stack gap="lg">
-                <form.AppField name="url">
-                  {field => (
-                    <field.Layout.Stack
-                      label={t('GitLab URL')}
-                      hintText={t(
-                        'The base URL for your self-hosted GitLab instance, including the host and protocol.'
-                      )}
-                      required
-                    >
-                      <field.Input
-                        value={field.state.value}
-                        onChange={field.handleChange}
-                        placeholder="https://gitlab.example.com"
-                      />
-                    </field.Layout.Stack>
-                  )}
-                </form.AppField>
-                <form.AppField name="verifySsl">
-                  {field => (
-                    <field.Layout.Stack
-                      label={t('Verify SSL')}
-                      hintText={t(
-                        'Verify SSL certificates when communicating with your GitLab instance.'
-                      )}
-                    >
-                      <field.Switch
-                        checked={field.state.value}
-                        onChange={field.handleChange}
-                      />
-                    </field.Layout.Stack>
-                  )}
-                </form.AppField>
-              </Stack>
-            ) : null
-          }
-        </form.Subscribe>
-        <Flex>
-          <form.SubmitButton disabled={isAdvancing}>
-            {isAdvancing ? t('Submitting...') : t('Continue')}
-          </form.SubmitButton>
-        </Flex>
-      </Stack>
-    </form.AppForm>
-  );
-
-  return (
-    <Stack gap="lg">
-      <Text>
-        {t(
-          'To connect Sentry with your GitLab instance, you need to create an OAuth application in GitLab.'
-        )}
-      </Text>
-      <GuidedSteps>
-        <GuidedSteps.Step
-          stepKey="navigate"
-          title={t('Open GitLab application settings')}
-        >
-          <Stack gap="xs">
-            <Text density="comfortable">
-              {tct(
-                'Navigate to [bold:User Settings \u203A Access \u203A Applications] in GitLab.',
-                {
-                  bold: <strong />,
-                }
-              )}
-            </Text>
-            <Text variant="muted" size="sm">
-              {tct(
-                'For self-managed instances, use [bold:Admin Area \u203A Applications] instead.',
-                {bold: <strong />}
-              )}
-            </Text>
-          </Stack>
-          <GuidedSteps.StepButtons />
-        </GuidedSteps.Step>
-        <GuidedSteps.Step stepKey="create" title={t('Create a new application')}>
-          <Stack gap="sm">
-            {setupValues.map(({label, value}) => (
-              <Stack key={label} gap="xs">
-                <Text bold size="sm">
-                  {label}
-                </Text>
-                <CodeBlock>{value}</CodeBlock>
-              </Stack>
-            ))}
-          </Stack>
-          <GuidedSteps.StepButtons />
-        </GuidedSteps.Step>
-        <GuidedSteps.Step stepKey="configure" title={t('Configure the integration')}>
-          {configForm}
-        </GuidedSteps.Step>
-      </GuidedSteps>
-    </Stack>
-  );
-}
-
-function GitLabOAuthLoginStep({
-  stepData,
-  advance,
-  isAdvancing,
-}: PipelineStepProps<{oauthUrl?: string}, {code: string; state: string}>) {
-  const handleOAuthCallback = useCallback(
-    (data: OAuthCallbackData) => {
-      advance({code: data.code, state: data.state});
-    },
-    [advance]
-  );
-
-  return (
-    <OAuthLoginStep
-      oauthUrl={stepData.oauthUrl}
-      isLoading={isAdvancing}
-      serviceName="GitLab"
-      onOAuthCallback={handleOAuthCallback}
-    />
-  );
-}
-
-export const gitlabIntegrationPipeline = {
-  type: 'integration',
-  provider: 'gitlab',
-  actionTitle: t('Installing GitLab Integration'),
-  getCompletionData: pipelineComplete<IntegrationWithConfig>,
-  steps: [
-    {
-      stepId: 'installation_config',
-      shortDescription: t('Configuring GitLab connection'),
-      component: InstallationConfigStep,
-    },
-    {
-      stepId: 'oauth_login',
-      shortDescription: t('Authorizing via GitLab OAuth flow'),
-      component: GitLabOAuthLoginStep,
-    },
-  ],
-} as const satisfies PipelineDefinition;
diff --git a/static/app/components/pipeline/pipelineIntegrationSlack.spec.tsx b/static/app/components/pipeline/pipelineIntegrationSlack.spec.tsx
deleted file mode 100644
index 740343d5d25a..000000000000
--- a/static/app/components/pipeline/pipelineIntegrationSlack.spec.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import {act, render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
-
-import {slackIntegrationPipeline} from './pipelineIntegrationSlack';
-import type {PipelineStepProps} from './types';
-
-const SlackOAuthLoginStep = slackIntegrationPipeline.steps[0].component;
-
-function makeStepProps<D, A>(
-  overrides: Partial<PipelineStepProps<D, A>> & {stepData: D}
-): PipelineStepProps<D, A> {
-  return {
-    advance: jest.fn(),
-    advanceError: null,
-    isAdvancing: false,
-    stepIndex: 0,
-    totalSteps: 1,
-    ...overrides,
-  };
-}
-
-let mockPopup: Window;
-
-function dispatchPipelineMessage({
-  data,
-  origin = document.location.origin,
-  source = mockPopup,
-}: {
-  data: Record<string, string>;
-  origin?: string;
-  source?: Window | MessageEventSource | null;
-}) {
-  act(() => {
-    const event = new MessageEvent('message', {data, origin});
-    Object.defineProperty(event, 'source', {value: source});
-    window.dispatchEvent(event);
-  });
-}
-
-beforeEach(() => {
-  mockPopup = {
-    closed: false,
-    close: jest.fn(),
-    focus: jest.fn(),
-  } as unknown as Window;
-  jest.spyOn(window, 'open').mockReturnValue(mockPopup);
-});
-
-afterEach(() => {
-  jest.restoreAllMocks();
-});
-
-describe('SlackOAuthLoginStep', () => {
-  it('renders the OAuth login step for Slack', () => {
-    render(
-      <SlackOAuthLoginStep
-        {...makeStepProps({stepData: {oauthUrl: 'https://slack.com/oauth/authorize'}})}
-      />
-    );
-
-    expect(screen.getByRole('button', {name: 'Authorize Slack'})).toBeInTheDocument();
-  });
-
-  it('calls advance with code and state on OAuth callback', async () => {
-    const advance = jest.fn();
-    render(
-      <SlackOAuthLoginStep
-        {...makeStepProps({
-          stepData: {oauthUrl: 'https://slack.com/oauth/authorize'},
-          advance,
-        })}
-      />
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Authorize Slack'}));
-
-    dispatchPipelineMessage({
-      data: {
-        _pipeline_source: 'sentry-pipeline',
-        code: 'auth-code-123',
-        state: 'state-xyz',
-      },
-    });
-
-    expect(advance).toHaveBeenCalledWith({
-      code: 'auth-code-123',
-      state: 'state-xyz',
-    });
-  });
-
-  it('shows loading state when isAdvancing is true', () => {
-    render(
-      <SlackOAuthLoginStep
-        {...makeStepProps({
-          stepData: {oauthUrl: 'https://slack.com/oauth/authorize'},
-          isAdvancing: true,
-        })}
-      />
-    );
-
-    expect(screen.getByRole('button', {name: 'Authorizing...'})).toBeDisabled();
-  });
-
-  it('disables authorize button when oauthUrl is not provided', () => {
-    render(<SlackOAuthLoginStep {...makeStepProps({stepData: {}})} />);
-
-    expect(screen.getByRole('button', {name: 'Authorize Slack'})).toBeDisabled();
-  });
-});
diff --git a/static/app/components/pipeline/pipelineIntegrationSlack.tsx b/static/app/components/pipeline/pipelineIntegrationSlack.tsx
deleted file mode 100644
index ecd4433cb99e..000000000000
--- a/static/app/components/pipeline/pipelineIntegrationSlack.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import {useCallback} from 'react';
-
-import {t} from 'sentry/locale';
-import type {IntegrationWithConfig} from 'sentry/types/integrations';
-
-import type {OAuthCallbackData} from './shared/oauthLoginStep';
-import {OAuthLoginStep} from './shared/oauthLoginStep';
-import type {PipelineDefinition, PipelineStepProps} from './types';
-import {pipelineComplete} from './types';
-
-function SlackOAuthLoginStep({
-  stepData,
-  advance,
-  isAdvancing,
-}: PipelineStepProps<{oauthUrl?: string}, {code: string; state: string}>) {
-  const handleOAuthCallback = useCallback(
-    (data: OAuthCallbackData) => {
-      advance({code: data.code, state: data.state});
-    },
-    [advance]
-  );
-
-  return (
-    <OAuthLoginStep
-      oauthUrl={stepData.oauthUrl}
-      isLoading={isAdvancing}
-      serviceName="Slack"
-      onOAuthCallback={handleOAuthCallback}
-      popup={{height: 900}}
-    />
-  );
-}
-
-export const slackIntegrationPipeline = {
-  type: 'integration',
-  provider: 'slack',
-  actionTitle: t('Installing Slack Integration'),
-  getCompletionData: pipelineComplete<IntegrationWithConfig>,
-  steps: [
-    {
-      stepId: 'oauth_login',
-      shortDescription: t('Authorizing via Slack OAuth'),
-      component: SlackOAuthLoginStep,
-    },
-  ],
-} as const satisfies PipelineDefinition;
diff --git a/static/app/components/pipeline/registry.tsx b/static/app/components/pipeline/registry.tsx
index d15ce8325232..c88fad5a4016 100644
--- a/static/app/components/pipeline/registry.tsx
+++ b/static/app/components/pipeline/registry.tsx
@@ -1,18 +1,12 @@
 import {dummyIntegrationPipeline} from './pipelineDummyProvider';
-import {bitbucketIntegrationPipeline} from './pipelineIntegrationBitbucket';
 import {githubIntegrationPipeline} from './pipelineIntegrationGitHub';
-import {gitlabIntegrationPipeline} from './pipelineIntegrationGitLab';
-import {slackIntegrationPipeline} from './pipelineIntegrationSlack';
 
 /**
  * All registered pipeline definitions.
  */
 export const PIPELINE_REGISTRY = [
-  bitbucketIntegrationPipeline,
   dummyIntegrationPipeline,
   githubIntegrationPipeline,
-  gitlabIntegrationPipeline,
-  slackIntegrationPipeline,
 ] as const;
 
 type AllPipelines = (typeof PIPELINE_REGISTRY)[number];
diff --git a/static/app/components/platformPicker.spec.tsx b/static/app/components/platformPicker.spec.tsx
index 54ea74373620..4d197802b355 100644
--- a/static/app/components/platformPicker.spec.tsx
+++ b/static/app/components/platformPicker.spec.tsx
@@ -130,6 +130,6 @@ describe('PlatformPicker', () => {
 
     await userEvent.type(screen.getByPlaceholderText('Filter Platforms'), 'play');
 
-    expect(screen.getByTestId('platform-playstation')).toBeInTheDocument();
+    expect(screen.getByTestId(`platform-playstation`)).toBeInTheDocument();
   });
 });
diff --git a/static/app/components/platformPicker.tsx b/static/app/components/platformPicker.tsx
index cc4f6d7988ff..eb232b95213c 100644
--- a/static/app/components/platformPicker.tsx
+++ b/static/app/components/platformPicker.tsx
@@ -266,7 +266,7 @@ export function PlatformPicker({
           title={t("We don't have an SDK for that yet!")}
         >
           {tct(
-            "Sure you haven't misspelled? If you're using a lesser-known platform, consider choosing a more generic SDK like Browser JavaScript, Python, Node, .NET & Java or create a generic project, by selecting [linkOther:“Other”].",
+            `Sure you haven't misspelled? If you're using a lesser-known platform, consider choosing a more generic SDK like Browser JavaScript, Python, Node, .NET & Java or create a generic project, by selecting [linkOther:“Other”].`,
             {
               linkOther: (
                 <Button
diff --git a/static/app/components/profiling/flamegraph/flamegraphDrawer/profileDetails.tsx b/static/app/components/profiling/flamegraph/flamegraphDrawer/profileDetails.tsx
index 70edbe4941b2..0c6b76abea22 100644
--- a/static/app/components/profiling/flamegraph/flamegraphDrawer/profileDetails.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphDrawer/profileDetails.tsx
@@ -96,7 +96,7 @@ export function ProfileDetails(props: ProfileDetailsProps) {
       }
 
       if (isSidebarLayout) {
-        detailsBarRef.current.style.width = '100%';
+        detailsBarRef.current.style.width = `100%`;
         detailsBarRef.current.style.height = `${maybeOldSize ?? newSize}px`;
       } else {
         detailsBarRef.current.style.height = '';
diff --git a/static/app/components/profiling/flamegraph/flamegraphLayout.tsx b/static/app/components/profiling/flamegraph/flamegraphLayout.tsx
index f85c685c3452..86a858390b07 100644
--- a/static/app/components/profiling/flamegraph/flamegraphLayout.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphLayout.tsx
@@ -57,10 +57,10 @@ export function FlamegraphLayout(props: FlamegraphLayoutProps) {
 
       if (isSidebarLayout) {
         flamegraphDrawerRef.current.style.width = `${maybeOldSize ?? newSize}px`;
-        flamegraphDrawerRef.current.style.height = '100%';
+        flamegraphDrawerRef.current.style.height = `100%`;
       } else {
         flamegraphDrawerRef.current.style.height = `${maybeOldSize ?? newSize}px`;
-        flamegraphDrawerRef.current.style.width = '100%';
+        flamegraphDrawerRef.current.style.width = `100%`;
       }
     };
 
@@ -332,8 +332,8 @@ const FlamegraphGrid = styled('div')<{
     layout === 'table bottom'
       ? '100%'
       : layout === 'table left'
-        ? 'min-content auto'
-        : 'auto min-content'};
+        ? `min-content auto`
+        : `auto min-content`};
 
   /* false positive for grid layout */
   /* stylelint-disable */
diff --git a/static/app/components/profiling/flamegraph/flamegraphOverlays/FlamegraphWarnings.tsx b/static/app/components/profiling/flamegraph/flamegraphOverlays/FlamegraphWarnings.tsx
index f677b80fa6de..2dcb845db906 100644
--- a/static/app/components/profiling/flamegraph/flamegraphOverlays/FlamegraphWarnings.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphOverlays/FlamegraphWarnings.tsx
@@ -76,7 +76,7 @@ export function FlamegraphWarnings(props: FlamegraphWarningProps) {
     return (
       <Overlay data-test-id="flamegraph-warning-overlay">
         <p>
-          {tct('No frames match the [filter] frame filter', {
+          {tct(`No frames match the [filter] frame filter`, {
             filter: props.filter,
           })}
         </p>
diff --git a/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx b/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx
index d266dd4d03ff..abc975dcc65f 100644
--- a/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphToolbar/flamegraphSearch.tsx
@@ -454,7 +454,7 @@ function FlamegraphSearch({
             />
           </Fragment>
         ) : (
-          <Tooltip title={t('Also supports regular expressions, e.g. /^functionName/i')}>
+          <Tooltip title={t(`Also supports regular expressions, e.g. /^functionName/i`)}>
             <StyledIconInfo size="xs" variant="muted" />
           </Tooltip>
         )
diff --git a/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx b/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx
index 5c00fc50c19a..f655ecac1724 100644
--- a/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx
+++ b/static/app/components/profiling/flamegraph/flamegraphTooltip.tsx
@@ -97,7 +97,7 @@ function DifferentialFlamegraphTooltip(props: DifferentialFlamegraphTooltipProps
       : `${relative > 0 ? '+' : ''}${formatPercentage(relative)}`
     : props.flamegraph.negated
       ? t('removed function')
-      : t('new function');
+      : t(`new function`);
 
   return (
     <BoundTooltip
diff --git a/static/app/components/projects/missingProjectMembership.tsx b/static/app/components/projects/missingProjectMembership.tsx
index 239815dbfb1c..e555db524a0a 100644
--- a/static/app/components/projects/missingProjectMembership.tsx
+++ b/static/app/components/projects/missingProjectMembership.tsx
@@ -153,7 +153,7 @@ export function MissingProjectMembership({
             </Grid>
           }
         >
-          {t("You'll need to join a team with access before you can view this data.")}
+          {t(`You'll need to join a team with access before you can view this data.`)}
         </EmptyMessage>
       ) : (
         <EmptyMessage icon={<IconFlag />}>
diff --git a/static/app/components/replays/alerts/replayUnsupportedAlert.tsx b/static/app/components/replays/alerts/replayUnsupportedAlert.tsx
index a5484ab282da..fd903d3cf292 100644
--- a/static/app/components/replays/alerts/replayUnsupportedAlert.tsx
+++ b/static/app/components/replays/alerts/replayUnsupportedAlert.tsx
@@ -14,8 +14,8 @@ export function ReplayUnsupportedAlert({projectSlug}: Props) {
   );
   return (
     <Alert variant="info" icon={<IconInfo />}>
-      <strong>{t("Session Replay isn't available for %s.", projectSlug)}</strong>{' '}
-      {tct('[docsLink: See our docs] to find out which platforms are supported.', {
+      <strong>{t(`Session Replay isn't available for %s.`, projectSlug)}</strong>{' '}
+      {tct(`[docsLink: See our docs] to find out which platforms are supported.`, {
         docsLink,
       })}
     </Alert>
diff --git a/static/app/components/replays/header/configureReplayCard.tsx b/static/app/components/replays/header/configureReplayCard.tsx
index 83ec01777249..ce3b1bc1f935 100644
--- a/static/app/components/replays/header/configureReplayCard.tsx
+++ b/static/app/components/replays/header/configureReplayCard.tsx
@@ -90,8 +90,7 @@ function getWebItems(): MenuItemProps[] {
         />
       ),
       textValue: keyToTitle('general'),
-      externalHref:
-        'https://docs.sentry.io/platforms/javascript/session-replay/configuration/#general-integration-configuration',
+      externalHref: `https://docs.sentry.io/platforms/javascript/session-replay/configuration/#general-integration-configuration`,
     },
     {
       key: 'masking',
@@ -102,8 +101,7 @@ function getWebItems(): MenuItemProps[] {
         />
       ),
       textValue: keyToTitle('masking'),
-      externalHref:
-        'https://docs.sentry.io/platforms/javascript/session-replay/privacy/#privacy-configuration',
+      externalHref: `https://docs.sentry.io/platforms/javascript/session-replay/privacy/#privacy-configuration`,
     },
     {
       key: 'users',
@@ -114,8 +112,7 @@ function getWebItems(): MenuItemProps[] {
         />
       ),
       textValue: keyToTitle('users'),
-      externalHref:
-        'https://docs.sentry.io/platforms/javascript/session-replay/configuration/#identifying-users',
+      externalHref: `https://docs.sentry.io/platforms/javascript/session-replay/configuration/#identifying-users`,
     },
     {
       key: 'network',
@@ -126,8 +123,7 @@ function getWebItems(): MenuItemProps[] {
         />
       ),
       textValue: keyToTitle('network'),
-      externalHref:
-        'https://docs.sentry.io/platforms/javascript/session-replay/configuration/#network-details',
+      externalHref: `https://docs.sentry.io/platforms/javascript/session-replay/configuration/#network-details`,
     },
     {
       key: 'canvas',
@@ -141,8 +137,7 @@ function getWebItems(): MenuItemProps[] {
         />
       ),
       textValue: keyToTitle('canvas'),
-      externalHref:
-        'https://docs.sentry.io/platforms/javascript/session-replay/#canvas-recording',
+      externalHref: `https://docs.sentry.io/platforms/javascript/session-replay/#canvas-recording`,
     },
   ] satisfies MenuItemProps[];
 }
diff --git a/static/app/components/replays/header/replayMetaData.tsx b/static/app/components/replays/header/replayMetaData.tsx
index 89f24f7bfe73..da2a938dea56 100644
--- a/static/app/components/replays/header/replayMetaData.tsx
+++ b/static/app/components/replays/header/replayMetaData.tsx
@@ -1,5 +1,4 @@
 import {Fragment} from 'react';
-import {useMatches} from 'react-router-dom';
 import styled from '@emotion/styled';
 
 import {Link} from '@sentry/scraps/link';
@@ -14,6 +13,7 @@ import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
 import {TabKey} from 'sentry/utils/replays/hooks/useActiveReplayTab';
 import type {RawReplayError} from 'sentry/utils/replays/types';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import type {ReplayRecord} from 'sentry/views/replays/types';
 
 interface Props {
@@ -30,8 +30,8 @@ export function ReplayMetaData({
   const nonFeedbackErrors = replayErrors.filter(e => !e.title.includes('User Feedback'));
 
   const location = useLocation();
-  const matches = useMatches();
-  const referrer = getRouteStringFromRoutes({matches});
+  const routes = useRoutes();
+  const referrer = getRouteStringFromRoutes(routes);
   const eventView = EventView.fromLocation(location);
 
   const breadcrumbTab = {
diff --git a/static/app/components/replays/replayController.tsx b/static/app/components/replays/replayController.tsx
index 243928f5c591..604d6dc2cbaa 100644
--- a/static/app/components/replays/replayController.tsx
+++ b/static/app/components/replays/replayController.tsx
@@ -113,5 +113,5 @@ const ButtonGrid = styled('div')<{isCompact: boolean}>`
   gap: 0 ${p => p.theme.space.xl};
   flex-direction: row;
   justify-content: space-between;
-  ${p => (p.isCompact ? 'flex-wrap: wrap;' : '')}
+  ${p => (p.isCompact ? `flex-wrap: wrap;` : '')}
 `;
diff --git a/static/app/components/replays/table/replayTableColumns.tsx b/static/app/components/replays/table/replayTableColumns.tsx
index 7d798e93ec7a..28b7ba00663b 100644
--- a/static/app/components/replays/table/replayTableColumns.tsx
+++ b/static/app/components/replays/table/replayTableColumns.tsx
@@ -1,5 +1,4 @@
 import type {ReactNode} from 'react';
-import {useMatches} from 'react-router-dom';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 import type {LocationDescriptor} from 'history';
@@ -36,6 +35,7 @@ import {useLocation} from 'sentry/utils/useLocation';
 import {useMedia} from 'sentry/utils/useMedia';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {useProjectFromId} from 'sentry/utils/useProjectFromId';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import type {ReplayListRecordWithTx} from 'sentry/views/performance/transactionSummary/transactionReplays/useReplaysWithTxData';
 import type {
   ReplayListRecord,
@@ -500,8 +500,8 @@ export const ReplaySessionColumn: ReplayTableColumn = {
   sortKey: 'started_at',
   width: 'minmax(150px, 1fr)',
   Component: ({replay, to, className}) => {
-    const matches = useMatches();
-    const referrer = getRouteStringFromRoutes({matches});
+    const routes = useRoutes();
+    const referrer = getRouteStringFromRoutes(routes);
 
     const organization = useOrganization();
     const project = useProjectFromId({project_id: replay.project_id ?? undefined});
diff --git a/static/app/components/replays/useUserViewedReplays.tsx b/static/app/components/replays/useUserViewedReplays.tsx
index 6806267c51a4..57d339736d70 100644
--- a/static/app/components/replays/useUserViewedReplays.tsx
+++ b/static/app/components/replays/useUserViewedReplays.tsx
@@ -14,7 +14,7 @@ export function useUserViewedReplays() {
       getApiUrl('/organizations/$organizationIdOrSlug/replays/', {
         path: {organizationIdOrSlug: organization.slug},
       }),
-      {query: {query: 'viewed_by_me:true'}},
+      {query: {query: `viewed_by_me:true`}},
     ],
     {staleTime: 0}
   );
diff --git a/static/app/components/replays/virtualizedGrid/bodyCell.tsx b/static/app/components/replays/virtualizedGrid/bodyCell.tsx
index 7ab02bb0d3e8..d4436d04fbc7 100644
--- a/static/app/components/replays/virtualizedGrid/bodyCell.tsx
+++ b/static/app/components/replays/virtualizedGrid/bodyCell.tsx
@@ -11,9 +11,9 @@ const cellBackground = (p: CellProps & {theme: Theme}) => {
     return `background-color: ${p.theme.colors.red100};`;
   }
   if (p.isStatusWarning) {
-    return 'background-color: var(--background-warning-default, rgba(245, 176, 0, 0.09));';
+    return `background-color: var(--background-warning-default, rgba(245, 176, 0, 0.09));`;
   }
-  return 'background-color: inherit;';
+  return `background-color: inherit;`;
 };
 
 const cellColor = (p: CellProps & {theme: Theme}) => {
@@ -22,7 +22,7 @@ const cellColor = (p: CellProps & {theme: Theme}) => {
     return `color: ${color};`;
   }
 
-  return 'color: inherit';
+  return `color: inherit`;
 };
 
 type CellProps = {
diff --git a/static/app/components/repositories/repoProviderIcon.tsx b/static/app/components/repositories/repoProviderIcon.tsx
index ee8f7bce0bbb..4e4b8b96f505 100644
--- a/static/app/components/repositories/repoProviderIcon.tsx
+++ b/static/app/components/repositories/repoProviderIcon.tsx
@@ -28,6 +28,6 @@ export function RepoProviderIcon({provider, ...props}: Props) {
     const Icon = PROVIDER_ICONS[provider as keyof typeof PROVIDER_ICONS];
     return <Icon {...props} />;
   }
-  Sentry.logger.error('Unknown provider in RepoProviderIcon', {provider});
+  Sentry.logger.error(`Unknown provider in RepoProviderIcon`, {provider});
   return <IconOpen {...props} />;
 }
diff --git a/static/app/components/repositories/scmRepoTreeModal.tsx b/static/app/components/repositories/scmRepoTreeModal.tsx
index 062135d55fc9..057ebe3843ca 100644
--- a/static/app/components/repositories/scmRepoTreeModal.tsx
+++ b/static/app/components/repositories/scmRepoTreeModal.tsx
@@ -27,7 +27,7 @@ export function ScmRepoTreeModal({Header, Body, title}: Props) {
         <Stack gap="2xl">
           <Text size="md">
             {tct(
-              'Integrate with a Seer compatible Source Code Management provider and then connect repositories with Sentry. Seer needs read access to your source code to perform code review, and analyze your issues. [read_the_docs:Read the docs] and our [privacy:AI Privacy Principles] to learn more.',
+              `Integrate with a Seer compatible Source Code Management provider and then connect repositories with Sentry. Seer needs read access to your source code to perform code review, and analyze your issues. [read_the_docs:Read the docs] and our [privacy:AI Privacy Principles] to learn more.`,
               {
                 privacy: (
                   <ExternalLink href="https://docs.sentry.io/product/ai-in-sentry/ai-privacy-and-security/" />
diff --git a/static/app/components/repositories/useRepositoryWithSettings.tsx b/static/app/components/repositories/useRepositoryWithSettings.tsx
index 03bb4c400092..0d951b88eb22 100644
--- a/static/app/components/repositories/useRepositoryWithSettings.tsx
+++ b/static/app/components/repositories/useRepositoryWithSettings.tsx
@@ -17,7 +17,7 @@ export function getRepositoryWithSettingsQueryKey(
   repoId: string
 ) {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/repos/$repoId/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/repos/$repoId/`, {
       path: {organizationIdOrSlug: organization.slug, repoId},
     }),
     {query: {expand: 'settings'}},
diff --git a/static/app/components/searchBar/searchDropdown.tsx b/static/app/components/searchBar/searchDropdown.tsx
index 0cb0edfef5e9..333aad119d6b 100644
--- a/static/app/components/searchBar/searchDropdown.tsx
+++ b/static/app/components/searchBar/searchDropdown.tsx
@@ -623,7 +623,7 @@ const Documentation = styled('span')`
   white-space: pre;
 `;
 
-const DropdownFooter = styled('div')`
+const DropdownFooter = styled(`div`)`
   width: 100%;
   min-height: 45px;
   background-color: ${p => p.theme.tokens.background.secondary};
diff --git a/static/app/components/searchBar/searchInvalidTag.tsx b/static/app/components/searchBar/searchInvalidTag.tsx
index 35a2b0c2bd00..8b7e240baea0 100644
--- a/static/app/components/searchBar/searchInvalidTag.tsx
+++ b/static/app/components/searchBar/searchInvalidTag.tsx
@@ -27,7 +27,7 @@ export function SearchInvalidTag({message, highlightMessage, docLink}: Props) {
   );
 }
 
-const Invalid = styled('span')`
+const Invalid = styled(`span`)`
   font-size: ${p => p.theme.font.size.sm};
   font-family: ${p => p.theme.font.family.sans};
   color: ${p => p.theme.colors.gray500};
@@ -41,6 +41,6 @@ const Invalid = styled('span')`
   width: 100%;
 `;
 
-const Highlight = styled('strong')`
+const Highlight = styled(`strong`)`
   color: ${p => p.theme.tokens.interactive.link.accent.rest};
 `;
diff --git a/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.spec.tsx b/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.spec.tsx
index f1cd28e66008..a8906a188b75 100644
--- a/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.spec.tsx
+++ b/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.spec.tsx
@@ -25,7 +25,7 @@ const askSeerMutationOptions = mutationOptions({
       status: string;
       unsupported_reason: string | null;
     }>({
-      url: '/organizations/org-slug/trace-explorer-ai/query/',
+      url: `/organizations/org-slug/trace-explorer-ai/query/`,
       method: 'POST',
       data: {},
     });
diff --git a/static/app/components/searchQueryBuilder/hooks/useQueryBuilderState.spec.tsx b/static/app/components/searchQueryBuilder/hooks/useQueryBuilderState.spec.tsx
index 6ce4dbf84fed..a6207d93dce9 100644
--- a/static/app/components/searchQueryBuilder/hooks/useQueryBuilderState.spec.tsx
+++ b/static/app/components/searchQueryBuilder/hooks/useQueryBuilderState.spec.tsx
@@ -115,7 +115,7 @@ describe('replaceFreeTextTokens', () => {
           currentQuery: 'test test',
         },
         expected: {
-          query: 'span.description:"*test*test*"',
+          query: `span.description:"*test*test*"`,
           focusOverride: {itemKey: 'freeText:1'},
         },
       },
@@ -157,10 +157,10 @@ describe('replaceFreeTextTokens', () => {
           'when there is already a replace token present with a different operator',
         input: {
           rawSearchReplacement: ['span.description'],
-          currentQuery: 'span.description:test other value',
+          currentQuery: `span.description:test other value`,
         },
         expected: {
-          query: 'span.description:test span.description:"*other*value*"',
+          query: `span.description:test span.description:"*other*value*"`,
           focusOverride: {itemKey: 'freeText:2'},
         },
       },
@@ -168,10 +168,10 @@ describe('replaceFreeTextTokens', () => {
         description: 'when the value contains an asterisks, it sets to is',
         input: {
           rawSearchReplacement: ['span.description'],
-          currentQuery: 'span.description:test te*st',
+          currentQuery: `span.description:test te*st`,
         },
         expected: {
-          query: 'span.description:test span.description:te*st',
+          query: `span.description:test span.description:te*st`,
           focusOverride: {itemKey: 'freeText:2'},
         },
       },
@@ -179,10 +179,10 @@ describe('replaceFreeTextTokens', () => {
         description: 'when the value contains a space and asterisks, it sets to is',
         input: {
           rawSearchReplacement: ['span.description'],
-          currentQuery: 'te*st test',
+          currentQuery: `te*st test`,
         },
         expected: {
-          query: 'span.description:"te*st test"',
+          query: `span.description:"te*st test"`,
           focusOverride: {itemKey: 'freeText:1'},
         },
       },
@@ -191,10 +191,10 @@ describe('replaceFreeTextTokens', () => {
           'when the value contains multiple spaces, it removes them and will replace them with a single space, and apply fuzzy matching',
         input: {
           rawSearchReplacement: ['span.description'],
-          currentQuery: 'test  test',
+          currentQuery: `test  test`,
         },
         expected: {
-          query: 'span.description:"*test*test*"',
+          query: `span.description:"*test*test*"`,
           focusOverride: {itemKey: 'freeText:1'},
         },
       },
@@ -202,7 +202,7 @@ describe('replaceFreeTextTokens', () => {
         description: 'when the value is an aggregate filter token, it ignores it',
         input: {
           rawSearchReplacement: ['span.description'],
-          currentQuery: 'p75(span.duration):>300ms test',
+          currentQuery: `p75(span.duration):>300ms test`,
         },
         expected: {
           query: `p75(span.duration):>300ms span.description:${WildcardOperators.CONTAINS}test`,
diff --git a/static/app/components/searchQueryBuilder/index.spec.tsx b/static/app/components/searchQueryBuilder/index.spec.tsx
index 1df88cc8464b..999d7e3a6e2e 100644
--- a/static/app/components/searchQueryBuilder/index.spec.tsx
+++ b/static/app/components/searchQueryBuilder/index.spec.tsx
@@ -4917,7 +4917,7 @@ describe('SearchQueryBuilder', () => {
 
         expect(
           screen.getByRole('row', {
-            name: 'span.description:*random*value*',
+            name: `span.description:*random*value*`,
           })
         ).toBeInTheDocument();
       });
@@ -5009,7 +5009,7 @@ describe('SearchQueryBuilder', () => {
         await userEvent.keyboard('randomValue');
         await userEvent.click(document.body);
 
-        expect(screen.getByRole('row', {name: 'randomValue'})).toBeInTheDocument();
+        expect(screen.getByRole('row', {name: `randomValue`})).toBeInTheDocument();
         expect(getLastInput()).toHaveFocus();
       });
     });
@@ -5125,7 +5125,7 @@ describe('SearchQueryBuilder', () => {
     describe('user clicks on ask seer button', () => {
       it('renders the seer combobox', async () => {
         MockApiClient.addMockResponse({
-          url: '/organizations/org-slug/prompts-activity/',
+          url: `/organizations/org-slug/prompts-activity/`,
           method: 'PUT',
         });
         MockApiClient.addMockResponse({
@@ -5174,7 +5174,7 @@ describe('SearchQueryBuilder', () => {
                     status: string;
                     unsupported_reason: string | null;
                   }>({
-                    url: '/organizations/org-slug/trace-explorer-ai/query/',
+                    url: `/organizations/org-slug/trace-explorer-ai/query/`,
                     method: 'POST',
                     data: {},
                   });
diff --git a/static/app/components/searchQueryBuilder/index.stories.tsx b/static/app/components/searchQueryBuilder/index.stories.tsx
index 7790a9719e5f..e85cf0d6b9f4 100644
--- a/static/app/components/searchQueryBuilder/index.stories.tsx
+++ b/static/app/components/searchQueryBuilder/index.stories.tsx
@@ -771,7 +771,7 @@ export default Storybook.story('SearchQueryBuilder', story => {
         <p>
           The suggestions will be the values for the provided keys. The following example,
           will show suggestions for the <code>id</code> key when the user types a value
-          that matches the regex pattern <code>{'/^[0-9]{3}$/'}</code>.
+          that matches the regex pattern <code>{`/^[0-9]{3}$/`}</code>.
         </p>
         <SearchQueryBuilder
           initialQuery=""
@@ -811,7 +811,7 @@ export default Storybook.story('SearchQueryBuilder', story => {
         <p>
           The raw search will be replaced with option(s) in the dropdown. The options will
           be the values for the provided keys. The following example shows the prop set as{' '}
-          <code>{"replaceRawSearchKeys={['span.description']}"}</code>.
+          <code>{`replaceRawSearchKeys={['span.description']}`}</code>.
         </p>
         <SearchQueryBuilder
           initialQuery=""
@@ -823,7 +823,7 @@ export default Storybook.story('SearchQueryBuilder', story => {
         />
         <p>
           You can also pass multiple values in the prop to replace multiple keys.{' '}
-          <code>{"replaceRawSearchKeys={['span.op', 'span.description']}"}</code>.
+          <code>{`replaceRawSearchKeys={['span.op', 'span.description']}`}</code>.
         </p>
         <SearchQueryBuilder
           initialQuery=""
diff --git a/static/app/components/slider/index.tsx b/static/app/components/slider/index.tsx
index 8dce25f2426c..4e7650aebfad 100644
--- a/static/app/components/slider/index.tsx
+++ b/static/app/components/slider/index.tsx
@@ -339,7 +339,7 @@ const SliderTrack = styled('div', {
   margin-bottom: ${p => (p.hasTickLabels ? '2em' : '0.5rem')};
   margin-top: ${p => (p.hasThumbLabels ? '2em' : '0.5rem')};
 
-  ${p => p.disabled && 'pointer-events: none;'}
+  ${p => p.disabled && `pointer-events: none;`}
 
   /* Users can click on the track to quickly jump to a value. We should extend the click
   area to make the action easier. */
diff --git a/static/app/components/stackTrace/frame/frameContent.tsx b/static/app/components/stackTrace/frame/frameContent.tsx
index bac23ded5d27..f1419b13a015 100644
--- a/static/app/components/stackTrace/frame/frameContent.tsx
+++ b/static/app/components/stackTrace/frame/frameContent.tsx
@@ -14,7 +14,6 @@ import {
   hasContextRegisters,
 } from 'sentry/components/events/interfaces/frame/utils';
 import {parseAssembly} from 'sentry/components/events/interfaces/utils';
-import {LoadingIndicator} from 'sentry/components/loadingIndicator';
 import {FrameVariablesGrid} from 'sentry/components/stackTrace/frame/frameVariablesGrid';
 import {
   useStackTraceContext,
@@ -32,16 +31,10 @@ const COVERAGE_TEXT: Record<Coverage, string | undefined> = {
 };
 
 interface FrameContentProps {
-  effectiveContext?: Array<[number, string | null]>;
-  isLoadingSourceContext?: boolean;
   sourceLineCoverage?: Array<Coverage | undefined>;
 }
 
-export function FrameContent({
-  sourceLineCoverage = [],
-  effectiveContext,
-  isLoadingSourceContext,
-}: FrameContentProps) {
+export function FrameContent({sourceLineCoverage = []}: FrameContentProps) {
   const {event, frame, frameContextId, frameIndex, isExpanded, platform} =
     useStackTraceFrameContext();
   const {frames, lastFrameIndex, meta, stacktrace} = useStackTraceContext();
@@ -53,7 +46,7 @@ export function FrameContent({
     hasBeenExpandedRef.current = true;
   }
 
-  const contextLines = isExpanded ? (effectiveContext ?? frame.context ?? []) : [];
+  const contextLines = isExpanded ? (frame.context ?? []) : [];
   const fileExtension = isExpanded ? (getFileExtension(frame.filename ?? '') ?? '') : '';
   const prismLines = usePrismTokensSourceContext({
     contextLines,
@@ -69,11 +62,7 @@ export function FrameContent({
   const hasFrameVariables = !!frameVariables && Object.keys(frameVariables).length > 0;
   const hasFrameRegisters = !!expandedFrameRegisters;
   const hasAnyFrameDetails =
-    hasSourceContext ||
-    isLoadingSourceContext ||
-    hasFrameVariables ||
-    hasFrameRegisters ||
-    hasFrameAssembly;
+    hasSourceContext || hasFrameVariables || hasFrameRegisters || hasFrameAssembly;
   const shouldShowNoDetails =
     frameIndex === lastFrameIndex && frameIndex === 0 && !hasAnyFrameDetails;
 
@@ -89,12 +78,7 @@ export function FrameContent({
         overflowX="hidden"
         data-test-id="core-stacktrace-frame-context"
       >
-        {isLoadingSourceContext ? (
-          <Container padding="sm md">
-            <LoadingIndicator mini size={16} />
-            {t('Loading source context…')}
-          </Container>
-        ) : hasSourceContext ? (
+        {hasSourceContext ? (
           <FrameSourceGrid>
             {contextLines.map(([lineNumber, lineValue], lineIndex) => (
               <FrameSourceRow
diff --git a/static/app/components/stackTrace/frame/frameRow.tsx b/static/app/components/stackTrace/frame/frameRow.tsx
index 758ce9cf81e0..d7c2632b5bbf 100644
--- a/static/app/components/stackTrace/frame/frameRow.tsx
+++ b/static/app/components/stackTrace/frame/frameRow.tsx
@@ -29,7 +29,6 @@ const StackTraceFrameRowRoot = memo(function StackTraceFrameRowRoot({
   const {
     event,
     frames,
-    hasScmSourceContext,
     lastFrameIndex,
     platform,
     stacktrace,
@@ -44,7 +43,6 @@ const StackTraceFrameRowRoot = memo(function StackTraceFrameRowRoot({
     frame: row.frame,
     registers,
     platform,
-    hasScmSourceContext,
   });
 
   const frameContextId = useId();
diff --git a/static/app/components/stackTrace/frame/frameVariablesGrid.spec.tsx b/static/app/components/stackTrace/frame/frameVariablesGrid.spec.tsx
index b15a0a97d7f1..5ac6300fb635 100644
--- a/static/app/components/stackTrace/frame/frameVariablesGrid.spec.tsx
+++ b/static/app/components/stackTrace/frame/frameVariablesGrid.spec.tsx
@@ -61,7 +61,7 @@ describe('FrameVariablesGrid', () => {
 
     const initialRouterConfig = {
       location: {
-        pathname: '/organizations/org-slug/issues/1/',
+        pathname: `/organizations/org-slug/issues/1/`,
         query: {project: project.id},
       },
       route: '/organizations/:orgId/issues/:groupId/',
diff --git a/static/app/components/stackTrace/issueStackTrace/index.spec.tsx b/static/app/components/stackTrace/issueStackTrace/index.spec.tsx
index c9dd66c79e32..dfbebe996e3c 100644
--- a/static/app/components/stackTrace/issueStackTrace/index.spec.tsx
+++ b/static/app/components/stackTrace/issueStackTrace/index.spec.tsx
@@ -664,38 +664,6 @@ describe('IssueStackTrace', () => {
     });
   });
 
-  it('fetches and renders SCM source context for frames without embedded context', async () => {
-    const {event, stacktrace} = makeCopyTestData();
-    const organization = OrganizationFixture({features: ['scm-source-context']});
-    ProjectsStore.loadInitialData([ProjectFixture({id: '1', slug: 'project-slug'})]);
-
-    const sourceContextRequest = MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/stacktrace-source-context/',
-      body: {context: [[42, 'def handle():']], sourceUrl: null, error: null},
-    });
-
-    render(
-      <IssueStackTrace
-        event={event}
-        values={[
-          {
-            type: 'RuntimeError',
-            value: 'broke',
-            module: null,
-            mechanism: {handled: false, type: 'generic'},
-            stacktrace,
-            rawStacktrace: null,
-            threadId: null,
-          },
-        ]}
-      />,
-      {organization}
-    );
-
-    expect(sourceContextRequest).toHaveBeenCalled();
-    expect(await screen.findByText('def handle():')).toBeInTheDocument();
-  });
-
   describe('exception groups', () => {
     function makeExceptionGroupValues(): {
       event: ReturnType<typeof EventFixture>;
diff --git a/static/app/components/stackTrace/issueStackTrace/index.tsx b/static/app/components/stackTrace/issueStackTrace/index.tsx
index b7ccc126ef61..8d8574524e3f 100644
--- a/static/app/components/stackTrace/issueStackTrace/index.tsx
+++ b/static/app/components/stackTrace/issueStackTrace/index.tsx
@@ -40,7 +40,6 @@ import type {Group} from 'sentry/types/group';
 import type {Project} from 'sentry/types/project';
 import type {StacktraceType} from 'sentry/types/stacktrace';
 import {defined} from 'sentry/utils';
-import {useOrganization} from 'sentry/utils/useOrganization';
 import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
 import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
 
@@ -149,8 +148,6 @@ function IssueStackTraceContent({
   isStandalone,
 }: IssueStackTraceBaseProps & {isStandalone: boolean; values: ExceptionValue[]}) {
   const {isMinified, isNewestFirst, view} = useStackTraceViewState();
-  const organization = useOrganization();
-  const hasScmSourceContext = organization.features.includes('scm-source-context');
   const {hiddenExceptions, toggleRelatedExceptions, expandException} =
     useHiddenExceptions(values);
 
@@ -261,7 +258,6 @@ function IssueStackTraceContent({
           <StackTraceProvider
             exceptionIndex={isStandalone ? undefined : exc.exceptionIndex}
             event={event}
-            hasScmSourceContext={hasScmSourceContext}
             stacktrace={exc.stacktrace}
             minifiedStacktrace={exc.rawStacktrace ?? undefined}
             meta={isStandalone ? rawEntryMeta : excMeta?.stacktrace}
@@ -348,7 +344,6 @@ function IssueStackTraceContent({
                   <StackTraceProvider
                     exceptionIndex={exc.exceptionIndex}
                     event={event}
-                    hasScmSourceContext={hasScmSourceContext}
                     stacktrace={exc.stacktrace}
                     minifiedStacktrace={exc.rawStacktrace ?? undefined}
                     meta={exceptionValuesMeta?.[exc.exceptionIndex]?.stacktrace}
diff --git a/static/app/components/stackTrace/issueStackTrace/issueStackTraceFrameContext.tsx b/static/app/components/stackTrace/issueStackTrace/issueStackTraceFrameContext.tsx
index e621e5d0772d..2212bb4b271a 100644
--- a/static/app/components/stackTrace/issueStackTrace/issueStackTraceFrameContext.tsx
+++ b/static/app/components/stackTrace/issueStackTrace/issueStackTraceFrameContext.tsx
@@ -1,12 +1,7 @@
-import {useEffect, useMemo} from 'react';
+import {useEffect} from 'react';
 
 import {useLineCoverageContext} from 'sentry/components/events/interfaces/crashContent/exception/lineCoverageContext';
-import {useSourceContext} from 'sentry/components/events/interfaces/frame/useSourceContext';
 import {useStacktraceCoverage} from 'sentry/components/events/interfaces/frame/useStacktraceCoverage';
-import {
-  hasContextSource,
-  hasPotentialSourceContext,
-} from 'sentry/components/events/interfaces/frame/utils';
 import {FrameContent} from 'sentry/components/stackTrace/frame/frameContent';
 import {
   useStackTraceContext,
@@ -30,47 +25,25 @@ function getLineCoverage(
 
 export function IssueStackTraceFrameContext() {
   const {event, frame, isExpanded} = useStackTraceFrameContext();
-  const {hasScmSourceContext, project} = useStackTraceContext();
+  const {project} = useStackTraceContext();
   const {hasCoverageData, setHasCoverageData} = useLineCoverageContext();
-  const organization = useOrganization();
-
-  const hasEmbeddedContext = hasContextSource(frame);
-  const shouldFetchSourceContext =
-    hasScmSourceContext &&
-    defined(project) &&
-    !hasEmbeddedContext &&
-    isExpanded &&
-    hasPotentialSourceContext(frame);
-
-  const {data: sourceContextData, isPending: isLoadingSourceContext} = useSourceContext(
-    {
-      event,
-      frame,
-      orgSlug: organization.slug,
-      projectSlug: project?.slug,
-    },
-    {enabled: shouldFetchSourceContext}
-  );
+  const organization = useOrganization({allowNull: true});
 
-  const scmContext = useMemo(() => {
-    if (!sourceContextData?.context?.length) {
-      return undefined;
-    }
-    return sourceContextData.context;
-  }, [sourceContextData]);
-
-  const effectiveContext = hasEmbeddedContext ? frame.context : scmContext;
-  const contextLines = isExpanded ? (effectiveContext ?? []) : [];
+  const contextLines = isExpanded ? (frame.context ?? []) : [];
 
   const {data: coverageData, isPending: isLoadingCoverage} = useStacktraceCoverage(
     {
       event,
       frame,
-      orgSlug: organization.slug,
+      orgSlug: organization?.slug || '',
       projectSlug: project?.slug,
     },
     {
-      enabled: isExpanded && defined(project) && !!organization.codecovAccess,
+      enabled:
+        isExpanded &&
+        defined(organization) &&
+        defined(project) &&
+        !!organization.codecovAccess,
     }
   );
 
@@ -93,11 +66,5 @@ export function IssueStackTraceFrameContext() {
     }
   }, [coverageData, hasCoverageData, isLoadingCoverage, setHasCoverageData]);
 
-  return (
-    <FrameContent
-      sourceLineCoverage={sourceLineCoverage}
-      effectiveContext={effectiveContext}
-      isLoadingSourceContext={shouldFetchSourceContext && isLoadingSourceContext}
-    />
-  );
+  return <FrameContent sourceLineCoverage={sourceLineCoverage} />;
 }
diff --git a/static/app/components/stackTrace/stackTrace.stories.tsx b/static/app/components/stackTrace/stackTrace.stories.tsx
index dfa069d7ae4f..3aa8e87ab0f2 100644
--- a/static/app/components/stackTrace/stackTrace.stories.tsx
+++ b/static/app/components/stackTrace/stackTrace.stories.tsx
@@ -343,7 +343,7 @@ function makeLongPathAndFunctionStackTraceData(): StackTraceStoryData {
         ...frame,
         function:
           `very_long_function_name_for_exception_debugging_pipeline_stage_${index}` +
-          '__with_additional_context_and_nested_handler_resolution_chain',
+          `__with_additional_context_and_nested_handler_resolution_chain`,
         inApp: true,
       })),
     } as StacktraceWithFrames,
@@ -628,7 +628,7 @@ function makeChainedWithExceptionGroupValues(): ExceptionValue[] {
       context: [
         [lineNo - 2, `def ${func}():`],
         [lineNo - 1, '    try:'],
-        [lineNo, '        raise ExceptionGroup("group", errors)'],
+        [lineNo, `        raise ExceptionGroup("group", errors)`],
         [lineNo + 1, '    except Exception:'],
         [lineNo + 2, '        pass'],
       ],
diff --git a/static/app/components/stackTrace/stackTraceContext.tsx b/static/app/components/stackTrace/stackTraceContext.tsx
index a74d4de7b115..0501edf2efba 100644
--- a/static/app/components/stackTrace/stackTraceContext.tsx
+++ b/static/app/components/stackTrace/stackTraceContext.tsx
@@ -59,8 +59,6 @@ export interface StackTraceContextValue {
   frames: Frame[];
   /** True when any visible frame row has expandable details. */
   hasAnyExpandableFrames: boolean;
-  /** True when the SCM source context feature is enabled for this org. */
-  hasScmSourceContext: boolean;
   /** Hidden-system-frame expansion state keyed by frame index. */
   hiddenFrameToggleMap: Record<number, boolean>;
   /** True when the "Unminify Code" source map action must be hidden. */
diff --git a/static/app/components/stackTrace/stackTraceProvider.tsx b/static/app/components/stackTrace/stackTraceProvider.tsx
index 3fd3775a5d88..c19c19de17f9 100644
--- a/static/app/components/stackTrace/stackTraceProvider.tsx
+++ b/static/app/components/stackTrace/stackTraceProvider.tsx
@@ -22,7 +22,6 @@ export function StackTraceProvider({
   exceptionIndex,
   event,
   frameSourceMapDebuggerData,
-  hasScmSourceContext,
   hideSourceMapDebugger,
   minifiedStacktrace,
   stacktrace,
@@ -107,10 +106,9 @@ export function StackTraceProvider({
           frame: row.frame,
           registers,
           platform,
-          hasScmSourceContext,
         });
       }),
-    [rows, frames.length, activeStacktrace.registers, platform, hasScmSourceContext]
+    [rows, frames.length, activeStacktrace.registers, platform]
   );
 
   const toggleHiddenFrames = useCallback((frameIndex: number) => {
@@ -126,7 +124,6 @@ export function StackTraceProvider({
       exceptionIndex,
       event,
       hasAnyExpandableFrames,
-      hasScmSourceContext: hasScmSourceContext ?? false,
       platform,
       project,
       stacktrace: activeStacktrace,
@@ -146,7 +143,6 @@ export function StackTraceProvider({
       frameSourceMapDebuggerData,
       frames,
       hasAnyExpandableFrames,
-      hasScmSourceContext,
       hideSourceMapDebugger,
       hiddenFrameToggleMap,
       lastFrameIndex,
diff --git a/static/app/components/stackTrace/types.tsx b/static/app/components/stackTrace/types.tsx
index d7f28c0b5b9e..56f7a38e3550 100644
--- a/static/app/components/stackTrace/types.tsx
+++ b/static/app/components/stackTrace/types.tsx
@@ -60,8 +60,6 @@ export interface StackTraceProviderProps {
   exceptionIndex?: number;
   /** Per-frame source map debugger data, powering the "Unminify Code" action. */
   frameSourceMapDebuggerData?: FrameSourceMapDebuggerData[];
-  /** Whether the SCM source context feature is enabled for this org. */
-  hasScmSourceContext?: boolean;
   /** Hide the source maps debugger button entirely. */
   hideSourceMapDebugger?: boolean;
   /** Cap the number of frames rendered. Frames beyond this depth are omitted. */
diff --git a/static/app/components/structuredEventData/index.stories.tsx b/static/app/components/structuredEventData/index.stories.tsx
index 26fb96d9c8a4..536883827bfb 100644
--- a/static/app/components/structuredEventData/index.stories.tsx
+++ b/static/app/components/structuredEventData/index.stories.tsx
@@ -144,9 +144,7 @@ export default Storybook.story('StructuredEventData', story => {
           customize when and how certain data types are displayed.
         </p>
         <p>Input:</p>
-        <CodeBlock language="javascript">
-          {"data: {nil: null, bool: 'this_should_look_like_a_boolean'}"}
-        </CodeBlock>
+        <CodeBlock language="javascript">{`data: {nil: null, bool: 'this_should_look_like_a_boolean'}`}</CodeBlock>
         <p>Config:</p>
         <CodeBlock language="javascript">
           {`const config = {
diff --git a/static/app/components/suggestedAvatarStack.tsx b/static/app/components/suggestedAvatarStack.tsx
index 7e2a3eb0a5b2..df219233cfd5 100644
--- a/static/app/components/suggestedAvatarStack.tsx
+++ b/static/app/components/suggestedAvatarStack.tsx
@@ -54,7 +54,7 @@ export function SuggestedAvatarStack({
 const AvatarStack = styled('div')<{reverse: boolean}>`
   display: flex;
   align-content: center;
-  ${p => p.reverse && 'flex-direction: row-reverse;'}
+  ${p => p.reverse && `flex-direction: row-reverse;`}
 `;
 
 const Avatar = styled(ActorAvatar)<{index: number; reverse: boolean}>`
diff --git a/static/app/components/timeRangeSelector/dateRange.tsx b/static/app/components/timeRangeSelector/dateRange.tsx
index b11cf478e106..3de44c83aeec 100644
--- a/static/app/components/timeRangeSelector/dateRange.tsx
+++ b/static/app/components/timeRangeSelector/dateRange.tsx
@@ -131,7 +131,7 @@ class BaseDateRange extends Component<Props, State> {
       organization: organization ?? null,
       field_changed: 'start',
       time: startTime,
-      path: getRouteStringFromRoutes({routes: router.routes}),
+      path: getRouteStringFromRoutes(router.routes),
     });
 
     onChange({
@@ -160,7 +160,7 @@ class BaseDateRange extends Component<Props, State> {
       organization: organization ?? null,
       field_changed: 'end',
       time: endTime,
-      path: getRouteStringFromRoutes({routes: router.routes}),
+      path: getRouteStringFromRoutes(router.routes),
     });
 
     onChange({
diff --git a/static/app/components/timeRangeSelector/index.tsx b/static/app/components/timeRangeSelector/index.tsx
index 88eceb32d1a9..f5836e9e263a 100644
--- a/static/app/components/timeRangeSelector/index.tsx
+++ b/static/app/components/timeRangeSelector/index.tsx
@@ -1,6 +1,5 @@
 import {Fragment, useCallback, useState} from 'react';
 import * as React from 'react';
-import {useMatches} from 'react-router-dom';
 import styled from '@emotion/styled';
 import {mergeProps} from '@react-aria/utils';
 
@@ -28,6 +27,7 @@ import {parsePeriodToHours} from 'sentry/utils/duration/parsePeriodToHours';
 import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
 import {useDefaultMaxPickableDays} from 'sentry/utils/useMaxPickableDays';
 import {useOrganization} from 'sentry/utils/useOrganization';
+import {useRoutes} from 'sentry/utils/useRoutes';
 
 import {DateRange} from './dateRange';
 import {SelectorItems} from './selectorItems';
@@ -168,7 +168,7 @@ export function TimeRangeSelector({
   menuFooterMessage,
   ...selectProps
 }: TimeRangeSelectorProps) {
-  const matches = useMatches();
+  const routes = useRoutes();
   const organization = useOrganization({allowNull: true});
 
   const defaultMaxPickableDays = useDefaultMaxPickableDays();
@@ -420,7 +420,7 @@ export function TimeRangeSelector({
 
                           trackAnalytics('dateselector.utc_changed', {
                             utc: newUtc,
-                            path: getRouteStringFromRoutes({matches}),
+                            path: getRouteStringFromRoutes(routes),
                             organization,
                           });
 
diff --git a/static/app/components/updatedEmptyState.spec.tsx b/static/app/components/updatedEmptyState.spec.tsx
index 9254cde63d53..73a567b76532 100644
--- a/static/app/components/updatedEmptyState.spec.tsx
+++ b/static/app/components/updatedEmptyState.spec.tsx
@@ -9,7 +9,7 @@ import UpdatedEmptyState from 'sentry/components/updatedEmptyState';
 
 function renderMockRequests({firstIssue}: {firstIssue?: string} = {}) {
   MockApiClient.addMockResponse({
-    url: '/projects/org-slug/project-slug/keys/',
+    url: `/projects/org-slug/project-slug/keys/`,
     method: 'GET',
     body: [ProjectKeysFixture()[0]],
   });
@@ -21,13 +21,13 @@ function renderMockRequests({firstIssue}: {firstIssue?: string} = {}) {
   });
 
   MockApiClient.addMockResponse({
-    url: '/projects/org-slug/project-slug/',
+    url: `/projects/org-slug/project-slug/`,
     method: 'GET',
     body: ProjectFixture({platform: 'python-django', firstEvent: firstIssue ?? null}),
   });
 
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/sdks/',
+    url: `/organizations/org-slug/sdks/`,
     method: 'GET',
   });
 }
@@ -105,7 +105,7 @@ describe('UpdatedEmptyState', () => {
 
     expect(screen.getByRole('button', {name: 'Take me to my error'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/issues/1/?referrer=onboarding-first-event-indicator'
+      `/organizations/org-slug/issues/1/?referrer=onboarding-first-event-indicator`
     );
 
     expect(screen.getByRole('button', {name: 'Back'})).toBeEnabled();
diff --git a/static/app/components/workflowEngine/ui/formSection.tsx b/static/app/components/workflowEngine/ui/formSection.tsx
index 339a386dce6d..15acd7e03949 100644
--- a/static/app/components/workflowEngine/ui/formSection.tsx
+++ b/static/app/components/workflowEngine/ui/formSection.tsx
@@ -4,6 +4,8 @@ import {Disclosure} from '@sentry/scraps/disclosure';
 import {Stack} from '@sentry/scraps/layout';
 import {Heading, Text} from '@sentry/scraps/text';
 
+import {ErrorBoundary} from 'sentry/components/errorBoundary';
+
 type FormSectionProps = {
   title: React.ReactNode;
   children?: React.ReactNode;
@@ -24,30 +26,32 @@ export function FormSection({
   defaultExpanded = true,
 }: FormSectionProps) {
   return (
-    <Disclosure
-      as="section"
-      size="md"
-      role="region"
-      defaultExpanded={defaultExpanded}
-      className={className}
-    >
-      <Disclosure.Title trailingItems={trailingItems}>
-        <Heading as="h3">
-          {step ? `${step}. ` : ''}
-          {title}
-        </Heading>
-      </Disclosure.Title>
-      <Disclosure.Content>
-        <Stack gap="lg">
-          {description && (
-            <FormSectionDescription as="p" variant="secondary">
-              {description}
-            </FormSectionDescription>
-          )}
-          <Stack gap="md">{children}</Stack>
-        </Stack>
-      </Disclosure.Content>
-    </Disclosure>
+    <ErrorBoundary mini>
+      <Disclosure
+        as="section"
+        size="md"
+        role="region"
+        defaultExpanded={defaultExpanded}
+        className={className}
+      >
+        <Disclosure.Title trailingItems={trailingItems}>
+          <Heading as="h3">
+            {step ? `${step}. ` : ''}
+            {title}
+          </Heading>
+        </Disclosure.Title>
+        <Disclosure.Content>
+          <Stack gap="lg">
+            {description && (
+              <FormSectionDescription as="p" variant="secondary">
+                {description}
+              </FormSectionDescription>
+            )}
+            <Stack gap="md">{children}</Stack>
+          </Stack>
+        </Disclosure.Content>
+      </Disclosure>
+    </ErrorBoundary>
   );
 }
 
diff --git a/static/app/data/controlsiloUrlPatterns.ts b/static/app/data/controlsiloUrlPatterns.ts
index 1035251b01b4..60d83e3c1cab 100644
--- a/static/app/data/controlsiloUrlPatterns.ts
+++ b/static/app/data/controlsiloUrlPatterns.ts
@@ -164,7 +164,10 @@ export const controlsiloUrlPatterns: RegExp[] = [
   new RegExp('^api/0/wizard/$'),
   new RegExp('^api/0/wizard/[^/]+/$'),
   new RegExp('^api/0/internal/beacon/$'),
+  new RegExp('^api/0/internal/integration-proxy/$'),
   new RegExp('^api/0/internal/demo/email-capture/$'),
+  new RegExp('^api/0/internal/org-cell-mappings/$'),
+  new RegExp('^api/0/internal/projectkey-cell-mappings/$'),
   new RegExp('^api/0/internal/notifications/registered-templates/$'),
   new RegExp('^api/0/tempest-ips/$'),
   new RegExp('^api/0/secret-scanning/github/$'),
diff --git a/static/app/data/forms/projectGeneralSettings.tsx b/static/app/data/forms/projectGeneralSettings.tsx
index f41bf4c59ec4..a821257dec50 100644
--- a/static/app/data/forms/projectGeneralSettings.tsx
+++ b/static/app/data/forms/projectGeneralSettings.tsx
@@ -142,7 +142,7 @@ export const fields = {
         <Hovercard
           body={
             <CodeBlock hideCopyButton>
-              {'https://example.com\n*.example.com\n*:80\n*'}
+              {`https://example.com\n*.example.com\n*:80\n*`}
             </CodeBlock>
           }
         >
diff --git a/static/app/gettingStartedDocs/android/logs.tsx b/static/app/gettingStartedDocs/android/logs.tsx
index c6096580033a..729f4a04d0bd 100644
--- a/static/app/gettingStartedDocs/android/logs.tsx
+++ b/static/app/gettingStartedDocs/android/logs.tsx
@@ -113,7 +113,7 @@ export const logs: OnboardingConfig = {
               label: 'XML',
               language: 'xml',
               filename: 'AndroidManifest.xml',
-              code: '<meta-data android:name="io.sentry.logs.enabled" android:value="true" />',
+              code: `<meta-data android:name="io.sentry.logs.enabled" android:value="true" />`,
             },
             {
               label: 'Java',
diff --git a/static/app/gettingStartedDocs/apple-macos/onboarding.tsx b/static/app/gettingStartedDocs/apple-macos/onboarding.tsx
index 6265a54f2022..e564aef3efb1 100644
--- a/static/app/gettingStartedDocs/apple-macos/onboarding.tsx
+++ b/static/app/gettingStartedDocs/apple-macos/onboarding.tsx
@@ -141,7 +141,7 @@ export const onboarding: OnboardingConfig = {
         {
           type: 'code',
           language: 'url',
-          code: 'https://github.com/getsentry/sentry-cocoa.git',
+          code: `https://github.com/getsentry/sentry-cocoa.git`,
         },
         {
           type: 'text',
diff --git a/static/app/gettingStartedDocs/apple-macos/profiling.tsx b/static/app/gettingStartedDocs/apple-macos/profiling.tsx
index e9b418ecc7e9..7d7ac151c91b 100644
--- a/static/app/gettingStartedDocs/apple-macos/profiling.tsx
+++ b/static/app/gettingStartedDocs/apple-macos/profiling.tsx
@@ -50,7 +50,7 @@ export const profiling: OnboardingConfig = {
         {
           type: 'code',
           language: 'url',
-          code: 'https://github.com/getsentry/sentry-cocoa.git',
+          code: `https://github.com/getsentry/sentry-cocoa.git`,
         },
         {
           type: 'text',
diff --git a/static/app/gettingStartedDocs/capacitor/onboarding.tsx b/static/app/gettingStartedDocs/capacitor/onboarding.tsx
index 95b388dcdb20..be92e40ff9c9 100644
--- a/static/app/gettingStartedDocs/capacitor/onboarding.tsx
+++ b/static/app/gettingStartedDocs/capacitor/onboarding.tsx
@@ -19,7 +19,7 @@ export const onboarding: OnboardingConfig<PlatformOptions> = {
         {
           type: 'text',
           text: tct(
-            'Install the Sentry Capacitor SDK as a dependency using [code:npm] or [code:yarn], alongside the Sentry [siblingName:] SDK:',
+            `Install the Sentry Capacitor SDK as a dependency using [code:npm] or [code:yarn], alongside the Sentry [siblingName:] SDK:`,
             {
               code: <code />,
               siblingName: getSiblingName(params.platformOptions.siblingOption),
@@ -50,7 +50,7 @@ export const onboarding: OnboardingConfig<PlatformOptions> = {
         {
           type: 'text',
           text: tct(
-            'The version of the Sentry [siblingName:] SDK must match with the version referred by Sentry Capacitor. To check which version of the Sentry [siblingName:] SDK is installed, use the following command: [code:npm info @sentry/capacitor peerDependencies]',
+            `The version of the Sentry [siblingName:] SDK must match with the version referred by Sentry Capacitor. To check which version of the Sentry [siblingName:] SDK is installed, use the following command: [code:npm info @sentry/capacitor peerDependencies]`,
             {
               code: <code />,
               siblingName: getSiblingName(params.platformOptions.siblingOption),
@@ -87,7 +87,7 @@ export const onboarding: OnboardingConfig<PlatformOptions> = {
             {
               label: 'JavaScript',
               language: 'javascript',
-              code: 'myUndefinedFunction();',
+              code: `myUndefinedFunction();`,
             },
           ],
         },
diff --git a/static/app/gettingStartedDocs/capacitor/utils.tsx b/static/app/gettingStartedDocs/capacitor/utils.tsx
index 330cbf27741f..81cf30ee3b6c 100644
--- a/static/app/gettingStartedDocs/capacitor/utils.tsx
+++ b/static/app/gettingStartedDocs/capacitor/utils.tsx
@@ -59,9 +59,9 @@ const isVue = (siblingOption: string): boolean =>
 
 function getPerformanceIntegration(siblingOption: string): string {
   return isVue(siblingOption)
-    ? 'routingInstrumentation: SentryVue.vueRouterInstrumentation(router),'
+    ? `routingInstrumentation: SentryVue.vueRouterInstrumentation(router),`
     : isAngular(siblingOption)
-      ? 'routingInstrumentation: SentryAngular.routingInstrumentation,'
+      ? `routingInstrumentation: SentryAngular.routingInstrumentation,`
       : '';
 }
 
@@ -168,9 +168,9 @@ const getStaticParts = (params: Params): string[] => {
   const staticParts = [`dsn: "${params.dsn.public}"`];
 
   if (params.platformOptions.siblingOption === SiblingOption.VUE2) {
-    staticParts.unshift('Vue');
+    staticParts.unshift(`Vue`);
   } else if (params.platformOptions.siblingOption === SiblingOption.VUE3) {
-    staticParts.unshift('app');
+    staticParts.unshift(`app`);
   }
 
   return staticParts;
@@ -200,7 +200,7 @@ export function getSetupConfiguration({
     configuration.push({
       type: 'text',
       text: tct(
-        'You should init the Sentry capacitor SDK in your [code:main.ts] file as soon as possible during application load up, before initializing Sentry [siblingName:]',
+        `You should init the Sentry capacitor SDK in your [code:main.ts] file as soon as possible during application load up, before initializing Sentry [siblingName:]`,
         {
           siblingName: getSiblingName(siblingOption),
           code: <code />,
diff --git a/static/app/gettingStartedDocs/dart/logs.tsx b/static/app/gettingStartedDocs/dart/logs.tsx
index 982efc917ba8..6104991f4982 100644
--- a/static/app/gettingStartedDocs/dart/logs.tsx
+++ b/static/app/gettingStartedDocs/dart/logs.tsx
@@ -91,7 +91,7 @@ export const logs: OnboardingConfig = {
         {
           type: 'code',
           language: 'dart',
-          code: 'Sentry.logger.fmt.info("Test log from %s", ["Sentry"])',
+          code: `Sentry.logger.fmt.info("Test log from %s", ["Sentry"])`,
         },
         {
           type: 'text',
diff --git a/static/app/gettingStartedDocs/deno/onboarding.tsx b/static/app/gettingStartedDocs/deno/onboarding.tsx
index a6e98a7826fb..f057ca9253c0 100644
--- a/static/app/gettingStartedDocs/deno/onboarding.tsx
+++ b/static/app/gettingStartedDocs/deno/onboarding.tsx
@@ -19,7 +19,7 @@ export const onboarding: OnboardingConfig = {
             {
               label: 'npm registry',
               language: 'javascript',
-              code: 'import * as Sentry from "npm:@sentry/deno";',
+              code: `import * as Sentry from "npm:@sentry/deno";`,
             },
           ],
         },
diff --git a/static/app/gettingStartedDocs/electron/feedback.tsx b/static/app/gettingStartedDocs/electron/feedback.tsx
index ce1ce2c93fd2..6677566a7430 100644
--- a/static/app/gettingStartedDocs/electron/feedback.tsx
+++ b/static/app/gettingStartedDocs/electron/feedback.tsx
@@ -50,7 +50,7 @@ export const feedback: OnboardingConfig = {
               language: 'javascript',
               label: 'JavaScript',
               code: getFeedbackSDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/electron/renderer";',
+                importStatement: `import * as Sentry from "@sentry/electron/renderer";`,
                 dsn: params.dsn.public,
                 feedbackOptions: params.feedbackOptions,
               }),
diff --git a/static/app/gettingStartedDocs/electron/onboarding.tsx b/static/app/gettingStartedDocs/electron/onboarding.tsx
index 28f0d07fe74a..708a96ca1917 100644
--- a/static/app/gettingStartedDocs/electron/onboarding.tsx
+++ b/static/app/gettingStartedDocs/electron/onboarding.tsx
@@ -66,12 +66,12 @@ export const onboarding: OnboardingConfig = {
         {
           type: 'text',
           text: t(
-            'One way to verify your setup is by intentionally causing an error that breaks your application.'
+            `One way to verify your setup is by intentionally causing an error that breaks your application.`
           ),
         },
         {
           type: 'text',
-          text: t('Calling an undefined function will throw a JavaScript exception:'),
+          text: t(`Calling an undefined function will throw a JavaScript exception:`),
         },
         {
           type: 'code',
@@ -81,7 +81,7 @@ export const onboarding: OnboardingConfig = {
         {
           type: 'text',
           text: t(
-            'With Electron you can test native crash reporting by triggering a crash:'
+            `With Electron you can test native crash reporting by triggering a crash:`
           ),
         },
         {
diff --git a/static/app/gettingStartedDocs/electron/replay.tsx b/static/app/gettingStartedDocs/electron/replay.tsx
index 2e861853efe7..86b5f4347fce 100644
--- a/static/app/gettingStartedDocs/electron/replay.tsx
+++ b/static/app/gettingStartedDocs/electron/replay.tsx
@@ -48,7 +48,7 @@ export const replay: OnboardingConfig = {
               language: 'javascript',
               label: 'JavaScript',
               code: getReplaySDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/electron/renderer";',
+                importStatement: `import * as Sentry from "@sentry/electron/renderer";`,
                 dsn: params.dsn.public,
                 mask: params.replayOptions?.mask,
                 block: params.replayOptions?.block,
diff --git a/static/app/gettingStartedDocs/flutter/logs.tsx b/static/app/gettingStartedDocs/flutter/logs.tsx
index 7807c79c610e..16f133f07250 100644
--- a/static/app/gettingStartedDocs/flutter/logs.tsx
+++ b/static/app/gettingStartedDocs/flutter/logs.tsx
@@ -93,7 +93,7 @@ export const logs: OnboardingConfig = {
         {
           type: 'code',
           language: 'dart',
-          code: 'Sentry.logger.fmt.info("Test log from %s", ["Sentry"])',
+          code: `Sentry.logger.fmt.info("Test log from %s", ["Sentry"])`,
         },
         {
           type: 'text',
diff --git a/static/app/gettingStartedDocs/go/logs.tsx b/static/app/gettingStartedDocs/go/logs.tsx
index 660e90f18902..db838b311f7a 100644
--- a/static/app/gettingStartedDocs/go/logs.tsx
+++ b/static/app/gettingStartedDocs/go/logs.tsx
@@ -74,7 +74,7 @@ func main() {
                 <ExternalLink
                   href={
                     docsPlatform === 'go'
-                      ? 'https://docs.sentry.io/platforms/go/logs/#integrations'
+                      ? `https://docs.sentry.io/platforms/go/logs/#integrations`
                       : `https://docs.sentry.io/platforms/go/guides/${docsPlatform}/logs/#integrations`
                   }
                 />
diff --git a/static/app/gettingStartedDocs/java-log4j2/logs.tsx b/static/app/gettingStartedDocs/java-log4j2/logs.tsx
index 62c903cd6001..d665458ac0da 100644
--- a/static/app/gettingStartedDocs/java-log4j2/logs.tsx
+++ b/static/app/gettingStartedDocs/java-log4j2/logs.tsx
@@ -43,7 +43,7 @@ export const logs: OnboardingConfig = {
             {
               label: 'sentry.properties',
               language: 'properties',
-              code: 'logs.enabled=true',
+              code: `logs.enabled=true`,
             },
             {
               label: 'Java',
diff --git a/static/app/gettingStartedDocs/java-spring-boot/logs.tsx b/static/app/gettingStartedDocs/java-spring-boot/logs.tsx
index 8fc043cc9180..7356d59f49fc 100644
--- a/static/app/gettingStartedDocs/java-spring-boot/logs.tsx
+++ b/static/app/gettingStartedDocs/java-spring-boot/logs.tsx
@@ -43,7 +43,7 @@ export const logs: OnboardingConfig = {
             {
               label: 'application.properties',
               language: 'properties',
-              code: 'sentry.logs.enabled=true',
+              code: `sentry.logs.enabled=true`,
             },
             {
               label: 'application.yml',
diff --git a/static/app/gettingStartedDocs/java-spring-boot/onboarding.tsx b/static/app/gettingStartedDocs/java-spring-boot/onboarding.tsx
index 5965d268fe82..563b94915a27 100644
--- a/static/app/gettingStartedDocs/java-spring-boot/onboarding.tsx
+++ b/static/app/gettingStartedDocs/java-spring-boot/onboarding.tsx
@@ -91,7 +91,7 @@ export const onboarding: OnboardingConfig<PlatformOptions> = {
         {
           type: 'code',
           language: 'bash',
-          code: 'SENTRY_AUTH_TOKEN=___ORG_AUTH_TOKEN___',
+          code: `SENTRY_AUTH_TOKEN=___ORG_AUTH_TOKEN___`,
         },
         {
           type: 'conditional',
diff --git a/static/app/gettingStartedDocs/java/onboarding.tsx b/static/app/gettingStartedDocs/java/onboarding.tsx
index 31840903fafe..d466a7fe724e 100644
--- a/static/app/gettingStartedDocs/java/onboarding.tsx
+++ b/static/app/gettingStartedDocs/java/onboarding.tsx
@@ -87,7 +87,7 @@ export const onboarding: OnboardingConfig<PlatformOptions> = {
         {
           type: 'text',
           text: t(
-            'Install the SDK via %s:',
+            `Install the SDK via %s:`,
             packageManagerName[params.platformOptions.packageManager]
           ),
         },
@@ -103,7 +103,7 @@ export const onboarding: OnboardingConfig<PlatformOptions> = {
         {
           type: 'code',
           language: 'bash',
-          code: 'SENTRY_AUTH_TOKEN=___ORG_AUTH_TOKEN___',
+          code: `SENTRY_AUTH_TOKEN=___ORG_AUTH_TOKEN___`,
         },
         {
           type: 'conditional',
diff --git a/static/app/gettingStartedDocs/javascript-angular/onboarding.tsx b/static/app/gettingStartedDocs/javascript-angular/onboarding.tsx
index 1cc9a0baf93f..de15a44a8e64 100644
--- a/static/app/gettingStartedDocs/javascript-angular/onboarding.tsx
+++ b/static/app/gettingStartedDocs/javascript-angular/onboarding.tsx
@@ -123,7 +123,7 @@ export const onboarding: OnboardingConfig<PlatformOptions> = {
         {
           type: 'text',
           text: tct(
-            'Initialize the Sentry Angular SDK in your [code:main.ts] file as early as possible, before initializing Angular:',
+            `Initialize the Sentry Angular SDK in your [code:main.ts] file as early as possible, before initializing Angular:`,
             {
               code: <code />,
             }
diff --git a/static/app/gettingStartedDocs/javascript-angular/utils.tsx b/static/app/gettingStartedDocs/javascript-angular/utils.tsx
index 84bdd7f1cfa1..3fad7412e35d 100644
--- a/static/app/gettingStartedDocs/javascript-angular/utils.tsx
+++ b/static/app/gettingStartedDocs/javascript-angular/utils.tsx
@@ -41,11 +41,11 @@ const getIntegrations = (params: Params): string[] => {
   const integrations = [];
 
   if (params.isPerformanceSelected) {
-    integrations.push('Sentry.browserTracingIntegration()');
+    integrations.push(`Sentry.browserTracingIntegration()`);
   }
 
   if (params.isProfilingSelected) {
-    integrations.push('Sentry.browserProfilingIntegration()');
+    integrations.push(`Sentry.browserProfilingIntegration()`);
   }
 
   if (params.isReplaySelected) {
diff --git a/static/app/gettingStartedDocs/javascript-astro/feedback.tsx b/static/app/gettingStartedDocs/javascript-astro/feedback.tsx
index 5d81183c988c..d1d9a3df08fd 100644
--- a/static/app/gettingStartedDocs/javascript-astro/feedback.tsx
+++ b/static/app/gettingStartedDocs/javascript-astro/feedback.tsx
@@ -47,7 +47,7 @@ export const feedback: OnboardingConfig = {
               label: 'JavaScript',
               language: 'javascript',
               code: getFeedbackSDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/astro";',
+                importStatement: `import * as Sentry from "@sentry/astro";`,
                 dsn: params.dsn.public,
                 feedbackOptions: params.feedbackOptions,
               }),
diff --git a/static/app/gettingStartedDocs/javascript-astro/replay.tsx b/static/app/gettingStartedDocs/javascript-astro/replay.tsx
index 37414b33f9c0..ee5373f5df51 100644
--- a/static/app/gettingStartedDocs/javascript-astro/replay.tsx
+++ b/static/app/gettingStartedDocs/javascript-astro/replay.tsx
@@ -115,7 +115,7 @@ import * as Sentry from "@sentry/astro";`,
         {
           type: 'text',
           text: tct(
-            'The [code:sentry.client.config.js] file allows you to configure client-side SDK options including replay settings. Learn more about manual SDK initialization [link:here].',
+            `The [code:sentry.client.config.js] file allows you to configure client-side SDK options including replay settings. Learn more about manual SDK initialization [link:here].`,
             {
               code: <code />,
               link: (
diff --git a/static/app/gettingStartedDocs/javascript-ember/utils.tsx b/static/app/gettingStartedDocs/javascript-ember/utils.tsx
index 1d705170547c..3757460fe6b2 100644
--- a/static/app/gettingStartedDocs/javascript-ember/utils.tsx
+++ b/static/app/gettingStartedDocs/javascript-ember/utils.tsx
@@ -10,7 +10,7 @@ const getIntegrations = (params: DocsParams): string[] => {
   const integrations = [];
 
   if (params.isProfilingSelected) {
-    integrations.push('Sentry.browserProfilingIntegration()');
+    integrations.push(`Sentry.browserProfilingIntegration()`);
   }
 
   if (params.isReplaySelected) {
diff --git a/static/app/gettingStartedDocs/javascript-gatsby/utils.tsx b/static/app/gettingStartedDocs/javascript-gatsby/utils.tsx
index d8426a244ec9..a053cf700c90 100644
--- a/static/app/gettingStartedDocs/javascript-gatsby/utils.tsx
+++ b/static/app/gettingStartedDocs/javascript-gatsby/utils.tsx
@@ -12,11 +12,11 @@ import {tct} from 'sentry/locale';
 const getIntegrations = (params: DocsParams): string[] => {
   const integrations = [];
   if (params.isPerformanceSelected) {
-    integrations.push('Sentry.browserTracingIntegration()');
+    integrations.push(`Sentry.browserTracingIntegration()`);
   }
 
   if (params.isProfilingSelected) {
-    integrations.push('Sentry.browserProfilingIntegration()');
+    integrations.push(`Sentry.browserProfilingIntegration()`);
   }
 
   if (params.isReplaySelected) {
diff --git a/static/app/gettingStartedDocs/javascript-nextjs/feedback.tsx b/static/app/gettingStartedDocs/javascript-nextjs/feedback.tsx
index 9b4582f5d053..4e13eb12ae08 100644
--- a/static/app/gettingStartedDocs/javascript-nextjs/feedback.tsx
+++ b/static/app/gettingStartedDocs/javascript-nextjs/feedback.tsx
@@ -59,7 +59,7 @@ export const feedback: OnboardingConfig = {
               filename: 'instrumentation-client.(js|ts)',
               language: 'javascript',
               code: getFeedbackSDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/nextjs";',
+                importStatement: `import * as Sentry from "@sentry/nextjs";`,
                 dsn: params.dsn.public,
                 feedbackOptions: params.feedbackOptions,
               }),
diff --git a/static/app/gettingStartedDocs/javascript-nextjs/replay.tsx b/static/app/gettingStartedDocs/javascript-nextjs/replay.tsx
index fb1f58b868e2..3226ffcf9140 100644
--- a/static/app/gettingStartedDocs/javascript-nextjs/replay.tsx
+++ b/static/app/gettingStartedDocs/javascript-nextjs/replay.tsx
@@ -41,7 +41,7 @@ export const replay: OnboardingConfig = {
               filename: 'instrumentation-client.(js|ts)',
               language: 'javascript',
               code: getReplaySDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/nextjs";',
+                importStatement: `import * as Sentry from "@sentry/nextjs";`,
                 dsn: params.dsn.public,
                 mask: params.replayOptions?.mask,
                 block: params.replayOptions?.block,
diff --git a/static/app/gettingStartedDocs/javascript-nuxt/feedback.tsx b/static/app/gettingStartedDocs/javascript-nuxt/feedback.tsx
index d11d733de363..6106674dcfdd 100644
--- a/static/app/gettingStartedDocs/javascript-nuxt/feedback.tsx
+++ b/static/app/gettingStartedDocs/javascript-nuxt/feedback.tsx
@@ -50,7 +50,7 @@ export const feedback: OnboardingConfig = {
               label: 'JavaScript',
               language: 'javascript',
               code: getFeedbackSDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/nuxt";',
+                importStatement: `import * as Sentry from "@sentry/nuxt";`,
                 dsn: params.dsn.public,
                 feedbackOptions: params.feedbackOptions,
               }),
diff --git a/static/app/gettingStartedDocs/javascript-nuxt/replay.tsx b/static/app/gettingStartedDocs/javascript-nuxt/replay.tsx
index 62066ee9e604..d7a934b849f4 100644
--- a/static/app/gettingStartedDocs/javascript-nuxt/replay.tsx
+++ b/static/app/gettingStartedDocs/javascript-nuxt/replay.tsx
@@ -36,7 +36,7 @@ export const replay: OnboardingConfig = {
               label: 'JavaScript',
               language: 'javascript',
               code: getReplaySDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/nuxt";',
+                importStatement: `import * as Sentry from "@sentry/nuxt";`,
                 dsn: params.dsn.public,
                 mask: params.replayOptions?.mask,
                 block: params.replayOptions?.block,
diff --git a/static/app/gettingStartedDocs/javascript-react/utils.tsx b/static/app/gettingStartedDocs/javascript-react/utils.tsx
index 0665ae9ed3d6..20a44d3b6ddc 100644
--- a/static/app/gettingStartedDocs/javascript-react/utils.tsx
+++ b/static/app/gettingStartedDocs/javascript-react/utils.tsx
@@ -43,11 +43,11 @@ const getDynamicParts = (params: DocsParams): string[] => {
 const getIntegrations = (params: DocsParams): string[] => {
   const integrations = [];
   if (params.isPerformanceSelected) {
-    integrations.push('Sentry.browserTracingIntegration()');
+    integrations.push(`Sentry.browserTracingIntegration()`);
   }
 
   if (params.isProfilingSelected) {
-    integrations.push('Sentry.browserProfilingIntegration()');
+    integrations.push(`Sentry.browserProfilingIntegration()`);
   }
 
   if (params.isReplaySelected) {
diff --git a/static/app/gettingStartedDocs/javascript-remix/feedback.tsx b/static/app/gettingStartedDocs/javascript-remix/feedback.tsx
index 9a3c55388f9f..73ae84837311 100644
--- a/static/app/gettingStartedDocs/javascript-remix/feedback.tsx
+++ b/static/app/gettingStartedDocs/javascript-remix/feedback.tsx
@@ -51,7 +51,7 @@ export const feedback: OnboardingConfig = {
               filename: 'entry.client.tsx',
               language: 'javascript',
               code: getFeedbackSDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/remix";',
+                importStatement: `import * as Sentry from "@sentry/remix";`,
                 dsn: params.dsn.public,
                 feedbackOptions: params.feedbackOptions,
               }),
diff --git a/static/app/gettingStartedDocs/javascript-remix/replay.tsx b/static/app/gettingStartedDocs/javascript-remix/replay.tsx
index d4f01179d8ff..cd5b5e79aa0a 100644
--- a/static/app/gettingStartedDocs/javascript-remix/replay.tsx
+++ b/static/app/gettingStartedDocs/javascript-remix/replay.tsx
@@ -38,7 +38,7 @@ export const replay: OnboardingConfig = {
               filename: 'entry.client.tsx',
               language: 'javascript',
               code: getReplaySDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/remix";',
+                importStatement: `import * as Sentry from "@sentry/remix";`,
                 dsn: params.dsn.public,
                 mask: params.replayOptions?.mask,
                 block: params.replayOptions?.block,
diff --git a/static/app/gettingStartedDocs/javascript-solid/utils.tsx b/static/app/gettingStartedDocs/javascript-solid/utils.tsx
index 9677c21d7f2a..5f66f23f73c9 100644
--- a/static/app/gettingStartedDocs/javascript-solid/utils.tsx
+++ b/static/app/gettingStartedDocs/javascript-solid/utils.tsx
@@ -9,11 +9,11 @@ import {getReplayConfigOptions} from 'sentry/components/onboarding/gettingStarte
 const getIntegrations = (params: DocsParams): string[] => {
   const integrations = [];
   if (params.isPerformanceSelected) {
-    integrations.push('Sentry.browserTracingIntegration()');
+    integrations.push(`Sentry.browserTracingIntegration()`);
   }
 
   if (params.isProfilingSelected) {
-    integrations.push('Sentry.browserProfilingIntegration()');
+    integrations.push(`Sentry.browserProfilingIntegration()`);
   }
 
   if (params.isReplaySelected) {
diff --git a/static/app/gettingStartedDocs/javascript-solidstart/utils.tsx b/static/app/gettingStartedDocs/javascript-solidstart/utils.tsx
index 36822ac1ca2b..a651614074f6 100644
--- a/static/app/gettingStartedDocs/javascript-solidstart/utils.tsx
+++ b/static/app/gettingStartedDocs/javascript-solidstart/utils.tsx
@@ -9,11 +9,11 @@ import {getReplayConfigOptions} from 'sentry/components/onboarding/gettingStarte
 const getIntegrations = (params: DocsParams): string[] => {
   const integrations = [];
   if (params.isPerformanceSelected) {
-    integrations.push('solidRouterBrowserTracingIntegration()');
+    integrations.push(`solidRouterBrowserTracingIntegration()`);
   }
 
   if (params.isProfilingSelected) {
-    integrations.push('Sentry.browserProfilingIntegration()');
+    integrations.push(`Sentry.browserProfilingIntegration()`);
   }
 
   if (params.isReplaySelected) {
@@ -106,7 +106,7 @@ export const installSnippetBlock: ContentBlock = {
     {
       label: 'pnpm',
       language: 'bash',
-      code: 'pnpm add @sentry/solidstart',
+      code: `pnpm add @sentry/solidstart`,
     },
   ],
 };
diff --git a/static/app/gettingStartedDocs/javascript-svelte/onboarding.tsx b/static/app/gettingStartedDocs/javascript-svelte/onboarding.tsx
index 7f394cd9d7ab..c8a8cceff898 100644
--- a/static/app/gettingStartedDocs/javascript-svelte/onboarding.tsx
+++ b/static/app/gettingStartedDocs/javascript-svelte/onboarding.tsx
@@ -26,7 +26,7 @@ const getVerifySnippet = (params: DocsParams, isVersion5: boolean) => {
   const errorCode =
     logsCode || metricsCode
       ? `${logsCode}${metricsCode}    throw new Error("This is your first error!");`
-      : 'throw new Error("This is your first error!")';
+      : `throw new Error("This is your first error!")`;
 
   return isVersion5
     ? `
diff --git a/static/app/gettingStartedDocs/javascript-svelte/utils.tsx b/static/app/gettingStartedDocs/javascript-svelte/utils.tsx
index 752d24aa979f..ae664b7b1fa0 100644
--- a/static/app/gettingStartedDocs/javascript-svelte/utils.tsx
+++ b/static/app/gettingStartedDocs/javascript-svelte/utils.tsx
@@ -9,11 +9,11 @@ import {getReplayConfigOptions} from 'sentry/components/onboarding/gettingStarte
 const getIntegrations = (params: DocsParams): string[] => {
   const integrations = [];
   if (params.isPerformanceSelected) {
-    integrations.push('Sentry.browserTracingIntegration()');
+    integrations.push(`Sentry.browserTracingIntegration()`);
   }
 
   if (params.isProfilingSelected) {
-    integrations.push('Sentry.browserProfilingIntegration()');
+    integrations.push(`Sentry.browserProfilingIntegration()`);
   }
 
   if (params.isReplaySelected) {
diff --git a/static/app/gettingStartedDocs/javascript-sveltekit/feedback.tsx b/static/app/gettingStartedDocs/javascript-sveltekit/feedback.tsx
index 457019abf8a0..211705944a51 100644
--- a/static/app/gettingStartedDocs/javascript-sveltekit/feedback.tsx
+++ b/static/app/gettingStartedDocs/javascript-sveltekit/feedback.tsx
@@ -50,7 +50,7 @@ export const feedback: OnboardingConfig = {
               label: 'JavaScript',
               language: 'javascript',
               code: getFeedbackSDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/sveltekit";',
+                importStatement: `import * as Sentry from "@sentry/sveltekit";`,
                 dsn: params.dsn.public,
                 feedbackOptions: params.feedbackOptions,
               }),
diff --git a/static/app/gettingStartedDocs/javascript-sveltekit/replay.tsx b/static/app/gettingStartedDocs/javascript-sveltekit/replay.tsx
index 49eb82d9c4d5..b92b7356d4e4 100644
--- a/static/app/gettingStartedDocs/javascript-sveltekit/replay.tsx
+++ b/static/app/gettingStartedDocs/javascript-sveltekit/replay.tsx
@@ -33,7 +33,7 @@ export const replay: OnboardingConfig = {
               label: 'JavaScript',
               language: 'javascript',
               code: getReplaySDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/sveltekit";',
+                importStatement: `import * as Sentry from "@sentry/sveltekit";`,
                 dsn: params.dsn.public,
                 mask: params.replayOptions?.mask,
                 block: params.replayOptions?.block,
diff --git a/static/app/gettingStartedDocs/javascript-vue/feedback.tsx b/static/app/gettingStartedDocs/javascript-vue/feedback.tsx
index 0e569a08b39f..eca28535c84c 100644
--- a/static/app/gettingStartedDocs/javascript-vue/feedback.tsx
+++ b/static/app/gettingStartedDocs/javascript-vue/feedback.tsx
@@ -47,7 +47,7 @@ export const feedback: OnboardingConfig<PlatformOptions> = {
               label: 'JavaScript',
               language: 'javascript',
               code: getFeedbackSDKSetupSnippet({
-                importStatement: 'import * as Sentry from "@sentry/vue";',
+                importStatement: `import * as Sentry from "@sentry/vue";`,
                 dsn: params.dsn.public,
                 feedbackOptions: params.feedbackOptions,
               }),
diff --git a/static/app/gettingStartedDocs/javascript-vue/utils.tsx b/static/app/gettingStartedDocs/javascript-vue/utils.tsx
index 873d03684a88..60ec884e207b 100644
--- a/static/app/gettingStartedDocs/javascript-vue/utils.tsx
+++ b/static/app/gettingStartedDocs/javascript-vue/utils.tsx
@@ -37,7 +37,7 @@ export type Params = DocsParams<PlatformOptions>;
 const getIntegrations = (params: Params): string[] => {
   const integrations = [];
   if (params.isPerformanceSelected) {
-    integrations.push('Sentry.browserTracingIntegration({ router })');
+    integrations.push(`Sentry.browserTracingIntegration({ router })`);
   }
 
   if (params.isReplaySelected) {
@@ -47,7 +47,7 @@ const getIntegrations = (params: Params): string[] => {
   }
 
   if (params.isProfilingSelected) {
-    integrations.push('Sentry.browserProfilingIntegration()');
+    integrations.push(`Sentry.browserProfilingIntegration()`);
   }
 
   if (params.isFeedbackSelected) {
diff --git a/static/app/gettingStartedDocs/javascript/featureFlag.tsx b/static/app/gettingStartedDocs/javascript/featureFlag.tsx
index bb85465dbd53..e78449fa3c7f 100644
--- a/static/app/gettingStartedDocs/javascript/featureFlag.tsx
+++ b/static/app/gettingStartedDocs/javascript/featureFlag.tsx
@@ -15,7 +15,7 @@ const FEATURE_FLAG_CONFIGURATION_MAP: Record<
   FeatureFlagConfiguration
 > = {
   [FeatureFlagProviderEnum.GENERIC]: {
-    integrationName: 'featureFlagsIntegration',
+    integrationName: `featureFlagsIntegration`,
     packageName: '',
     makeConfigureCode: (dsn: string) => `import * as Sentry from "@sentry/browser";
 
@@ -34,7 +34,7 @@ Sentry.captureException(new Error("Something went wrong!"));`,
   },
 
   [FeatureFlagProviderEnum.LAUNCHDARKLY]: {
-    integrationName: 'launchDarklyIntegration',
+    integrationName: `launchDarklyIntegration`,
     packageName: 'launchdarkly-js-client-sdk',
     makeConfigureCode: (dsn: string) => `import * as Sentry from "@sentry/browser";
 import * as LaunchDarkly from "launchdarkly-js-client-sdk";
@@ -56,7 +56,7 @@ Sentry.captureException(new Error("Something went wrong!"));`,
   },
 
   [FeatureFlagProviderEnum.OPENFEATURE]: {
-    integrationName: 'openFeatureIntegration',
+    integrationName: `openFeatureIntegration`,
     packageName: '@openfeature/web-sdk',
     makeConfigureCode: (dsn: string) => `import * as Sentry from "@sentry/browser";
 import { OpenFeature } from "@openfeature/web-sdk";
@@ -75,7 +75,7 @@ Sentry.captureException(new Error("Something went wrong!"));`,
   },
 
   [FeatureFlagProviderEnum.STATSIG]: {
-    integrationName: 'statsigIntegration',
+    integrationName: `statsigIntegration`,
     packageName: '@statsig/js-client',
     makeConfigureCode: (dsn: string) => `import * as Sentry from "@sentry/browser";
 import { StatsigClient } from "@statsig/js-client";
@@ -101,7 +101,7 @@ Sentry.captureException(new Error("something went wrong"));`,
   },
 
   [FeatureFlagProviderEnum.UNLEASH]: {
-    integrationName: 'unleashIntegration',
+    integrationName: `unleashIntegration`,
     packageName: 'unleash-proxy-client',
     makeConfigureCode: (dsn: string) => `import * as Sentry from "@sentry/browser";
 import { UnleashClient } from "unleash-proxy-client";
diff --git a/static/app/gettingStartedDocs/javascript/jsLoader.tsx b/static/app/gettingStartedDocs/javascript/jsLoader.tsx
index 3fc7e8abbba5..611472d0591b 100644
--- a/static/app/gettingStartedDocs/javascript/jsLoader.tsx
+++ b/static/app/gettingStartedDocs/javascript/jsLoader.tsx
@@ -86,7 +86,7 @@ window.sentryOnLoad = function () {
         {
           type: 'text',
           text: tct(
-            'For a full list of User Feedback configuration options, [link:read the docs].',
+            `For a full list of User Feedback configuration options, [link:read the docs].`,
             {
               link: (
                 <ExternalLink href="https://docs.sentry.io/platforms/javascript/user-feedback/configuration/" />
diff --git a/static/app/gettingStartedDocs/javascript/profiling.tsx b/static/app/gettingStartedDocs/javascript/profiling.tsx
index bba2aad2722f..fd3346ba3567 100644
--- a/static/app/gettingStartedDocs/javascript/profiling.tsx
+++ b/static/app/gettingStartedDocs/javascript/profiling.tsx
@@ -14,7 +14,7 @@ function BrowserProfilingBetaWarning() {
   return (
     <Alert variant="info" showIcon={false}>
       {tct(
-        'Browser profiling is currently in Beta as we wait for the JS Self Profiling spec to gain wider support. You can read the detailed explanation [explainer].',
+        `Browser profiling is currently in Beta as we wait for the JS Self Profiling spec to gain wider support. You can read the detailed explanation [explainer].`,
         {
           explainer: (
             <a href="https://docs.sentry.io/platforms/javascript/profiling/">
diff --git a/static/app/gettingStartedDocs/javascript/utils.tsx b/static/app/gettingStartedDocs/javascript/utils.tsx
index aedc3fb562d7..266ccfaf6ae9 100644
--- a/static/app/gettingStartedDocs/javascript/utils.tsx
+++ b/static/app/gettingStartedDocs/javascript/utils.tsx
@@ -50,11 +50,11 @@ export const isAutoInstall = (params: Params) =>
 const getIntegrations = (params: Params): string[] => {
   const integrations = [];
   if (params.isPerformanceSelected) {
-    integrations.push('Sentry.browserTracingIntegration()');
+    integrations.push(`Sentry.browserTracingIntegration()`);
   }
 
   if (params.isProfilingSelected) {
-    integrations.push('Sentry.browserProfilingIntegration()');
+    integrations.push(`Sentry.browserProfilingIntegration()`);
   }
 
   if (params.isReplaySelected) {
diff --git a/static/app/gettingStartedDocs/kotlin/onboarding.tsx b/static/app/gettingStartedDocs/kotlin/onboarding.tsx
index babf3c5b6cc0..ae12190d7c1d 100644
--- a/static/app/gettingStartedDocs/kotlin/onboarding.tsx
+++ b/static/app/gettingStartedDocs/kotlin/onboarding.tsx
@@ -129,7 +129,7 @@ export const onboarding: OnboardingConfig<PlatformOptions> = {
         {
           type: 'text',
           text: t(
-            'Install the SDK via %s:',
+            `Install the SDK via %s:`,
             packageManagerName[params.platformOptions.packageManager]
           ),
         },
@@ -145,7 +145,7 @@ export const onboarding: OnboardingConfig<PlatformOptions> = {
         {
           type: 'code',
           language: 'bash',
-          code: 'SENTRY_AUTH_TOKEN=___ORG_AUTH_TOKEN___',
+          code: `SENTRY_AUTH_TOKEN=___ORG_AUTH_TOKEN___`,
         },
         {
           type: 'conditional',
diff --git a/static/app/gettingStartedDocs/node/utils.tsx b/static/app/gettingStartedDocs/node/utils.tsx
index ae1f5d896833..d3e20e6b8d2a 100644
--- a/static/app/gettingStartedDocs/node/utils.tsx
+++ b/static/app/gettingStartedDocs/node/utils.tsx
@@ -104,8 +104,8 @@ export function getImport(
 
 function getProfilingImport(defaultMode?: 'esm' | 'cjs'): string {
   return defaultMode === 'esm'
-    ? 'import { nodeProfilingIntegration } from "@sentry/profiling-node";'
-    : 'const { nodeProfilingIntegration } = require("@sentry/profiling-node");';
+    ? `import { nodeProfilingIntegration } from "@sentry/profiling-node";`
+    : `const { nodeProfilingIntegration } = require("@sentry/profiling-node");`;
 }
 
 /**
diff --git a/static/app/gettingStartedDocs/php-laravel/onboarding.tsx b/static/app/gettingStartedDocs/php-laravel/onboarding.tsx
index 3b2e1b522c01..94e57f268a6c 100644
--- a/static/app/gettingStartedDocs/php-laravel/onboarding.tsx
+++ b/static/app/gettingStartedDocs/php-laravel/onboarding.tsx
@@ -59,7 +59,7 @@ export const onboarding: OnboardingConfig = {
         {
           type: 'code',
           language: 'bash',
-          code: 'composer require sentry/sentry-laravel',
+          code: `composer require sentry/sentry-laravel`,
         },
         ...(params.isProfilingSelected
           ? ([
diff --git a/static/app/gettingStartedDocs/php-laravel/profiling.tsx b/static/app/gettingStartedDocs/php-laravel/profiling.tsx
index 16790b09e2cc..eaf34cc47f0c 100644
--- a/static/app/gettingStartedDocs/php-laravel/profiling.tsx
+++ b/static/app/gettingStartedDocs/php-laravel/profiling.tsx
@@ -37,7 +37,7 @@ export const profiling: OnboardingConfig = {
         {
           type: 'code',
           language: 'bash',
-          code: 'composer require sentry/sentry-laravel',
+          code: `composer require sentry/sentry-laravel`,
         },
         {
           type: 'text',
diff --git a/static/app/gettingStartedDocs/playstation/onboarding.tsx b/static/app/gettingStartedDocs/playstation/onboarding.tsx
index 33a15945a3e9..39959e76b0ef 100644
--- a/static/app/gettingStartedDocs/playstation/onboarding.tsx
+++ b/static/app/gettingStartedDocs/playstation/onboarding.tsx
@@ -135,7 +135,7 @@ const onboardingRetail: OnboardingConfig = {
         {
           type: 'code',
           language: 'c',
-          code: 'os.name: PlayStation',
+          code: `os.name: PlayStation`,
         },
       ],
     },
diff --git a/static/app/gettingStartedDocs/python-aiohttp/onboarding.tsx b/static/app/gettingStartedDocs/python-aiohttp/onboarding.tsx
index 5c4dd32f9342..b9881d5e0b5d 100644
--- a/static/app/gettingStartedDocs/python-aiohttp/onboarding.tsx
+++ b/static/app/gettingStartedDocs/python-aiohttp/onboarding.tsx
@@ -133,7 +133,7 @@ web.run_app(app)
           type: 'text',
           text: [
             tct(
-              'When you point your browser to [localhostLInk:http://localhost:8080/] a transaction in the Performance section of Sentry will be created.',
+              `When you point your browser to [localhostLInk:http://localhost:8080/] a transaction in the Performance section of Sentry will be created.`,
               {
                 localhostLInk: <ExternalLink href="http://localhost:8080/" />,
               }
diff --git a/static/app/gettingStartedDocs/python/featureFlag.tsx b/static/app/gettingStartedDocs/python/featureFlag.tsx
index 5e5da98b1619..47dc7ad03822 100644
--- a/static/app/gettingStartedDocs/python/featureFlag.tsx
+++ b/static/app/gettingStartedDocs/python/featureFlag.tsx
@@ -16,7 +16,7 @@ const FEATURE_FLAG_CONFIGURATION_MAP: Record<
   FeatureFlagConfiguration
 > = {
   [FeatureFlagProviderEnum.GENERIC]: {
-    integrationName: '',
+    integrationName: ``,
     makeConfigureCode: (dsn: string) => `sentry_sdk.init(
     dsn="${dsn}",
     # Add data like request headers and IP for users, if applicable;
@@ -34,7 +34,7 @@ sentry_sdk.capture_exception(Exception("Something went wrong!"))`,
   },
 
   [FeatureFlagProviderEnum.LAUNCHDARKLY]: {
-    integrationName: 'LaunchDarklyIntegration',
+    integrationName: `LaunchDarklyIntegration`,
     makeConfigureCode: (dsn: string) => `import sentry_sdk
 from sentry_sdk.integrations.launchdarkly import LaunchDarklyIntegration
 import ldclient
@@ -54,7 +54,7 @@ sentry_sdk.capture_exception(Exception("Something went wrong!"))`,
   },
 
   [FeatureFlagProviderEnum.OPENFEATURE]: {
-    integrationName: 'OpenFeatureIntegration',
+    integrationName: `OpenFeatureIntegration`,
     makeConfigureCode: (dsn: string) => `import sentry_sdk
 from sentry_sdk.integrations.openfeature import OpenFeatureIntegration
 from openfeature import api
@@ -74,7 +74,7 @@ sentry_sdk.capture_exception(Exception("Something went wrong!"))`,
   },
 
   [FeatureFlagProviderEnum.STATSIG]: {
-    integrationName: 'StatsigIntegration',
+    integrationName: `StatsigIntegration`,
     makeConfigureCode: (dsn: string) => `import sentry_sdk
 from sentry_sdk.integrations.statsig import StatsigIntegration
 from statsig.statsig_user import StatsigUser
@@ -97,7 +97,7 @@ sentry_sdk.capture_exception(Exception("Something went wrong!"))`,
   },
 
   [FeatureFlagProviderEnum.UNLEASH]: {
-    integrationName: 'UnleashIntegration',
+    integrationName: `UnleashIntegration`,
     makeConfigureCode: (dsn: string) => `import sentry_sdk
 from sentry_sdk.integrations.unleash import UnleashIntegration
 from UnleashClient import UnleashClient
@@ -144,7 +144,7 @@ export const featureFlag: OnboardingConfig = {
             type: 'text',
             text:
               featureFlagOptions.integration === FeatureFlagProviderEnum.GENERIC
-                ? "You don't need an integration for a generic usecase. Simply use this API after initializing Sentry."
+                ? `You don't need an integration for a generic usecase. Simply use this API after initializing Sentry.`
                 : tct('Add [name] to your integrations list.', {
                     name: <code>{integrationName}</code>,
                   }),
diff --git a/static/app/gettingStartedDocs/python/utils.spec.tsx b/static/app/gettingStartedDocs/python/utils.spec.tsx
index a280fea4a05f..ed823304a2ec 100644
--- a/static/app/gettingStartedDocs/python/utils.spec.tsx
+++ b/static/app/gettingStartedDocs/python/utils.spec.tsx
@@ -10,17 +10,17 @@ describe('getPythonInstallCodeBlock', () => {
         {
           label: 'pip',
           language: 'bash',
-          code: 'pip install "sentry-sdk"',
+          code: `pip install "sentry-sdk"`,
         },
         {
           label: 'uv',
           language: 'bash',
-          code: 'uv add "sentry-sdk"',
+          code: `uv add "sentry-sdk"`,
         },
         {
           label: 'poetry',
           language: 'bash',
-          code: 'poetry add "sentry-sdk"',
+          code: `poetry add "sentry-sdk"`,
         },
       ],
     });
@@ -37,17 +37,17 @@ describe('getPythonInstallCodeBlock', () => {
         {
           label: 'pip',
           language: 'bash',
-          code: 'pip install --upgrade "sentry-sdk[with-extras]>=2.3.4"',
+          code: `pip install --upgrade "sentry-sdk[with-extras]>=2.3.4"`,
         },
         {
           label: 'uv',
           language: 'bash',
-          code: 'uv add --upgrade "sentry-sdk[with-extras]>=2.3.4"',
+          code: `uv add --upgrade "sentry-sdk[with-extras]>=2.3.4"`,
         },
         {
           label: 'poetry',
           language: 'bash',
-          code: 'poetry add "sentry-sdk[with-extras]>=2.3.4"',
+          code: `poetry add "sentry-sdk[with-extras]>=2.3.4"`,
         },
       ],
     });
@@ -63,17 +63,17 @@ describe('getPythonInstallCodeBlock', () => {
         {
           label: 'pip',
           language: 'bash',
-          code: 'pip install "sentry-sdk" "falcon"',
+          code: `pip install "sentry-sdk" "falcon"`,
         },
         {
           label: 'uv',
           language: 'bash',
-          code: 'uv add "sentry-sdk" "falcon"',
+          code: `uv add "sentry-sdk" "falcon"`,
         },
         {
           label: 'poetry',
           language: 'bash',
-          code: 'poetry add "sentry-sdk" "falcon"',
+          code: `poetry add "sentry-sdk" "falcon"`,
         },
       ],
     });
diff --git a/static/app/gettingStartedDocs/react-native/utils.tsx b/static/app/gettingStartedDocs/react-native/utils.tsx
index a65a3e8b86a8..c53110d95f4a 100644
--- a/static/app/gettingStartedDocs/react-native/utils.tsx
+++ b/static/app/gettingStartedDocs/react-native/utils.tsx
@@ -10,17 +10,17 @@ export const installCodeBlock: ContentBlock = {
     {
       label: 'npm',
       language: 'bash',
-      code: 'npm install @sentry/react-native@latest',
+      code: `npm install @sentry/react-native@latest`,
     },
     {
       label: 'yarn',
       language: 'bash',
-      code: 'yarn add @sentry/react-native@latest',
+      code: `yarn add @sentry/react-native@latest`,
     },
     {
       label: 'pnpm',
       language: 'bash',
-      code: 'pnpm add @sentry/react-native@latest',
+      code: `pnpm add @sentry/react-native@latest`,
     },
   ],
 };
diff --git a/static/app/gettingStartedDocs/ruby/logs.tsx b/static/app/gettingStartedDocs/ruby/logs.tsx
index 58d3e0e66864..4c17a8f3c8d9 100644
--- a/static/app/gettingStartedDocs/ruby/logs.tsx
+++ b/static/app/gettingStartedDocs/ruby/logs.tsx
@@ -93,7 +93,7 @@ logger.info("Sentry test log from stdlib logger")`,
         {
           type: 'code',
           language: 'ruby',
-          code: 'Sentry.logger.info("Test log from %{test_source}", test_source: "Sentry")',
+          code: `Sentry.logger.info("Test log from %{test_source}", test_source: "Sentry")`,
         },
       ],
     },
diff --git a/static/app/gettingStartedDocs/unreal/onboarding.tsx b/static/app/gettingStartedDocs/unreal/onboarding.tsx
index aaee846517e7..5d4fc4aa6ab3 100644
--- a/static/app/gettingStartedDocs/unreal/onboarding.tsx
+++ b/static/app/gettingStartedDocs/unreal/onboarding.tsx
@@ -301,7 +301,7 @@ export const onboarding: OnboardingConfig = {
         {
           type: 'code',
           language: 'bash',
-          code: 'export SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY=True',
+          code: `export SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY=True`,
         },
         {
           type: 'text',
diff --git a/static/app/icons/icons.stories.tsx b/static/app/icons/icons.stories.tsx
index 7f2f91f064a6..10c448c6a4ab 100644
--- a/static/app/icons/icons.stories.tsx
+++ b/static/app/icons/icons.stories.tsx
@@ -1866,7 +1866,7 @@ function IconCard(props: IconCardProps) {
   };
   snippets.all = `${snippets.import}\n\n${snippets.element}`;
   const labels = {
-    import: 'import statement',
+    import: `import statement`,
     element: props.icon.id,
   };
   const action: keyof typeof snippets = shift ? 'import' : 'element';
diff --git a/static/app/router/routes.tsx b/static/app/router/routes.tsx
index 24374f502616..5235efa27238 100644
--- a/static/app/router/routes.tsx
+++ b/static/app/router/routes.tsx
@@ -2030,7 +2030,7 @@ function buildRoutes(): RouteObject[] {
     },
     // Redirect old links to the new mcp landing page
     {
-      path: 'ai/mcp/',
+      path: `ai/mcp/`,
       redirectTo: `/${DOMAIN_VIEW_BASE_URL}/${MCP_LANDING_SUB_PATH}/`,
     },
     {
@@ -2093,7 +2093,7 @@ function buildRoutes(): RouteObject[] {
     },
     // Redirect old links to the new agents landing page
     {
-      path: 'ai/*',
+      path: `ai/*`,
       redirectTo: `/${DOMAIN_VIEW_BASE_URL}/${AGENTS_LANDING_SUB_PATH}/`,
     },
     {
diff --git a/static/app/stories/jsx.tsx b/static/app/stories/jsx.tsx
index b88708d9f7c5..a677c44ca6ee 100644
--- a/static/app/stories/jsx.tsx
+++ b/static/app/stories/jsx.tsx
@@ -19,7 +19,7 @@ export function JSXNode({name, props = {}, children}: JSXNodeProps) {
             <JSXProperty name={propName} value={value} />
           </Fragment>
         ))}
-        {'>'}
+        {`>`}
         <br />
         {children}
         <br />
@@ -35,7 +35,7 @@ export function JSXNode({name, props = {}, children}: JSXNodeProps) {
           <JSXProperty name={propName} value={value} />{' '}
         </Fragment>
       ))}
-      {'/>'}
+      {`/>`}
     </Code>
   );
 }
@@ -59,7 +59,7 @@ interface JSXPropertyProps {
 
 export function JSXProperty({name, value}: JSXPropertyProps) {
   if (name === 'children') {
-    return <code data-property="children">{'{children}'}</code>;
+    return <code data-property="children">{`{children}`}</code>;
   }
   if (value === null || value === undefined) {
     return <code data-property="nullish">{`${name}={${value}}`}</code>;
diff --git a/static/app/stories/view/storySearch.tsx b/static/app/stories/view/storySearch.tsx
index 0028b23058b4..78a3f9b2827a 100644
--- a/static/app/stories/view/storySearch.tsx
+++ b/static/app/stories/view/storySearch.tsx
@@ -9,7 +9,6 @@ import type {CollectionChildren} from '@react-types/shared';
 import {ListBox} from '@sentry/scraps/compactSelect';
 import {useHotkeys, Hotkey} from '@sentry/scraps/hotkey';
 import {InputGroup} from '@sentry/scraps/input';
-import {Flex} from '@sentry/scraps/layout';
 import {Text} from '@sentry/scraps/text';
 
 import {Overlay} from 'sentry/components/overlay';
@@ -210,7 +209,7 @@ function SearchComboBox(props: SearchComboBoxProps) {
     onInputChange: setInputValue,
     defaultFilter: filter,
     shouldCloseOnBlur: true,
-    allowsEmptyCollection: true,
+    allowsEmptyCollection: false,
     onSelectionChange: handleSelectionChange,
   });
 
@@ -234,51 +233,23 @@ function SearchComboBox(props: SearchComboBoxProps) {
       <SearchInput ref={inputRef} placeholder={props.label} {...inputProps} />
       {state.isOpen && (
         <StyledOverlay placement="bottom-start" ref={popoverRef}>
-          {state.collection.size === 0 ? (
-            inputValue.length === 0 ? (
-              <SearchEmpty />
-            ) : (
-              <SearchNotFound inputValue={inputValue} />
-            )
-          ) : (
-            <ListBox
-              size="sm"
-              virtualized
-              listState={state}
-              hasSearch={!!state.inputValue}
-              overlayIsOpen={state.isOpen}
-              {...listBoxProps}
-              className="story-search-results"
-            >
-              {props.children}
-            </ListBox>
-          )}
+          <ListBox
+            size="sm"
+            virtualized
+            listState={state}
+            hasSearch={!!state.inputValue}
+            overlayIsOpen={state.isOpen}
+            {...listBoxProps}
+            style={{maxHeight: 320, minHeight: 132}}
+          >
+            {props.children}
+          </ListBox>
         </StyledOverlay>
       )}
     </StorySearchContainer>
   );
 }
 
-function SearchEmpty() {
-  return (
-    <Flex align="center" justify="start" padding="lg">
-      <Text variant="muted" size="sm">
-        {t('Type to search stories...')}
-      </Text>
-    </Flex>
-  );
-}
-
-function SearchNotFound({inputValue}: {inputValue: string}) {
-  return (
-    <Flex align="center" justify="start" padding="lg">
-      <Text variant="muted" size="sm">
-        {t('No stories match "%s"', inputValue)}
-      </Text>
-    </Flex>
-  );
-}
-
 const StorySearchContainer = styled('div')`
   position: relative;
   width: 320px;
@@ -288,21 +259,23 @@ const StorySearchContainer = styled('div')`
 `;
 
 const StyledOverlay = styled(Overlay)`
-  position: absolute;
-  top: 100%;
-  left: 0;
+  overflow: hidden;
+  position: fixed;
+  top: 48px;
+  left: 256px;
   width: 320px;
 
+  max-height: 320px;
+  min-height: 132px;
+  > div {
+    max-height: 320px !important;
+    min-height: 132px !important;
+  }
+
   /* Make section headers darker in this component */
   p[id][aria-hidden='true'] {
     color: ${p => p.theme.tokens.content.primary};
   }
-
-  .story-search-results {
-    max-height: 320px;
-    min-height: 64px;
-    padding-block-end: calc(${p => p.theme.space.md} + 1px);
-  }
 `;
 
 function getStoryTreeNodeFromKey(
diff --git a/static/app/stories/view/useStory.tsx b/static/app/stories/view/useStory.tsx
index fc441d8d1118..3a21052a4d0e 100644
--- a/static/app/stories/view/useStory.tsx
+++ b/static/app/stories/view/useStory.tsx
@@ -11,7 +11,7 @@ export type StoryExports = StoryDescriptor['exports'];
 export function useStory() {
   const context = useContext(StoryContext);
   if (!context.story) {
-    throw new Error('Wrap useStory in a StoryContext.Provider');
+    throw new Error(`Wrap useStory in a StoryContext.Provider`);
   }
   return context as Required<StoryContextValue>;
 }
diff --git a/static/app/types/group.tsx b/static/app/types/group.tsx
index 7a837dd4ec48..8cd5a8d7fde3 100644
--- a/static/app/types/group.tsx
+++ b/static/app/types/group.tsx
@@ -523,18 +523,9 @@ type SuggestedOwner = {
   type: SuggestedOwnerReason;
 };
 
-/**
- * Mirrors OwnershipRuleOwnerResponse from the backend
- */
-interface OwnershipRuleOwner {
-  name: string;
-  type: 'user' | 'team';
-  id?: string;
-}
-
 export interface ParsedOwnershipRule {
   matcher: {pattern: string; type: string};
-  owners: OwnershipRuleOwner[];
+  owners: Actor[];
 }
 
 export type IssueOwnership = {
diff --git a/static/app/types/legacyReactRouter.tsx b/static/app/types/legacyReactRouter.tsx
index b916699f9f07..b8fc7ac98741 100644
--- a/static/app/types/legacyReactRouter.tsx
+++ b/static/app/types/legacyReactRouter.tsx
@@ -1,4 +1,3 @@
-import type {UIMatch} from 'react-router-dom';
 /**
  * These are vendored from react-router v3
  *
@@ -72,7 +71,6 @@ export interface WithRouterProps<P = Record<string, string | undefined>, Q = any
 
 export interface RouteContextInterface<P = Record<string, string | undefined>, Q = any> {
   location: Location<Q>;
-  matches: Array<UIMatch<unknown, unknown>>;
   params: P;
   router: InjectedRouter<P, Q>;
   routes: PlainRoute[];
diff --git a/static/app/utils/api/useAggregatedQueryKeys.spec.tsx b/static/app/utils/api/useAggregatedQueryKeys.spec.tsx
index 73af0cbfa780..54dbfacca448 100644
--- a/static/app/utils/api/useAggregatedQueryKeys.spec.tsx
+++ b/static/app/utils/api/useAggregatedQueryKeys.spec.tsx
@@ -40,7 +40,7 @@ describe('useAggregatedQueryKeys', () => {
 
   it('should convert multiple buffer calls into one fetch request after a timeout', async () => {
     const mockRequest = MockApiClient.addMockResponse({
-      url: '/api-tokens/',
+      url: `/api-tokens/`,
       body: {
         '1111': 5,
         '2222': 7,
@@ -61,7 +61,7 @@ describe('useAggregatedQueryKeys', () => {
     });
 
     expect(mockRequest).toHaveBeenCalledWith(
-      '/api-tokens/',
+      `/api-tokens/`,
       expect.objectContaining({
         query: expect.arrayContaining(['1111', '2222', '3333']),
       })
@@ -70,7 +70,7 @@ describe('useAggregatedQueryKeys', () => {
 
   it('should send a fetch request immediatly if the buffer is full', async () => {
     const mockRequest = MockApiClient.addMockResponse({
-      url: '/api-tokens/',
+      url: `/api-tokens/`,
     });
 
     const {result} = renderHook(useAggregatedQueryKeys, {
@@ -92,7 +92,7 @@ describe('useAggregatedQueryKeys', () => {
   it('should return cached data right away, if it exists in the cache', async () => {
     const queryClient = makeTestQueryClient();
     MockApiClient.addMockResponse({
-      url: '/api-tokens/',
+      url: `/api-tokens/`,
       body: {
         '1111': 5,
         '2222': 7,
@@ -139,7 +139,7 @@ describe('useAggregatedQueryKeys', () => {
       '1111': 5,
     };
     MockApiClient.addMockResponse({
-      url: '/api-tokens/',
+      url: `/api-tokens/`,
       body: mockResponse,
     });
 
@@ -165,7 +165,7 @@ describe('useAggregatedQueryKeys', () => {
   it('should separate callsites that have different cacheKeys', async () => {
     const wrapper = makeWrapper(makeTestQueryClient());
     const mockRequest = MockApiClient.addMockResponse({
-      url: '/api-tokens/',
+      url: `/api-tokens/`,
     });
     const responseReducer1 = jest.fn((prevState: any, response: ApiResult) => {
       return {
diff --git a/static/app/utils/demoMode/guides.tsx b/static/app/utils/demoMode/guides.tsx
index 1b537066c87d..8cd5ea128373 100644
--- a/static/app/utils/demoMode/guides.tsx
+++ b/static/app/utils/demoMode/guides.tsx
@@ -79,35 +79,35 @@ export function getDemoModeGuides(): GuidesContent {
           title: t('Projects'),
           target: 'projects',
           description: t(
-            'Create a project for any type of application you want to monitor.'
+            `Create a project for any type of application you want to monitor.`
           ),
         },
         {
           title: t('Issues'),
           target: 'issues',
           description: t(
-            "Here's a list of what's broken and slow. Sentry automatically groups similar events together into an issue."
+            `Here's a list of what's broken and slow. Sentry automatically groups similar events together into an issue.`
           ),
         },
         {
           title: t('Performance'),
           target: 'performance',
           description: t(
-            'Keep a pulse on crash rates, throughput, and latency issues across projects.'
+            `Keep a pulse on crash rates, throughput, and latency issues across projects.`
           ),
         },
         {
           title: t('Releases'),
           target: 'releases',
           description: t(
-            'Track the health of every release, see differences between releases from crash analytics to adoption rates.'
+            `Track the health of every release, see differences between releases from crash analytics to adoption rates.`
           ),
         },
         {
           title: t('Discover'),
           target: 'discover',
           description: t(
-            'Query and unlock insights into the health of your entire system and get answers to critical business questions all in one place.'
+            `Query and unlock insights into the health of your entire system and get answers to critical business questions all in one place.`
           ),
           nextText: t('Got it'),
         },
diff --git a/static/app/utils/discover/eventView.tsx b/static/app/utils/discover/eventView.tsx
index f6f83cb65252..d7855bfc1660 100644
--- a/static/app/utils/discover/eventView.tsx
+++ b/static/app/utils/discover/eventView.tsx
@@ -1275,7 +1275,7 @@ export class EventView {
 
     return {
       pathname: makeDiscoverPathname({
-        path: '/results/',
+        path: `/results/`,
         organization,
       }),
       query: cloneDeep(output),
diff --git a/static/app/utils/discover/fieldRenderers.spec.tsx b/static/app/utils/discover/fieldRenderers.spec.tsx
index 6df41b1a9c03..ab1f7b057aed 100644
--- a/static/app/utils/discover/fieldRenderers.spec.tsx
+++ b/static/app/utils/discover/fieldRenderers.spec.tsx
@@ -420,7 +420,7 @@ describe('getFieldRenderer', () => {
 
     expect(screen.queryByRole('link')).toHaveAttribute(
       'href',
-      '/organizations/org-slug/issues/123214/'
+      `/organizations/org-slug/issues/123214/`
     );
     expect(screen.getByText('SENTRY-T6P')).toBeInTheDocument();
   });
diff --git a/static/app/utils/discover/fieldRenderers.tsx b/static/app/utils/discover/fieldRenderers.tsx
index a4d71dc670ea..3631fd0f3115 100644
--- a/static/app/utils/discover/fieldRenderers.tsx
+++ b/static/app/utils/discover/fieldRenderers.tsx
@@ -1193,7 +1193,7 @@ const SPECIAL_FUNCTIONS: SpecialFunctions = {
       <TimeSpentCell
         percentage={data[fieldName]}
         total={data[`sum(${column})`]}
-        op={data['span.op']}
+        op={data[`span.op`]}
       />
     );
   },
diff --git a/static/app/utils/discover/genericDiscoverQuery.tsx b/static/app/utils/discover/genericDiscoverQuery.tsx
index a5bef762d094..b0668f774041 100644
--- a/static/app/utils/discover/genericDiscoverQuery.tsx
+++ b/static/app/utils/discover/genericDiscoverQuery.tsx
@@ -230,7 +230,7 @@ class _GenericDiscoverQuery<T, P> extends Component<Props<T, P>, State<T>> {
     }
 
     const url = `/organizations/${orgSlug}/${route}/`;
-    const tableFetchID = Symbol('tableFetchID');
+    const tableFetchID = Symbol(`tableFetchID`);
     const apiPayload: Partial<EventQuery & LocationQuery> = getPayload(this.props);
 
     this.setState({isLoading: true, tableFetchID});
diff --git a/static/app/utils/discover/urls.tsx b/static/app/utils/discover/urls.tsx
index 8d743f9dd123..6ae69b04acb2 100644
--- a/static/app/utils/discover/urls.tsx
+++ b/static/app/utils/discover/urls.tsx
@@ -134,19 +134,19 @@ export function eventDetailsRouteWithEventView({
 export function getDiscoverLandingUrl(organization: Organization): string {
   if (organization.features.includes('discover-query')) {
     return makeDiscoverPathname({
-      path: '/homepage/',
+      path: `/homepage/`,
       organization,
     });
   }
   return makeDiscoverPathname({
-    path: '/results/',
+    path: `/results/`,
     organization,
   });
 }
 
 export function getDiscoverQueriesUrl(organization: Organization): string {
   return makeDiscoverPathname({
-    path: '/queries/',
+    path: `/queries/`,
     organization,
   });
 }
diff --git a/static/app/utils/formatters.spec.tsx b/static/app/utils/formatters.spec.tsx
index e49e56a667fb..b49e8c1ad8b9 100644
--- a/static/app/utils/formatters.spec.tsx
+++ b/static/app/utils/formatters.spec.tsx
@@ -171,13 +171,13 @@ describe('userDisplayName', () => {
   it('should show unknown author, if author or email is just whitespace', () => {
     expect(
       userDisplayName({
-        name: '\t\n ',
+        name: `\t\n `,
       })
     ).toBe('Unknown author');
 
     expect(
       userDisplayName({
-        email: '\t\n ',
+        email: `\t\n `,
       })
     ).toBe('Unknown author');
   });
diff --git a/static/app/utils/getRouteStringFromRoutes.spec.tsx b/static/app/utils/getRouteStringFromRoutes.spec.tsx
index 8400c6d0420c..5b6f79514de5 100644
--- a/static/app/utils/getRouteStringFromRoutes.spec.tsx
+++ b/static/app/utils/getRouteStringFromRoutes.spec.tsx
@@ -1,54 +1,16 @@
-import type {UIMatch} from 'react-router-dom';
-
 import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
 
 describe('getRouteStringFromRoutes', () => {
-  const matches: Array<UIMatch<unknown, unknown>> = [
-    {
-      handle: {path: '/'},
-      id: '1',
-      pathname: '/',
-      params: {},
-      data: {},
-    },
-    {
-      handle: {path: '/:orgId/'},
-      id: '2',
-      pathname: '/:orgId/',
-      params: {},
-      data: {},
-    },
-    {
-      handle: undefined,
-      id: '3',
-      pathname: 'this should be skipped',
-      params: {},
-      data: {},
-    },
-    {
-      handle: {path: '/organizations/:orgId/'},
-      id: '4',
-      pathname: '/organizations/:orgId/',
-      params: {},
-      data: {},
-    },
-    {
-      id: '6',
-      handle: undefined,
-      pathname: 'also skipped',
-      params: {},
-      data: {},
-    },
-    {
-      handle: {path: 'api-keys/', name: 'API Key'},
-      id: '5',
-      pathname: 'api-keys/',
-      params: {},
-      data: {},
-    },
+  const routes = [
+    {path: '/'},
+    {path: '/:orgId/'},
+    {name: 'this should be skipped'},
+    {path: '/organizations/:orgId/'},
+    {name: 'also skipped'},
+    {path: 'api-keys/', name: 'API Key'},
   ];
 
   it('can get a route string from routes array and skips routes that do not have a path', () => {
-    expect(getRouteStringFromRoutes({matches})).toBe('/organizations/:orgId/api-keys/');
+    expect(getRouteStringFromRoutes(routes)).toBe('/organizations/:orgId/api-keys/');
   });
 });
diff --git a/static/app/utils/getRouteStringFromRoutes.tsx b/static/app/utils/getRouteStringFromRoutes.tsx
index b5985e61c909..4dd0c7ff0293 100644
--- a/static/app/utils/getRouteStringFromRoutes.tsx
+++ b/static/app/utils/getRouteStringFromRoutes.tsx
@@ -1,41 +1,17 @@
-import type {UIMatch} from 'react-router-dom';
-
 import type {PlainRoute} from 'sentry/types/legacyReactRouter';
 
 type RouteWithPath = Omit<PlainRoute, 'path'> & Required<Pick<PlainRoute, 'path'>>;
 
-export type Props =
-  | {
-      matches?: never;
-      routes?: PlainRoute[];
-    }
-  | {
-      matches?: Array<UIMatch<unknown, unknown>>;
-      routes?: never;
-    };
-
 /**
  * Creates a route string from an array of `routes` from react-router
  *
  * It will look for the last route path that begins with a `/` and
  * concatenate all of the following routes. Skips any routes without a path
  *
- * @param params.matches An array of UIMatch objects from react-router-dom `useMatches()`
- * @returns A route path string
+ * @param {Array<{}>} routes An array of route objects from react-router
+ * @return String Returns a route path
  */
-export function getRouteStringFromRoutes({routes, matches}: Props): string {
-  if (matches) {
-    // Route patterns are stored in handle.path by useRoutes (not in pathname,
-    // which is the resolved URL with params filled in).
-    const paths = matches
-      .map(match => (match.handle as any)?.path ?? '')
-      .filter((path): path is string => !!path);
-
-    const lastAbsolutePathIndex = paths.findLastIndex(path => path.startsWith('/'));
-
-    return paths.slice(lastAbsolutePathIndex).join('');
-  }
-
+export function getRouteStringFromRoutes(routes?: PlainRoute[]): string {
   if (!Array.isArray(routes)) {
     return '';
   }
diff --git a/static/app/utils/marked/marked.spec.tsx b/static/app/utils/marked/marked.spec.tsx
index e16291316a6e..f5fb91e14db2 100644
--- a/static/app/utils/marked/marked.spec.tsx
+++ b/static/app/utils/marked/marked.spec.tsx
@@ -84,13 +84,13 @@ describe('marked', () => {
 
   it('allows custom html within code blocks', () => {
     expect(sanitizedMarked('```html\n<div>Hello</div>\n```')).toBe(
-      '<pre><code class="language-html">&lt;div&gt;Hello&lt;/div&gt;\n</code></pre>\n'
+      `<pre><code class="language-html">&lt;div&gt;Hello&lt;/div&gt;\n</code></pre>\n`
     );
     expect(sanitizedMarked('```tsx\n<div>Hello</div>\n```')).toBe(
-      '<pre><code class="language-tsx">&lt;div&gt;Hello&lt;/div&gt;\n</code></pre>\n'
+      `<pre><code class="language-tsx">&lt;div&gt;Hello&lt;/div&gt;\n</code></pre>\n`
     );
     expect(sanitizedMarked('```jsx\n<Component>Hello</Component>\n```')).toBe(
-      '<pre><code class="language-jsx">&lt;Component&gt;Hello&lt;/Component&gt;\n</code></pre>\n'
+      `<pre><code class="language-jsx">&lt;Component&gt;Hello&lt;/Component&gt;\n</code></pre>\n`
     );
   });
 
@@ -111,9 +111,9 @@ describe('marked', () => {
   it('single line renderer should not render paragraphs', () => {
     expect(singleLineRenderer('foo')).toBe('foo');
     expect(sanitizedMarked('foo')).toBe('<p>foo</p>\n');
-    expect(singleLineRenderer('Reading `file.py`')).toBe('Reading <code>file.py</code>');
+    expect(singleLineRenderer('Reading `file.py`')).toBe(`Reading <code>file.py</code>`);
     expect(sanitizedMarked('Reading `file.py`')).toBe(
-      '<p>Reading <code>file.py</code></p>\n'
+      `<p>Reading <code>file.py</code></p>\n`
     );
   });
 
@@ -143,7 +143,7 @@ describe('marked', () => {
   it('does not render syntax highlighting via sanitizedMarked', () => {
     const markdown = '```javascript\nconst x = 1;\n```';
     expect(sanitizedMarked(markdown)).toBe(
-      '<pre><code class="language-javascript">const x = 1;\n</code></pre>\n'
+      `<pre><code class="language-javascript">const x = 1;\n</code></pre>\n`
     );
   });
 
@@ -232,14 +232,14 @@ describe('marked', () => {
   it('renders syntax highlighting via asyncSanitizedMarked', async () => {
     const markdown = '```javascript\nconst x = 1;\n```';
     expect(await asyncSanitizedMarked(markdown)).toBe(
-      '<pre><code class="language-javascript"><span class="token keyword">const</span> x <span class="token operator">=</span> <span class="token number">1</span><span class="token punctuation">;</span>\n</code></pre>'
+      `<pre><code class="language-javascript"><span class="token keyword">const</span> x <span class="token operator">=</span> <span class="token number">1</span><span class="token punctuation">;</span>\n</code></pre>`
     );
   });
 
   it('renders unknown language code blocks as plaintext via asyncSanitizedMarked', async () => {
     const markdown = '```unknown\nconst x = 1;\n```';
     expect(await asyncSanitizedMarked(markdown)).toBe(
-      '<pre><code class="language-unknown">const x = 1;\n</code></pre>'
+      `<pre><code class="language-unknown">const x = 1;\n</code></pre>`
     );
   });
 });
diff --git a/static/app/utils/marked/markedText.stories.tsx b/static/app/utils/marked/markedText.stories.tsx
index d14497ad29ff..de768182bb79 100644
--- a/static/app/utils/marked/markedText.stories.tsx
+++ b/static/app/utils/marked/markedText.stories.tsx
@@ -64,7 +64,7 @@ export default Storybook.story('MarkedText', (story, _APIReference) => {
       <Fragment>
         <p>Markdown lists are supported:</p>
         <Storybook.SizingWindow display="block">
-          <MarkedText text={'- Item 1\n- Item 2\n- Item 3'} />
+          <MarkedText text={`- Item 1\n- Item 2\n- Item 3`} />
         </Storybook.SizingWindow>
       </Fragment>
     );
@@ -76,9 +76,7 @@ export default Storybook.story('MarkedText', (story, _APIReference) => {
         <p>Markdown code blocks are supported:</p>
         <Storybook.SizingWindow display="block">
           <MarkedText
-            text={
-              '```jsx\nconst example = "code block";\nconsole.log(example);\nconst el = <Component>Hello</Component>;\n```'
-            }
+            text={`\`\`\`jsx\nconst example = "code block";\nconsole.log(example);\nconst el = <Component>Hello</Component>;\n\`\`\``}
           />
         </Storybook.SizingWindow>
       </Fragment>
diff --git a/static/app/utils/performanceForSentry/index.tsx b/static/app/utils/performanceForSentry/index.tsx
index a8683b1c3a4e..d7a2d8e10c00 100644
--- a/static/app/utils/performanceForSentry/index.tsx
+++ b/static/app/utils/performanceForSentry/index.tsx
@@ -544,7 +544,7 @@ const addSlowAppInit = (transaction: TransactionEvent) => {
       s.start_timestamp < appInitSpan.start_timestamp
   );
   longTaskSpans.forEach(s => {
-    s.op = 'ui.long-task.app-init';
+    s.op = `ui.long-task.app-init`;
   });
   if (longTaskSpans.length) {
     const sum = longTaskSpans.reduce(
diff --git a/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx b/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx
index f6d7c8ecef15..642e0e6c1f23 100644
--- a/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx
+++ b/static/app/utils/profiling/flamegraph/flamegraphTheme.tsx
@@ -234,7 +234,7 @@ export const makeLightFlamegraphTheme = (theme: Theme): FlamegraphTheme => {
 
       // Special states
       FOCUSED_FRAME_BORDER_COLOR: theme.tokens.focus.default,
-      HIGHLIGHTED_LABEL_COLOR: 'rgba(240, 240, 0, 1)',
+      HIGHLIGHTED_LABEL_COLOR: `rgba(240, 240, 0, 1)`,
       HOVERED_FRAME_BORDER_COLOR: theme.tokens.border.transparent.neutral.vibrant,
       SELECTED_FRAME_BORDER_COLOR: theme.tokens.graphics.accent.vibrant,
 
diff --git a/static/app/utils/profiling/frame.spec.tsx b/static/app/utils/profiling/frame.spec.tsx
index d1ae06df213c..8e41b3cbd34b 100644
--- a/static/app/utils/profiling/frame.spec.tsx
+++ b/static/app/utils/profiling/frame.spec.tsx
@@ -42,7 +42,7 @@ describe('Frame', () => {
           name: 'foo',
           line: undefined,
           column: undefined,
-          file: 'bar.js',
+          file: `bar.js`,
         },
         'javascript'
       ).is_browser_extension
diff --git a/static/app/utils/profiling/gl/utils.spec.tsx b/static/app/utils/profiling/gl/utils.spec.tsx
index 3ccde5481c32..971f51a8a327 100644
--- a/static/app/utils/profiling/gl/utils.spec.tsx
+++ b/static/app/utils/profiling/gl/utils.spec.tsx
@@ -51,7 +51,7 @@ describe('upperBound', () => {
     [[-3, -2, -1], -2, 1],
     [[1, 2, 3], 10, 3],
     [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 5, 4],
-  ])('inserts %p', (args, target, insert) => {
+  ])(`inserts %p`, (args, target, insert) => {
     expect(
       upperBound(
         target,
@@ -77,7 +77,7 @@ describe('lowerBound', () => {
     [[-3, -2, -1], -1, 1],
     [[1, 2, 3], 10, 3],
     [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 5, 3],
-  ])('inserts %p', (args, target, insert) => {
+  ])(`inserts %p`, (args, target, insert) => {
     expect(
       lowerBound(
         target,
@@ -171,7 +171,7 @@ describe('createShader', () => {
   it('successfully compiles', () => {
     const shader: WebGLShader = {};
     const type = 0;
-    const shaderSource = 'vec4(1.0, 0.0, 0.0, 1.0)';
+    const shaderSource = `vec4(1.0, 0.0, 0.0, 1.0)`;
 
     const ctx: Partial<WebGLRenderingContext> = {
       createShader: jest.fn().mockImplementation(() => shader),
@@ -192,7 +192,7 @@ describe('createShader', () => {
   it('deletes shader if compilation fails', () => {
     const shader: WebGLShader = {};
     const type = 0;
-    const shaderSource = 'vec4(1.0, 0.0, 0.0, 1.0)';
+    const shaderSource = `vec4(1.0, 0.0, 0.0, 1.0)`;
 
     const ctx: Partial<WebGLRenderingContext> = {
       createShader: jest.fn().mockImplementation(() => shader),
@@ -493,7 +493,7 @@ describe('computeHighlightedBounds', () => {
     },
   ];
 
-  it.each(testTable)('$name', ({args, expected}) => {
+  it.each(testTable)(`$name`, ({args, expected}) => {
     const value = computeHighlightedBounds(args.bounds as Fuse.RangeTuple, args.trim);
     expect(value).toEqual(expected);
   });
diff --git a/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx b/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx
index affe261a204b..b8d32674f217 100644
--- a/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx
+++ b/static/app/utils/profiling/hooks/useProfileEvents.spec.tsx
@@ -26,9 +26,8 @@ describe('useProfileEvents', () => {
       body,
       match: [
         MockApiClient.matchQuery({
-          dataset: 'spans',
-          query:
-            'is_transaction:true (has:profile.id OR (has:profiler.id has:thread.id)) (transaction:foo)',
+          dataset: 'discover',
+          query: '(has:profile.id OR (has:profiler.id has:thread.id)) (transaction:foo)',
         }),
       ],
     });
@@ -55,7 +54,7 @@ describe('useProfileEvents', () => {
       url: `/organizations/${organization.slug}/events/`,
       status: 400,
       statusCode: 400,
-      match: [MockApiClient.matchQuery({dataset: 'spans'})],
+      match: [MockApiClient.matchQuery({dataset: 'discover'})],
     });
 
     const {result} = renderHookWithProviders(useProfileEvents, {
diff --git a/static/app/utils/profiling/hooks/useProfileEvents.tsx b/static/app/utils/profiling/hooks/useProfileEvents.tsx
index e27c43eb11b5..e16464aa3df5 100644
--- a/static/app/utils/profiling/hooks/useProfileEvents.tsx
+++ b/static/app/utils/profiling/hooks/useProfileEvents.tsx
@@ -35,11 +35,11 @@ export function useProfileEvents<F extends string>({
   const organization = useOrganization();
   const {selection} = usePageFilters();
 
-  query = `is_transaction:true (has:profile.id OR (has:profiler.id has:thread.id)) ${query ? `(${query})` : ''}`;
+  query = `(has:profile.id OR (has:profiler.id has:thread.id)) ${query ? `(${query})` : ''}`;
 
   const endpointOptions = {
     query: {
-      dataset: 'spans',
+      dataset: 'discover',
       referrer,
       project: projects || selection.projects,
       environment: selection.environments,
@@ -88,4 +88,5 @@ type ProfilingFieldType =
   | 'p75()'
   | 'p95()'
   | 'p99()'
-  | 'count()';
+  | 'count()'
+  | 'last_seen()';
diff --git a/static/app/utils/profiling/platforms.tsx b/static/app/utils/profiling/platforms.tsx
index e87dfeeb65a8..20e4febd1412 100644
--- a/static/app/utils/profiling/platforms.tsx
+++ b/static/app/utils/profiling/platforms.tsx
@@ -177,11 +177,11 @@ export function getProfilingDocsForPlatform(platform: string | undefined): strin
   }
 
   if (docsPlatform === 'react-native') {
-    return 'https://docs.sentry.io/platforms/react-native/profiling/';
+    return `https://docs.sentry.io/platforms/react-native/profiling/`;
   }
 
   if (docsPlatform === 'java-spring-boot') {
-    return 'https://docs.sentry.io/platforms/java/guides/spring-boot/profiling/';
+    return `https://docs.sentry.io/platforms/java/guides/spring-boot/profiling/`;
   }
 
   const [language, framework] = docsPlatform.split('-');
diff --git a/static/app/utils/profiling/renderers/flamegraphRendererWebGL.spec.tsx b/static/app/utils/profiling/renderers/flamegraphRendererWebGL.spec.tsx
index 8a2ddfd57fd7..4c234ffeb169 100644
--- a/static/app/utils/profiling/renderers/flamegraphRendererWebGL.spec.tsx
+++ b/static/app/utils/profiling/renderers/flamegraphRendererWebGL.spec.tsx
@@ -106,8 +106,8 @@ describe('flamegraphRendererWebGL', () => {
   });
 
   it('inits shaders', () => {
-    const VERTEX = 'void main() { gl_Position = vec4(pos, 0.0, 1.0); }';
-    const FRAGMENT = 'void main() { gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0); }';
+    const VERTEX = `void main() { gl_Position = vec4(pos, 0.0, 1.0); }`;
+    const FRAGMENT = `void main() { gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0); }`;
 
     const context = makeContextMock({
       createShader: jest.fn().mockReturnValueOnce(VERTEX).mockReturnValueOnce(FRAGMENT),
diff --git a/static/app/utils/profiling/uiFrames.spec.tsx b/static/app/utils/profiling/uiFrames.spec.tsx
index 072da04a21d7..fa67d2ebfdce 100644
--- a/static/app/utils/profiling/uiFrames.spec.tsx
+++ b/static/app/utils/profiling/uiFrames.spec.tsx
@@ -34,7 +34,7 @@ describe('UIFrames', () => {
     [{unit: 'nanoseconds', values: [{elapsed: 0, value: 1}]}, undefined],
     [undefined, undefined],
   ])(
-    'does not throw',
+    `does not throw`,
     (
       slow: ConstructorParameters<typeof UIFrames>[0]['slow'],
       frozen: ConstructorParameters<typeof UIFrames>[0]['frozen']
diff --git a/static/app/utils/profiling/units/unit.spec.ts b/static/app/utils/profiling/units/unit.spec.ts
index 8e1d9de5a922..a3744c4ba0b2 100644
--- a/static/app/utils/profiling/units/unit.spec.ts
+++ b/static/app/utils/profiling/units/unit.spec.ts
@@ -21,19 +21,19 @@ describe('makeTimelineFormatter', () => {
 
   it('nanojoules', () => {
     const formatter = makeFormatter('nanojoules');
-    expect(formatter(1e9)).toBe('1.00J');
-    expect(formatter(1e12)).toBe('1.00kJ');
-    expect(formatter(1e15)).toBe('1.00MJ');
-    expect(formatter(1e18)).toBe('1.00GJ');
+    expect(formatter(1e9)).toBe(`1.00J`);
+    expect(formatter(1e12)).toBe(`1.00kJ`);
+    expect(formatter(1e15)).toBe(`1.00MJ`);
+    expect(formatter(1e18)).toBe(`1.00GJ`);
   });
 
   it('watts', () => {
     const formatter = makeFormatter('watt');
-    expect(formatter(0.1)).toBe('0.10W');
-    expect(formatter(1)).toBe('1.00W');
-    expect(formatter(1e3)).toBe('1.00kW');
-    expect(formatter(1e6)).toBe('1.00MW');
-    expect(formatter(1e9)).toBe('1.00GW');
+    expect(formatter(0.1)).toBe(`0.10W`);
+    expect(formatter(1)).toBe(`1.00W`);
+    expect(formatter(1e3)).toBe(`1.00kW`);
+    expect(formatter(1e6)).toBe(`1.00MW`);
+    expect(formatter(1e9)).toBe(`1.00GW`);
   });
 
   it('formats s', () => {
diff --git a/static/app/utils/replays/hooks/useLoadReplayReader.spec.tsx b/static/app/utils/replays/hooks/useLoadReplayReader.spec.tsx
index 911823c852ad..db9b7a8c4f72 100644
--- a/static/app/utils/replays/hooks/useLoadReplayReader.spec.tsx
+++ b/static/app/utils/replays/hooks/useLoadReplayReader.spec.tsx
@@ -32,7 +32,7 @@ describe('useLoadReplayReader', () => {
     const {result} = renderHookWithProviders(useLoadReplayReader, {
       initialProps: {
         orgSlug: organization.slug,
-        replaySlug: '123',
+        replaySlug: `123`,
       },
     });
 
diff --git a/static/app/utils/replays/hooks/useShareReplayAtTimestamp.tsx b/static/app/utils/replays/hooks/useShareReplayAtTimestamp.tsx
index 6bcb495ab528..6be379ee12e3 100644
--- a/static/app/utils/replays/hooks/useShareReplayAtTimestamp.tsx
+++ b/static/app/utils/replays/hooks/useShareReplayAtTimestamp.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useState} from 'react';
-import {useMatches} from 'react-router-dom';
 import styled from '@emotion/styled';
 
 import {Input} from '@sentry/scraps/input';
@@ -13,15 +12,16 @@ import {t} from 'sentry/locale';
 import {formatSecondsToClock} from 'sentry/utils/duration/formatSecondsToClock';
 import {parseClockToSeconds} from 'sentry/utils/duration/parseClockToSeconds';
 import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
+import {useRoutes} from 'sentry/utils/useRoutes';
 
 function ShareModal({currentTimeSec, Header, Body}: any) {
-  const matches = useMatches();
+  const routes = useRoutes();
   const [customSeconds, setSeconds] = useState(currentTimeSec);
   const [shareMode, setShareMode] = useState<'current' | 'user'>('current');
 
   const url = new URL(window.location.href);
   const {searchParams} = url;
-  searchParams.set('referrer', getRouteStringFromRoutes({matches}));
+  searchParams.set('referrer', getRouteStringFromRoutes(routes));
   searchParams.set(
     't',
     shareMode === 'user' ? String(customSeconds) : String(currentTimeSec)
diff --git a/static/app/utils/resolveRoute.spec.tsx b/static/app/utils/resolveRoute.spec.tsx
index d314244437df..03243a9abf1b 100644
--- a/static/app/utils/resolveRoute.spec.tsx
+++ b/static/app/utils/resolveRoute.spec.tsx
@@ -110,10 +110,10 @@ describe('resolveRoute', () => {
     ConfigStore.set('customerDomain', {
       subdomain: otherOrg.slug,
       organizationUrl: `https://${otherOrg.slug}.sentry.io`,
-      sentryUrl: 'https://sentry.io',
+      sentryUrl: `https://sentry.io`,
     });
 
     const result = resolveRoute(`/organizations/${otherOrg.slug}/issues/`, otherOrg);
-    expect(result).toBe('/issues/');
+    expect(result).toBe(`/issues/`);
   });
 });
diff --git a/static/app/utils/sqlish.tsx b/static/app/utils/sqlish.tsx
deleted file mode 100644
index 247a949a1643..000000000000
--- a/static/app/utils/sqlish.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Thin wrapper around @sentry/sqlish that adds Sentry observability
- * (performance spans and error capture with fingerprinting on parse failures)
- * and re-adds `toSimpleMarkup()` which the npm package doesn't include as a
- * class method — it ships `simpleMarkup` as a standalone function from
- * `@sentry/sqlish/react` instead.
- */
-import * as Sentry from '@sentry/react';
-import {SQLishFormatter as BaseSQLishFormatter, SQLishParser} from '@sentry/sqlish';
-import {simpleMarkup} from '@sentry/sqlish/react';
-
-type StringFormatterOptions = Parameters<BaseSQLishFormatter['toString']>[1];
-
-export class SQLishFormatter {
-  private formatter: BaseSQLishFormatter;
-  private parser: SQLishParser;
-
-  constructor() {
-    this.formatter = new BaseSQLishFormatter();
-    this.parser = new SQLishParser();
-  }
-
-  toString(sql: string, options?: StringFormatterOptions): string {
-    return this._withSentry('string', () => this.formatter.toString(sql, options), sql);
-  }
-
-  toSimpleMarkup(sql: string): React.ReactElement[] {
-    return this._withSentry(
-      'simpleMarkup',
-      () => simpleMarkup(this.parser.parse(sql)),
-      sql
-    );
-  }
-
-  private _withSentry<T>(format: string, fn: () => T, sql: string): T {
-    const sentrySpan = Sentry.startInactiveSpan({
-      op: 'function',
-      name: 'SQLishFormatter.toFormat',
-      attributes: {format},
-      onlyIfParent: true,
-    });
-
-    try {
-      const result = fn();
-      return result;
-    } catch (error: any) {
-      Sentry.withScope(scope => {
-        const fingerprint = ['sqlish-parse-error'];
-
-        if (error?.message) {
-          scope.setExtra('message', error.message?.slice(-100));
-          scope.setExtra('found', error.found);
-
-          if (error.message.includes('Expected')) {
-            fingerprint.push(error.message.slice(-10));
-          }
-        }
-
-        scope.setFingerprint(fingerprint);
-        Sentry.captureException(error);
-      });
-
-      // If we fail to parse the SQL, return the original string
-      return sql as unknown as T;
-    } finally {
-      sentrySpan?.end();
-    }
-  }
-}
diff --git a/static/app/utils/sqlish/SQLishFormatter.spec.tsx b/static/app/utils/sqlish/SQLishFormatter.spec.tsx
new file mode 100644
index 000000000000..2cdefb948fcf
--- /dev/null
+++ b/static/app/utils/sqlish/SQLishFormatter.spec.tsx
@@ -0,0 +1,148 @@
+import {Fragment} from 'react';
+
+import {render} from 'sentry-test/reactTestingLibrary';
+
+import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
+
+describe('SQLishFormatter', () => {
+  describe('SQLishFormatter.toString()', () => {
+    const formatter = new SQLishFormatter();
+
+    it('Falls back to original string if unable to parse', () => {
+      expect(formatter.toString('😤')).toBe('😤');
+    });
+
+    it('Adds newlines for keywords in SELECTs', () => {
+      expect(formatter.toString('SELECT hello FROM users ORDER BY name DESC LIMIT 1;'))
+        .toMatchInlineSnapshot(`
+        "SELECT hello
+        FROM users
+        ORDER BY name DESC
+        LIMIT 1;"
+      `);
+    });
+
+    it('Adds newlines for keywords in INSERTs', () => {
+      expect(
+        formatter.toString('INSERT INTO users (id, name) VALUES (:c0, :c1) RETURNING *')
+      ).toMatchInlineSnapshot(`
+        "INSERT INTO users (id, name)
+        VALUES (
+          :c0, :c1
+        )
+        RETURNING *"
+      `);
+    });
+
+    it('Adds indentation for keywords followed by parentheses', () => {
+      expect(formatter.toString('SELECT * FROM (SELECT * FROM users))'))
+        .toMatchInlineSnapshot(`
+        "SELECT *
+        FROM (
+          SELECT *
+          FROM users
+        ))"
+      `);
+    });
+
+    it('Capitalizes lowercase keywords', () => {
+      expect(formatter.toString('select * from users;')).toMatchInlineSnapshot(`
+        "SELECT *
+        FROM users;"
+      `);
+    });
+
+    it('Adds indentation for SELECTS in conditions', () => {
+      expect(
+        formatter.toString(
+          'SELECT * FROM "sentry_users" WHERE (id IN (SELECT VO."id" FROM "sentry_vips" VO LIMIT 1)) AND (id IN (SELECT V1."id" FROM "sentry_currentusers" V1 LIMIT 1)) LIMIT 1'
+        )
+      ).toMatchInlineSnapshot(`
+        "SELECT *
+        FROM "sentry_users"
+        WHERE (
+          id IN (
+            SELECT VO."id"
+            FROM "sentry_vips" VO
+            LIMIT 1
+          )
+        ) AND (id IN (
+          SELECT V1."id"
+          FROM "sentry_currentusers" V1
+          LIMIT 1
+        ))
+        LIMIT 1"
+      `);
+    });
+
+    it('Reflows long lines to a max length', () => {
+      expect(
+        formatter.toString(
+          'SELECT "sentry_organization"."id", "sentry_organization"."name", "sentry_organization"."slug", "sentry_organization"."status", "sentry_organization"."date_added", "sentry_organization"."default_role", "sentry_organization"."is_test", "sentry_organization"."flags" FROM "sentry_organization" WHERE "sentry_organization"."id" = %s LIMIT 21'
+        )
+      ).toMatchInlineSnapshot(`
+        "SELECT "sentry_organization"."id", "sentry_organization"."name", "sentry_organization"."slug",
+          "sentry_organization"."status", "sentry_organization"."date_added",
+          "sentry_organization"."default_role", "sentry_organization"."is_test", "sentry_organization"."flags"
+        FROM "sentry_organization"
+        WHERE "sentry_organization"."id" = %s
+        LIMIT 21"
+      `);
+    });
+
+    it('Reflows to specified width', () => {
+      expect(
+        formatter.toString(
+          'SELECT "sentry_organization"."id", "sentry_organization"."name", "sentry_organization"."slug", "sentry_organization"."status", "sentry_organization"."date_added" FROM "sentry_organization" WHERE "sentry_organization"."id" = %s LIMIT 21',
+          {maxLineLength: 40}
+        )
+      ).toMatchInlineSnapshot(`
+        "SELECT "sentry_organization"."id",
+          "sentry_organization"."name",
+          "sentry_organization"."slug",
+          "sentry_organization"."status",
+          "sentry_organization"."date_added"
+        FROM "sentry_organization"
+        WHERE "sentry_organization"."id" = %s
+        LIMIT 21"
+      `);
+    });
+
+    it('Reflows avoid unnecessary newlines', () => {
+      expect(
+        formatter.toString(
+          'SELECT "sentry_team"."org_role" FROM "sentry_team" INNER JOIN "sentry_organizationmember_teams" ON ("sentry_team"."id" = "sentry_organizationmember_teams"."team_id" WHERE ( "sentry_organizationmember_teams"."organizationmember_id" = %s AND NOT ("sentry_team"."org_role" IS NULL)'
+        )
+      ).toMatchInlineSnapshot(`
+        "SELECT "sentry_team"."org_role"
+        FROM "sentry_team"
+        INNER JOIN "sentry_organizationmember_teams" ON ("sentry_team"."id" =
+          "sentry_organizationmember_teams"."team_id"
+        WHERE (
+           "sentry_organizationmember_teams"."organizationmember_id" = %s AND NOT ("sentry_team"."org_role" IS
+            NULL)"
+      `);
+    });
+  });
+
+  describe('SQLishFormatter.toSimpleMarkup()', () => {
+    const formatter = new SQLishFormatter();
+    const getMarkup = (markup: any): string => {
+      const {container} = render(<Fragment>{markup}</Fragment>);
+
+      return container.innerHTML;
+    };
+
+    it('Capitalizes keywords', () => {
+      expect(getMarkup(formatter.toSimpleMarkup('select hello'))).toMatchInlineSnapshot(
+        `"<b>SELECT</b><span> </span><span>hello</span>"`
+      );
+    });
+
+    it('Wraps every token in a `<span>` element', () => {
+      expect(getMarkup(formatter.toSimpleMarkup('SELECT hello;'))).toMatchInlineSnapshot(
+        `"<b>SELECT</b><span> </span><span>hello;</span>"`
+      );
+    });
+  });
+});
diff --git a/static/app/utils/sqlish/SQLishFormatter.tsx b/static/app/utils/sqlish/SQLishFormatter.tsx
new file mode 100644
index 000000000000..c31726e5ec79
--- /dev/null
+++ b/static/app/utils/sqlish/SQLishFormatter.tsx
@@ -0,0 +1,82 @@
+import * as Sentry from '@sentry/react';
+
+import {simpleMarkup} from 'sentry/utils/sqlish/formatters/simpleMarkup';
+import {string} from 'sentry/utils/sqlish/formatters/string';
+import {SQLishParser} from 'sentry/utils/sqlish/SQLishParser';
+
+type StringFormatterOptions = Parameters<typeof string>[1];
+
+enum Format {
+  STRING = 'string',
+  SIMPLE_MARKUP = 'simpleMarkup',
+}
+
+const FORMATTERS = {
+  [Format.STRING]: string,
+  [Format.SIMPLE_MARKUP]: simpleMarkup,
+};
+
+export class SQLishFormatter {
+  parser: SQLishParser;
+
+  constructor() {
+    this.parser = new SQLishParser();
+  }
+
+  toString(sql: string, options?: StringFormatterOptions) {
+    return this.toFormat(sql, Format.STRING, options);
+  }
+
+  toSimpleMarkup(sql: string) {
+    return this.toFormat(sql, Format.SIMPLE_MARKUP);
+  }
+
+  toFormat(sql: string, format: Format.STRING, options?: StringFormatterOptions): string;
+  toFormat(sql: string, format: Format.SIMPLE_MARKUP): React.ReactElement[];
+  toFormat(sql: string, format: Format, options?: StringFormatterOptions) {
+    let tokens: any;
+
+    const sentrySpan = Sentry.startInactiveSpan({
+      op: 'function',
+      name: 'SQLishFormatter.toFormat',
+      attributes: {
+        format,
+      },
+      onlyIfParent: true,
+    });
+
+    try {
+      tokens = this.parser.parse(sql);
+    } catch (error: any) {
+      Sentry.withScope(scope => {
+        const fingerprint = ['sqlish-parse-error'];
+
+        if (error?.message) {
+          // The error message might be a PEG grammar error, or some kind of
+          // other parser error. They're usually too long to be useful since PEG
+          // errors contain the entire current grammar. Take the last 100
+          // characters instead.
+          scope.setExtra('message', error.message?.slice(-100));
+          scope.setExtra('found', error.found);
+
+          // Grammar error. Group these by the specific missing grammar, so we
+          // can make case-by-case decisions whether we should amend the
+          // grammar.
+          if (error.message.includes('Expected')) {
+            fingerprint.push(error.message.slice(-10));
+          }
+        }
+
+        scope.setFingerprint(fingerprint);
+        Sentry.captureException(error);
+      });
+      // If we fail to parse the SQL, return the original string
+      return sql;
+    }
+
+    const formattedString = FORMATTERS[format](tokens, options);
+    sentrySpan?.end();
+
+    return formattedString;
+  }
+}
diff --git a/static/app/utils/sqlish/SQLishParser.spec.tsx b/static/app/utils/sqlish/SQLishParser.spec.tsx
new file mode 100644
index 000000000000..a9d21e73421e
--- /dev/null
+++ b/static/app/utils/sqlish/SQLishParser.spec.tsx
@@ -0,0 +1,116 @@
+import {SQLishParser} from 'sentry/utils/sqlish/SQLishParser';
+
+describe('SQLishParser', () => {
+  describe('SQLishParser()', () => {
+    const parser = new SQLishParser();
+
+    it.each([
+      'SELECT;',
+      'SELECT hello;',
+      'SELECT *;', // Wildcards
+      'WHERE age = 10;', // Equality
+      'WHERE age != 10;', // Inequality
+      'total / time', // Division
+      'sum(age)::numeric(0, 5)', // Type casting
+      'WHERE age > 10 AND age < 20;', // Comparison
+      "WHERE$1 ILIKE ' % ' || 'text'", // Conditionals
+      'SELECT id, name;', // Column lists
+      'columns AS `tags[column]`', // ClickHouse backtics
+      'SELECT * FROM #temp', // Temporary tables
+      '# Fetches', // Comments
+      '\r\n', // Windows newlines
+      '✌🏻', // Emoji
+      'ă', // Unicode
+      `\u0000`, // Unicode null
+      'SELECT id, nam*', // Truncation
+      'AND created >= :c1', // PHP-Style I
+      'LIMIT $2', // PHP-style II
+      'created >= %s', // Python-style
+      'created >= $1', // Rails-style
+      '@@ to_tsquery', // Postgres full-text search
+      'flags & %s)', // Bitwise AND
+      'flags | %s)', // Bitwise OR
+      'flags ^ %s)', // Bitwise XOR
+      'flags ~ %s)', // Bitwise NOT
+      'FROM temp{%s}', // Relay integer stripping
+      '+ %s as count', // Arithmetic I
+      '- %s as count', // Arithmetic II
+      "ILIKE '\\_')", // Backslash
+    ])('Parses %s', sql => {
+      expect(() => {
+        parser.parse(sql);
+      }).not.toThrow();
+    });
+  });
+
+  describe('SQLishParser.parse', () => {
+    const parser = new SQLishParser();
+
+    it('Distinguishes between real keywords and interpolated words', () => {
+      expect(parser.parse('SELECT country')).toEqual([
+        {
+          type: 'Keyword',
+          content: 'SELECT',
+        },
+        {
+          type: 'Whitespace',
+          content: ' ',
+        },
+        {
+          type: 'GenericToken',
+          content: 'country',
+        },
+      ]);
+
+      expect(parser.parse('SELECT discount')).toEqual([
+        {
+          type: 'Keyword',
+          content: 'SELECT',
+        },
+        {
+          type: 'Whitespace',
+          content: ' ',
+        },
+        {
+          type: 'GenericToken',
+          content: 'discount',
+        },
+      ]);
+    });
+
+    it('Detects collapsed columns', () => {
+      expect(parser.parse('select ..')).toEqual([
+        {
+          type: 'Keyword',
+          content: 'SELECT',
+        },
+        {
+          type: 'Whitespace',
+          content: ' ',
+        },
+        {
+          type: 'CollapsedColumns',
+          content: '..',
+        },
+      ]);
+    });
+
+    it('Detects whitespace between generic tokens and JOIN commands', () => {
+      expect(parser.parse('sentry_users INNER JOIN sentry_messages')).toEqual([
+        {
+          type: 'GenericToken',
+          content: 'sentry_users',
+        },
+        {type: 'Whitespace', content: ' '},
+        {type: 'Keyword', content: 'INNER'},
+        {type: 'Whitespace', content: ' '},
+        {type: 'Keyword', content: 'JOIN'},
+        {type: 'Whitespace', content: ' '},
+        {
+          type: 'GenericToken',
+          content: 'sentry_messages',
+        },
+      ]);
+    });
+  });
+});
diff --git a/static/app/utils/sqlish/SQLishParser.ts b/static/app/utils/sqlish/SQLishParser.ts
new file mode 100644
index 000000000000..917b23c06466
--- /dev/null
+++ b/static/app/utils/sqlish/SQLishParser.ts
@@ -0,0 +1,9 @@
+import type {Token} from 'sentry/utils/sqlish/types';
+
+import {parse} from './sqlish.pegjs';
+
+export class SQLishParser {
+  parse(sql: string) {
+    return parse(sql) as Token[];
+  }
+}
diff --git a/static/app/utils/sqlish/formatters/simpleMarkup.tsx b/static/app/utils/sqlish/formatters/simpleMarkup.tsx
new file mode 100644
index 000000000000..fa3a0e2a16c4
--- /dev/null
+++ b/static/app/utils/sqlish/formatters/simpleMarkup.tsx
@@ -0,0 +1,27 @@
+import type {Token} from 'sentry/utils/sqlish/types';
+
+export function simpleMarkup(tokens: Token[]): React.ReactElement[] {
+  const accumulator: React.ReactElement[] = [];
+
+  function contentize(token: Token, index: number): void {
+    if (Array.isArray(token.content)) {
+      token.content.forEach(contentize);
+      return;
+    }
+
+    if (typeof token.content === 'string') {
+      if (token.type === 'Keyword') {
+        accumulator.push(<b key={index}>{token.content.toUpperCase()}</b>);
+      } else if (token.type === 'Whitespace') {
+        accumulator.push(<span key={index}> </span>);
+      } else {
+        accumulator.push(<span key={index}>{token.content}</span>);
+      }
+    }
+
+    return;
+  }
+
+  tokens.forEach(contentize);
+  return accumulator;
+}
diff --git a/static/app/utils/sqlish/formatters/string.ts b/static/app/utils/sqlish/formatters/string.ts
new file mode 100644
index 000000000000..b8a66b5ae4af
--- /dev/null
+++ b/static/app/utils/sqlish/formatters/string.ts
@@ -0,0 +1,98 @@
+import {StringAccumulator} from 'sentry/utils/sqlish/formatters/stringAccumulator';
+import type {Token} from 'sentry/utils/sqlish/types';
+
+interface Options {
+  maxLineLength?: number;
+}
+
+export function string(tokens: Token[], options: Options = {}): string {
+  const accumulator = new StringAccumulator();
+
+  let precedingNonWhitespaceToken: Token | undefined = undefined;
+  let parenthesisLevel = 0; // Tracks the current parenthesis nesting level
+  const indentationLevels: number[] = []; // Tracks the parenthesis nesting levels at which we've incremented the indentation
+
+  function contentize(token: Token): void {
+    if (Array.isArray(token.content)) {
+      token.content.forEach(contentize);
+      return;
+    }
+
+    if (token.type === 'LeftParenthesis') {
+      parenthesisLevel += 1;
+      accumulator.add('(');
+
+      // If the previous legible token is a meaningful keyword that triggers a
+      // newline, increase the current indentation level and note the parenthesis level where this happened
+      if (
+        typeof precedingNonWhitespaceToken?.content === 'string' &&
+        PARENTHESIS_NEWLINE_KEYWORDS.has(precedingNonWhitespaceToken.content)
+      ) {
+        accumulator.break();
+
+        accumulator.indent();
+        indentationLevels.push(parenthesisLevel);
+      }
+    }
+
+    if (token.type === 'RightParenthesis') {
+      // If this right parenthesis closes a left parenthesis at a level where
+      // we incremented the indentation, decrement the indentation
+      if (indentationLevels.at(-1) === parenthesisLevel) {
+        accumulator.break();
+        accumulator.unindent();
+        indentationLevels.pop();
+      }
+
+      parenthesisLevel -= 1;
+      accumulator.add(')');
+    }
+
+    if (typeof token.content === 'string') {
+      if (token.type === 'Keyword' && NEWLINE_KEYWORDS.has(token.content)) {
+        if (!accumulator.lastLine.isEmpty) {
+          accumulator.break();
+        }
+
+        accumulator.add(token.content);
+      } else if (token.type === 'Whitespace') {
+        // Convert all whitespace to single spaces
+        accumulator.space();
+      } else if (['LeftParenthesis', 'RightParenthesis'].includes(token.type)) {
+        // Parenthesis contents are appended above, so we can skip them here
+      } else {
+        accumulator.add(token.content);
+      }
+    }
+
+    if (token.type !== 'Whitespace') {
+      precedingNonWhitespaceToken = token;
+    }
+
+    return;
+  }
+
+  tokens.forEach(contentize);
+  return accumulator.toString(options.maxLineLength);
+}
+
+// Keywords that always trigger a newline
+const NEWLINE_KEYWORDS = new Set([
+  'DELETE',
+  'FROM',
+  'GROUP',
+  'INNER',
+  'INSERT',
+  'LEFT',
+  'LIMIT',
+  'OFFSET',
+  'ORDER',
+  'RETURNING',
+  'RIGHT',
+  'SELECT',
+  'VALUES',
+  'WHERE',
+]);
+
+// Keywords that may or may not trigger a newline, but they always trigger a newlines if followed by a parenthesis
+const PARENTHESIS_NEWLINE_KEYWORDS = new Set([...NEWLINE_KEYWORDS, ...['IN']]);
diff --git a/static/app/utils/sqlish/formatters/stringAccumulator.ts b/static/app/utils/sqlish/formatters/stringAccumulator.ts
new file mode 100644
index 000000000000..63042a105dac
--- /dev/null
+++ b/static/app/utils/sqlish/formatters/stringAccumulator.ts
@@ -0,0 +1,122 @@
+export class StringAccumulator {
+  lines: Line[];
+
+  constructor() {
+    this.lines = [new Line()];
+  }
+
+  get lastLine(): Line {
+    return this.lines.at(-1) as Line;
+  }
+
+  add(token: string) {
+    if (!token) {
+      return;
+    }
+
+    this.lastLine.add(token);
+  }
+
+  space() {
+    this.lastLine.add(SPACE);
+  }
+
+  break() {
+    const newLine = new Line();
+    newLine.indentTo(this.lastLine.indentation);
+
+    this.lines.push(newLine);
+  }
+
+  indent() {
+    this.lastLine.indent();
+  }
+
+  unindent() {
+    this.lastLine.unindent();
+  }
+
+  indentTo(level = 1) {
+    this.lastLine.indentTo(level);
+  }
+
+  toString(maxLineLength: number = DEFAULT_MAX_LINE_LENGTH) {
+    let output: Line[] = [];
+
+    this.lines.forEach(line => {
+      if (line.textLength <= maxLineLength) {
+        output.push(line);
+        return;
+      }
+
+      const splitLines: Line[] = [new Line([], line.indentation)];
+      let tokenIndex = 0;
+
+      while (tokenIndex < line.tokens.length) {
+        const incomingToken = line.tokens.at(tokenIndex) as string;
+
+        const totalLength = (splitLines.at(-1) as Line).textLength + incomingToken.length;
+
+        if (totalLength <= maxLineLength) {
+          splitLines.at(-1)?.add(incomingToken);
+        } else {
+          splitLines.push(new Line([incomingToken], line.indentation + 1));
+        }
+
+        tokenIndex += 1;
+      }
+
+      output = [...output, ...splitLines.filter(splitLine => !splitLine.isEmpty)];
+    });
+
+    return output.join(NEWLINE).trim();
+  }
+}
+
+const DEFAULT_MAX_LINE_LENGTH = 100;
+
+class Line {
+  tokens: string[];
+  indentation: number;
+
+  constructor(tokens: string[] = [], indentation = 0) {
+    this.tokens = tokens;
+    this.indentation = indentation;
+  }
+
+  get isEmpty() {
+    return this.toString().trim() === '';
+  }
+
+  get length() {
+    return this.toString().length;
+  }
+
+  get textLength() {
+    return this.toString().trim().length;
+  }
+
+  add(token: string) {
+    this.tokens.push(token);
+  }
+
+  indent() {
+    this.indentation += 1;
+  }
+
+  unindent() {
+    this.indentation -= 1;
+  }
+
+  indentTo(level: number) {
+    this.indentation = level;
+  }
+
+  toString() {
+    return `${INDENTATION.repeat(this.indentation)}${this.tokens.join('').trimEnd()}`;
+  }
+}
+
+const SPACE = ' ';
+const INDENTATION = '  ';
+const NEWLINE = '\n';
diff --git a/static/app/utils/sqlish/sqlish.pegjs b/static/app/utils/sqlish/sqlish.pegjs
new file mode 100644
index 000000000000..9c52e0107c7b
--- /dev/null
+++ b/static/app/utils/sqlish/sqlish.pegjs
@@ -0,0 +1,46 @@
+Expression
+   = tokens:Token*
+
+Token
+  = LeftParenthesis / RightParenthesis / Whitespace / Keyword / Parameter / CollapsedColumns / GenericToken
+
+LeftParenthesis
+  = "(" { return { type: 'LeftParenthesis', content: '(' } }
+
+RightParenthesis
+  = ")" { return { type: 'RightParenthesis', content: ')' } }
+
+Keyword
+  = Keyword:("ADD"i / "ALL"i / "ALTER"i / "AND"i / "ANY"i / "AS"i / "ASC"i / "BACKUP"i / "BETWEEN"i / "BY"i / "CASE"i / "CHECK"i / "COLUMN"i / "CONSTRAINT"i / "COUNT"i / "CREATE"i / "DATABASE"i / "DEFAULT"i / "DELETE"i / "DESC"i / "DISTINCT"i / "DROP"i / "EXEC"i / "EXISTS"i / "FOREIGN"i / "FROM"i / "FROM"i / "FULL"i / "GROUP"i / "HAVING"i / "INNER"i / "INSERT"i / "JOIN"i / "KEY"i / "LEFT"i / "LIMIT"i / "OFFSET"i / "ON"i / "ORDER"i / "OUTER"i / "RETURNING"i / "RIGHT"i / "SELECT"i / "SELECT"i / "SET"i / "TABLE"i / "UPDATE"i / "VALUES"i / "WHERE"i / JoinKeyword) & (Whitespace / LeftParenthesis / RightParenthesis) {
+  return { type: 'Keyword', content: Keyword.toUpperCase() }
+}
+
+JoinKeyword
+  = JoinDirection:JoinDirection? Whitespace? JoinType:JoinType? Whitespace "JOIN"i {
+  return (JoinDirection || '') + (JoinDirection ? " " : '') + JoinType + " " + "JOIN"
+}
+
+JoinDirection
+  = "LEFT"i / "RIGHT"i / "FULL"i
+
+JoinType
+  = "OUTER"i / "INNER"i
+
+Parameter
+  = Parameter:("%s" / ":c" [0-9]) { return { type: 'Parameter', content: Array.isArray(Parameter) ? Parameter.join('') : Parameter } }
+
+CollapsedColumns
+  = ".." { return { type: 'CollapsedColumns', content: '..' } }
+
+Whitespace
+  = Whitespace:[\n\t\r ]+ { return { type: 'Whitespace', content: Whitespace.join("") } }
+
+// \u0000-\u001F are C0 Unicode control characters which sometimes sneak into
+// strings, especially \u0000 which is Unicode null. I added support for a few
+// just to prevent exceptions.
+// \u00A0-\uFFFF is the entire Unicode BMP _including_ surrogate pairs and
+// unassigned code points, which aren't parse-able naively. A more precise
+// approach would be to define all valid Unicode ranges exactly but for
+// permissive parsing we don't mind the lack of precision.
+GenericToken
+  = GenericToken:[a-zA-Z0-9\u0000-\u0006\u00A0-\uFFFF"'`_\-.=><:,*;!\[\]?$%|/\\@#&~^+{}]+ { return { type: 'GenericToken', content: GenericToken.join('') } }
diff --git a/static/app/utils/sqlish/types.ts b/static/app/utils/sqlish/types.ts
new file mode 100644
index 000000000000..6e4d7fd5e19d
--- /dev/null
+++ b/static/app/utils/sqlish/types.ts
@@ -0,0 +1,11 @@
+export interface Token {
+  type:
+    | 'LeftParenthesis'
+    | 'RightParenthesis'
+    | 'Whitespace'
+    | 'Keyword'
+    | 'Parameter'
+    | 'CollapsedColumns'
+    | 'GenericToken';
+  content?: string | Token | Token[];
+}
diff --git a/static/app/utils/timeSeries/timeSeriesItemToEChartsDataPoint.tsx b/static/app/utils/timeSeries/timeSeriesItemToEChartsDataPoint.tsx
index fa3bbd0993d6..146517e04c90 100644
--- a/static/app/utils/timeSeries/timeSeriesItemToEChartsDataPoint.tsx
+++ b/static/app/utils/timeSeries/timeSeriesItemToEChartsDataPoint.tsx
@@ -11,4 +11,4 @@ export function timeSeriesItemToEChartsDataPoint(
 
 // ECharts has a special value to represent missing data, it doesn't nicely
 // support `null` or `undefined`
-export const ECHARTS_MISSING_DATA_VALUE = '-';
+export const ECHARTS_MISSING_DATA_VALUE = `-`;
diff --git a/static/app/utils/url/safeURL.spec.tsx b/static/app/utils/url/safeURL.spec.tsx
index 9d81a3187e00..b4724ee964c3 100644
--- a/static/app/utils/url/safeURL.spec.tsx
+++ b/static/app/utils/url/safeURL.spec.tsx
@@ -7,7 +7,7 @@ describe('safeURL', () => {
     globalThis.URL = nativeConstructor;
   });
 
-  describe('invalid argument types', () => {
+  describe(`invalid argument types`, () => {
     it('does not throw on unknown input', () => {
       expect(() => safeURL('/')).not.toThrow();
       expect(() => safeURL('/', 'bad_base')).not.toThrow();
@@ -24,7 +24,7 @@ describe('safeURL', () => {
     });
   });
 
-  describe('valid argument values', () => {
+  describe(`valid argument values`, () => {
     it('returns a new URL object', () => {
       expect(safeURL('https://example.com')).toBeInstanceOf(URL);
       expect(safeURL('/path', 'http://example.com')).toBeInstanceOf(URL);
diff --git a/static/app/utils/useCustomMeasurements.spec.tsx b/static/app/utils/useCustomMeasurements.spec.tsx
index b91046decac4..94ce7bd2f23d 100644
--- a/static/app/utils/useCustomMeasurements.spec.tsx
+++ b/static/app/utils/useCustomMeasurements.spec.tsx
@@ -19,7 +19,7 @@ function TestComponent({other}: {other: string}) {
 
 function mockMeasurementsMeta() {
   return MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/measurements-meta/',
+    url: `/organizations/org-slug/measurements-meta/`,
     body: {
       'measurements.custom.measurement': {
         functions: ['p99'],
diff --git a/static/app/utils/useExperiment.spec.tsx b/static/app/utils/useExperiment.spec.tsx
index f79d86b7bfc3..b7a1c2b614b8 100644
--- a/static/app/utils/useExperiment.spec.tsx
+++ b/static/app/utils/useExperiment.spec.tsx
@@ -1,5 +1,3 @@
-import {OrganizationFixture} from 'sentry-fixture/organization';
-
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import {useExperiment} from 'sentry/utils/useExperiment';
@@ -15,16 +13,9 @@ function TestComponent({feature}: {feature: string}) {
 }
 
 describe('useExperiment (open-source fallback)', () => {
-  it('returns control group when feature is not enabled', () => {
+  it('returns control group when no gsApp hook is registered', () => {
     render(<TestComponent feature="test-experiment" />);
     expect(screen.getByTestId('in-experiment')).toHaveTextContent('false');
     expect(screen.getByTestId('assignment')).toHaveTextContent('control');
   });
-
-  it('returns inExperiment true when feature is enabled', () => {
-    const org = OrganizationFixture({features: ['test-experiment']});
-    render(<TestComponent feature="test-experiment" />, {organization: org});
-    expect(screen.getByTestId('in-experiment')).toHaveTextContent('true');
-    expect(screen.getByTestId('assignment')).toHaveTextContent('control');
-  });
 });
diff --git a/static/app/utils/useExperiment.tsx b/static/app/utils/useExperiment.tsx
index 03cc76a190e1..221299490183 100644
--- a/static/app/utils/useExperiment.tsx
+++ b/static/app/utils/useExperiment.tsx
@@ -1,5 +1,4 @@
 import {HookStore} from 'sentry/stores/hookStore';
-import {useOrganization} from 'sentry/utils/useOrganization';
 
 export interface UseExperimentResult {
   /**
@@ -35,14 +34,10 @@ export interface UseExperimentOptions {
 }
 
 /**
- * Open-source fallback: gates on organization.features with no exposure logging.
+ * Open-source fallback: always returns control group with no exposure logging.
  */
-function useNoopExperiment(options: UseExperimentOptions): UseExperimentResult {
-  const organization = useOrganization();
-  return {
-    inExperiment: organization.features.includes(options.feature),
-    experimentAssignment: 'control',
-  };
+function noopUseExperiment(_options: UseExperimentOptions): UseExperimentResult {
+  return {inExperiment: false, experimentAssignment: 'control'};
 }
 
 /**
@@ -82,6 +77,6 @@ function useNoopExperiment(options: UseExperimentOptions): UseExperimentResult {
  */
 export function useExperiment(options: UseExperimentOptions): UseExperimentResult {
   const useExperimentHook =
-    HookStore.get('react-hook:use-experiment')[0] ?? useNoopExperiment;
+    HookStore.get('react-hook:use-experiment')[0] ?? noopUseExperiment;
   return useExperimentHook(options);
 }
diff --git a/static/app/utils/useLocalStorageState.spec.tsx b/static/app/utils/useLocalStorageState.spec.tsx
index 1e370535339d..69d69fad66e6 100644
--- a/static/app/utils/useLocalStorageState.spec.tsx
+++ b/static/app/utils/useLocalStorageState.spec.tsx
@@ -201,7 +201,7 @@ describe('useLocalStorageState', () => {
     );
 
     expect(() => result.current[1](recursiveReferenceMap)).toThrow(
-      'useLocalStorage: Native serialization of Map is not supported'
+      `useLocalStorage: Native serialization of Map is not supported`
     );
   });
 
diff --git a/static/app/utils/useOwners.spec.tsx b/static/app/utils/useOwners.spec.tsx
index 4856775744cd..f2fd899c3f5f 100644
--- a/static/app/utils/useOwners.spec.tsx
+++ b/static/app/utils/useOwners.spec.tsx
@@ -28,15 +28,15 @@ describe('useOwners', () => {
 
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/user-teams/',
+      url: `/organizations/org-slug/user-teams/`,
       body: [],
     });
     teamsRequest = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/teams/',
+      url: `/organizations/org-slug/teams/`,
       body: [],
     });
     membersRequest = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/members/',
+      url: `/organizations/org-slug/members/`,
       body: [],
     });
   });
@@ -61,11 +61,11 @@ describe('useOwners', () => {
     const teams = [TeamFixture({id: '4', slug: 'other-slug'})];
 
     teamsRequest = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/teams/',
+      url: `/organizations/org-slug/teams/`,
       body: teams,
     });
     membersRequest = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/members/',
+      url: `/organizations/org-slug/members/`,
       body: members,
     });
 
diff --git a/static/app/utils/usePrismTokens.spec.tsx b/static/app/utils/usePrismTokens.spec.tsx
index 84a53055302f..ae62dbe85f9f 100644
--- a/static/app/utils/usePrismTokens.spec.tsx
+++ b/static/app/utils/usePrismTokens.spec.tsx
@@ -10,9 +10,9 @@ const JS_CODE = `function foo() {
   return 'bar';
 }`;
 
-const SINGLE_LINE_CODE = "const a='b'";
+const SINGLE_LINE_CODE = `const a='b'`;
 
-const NESTED_CODE = '<p class="hey">Test</p>';
+const NESTED_CODE = `<p class="hey">Test</p>`;
 
 describe('usePrismTokens', () => {
   beforeAll(async () => {
diff --git a/static/app/utils/useUserTeams.spec.tsx b/static/app/utils/useUserTeams.spec.tsx
index 674de2bb8d77..328f7ba91d4c 100644
--- a/static/app/utils/useUserTeams.spec.tsx
+++ b/static/app/utils/useUserTeams.spec.tsx
@@ -28,7 +28,7 @@ describe('useUserTeams', () => {
     const userTeams = [TeamFixture({id: '1', isMember: true})];
     const nonUserTeams = [TeamFixture({id: '2', isMember: false})];
     const mockapi = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/user-teams/',
+      url: `/organizations/org-slug/user-teams/`,
       body: userTeams,
     });
 
diff --git a/static/app/views/alerts/create.spec.tsx b/static/app/views/alerts/create.spec.tsx
index 2d1a0c525abd..2c452890a9c3 100644
--- a/static/app/views/alerts/create.spec.tsx
+++ b/static/app/views/alerts/create.spec.tsx
@@ -50,12 +50,12 @@ describe('ProjectAlertsCreate', () => {
       body: EnvironmentsFixture(),
     });
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/',
+      url: `/projects/org-slug/project-slug/`,
       body: {},
       match: [MockApiClient.matchQuery({expand: 'hasAlertIntegration'})],
     });
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/ownership/',
+      url: `/projects/org-slug/project-slug/ownership/`,
       method: 'GET',
       body: {
         fallthrough: false,
@@ -68,14 +68,14 @@ describe('ProjectAlertsCreate', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/integrations/',
+      url: `/organizations/org-slug/integrations/`,
       body: [],
       match: [MockApiClient.matchQuery({integrationType: 'messaging'})],
     });
     const providerKeys = ['slack', 'discord', 'msteams'];
     providerKeys.forEach(providerKey => {
       MockApiClient.addMockResponse({
-        url: '/organizations/org-slug/config/integrations/',
+        url: `/organizations/org-slug/config/integrations/`,
         body: {providers: [GitHubIntegrationProviderFixture({key: providerKey})]},
         match: [MockApiClient.matchQuery({provider_key: providerKey})],
       });
diff --git a/static/app/views/alerts/rules/crons/details.spec.tsx b/static/app/views/alerts/rules/crons/details.spec.tsx
index eafc90706da3..197e0b31d7b4 100644
--- a/static/app/views/alerts/rules/crons/details.spec.tsx
+++ b/static/app/views/alerts/rules/crons/details.spec.tsx
@@ -46,7 +46,7 @@ describe('Monitor Details', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/detectors/',
+      url: `/organizations/org-slug/detectors/`,
       body: [],
     });
   });
diff --git a/static/app/views/alerts/rules/issue/details/ruleDetails.tsx b/static/app/views/alerts/rules/issue/details/ruleDetails.tsx
index 2b6a6d6cb5c9..b797d399f51e 100644
--- a/static/app/views/alerts/rules/issue/details/ruleDetails.tsx
+++ b/static/app/views/alerts/rules/issue/details/ruleDetails.tsx
@@ -279,7 +279,7 @@ export default function AlertRuleDetails() {
 
   const duplicateLink = {
     pathname: makeAlertsPathname({
-      path: '/new/issue/',
+      path: `/new/issue/`,
       organization,
     }),
     query: {
@@ -403,7 +403,7 @@ export default function AlertRuleDetails() {
                 {
                   label: t('Alerts'),
                   to: makeAlertsPathname({
-                    path: '/rules/',
+                    path: `/rules/`,
                     organization,
                   }),
                 },
diff --git a/static/app/views/alerts/rules/issue/index.spec.tsx b/static/app/views/alerts/rules/issue/index.spec.tsx
index b19326593692..45336dd82e88 100644
--- a/static/app/views/alerts/rules/issue/index.spec.tsx
+++ b/static/app/views/alerts/rules/issue/index.spec.tsx
@@ -140,7 +140,7 @@ describe('IssueRuleEditor', () => {
       body: EnvironmentsFixture(),
     });
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/',
+      url: `/projects/org-slug/project-slug/`,
       body: {},
       match: [MockApiClient.matchQuery({expand: 'hasAlertIntegration'})],
     });
@@ -151,14 +151,14 @@ describe('IssueRuleEditor', () => {
     });
     ProjectsStore.loadInitialData([ProjectFixture()]);
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/integrations/',
+      url: `/organizations/org-slug/integrations/`,
       body: [],
       match: [MockApiClient.matchQuery({integrationType: 'messaging'})],
     });
     const providerKeys = ['slack', 'discord', 'msteams'];
     providerKeys.forEach(providerKey => {
       MockApiClient.addMockResponse({
-        url: '/organizations/org-slug/config/integrations/',
+        url: `/organizations/org-slug/config/integrations/`,
         match: [MockApiClient.matchQuery({provider_key: providerKey})],
         body: {providers: [GitHubIntegrationProviderFixture({key: providerKey})]},
       });
diff --git a/static/app/views/alerts/rules/issue/index.tsx b/static/app/views/alerts/rules/issue/index.tsx
index 4eccc424d461..cd63e0aea725 100644
--- a/static/app/views/alerts/rules/issue/index.tsx
+++ b/static/app/views/alerts/rules/issue/index.tsx
@@ -600,7 +600,7 @@ class IssueRuleEditor extends DeprecatedAsyncComponent<Props, State> {
 
     router.push(
       makeAlertsPathname({
-        path: '/rules/',
+        path: `/rules/`,
         organization,
       })
     );
diff --git a/static/app/views/alerts/rules/issue/previewTable.tsx b/static/app/views/alerts/rules/issue/previewTable.tsx
index b832f1510c96..63e6cf1fd92b 100644
--- a/static/app/views/alerts/rules/issue/previewTable.tsx
+++ b/static/app/views/alerts/rules/issue/previewTable.tsx
@@ -80,7 +80,7 @@ export function PreviewTable({
       return null;
     }
     const pageIssues = page * 5 + groups.length;
-    return tct('Showing [pageIssues] of [issueCount] issues', {pageIssues, issueCount});
+    return tct(`Showing [pageIssues] of [issueCount] issues`, {pageIssues, issueCount});
   };
 
   const renderPagination = () => {
diff --git a/static/app/views/alerts/rules/issue/ruleNode.spec.tsx b/static/app/views/alerts/rules/issue/ruleNode.spec.tsx
index 17f98b8bb3fa..dfa8fdeaa7a1 100644
--- a/static/app/views/alerts/rules/issue/ruleNode.spec.tsx
+++ b/static/app/views/alerts/rules/issue/ruleNode.spec.tsx
@@ -277,7 +277,7 @@ describe('RuleNode', () => {
     it('remove deprecated category options', async () => {
       renderRuleNode(
         {
-          label: "The issue's category is equal to {value}",
+          label: `The issue's category is equal to {value}`,
           name: 'Issue Category',
           formFields: {
             value: {
diff --git a/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx b/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx
index 733f07b42c5a..7dde330bc25e 100644
--- a/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx
+++ b/static/app/views/alerts/rules/issue/setupMessagingIntegrationButton.tsx
@@ -42,7 +42,7 @@ export function SetupMessagingIntegrationButton({
 
   const messagingIntegrationsQuery = useApiQuery<OrganizationIntegration[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {integrationType: 'messaging'}},
@@ -52,7 +52,7 @@ export function SetupMessagingIntegrationButton({
 
   const integrationProvidersQuery = useApiQueries<{providers: IntegrationProvider[]}>(
     providerKeys.map((providerKey: string) => [
-      getApiUrl('/organizations/$organizationIdOrSlug/config/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/config/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {provider_key: providerKey}},
diff --git a/static/app/views/alerts/rules/metric/create.tsx b/static/app/views/alerts/rules/metric/create.tsx
index 87d3077f0ac7..4e83dce41f2e 100644
--- a/static/app/views/alerts/rules/metric/create.tsx
+++ b/static/app/views/alerts/rules/metric/create.tsx
@@ -51,7 +51,7 @@ export function MetricRulesCreate(props: Props) {
         }
       : {
           pathname: makeAlertsPathname({
-            path: '/rules/',
+            path: `/rules/`,
             organization,
           }),
           query: {project: project.id},
diff --git a/static/app/views/alerts/rules/metric/details/header.tsx b/static/app/views/alerts/rules/metric/details/header.tsx
index 33136f361d40..cc46ee043642 100644
--- a/static/app/views/alerts/rules/metric/details/header.tsx
+++ b/static/app/views/alerts/rules/metric/details/header.tsx
@@ -55,7 +55,7 @@ export function DetailsHeader({
 
   const duplicateLink = {
     pathname: makeAlertsPathname({
-      path: '/new/metric/',
+      path: `/new/metric/`,
       organization,
     }),
     query: {
@@ -88,7 +88,7 @@ export function DetailsHeader({
             {
               label: t('Alerts'),
               to: makeAlertsPathname({
-                path: '/rules/',
+                path: `/rules/`,
                 organization,
               }),
             },
diff --git a/static/app/views/alerts/rules/metric/details/index.spec.tsx b/static/app/views/alerts/rules/metric/details/index.spec.tsx
index 1f801bcfae7f..38204ab4891e 100644
--- a/static/app/views/alerts/rules/metric/details/index.spec.tsx
+++ b/static/app/views/alerts/rules/metric/details/index.spec.tsx
@@ -83,7 +83,7 @@ describe('MetricAlertDetails', () => {
       body: rule,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/incidents/',
+      url: `/organizations/org-slug/incidents/`,
       body: [incident],
     });
 
@@ -128,7 +128,7 @@ describe('MetricAlertDetails', () => {
       body: incident,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/incidents/',
+      url: `/organizations/org-slug/incidents/`,
       body: [incident],
     });
     // Related issues to the selected incident
@@ -168,7 +168,7 @@ describe('MetricAlertDetails', () => {
       body: rule,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/incidents/',
+      url: `/organizations/org-slug/incidents/`,
       body: [incident],
     });
     const promptResponse = {
@@ -219,7 +219,7 @@ describe('MetricAlertDetails', () => {
       body: rule,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/incidents/',
+      url: `/organizations/org-slug/incidents/`,
       body: [],
     });
     MockApiClient.addMockResponse({
@@ -264,7 +264,7 @@ describe('MetricAlertDetails', () => {
       body: rule,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/incidents/',
+      url: `/organizations/org-slug/incidents/`,
       body: [],
     });
 
@@ -298,7 +298,7 @@ describe('MetricAlertDetails', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/incidents/',
+      url: `/organizations/org-slug/incidents/`,
       body: [],
     });
 
@@ -343,7 +343,7 @@ describe('MetricAlertDetails', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/incidents/',
+      url: `/organizations/org-slug/incidents/`,
       body: [],
     });
 
diff --git a/static/app/views/alerts/rules/metric/details/metricChart.tsx b/static/app/views/alerts/rules/metric/details/metricChart.tsx
index 5f33dbedcc90..4c75334864b0 100644
--- a/static/app/views/alerts/rules/metric/details/metricChart.tsx
+++ b/static/app/views/alerts/rules/metric/details/metricChart.tsx
@@ -693,7 +693,7 @@ function getMetricChartTooltipFormatter({
           : theme.colors.green400;
 
     return [
-      '<div class="tooltip-series">',
+      `<div class="tooltip-series">`,
       isModified &&
         `<div><span class="tooltip-label"><strong>${t(
           'Alert Rule Modified'
@@ -707,8 +707,8 @@ function getMetricChartTooltipFormatter({
       lowerThresholdSeries &&
         lowerThresholdFormatted &&
         `<div><span class="tooltip-label">${lowerThresholdSeries.marker as string} <strong>${t('Lower Threshold')}</strong></span>${lowerThresholdFormatted}</div>`,
-      '</div>',
-      '<div class="tooltip-footer">',
+      `</div>`,
+      `<div class="tooltip-footer">`,
       `<span>${startTime} &mdash; ${endTime}</span>`,
       comparisonPointY !== undefined &&
         Math.abs(changePercentage) !== Infinity &&
@@ -716,7 +716,7 @@ function getMetricChartTooltipFormatter({
         `<span style="color:${changeStatusColor};margin-left:10px;">${
           Math.sign(changePercentage) === 1 ? '+' : '-'
         }${Math.abs(changePercentage).toFixed(2)}%</span>`,
-      '</div>',
+      `</div>`,
       '<div class="tooltip-arrow"></div>',
     ]
       .filter(e => e)
diff --git a/static/app/views/alerts/rules/metric/details/metricChartOption.tsx b/static/app/views/alerts/rules/metric/details/metricChartOption.tsx
index 75c435ea856f..5506b5612a2c 100644
--- a/static/app/views/alerts/rules/metric/details/metricChartOption.tsx
+++ b/static/app/views/alerts/rules/metric/details/metricChartOption.tsx
@@ -77,7 +77,7 @@ function createIncidentSeries(
   const formatter = ({value, marker}: any) => {
     const time = formatTooltipDate(moment(value), 'MMM D, YYYY LT');
     return [
-      '<div class="tooltip-series"><div>',
+      `<div class="tooltip-series"><div>`,
       `<span class="tooltip-label">${marker} <strong>${t('Alert')} #${
         incident.identifier
       }</strong></span>${
@@ -89,7 +89,7 @@ function createIncidentSeries(
             )}`
           : ''
       }`,
-      '</div></div>',
+      `</div></div>`,
       `<div class="tooltip-footer">${time}</div>`,
       '<div class="tooltip-arrow"></div>',
     ].join('');
diff --git a/static/app/views/alerts/rules/metric/details/ongoingIssues.spec.tsx b/static/app/views/alerts/rules/metric/details/ongoingIssues.spec.tsx
index 794df792f4a9..6e1cd66a162c 100644
--- a/static/app/views/alerts/rules/metric/details/ongoingIssues.spec.tsx
+++ b/static/app/views/alerts/rules/metric/details/ongoingIssues.spec.tsx
@@ -11,7 +11,7 @@ describe('MetricAlertOngoingIssues', () => {
   beforeEach(() => {
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/users/',
+      url: `/organizations/org-slug/users/`,
       body: [],
     });
   });
diff --git a/static/app/views/alerts/rules/metric/duplicate.tsx b/static/app/views/alerts/rules/metric/duplicate.tsx
index f66f1d8aba52..3ee24466d24a 100644
--- a/static/app/views/alerts/rules/metric/duplicate.tsx
+++ b/static/app/views/alerts/rules/metric/duplicate.tsx
@@ -63,7 +63,7 @@ export function MetricRuleDuplicate({
         }
       : {
           pathname: makeAlertsPathname({
-            path: '/rules/',
+            path: `/rules/`,
             organization,
           }),
           query: {project: project.id},
diff --git a/static/app/views/alerts/rules/metric/ruleForm.tsx b/static/app/views/alerts/rules/metric/ruleForm.tsx
index 992585c81510..712860f42f93 100644
--- a/static/app/views/alerts/rules/metric/ruleForm.tsx
+++ b/static/app/views/alerts/rules/metric/ruleForm.tsx
@@ -304,7 +304,7 @@ class RuleFormContainer extends DeprecatedAsyncComponent<Props, State> {
 
     router.push(
       makeAlertsPathname({
-        path: '/rules/',
+        path: `/rules/`,
         organization,
       })
     );
diff --git a/static/app/views/alerts/rules/metric/utils/anomalyChart.tsx b/static/app/views/alerts/rules/metric/utils/anomalyChart.tsx
index 7ac1b84547c7..edfb5cbb6c56 100644
--- a/static/app/views/alerts/rules/metric/utils/anomalyChart.tsx
+++ b/static/app/views/alerts/rules/metric/utils/anomalyChart.tsx
@@ -119,8 +119,8 @@ function createAnomalyMarkerSeries(
   const formatter = ({value}: any) => {
     const time = formatTooltipDate(moment(value), 'MMM D, YYYY LT');
     return [
-      '<div class="tooltip-series"><div>',
-      '</div>Anomaly Detected</div>',
+      `<div class="tooltip-series"><div>`,
+      `</div>Anomaly Detected</div>`,
       `<div class="tooltip-footer">${time}</div>`,
       '<div class="tooltip-arrow"></div>',
     ].join('');
diff --git a/static/app/views/alerts/rules/uptime/details.tsx b/static/app/views/alerts/rules/uptime/details.tsx
index c96e533999fa..126821537e2a 100644
--- a/static/app/views/alerts/rules/uptime/details.tsx
+++ b/static/app/views/alerts/rules/uptime/details.tsx
@@ -130,7 +130,7 @@ export default function UptimeAlertDetails() {
               {
                 label: t('Alerts'),
                 to: makeAlertsPathname({
-                  path: '/rules/',
+                  path: `/rules/`,
                   organization,
                 }),
               },
diff --git a/static/app/views/alerts/rules/uptime/edit.tsx b/static/app/views/alerts/rules/uptime/edit.tsx
index c7f19c62cb2c..ce4bd2bdc06c 100644
--- a/static/app/views/alerts/rules/uptime/edit.tsx
+++ b/static/app/views/alerts/rules/uptime/edit.tsx
@@ -63,7 +63,7 @@ export function UptimeRulesEdit({params, onChangeTitle, organization}: Props) {
 
   const handleDelete = async () => {
     await deleteUptimeRule(api, organization, rule);
-    navigate(makeAlertsPathname({path: '/rules/', organization}));
+    navigate(makeAlertsPathname({path: `/rules/`, organization}));
   };
 
   return (
diff --git a/static/app/views/alerts/rules/uptime/existingOrCreate.tsx b/static/app/views/alerts/rules/uptime/existingOrCreate.tsx
index cc86c87007b0..3b02c024d956 100644
--- a/static/app/views/alerts/rules/uptime/existingOrCreate.tsx
+++ b/static/app/views/alerts/rules/uptime/existingOrCreate.tsx
@@ -47,7 +47,7 @@ export default function ExistingOrCreate() {
     // Has multiple existing alert rules
     if (existingRules.length > 1) {
       const url = makeAlertsPathname({
-        path: '/rules/',
+        path: `/rules/`,
         organization,
       });
       navigate(
@@ -64,7 +64,7 @@ export default function ExistingOrCreate() {
 
     // No alert rules, create a new one
     const url = makeAlertsPathname({
-      path: '/new/uptime/',
+      path: `/new/uptime/`,
       organization,
     });
     navigate(url, {replace: true});
diff --git a/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx b/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx
index 6773b78a666c..c0184c25e411 100644
--- a/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx
+++ b/static/app/views/alerts/rules/uptime/httpSnippet.spec.tsx
@@ -38,8 +38,8 @@ describe('HTTPSnippet', () => {
       'User-Agent: SentryUptimeBot/1.0 (+http://docs.sentry.io/product/alerts/uptime-monitoring/)',
       'Sentry-Trace: sentry-trace-value',
       'Content-Size: 18',
-      '',
-      '{"key": "value"}',
+      ``,
+      `{"key": "value"}`,
     ].join('\r\n');
 
     const codeElem = screen.getByText(/POST \/test\?query=value HTTP\/1\.1/);
diff --git a/static/app/views/automations/components/automationListTable/actions.tsx b/static/app/views/automations/components/automationListTable/actions.tsx
index a9ad989ea450..4b073c3c4568 100644
--- a/static/app/views/automations/components/automationListTable/actions.tsx
+++ b/static/app/views/automations/components/automationListTable/actions.tsx
@@ -61,8 +61,8 @@ export function AutomationsTableActions({
       );
     }
     return tn(
-      'Are you sure you want to enable this %s alert?',
-      'Are you sure you want to enable these %s alerts?',
+      `Are you sure you want to enable this %s alert?`,
+      `Are you sure you want to enable these %s alerts?`,
       selected.size
     );
   }, [allInQuerySelected, queryCount, selected.size]);
@@ -77,8 +77,8 @@ export function AutomationsTableActions({
       );
     }
     return tn(
-      'Are you sure you want to disable this %s alert?',
-      'Are you sure you want to disable these %s alerts?',
+      `Are you sure you want to disable this %s alert?`,
+      `Are you sure you want to disable these %s alerts?`,
       selected.size
     );
   }, [allInQuerySelected, queryCount, selected.size]);
@@ -121,8 +121,8 @@ export function AutomationsTableActions({
       );
     }
     return tn(
-      'Are you sure you want to delete this %s automation?',
-      'Are you sure you want to delete these %s automations?',
+      `Are you sure you want to delete this %s automation?`,
+      `Are you sure you want to delete these %s automations?`,
       selected.size
     );
   }, [allInQuerySelected, queryCount, selected.size]);
diff --git a/static/app/views/dashboards/createFromSeer.tsx b/static/app/views/dashboards/createFromSeer.tsx
index 6d145e692951..8786524df958 100644
--- a/static/app/views/dashboards/createFromSeer.tsx
+++ b/static/app/views/dashboards/createFromSeer.tsx
@@ -9,22 +9,88 @@ import {addErrorMessage} from 'sentry/actionCreators/indicator';
 import {ErrorBoundary} from 'sentry/components/errorBoundary';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
+import {parseQueryKey} from 'sentry/utils/api/apiQueryKey';
+import {fetchMutation, useApiQuery, useQueryClient} from 'sentry/utils/queryClient';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {CreateFromSeerLoading} from 'sentry/views/dashboards/createFromSeerLoading';
 import {CreateFromSeerPrompt} from 'sentry/views/dashboards/createFromSeerPrompt';
+import type {SeerExplorerResponse} from 'sentry/views/seerExplorer/hooks/useSeerExplorer';
+import {makeSeerExplorerQueryKey} from 'sentry/views/seerExplorer/utils';
 
 import {WidgetErrorProvider} from './contexts/widgetErrorContext';
-import {statusIsTerminal} from './createFromSeerUtils';
+import {applySeerWidgetDefaults} from './createFromSeerUtils';
 import {DashboardChatPanel, type WidgetError} from './dashboardChatPanel';
 import {EMPTY_DASHBOARD} from './data';
 import {DashboardDetailWithInjectedProps as DashboardDetail} from './detail';
+import {assignDefaultLayout, assignTempId, getInitialColumnDepths} from './layoutUtils';
 import type {DashboardDetails, Widget} from './types';
 import {DashboardState} from './types';
-import {useSeerDashboardSession} from './useSeerDashboardSession';
 
+const POLL_INTERVAL_MS = 500;
+const DASHBOARD_ARTIFACT_KEY = 'dashboard';
+const POST_COMPLETE_POLL_MS = 5000;
 const EMPTY_DASHBOARDS: never[] = [];
 
+type DashboardArtifact = {
+  title: string;
+  widgets: WidgetArtifact[];
+};
+
+type WidgetArtifact = {
+  display_type: Widget['displayType'];
+  interval: string;
+  layout: {h: number; min_h: number; w: number; x: number; y: number};
+  queries: Widget['queries'];
+  title: string;
+  widget_type: Widget['widgetType'];
+  description?: string;
+  limit?: number;
+};
+
+function normalizeWidget(raw: WidgetArtifact): Widget {
+  const {display_type, widget_type, ...rest} = raw;
+  return {
+    ...rest,
+    displayType: display_type,
+    widgetType: widget_type,
+    layout: raw.layout
+      ? {
+          x: raw.layout.x,
+          y: raw.layout.y,
+          w: raw.layout.w,
+          h: raw.layout.h,
+          minH: raw.layout.min_h,
+        }
+      : undefined,
+  };
+}
+
+function extractDashboardFromSession(
+  session: NonNullable<SeerExplorerResponse['session']>
+): {
+  title: string;
+  widgets: Widget[];
+} | null {
+  // Newest dashboard artifacts appear closer to the end of the array
+  for (let i = session.blocks.length - 1; i >= 0; i--) {
+    const artifact = session.blocks[i]!.artifacts?.find(
+      a => a.key === DASHBOARD_ARTIFACT_KEY && a.data
+    );
+    if (artifact) {
+      const data = artifact.data as DashboardArtifact;
+      return {
+        title: data.title,
+        widgets: assignDefaultLayout(
+          applySeerWidgetDefaults(data.widgets.map(normalizeWidget)).map(assignTempId),
+          getInitialColumnDepths()
+        ),
+      };
+    }
+  }
+  return null;
+}
+
 async function validateDashboardAndRecordMetrics(
   organization: Organization,
   newDashboard: DashboardDetails,
@@ -53,9 +119,14 @@ async function validateDashboardAndRecordMetrics(
   }
 }
 
+function statusIsTerminal(status?: string | null) {
+  return status === 'completed' || status === 'error' || status === 'awaiting_user_input';
+}
+
 export default function CreateFromSeer() {
   const organization = useOrganization();
   const location = useLocation();
+  const queryClient = useQueryClient();
 
   const seerRunId = location.query?.seerRunId ? Number(location.query.seerRunId) : null;
   const hasFeature =
@@ -63,52 +134,95 @@ export default function CreateFromSeer() {
     organization.features.includes('dashboards-ai-generate');
 
   const [dashboard, setDashboard] = useState<DashboardDetails>(EMPTY_DASHBOARD);
+  const [isUpdating, setisUpdating] = useState(false); // State tracks if dashboard is being updated from user chat input
+  const prevSessionStatusRef = useRef<{
+    status: string | null;
+    updated_at: string | null;
+  }>({status: null, updated_at: null});
+
+  // Timestamp of when we observe a "completed" status.
+  // This is required to poll for POST_COMPLETE_POLL_MS
+  // since backend hooks can resume runs in case of
+  // validation errors.
+  const completedAtRef = useRef<number | null>(null);
 
   // Additional guards to prevent duplicate metrics recording and on reload
   const hasValidatedRef = useRef(false);
   const hasSeenNonTerminalRef = useRef(false);
 
-  // Prevent repeat errors on the same widget
-  const reportedWidgetErrors = useRef(new Set<string>());
-  // Maps widget tempId to error message
-  const widgetErrorsMap = useRef(new Map<string, WidgetError>());
-
-  const handleDashboardUpdate = useCallback(
-    (data: {title: string; widgets: Widget[]}) => {
-      const newDashboard = {
-        ...EMPTY_DASHBOARD,
-        title: data.title,
-        widgets: data.widgets,
-      };
-      setDashboard(newDashboard);
-      reportedWidgetErrors.current.clear();
-    },
-    []
-  );
-
-  const handlePostCompletePollEnd = useCallback(() => {
-    if (!hasValidatedRef.current && hasSeenNonTerminalRef.current) {
-      hasValidatedRef.current = true;
-      validateDashboardAndRecordMetrics(organization, dashboard, seerRunId);
+  const {data, isError} = useApiQuery<SeerExplorerResponse>(
+    makeSeerExplorerQueryKey(organization.slug, seerRunId),
+    {
+      staleTime: 0,
+      retry: false,
+      enabled: !!seerRunId && hasFeature,
+      refetchInterval: query => {
+        const status = query.state.data?.[0]?.session?.status;
+        if (statusIsTerminal(status)) {
+          if (completedAtRef.current === null) {
+            completedAtRef.current = Date.now();
+          }
+          if (Date.now() - completedAtRef.current < POST_COMPLETE_POLL_MS) {
+            return POLL_INTERVAL_MS;
+          }
+          if (!hasValidatedRef.current && hasSeenNonTerminalRef.current) {
+            hasValidatedRef.current = true;
+            validateDashboardAndRecordMetrics(organization, dashboard, seerRunId);
+          }
+          return false;
+        }
+        if (status !== undefined && !statusIsTerminal(status)) {
+          hasSeenNonTerminalRef.current = true;
+          hasValidatedRef.current = false;
+          completedAtRef.current = null;
+        }
+        return POLL_INTERVAL_MS;
+      },
     }
-  }, [organization, dashboard, seerRunId]);
-
-  const {session, isUpdating, setIsUpdating, isError, sendFollowUpMessage} =
-    useSeerDashboardSession({
-      seerRunId,
-      onDashboardUpdate: handleDashboardUpdate,
-      enabled: hasFeature,
-      onPostCompletePollEnd: handlePostCompletePollEnd,
-    });
+  );
 
+  const session = data?.session;
   const sessionStatus = session?.status ?? null;
+  const sessionUpdatedAt = session?.updated_at ?? null;
 
   useEffect(() => {
-    if (sessionStatus !== null && !statusIsTerminal(sessionStatus)) {
-      hasSeenNonTerminalRef.current = true;
-      hasValidatedRef.current = false;
+    if (!session) {
+      return;
+    }
+    const prevUpdatedAt = prevSessionStatusRef.current.updated_at;
+    const prevStatus = prevSessionStatusRef.current.status;
+    prevSessionStatusRef.current = {
+      status: sessionStatus,
+      updated_at: sessionUpdatedAt,
+    };
+
+    const isTerminal = statusIsTerminal(sessionStatus);
+    const wasTerminal = statusIsTerminal(prevStatus);
+
+    // Only trigger Dashboard rerender when transition to a new completed state
+    if (prevUpdatedAt !== sessionUpdatedAt && isTerminal && !wasTerminal) {
+      if (isUpdating) {
+        setisUpdating(false);
+      }
+      const dashboardData = extractDashboardFromSession(session);
+      if (dashboardData) {
+        const newDashboard = {
+          ...EMPTY_DASHBOARD,
+          title: dashboardData.title,
+          widgets: dashboardData.widgets,
+        };
+        setDashboard(newDashboard);
+        reportedWidgetErrors.current.clear();
+      }
     }
-  }, [sessionStatus]);
+  }, [organization, seerRunId, isUpdating, sessionStatus, session, sessionUpdatedAt]);
+
+  const isLoading = !statusIsTerminal(sessionStatus) && !isError;
+
+  // Prevent repeat errors on the same widget
+  const reportedWidgetErrors = useRef(new Set<string>());
+  // Maps widget tempId to error message
+  const widgetErrorsMap = useRef(new Map<string, WidgetError>());
 
   const handleWidgetError = useCallback(
     (widget: Widget, errorMessage: string) => {
@@ -155,12 +269,25 @@ export default function CreateFromSeer() {
       if (!seerRunId) {
         return;
       }
-      setIsUpdating(true);
+      setisUpdating(true);
+      completedAtRef.current = null;
       hasValidatedRef.current = false;
       reportedWidgetErrors.current.clear();
-      await sendFollowUpMessage(message);
+      try {
+        const queryKey = makeSeerExplorerQueryKey(organization.slug, seerRunId);
+        const {url} = parseQueryKey(queryKey);
+        await fetchMutation({
+          url,
+          method: 'POST',
+          data: {query: message},
+        });
+        queryClient.invalidateQueries({queryKey});
+      } catch {
+        setisUpdating(false);
+        addErrorMessage(t('Failed to send message'));
+      }
     },
-    [seerRunId, setIsUpdating, sendFollowUpMessage]
+    [organization.slug, queryClient, seerRunId]
   );
 
   if (!hasFeature) {
@@ -179,8 +306,6 @@ export default function CreateFromSeer() {
     return <CreateFromSeerPrompt />;
   }
 
-  const isLoading = !statusIsTerminal(sessionStatus) && !isError;
-
   if (isLoading && !isUpdating) {
     return <CreateFromSeerLoading blocks={session?.blocks ?? []} seerRunId={seerRunId} />;
   }
diff --git a/static/app/views/dashboards/createFromSeerLoading.tsx b/static/app/views/dashboards/createFromSeerLoading.tsx
index d36abad6e9db..495802b39a8a 100644
--- a/static/app/views/dashboards/createFromSeerLoading.tsx
+++ b/static/app/views/dashboards/createFromSeerLoading.tsx
@@ -1,5 +1,4 @@
 import {Container, Flex, Stack} from '@sentry/scraps/layout';
-import {IndeterminateLoader} from '@sentry/scraps/loader';
 import {Heading, Text} from '@sentry/scraps/text';
 
 import {t} from 'sentry/locale';
@@ -19,9 +18,6 @@ export function CreateFromSeerLoading({blocks, seerRunId}: CreateFromSeerLoading
     <Stack flex={1} padding="2xl 3xl" background={hasPageFrame ? undefined : 'secondary'}>
       <Flex direction="column" gap="lg" align="center" justify="center" flex="1">
         <Flex direction="column" gap="sm" width="640px">
-          <Container paddingBottom="lg">
-            <IndeterminateLoader />
-          </Container>
           <Heading as="h3">{t('Generating Dashboard')}</Heading>
           <Text variant="muted">
             {t('Stay on this page while we get this made for you')}
diff --git a/static/app/views/dashboards/createFromSeerUtils.spec.tsx b/static/app/views/dashboards/createFromSeerUtils.spec.tsx
index 8ac74a600586..66308db5ef45 100644
--- a/static/app/views/dashboards/createFromSeerUtils.spec.tsx
+++ b/static/app/views/dashboards/createFromSeerUtils.spec.tsx
@@ -1,11 +1,6 @@
 import {applySeerWidgetDefaults} from 'sentry/views/dashboards/createFromSeerUtils';
-import {
-  extractDashboardFromSession,
-  statusIsTerminal,
-} from 'sentry/views/dashboards/createFromSeerUtils';
 import type {Widget} from 'sentry/views/dashboards/types';
 import {DisplayType} from 'sentry/views/dashboards/types';
-import type {SeerExplorerResponse} from 'sentry/views/seerExplorer/hooks/useSeerExplorer';
 
 function makeWidget(overrides: Partial<Widget> = {}): Widget {
   return {
@@ -26,18 +21,6 @@ function makeWidget(overrides: Partial<Widget> = {}): Widget {
   };
 }
 
-function makeSession(
-  overrides: Partial<NonNullable<SeerExplorerResponse['session']>> = {}
-): NonNullable<SeerExplorerResponse['session']> {
-  return {
-    run_id: 1,
-    status: 'completed',
-    updated_at: new Date().toISOString(),
-    blocks: [],
-    ...overrides,
-  };
-}
-
 describe('applySeerWidgetDefaults', () => {
   describe('layout defaults', () => {
     it('fills in a full default layout when layout is undefined', () => {
@@ -68,67 +51,3 @@ describe('applySeerWidgetDefaults', () => {
     });
   });
 });
-
-describe('statusIsTerminal', () => {
-  it.each(['completed', 'error', 'awaiting_user_input'])(
-    'returns true for %s',
-    status => {
-      expect(statusIsTerminal(status)).toBe(true);
-    }
-  );
-
-  it.each(['processing', 'pending', undefined, null])('returns false for %s', status => {
-    expect(statusIsTerminal(status)).toBe(false);
-  });
-});
-
-describe('extractDashboardFromSession', () => {
-  it('extracts dashboard from session blocks', () => {
-    const session = makeSession({
-      blocks: [
-        {
-          id: 'block-1',
-          message: {content: 'Here is your dashboard', role: 'assistant'},
-          timestamp: new Date().toISOString(),
-          artifacts: [
-            {
-              key: 'dashboard',
-              reason: 'generated',
-              data: {
-                title: 'My Dashboard',
-                widgets: [
-                  {
-                    title: 'Count',
-                    display_type: 'line',
-                    widget_type: 'spans',
-                    queries: [
-                      {
-                        name: '',
-                        conditions: '',
-                        fields: ['count()'],
-                        columns: [],
-                        aggregates: ['count()'],
-                        orderby: '',
-                      },
-                    ],
-                    layout: {x: 0, y: 0, w: 3, h: 2, min_h: 2},
-                    interval: '1h',
-                  },
-                ],
-              },
-            },
-          ],
-        },
-      ],
-    });
-
-    const result = extractDashboardFromSession(session);
-
-    expect(result).not.toBeNull();
-    expect(result!.title).toBe('My Dashboard');
-    expect(result!.widgets).toHaveLength(1);
-    expect(result!.widgets[0]!.title).toBe('Count');
-    expect(result!.widgets[0]!.displayType).toBe('line');
-    expect(result!.widgets[0]!.widgetType).toBe('spans');
-  });
-});
diff --git a/static/app/views/dashboards/createFromSeerUtils.tsx b/static/app/views/dashboards/createFromSeerUtils.tsx
index 3bdc3b0bc1a5..4b25144ff330 100644
--- a/static/app/views/dashboards/createFromSeerUtils.tsx
+++ b/static/app/views/dashboards/createFromSeerUtils.tsx
@@ -1,53 +1,10 @@
-import type {SeerExplorerResponse} from 'sentry/views/seerExplorer/hooks/useSeerExplorer';
-
 import {
-  assignDefaultLayout,
-  assignTempId,
   DEFAULT_WIDGET_WIDTH,
   getDefaultWidgetHeight,
-  getInitialColumnDepths,
-} from './layoutUtils';
-import {DEFAULT_TABLE_LIMIT} from './types';
-import type {Widget, WidgetLayout} from './types';
-
-const DASHBOARD_ARTIFACT_KEY = 'dashboard';
-
-type DashboardArtifact = {
-  title: string;
-  widgets: WidgetArtifact[];
-};
-
-type WidgetArtifact = {
-  display_type: Widget['displayType'];
-  interval: string;
-  layout: {h: number; min_h: number; w: number; x: number; y: number};
-  queries: Widget['queries'];
-  title: string;
-  widget_type: Widget['widgetType'];
-  description?: string;
-  limit?: number;
-};
+} from 'sentry/views/dashboards/layoutUtils';
+import type {Widget, WidgetLayout} from 'sentry/views/dashboards/types';
 
-/**
- * Converts a Seer-generated widget artifact (snake_case) to a frontend Widget (camelCase).
- */
-function normalizeWidgetCase(raw: WidgetArtifact): Widget {
-  const {display_type, widget_type, ...rest} = raw;
-  return {
-    ...rest,
-    displayType: display_type,
-    widgetType: widget_type,
-    layout: raw.layout
-      ? {
-          x: raw.layout.x,
-          y: raw.layout.y,
-          w: raw.layout.w,
-          h: raw.layout.h,
-          minH: raw.layout.min_h,
-        }
-      : undefined,
-  };
-}
+const DEFAULT_LIMIT = 5;
 
 /**
  * This function serves as a fallback to fill out any commonly missing or transform
@@ -91,40 +48,7 @@ function applyLayoutDefaults(
 
 function applyLimitDefaults(limit: number | null | undefined): number {
   if (limit === null || limit === undefined) {
-    return DEFAULT_TABLE_LIMIT;
+    return DEFAULT_LIMIT;
   }
   return limit;
 }
-
-/**
- * Extracts the latest dashboard artifact from a Seer Explorer session's blocks.
- */
-export function extractDashboardFromSession(
-  session: NonNullable<SeerExplorerResponse['session']>
-): {
-  title: string;
-  widgets: Widget[];
-} | null {
-  for (let i = session.blocks.length - 1; i >= 0; i--) {
-    const artifact = session.blocks[i]!.artifacts?.find(
-      a => a.key === DASHBOARD_ARTIFACT_KEY && a.data
-    );
-    if (artifact) {
-      const data = artifact.data as DashboardArtifact;
-      return {
-        title: data.title,
-        widgets: assignDefaultLayout(
-          applySeerWidgetDefaults(data.widgets.map(normalizeWidgetCase)).map(
-            assignTempId
-          ),
-          getInitialColumnDepths()
-        ),
-      };
-    }
-  }
-  return null;
-}
-
-export function statusIsTerminal(status?: string | null) {
-  return status === 'completed' || status === 'error' || status === 'awaiting_user_input';
-}
diff --git a/static/app/views/dashboards/dashboard.spec.tsx b/static/app/views/dashboards/dashboard.spec.tsx
index 2ba0775ceb9b..77594d617a0d 100644
--- a/static/app/views/dashboards/dashboard.spec.tsx
+++ b/static/app/views/dashboards/dashboard.spec.tsx
@@ -95,12 +95,12 @@ describe('Dashboards > Dashboard', () => {
   beforeEach(() => {
     initialData = initializeOrg({organization, projects: []});
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/dashboards/widgets/',
+      url: `/organizations/org-slug/dashboards/widgets/`,
       method: 'POST',
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/releases/stats/',
+      url: `/organizations/org-slug/releases/stats/`,
       body: [],
     });
     MockApiClient.addMockResponse({
diff --git a/static/app/views/dashboards/dashboard.tsx b/static/app/views/dashboards/dashboard.tsx
index b4500bba4baf..4ece16a86e9c 100644
--- a/static/app/views/dashboards/dashboard.tsx
+++ b/static/app/views/dashboards/dashboard.tsx
@@ -124,20 +124,13 @@ function DashboardInner({
   const organization = useOrganization();
   const api = useApi();
 
-  const {selection} = usePageFilters();
-
   // Push dashboard metadata into the LLM context tree for Seer Explorer.
   useLLMContext({
-    contextHint:
-      'This is a Sentry dashboard. The dateRange, environments, and projects below are global page filters that scope every widget query. Each child widget node contains its own query config that can be used with the telemetry_live_search tool to fetch or drill into its data.',
     title: dashboard.title,
     widgetCount: dashboard.widgets.length,
     filters: dashboard.filters,
-    isEditingDashboard,
-    dateRange: selection.datetime,
-    environments: selection.environments,
-    projects: selection.projects,
   });
+  const {selection} = usePageFilters();
   const {queue} = useWidgetQueryQueue();
   const layouts = useMemo<LayoutState>(() => {
     const desktopLayout = getDashboardLayout(dashboard.widgets);
diff --git a/static/app/views/dashboards/detail.tsx b/static/app/views/dashboards/detail.tsx
index b89a2e53a758..ce2dd5aec102 100644
--- a/static/app/views/dashboards/detail.tsx
+++ b/static/app/views/dashboards/detail.tsx
@@ -185,7 +185,7 @@ function getDashboardLocation({
 
   const commonPath = defined(dashboardId)
     ? `/dashboard/${dashboardId}/`
-    : '/dashboards/new/';
+    : `/dashboards/new/`;
 
   const dashboardUrl = USING_CUSTOMER_DOMAIN
     ? commonPath
@@ -419,7 +419,7 @@ class DashboardDetail extends Component<Props, State> {
     if (USING_CUSTOMER_DOMAIN) {
       widgetBuilderRoutes.push(
         ...[
-          '/dashboards/new/widget-builder/widget/new/',
+          `/dashboards/new/widget-builder/widget/new/`,
           `/dashboards/new/widget-builder/widget/${widgetIndex}/edit/`,
           `/dashboard/${dashboardId}/widget-builder/widget/new/`,
           `/dashboard/${dashboardId}/widget-builder/widget/${widgetIndex}/edit/`,
diff --git a/static/app/views/dashboards/editAccessSelector.spec.tsx b/static/app/views/dashboards/editAccessSelector.spec.tsx
index 8bb9c36d9f71..e786863852f2 100644
--- a/static/app/views/dashboards/editAccessSelector.spec.tsx
+++ b/static/app/views/dashboards/editAccessSelector.spec.tsx
@@ -229,7 +229,7 @@ describe('When EditAccessSelector is rendered with Teams', () => {
     const org = OrganizationFixture();
     OrganizationStore.onUpdate(org, {replace: true});
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/teams/',
+      url: `/organizations/org-slug/teams/`,
       method: 'GET',
       body: teams,
     });
diff --git a/static/app/views/dashboards/filtersBar.spec.tsx b/static/app/views/dashboards/filtersBar.spec.tsx
index 74d636c0c3a6..9ef1f8a92568 100644
--- a/static/app/views/dashboards/filtersBar.spec.tsx
+++ b/static/app/views/dashboards/filtersBar.spec.tsx
@@ -58,7 +58,7 @@ describe('FiltersBar', () => {
         [DashboardFilterKeys.GLOBAL_FILTER]: JSON.stringify({
           dataset: WidgetType.SPANS,
           tag: {key: 'browser.name', name: 'Browser Name', kind: FieldKind.FIELD},
-          value: 'browser.name:[Chrome]',
+          value: `browser.name:[Chrome]`,
         } satisfies GlobalFilter),
       },
     });
@@ -75,7 +75,7 @@ describe('FiltersBar', () => {
         [DashboardFilterKeys.GLOBAL_FILTER]: JSON.stringify({
           dataset: WidgetType.SPANS,
           tag: {key: 'browser.name', name: 'Browser Name', kind: FieldKind.FIELD},
-          value: 'browser.name:[Chrome]',
+          value: `browser.name:[Chrome]`,
         } satisfies GlobalFilter),
       },
     });
@@ -91,7 +91,7 @@ describe('FiltersBar', () => {
         [DashboardFilterKeys.GLOBAL_FILTER]: JSON.stringify({
           dataset: WidgetType.SPANS,
           tag: {key: 'browser.name', name: 'Browser Name', kind: FieldKind.FIELD},
-          value: 'browser.name:[Chrome]',
+          value: `browser.name:[Chrome]`,
           isTemporary: true,
         } satisfies GlobalFilter),
       },
@@ -110,12 +110,12 @@ describe('FiltersBar', () => {
     const savedFilter: GlobalFilter = {
       dataset: WidgetType.SPANS,
       tag: {key: 'os.name', name: 'OS Name', kind: FieldKind.FIELD},
-      value: 'os.name:[Windows]',
+      value: `os.name:[Windows]`,
     };
     const urlFilter: GlobalFilter = {
       dataset: WidgetType.SPANS,
       tag: {key: 'browser.name', name: 'Browser Name', kind: FieldKind.FIELD},
-      value: 'browser.name:[Chrome]',
+      value: `browser.name:[Chrome]`,
     };
     const newLocation = LocationFixture({
       query: {
@@ -145,7 +145,7 @@ describe('FiltersBar', () => {
     const urlFilter: GlobalFilter = {
       dataset: WidgetType.SPANS,
       tag: {key: 'browser.name', name: 'Browser Name', kind: FieldKind.FIELD},
-      value: 'browser.name:[Chrome]',
+      value: `browser.name:[Chrome]`,
     };
     const newLocation = LocationFixture({
       query: {
@@ -173,7 +173,7 @@ describe('FiltersBar', () => {
     const savedFilter: GlobalFilter = {
       dataset: WidgetType.SPANS,
       tag: {key: 'os.name', name: 'OS Name', kind: FieldKind.FIELD},
-      value: 'os.name:[Windows]',
+      value: `os.name:[Windows]`,
     };
     // Empty string simulates cleared filters (handleChangeFilter stores [''])
     const newLocation = LocationFixture({
@@ -206,7 +206,7 @@ describe('FiltersBar', () => {
         [DashboardFilterKeys.GLOBAL_FILTER]: JSON.stringify({
           dataset: WidgetType.SPANS,
           tag: {key: 'browser.name', name: 'Browser Name', kind: FieldKind.FIELD},
-          value: 'browser.name:[Chrome]',
+          value: `browser.name:[Chrome]`,
         } satisfies GlobalFilter),
       },
     });
@@ -234,7 +234,7 @@ const mockNetworkRequests = () => {
     body: TagsFixture(),
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/measurements-meta/',
+    url: `/organizations/org-slug/measurements-meta/`,
     body: {
       'measurements.custom.measurement': {
         functions: ['p99'],
@@ -269,13 +269,13 @@ const mockNetworkRequests = () => {
   ];
 
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/trace-items/attributes/browser.name/values/',
+    url: `/organizations/org-slug/trace-items/attributes/browser.name/values/`,
     body: mockSearchResponse,
     match: [MockApiClient.matchQuery({attributeType: 'string'})],
   });
 
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/trace-items/attributes/os.name/values/',
+    url: `/organizations/org-slug/trace-items/attributes/os.name/values/`,
     body: [
       {
         key: 'os.name',
diff --git a/static/app/views/dashboards/orgDashboards.spec.tsx b/static/app/views/dashboards/orgDashboards.spec.tsx
index 2146f7eae881..091b6a965a10 100644
--- a/static/app/views/dashboards/orgDashboards.spec.tsx
+++ b/static/app/views/dashboards/orgDashboards.spec.tsx
@@ -40,7 +40,7 @@ describe('OrgDashboards', () => {
       filters: {},
     };
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/dashboards/1/',
+      url: `/organizations/org-slug/dashboards/1/`,
       method: 'GET',
       body: mockDashboard,
     });
@@ -68,7 +68,7 @@ describe('OrgDashboards', () => {
       filters: {},
     };
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/dashboards/1/',
+      url: `/organizations/org-slug/dashboards/1/`,
       method: 'GET',
       body: mockDashboardWithFilters,
     });
@@ -102,7 +102,7 @@ describe('OrgDashboards', () => {
       filters: {},
     };
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/dashboards/1/',
+      url: `/organizations/org-slug/dashboards/1/`,
       method: 'GET',
       body: mockDashboardWithFilters,
     });
@@ -148,7 +148,7 @@ describe('OrgDashboards', () => {
       filters: {},
     };
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/dashboards/1/',
+      url: `/organizations/org-slug/dashboards/1/`,
       method: 'GET',
       body: mockDashboardWithFilters,
     });
@@ -201,7 +201,7 @@ describe('OrgDashboards', () => {
       filters: {},
     };
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/dashboards/1/',
+      url: `/organizations/org-slug/dashboards/1/`,
       method: 'GET',
       body: mockDashboardWithFilters,
     });
diff --git a/static/app/views/dashboards/types.tsx b/static/app/views/dashboards/types.tsx
index 8de3739854d6..6c6a85525e6b 100644
--- a/static/app/views/dashboards/types.tsx
+++ b/static/app/views/dashboards/types.tsx
@@ -166,7 +166,7 @@ export type Widget = {
   exploreUrls?: null | string[];
   id?: string;
   layout?: WidgetLayout | null;
-  legendType?: LegendType | null;
+  legendType?: LegendType;
   // Used to define 'topEvents' when fetching time-series data for a widget
   limit?: number;
   // Used for table widget column widths, currently is not saved
diff --git a/static/app/views/dashboards/useSeerDashboardSession.spec.tsx b/static/app/views/dashboards/useSeerDashboardSession.spec.tsx
deleted file mode 100644
index ca65fa166012..000000000000
--- a/static/app/views/dashboards/useSeerDashboardSession.spec.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import {OrganizationFixture} from 'sentry-fixture/organization';
-
-import {act, renderHookWithProviders, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import {useSeerDashboardSession} from 'sentry/views/dashboards/useSeerDashboardSession';
-
-const SEER_RUN_ID = 456;
-
-function makeSeerApiUrl(orgSlug: string, runId: number) {
-  return `/organizations/${orgSlug}/seer/explorer-chat/${runId}/`;
-}
-
-const COMPLETED_SESSION = {
-  session: {
-    run_id: SEER_RUN_ID,
-    status: 'completed',
-    updated_at: '2026-01-01T00:00:00Z',
-    blocks: [
-      {
-        id: 'block-1',
-        message: {content: 'Here is your dashboard', role: 'assistant'},
-        timestamp: '2026-01-01T00:00:00Z',
-        artifacts: [
-          {
-            key: 'dashboard',
-            reason: 'generated',
-            data: {
-              title: 'Generated Dashboard',
-              widgets: [
-                {
-                  title: 'Error Count',
-                  display_type: 'line',
-                  widget_type: 'error-events',
-                  queries: [
-                    {
-                      name: '',
-                      conditions: '',
-                      fields: ['count()'],
-                      columns: [],
-                      aggregates: ['count()'],
-                      orderby: '',
-                    },
-                  ],
-                  layout: {x: 0, y: 0, w: 3, h: 2, min_h: 2},
-                  interval: '1h',
-                },
-              ],
-            },
-          },
-        ],
-      },
-    ],
-  },
-};
-
-describe('useSeerDashboardSession', () => {
-  const organization = OrganizationFixture();
-  const apiUrl = makeSeerApiUrl(organization.slug, SEER_RUN_ID);
-
-  beforeEach(() => {
-    MockApiClient.clearMockResponses();
-  });
-
-  it('returns session data when polling a completed session', async () => {
-    MockApiClient.addMockResponse({
-      url: apiUrl,
-      body: COMPLETED_SESSION,
-    });
-
-    const onDashboardUpdate = jest.fn();
-
-    const {result} = renderHookWithProviders(
-      () =>
-        useSeerDashboardSession({
-          seerRunId: SEER_RUN_ID,
-          onDashboardUpdate,
-        }),
-      {organization}
-    );
-
-    await waitFor(() => {
-      expect(result.current.session).toBeDefined();
-      expect(result.current.session?.status).toBe('completed');
-    });
-  });
-
-  it('sends follow-up messages to the Seer session', async () => {
-    MockApiClient.addMockResponse({
-      url: apiUrl,
-      body: COMPLETED_SESSION,
-    });
-
-    const postMock = MockApiClient.addMockResponse({
-      url: apiUrl,
-      method: 'POST',
-      body: {},
-    });
-
-    const onDashboardUpdate = jest.fn();
-
-    const {result} = renderHookWithProviders(
-      () =>
-        useSeerDashboardSession({
-          seerRunId: SEER_RUN_ID,
-          onDashboardUpdate,
-        }),
-      {organization}
-    );
-
-    await act(async () => {
-      await result.current.sendFollowUpMessage('Add an error rate widget');
-    });
-
-    expect(postMock).toHaveBeenCalledWith(
-      apiUrl,
-      expect.objectContaining({
-        method: 'POST',
-        data: {query: 'Add an error rate widget'},
-      })
-    );
-  });
-});
diff --git a/static/app/views/dashboards/useSeerDashboardSession.tsx b/static/app/views/dashboards/useSeerDashboardSession.tsx
deleted file mode 100644
index 0e34d7c2b14d..000000000000
--- a/static/app/views/dashboards/useSeerDashboardSession.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import {useCallback, useEffect, useRef, useState} from 'react';
-
-import {addErrorMessage} from 'sentry/actionCreators/indicator';
-import {t} from 'sentry/locale';
-import {parseQueryKey} from 'sentry/utils/api/apiQueryKey';
-import {fetchMutation, useApiQuery, useQueryClient} from 'sentry/utils/queryClient';
-import {useOrganization} from 'sentry/utils/useOrganization';
-import type {SeerExplorerResponse} from 'sentry/views/seerExplorer/hooks/useSeerExplorer';
-import {makeSeerExplorerQueryKey} from 'sentry/views/seerExplorer/utils';
-
-import {extractDashboardFromSession, statusIsTerminal} from './createFromSeerUtils';
-import type {Widget} from './types';
-
-const POLL_INTERVAL_MS = 500;
-const POST_COMPLETE_POLL_MS = 5000;
-
-interface UseSeerDashboardSessionOptions {
-  onDashboardUpdate: (data: {title: string; widgets: Widget[]}) => void;
-  seerRunId: number | null;
-  enabled?: boolean;
-  onPostCompletePollEnd?: () => void;
-}
-
-interface UseSeerDashboardSessionResult {
-  isError: boolean;
-  isUpdating: boolean;
-  sendFollowUpMessage: (message: string) => Promise<void>;
-  session: SeerExplorerResponse['session'] | undefined;
-  setIsUpdating: (updating: boolean) => void;
-}
-
-/**
- * Hook that encapsulates polling a Seer Explorer session for dashboard artifacts,
- * detecting terminal-state transitions, and sending follow-up messages.
- */
-export function useSeerDashboardSession({
-  seerRunId,
-  onDashboardUpdate,
-  enabled = true,
-  onPostCompletePollEnd,
-}: UseSeerDashboardSessionOptions): UseSeerDashboardSessionResult {
-  const organization = useOrganization();
-  const queryClient = useQueryClient();
-
-  const [isUpdating, setIsUpdating] = useState(false);
-
-  const prevSessionStatusRef = useRef<{
-    status: string | null;
-    updated_at: string | null;
-  }>({status: null, updated_at: null});
-  const completedAtRef = useRef<number | null>(null);
-
-  const {data, isError} = useApiQuery<SeerExplorerResponse>(
-    makeSeerExplorerQueryKey(organization.slug, seerRunId),
-    {
-      staleTime: 0,
-      retry: false,
-      enabled: !!seerRunId && enabled,
-      refetchInterval: query => {
-        const status = query.state.data?.[0]?.session?.status;
-        if (statusIsTerminal(status)) {
-          if (completedAtRef.current === null) {
-            completedAtRef.current = Date.now();
-          }
-          if (Date.now() - completedAtRef.current < POST_COMPLETE_POLL_MS) {
-            return POLL_INTERVAL_MS;
-          }
-          onPostCompletePollEnd?.();
-          return false;
-        }
-        completedAtRef.current = null;
-        return POLL_INTERVAL_MS;
-      },
-    }
-  );
-
-  const session = data?.session;
-  const sessionStatus = session?.status ?? null;
-  const sessionUpdatedAt = session?.updated_at ?? null;
-
-  useEffect(() => {
-    if (!session) {
-      return;
-    }
-    const prevUpdatedAt = prevSessionStatusRef.current.updated_at;
-    const prevStatus = prevSessionStatusRef.current.status;
-    prevSessionStatusRef.current = {
-      status: sessionStatus,
-      updated_at: sessionUpdatedAt,
-    };
-
-    const isTerminal = statusIsTerminal(sessionStatus);
-    const wasTerminal = statusIsTerminal(prevStatus);
-
-    // Update states when transitioning from non-terminal to terminal session
-    if (prevUpdatedAt !== sessionUpdatedAt && isTerminal && !wasTerminal) {
-      if (isUpdating) {
-        setIsUpdating(false);
-      }
-      const dashboardData = extractDashboardFromSession(session);
-      if (dashboardData) {
-        onDashboardUpdate(dashboardData);
-      }
-    }
-  }, [isUpdating, sessionStatus, session, sessionUpdatedAt, onDashboardUpdate]);
-
-  const sendFollowUpMessage = useCallback(
-    async (message: string) => {
-      if (!seerRunId) {
-        return;
-      }
-      setIsUpdating(true);
-      completedAtRef.current = null;
-      try {
-        const queryKey = makeSeerExplorerQueryKey(organization.slug, seerRunId);
-        const {url} = parseQueryKey(queryKey);
-        await fetchMutation({
-          url,
-          method: 'POST',
-          data: {query: message},
-        });
-        queryClient.invalidateQueries({queryKey});
-      } catch {
-        setIsUpdating(false);
-        addErrorMessage(t('Failed to send message'));
-      }
-    },
-    [organization.slug, queryClient, seerRunId]
-  );
-
-  return {
-    session,
-    isUpdating,
-    setIsUpdating,
-    isError,
-    sendFollowUpMessage,
-  };
-}
diff --git a/static/app/views/dashboards/utils/prebuiltConfigs/frontendOverview/frontendOverview.ts b/static/app/views/dashboards/utils/prebuiltConfigs/frontendOverview/frontendOverview.ts
index b8289255b258..9f4dcf3c8261 100644
--- a/static/app/views/dashboards/utils/prebuiltConfigs/frontendOverview/frontendOverview.ts
+++ b/static/app/views/dashboards/utils/prebuiltConfigs/frontendOverview/frontendOverview.ts
@@ -61,12 +61,12 @@ const FIRST_ROW_WIDGETS = spaceWidgetsEquallyOnRow(
       queries: [
         {
           name: '',
-          fields: ['epm()'],
-          aggregates: ['epm()'],
+          fields: [`epm()`],
+          aggregates: [`epm()`],
           columns: [],
           fieldAliases: [],
           conditions: BASE_QUERY.formatString(),
-          orderby: '-epm()',
+          orderby: `-epm()`,
         },
       ],
       widgetType: WidgetType.SPANS,
@@ -136,7 +136,7 @@ const SECOND_ROW_WIDGETS = spaceWidgetsEquallyOnRow(
           fields: ['p75(span.duration)'],
           aggregates: ['p75(span.duration)'],
           columns: [SpanFields.NORMALIZED_DESCRIPTION],
-          orderby: '-sum(span.duration)',
+          orderby: `-sum(span.duration)`,
           linkedDashboards: [
             {
               dashboardId: '-1',
@@ -162,7 +162,7 @@ const SECOND_ROW_WIDGETS = spaceWidgetsEquallyOnRow(
           fields: ['p75(span.duration)'],
           aggregates: ['p75(span.duration)'],
           columns: [SpanFields.SPAN_DOMAIN],
-          orderby: '-sum(span.duration)',
+          orderby: `-sum(span.duration)`,
           linkedDashboards: [
             {dashboardId: '-1', field: SpanFields.SPAN_DOMAIN, staticDashboardId: 5},
           ],
@@ -185,7 +185,7 @@ const TABLE_FIELDS = [
   `equation|failure_rate_if(${SpanFields.IS_TRANSACTION},equals,true)`,
   `count_unique(${SpanFields.USER})`,
   `equation|sum_if(${SpanFields.SPAN_DURATION},${SpanFields.IS_TRANSACTION},equals,true)`,
-  'equation|performance_score(measurements.score.total)',
+  `equation|performance_score(measurements.score.total)`,
 ];
 
 const TRANSACTIONS_TABLE: Widget = {
@@ -207,7 +207,7 @@ const TRANSACTIONS_TABLE: Widget = {
         `equation|failure_rate_if(${SpanFields.IS_TRANSACTION},equals,true)`,
         `count_unique(${SpanFields.USER})`,
         `equation|sum_if(${SpanFields.SPAN_DURATION},${SpanFields.IS_TRANSACTION},equals,true)`,
-        'equation|performance_score(measurements.score.total)',
+        `equation|performance_score(measurements.score.total)`,
       ],
       fields: TABLE_FIELDS,
       fieldAliases: [
diff --git a/static/app/views/dashboards/utils/prebuiltConfigs/mobileVitals/screenLoads.ts b/static/app/views/dashboards/utils/prebuiltConfigs/mobileVitals/screenLoads.ts
index 95adbc8d624c..24a1f644a6d1 100644
--- a/static/app/views/dashboards/utils/prebuiltConfigs/mobileVitals/screenLoads.ts
+++ b/static/app/views/dashboards/utils/prebuiltConfigs/mobileVitals/screenLoads.ts
@@ -250,14 +250,14 @@ const SPAN_OPERATIONS_TABLE: Widget = {
       fields: [
         SpanFields.SPAN_OP,
         SpanFields.SPAN_DESCRIPTION,
-        'equation|ttid_contribution_rate()',
-        'equation|ttfd_contribution_rate()',
+        `equation|ttid_contribution_rate()`,
+        `equation|ttfd_contribution_rate()`,
         `avg(${SpanFields.SPAN_SELF_TIME})`,
         `sum(${SpanFields.SPAN_SELF_TIME})`,
       ],
       aggregates: [
-        'equation|ttid_contribution_rate()',
-        'equation|ttfd_contribution_rate()',
+        `equation|ttid_contribution_rate()`,
+        `equation|ttfd_contribution_rate()`,
         `avg(${SpanFields.SPAN_SELF_TIME})`,
         `sum(${SpanFields.SPAN_SELF_TIME})`,
       ],
diff --git a/static/app/views/dashboards/utils/prebuiltConfigs/webVitals/pageDetails.ts b/static/app/views/dashboards/utils/prebuiltConfigs/webVitals/pageDetails.ts
index 1f385a2c456f..58b81b95f49a 100644
--- a/static/app/views/dashboards/utils/prebuiltConfigs/webVitals/pageDetails.ts
+++ b/static/app/views/dashboards/utils/prebuiltConfigs/webVitals/pageDetails.ts
@@ -18,7 +18,7 @@ export const WEB_VITALS_DETAILS_PREBUILT_CONFIG: PrebuiltDashboard = {
       id: 'score-breakdown-chart',
       title: t('Score Breakdown'),
       description: t(
-        'Each Web Vital score contributes a different amount to the total score. Refer to the Performance Score wheel for total contribution.'
+        `Each Web Vital score contributes a different amount to the total score. Refer to the Performance Score wheel for total contribution.`
       ),
       displayType: DisplayType.AREA,
       widgetType: WidgetType.SPANS,
@@ -279,7 +279,7 @@ export const WEB_VITALS_DETAILS_PREBUILT_CONFIG: PrebuiltDashboard = {
       queries: [
         {
           name: '',
-          conditions: 'has:measurements.lcp',
+          conditions: `has:measurements.lcp`,
           fields: [
             'project',
             'trace',
@@ -321,7 +321,7 @@ export const WEB_VITALS_DETAILS_PREBUILT_CONFIG: PrebuiltDashboard = {
       queries: [
         {
           name: '',
-          conditions: 'has:measurements.inp',
+          conditions: `has:measurements.inp`,
           fields: [
             'project',
             'trace',
@@ -361,7 +361,7 @@ export const WEB_VITALS_DETAILS_PREBUILT_CONFIG: PrebuiltDashboard = {
       queries: [
         {
           name: '',
-          conditions: 'has:measurements.cls',
+          conditions: `has:measurements.cls`,
           fields: [
             'project',
             'trace',
@@ -401,7 +401,7 @@ export const WEB_VITALS_DETAILS_PREBUILT_CONFIG: PrebuiltDashboard = {
       queries: [
         {
           name: '',
-          conditions: 'span.op:pageload',
+          conditions: `span.op:pageload`,
           fields: ['count()'],
           aggregates: ['count()'],
           columns: [],
@@ -425,8 +425,7 @@ export const WEB_VITALS_DETAILS_PREBUILT_CONFIG: PrebuiltDashboard = {
       queries: [
         {
           name: '',
-          conditions:
-            'span.op:[ui.interaction.click,ui.interaction.hover,ui.interaction.drag,ui.interaction.press]',
+          conditions: `span.op:[ui.interaction.click,ui.interaction.hover,ui.interaction.drag,ui.interaction.press]`,
           fields: ['count()'],
           aggregates: ['count()'],
           columns: [],
diff --git a/static/app/views/dashboards/utils/prebuiltConfigs/webVitals/webVitals.ts b/static/app/views/dashboards/utils/prebuiltConfigs/webVitals/webVitals.ts
index 9cecb4d2d6fb..ca0d2b2a0b2d 100644
--- a/static/app/views/dashboards/utils/prebuiltConfigs/webVitals/webVitals.ts
+++ b/static/app/views/dashboards/utils/prebuiltConfigs/webVitals/webVitals.ts
@@ -295,7 +295,7 @@ export const WEB_VITALS_PREBUILT_CONFIG: PrebuiltDashboard = {
             'equation|performance_score(measurements.score.total)',
             'equation|opportunity_score(measurements.score.total)',
           ],
-          orderby: '-equation|opportunity_score(measurements.score.total)',
+          orderby: `-equation|opportunity_score(measurements.score.total)`,
           fieldAliases: [
             t('Pages'),
             t('Project'),
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/eventsSearchBar.spec.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/eventsSearchBar.spec.tsx
index 737c9bfc0286..897a4811fe54 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/eventsSearchBar.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/eventsSearchBar.spec.tsx
@@ -17,11 +17,11 @@ describe('EventsSearchBar', () => {
     organization = OrganizationFixture();
     jest.mocked(useCustomMeasurements).mockReturnValue({customMeasurements: {}});
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/recent-searches/',
+      url: `/organizations/org-slug/recent-searches/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/recent-searches/',
+      url: `/organizations/org-slug/recent-searches/`,
       body: [],
       method: 'POST',
     });
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar.spec.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar.spec.tsx
index 333990cf7884..eea5086f12c0 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar.spec.tsx
@@ -33,7 +33,7 @@ function mockSpanTags({
   type: 'string' | 'number' | 'boolean';
 }) {
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/trace-items/attributes/',
+    url: `/organizations/org-slug/trace-items/attributes/`,
     body: mockedTags,
     match: [
       function (_url: string, options: Record<string, any>) {
@@ -68,16 +68,16 @@ describe('SpansSearchBar', () => {
     MockApiClient.clearMockResponses();
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/recent-searches/',
+      url: `/organizations/org-slug/recent-searches/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/recent-searches/',
+      url: `/organizations/org-slug/recent-searches/`,
       body: [],
       method: 'POST',
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/spans/fields/',
+      url: `/organizations/org-slug/spans/fields/`,
       body: [],
     });
 
@@ -90,7 +90,7 @@ describe('SpansSearchBar', () => {
     mockSpanTags({type: 'boolean', mockedTags: []});
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/trace-items/attributes/validate/',
+      url: `/organizations/org-slug/trace-items/attributes/validate/`,
       method: 'POST',
       body: {attributes: {}},
     });
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/thresholdsStep/thresholdsHoverWrapper.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/thresholdsStep/thresholdsHoverWrapper.tsx
index d18682d81a27..a8bcb8c112ae 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/thresholdsStep/thresholdsHoverWrapper.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/thresholdsStep/thresholdsHoverWrapper.tsx
@@ -28,7 +28,7 @@ export function ThresholdsHoverWrapper({children, thresholds, type}: Props) {
   const theme = useTheme();
   const formattedUnit =
     unit && (type === 'duration' ? `${unit}s` : `/${unit.split('/')[1]}`);
-  const title = unit ? t('Thresholds in %s', formattedUnit) : t('Thresholds');
+  const title = unit ? t(`Thresholds in %s`, formattedUnit) : t('Thresholds');
 
   const notSetMsg = t('Not set');
   const maxOneValue = max1 ?? notSetMsg;
diff --git a/static/app/views/dashboards/widgetBuilder/components/datasetSelector.tsx b/static/app/views/dashboards/widgetBuilder/components/datasetSelector.tsx
index b57636fc9928..ec7323589be0 100644
--- a/static/app/views/dashboards/widgetBuilder/components/datasetSelector.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/datasetSelector.tsx
@@ -94,7 +94,7 @@ export function WidgetBuilderDatasetSelector() {
       <StyledSectionHeader
         title={t('Dataset')}
         tooltipText={tct(
-          'This reflects the type of information you want to use. To learn more, [link: read the docs].',
+          `This reflects the type of information you want to use. To learn more, [link: read the docs].`,
           {
             link: (
               <ExternalLink href="https://docs.sentry.io/product/dashboards/widget-builder/#choose-your-dataset" />
diff --git a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
index 61597a096803..649f319eec5e 100644
--- a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
@@ -152,7 +152,7 @@ describe('NewWidgetBuilder', () => {
     // Test sort by selector for table display type
     expect(screen.getByText('Sort by')).toBeInTheDocument();
     expect(screen.getByText('High to low')).toBeInTheDocument();
-    expect(screen.getByText('Select a column\u{2026}')).toBeInTheDocument();
+    expect(screen.getByText(`Select a column\u{2026}`)).toBeInTheDocument();
 
     expect(await screen.findByPlaceholderText('Name')).toBeInTheDocument();
     expect(await screen.findByTestId('add-description')).toBeInTheDocument();
diff --git a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
index eb9d8282c212..00e100897c8b 100644
--- a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
@@ -467,7 +467,7 @@ const SampleWidgetCard = styled(motion.div)`
   }
 `;
 
-const DraggableWidgetContainer = styled('div')`
+const DraggableWidgetContainer = styled(`div`)`
   align-content: center;
   z-index: ${p => p.theme.zIndex.initial};
   position: relative;
diff --git a/static/app/views/dashboards/widgetBuilder/components/sortBySelector.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/sortBySelector.spec.tsx
index 4d14e0e3d117..32fac0ab2be0 100644
--- a/static/app/views/dashboards/widgetBuilder/components/sortBySelector.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/sortBySelector.spec.tsx
@@ -95,7 +95,7 @@ describe('WidgetBuilderSortBySelector', () => {
 
     expect(await screen.findByText('Sort by')).toBeInTheDocument();
     expect(await screen.findByText('High to low')).toBeInTheDocument();
-    expect(await screen.findByText('Select a column\u{2026}')).toBeInTheDocument();
+    expect(await screen.findByText(`Select a column\u{2026}`)).toBeInTheDocument();
   });
 
   it('renders and functions correctly', async () => {
@@ -204,7 +204,7 @@ describe('WidgetBuilderSortBySelector', () => {
     const mockNavigate = jest.fn();
     mockUseNavigate.mockReturnValue(mockNavigate);
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/trace-items/attributes/',
+      url: `/organizations/org-slug/trace-items/attributes/`,
       body: [{key: 'span.duration', name: 'span.duration'}],
       match: [
         function (_url: string, options: Record<string, any>) {
@@ -416,7 +416,7 @@ describe('WidgetBuilderSortBySelector', () => {
     );
 
     const sortDirectionSelector = await screen.findByText('High to low');
-    const sortFieldSelector = await screen.findByText('Select a column\u{2026}');
+    const sortFieldSelector = await screen.findByText(`Select a column\u{2026}`);
 
     expect(sortFieldSelector).toBeInTheDocument();
 
diff --git a/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx b/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
index 9f2a3bd39d9b..b17494c07127 100644
--- a/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
@@ -12,7 +12,6 @@ import isEqual from 'lodash/isEqual';
 
 import {Alert} from '@sentry/scraps/alert';
 import {Button} from '@sentry/scraps/button';
-import {useHotkeys} from '@sentry/scraps/hotkey';
 import {Flex} from '@sentry/scraps/layout';
 import {ExternalLink, Link} from '@sentry/scraps/link';
 import {SlideOverPanel} from '@sentry/scraps/slideOverPanel';
@@ -20,7 +19,6 @@ import {SlideOverPanel} from '@sentry/scraps/slideOverPanel';
 import {Breadcrumbs} from 'sentry/components/breadcrumbs';
 import {openConfirmModal} from 'sentry/components/confirm';
 import {ErrorBoundary} from 'sentry/components/errorBoundary';
-import {useGlobalModal} from 'sentry/components/globalModal/useGlobalModal';
 import {Placeholder} from 'sentry/components/placeholder';
 import {IconClose} from 'sentry/icons';
 import {t, tctCode} from 'sentry/locale';
@@ -101,7 +99,6 @@ export function WidgetBuilderSlideout({
 }: WidgetBuilderSlideoutProps) {
   const organization = useOrganization();
   const location = useLocation();
-  const {visible: isModalVisible} = useGlobalModal();
   const {state, dispatch} = useWidgetBuilderContext();
   const [initialState] = useState(state);
   const [customizeFromLibrary, setCustomizeFromLibrary] = useState(false);
@@ -237,19 +234,6 @@ export function WidgetBuilderSlideout({
     });
   }, [initialState, onClose, state]);
 
-  useHotkeys([
-    {
-      match: 'Escape',
-      skipPreventDefault: true,
-      callback: (evt: KeyboardEvent) => {
-        if (!isModalVisible) {
-          evt.preventDefault();
-          onCloseWithModal();
-        }
-      },
-    },
-  ]);
-
   const breadcrumbs = customizeFromLibrary
     ? [
         {
diff --git a/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx
index e9af15be4bac..77c182e80e7f 100644
--- a/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.spec.tsx
@@ -37,9 +37,7 @@ describe('convertBuilderStateToWidget', () => {
           selectedAggregate: undefined,
         },
       ],
-      legendType: null,
       thresholds: undefined,
-      axisRange: undefined,
     });
   });
 
@@ -300,30 +298,4 @@ describe('convertBuilderStateToWidget', () => {
       axisRange: undefined,
     });
   });
-
-  it('sends null legendType when legend breakdown is not set', () => {
-    const mockState: WidgetBuilderState = {
-      dataset: WidgetType.ERRORS,
-      displayType: DisplayType.LINE,
-      legendType: undefined,
-    };
-
-    const widget = convertBuilderStateToWidget(mockState);
-
-    // legendType must be null (not undefined) so it survives JSON serialization
-    // and the backend clears the previously saved value
-    expect(widget.legendType).toBeNull();
-  });
-
-  it('preserves breakdown legendType when set', () => {
-    const mockState: WidgetBuilderState = {
-      dataset: WidgetType.ERRORS,
-      displayType: DisplayType.LINE,
-      legendType: 'breakdown',
-    };
-
-    const widget = convertBuilderStateToWidget(mockState);
-
-    expect(widget.legendType).toBe('breakdown');
-  });
 });
diff --git a/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts
index f2241a082c7d..39b6d31326eb 100644
--- a/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts
+++ b/static/app/views/dashboards/widgetBuilder/utils/convertBuilderStateToWidget.ts
@@ -147,7 +147,7 @@ export function convertBuilderStateToWidget(state: WidgetBuilderState): Widget {
     queries: widgetQueries,
     widgetType: state.dataset,
     limit,
-    legendType: state.legendType ?? null,
+    legendType: state.legendType,
     thresholds: state.thresholds,
     axisRange: getAxisRange(state.axisRange) ?? datasetConfig.axisRange,
   };
diff --git a/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts b/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts
index 0dbd86a8f41d..c2786d19b68e 100644
--- a/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts
+++ b/static/app/views/dashboards/widgetBuilder/utils/convertWidgetToBuilderStateParams.ts
@@ -69,7 +69,7 @@ export function convertWidgetToQueryParams(
     sort,
     legendAlias,
     selectedAggregate: firstWidgetQuery?.selectedAggregate,
-    legendType: widget.legendType ?? undefined,
+    legendType: widget.legendType,
     thresholds: widget.thresholds ? serializeThresholds(widget.thresholds) : undefined,
     axisRange: getAxisRange(widget.axisRange) ?? 'auto',
     linkedDashboards: firstWidgetQuery?.linkedDashboards
diff --git a/static/app/views/dashboards/widgetCard/chart.tsx b/static/app/views/dashboards/widgetCard/chart.tsx
index 408d7164831e..5efdb037e42a 100644
--- a/static/app/views/dashboards/widgetCard/chart.tsx
+++ b/static/app/views/dashboards/widgetCard/chart.tsx
@@ -964,7 +964,7 @@ const BigNumberResizeWrapper = styled('div')<{noPadding?: boolean}>`
   position: relative;
   padding: ${p =>
     p.noPadding
-      ? '0'
+      ? `0`
       : `${p.theme.space.md} ${p.theme.space['2xl']} ${p.theme.space['2xl']} ${p.theme.space['2xl']}`};
 `;
 
@@ -985,7 +985,7 @@ const BigNumber = styled('div')`
 const ChartWrapper = styled('div')<{autoHeightResize: boolean; noPadding?: boolean}>`
   ${p => p.autoHeightResize && 'height: 100%;'}
   width: 100%;
-  padding: ${p => (p.noPadding ? '0' : `0 ${p.theme.space.xl} ${p.theme.space.xl}`)};
+  padding: ${p => (p.noPadding ? `0` : `0 ${p.theme.space.xl} ${p.theme.space.xl}`)};
   display: flex;
   flex-direction: column;
   gap: ${p => p.theme.space.md};
diff --git a/static/app/views/dashboards/widgetCard/hooks/useErrorsAndTransactionsWidgetQuery.tsx b/static/app/views/dashboards/widgetCard/hooks/useErrorsAndTransactionsWidgetQuery.tsx
index 07982e74da16..8467a8bddd84 100644
--- a/static/app/views/dashboards/widgetCard/hooks/useErrorsAndTransactionsWidgetQuery.tsx
+++ b/static/app/views/dashboards/widgetCard/hooks/useErrorsAndTransactionsWidgetQuery.tsx
@@ -143,7 +143,7 @@ export function useErrorsAndTransactionsSeriesQuery(
       }
 
       return [
-        getApiUrl('/organizations/$organizationIdOrSlug/events-stats/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events-stats/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
@@ -415,7 +415,7 @@ export function useErrorsAndTransactionsTableQuery(
       };
 
       const baseQueryKey: ApiQueryKey = [
-        getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
diff --git a/static/app/views/dashboards/widgetCard/hooks/useErrorsWidgetQuery.tsx b/static/app/views/dashboards/widgetCard/hooks/useErrorsWidgetQuery.tsx
index 33e829f270f5..1bc1bd0a331c 100644
--- a/static/app/views/dashboards/widgetCard/hooks/useErrorsWidgetQuery.tsx
+++ b/static/app/views/dashboards/widgetCard/hooks/useErrorsWidgetQuery.tsx
@@ -98,7 +98,7 @@ export function useErrorsSeriesQuery(
       }
 
       return [
-        getApiUrl('/organizations/$organizationIdOrSlug/events-stats/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events-stats/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
@@ -280,7 +280,7 @@ export function useErrorsTableQuery(
       };
 
       const baseQueryKey: ApiQueryKey = [
-        getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
diff --git a/static/app/views/dashboards/widgetCard/hooks/useIssuesWidgetQuery.tsx b/static/app/views/dashboards/widgetCard/hooks/useIssuesWidgetQuery.tsx
index 699f139d0383..5779cd2f5f4e 100644
--- a/static/app/views/dashboards/widgetCard/hooks/useIssuesWidgetQuery.tsx
+++ b/static/app/views/dashboards/widgetCard/hooks/useIssuesWidgetQuery.tsx
@@ -101,7 +101,7 @@ export function useIssuesSeriesQuery(
       }
 
       return [
-        getApiUrl('/organizations/$organizationIdOrSlug/issues-timeseries/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/issues-timeseries/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
@@ -276,7 +276,7 @@ export function useIssuesTableQuery(
       }
 
       const baseQueryKey: ApiQueryKey = [
-        getApiUrl('/organizations/$organizationIdOrSlug/issues/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/issues/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
diff --git a/static/app/views/dashboards/widgetCard/hooks/useLogsWidgetQuery.tsx b/static/app/views/dashboards/widgetCard/hooks/useLogsWidgetQuery.tsx
index bb5ae277c108..dda2e6876c2c 100644
--- a/static/app/views/dashboards/widgetCard/hooks/useLogsWidgetQuery.tsx
+++ b/static/app/views/dashboards/widgetCard/hooks/useLogsWidgetQuery.tsx
@@ -103,7 +103,7 @@ export function useLogsSeriesQuery(
       }
 
       return [
-        getApiUrl('/organizations/$organizationIdOrSlug/events-stats/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events-stats/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
@@ -268,7 +268,7 @@ export function useLogsTableQuery(
       };
 
       const baseQueryKey: ApiQueryKey = [
-        getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
diff --git a/static/app/views/dashboards/widgetCard/hooks/useMobileAppSizeWidgetQuery.tsx b/static/app/views/dashboards/widgetCard/hooks/useMobileAppSizeWidgetQuery.tsx
index 466980ff6f0e..5f0cb7491b98 100644
--- a/static/app/views/dashboards/widgetCard/hooks/useMobileAppSizeWidgetQuery.tsx
+++ b/static/app/views/dashboards/widgetCard/hooks/useMobileAppSizeWidgetQuery.tsx
@@ -91,7 +91,7 @@ export function useMobileAppSizeSeriesQuery(
       }
 
       return [
-        getApiUrl('/organizations/$organizationIdOrSlug/events-stats/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events-stats/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
diff --git a/static/app/views/dashboards/widgetCard/hooks/useSpansWidgetQuery.tsx b/static/app/views/dashboards/widgetCard/hooks/useSpansWidgetQuery.tsx
index 16f9abcbcb3c..a9d2545bcd38 100644
--- a/static/app/views/dashboards/widgetCard/hooks/useSpansWidgetQuery.tsx
+++ b/static/app/views/dashboards/widgetCard/hooks/useSpansWidgetQuery.tsx
@@ -127,7 +127,7 @@ export function useSpansSeriesQuery(
 
       // Build the API query key for events-stats endpoint
       return [
-        getApiUrl('/organizations/$organizationIdOrSlug/events-stats/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events-stats/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
@@ -354,7 +354,7 @@ export function useSpansTableQuery(
       };
 
       const baseQueryKey: ApiQueryKey = [
-        getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
diff --git a/static/app/views/dashboards/widgetCard/hooks/useTraceMetricsWidgetQuery.tsx b/static/app/views/dashboards/widgetCard/hooks/useTraceMetricsWidgetQuery.tsx
index e57948ceb796..a7ae463f28ba 100644
--- a/static/app/views/dashboards/widgetCard/hooks/useTraceMetricsWidgetQuery.tsx
+++ b/static/app/views/dashboards/widgetCard/hooks/useTraceMetricsWidgetQuery.tsx
@@ -117,7 +117,7 @@ export function useTraceMetricsSeriesQuery(
 
       // Build the API query key for events-timeseries endpoint
       return [
-        getApiUrl('/organizations/$organizationIdOrSlug/events-timeseries/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events-timeseries/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
@@ -303,7 +303,7 @@ export function useTraceMetricsTableQuery(
       };
 
       const baseQueryKey: ApiQueryKey = [
-        getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
diff --git a/static/app/views/dashboards/widgetCard/hooks/useTransactionsWidgetQuery.tsx b/static/app/views/dashboards/widgetCard/hooks/useTransactionsWidgetQuery.tsx
index 4aac8a753347..b0e2cb4ec2ff 100644
--- a/static/app/views/dashboards/widgetCard/hooks/useTransactionsWidgetQuery.tsx
+++ b/static/app/views/dashboards/widgetCard/hooks/useTransactionsWidgetQuery.tsx
@@ -127,7 +127,7 @@ export function useTransactionsSeriesQuery(
 
       // Build the API query key for events-stats endpoint
       return [
-        getApiUrl('/organizations/$organizationIdOrSlug/events-stats/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events-stats/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
@@ -381,7 +381,7 @@ export function useTransactionsTableQuery(
       };
 
       const baseQueryKey: ApiQueryKey = [
-        getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
diff --git a/static/app/views/dashboards/widgetCard/index.tsx b/static/app/views/dashboards/widgetCard/index.tsx
index b9b7d1a3f563..f2186e76a10c 100644
--- a/static/app/views/dashboards/widgetCard/index.tsx
+++ b/static/app/views/dashboards/widgetCard/index.tsx
@@ -52,8 +52,6 @@ import {WidgetCardChartContainer} from 'sentry/views/dashboards/widgetCard/widge
 import type {WidgetLegendSelectionState} from 'sentry/views/dashboards/widgetLegendSelectionState';
 import type {TabularColumn} from 'sentry/views/dashboards/widgets/common/types';
 import {Widget} from 'sentry/views/dashboards/widgets/widget/widget';
-import {useLLMContext} from 'sentry/views/seerExplorer/contexts/llmContext';
-import {registerLLMContext} from 'sentry/views/seerExplorer/contexts/registerLLMContext';
 
 import {useDashboardsMEPContext} from './dashboardsMEPContext';
 import {VisualizationWidget} from './visualizationWidget';
@@ -64,7 +62,6 @@ import {
   useTransactionsDeprecationWarning,
 } from './widgetCardContextMenu';
 import {WidgetFrame} from './widgetFrame';
-import {getWidgetQueryLLMHint} from './widgetLLMContext';
 
 export type OnDataFetchedParams = {
   tableResults?: TableDataWithTitle[];
@@ -150,28 +147,6 @@ function WidgetCard(props: Props) {
   const {dashboardId: currentDashboardId} = useParams<{dashboardId: string}>();
   const timeoutRef = useRef<NodeJS.Timeout | null>(null);
 
-  // Resolve TOP_N → AREA before capturing context (the render body mutates
-  // this later, but useLLMContext needs the resolved value on first render).
-  const resolvedDisplayType =
-    props.widget.displayType === DisplayType.TOP_N
-      ? DisplayType.AREA
-      : props.widget.displayType;
-
-  // Push widget metadata into the LLM context tree for Seer Explorer.
-  useLLMContext({
-    title: props.widget.title,
-    displayType: resolvedDisplayType,
-    widgetType: props.widget.widgetType,
-    queryHint: getWidgetQueryLLMHint(resolvedDisplayType),
-    queries: props.widget.queries.map(q => ({
-      name: q.name,
-      conditions: q.conditions,
-      aggregates: q.aggregates,
-      columns: q.columns,
-      orderby: q.orderby,
-    })),
-  });
-
   const onDataFetched = (newData: Data) => {
     if (props.onDataFetched) {
       props.onDataFetched({
@@ -460,10 +435,7 @@ function WidgetCard(props: Props) {
   );
 }
 
-export default registerLLMContext(
-  'widget',
-  withApi(withOrganization(withPageFilters(withSentryRouter(WidgetCard))))
-);
+export default withApi(withOrganization(withPageFilters(withSentryRouter(WidgetCard))));
 
 function useOnDemandWarning(props: {widget: TWidget}): string | null {
   const organization = useOrganization();
@@ -531,7 +503,7 @@ function useTimeRangeWarning({widget}: {widget: TWidget}) {
     (retentionLimitDate && statsPeriodToEnd && retentionLimitDate > statsPeriodToEnd)
   ) {
     return tct(
-      "You've selected a time range longer than the retention period for some datasets. Data older than [numDays] days may be unavailable.",
+      `You've selected a time range longer than the retention period for some datasets. Data older than [numDays] days may be unavailable.`,
       {
         numDays: retentionLimitDays,
       }
diff --git a/static/app/views/dashboards/widgetCard/releaseWidgetQueries.spec.tsx b/static/app/views/dashboards/widgetCard/releaseWidgetQueries.spec.tsx
index ae7e0f54bb58..9399ffe9c8fc 100644
--- a/static/app/views/dashboards/widgetCard/releaseWidgetQueries.spec.tsx
+++ b/static/app/views/dashboards/widgetCard/releaseWidgetQueries.spec.tsx
@@ -25,16 +25,16 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
     queries: [
       {
         conditions: '',
-        fields: ['sum(session)'],
-        aggregates: ['sum(session)'],
+        fields: [`sum(session)`],
+        aggregates: [`sum(session)`],
         columns: [],
         name: 'sessions',
         orderby: '',
       },
       {
         conditions: 'environment:prod',
-        fields: ['sum(session)'],
-        aggregates: ['sum(session)'],
+        fields: [`sum(session)`],
+        aggregates: [`sum(session)`],
         columns: [],
         name: 'users',
         orderby: '',
@@ -49,8 +49,8 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
     queries: [
       {
         conditions: '',
-        fields: ['count_unique(user)'],
-        aggregates: ['count_unique(user)'],
+        fields: [`count_unique(user)`],
+        aggregates: [`count_unique(user)`],
         columns: [],
         name: 'sessions',
         orderby: '-count_unique(user)',
@@ -82,7 +82,7 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
   it('can send chart requests', async () => {
     const mock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/metrics/data/',
-      body: MetricsFieldFixture('session.all'),
+      body: MetricsFieldFixture(`session.all`),
     });
     const children = jest.fn(() => <div />);
 
@@ -129,8 +129,8 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
     const queries = [
       {
         conditions: '',
-        fields: ['count_unique(user)'],
-        aggregates: ['count_unique(user)'],
+        fields: [`count_unique(user)`],
+        aggregates: [`count_unique(user)`],
         columns: ['release'],
         name: 'sessions',
         orderby: '-release',
@@ -178,14 +178,14 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
   it('calls session api when session.status is a group by', async () => {
     const mock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/sessions/',
-      body: MetricsFieldFixture('count_unique(user)'),
+      body: MetricsFieldFixture(`count_unique(user)`),
     });
     const children = jest.fn(() => <div />);
     const queries = [
       {
         conditions: '',
-        fields: ['count_unique(user)'],
-        aggregates: ['count_unique(user)'],
+        fields: [`count_unique(user)`],
+        aggregates: [`count_unique(user)`],
         columns: ['session.status'],
         name: 'sessions',
         orderby: '-count_unique(user)',
@@ -256,8 +256,8 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
       queries: [
         {
           conditions: '',
-          fields: ['sum(session)'],
-          aggregates: ['sum(session)'],
+          fields: [`sum(session)`],
+          aggregates: [`sum(session)`],
           columns: [],
           name: 'sessions',
           orderby: '-count_unique(user)',
@@ -540,7 +540,7 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
   it('can send big number requests', async () => {
     const mock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/metrics/data/',
-      body: MetricsFieldFixture('count_unique(sentry.sessions.user)'),
+      body: MetricsFieldFixture(`count_unique(sentry.sessions.user)`),
     });
     const children = jest.fn(() => <div />);
 
@@ -585,10 +585,10 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
   it('can send multiple API requests', async () => {
     const metricsMock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/metrics/data/',
-      body: SessionsFieldFixture('session.all'),
+      body: SessionsFieldFixture(`session.all`),
       match: [
         MockApiClient.matchQuery({
-          field: ['session.all'],
+          field: [`session.all`],
         }),
       ],
     });
@@ -644,7 +644,7 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
       body: {detail: badMessage},
       match: [
         MockApiClient.matchQuery({
-          field: ['session.all'],
+          field: [`session.all`],
         }),
       ],
     });
@@ -667,7 +667,7 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
   it('adjusts interval based on date window', async () => {
     const mock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/metrics/data/',
-      body: SessionsFieldFixture('session.all'),
+      body: SessionsFieldFixture(`session.all`),
     });
 
     PageFiltersStore.onInitializeUrlState({
@@ -699,7 +699,7 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
   it('does not re-fetch when renaming legend alias / adding falsy fields', async () => {
     const mock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/metrics/data/',
-      body: SessionsFieldFixture('session.all'),
+      body: SessionsFieldFixture(`session.all`),
     });
     const children = jest.fn(() => <div />);
 
@@ -737,7 +737,7 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
   it('does not re-fetch when dashboard filter remains the same', async () => {
     const mock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/metrics/data/',
-      body: SessionsFieldFixture('session.all'),
+      body: SessionsFieldFixture(`session.all`),
     });
     const children = jest.fn(() => <div />);
 
@@ -772,7 +772,7 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
   it('fetches releases if required', async () => {
     const dataMock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/metrics/data/',
-      body: SessionsFieldFixture('session.all'),
+      body: SessionsFieldFixture(`session.all`),
     });
 
     const releasesMock = MockApiClient.addMockResponse({
@@ -791,8 +791,8 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
         {
           name: '',
           conditions: '',
-          fields: ['count_unique(user)'],
-          aggregates: ['count_unique(user)'],
+          fields: [`count_unique(user)`],
+          aggregates: [`count_unique(user)`],
           columns: ['release'],
           orderby: '-count_unique(user)',
         },
@@ -838,7 +838,7 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
   it('escapes release versions with spaces and special characters', async () => {
     const mock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/metrics/data/',
-      body: MetricsFieldFixture('session.status'),
+      body: MetricsFieldFixture(`session.status`),
     });
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/releases/',
@@ -852,8 +852,8 @@ describe('Dashboards > ReleaseWidgetQueries', () => {
     const queries = [
       {
         conditions: '',
-        fields: ['count_unique(user)'],
-        aggregates: ['count_unique(user)'],
+        fields: [`count_unique(user)`],
+        aggregates: [`count_unique(user)`],
         columns: ['release'],
         name: 'sessions',
         orderby: '-release',
diff --git a/static/app/views/dashboards/widgetCard/spansWidgetQueries.spec.tsx b/static/app/views/dashboards/widgetCard/spansWidgetQueries.spec.tsx
index f1349e73abbb..7b550cff2dda 100644
--- a/static/app/views/dashboards/widgetCard/spansWidgetQueries.spec.tsx
+++ b/static/app/views/dashboards/widgetCard/spansWidgetQueries.spec.tsx
@@ -134,7 +134,7 @@ describe('spansWidgetQueries', () => {
     });
 
     const normalModeMock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events-stats/',
+      url: `/organizations/org-slug/events-stats/`,
       body: {
         data: [
           [1, [{count: 1}]],
@@ -189,7 +189,7 @@ describe('spansWidgetQueries', () => {
     });
 
     const normalModeMock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       body: {
         data: [{a: 'normal mode'}],
       },
diff --git a/static/app/views/dashboards/widgetCard/widgetLLMContext.spec.tsx b/static/app/views/dashboards/widgetCard/widgetLLMContext.spec.tsx
deleted file mode 100644
index ef531f3e34b1..000000000000
--- a/static/app/views/dashboards/widgetCard/widgetLLMContext.spec.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import {DisplayType} from 'sentry/views/dashboards/types';
-
-import {getWidgetQueryLLMHint} from './widgetLLMContext';
-
-describe('getWidgetQueryLLMHint', () => {
-  it.each([
-    [DisplayType.LINE, 'timeseries'],
-    [DisplayType.AREA, 'timeseries'],
-    [DisplayType.BAR, 'timeseries'],
-  ])('returns timeseries hint for %s', (displayType, expected) => {
-    expect(getWidgetQueryLLMHint(displayType)).toContain(expected);
-  });
-
-  it('returns table hint for TABLE', () => {
-    expect(getWidgetQueryLLMHint(DisplayType.TABLE)).toContain('table query');
-  });
-
-  it('returns single aggregate hint for BIG_NUMBER', () => {
-    expect(getWidgetQueryLLMHint(DisplayType.BIG_NUMBER)).toContain('single aggregate');
-    expect(getWidgetQueryLLMHint(DisplayType.BIG_NUMBER)).toContain(
-      'value is included below'
-    );
-  });
-
-  it('returns table hint as default for unknown types', () => {
-    expect(getWidgetQueryLLMHint(DisplayType.WHEEL)).toContain('table query');
-  });
-});
diff --git a/static/app/views/dashboards/widgetCard/widgetLLMContext.tsx b/static/app/views/dashboards/widgetCard/widgetLLMContext.tsx
deleted file mode 100644
index c792a7ed1b34..000000000000
--- a/static/app/views/dashboards/widgetCard/widgetLLMContext.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import {DisplayType} from 'sentry/views/dashboards/types';
-
-/**
- * Returns a hint for the Seer Explorer agent describing how to re-query this
- * widget's data using a tool call, if the user wants to dig deeper.
- */
-export function getWidgetQueryLLMHint(displayType: DisplayType): string {
-  switch (displayType) {
-    case DisplayType.LINE:
-    case DisplayType.AREA:
-    case DisplayType.BAR:
-      return 'To dig deeper into this widget, run a timeseries query using y_axes (aggregates) + group_by (columns) + query (conditions)';
-    case DisplayType.TABLE:
-      return 'To dig deeper into this widget, run a table query using fields (aggregates + columns) + query (conditions) + sort (orderby)';
-    case DisplayType.BIG_NUMBER:
-      return 'To dig deeper into this widget, run a single aggregate query using fields (aggregates) + query (conditions); current value is included below';
-    default:
-      return 'To dig deeper into this widget, run a table query using fields (aggregates + columns) + query (conditions)';
-  }
-}
diff --git a/static/app/views/dashboards/widgets/bigNumberWidget/bigNumberWidgetVisualization.tsx b/static/app/views/dashboards/widgets/bigNumberWidget/bigNumberWidgetVisualization.tsx
index 86bfe284a386..b3062ebd0670 100644
--- a/static/app/views/dashboards/widgets/bigNumberWidget/bigNumberWidgetVisualization.tsx
+++ b/static/app/views/dashboards/widgets/bigNumberWidget/bigNumberWidgetVisualization.tsx
@@ -18,13 +18,11 @@ import type {
   TabularValueUnit,
   Thresholds,
 } from 'sentry/views/dashboards/widgets/common/types';
-import {useLLMContext} from 'sentry/views/seerExplorer/contexts/llmContext';
-import {registerLLMContext} from 'sentry/views/seerExplorer/contexts/registerLLMContext';
 
 import {DEEMPHASIS_VARIANT, LOADING_PLACEHOLDER} from './settings';
 import {ThresholdsIndicator} from './thresholdsIndicator';
 
-type BigNumberWidgetVisualizationProps = {
+interface BigNumberWidgetVisualizationProps {
   field: string;
   value: number | string;
   maximumValue?: number;
@@ -33,9 +31,9 @@ type BigNumberWidgetVisualizationProps = {
   thresholds?: Thresholds;
   type?: TabularValueType;
   unit?: TabularValueUnit;
-};
+}
 
-function BigNumberWidgetVisualizationInner(props: BigNumberWidgetVisualizationProps) {
+export function BigNumberWidgetVisualization(props: BigNumberWidgetVisualizationProps) {
   const {
     field,
     value,
@@ -46,10 +44,6 @@ function BigNumberWidgetVisualizationInner(props: BigNumberWidgetVisualizationPr
     unit,
   } = props;
 
-  // Push parsed display values into the LLM context tree for Seer Explorer.
-  // These are already computed by the parent — no raw data involved.
-  useLLMContext({field, value, type, unit, thresholds: props.thresholds});
-
   const theme = useTheme();
 
   if ((typeof value === 'number' && !Number.isFinite(value)) || Number.isNaN(value)) {
@@ -212,11 +206,6 @@ const LoadingPlaceholder = styled('span')`
   font-size: ${p => p.theme.font.size.lg};
 `;
 
-export const BigNumberWidgetVisualization = Object.assign(
-  registerLLMContext('chart', BigNumberWidgetVisualizationInner),
-  {
-    LoadingPlaceholder() {
-      return <LoadingPlaceholder>{LOADING_PLACEHOLDER}</LoadingPlaceholder>;
-    },
-  }
-);
+BigNumberWidgetVisualization.LoadingPlaceholder = function () {
+  return <LoadingPlaceholder>{LOADING_PLACEHOLDER}</LoadingPlaceholder>;
+};
diff --git a/static/app/views/dashboards/widgets/textWidget/textWidgetVisualization.stories.tsx b/static/app/views/dashboards/widgets/textWidget/textWidgetVisualization.stories.tsx
index 341a52031ddf..8916a3c01fbf 100644
--- a/static/app/views/dashboards/widgets/textWidget/textWidgetVisualization.stories.tsx
+++ b/static/app/views/dashboards/widgets/textWidget/textWidgetVisualization.stories.tsx
@@ -72,9 +72,7 @@ export default Storybook.story('TextWidgetVisualization', story => {
             <p>Headings &amp; emphasis</p>
             <InvisibleWidgetFrame>
               <TextWidgetVisualization
-                text={
-                  '# Dashboard Notes\n\nThis widget shows **critical** metrics for the *payments* service.'
-                }
+                text={`# Dashboard Notes\n\nThis widget shows **critical** metrics for the *payments* service.`}
               />
             </InvisibleWidgetFrame>
           </div>
@@ -82,9 +80,7 @@ export default Storybook.story('TextWidgetVisualization', story => {
             <p>Links &amp; lists</p>
             <InvisibleWidgetFrame>
               <TextWidgetVisualization
-                text={
-                  '## Runbook\n\n- Check the [error dashboard](https://sentry.io)\n- Review recent deploys\n- Page on-call if p99 > 500ms'
-                }
+                text={`## Runbook\n\n- Check the [error dashboard](https://sentry.io)\n- Review recent deploys\n- Page on-call if p99 > 500ms`}
               />
             </InvisibleWidgetFrame>
           </div>
@@ -110,9 +106,7 @@ export default Storybook.story('TextWidgetVisualization', story => {
         </p>
         <InvisibleWidgetFrame>
           <TextWidgetVisualization
-            text={
-              '# Section 1\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\n\n# Section 2\n\nPellentesque habitant morbi tristique senectus et netus.\n\n# Section 3\n\nVivamus lacinia odio vitae vestibulum vestibulum.\n\n# Section 4\n\nDonec in efficitur leo, in commodo orci.'
-            }
+            text={`# Section 1\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\n\n# Section 2\n\nPellentesque habitant morbi tristique senectus et netus.\n\n# Section 3\n\nVivamus lacinia odio vitae vestibulum vestibulum.\n\n# Section 4\n\nDonec in efficitur leo, in commodo orci.`}
           />
         </InvisibleWidgetFrame>
       </Fragment>
diff --git a/static/app/views/detectors/components/connectedAutomationsEmptyState.tsx b/static/app/views/detectors/components/connectedAutomationsEmptyState.tsx
deleted file mode 100644
index fb7b5d00b161..000000000000
--- a/static/app/views/detectors/components/connectedAutomationsEmptyState.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import styled from '@emotion/styled';
-
-import {ProjectAvatar} from '@sentry/scraps/avatar';
-import {Flex, Stack} from '@sentry/scraps/layout';
-import {Text} from '@sentry/scraps/text';
-
-import {tct} from 'sentry/locale';
-import type {AvatarProject} from 'sentry/types/project';
-
-interface ConnectedAlertsEmptyStateProps {
-  project: AvatarProject;
-  children?: React.ReactNode;
-}
-
-export function ConnectedAlertsEmptyState({
-  project,
-  children,
-}: ConnectedAlertsEmptyStateProps) {
-  return (
-    <Stack gap="lg" align="center" maxWidth="300px">
-      {children && (
-        <Stack gap="md" align="center">
-          {children}
-        </Stack>
-      )}
-      <Text variant="muted" align="center" density="comfortable">
-        {tct(
-          'Alerts configured for all Issues in the project [project] will also apply to this Monitor.',
-          {
-            project: (
-              <InlineProjectName display="inline-flex" align="center" gap="xs">
-                <ProjectAvatar project={project} size={16} />
-                <strong>{project.slug}</strong>
-              </InlineProjectName>
-            ),
-          }
-        )}
-      </Text>
-    </Stack>
-  );
-}
-
-const InlineProjectName = styled(Flex)`
-  vertical-align: bottom;
-`;
diff --git a/static/app/views/detectors/components/details/common/automations.spec.tsx b/static/app/views/detectors/components/details/common/automations.spec.tsx
index a7cd18fea83a..30d7e6fe8583 100644
--- a/static/app/views/detectors/components/details/common/automations.spec.tsx
+++ b/static/app/views/detectors/components/details/common/automations.spec.tsx
@@ -24,12 +24,9 @@ describe('DetectorDetailsAutomations', () => {
   const automation1 = AutomationFixture({id: '1', name: 'Alert 1'});
   const issueStreamDetector = IssueStreamDetectorFixture({id: '4'});
 
-  const project = ProjectFixture({id: '1'});
-
   beforeEach(() => {
     jest.clearAllMocks();
     MockApiClient.clearMockResponses();
-    ProjectsStore.loadInitialData([project]);
 
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/detectors/',
@@ -300,7 +297,8 @@ describe('DetectorDetailsAutomations', () => {
         projectId: '1',
         workflowIds: [automation1.id],
       });
-      ProjectsStore.loadInitialData([projectWithoutAlertsWrite]);
+
+      act(() => ProjectsStore.loadInitialData([projectWithoutAlertsWrite]));
 
       MockApiClient.addMockResponse({
         url: '/organizations/org-slug/workflows/',
diff --git a/static/app/views/detectors/components/details/common/automations.tsx b/static/app/views/detectors/components/details/common/automations.tsx
index 0acec2924063..a5c364b4c463 100644
--- a/static/app/views/detectors/components/details/common/automations.tsx
+++ b/static/app/views/detectors/components/details/common/automations.tsx
@@ -30,7 +30,6 @@ import {useAutomationsQuery} from 'sentry/views/automations/hooks';
 import {getAutomationActions} from 'sentry/views/automations/hooks/utils';
 import {makeAutomationCreatePathname} from 'sentry/views/automations/pathnames';
 import {ConnectAutomationsDrawer} from 'sentry/views/detectors/components/connectAutomationsDrawer';
-import {ConnectedAlertsEmptyState} from 'sentry/views/detectors/components/connectedAutomationsEmptyState';
 import {useUpdateDetector} from 'sentry/views/detectors/hooks';
 import {useCanEditDetectorWorkflowConnections} from 'sentry/views/detectors/utils/useCanEditDetector';
 import {useIssueStreamDetectorsForProject} from 'sentry/views/detectors/utils/useIssueStreamDetectorsForProject';
@@ -223,7 +222,6 @@ export function DetectorDetailsAutomations({detector}: Props) {
   const queryClient = useQueryClient();
   const {openDrawer, closeDrawer, isDrawerOpen} = useDrawer();
   const {mutate: updateDetector} = useUpdateDetector();
-  const project = useProjectFromId({project_id: detector.projectId});
   const canEditWorkflowConnections = useCanEditDetectorWorkflowConnections({
     projectId: detector.projectId,
   });
@@ -306,8 +304,8 @@ export function DetectorDetailsAutomations({detector}: Props) {
           detectorId={detector.id}
           projectId={detector.projectId}
           emptyMessage={
-            project ? (
-              <ConnectedAlertsEmptyState project={project}>
+            <Stack gap="xl" align="center">
+              <Stack gap="sm" align="center">
                 <Button
                   size="sm"
                   onClick={toggleDrawer}
@@ -328,10 +326,8 @@ export function DetectorDetailsAutomations({detector}: Props) {
                 >
                   {t('Create a New Alert')}
                 </LinkButton>
-              </ConnectedAlertsEmptyState>
-            ) : (
-              t('No alerts connected')
-            )
+              </Stack>
+            </Stack>
           }
         />
       </ErrorBoundary>
diff --git a/static/app/views/detectors/components/details/common/openPeriodIssues.spec.tsx b/static/app/views/detectors/components/details/common/openPeriodIssues.spec.tsx
index fa4bf1da4051..969bb557ff18 100644
--- a/static/app/views/detectors/components/details/common/openPeriodIssues.spec.tsx
+++ b/static/app/views/detectors/components/details/common/openPeriodIssues.spec.tsx
@@ -35,12 +35,12 @@ describe('DetectorDetailsOpenPeriodIssues', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1234/',
+      url: `/organizations/org-slug/issues/1234/`,
       body: detector.latestGroup,
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/open-periods/',
+      url: `/organizations/org-slug/open-periods/`,
       body: [
         {
           start: '2025-06-01T10:00:00Z',
diff --git a/static/app/views/detectors/components/details/cron/index.spec.tsx b/static/app/views/detectors/components/details/cron/index.spec.tsx
index 6e2947b5b8d3..77d6fc3909b6 100644
--- a/static/app/views/detectors/components/details/cron/index.spec.tsx
+++ b/static/app/views/detectors/components/details/cron/index.spec.tsx
@@ -44,23 +44,23 @@ describe('CronDetectorDetails - check-ins', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/detectors/1/',
+      url: `/organizations/org-slug/detectors/1/`,
       body: detector,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/detectors/2/',
+      url: `/organizations/org-slug/detectors/2/`,
       body: detector,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/?limit=5&query=is%3Aunresolved%20detector%3A1&statsPeriod=14d',
+      url: `/organizations/org-slug/issues/?limit=5&query=is%3Aunresolved%20detector%3A1&statsPeriod=14d`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/users/',
+      url: `/organizations/org-slug/users/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/users/1/',
+      url: `/organizations/org-slug/users/1/`,
       body: UserFixture(),
     });
     MockApiClient.addMockResponse({
@@ -68,7 +68,7 @@ describe('CronDetectorDetails - check-ins', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/',
+      url: `/organizations/org-slug/issues/1/`,
       body: GroupFixture(),
     });
     MockApiClient.addMockResponse({
@@ -76,11 +76,11 @@ describe('CronDetectorDetails - check-ins', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/detectors/',
+      url: `/organizations/org-slug/detectors/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/workflows/',
+      url: `/organizations/org-slug/workflows/`,
       body: [],
     });
   });
@@ -115,7 +115,7 @@ describe('CronDetectorDetails - check-ins', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/detectors/2/',
+      url: `/organizations/org-slug/detectors/2/`,
       body: noCheckInDetector,
     });
 
@@ -294,7 +294,7 @@ describe('CronDetectorDetails - check-ins', () => {
       });
 
       MockApiClient.addMockResponse({
-        url: '/organizations/org-slug/detectors/2/',
+        url: `/organizations/org-slug/detectors/2/`,
         body: noCheckInDetector,
       });
 
@@ -384,7 +384,7 @@ describe('CronDetectorDetails - check-ins', () => {
       });
 
       const detectorRefetchRequest = MockApiClient.addMockResponse({
-        url: '/organizations/org-slug/detectors/1/',
+        url: `/organizations/org-slug/detectors/1/`,
         body: detectorWithMultipleEnvs,
       });
 
diff --git a/static/app/views/detectors/components/details/error/index.spec.tsx b/static/app/views/detectors/components/details/error/index.spec.tsx
index 85ddbbc8a6c4..59da36f156a9 100644
--- a/static/app/views/detectors/components/details/error/index.spec.tsx
+++ b/static/app/views/detectors/components/details/error/index.spec.tsx
@@ -35,19 +35,19 @@ describe('ErrorDetectorDetails', () => {
       body: UserFixture(),
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/',
+      url: `/organizations/org-slug/issues/1/`,
       body: GroupFixture(),
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/',
+      url: `/organizations/org-slug/issues/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/detectors/',
+      url: `/organizations/org-slug/detectors/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/workflows/',
+      url: `/organizations/org-slug/workflows/`,
       body: [],
     });
   });
diff --git a/static/app/views/detectors/components/details/metric/chart.spec.tsx b/static/app/views/detectors/components/details/metric/chart.spec.tsx
index cd4730938774..305c653fb1ef 100644
--- a/static/app/views/detectors/components/details/metric/chart.spec.tsx
+++ b/static/app/views/detectors/components/details/metric/chart.spec.tsx
@@ -28,7 +28,7 @@ describe('MetricDetectorDetailsChart', () => {
 
   it('displays error alert and error panel when API request fails', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events-stats/',
+      url: `/organizations/org-slug/events-stats/`,
       body: {
         detail: 'Invalid query: xyz',
       },
diff --git a/static/app/views/detectors/components/details/metric/charts/metricDetectorChartOptions.tsx b/static/app/views/detectors/components/details/metric/charts/metricDetectorChartOptions.tsx
index 42d1056503db..c5add3f68563 100644
--- a/static/app/views/detectors/components/details/metric/charts/metricDetectorChartOptions.tsx
+++ b/static/app/views/detectors/components/details/metric/charts/metricDetectorChartOptions.tsx
@@ -77,7 +77,7 @@ function createIncidentSeries(
   const formatter = ({value, marker}: any) => {
     const time = formatTooltipDate(moment(value), 'MMM D, YYYY LT');
     return [
-      '<div class="tooltip-series"><div>',
+      `<div class="tooltip-series"><div>`,
       `<span class="tooltip-label">${marker} <strong>${t('Alert')} #${
         openPeriod.id
       }</strong></span>${
@@ -89,7 +89,7 @@ function createIncidentSeries(
             )}`
           : ''
       }`,
-      '</div></div>',
+      `</div></div>`,
       `<div class="tooltip-footer">${time}</div>`,
       '<div class="tooltip-arrow"></div>',
     ].join('');
diff --git a/static/app/views/detectors/components/details/metric/detect.tsx b/static/app/views/detectors/components/details/metric/detect.tsx
index 0cd1dcfe1d2a..0e533df2c106 100644
--- a/static/app/views/detectors/components/details/metric/detect.tsx
+++ b/static/app/views/detectors/components/details/metric/detect.tsx
@@ -115,7 +115,7 @@ export function getConditionDescription({
 
     if (condition.conditionResult === DetectorPriorityLevel.OK) {
       return t(
-        'Below or equal to %(comparisonValue)s%(unit)s %(direction)s than the previous %(timeRange)s',
+        `Below or equal to %(comparisonValue)s%(unit)s %(direction)s than the previous %(timeRange)s`,
         {
           comparisonValue: deltaComparison,
           unit,
@@ -126,7 +126,7 @@ export function getConditionDescription({
     }
 
     return t(
-      '%(comparisonValue)s%(unit)s %(direction)s than the previous %(timeRange)s',
+      `%(comparisonValue)s%(unit)s %(direction)s than the previous %(timeRange)s`,
       {
         comparisonValue: deltaComparison,
         unit,
diff --git a/static/app/views/detectors/components/details/uptime/index.spec.tsx b/static/app/views/detectors/components/details/uptime/index.spec.tsx
index 90269671b225..8ffd0b5fb884 100644
--- a/static/app/views/detectors/components/details/uptime/index.spec.tsx
+++ b/static/app/views/detectors/components/details/uptime/index.spec.tsx
@@ -30,11 +30,11 @@ describe('UptimeDetectorDetails', () => {
       body: {},
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/detectors/',
+      url: `/organizations/org-slug/detectors/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/workflows/',
+      url: `/organizations/org-slug/workflows/`,
       body: [],
     });
     MockApiClient.addMockResponse({
diff --git a/static/app/views/detectors/components/detectorListTable/actions.tsx b/static/app/views/detectors/components/detectorListTable/actions.tsx
index 66a5b2eff600..0421e68cd394 100644
--- a/static/app/views/detectors/components/detectorListTable/actions.tsx
+++ b/static/app/views/detectors/components/detectorListTable/actions.tsx
@@ -68,8 +68,8 @@ export function DetectorsTableActions({
       );
     }
     return tn(
-      'Are you sure you want to enable this %s monitor?',
-      'Are you sure you want to enable these %s monitors?',
+      `Are you sure you want to enable this %s monitor?`,
+      `Are you sure you want to enable these %s monitors?`,
       selected.size
     );
   }, [allInQuerySelected, queryCount, selected.size]);
@@ -84,8 +84,8 @@ export function DetectorsTableActions({
       );
     }
     return tn(
-      'Are you sure you want to disable this %s monitor?',
-      'Are you sure you want to disable these %s monitors?',
+      `Are you sure you want to disable this %s monitor?`,
+      `Are you sure you want to disable these %s monitors?`,
       selected.size
     );
   }, [allInQuerySelected, queryCount, selected.size]);
@@ -128,8 +128,8 @@ export function DetectorsTableActions({
       );
     }
     return tn(
-      'Are you sure you want to delete this %s monitor?',
-      'Are you sure you want to delete these %s monitors?',
+      `Are you sure you want to delete this %s monitor?`,
+      `Are you sure you want to delete these %s monitors?`,
       selected.size
     );
   }, [allInQuerySelected, queryCount, selected.size]);
diff --git a/static/app/views/detectors/components/forms/automateSection.spec.tsx b/static/app/views/detectors/components/forms/automateSection.spec.tsx
index 801595242a33..5537ce38d7aa 100644
--- a/static/app/views/detectors/components/forms/automateSection.spec.tsx
+++ b/static/app/views/detectors/components/forms/automateSection.spec.tsx
@@ -17,6 +17,7 @@ import {
 import {selectEvent} from 'sentry-test/selectEvent';
 
 import {Form} from 'sentry/components/forms/form';
+import {ProjectsStore} from 'sentry/stores/projectsStore';
 import {ActionGroup, ActionType} from 'sentry/types/workflowEngine/actions';
 import {
   DataConditionHandlerGroupType,
@@ -37,6 +38,7 @@ describe('AutomateSection', () => {
   beforeEach(() => {
     jest.resetAllMocks();
     MockApiClient.clearMockResponses();
+    ProjectsStore.loadInitialData([project]);
 
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/workflows/',
@@ -130,8 +132,8 @@ describe('AutomateSection', () => {
 
   it('can connect an existing automation', async () => {
     render(
-      <DetectorFormProvider detectorType="metric_issue" project={project}>
-        <Form>
+      <DetectorFormProvider detectorType="metric_issue">
+        <Form initialData={{projectId: project.id}}>
           <AutomateSection />
         </Form>
       </DetectorFormProvider>
@@ -165,8 +167,8 @@ describe('AutomateSection', () => {
 
   it('can disconnect an existing automation', async () => {
     render(
-      <DetectorFormProvider detectorType="metric_issue" project={project}>
-        <Form initialData={{workflowIds: [automation1.id]}}>
+      <DetectorFormProvider detectorType="metric_issue">
+        <Form initialData={{projectId: project.id, workflowIds: [automation1.id]}}>
           <AutomateSection />
         </Form>
       </DetectorFormProvider>
@@ -217,8 +219,8 @@ describe('AutomateSection', () => {
     });
 
     render(
-      <DetectorFormProvider detectorType="metric_issue" project={project}>
-        <Form>
+      <DetectorFormProvider detectorType="metric_issue">
+        <Form initialData={{projectId: project.id}}>
           <AutomateSection />
         </Form>
       </DetectorFormProvider>
diff --git a/static/app/views/detectors/components/forms/automateSection.tsx b/static/app/views/detectors/components/forms/automateSection.tsx
index cd4268935509..b817c2a366bd 100644
--- a/static/app/views/detectors/components/forms/automateSection.tsx
+++ b/static/app/views/detectors/components/forms/automateSection.tsx
@@ -2,7 +2,8 @@ import {useCallback, useContext, useRef} from 'react';
 import styled from '@emotion/styled';
 
 import {Button} from '@sentry/scraps/button';
-import {Flex} from '@sentry/scraps/layout';
+import {Flex, Stack} from '@sentry/scraps/layout';
+import {Text} from '@sentry/scraps/text';
 
 import {FormContext} from 'sentry/components/forms/formContext';
 import {useDrawer} from 'sentry/components/globalDrawer';
@@ -10,19 +11,18 @@ import {useFormField} from 'sentry/components/workflowEngine/form/useFormField';
 import {Container} from 'sentry/components/workflowEngine/ui/container';
 import {FormSection} from 'sentry/components/workflowEngine/ui/formSection';
 import {IconAdd, IconEdit} from 'sentry/icons';
-import {t} from 'sentry/locale';
+import {t, tct} from 'sentry/locale';
 import {AutomationBuilderDrawerForm} from 'sentry/views/automations/components/automationBuilderDrawerForm';
 import {ConnectAutomationsDrawer} from 'sentry/views/detectors/components/connectAutomationsDrawer';
 import {ConnectedAutomationsList} from 'sentry/views/detectors/components/connectedAutomationList';
-import {ConnectedAlertsEmptyState} from 'sentry/views/detectors/components/connectedAutomationsEmptyState';
-import {useDetectorFormContext} from 'sentry/views/detectors/components/forms/context';
+import {useDetectorFormProject} from 'sentry/views/detectors/components/forms/common/useDetectorFormProject';
 
 export function AutomateSection({step}: {step?: number}) {
   const ref = useRef<HTMLButtonElement>(null);
   const formContext = useContext(FormContext);
   const {openDrawer, closeDrawer, isDrawerOpen} = useDrawer();
 
-  const {project} = useDetectorFormContext();
+  const project = useDetectorFormProject();
   const workflowIds = useFormField('workflowIds') as string[];
   const setWorkflowIds = useCallback(
     (newWorkflowIds: string[]) =>
@@ -110,7 +110,7 @@ export function AutomateSection({step}: {step?: number}) {
           cursor={undefined}
           onCursor={() => {}}
           emptyMessage={
-            <ConnectedAlertsEmptyState project={project}>
+            <Stack gap="md" align="center" maxWidth="300px">
               <Button
                 ref={ref}
                 size="sm"
@@ -119,10 +119,18 @@ export function AutomateSection({step}: {step?: number}) {
               >
                 {t('Connect Existing Alerts')}
               </Button>
-              <Button size="sm" onClick={openCreateDrawer}>
+              <Button size="sm" icon={<IconAdd />} onClick={openCreateDrawer}>
                 {t('Create New Alert')}
               </Button>
-            </ConnectedAlertsEmptyState>
+              <Text variant="muted" align="center">
+                {tct(
+                  'Alerts configured for all Issues in [projectName] will also apply to this Monitor.',
+                  {
+                    projectName: <strong>{project.slug}</strong>,
+                  }
+                )}
+              </Text>
+            </Stack>
           }
         />
       </FormSection>
diff --git a/static/app/views/detectors/components/forms/common/projectField.tsx b/static/app/views/detectors/components/forms/common/projectField.tsx
index 8d401a4f3bdc..23b24d7dd832 100644
--- a/static/app/views/detectors/components/forms/common/projectField.tsx
+++ b/static/app/views/detectors/components/forms/common/projectField.tsx
@@ -3,12 +3,14 @@ import styled from '@emotion/styled';
 import {SentryProjectSelectorField} from 'sentry/components/forms/fields/sentryProjectSelectorField';
 import {t} from 'sentry/locale';
 import {useProjects} from 'sentry/utils/useProjects';
+import {useDetectorFormProject} from 'sentry/views/detectors/components/forms/common/useDetectorFormProject';
 import {useDetectorFormContext} from 'sentry/views/detectors/components/forms/context';
 import {useCanEditDetector} from 'sentry/views/detectors/utils/useCanEditDetector';
 
 export function ProjectField() {
   const {projects, fetching} = useProjects();
-  const {project, detectorType} = useDetectorFormContext();
+  const {detectorType} = useDetectorFormContext();
+  const project = useDetectorFormProject();
   const canEditDetector = useCanEditDetector({projectId: project.id, detectorType});
 
   return (
diff --git a/static/app/views/detectors/components/forms/common/useDetectorFormProject.tsx b/static/app/views/detectors/components/forms/common/useDetectorFormProject.tsx
new file mode 100644
index 000000000000..b38d576277ab
--- /dev/null
+++ b/static/app/views/detectors/components/forms/common/useDetectorFormProject.tsx
@@ -0,0 +1,22 @@
+import {useMemo} from 'react';
+
+import {useFormField} from 'sentry/components/workflowEngine/form/useFormField';
+import type {Project} from 'sentry/types/project';
+import {useProjects} from 'sentry/utils/useProjects';
+
+export function useDetectorFormProject(): Project {
+  const projectId = useFormField<string>('projectId');
+  const {projects} = useProjects();
+  const project = useMemo(
+    () => projects.find(p => p.id === projectId),
+    [projects, projectId]
+  );
+  // There's a top-level spinner when projects are loading, and you can't select a
+  // project that's not in the ProjectStore, so this should never happen.
+  if (!project) {
+    throw new Error(
+      `useDetectorFormProject: no project found for projectId "${projectId}"`
+    );
+  }
+  return project;
+}
diff --git a/static/app/views/detectors/components/forms/common/useSetAutomaticName.spec.tsx b/static/app/views/detectors/components/forms/common/useSetAutomaticName.spec.tsx
index 4fe59334e85e..b1982f75cd6a 100644
--- a/static/app/views/detectors/components/forms/common/useSetAutomaticName.spec.tsx
+++ b/static/app/views/detectors/components/forms/common/useSetAutomaticName.spec.tsx
@@ -34,7 +34,7 @@ describe('useSetAutomaticName', () => {
 
   const renderDetectorForm = (detector?: Detector, initialFormData = {}) => {
     return render(
-      <DetectorFormProvider detectorType="error" project={project} detector={detector}>
+      <DetectorFormProvider detectorType="error" detector={detector}>
         <NewDetectorLayout
           detectorType="error"
           formDataToEndpointPayload={data => data as any}
diff --git a/static/app/views/detectors/components/forms/context.tsx b/static/app/views/detectors/components/forms/context.tsx
index de83ccab0c5a..ae5ab92e4d23 100644
--- a/static/app/views/detectors/components/forms/context.tsx
+++ b/static/app/views/detectors/components/forms/context.tsx
@@ -1,6 +1,5 @@
 import {createContext, useContext, useState} from 'react';
 
-import type {Project} from 'sentry/types/project';
 import type {Detector, DetectorType} from 'sentry/types/workflowEngine/detectors';
 
 type DetectorFormContextType = {
@@ -10,7 +9,6 @@ type DetectorFormContextType = {
    * Used by useSetAutomaticName to disable automatic name generation.
    */
   hasSetDetectorName: boolean;
-  project: Project;
   setHasSetDetectorName: (value: boolean) => void;
   detector?: Detector;
 };
@@ -19,20 +17,18 @@ const DetectorFormContext = createContext<DetectorFormContextType | null>(null);
 
 export function DetectorFormProvider({
   detectorType,
-  project,
   detector,
   children,
 }: {
   children: React.ReactNode;
   detectorType: DetectorType;
-  project: Project;
   detector?: Detector;
 }) {
   const [hasSetDetectorName, setHasSetDetectorName] = useState(false);
 
   return (
     <DetectorFormContext.Provider
-      value={{detectorType, project, hasSetDetectorName, setHasSetDetectorName, detector}}
+      value={{detectorType, hasSetDetectorName, setHasSetDetectorName, detector}}
     >
       {children}
     </DetectorFormContext.Provider>
diff --git a/static/app/views/detectors/components/forms/cron/cronIssuePreview.tsx b/static/app/views/detectors/components/forms/cron/cronIssuePreview.tsx
index 6269b074e045..9952ebc73c56 100644
--- a/static/app/views/detectors/components/forms/cron/cronIssuePreview.tsx
+++ b/static/app/views/detectors/components/forms/cron/cronIssuePreview.tsx
@@ -2,7 +2,7 @@ import {t} from 'sentry/locale';
 import {DetectorIssuePreview} from 'sentry/views/detectors/components/forms/common/detectorIssuePreview';
 import {IssuePreviewSection} from 'sentry/views/detectors/components/forms/common/issuePreviewSection';
 import {ownerToActor} from 'sentry/views/detectors/components/forms/common/ownerToActor';
-import {useDetectorFormContext} from 'sentry/views/detectors/components/forms/context';
+import {useDetectorFormProject} from 'sentry/views/detectors/components/forms/common/useDetectorFormProject';
 import {useCronDetectorFormField} from 'sentry/views/detectors/components/forms/cron/fields';
 
 const FALLBACK_ISSUE_TITLE = t('Cron failure: …');
@@ -22,7 +22,7 @@ export function CronIssuePreview({step}: {step?: number}) {
   const owner = useCronDetectorFormField('owner');
   const issueTitle = useCronIssueTitle();
   const assignee = ownerToActor(owner);
-  const {project} = useDetectorFormContext();
+  const project = useDetectorFormProject();
 
   return (
     <IssuePreviewSection step={step}>
diff --git a/static/app/views/detectors/components/forms/cron/index.spec.tsx b/static/app/views/detectors/components/forms/cron/index.spec.tsx
index 8ccf62848d5b..a4cba9dc59dd 100644
--- a/static/app/views/detectors/components/forms/cron/index.spec.tsx
+++ b/static/app/views/detectors/components/forms/cron/index.spec.tsx
@@ -43,7 +43,7 @@ describe('NewCronDetectorForm', () => {
 
   const renderForm = (routerConfig?: any) => {
     return render(
-      <DetectorFormProvider detectorType="monitor_check_in_failure" project={project}>
+      <DetectorFormProvider detectorType="monitor_check_in_failure">
         <NewCronDetectorForm />
       </DetectorFormProvider>,
       {
diff --git a/static/app/views/detectors/components/forms/error/index.tsx b/static/app/views/detectors/components/forms/error/index.tsx
index 4888b9082caa..720d0c0b9535 100644
--- a/static/app/views/detectors/components/forms/error/index.tsx
+++ b/static/app/views/detectors/components/forms/error/index.tsx
@@ -141,6 +141,7 @@ export function EditExistingErrorDetectorForm({detector}: {detector: ErrorDetect
     <EditLayout
       formProps={{
         initialData: {
+          projectId: detector.projectId,
           workflowIds: detector.workflowIds,
         },
         onSubmit: handleFormSubmit,
diff --git a/static/app/views/detectors/components/forms/metric/metric.spec.tsx b/static/app/views/detectors/components/forms/metric/metric.spec.tsx
index 44b258cd9fda..1bd457f8e9f0 100644
--- a/static/app/views/detectors/components/forms/metric/metric.spec.tsx
+++ b/static/app/views/detectors/components/forms/metric/metric.spec.tsx
@@ -7,6 +7,7 @@ import {selectEvent} from 'sentry-test/selectEvent';
 
 import {MemberListStore} from 'sentry/stores/memberListStore';
 import {OrganizationStore} from 'sentry/stores/organizationStore';
+import {ProjectsStore} from 'sentry/stores/projectsStore';
 import {DetectorFormProvider} from 'sentry/views/detectors/components/forms/context';
 import {NewMetricDetectorForm} from 'sentry/views/detectors/components/forms/metric/metric';
 
@@ -20,6 +21,7 @@ describe('NewMetricDetectorForm', () => {
     MockApiClient.clearMockResponses();
     OrganizationStore.reset();
     OrganizationStore.onUpdate(organization);
+    ProjectsStore.loadInitialData([project]);
     MemberListStore.init();
     MemberListStore.loadInitialData([UserFixture()]);
 
@@ -80,7 +82,7 @@ describe('NewMetricDetectorForm', () => {
 
   it('shows default issue preview and updates subtitle when threshold changes', async () => {
     render(
-      <DetectorFormProvider detectorType="metric_issue" project={project}>
+      <DetectorFormProvider detectorType="metric_issue">
         <NewMetricDetectorForm />
       </DetectorFormProvider>,
       {organization}
@@ -143,7 +145,7 @@ describe('NewMetricDetectorForm', () => {
 
   it('removes is filters when switching away from the errors dataset', async () => {
     render(
-      <DetectorFormProvider detectorType="metric_issue" project={project}>
+      <DetectorFormProvider detectorType="metric_issue">
         <NewMetricDetectorForm />
       </DetectorFormProvider>,
       {
diff --git a/static/app/views/detectors/components/forms/metric/metric.tsx b/static/app/views/detectors/components/forms/metric/metric.tsx
index 626c59191095..c163300632b9 100644
--- a/static/app/views/detectors/components/forms/metric/metric.tsx
+++ b/static/app/views/detectors/components/forms/metric/metric.tsx
@@ -710,7 +710,7 @@ const DatasetRow = styled('div')`
 `;
 
 const FilterRow = styled('div')<{disabled: boolean}>`
-  ${p => (p.disabled ? 'opacity: 0.6;' : '')}
+  ${p => (p.disabled ? `opacity: 0.6;` : '')}
 `;
 
 const StyledSelectField = styled(SelectField)`
@@ -794,7 +794,7 @@ const IntervalField = styled(SelectField)`
 `;
 
 const DisabledSection = styled('div')<{disabled: boolean}>`
-  ${p => (p.disabled ? 'opacity: 0.6;' : '')}
+  ${p => (p.disabled ? `opacity: 0.6;` : '')}
 `;
 
 const PriorityLabel = styled('span')`
diff --git a/static/app/views/detectors/components/forms/metric/metricIssuePreview.tsx b/static/app/views/detectors/components/forms/metric/metricIssuePreview.tsx
index f7ca68d5cbc2..d6e331a4ea8c 100644
--- a/static/app/views/detectors/components/forms/metric/metricIssuePreview.tsx
+++ b/static/app/views/detectors/components/forms/metric/metricIssuePreview.tsx
@@ -4,7 +4,7 @@ import {getDuration} from 'sentry/utils/duration/getDuration';
 import {DetectorIssuePreview} from 'sentry/views/detectors/components/forms/common/detectorIssuePreview';
 import {IssuePreviewSection} from 'sentry/views/detectors/components/forms/common/issuePreviewSection';
 import {ownerToActor} from 'sentry/views/detectors/components/forms/common/ownerToActor';
-import {useDetectorFormContext} from 'sentry/views/detectors/components/forms/context';
+import {useDetectorFormProject} from 'sentry/views/detectors/components/forms/common/useDetectorFormProject';
 import {
   METRIC_DETECTOR_FORM_FIELDS,
   useMetricDetectorFormField,
@@ -81,7 +81,7 @@ export function MetricIssuePreview({step}: {step?: number}) {
   const owner = useMetricDetectorFormField(METRIC_DETECTOR_FORM_FIELDS.owner);
   const subtitle = useMetricIssuePreviewSubtitle();
   const assignee = ownerToActor(owner);
-  const {project} = useDetectorFormContext();
+  const project = useDetectorFormProject();
 
   return (
     <IssuePreviewSection step={step}>
diff --git a/static/app/views/detectors/components/forms/newDetectorLayout.tsx b/static/app/views/detectors/components/forms/newDetectorLayout.tsx
index d3d685acd795..cb9c115cbfb1 100644
--- a/static/app/views/detectors/components/forms/newDetectorLayout.tsx
+++ b/static/app/views/detectors/components/forms/newDetectorLayout.tsx
@@ -1,5 +1,6 @@
 import {useMemo, useState} from 'react';
 import {useTheme} from '@emotion/react';
+import orderBy from 'lodash/orderBy';
 
 import type {FormProps} from 'sentry/components/forms/form';
 import {FormModel} from 'sentry/components/forms/model';
@@ -11,10 +12,10 @@ import type {
   DetectorType,
 } from 'sentry/types/workflowEngine/detectors';
 import {useLocation} from 'sentry/utils/useLocation';
+import {useProjects} from 'sentry/utils/useProjects';
 import {NewDetectorBreadcrumbs} from 'sentry/views/detectors/components/forms/common/breadcrumbs';
 import {DetectorNameField} from 'sentry/views/detectors/components/forms/common/detectorNameField';
 import {NewDetectorFooter} from 'sentry/views/detectors/components/forms/common/footer';
-import {useDetectorFormContext} from 'sentry/views/detectors/components/forms/context';
 import {MonitorFeedbackButton} from 'sentry/views/detectors/components/monitorFeedbackButton';
 import {useCreateDetectorFormSubmit} from 'sentry/views/detectors/hooks/useCreateDetectorFormSubmit';
 
@@ -45,7 +46,19 @@ export function NewDetectorLayout<
   const location = useLocation();
   const theme = useTheme();
   const maxWidth = theme.breakpoints.xl;
-  const formContext = useDetectorFormContext();
+  const {projects} = useProjects();
+
+  const initialProjectId = useMemo(() => {
+    const queryProjectId = location.query.project as string | undefined;
+    if (queryProjectId) {
+      const match = projects.find(p => p.id === queryProjectId);
+      if (match) {
+        return match.id;
+      }
+    }
+    const sorted = orderBy(projects, ['isMember', 'isBookmarked'], ['desc', 'desc']);
+    return sorted[0]?.id ?? '';
+  }, [location.query.project, projects]);
 
   const formSubmitHandler = useCreateDetectorFormSubmit({
     detectorType,
@@ -57,7 +70,7 @@ export function NewDetectorLayout<
 
   const initialData = useMemo(() => {
     return {
-      projectId: formContext.project.id,
+      projectId: initialProjectId,
       environment: (location.query.environment as string | undefined) || '',
       name: (location.query.name as string | undefined) || '',
       owner: (location.query.owner as string | undefined) || '',
@@ -65,7 +78,7 @@ export function NewDetectorLayout<
       ...initialFormData,
     };
   }, [
-    formContext.project.id,
+    initialProjectId,
     initialFormData,
     location.query.environment,
     location.query.name,
diff --git a/static/app/views/detectors/components/forms/uptime/uptimeIssuePreview.tsx b/static/app/views/detectors/components/forms/uptime/uptimeIssuePreview.tsx
index 414aaabeccee..a387b1e07bfa 100644
--- a/static/app/views/detectors/components/forms/uptime/uptimeIssuePreview.tsx
+++ b/static/app/views/detectors/components/forms/uptime/uptimeIssuePreview.tsx
@@ -2,7 +2,7 @@ import {t} from 'sentry/locale';
 import {DetectorIssuePreview} from 'sentry/views/detectors/components/forms/common/detectorIssuePreview';
 import {IssuePreviewSection} from 'sentry/views/detectors/components/forms/common/issuePreviewSection';
 import {ownerToActor} from 'sentry/views/detectors/components/forms/common/ownerToActor';
-import {useDetectorFormContext} from 'sentry/views/detectors/components/forms/context';
+import {useDetectorFormProject} from 'sentry/views/detectors/components/forms/common/useDetectorFormProject';
 import {useUptimeDetectorFormField} from 'sentry/views/detectors/components/forms/uptime/fields';
 import {formatUptimeUrl} from 'sentry/views/detectors/components/forms/uptime/formatUptimeUrl';
 
@@ -28,7 +28,7 @@ export function UptimeIssuePreview({step}: {step?: number}) {
   const owner = useUptimeDetectorFormField('owner');
   const issueTitle = useUptimeIssueTitle();
   const assignee = ownerToActor(owner);
-  const {project} = useDetectorFormContext();
+  const project = useDetectorFormProject();
 
   return (
     <IssuePreviewSection step={step}>
diff --git a/static/app/views/detectors/detail.spec.tsx b/static/app/views/detectors/detail.spec.tsx
index a25fe4203239..f45895db0365 100644
--- a/static/app/views/detectors/detail.spec.tsx
+++ b/static/app/views/detectors/detail.spec.tsx
@@ -97,11 +97,11 @@ describe('DetectorDetails', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/',
+      url: `/organizations/org-slug/issues/1/`,
       body: GroupFixture(),
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/detectors/',
+      url: `/organizations/org-slug/detectors/`,
       body: [issueStreamDetector],
       match: [
         MockApiClient.matchQuery({
@@ -111,7 +111,7 @@ describe('DetectorDetails', () => {
       ],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/workflows/',
+      url: `/organizations/org-slug/workflows/`,
       body: [],
       match: [(_url, options) => options.query?.detector === undefined],
     });
diff --git a/static/app/views/detectors/edit.tsx b/static/app/views/detectors/edit.tsx
index e3b470629360..663698fadbb2 100644
--- a/static/app/views/detectors/edit.tsx
+++ b/static/app/views/detectors/edit.tsx
@@ -10,6 +10,7 @@ import {useDetectorQuery} from 'sentry/views/detectors/hooks';
 
 export default function DetectorEdit() {
   const params = useParams<{detectorId: string}>();
+  const {fetching: isFetchingProjects} = useProjects();
   useWorkflowEngineFeatureGate({redirect: true});
 
   const {
@@ -20,9 +21,6 @@ export default function DetectorEdit() {
     refetch,
   } = useDetectorQuery(params.detectorId);
 
-  const {projects, fetching: isFetchingProjects} = useProjects();
-  const project = projects.find(p => p.id === detector?.projectId);
-
   if (isPending || isFetchingProjects) {
     return <LoadingIndicator />;
   }
@@ -36,16 +34,8 @@ export default function DetectorEdit() {
     );
   }
 
-  if (!project) {
-    return <LoadingError message={t('Project not found')} />;
-  }
-
   return (
-    <DetectorFormProvider
-      detectorType={detector.type}
-      project={project}
-      detector={detector}
-    >
+    <DetectorFormProvider detectorType={detector.type} detector={detector}>
       <EditExistingDetectorForm detector={detector} />
     </DetectorFormProvider>
   );
diff --git a/static/app/views/detectors/hooks/useMonitorsScheduleSampleBuckets.tsx b/static/app/views/detectors/hooks/useMonitorsScheduleSampleBuckets.tsx
index ec2db7074d37..4714a1977fd7 100644
--- a/static/app/views/detectors/hooks/useMonitorsScheduleSampleBuckets.tsx
+++ b/static/app/views/detectors/hooks/useMonitorsScheduleSampleBuckets.tsx
@@ -58,7 +58,7 @@ export function useMonitorsScheduleSampleBuckets({
 
   return useApiQuery<Array<CheckInBucket<SchedulePreviewStatus>>>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/monitors-schedule-buckets/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/monitors-schedule-buckets/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query},
diff --git a/static/app/views/detectors/hooks/useMonitorsScheduleSampleWindow.tsx b/static/app/views/detectors/hooks/useMonitorsScheduleSampleWindow.tsx
index 90d4bc7ed786..f241ca2bb197 100644
--- a/static/app/views/detectors/hooks/useMonitorsScheduleSampleWindow.tsx
+++ b/static/app/views/detectors/hooks/useMonitorsScheduleSampleWindow.tsx
@@ -34,7 +34,7 @@ export function useMonitorsScheduleSampleWindow({
 
   return useApiQuery<ScheduleSampleWindowResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/monitors-schedule-window/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/monitors-schedule-window/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query},
diff --git a/static/app/views/detectors/new-settings.tsx b/static/app/views/detectors/new-settings.tsx
index e05ad2dc1df0..9f9356c6fe74 100644
--- a/static/app/views/detectors/new-settings.tsx
+++ b/static/app/views/detectors/new-settings.tsx
@@ -1,9 +1,3 @@
-import orderBy from 'lodash/orderBy';
-import {parseAsString, useQueryState} from 'nuqs';
-
-import {Stack} from '@sentry/scraps/layout';
-
-import * as Layout from 'sentry/components/layouts/thirds';
 import {LoadingError} from 'sentry/components/loadingError';
 import {LoadingIndicator} from 'sentry/components/loadingIndicator';
 import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle';
@@ -19,41 +13,20 @@ import {
 } from 'sentry/views/detectors/utils/detectorTypeConfig';
 
 export default function DetectorNewSettings() {
-  const {projects, fetching: isFetchingProjects} = useProjects();
+  const {fetching: isFetchingProjects} = useProjects();
   const [detectorType] = useDetectorTypeQueryState();
-  const [projectId] = useQueryState('project', parseAsString);
   useWorkflowEngineFeatureGate({redirect: true});
 
-  if (!detectorType || !isValidDetectorType(detectorType)) {
-    return <LoadingError message={t('Invalid detector type: %s', detectorType ?? '')} />;
-  }
-
   if (isFetchingProjects) {
-    return (
-      <Stack flex={1}>
-        <Layout.Body>
-          <Layout.Main width="full">
-            <LoadingIndicator />
-          </Layout.Main>
-        </Layout.Body>
-      </Stack>
-    );
+    return <LoadingIndicator />;
   }
 
-  const sortedProjects = orderBy(
-    projects,
-    ['isMember', 'isBookmarked'],
-    ['desc', 'desc']
-  );
-  const project =
-    (projectId ? projects.find(p => p.id === projectId) : null) ?? sortedProjects[0];
-
-  if (!project) {
-    return <LoadingError message={t('Project not found')} />;
+  if (!detectorType || !isValidDetectorType(detectorType)) {
+    return <LoadingError message={t('Invalid detector type: %s', detectorType ?? '')} />;
   }
 
   return (
-    <DetectorFormProvider detectorType={detectorType} project={project}>
+    <DetectorFormProvider detectorType={detectorType}>
       <SentryDocumentTitle
         title={t('New %s Monitor', getDetectorTypeLabel(detectorType))}
       />
diff --git a/static/app/views/detectors/new.spec.tsx b/static/app/views/detectors/new.spec.tsx
index 61750dfa3345..ac20cba7e5a8 100644
--- a/static/app/views/detectors/new.spec.tsx
+++ b/static/app/views/detectors/new.spec.tsx
@@ -38,7 +38,7 @@ describe('DetectorNew', () => {
 
     expect(router.location).toEqual(
       expect.objectContaining({
-        pathname: '/organizations/org-slug/monitors/new/settings/',
+        pathname: `/organizations/org-slug/monitors/new/settings/`,
         query: expect.objectContaining({
           detectorType: 'uptime_domain_failure',
         }),
@@ -66,7 +66,7 @@ describe('DetectorNew', () => {
 
     expect(router.location).toEqual(
       expect.objectContaining({
-        pathname: '/organizations/org-slug/monitors/new/settings/',
+        pathname: `/organizations/org-slug/monitors/new/settings/`,
         query: {
           detectorType: 'uptime_domain_failure',
           project: '2',
diff --git a/static/app/views/discover/breadcrumb.tsx b/static/app/views/discover/breadcrumb.tsx
index 821fdd52709e..bf243b895f1f 100644
--- a/static/app/views/discover/breadcrumb.tsx
+++ b/static/app/views/discover/breadcrumb.tsx
@@ -50,7 +50,7 @@ export function DiscoverBreadcrumb({
     if (defined(eventView.id)) {
       crumbs.push({
         to: makeDiscoverPathname({
-          path: '/queries/',
+          path: `/queries/`,
           organization,
         }),
         label: t('Saved Queries'),
diff --git a/static/app/views/discover/homepage.spec.tsx b/static/app/views/discover/homepage.spec.tsx
index f54f9d04c58e..85c9609614c1 100644
--- a/static/app/views/discover/homepage.spec.tsx
+++ b/static/app/views/discover/homepage.spec.tsx
@@ -98,7 +98,7 @@ describe('Discover > Homepage', () => {
         location: {
           pathname: `/organizations/${organization.slug}/explore/discover/homepage/`,
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -123,7 +123,7 @@ describe('Discover > Homepage', () => {
             field: ['project'],
           },
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -141,7 +141,7 @@ describe('Discover > Homepage', () => {
         location: {
           pathname: `/organizations/${organization.slug}/explore/discover/homepage/`,
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -173,7 +173,7 @@ describe('Discover > Homepage', () => {
         location: {
           pathname: `/organizations/${organization.slug}/explore/discover/homepage/`,
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -220,7 +220,7 @@ describe('Discover > Homepage', () => {
         location: {
           pathname: `/organizations/${organization.slug}/explore/discover/homepage/`,
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -245,7 +245,7 @@ describe('Discover > Homepage', () => {
             field: ['title'],
           },
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -273,7 +273,7 @@ describe('Discover > Homepage', () => {
             field: ['title'],
           },
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -302,7 +302,7 @@ describe('Discover > Homepage', () => {
             field: ['title'],
           },
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -336,7 +336,7 @@ describe('Discover > Homepage', () => {
             field: ['title'],
           },
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -385,7 +385,7 @@ describe('Discover > Homepage', () => {
         location: {
           pathname: `/organizations/${organization.slug}/explore/discover/homepage/`,
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -412,7 +412,7 @@ describe('Discover > Homepage', () => {
             field: ['title'],
           },
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
@@ -467,7 +467,7 @@ describe('Discover > Homepage', () => {
         location: {
           pathname: `/organizations/${organization.slug}/explore/discover/homepage/`,
         },
-        route: '/organizations/:orgId/explore/discover/homepage/',
+        route: `/organizations/:orgId/explore/discover/homepage/`,
       },
       organization,
     });
diff --git a/static/app/views/discover/landing.tsx b/static/app/views/discover/landing.tsx
index b216603d865c..2e79098e6474 100644
--- a/static/app/views/discover/landing.tsx
+++ b/static/app/views/discover/landing.tsx
@@ -152,7 +152,7 @@ function DiscoverLanding() {
   const savedQueriesPageLinks = savedQueriesResponse?.headers.Link;
 
   const to = makeDiscoverPathname({
-    path: '/homepage/',
+    path: `/homepage/`,
     organization,
   });
 
diff --git a/static/app/views/discover/results.spec.tsx b/static/app/views/discover/results.spec.tsx
index ef1a9ce62a3b..b3bc4effbd38 100644
--- a/static/app/views/discover/results.spec.tsx
+++ b/static/app/views/discover/results.spec.tsx
@@ -252,7 +252,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {query: 'tag:value'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -289,7 +289,7 @@ describe('Results', () => {
               cursor: '0%3A50%3A0',
             },
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -346,7 +346,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), yAxis: 'count()'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -373,7 +373,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), display: 'default', yAxis: 'count'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -400,7 +400,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), display: 'previous'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -426,7 +426,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), statsPeriod: '60d', project: '-1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -456,7 +456,7 @@ describe('Results', () => {
               project: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].map(String),
             },
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -482,7 +482,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), statsPeriod: '30d', project: '-1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -512,7 +512,7 @@ describe('Results', () => {
               project: [1, 2, 3, 4].map(String),
             },
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -539,7 +539,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {id: '1', statsPeriod: '24h'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -594,7 +594,7 @@ describe('Results', () => {
               environment: ['production'],
             },
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -626,7 +626,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), yAxis: 'count()'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -686,7 +686,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), display: 'default', yAxis: 'count()'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -747,7 +747,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), display: 'default', yAxis: 'count()'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -808,7 +808,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), display: 'default', yAxis: 'count'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -862,7 +862,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), display: 'default', yAxis: 'count'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -898,7 +898,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {...generateFields(), yAxis: 'count()'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -923,7 +923,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {fromMetric: 'true', id: '1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -950,7 +950,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {showUnparameterizedBanner: 'true', id: '1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -981,7 +981,7 @@ describe('Results', () => {
             // These fields take priority and should be sent in the request
             query: {field: ['title', 'user'], id: '1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -1040,7 +1040,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {id: '1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -1090,7 +1090,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: initialQuery as Record<string, string | string[]>,
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -1132,7 +1132,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {id: '1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -1163,7 +1163,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {id: '1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -1199,7 +1199,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: initialQuery as Record<string, string | string[]>,
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -1230,7 +1230,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: initialQuery as Record<string, string | string[]>,
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -1281,7 +1281,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {id: '1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -1391,7 +1391,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {id: '1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
@@ -1500,7 +1500,7 @@ describe('Results', () => {
             pathname: `/organizations/${organization.slug}/explore/discover/results/`,
             query: {id: '1'},
           },
-          route: '/organizations/:orgId/explore/discover/results/',
+          route: `/organizations/:orgId/explore/discover/results/`,
         },
         organization,
       });
diff --git a/static/app/views/discover/results/resultsSearchQueryBuilder.spec.tsx b/static/app/views/discover/results/resultsSearchQueryBuilder.spec.tsx
index 474d5d28e8c0..d0b43b657998 100644
--- a/static/app/views/discover/results/resultsSearchQueryBuilder.spec.tsx
+++ b/static/app/views/discover/results/resultsSearchQueryBuilder.spec.tsx
@@ -13,16 +13,16 @@ describe('ResultsSearchQueryBuilder', () => {
   beforeEach(() => {
     organization = OrganizationFixture();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/recent-searches/',
+      url: `/organizations/org-slug/recent-searches/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/recent-searches/',
+      url: `/organizations/org-slug/recent-searches/`,
       body: [],
       method: 'POST',
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/tags/',
+      url: `/organizations/org-slug/tags/`,
       body: [{key: 'transaction', name: 'transaction', kind: FieldKind.FIELD}],
     });
   });
diff --git a/static/app/views/discover/table/columnEditCollection.tsx b/static/app/views/discover/table/columnEditCollection.tsx
index d1184e36434e..124a6168616e 100644
--- a/static/app/views/discover/table/columnEditCollection.tsx
+++ b/static/app/views/discover/table/columnEditCollection.tsx
@@ -562,7 +562,7 @@ class ColumnEditCollection extends Component<Props, State> {
     const title = canAdd
       ? undefined
       : t(
-          "Sorry, you've reached the maximum number of columns (%d). Delete columns to add more.",
+          `Sorry, you've reached the maximum number of columns (%d). Delete columns to add more.`,
           MAX_COL_COUNT
         );
 
@@ -671,7 +671,7 @@ function OnDemandEquationsWarning() {
       <Tooltip
         containerDisplayMode="inline-flex"
         title={t(
-          "This is using indexed data because we don't routinely collect metrics for equations."
+          `This is using indexed data because we don't routinely collect metrics for equations.`
         )}
       >
         <IconWarning variant="warning" />
@@ -704,7 +704,7 @@ const RowContainer = styled('div')<{
     css`
       align-items: flex-start;
       grid-template-columns: ${p.singleColumn
-        ? '1fr'
+        ? `1fr`
         : `${p.theme.space['2xl']} 1fr 40px 40px`};
 
       @media (min-width: ${p.theme.breakpoints.sm}) {
diff --git a/static/app/views/discover/table/queryField.tsx b/static/app/views/discover/table/queryField.tsx
index 7c431279136a..c467e8ac80f7 100644
--- a/static/app/views/discover/table/queryField.tsx
+++ b/static/app/views/discover/table/queryField.tsx
@@ -742,7 +742,7 @@ const Container = styled('div')<{
   display: grid;
   ${p =>
     p.tripleLayout
-      ? 'grid-template-columns: 1fr 2fr;'
+      ? `grid-template-columns: 1fr 2fr;`
       : `grid-template-columns: repeat(${p.gridColumns}, 1fr) ${p.error ? 'auto' : ''};`}
   gap: ${p => p.theme.space.md};
   align-items: center;
diff --git a/static/app/views/discover/table/tableView.tsx b/static/app/views/discover/table/tableView.tsx
index 3c39f68ebdac..3b579ccaac2f 100644
--- a/static/app/views/discover/table/tableView.tsx
+++ b/static/app/views/discover/table/tableView.tsx
@@ -1,5 +1,4 @@
 import {Fragment} from 'react';
-import {useMatches} from 'react-router-dom';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
@@ -49,6 +48,7 @@ import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {normalizeUrl} from 'sentry/utils/url/normalizeUrl';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import {useProjects} from 'sentry/utils/useProjects';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {appendQueryDatasetParam, hasDatasetSelector} from 'sentry/views/dashboards/utils';
 import {
   getExpandedResults,
@@ -107,8 +107,8 @@ export function TableView(props: TableViewProps) {
   const theme = useTheme();
   const navigate = useNavigate();
   const {projects} = useProjects();
-  const matches = useMatches();
-  const replayLinkGenerator = generateReplayLink(matches);
+  const routes = useRoutes();
+  const replayLinkGenerator = generateReplayLink(routes);
 
   function _renderPrependColumns(
     isHeader: boolean,
diff --git a/static/app/views/explore/components/attributeBreakdowns/utils.tsx b/static/app/views/explore/components/attributeBreakdowns/utils.tsx
index 65088727cd1f..5bc81a82a51b 100644
--- a/static/app/views/explore/components/attributeBreakdowns/utils.tsx
+++ b/static/app/views/explore/components/attributeBreakdowns/utils.tsx
@@ -69,7 +69,7 @@ function createActionButton(
 ): string {
   return [
     '  <div',
-    '    class="attribute-breakdowns-tooltip-action-button"',
+    `    class="attribute-breakdowns-tooltip-action-button"`,
     `    data-tooltip-action="${action}"`,
     `    data-tooltip-action-key="${escapedAttributeName}"`,
     `    data-tooltip-action-value="${escapedValue}"`,
diff --git a/static/app/views/explore/components/traceItemAttributes/attributesTree.tsx b/static/app/views/explore/components/traceItemAttributes/attributesTree.tsx
index 8d756de0420c..625c79890fe4 100644
--- a/static/app/views/explore/components/traceItemAttributes/attributesTree.tsx
+++ b/static/app/views/explore/components/traceItemAttributes/attributesTree.tsx
@@ -546,7 +546,7 @@ const TreeKeyTrunk = styled('div')<{spacerCount: number}>`
   display: grid;
   height: 100%;
   align-items: center;
-  grid-template-columns: ${p => (p.spacerCount > 0 ? 'auto 1rem 1fr' : '1fr')};
+  grid-template-columns: ${p => (p.spacerCount > 0 ? `auto 1rem 1fr` : '1fr')};
 `;
 
 const TreeValueTrunk = styled('div')`
diff --git a/static/app/views/explore/hooks/useMetricOptions.tsx b/static/app/views/explore/hooks/useMetricOptions.tsx
index e305ddade723..91161057012c 100644
--- a/static/app/views/explore/hooks/useMetricOptions.tsx
+++ b/static/app/views/explore/hooks/useMetricOptions.tsx
@@ -71,7 +71,7 @@ function metricOptionsQueryKey({
   }
 
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
       path: {organizationIdOrSlug: orgSlug!},
     }),
     {query},
diff --git a/static/app/views/explore/hooks/useSortByFields.spec.tsx b/static/app/views/explore/hooks/useSortByFields.spec.tsx
index 9b7b62d641a2..3ca6ac0429d4 100644
--- a/static/app/views/explore/hooks/useSortByFields.spec.tsx
+++ b/static/app/views/explore/hooks/useSortByFields.spec.tsx
@@ -37,7 +37,7 @@ describe('useSortByFields', () => {
     MockApiClient.clearMockResponses();
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/trace-items/attributes/',
+      url: `/organizations/org-slug/trace-items/attributes/`,
       body: [],
     });
 
diff --git a/static/app/views/explore/hooks/useTab.spec.tsx b/static/app/views/explore/hooks/useTab.spec.tsx
index eb5aab65f20b..e85b257b1bdb 100644
--- a/static/app/views/explore/hooks/useTab.spec.tsx
+++ b/static/app/views/explore/hooks/useTab.spec.tsx
@@ -12,7 +12,7 @@ function Wrapper({children}: {children: ReactNode}) {
 function makeInitialRouterConfig({table}: {table: string}) {
   return {
     location: {
-      pathname: '/organizations/org-slug/explore/traces/',
+      pathname: `/organizations/org-slug/explore/traces/`,
       query: {table},
     },
   };
diff --git a/static/app/views/explore/hooks/useVisualizeFields.spec.tsx b/static/app/views/explore/hooks/useVisualizeFields.spec.tsx
index 6e1cc8845dbc..c38d32e605f8 100644
--- a/static/app/views/explore/hooks/useVisualizeFields.spec.tsx
+++ b/static/app/views/explore/hooks/useVisualizeFields.spec.tsx
@@ -46,7 +46,7 @@ describe('useVisualizeFields', () => {
     MockApiClient.clearMockResponses();
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/trace-items/attributes/',
+      url: `/organizations/org-slug/trace-items/attributes/`,
       body: [],
     });
 
diff --git a/static/app/views/explore/logs/fieldRenderers.tsx b/static/app/views/explore/logs/fieldRenderers.tsx
index ae920f2666ac..88b9d4874497 100644
--- a/static/app/views/explore/logs/fieldRenderers.tsx
+++ b/static/app/views/explore/logs/fieldRenderers.tsx
@@ -353,7 +353,7 @@ function FilteredTooltip({
     return (
       <Tooltip
         title={tct(
-          'The log message was entirely filtered by a data scrubbing rule, its template is also been shown to help identify what was filtered. If necessary, you can turn data scrubbing off in your [settings].',
+          `The log message was entirely filtered by a data scrubbing rule, its template is also been shown to help identify what was filtered. If necessary, you can turn data scrubbing off in your [settings].`,
           {
             settings: (
               <Link
diff --git a/static/app/views/explore/logs/tables/logsInfiniteTable.tsx b/static/app/views/explore/logs/tables/logsInfiniteTable.tsx
index 7448c6ed836f..bbc51f1fde38 100644
--- a/static/app/views/explore/logs/tables/logsInfiniteTable.tsx
+++ b/static/app/views/explore/logs/tables/logsInfiniteTable.tsx
@@ -30,7 +30,6 @@ import {t, tct} from 'sentry/locale';
 import type {Event} from 'sentry/types/event';
 import type {TagCollection} from 'sentry/types/group';
 import {defined} from 'sentry/utils';
-import {useDimensions} from 'sentry/utils/useDimensions';
 import {
   TableBodyCell,
   TableHead,
@@ -221,7 +220,6 @@ export function LogsInfiniteTable({
 
   const tableRef = useRef<HTMLTableElement>(null);
   const tableBodyRef = useRef<HTMLTableSectionElement>(null);
-  const {width: tableWidth} = useDimensions({elementRef: tableRef});
   const [expandedLogRows, setExpandedLogRows] = useState<Set<string>>(
     new Set(embeddedOptions?.openWithExpandedIds ?? [])
   );
@@ -558,7 +556,7 @@ export function LogsInfiniteTable({
       <FloatingBackToTopContainer
         position={expanded === undefined ? 'fixed' : 'absolute'}
         inReplay={!!embeddedOptions?.replay}
-        tableWidth={tableWidth}
+        tableWidth={tableRef.current?.getBoundingClientRect().width ?? 0}
       >
         {!embeddedOptions?.replay && (
           <BackToTopButton
@@ -573,7 +571,9 @@ export function LogsInfiniteTable({
           <JumpButtons jump="up" onClick={onClickToJump} tableHeaderHeight={0} />
         ) : null}
       </FloatingBackToTopContainer>
-      <FloatingBottomContainer tableWidth={tableWidth}>
+      <FloatingBottomContainer
+        tableWidth={tableRef.current?.getBoundingClientRect().width ?? 0}
+      >
         {embeddedOptions?.replay && showJumpDownButton ? (
           <JumpButtons jump="down" onClick={onClickToJump} tableHeaderHeight={0} />
         ) : null}
diff --git a/static/app/views/explore/logs/tables/logsTableRow.spec.tsx b/static/app/views/explore/logs/tables/logsTableRow.spec.tsx
index a1596d08096c..90953517162d 100644
--- a/static/app/views/explore/logs/tables/logsTableRow.spec.tsx
+++ b/static/app/views/explore/logs/tables/logsTableRow.spec.tsx
@@ -99,7 +99,7 @@ describe('logsTableRow', () => {
         [LOGS_SORT_BYS_KEY]: '-timestamp',
       },
     },
-    route: '/organizations/:orgId/explore/logs/',
+    route: `/organizations/:orgId/explore/logs/`,
   };
 
   const initialRouterConfigWithCodeFilePath = {
diff --git a/static/app/views/explore/logs/useLogsQuery.tsx b/static/app/views/explore/logs/useLogsQuery.tsx
index 8c9614ef3685..eae61961782f 100644
--- a/static/app/views/explore/logs/useLogsQuery.tsx
+++ b/static/app/views/explore/logs/useLogsQuery.tsx
@@ -252,7 +252,7 @@ function getPageParam(
       firstTimestamp = BigInt(firstRow[OurLogKnownFieldKey.TIMESTAMP_PRECISE]);
       lastTimestamp = BigInt(lastRow[OurLogKnownFieldKey.TIMESTAMP_PRECISE]);
     } catch {
-      logger.warn('No timestamp precise found for log row, using timestamp instead', {
+      logger.warn(`No timestamp precise found for log row, using timestamp instead`, {
         logId: firstRow[OurLogKnownFieldKey.ID],
         timestamp: firstRow[OurLogKnownFieldKey.TIMESTAMP],
         timestampPrecise: firstRow[OurLogKnownFieldKey.TIMESTAMP_PRECISE],
diff --git a/static/app/views/explore/logs/useVirtualStreaming.tsx b/static/app/views/explore/logs/useVirtualStreaming.tsx
index 91feb5a16163..18ebff9225c5 100644
--- a/static/app/views/explore/logs/useVirtualStreaming.tsx
+++ b/static/app/views/explore/logs/useVirtualStreaming.tsx
@@ -220,7 +220,7 @@ export function useVirtualStreaming({
     hasWarnedRef.current = true;
 
     logger.warn(
-      'No most recent page data timestamp found, skipping virtual streaming update',
+      `No most recent page data timestamp found, skipping virtual streaming update`,
       {
         logId:
           data?.pages?.[data.pages.length - 1]?.[0]?.data?.[0]?.[OurLogKnownFieldKey.ID],
@@ -321,7 +321,7 @@ function getApproximateTimestamp(row: {
   }
   if (!timestampHasWarned) {
     timestampHasWarned = true;
-    logger.warn('No timestamp precise found for log row, using timestamp instead', {
+    logger.warn(`No timestamp precise found for log row, using timestamp instead`, {
       logId: row[OurLogKnownFieldKey.ID],
       traceId: row[OurLogKnownFieldKey.TRACE_ID],
       timestamp: row[OurLogKnownFieldKey.TIMESTAMP],
diff --git a/static/app/views/explore/multiQueryMode/hooks/useMultiQueryTable.spec.tsx b/static/app/views/explore/multiQueryMode/hooks/useMultiQueryTable.spec.tsx
index 8173884a1099..d4eea76a27ab 100644
--- a/static/app/views/explore/multiQueryMode/hooks/useMultiQueryTable.spec.tsx
+++ b/static/app/views/explore/multiQueryMode/hooks/useMultiQueryTable.spec.tsx
@@ -50,7 +50,7 @@ describe('useMultiQueryTable', () => {
     ['aggregate', useMultiQueryTableAggregateMode],
     ['sample', useMultiQueryTableSampleMode],
   ])(
-    'triggers the high accuracy request when there is no data and a partial scan for %s mode',
+    `triggers the high accuracy request when there is no data and a partial scan for %s mode`,
     async (_mode, hook) => {
       jest.mocked(useReadQueriesFromLocation).mockReturnValue([
         {
diff --git a/static/app/views/explore/multiQueryMode/hooks/useMultiQueryTimeseries.tsx b/static/app/views/explore/multiQueryMode/hooks/useMultiQueryTimeseries.tsx
index dc5dd96fc086..ed0fa88c38ae 100644
--- a/static/app/views/explore/multiQueryMode/hooks/useMultiQueryTimeseries.tsx
+++ b/static/app/views/explore/multiQueryMode/hooks/useMultiQueryTimeseries.tsx
@@ -107,7 +107,7 @@ function useMultiQueryTimeseriesImpl({
 
   const timeseriesResult = useSortedTimeSeries(
     options,
-    'api.explore.spans-timeseries',
+    `api.explore.spans-timeseries`,
     DiscoverDatasets.SPANS
   );
 
diff --git a/static/app/views/explore/spans/content.spec.tsx b/static/app/views/explore/spans/content.spec.tsx
index 44b143b85704..294693c42005 100644
--- a/static/app/views/explore/spans/content.spec.tsx
+++ b/static/app/views/explore/spans/content.spec.tsx
@@ -75,7 +75,7 @@ describe('ExploreContent', () => {
       body: [project],
     });
     MockApiClient.addMockResponse({
-      url: '/assistant/',
+      url: `/assistant/`,
       method: 'GET',
       body: [],
     });
diff --git a/static/app/views/explore/spans/droppedFieldsAlert.tsx b/static/app/views/explore/spans/droppedFieldsAlert.tsx
index 58a49d045969..52e7ade6fa5b 100644
--- a/static/app/views/explore/spans/droppedFieldsAlert.tsx
+++ b/static/app/views/explore/spans/droppedFieldsAlert.tsx
@@ -32,7 +32,7 @@ export function DroppedFieldsAlert(): React.JSX.Element | null {
   const changedReason = savedQuery.changedReason;
   if (changedReason.columns.length > 0) {
     columnsWarning.push(
-      tct('[columns] is no longer supported', {
+      tct(`[columns] is no longer supported`, {
         columns: changedReason.columns.join(', '),
       })
     );
@@ -40,7 +40,7 @@ export function DroppedFieldsAlert(): React.JSX.Element | null {
   if (changedReason.equations) {
     equationsWarning.push(
       ...changedReason.equations.map(equation =>
-        tct('[equation] is no longer supported because [reason] is unsupported', {
+        tct(`[equation] is no longer supported because [reason] is unsupported`, {
           equation: stripEquationPrefix(equation.equation),
           reason:
             typeof equation.reason === 'string'
@@ -61,10 +61,10 @@ export function DroppedFieldsAlert(): React.JSX.Element | null {
 
         // make sure that the reason and the orderby aren't the same and word it correctly
         return typeof orderby.reason === 'string' || orderbyWithoutPrefix === reasonText
-          ? tct('sorting by [orderby] is no longer supported', {
+          ? tct(`sorting by [orderby] is no longer supported`, {
               orderby: orderbyWithoutPrefix,
             })
-          : tct('sorting by [orderby] is not supported because [reason] is unsupported', {
+          : tct(`sorting by [orderby] is not supported because [reason] is unsupported`, {
               orderby: orderby.orderby,
               reason: reasonText,
             });
diff --git a/static/app/views/explore/tables/fieldRenderer.spec.tsx b/static/app/views/explore/tables/fieldRenderer.spec.tsx
index 129f76ef9519..6ca21d0d7df7 100644
--- a/static/app/views/explore/tables/fieldRenderer.spec.tsx
+++ b/static/app/views/explore/tables/fieldRenderer.spec.tsx
@@ -101,7 +101,7 @@ describe('FieldRenderer tests', () => {
       expect(screen.getByText('spanId')).toBeInTheDocument();
       expect(screen.getByRole('link')).toHaveAttribute(
         'href',
-        '/organizations/org-slug/explore/traces/trace/traceId/?node=span-spanId&node=txn-transactionSpanId&source=traces&statsPeriod=14d&targetId=transactionSpanId&timestamp=1727964900'
+        `/organizations/org-slug/explore/traces/trace/traceId/?node=span-spanId&node=txn-transactionSpanId&source=traces&statsPeriod=14d&targetId=transactionSpanId&timestamp=1727964900`
       );
     });
   });
@@ -159,7 +159,7 @@ describe('FieldRenderer tests', () => {
       expect(screen.getByText('transactionId')).toBeInTheDocument();
       expect(screen.getByRole('link')).toHaveAttribute(
         'href',
-        '/organizations/org-slug/explore/traces/trace/traceId/?source=traces&statsPeriod=14d&targetId=transactionSpanId&timestamp=1727964900'
+        `/organizations/org-slug/explore/traces/trace/traceId/?source=traces&statsPeriod=14d&targetId=transactionSpanId&timestamp=1727964900`
       );
     });
   });
@@ -217,7 +217,7 @@ describe('FieldRenderer tests', () => {
       expect(screen.getByText('traceId')).toBeInTheDocument();
       expect(screen.getByRole('link')).toHaveAttribute(
         'href',
-        '/organizations/org-slug/explore/traces/trace/traceId/?source=traces&statsPeriod=14d&timestamp=1727964900'
+        `/organizations/org-slug/explore/traces/trace/traceId/?source=traces&statsPeriod=14d&timestamp=1727964900`
       );
     });
   });
diff --git a/static/app/views/feedback/feedbackEmptyState.tsx b/static/app/views/feedback/feedbackEmptyState.tsx
index b2ac6532ff87..d1ac318bca84 100644
--- a/static/app/views/feedback/feedbackEmptyState.tsx
+++ b/static/app/views/feedback/feedbackEmptyState.tsx
@@ -101,7 +101,7 @@ export function FeedbackEmptyState({projectIds, issueTab = false}: Props) {
       <h3>{t('What do users think?')}</h3>
       <p>
         {t(
-          "You can't read minds. At least we hope not. Ask users for feedback on the impact of their crashes or bugs and you shall receive."
+          `You can't read minds. At least we hope not. Ask users for feedback on the impact of their crashes or bugs and you shall receive.`
         )}
       </p>
       <ButtonList>
diff --git a/static/app/views/insights/browser/resources/components/sampleImages.spec.tsx b/static/app/views/insights/browser/resources/components/sampleImages.spec.tsx
index 3522596f5f43..eb805ac829c3 100644
--- a/static/app/views/insights/browser/resources/components/sampleImages.spec.tsx
+++ b/static/app/views/insights/browser/resources/components/sampleImages.spec.tsx
@@ -90,7 +90,7 @@ const setupMockRequests = (
     },
   });
   MockApiClient.addMockResponse({
-    url: '/projects/org-slug/project-slug/performance/configure/',
+    url: `/projects/org-slug/project-slug/performance/configure/`,
     method: 'GET',
     body: {
       enable_images: enableImages,
diff --git a/static/app/views/insights/browser/resources/components/tables/resourceTable.tsx b/static/app/views/insights/browser/resources/components/tables/resourceTable.tsx
index bdaabcb0ca00..48aa7c02c1ed 100644
--- a/static/app/views/insights/browser/resources/components/tables/resourceTable.tsx
+++ b/static/app/views/insights/browser/resources/components/tables/resourceTable.tsx
@@ -55,7 +55,7 @@ const {
 const {EPM} = SpanFunction;
 
 const RESOURCE_SIZE_ALERT = t(
-  "If you're noticing unusually large resource sizes, try updating to SDK version 7.82.0 or higher."
+  `If you're noticing unusually large resource sizes, try updating to SDK version 7.82.0 or higher.`
 );
 
 type Row = Pick<
@@ -169,7 +169,7 @@ export function ResourceTable({sort, defaultResourceTypes}: Props) {
     if (key === 'avg(http.response_content_length)') {
       return <ResourceSizeCell bytes={row[key]} />;
     }
-    if (key === 'avg(span.self_time)') {
+    if (key === `avg(span.self_time)`) {
       return <DurationCell milliseconds={row[key]} />;
     }
     if (key === SPAN_OP) {
diff --git a/static/app/views/insights/browser/resources/queries/useResourcePageQuery.ts b/static/app/views/insights/browser/resources/queries/useResourcePageQuery.ts
index 6ba4dae7d05a..ca4fe7520a40 100644
--- a/static/app/views/insights/browser/resources/queries/useResourcePageQuery.ts
+++ b/static/app/views/insights/browser/resources/queries/useResourcePageQuery.ts
@@ -61,7 +61,7 @@ export const useResourcePagesQuery = (
       fields: [
         'transaction',
         'epm()',
-        'avg(span.self_time)',
+        `avg(span.self_time)`,
         `avg(${HTTP_RESPONSE_CONTENT_LENGTH})`,
         RESOURCE_RENDER_BLOCKING_STATUS,
       ],
diff --git a/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx b/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx
index 90a5a0e55a72..6a0ad3bf19b3 100644
--- a/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx
+++ b/static/app/views/insights/browser/resources/views/resourceSummaryPage.tsx
@@ -146,7 +146,7 @@ function ResourceSummary() {
                       spanMetrics?.[0]?.[`avg(${HTTP_RESPONSE_TRANSFER_SIZE})`] ?? 0
                     }
                     avgDuration={spanMetrics?.[0]?.[`avg(${SPAN_SELF_TIME})`] ?? 0}
-                    throughput={spanMetrics?.[0]?.['epm()'] ?? 0}
+                    throughput={spanMetrics?.[0]?.[`epm()`] ?? 0}
                     timeSpentTotal={spanMetrics?.[0]?.[`sum(${SPAN_SELF_TIME})`] ?? 0}
                   />
                 </HeaderContainer>
diff --git a/static/app/views/insights/browser/resources/views/resourcesLandingPage.spec.tsx b/static/app/views/insights/browser/resources/views/resourcesLandingPage.spec.tsx
index 269e8aad17cf..f5f5f9fa81cd 100644
--- a/static/app/views/insights/browser/resources/views/resourcesLandingPage.spec.tsx
+++ b/static/app/views/insights/browser/resources/views/resourcesLandingPage.spec.tsx
@@ -37,7 +37,7 @@ describe('ResourcesLandingPage', () => {
       pathname: `/organizations/${organization.slug}/insights/frontend/assets/`,
       query: {statsPeriod: '10d'},
     },
-    route: '/organizations/:orgId/insights/frontend/assets/',
+    route: `/organizations/:orgId/insights/frontend/assets/`,
   };
 
   beforeEach(() => {
@@ -266,7 +266,7 @@ const setupMockRequests = (organization: Organization) => {
   });
 
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/events/',
+    url: `/organizations/org-slug/events/`,
     method: 'GET',
     match: [
       MockApiClient.matchQuery({
diff --git a/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.spec.tsx b/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.spec.tsx
index 9345f99b2b98..9a20f2492356 100644
--- a/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.spec.tsx
@@ -18,7 +18,7 @@ describe('PageOverviewWebVitalsDetailPanel', () => {
       pathname: `/organizations/${organization.slug}/insights/frontend/pageloads/overview/`,
       query: {},
     },
-    route: '/organizations/:orgId/insights/frontend/pageloads/overview/',
+    route: `/organizations/:orgId/insights/frontend/pageloads/overview/`,
   };
 
   beforeEach(() => {
diff --git a/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx b/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx
index 23d6181383d7..f16eabe6deb4 100644
--- a/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx
+++ b/static/app/views/insights/browser/webVitals/components/pageOverviewWebVitalsDetailPanel.tsx
@@ -1,5 +1,4 @@
 import {useMemo} from 'react';
-import {useMatches} from 'react-router-dom';
 import styled from '@emotion/styled';
 
 import {Link} from '@sentry/scraps/link';
@@ -24,6 +23,7 @@ import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {useProjects} from 'sentry/utils/useProjects';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import type {DashboardFilters} from 'sentry/views/dashboards/types';
 import {WebVitalStatusLineChart} from 'sentry/views/insights/browser/webVitals/components/charts/webVitalStatusLineChart';
 import {PerformanceBadge} from 'sentry/views/insights/browser/webVitals/components/performanceBadge';
@@ -85,7 +85,7 @@ export function PageOverviewWebVitalsDetailPanel({
   const location = useLocation();
   const {projects} = useProjects();
   const organization = useOrganization();
-  const matches = useMatches();
+  const routes = useRoutes();
   const {replayExists} = useReplayExists();
   const domainViewFilters = useDomainViewFilters();
 
@@ -93,7 +93,7 @@ export function PageOverviewWebVitalsDetailPanel({
   const subregions = location.query[SpanFields.USER_GEO_SUBREGION] as SubregionCode[];
   const isSpansWebVital = defined(webVital) && ['inp', 'cls', 'lcp'].includes(webVital);
 
-  const replayLinkGenerator = generateReplayLink(matches);
+  const replayLinkGenerator = generateReplayLink(routes);
 
   const project = useMemo(
     () => projects.find(p => p.id === String(location.query.project)),
diff --git a/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.spec.tsx b/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.spec.tsx
index 9f01d7167ec8..113d805b0aae 100644
--- a/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/components/tables/pagePerformanceTable.spec.tsx
@@ -19,7 +19,7 @@ describe('PagePerformanceTable', () => {
       pathname: `/organizations/${organization.slug}/insights/frontend/pageloads/overview/`,
       query: {},
     },
-    route: '/organizations/:orgId/insights/frontend/pageloads/overview/',
+    route: `/organizations/:orgId/insights/frontend/pageloads/overview/`,
   };
 
   let eventsMock: jest.Mock;
diff --git a/static/app/views/insights/browser/webVitals/components/tables/pageSamplePerformanceTable.tsx b/static/app/views/insights/browser/webVitals/components/tables/pageSamplePerformanceTable.tsx
index 68de04da3628..692833ced330 100644
--- a/static/app/views/insights/browser/webVitals/components/tables/pageSamplePerformanceTable.tsx
+++ b/static/app/views/insights/browser/webVitals/components/tables/pageSamplePerformanceTable.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useMemo} from 'react';
-import {useMatches} from 'react-router-dom';
 import styled from '@emotion/styled';
 
 import {ProjectAvatar} from '@sentry/scraps/avatar';
@@ -35,6 +34,7 @@ import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {useProjects} from 'sentry/utils/useProjects';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {PerformanceBadge} from 'sentry/views/insights/browser/webVitals/components/performanceBadge';
 import {useTransactionSamplesWebVitalsScoresQuery} from 'sentry/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionSamplesWebVitalsScoresQuery';
 import {
@@ -153,7 +153,7 @@ export function PageSamplePerformanceTable({transaction, search, limit = 9}: Pro
   const {projects} = useProjects();
   const organization = useOrganization();
   const {replayExists} = useReplayExists();
-  const matches = useMatches();
+  const routes = useRoutes();
   const navigate = useNavigate();
   const domainViewFilters = useDomainViewFilters();
 
@@ -184,7 +184,7 @@ export function PageSamplePerformanceTable({transaction, search, limit = 9}: Pro
     sortableFields: sortableFields as unknown as string[],
   });
 
-  const replayLinkGenerator = generateReplayLink(matches);
+  const replayLinkGenerator = generateReplayLink(routes);
 
   const project = useMemo(
     () => projects.find(p => p.id === String(location.query.project)),
diff --git a/static/app/views/insights/browser/webVitals/components/webVitalDescription.tsx b/static/app/views/insights/browser/webVitals/components/webVitalDescription.tsx
index 243de300d723..bf751c5bb317 100644
--- a/static/app/views/insights/browser/webVitals/components/webVitalDescription.tsx
+++ b/static/app/views/insights/browser/webVitals/components/webVitalDescription.tsx
@@ -137,7 +137,7 @@ export function WebVitalDescription({score, value, webVital}: Props) {
       <WebVitalDetailHeader score={score} value={value} webVital={webVital} />
       <Stack marginBottom="md">
         {longDescription}
-        {tct(' [webVital] is available for the following browsers:', {
+        {tct(` [webVital] is available for the following browsers:`, {
           webVital: webVital.toUpperCase(),
         })}
       </Stack>
diff --git a/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.spec.tsx b/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.spec.tsx
index 648fda81ded2..76f3b8a24814 100644
--- a/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/components/webVitalsDetailPanel.spec.tsx
@@ -68,13 +68,13 @@ describe('WebVitalsDetailPanel', () => {
             'performance_score(measurements.score.lcp)',
             'performance_score(measurements.score.fcp)',
             'performance_score(measurements.score.cls)',
-            'performance_score(measurements.score.inp)',
+            `performance_score(measurements.score.inp)`,
             'performance_score(measurements.score.ttfb)',
             'performance_score(measurements.score.total)',
             'avg(measurements.score.weight.lcp)',
             'avg(measurements.score.weight.fcp)',
             'avg(measurements.score.weight.cls)',
-            'avg(measurements.score.weight.inp)',
+            `avg(measurements.score.weight.inp)`,
             'avg(measurements.score.weight.ttfb)',
             'count()',
             'count_scores(measurements.score.total)',
diff --git a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow.tsx b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow.tsx
index cfa56e62a318..a5f96b318934 100644
--- a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow.tsx
+++ b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/getWebVitalScoresFromTableDataRow.tsx
@@ -32,7 +32,7 @@ function getWebVitalScore(data: PerformanceScores, webVital: WebVitals): number
 }
 
 function getTotalScore(data: TotalPerformanceScore): number {
-  return data['performance_score(measurements.score.total)'] * 100;
+  return data[`performance_score(measurements.score.total)`] * 100;
 }
 
 function getWebVitalScoreCount(data: CountScores, webVital: WebVitals | 'total'): number {
diff --git a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresQuery.tsx b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresQuery.tsx
index b6e8df12a3bc..bced2eb5796f 100644
--- a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresQuery.tsx
+++ b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useProjectWebVitalsScoresQuery.tsx
@@ -47,13 +47,13 @@ export const useProjectWebVitalsScoresQuery = ({
         'performance_score(measurements.score.lcp)',
         'performance_score(measurements.score.fcp)',
         'performance_score(measurements.score.cls)',
-        'performance_score(measurements.score.inp)',
+        `performance_score(measurements.score.inp)`,
         'performance_score(measurements.score.ttfb)',
         'performance_score(measurements.score.total)',
         'avg(measurements.score.weight.lcp)',
         'avg(measurements.score.weight.fcp)',
         'avg(measurements.score.weight.cls)',
-        'avg(measurements.score.weight.inp)',
+        `avg(measurements.score.weight.inp)`,
         'avg(measurements.score.weight.ttfb)',
         'count()',
         'count_scores(measurements.score.total)',
@@ -61,7 +61,7 @@ export const useProjectWebVitalsScoresQuery = ({
         'count_scores(measurements.score.fcp)',
         'count_scores(measurements.score.cls)',
         'count_scores(measurements.score.ttfb)',
-        'count_scores(measurements.score.inp)',
+        `count_scores(measurements.score.inp)`,
         ...(weightWebVital === 'total'
           ? []
           : [`sum(measurements.score.weight.${weightWebVital})` as const]),
diff --git a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery.tsx b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery.tsx
index eef4d5959bfc..3fdf71a179e1 100644
--- a/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery.tsx
+++ b/static/app/views/insights/browser/webVitals/queries/storedScoreQueries/useTransactionWebVitalsScoresQuery.tsx
@@ -88,12 +88,12 @@ export const useTransactionWebVitalsScoresQuery = ({
         `opportunity_score(measurements.score.${webVital})`,
         'performance_score(measurements.score.total)',
         'count()',
-        'count_scores(measurements.score.lcp)',
-        'count_scores(measurements.score.fcp)',
-        'count_scores(measurements.score.cls)',
-        'count_scores(measurements.score.inp)',
-        'count_scores(measurements.score.ttfb)',
-        'count_scores(measurements.score.total)',
+        `count_scores(measurements.score.lcp)`,
+        `count_scores(measurements.score.fcp)`,
+        `count_scores(measurements.score.cls)`,
+        `count_scores(measurements.score.inp)`,
+        `count_scores(measurements.score.ttfb)`,
+        `count_scores(measurements.score.total)`,
         totalOpportunityScoreField,
       ],
     },
diff --git a/static/app/views/insights/browser/webVitals/queries/useSpanSamplesWebVitalsQuery.tsx b/static/app/views/insights/browser/webVitals/queries/useSpanSamplesWebVitalsQuery.tsx
index e2e31bb1663c..c79744e2a0dd 100644
--- a/static/app/views/insights/browser/webVitals/queries/useSpanSamplesWebVitalsQuery.tsx
+++ b/static/app/views/insights/browser/webVitals/queries/useSpanSamplesWebVitalsQuery.tsx
@@ -137,7 +137,7 @@ export function useSpanSamplesWebVitalsQuery({
               row[SpanFields.USER_IP],
             replayId: row[SpanFields.REPLAY_ID] ?? row[SpanFields.REPLAYID],
             'profile.id': row[SpanFields.PROFILEID] ?? row[SpanFields.PROFILE_ID],
-            totalScore: Math.round((row['measurements.score.total'] ?? 0) * 100),
+            totalScore: Math.round((row[`measurements.score.total`] ?? 0) * 100),
             inpScore: Math.round((row[SpanFields.INP_SCORE_RATIO] ?? 0) * 100),
             lcpScore: Math.round((row[SpanFields.LCP_SCORE_RATIO] ?? 0) * 100),
             clsScore: Math.round((row[SpanFields.CLS_SCORE_RATIO] ?? 0) * 100),
diff --git a/static/app/views/insights/browser/webVitals/views/pageOverview.spec.tsx b/static/app/views/insights/browser/webVitals/views/pageOverview.spec.tsx
index 7ee53a1c7c98..28f820623664 100644
--- a/static/app/views/insights/browser/webVitals/views/pageOverview.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/views/pageOverview.spec.tsx
@@ -19,7 +19,7 @@ describe('PageOverview', () => {
       pathname: `/organizations/${organization.slug}/insights/frontend/pageloads/overview/`,
       query: {},
     },
-    route: '/organizations/:orgId/insights/frontend/pageloads/overview/',
+    route: `/organizations/:orgId/insights/frontend/pageloads/overview/`,
   };
 
   let eventsMock: jest.Mock;
@@ -116,13 +116,13 @@ describe('PageOverview', () => {
             'performance_score(measurements.score.lcp)',
             'performance_score(measurements.score.fcp)',
             'performance_score(measurements.score.cls)',
-            'performance_score(measurements.score.inp)',
+            `performance_score(measurements.score.inp)`,
             'performance_score(measurements.score.ttfb)',
             'performance_score(measurements.score.total)',
             'avg(measurements.score.weight.lcp)',
             'avg(measurements.score.weight.fcp)',
             'avg(measurements.score.weight.cls)',
-            'avg(measurements.score.weight.inp)',
+            `avg(measurements.score.weight.inp)`,
             'avg(measurements.score.weight.ttfb)',
             'count()',
             'count_scores(measurements.score.total)',
@@ -130,7 +130,7 @@ describe('PageOverview', () => {
             'count_scores(measurements.score.fcp)',
             'count_scores(measurements.score.cls)',
             'count_scores(measurements.score.ttfb)',
-            'count_scores(measurements.score.inp)',
+            `count_scores(measurements.score.inp)`,
           ],
           query:
             'span.op:[ui.interaction.click,ui.interaction.hover,ui.interaction.drag,ui.interaction.press,ui.webvital.cls,ui.webvital.lcp,pageload,""]',
diff --git a/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.spec.tsx b/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.spec.tsx
index eb33b9d336c2..5e762fc1b916 100644
--- a/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.spec.tsx
+++ b/static/app/views/insights/browser/webVitals/views/webVitalsLandingPage.spec.tsx
@@ -18,7 +18,7 @@ describe('WebVitalsLandingPage', () => {
       pathname: `/organizations/${organization.slug}/insights/frontend/pageloads/`,
       query: {},
     },
-    route: '/organizations/:orgId/insights/frontend/pageloads/',
+    route: `/organizations/:orgId/insights/frontend/pageloads/`,
   };
 
   let eventsMock: jest.Mock;
@@ -158,13 +158,13 @@ describe('WebVitalsLandingPage', () => {
             'performance_score(measurements.score.lcp)',
             'performance_score(measurements.score.fcp)',
             'performance_score(measurements.score.cls)',
-            'performance_score(measurements.score.inp)',
+            `performance_score(measurements.score.inp)`,
             'performance_score(measurements.score.ttfb)',
             'performance_score(measurements.score.total)',
             'avg(measurements.score.weight.lcp)',
             'avg(measurements.score.weight.fcp)',
             'avg(measurements.score.weight.cls)',
-            'avg(measurements.score.weight.inp)',
+            `avg(measurements.score.weight.inp)`,
             'avg(measurements.score.weight.ttfb)',
             'count()',
             'count_scores(measurements.score.total)',
@@ -172,7 +172,7 @@ describe('WebVitalsLandingPage', () => {
             'count_scores(measurements.score.fcp)',
             'count_scores(measurements.score.cls)',
             'count_scores(measurements.score.ttfb)',
-            'count_scores(measurements.score.inp)',
+            `count_scores(measurements.score.inp)`,
           ],
           query:
             'span.op:[ui.interaction.click,ui.interaction.hover,ui.interaction.drag,ui.interaction.press,ui.webvital.cls,ui.webvital.lcp,pageload,""]',
diff --git a/static/app/views/insights/cache/components/charts/hitMissChart.tsx b/static/app/views/insights/cache/components/charts/hitMissChart.tsx
index 26412eb5b508..60335b52081a 100644
--- a/static/app/views/insights/cache/components/charts/hitMissChart.tsx
+++ b/static/app/views/insights/cache/components/charts/hitMissChart.tsx
@@ -39,7 +39,7 @@ export function CacheHitMissChart({search}: Props) {
   return (
     <InsightsLineChartWidget
       queryInfo={queryInfo}
-      title={DataTitles['cache_miss_rate()']}
+      title={DataTitles[`cache_miss_rate()`]}
       timeSeries={data?.timeSeries}
       showLegend="never"
       isLoading={isCacheHitRateLoading}
diff --git a/static/app/views/insights/cache/components/samplePanel.spec.tsx b/static/app/views/insights/cache/components/samplePanel.spec.tsx
index 7193862b6ac0..c015926990c7 100644
--- a/static/app/views/insights/cache/components/samplePanel.spec.tsx
+++ b/static/app/views/insights/cache/components/samplePanel.spec.tsx
@@ -18,7 +18,7 @@ describe('CacheSamplePanel', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events-timeseries/',
+      url: `/organizations/org-slug/events-timeseries/`,
       method: 'GET',
       body: [],
     });
diff --git a/static/app/views/insights/cache/components/tables/transactionsTable.tsx b/static/app/views/insights/cache/components/tables/transactionsTable.tsx
index fbdf30cef6a4..69741738be75 100644
--- a/static/app/views/insights/cache/components/tables/transactionsTable.tsx
+++ b/static/app/views/insights/cache/components/tables/transactionsTable.tsx
@@ -87,7 +87,7 @@ const COLUMN_ORDER: Column[] = [
     width: COL_WIDTH_UNDEFINED,
   },
   {
-    key: 'sum(span.self_time)',
+    key: `sum(span.self_time)`,
     name: DataTitles.timeSpent,
     width: COL_WIDTH_UNDEFINED,
   },
@@ -96,7 +96,7 @@ const COLUMN_ORDER: Column[] = [
 const SORTABLE_FIELDS = [
   `${EPM}()`,
   `${CACHE_MISS_RATE}()`,
-  'sum(span.self_time)',
+  `sum(span.self_time)`,
   `avg(${CACHE_ITEM_SIZE})`,
 ] as const;
 
diff --git a/static/app/views/insights/cache/views/cacheLandingPage.spec.tsx b/static/app/views/insights/cache/views/cacheLandingPage.spec.tsx
index 506627187aad..03adbde6a5e4 100644
--- a/static/app/views/insights/cache/views/cacheLandingPage.spec.tsx
+++ b/static/app/views/insights/cache/views/cacheLandingPage.spec.tsx
@@ -36,7 +36,7 @@ describe('CacheLandingPage', () => {
       pathname: `/organizations/${organization.slug}/insights/backend/caches/`,
       query: {statsPeriod: '10d', project: '1'},
     },
-    route: '/organizations/:orgId/insights/backend/caches/',
+    route: `/organizations/:orgId/insights/backend/caches/`,
   };
 
   ProjectsStore.loadInitialData([
diff --git a/static/app/views/insights/cache/views/cacheLandingPage.tsx b/static/app/views/insights/cache/views/cacheLandingPage.tsx
index b92763050b1f..e8583cdf423d 100644
--- a/static/app/views/insights/cache/views/cacheLandingPage.tsx
+++ b/static/app/views/insights/cache/views/cacheLandingPage.tsx
@@ -165,12 +165,12 @@ export default PageWithProviders;
 const addCustomMeta = (meta?: EventsMetaType) => {
   if (meta?.fields) {
     meta.fields[`avg(${CACHE_ITEM_SIZE})`] = 'size';
-    meta.fields['avg(span.duration)'] = 'duration';
+    meta.fields[`avg(span.duration)`] = 'duration';
     meta.units[`avg(${CACHE_ITEM_SIZE})`] = 'byte';
   }
 
   if (meta?.units) {
-    meta.units['avg(span.duration)'] = 'millisecond';
+    meta.units[`avg(span.duration)`] = 'millisecond';
   }
 };
 
diff --git a/static/app/views/insights/common/components/fullSpanDescription.spec.tsx b/static/app/views/insights/common/components/fullSpanDescription.spec.tsx
index 7db0b058c692..98cde8022e80 100644
--- a/static/app/views/insights/common/components/fullSpanDescription.spec.tsx
+++ b/static/app/views/insights/common/components/fullSpanDescription.spec.tsx
@@ -64,7 +64,7 @@ describe('FullSpanDescription', () => {
           {
             project: project.slug,
             span_id: spanId,
-            'span.description': '{"insert": "my_cool_collection😎", "a": {}}',
+            'span.description': `{"insert": "my_cool_collection😎", "a": {}}`,
             'db.system': 'mongodb',
           },
         ],
@@ -92,8 +92,7 @@ describe('FullSpanDescription', () => {
           {
             project: project.slug,
             span_id: spanId,
-            'span.description':
-              '{"insert": "my_cool_collection😎", "a": {}, "uh_oh":"the_query_is_truncated", "ohno*',
+            'span.description': `{"insert": "my_cool_collection😎", "a": {}, "uh_oh":"the_query_is_truncated", "ohno*`,
             'db.system': 'mongodb',
           },
         ],
diff --git a/static/app/views/insights/common/components/fullSpanDescription.tsx b/static/app/views/insights/common/components/fullSpanDescription.tsx
index cabc16b45488..84c25a2de4c3 100644
--- a/static/app/views/insights/common/components/fullSpanDescription.tsx
+++ b/static/app/views/insights/common/components/fullSpanDescription.tsx
@@ -7,7 +7,7 @@ import {ClippedBox} from 'sentry/components/clippedBox';
 import {LoadingIndicator} from 'sentry/components/loadingIndicator';
 import {IconOpen} from 'sentry/icons';
 import {t} from 'sentry/locale';
-import {SQLishFormatter} from 'sentry/utils/sqlish';
+import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
diff --git a/static/app/views/insights/common/components/moduleFeature.spec.tsx b/static/app/views/insights/common/components/moduleFeature.spec.tsx
index cfe30d9a90ac..7dcaf891b5cb 100644
--- a/static/app/views/insights/common/components/moduleFeature.spec.tsx
+++ b/static/app/views/insights/common/components/moduleFeature.spec.tsx
@@ -24,7 +24,7 @@ describe('ModulePageProviders', () => {
       }
     );
 
-    await screen.findByText("You don't have access to this feature");
+    await screen.findByText(`You don't have access to this feature`);
   });
 
   it('renders module content if module is enabled', async () => {
@@ -39,6 +39,6 @@ describe('ModulePageProviders', () => {
       }
     );
 
-    await screen.findByText('Module Content');
+    await screen.findByText(`Module Content`);
   });
 });
diff --git a/static/app/views/insights/common/components/modulesOnboarding.tsx b/static/app/views/insights/common/components/modulesOnboarding.tsx
index fc4c07082c4d..7a7327ad529f 100644
--- a/static/app/views/insights/common/components/modulesOnboarding.tsx
+++ b/static/app/views/insights/common/components/modulesOnboarding.tsx
@@ -260,7 +260,7 @@ type EmptyStateContent = {
 
 const EMPTY_STATE_CONTENT: Record<ModulesWithOnboarding, EmptyStateContent> = {
   [ModuleName.APP_START]: {
-    heading: t("Don't lose your user's attention before your app loads"),
+    heading: t(`Don't lose your user's attention before your app loads`),
     description: tct(
       'Monitor cold and warm [dataTypePlural] and track down the operations and releases contributing to regressions.',
       {
@@ -268,7 +268,7 @@ const EMPTY_STATE_CONTENT: Record<ModulesWithOnboarding, EmptyStateContent> = {
           MODULE_DATA_TYPES_PLURAL[ModuleName.APP_START].toLocaleLowerCase(),
       }
     ),
-    valuePropDescription: tct('Mobile [dataType] insights give you visibility into:', {
+    valuePropDescription: tct(`Mobile [dataType] insights give you visibility into:`, {
       dataType: MODULE_DATA_TYPES[ModuleName.APP_START],
     }),
     valuePropPoints: [
@@ -423,7 +423,7 @@ const EMPTY_STATE_CONTENT: Record<ModulesWithOnboarding, EmptyStateContent> = {
     supportedSdks: ['python', 'javascript', 'php', 'java', 'ruby', 'dotnet'],
   },
   [ModuleName.SCREEN_LOAD]: {
-    heading: t("Don’t lose your user's attention once your app loads"),
+    heading: t(`Don’t lose your user's attention once your app loads`),
     description: tct(
       'View the most active [dataTypePlural] in your mobile application and monitor your releases for screen load performance.',
       {
@@ -463,7 +463,7 @@ const EMPTY_STATE_CONTENT: Record<ModulesWithOnboarding, EmptyStateContent> = {
     supportedSdks: ['android', 'flutter', 'apple-ios', 'react-native'],
   },
   [ModuleName.SESSIONS]: {
-    heading: t("Get insights about your application's session health"),
+    heading: t(`Get insights about your application's session health`),
     description: tct(
       'Understand the frequency of handled errors and crashes compared to healthy sessions.',
       {
diff --git a/static/app/views/insights/common/components/spanDescription.spec.tsx b/static/app/views/insights/common/components/spanDescription.spec.tsx
index 16d9e79b7f7c..8aac67db7496 100644
--- a/static/app/views/insights/common/components/spanDescription.spec.tsx
+++ b/static/app/views/insights/common/components/spanDescription.spec.tsx
@@ -110,7 +110,7 @@ describe('DatabaseSpanDescription', () => {
   });
 
   it('correctly formats and displays MongoDB queries', async () => {
-    const sampleMongoDBQuery = '{"a": "?", "insert": "documents"}';
+    const sampleMongoDBQuery = `{"a": "?", "insert": "documents"}`;
 
     MockApiClient.addMockResponse({
       url: `/organizations/${organization.slug}/events/`,
diff --git a/static/app/views/insights/common/components/spanDescription.tsx b/static/app/views/insights/common/components/spanDescription.tsx
index afa063e21505..2212b9bac0a8 100644
--- a/static/app/views/insights/common/components/spanDescription.tsx
+++ b/static/app/views/insights/common/components/spanDescription.tsx
@@ -6,7 +6,7 @@ import {Flex} from '@sentry/scraps/layout';
 
 import {ClippedBox} from 'sentry/components/clippedBox';
 import {LoadingIndicator} from 'sentry/components/loadingIndicator';
-import {SQLishFormatter} from 'sentry/utils/sqlish';
+import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
 import {MutableSearch} from 'sentry/utils/tokenizeSearch';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
diff --git a/static/app/views/insights/common/components/tableCells/renderHeadCell.tsx b/static/app/views/insights/common/components/tableCells/renderHeadCell.tsx
index c3f4ddc7c298..2638ccbe6647 100644
--- a/static/app/views/insights/common/components/tableCells/renderHeadCell.tsx
+++ b/static/app/views/insights/common/components/tableCells/renderHeadCell.tsx
@@ -42,10 +42,10 @@ const SORTABLE_FIELDS = new Set([
   `sum(${SPAN_DURATION})`,
   `sum(${SPAN_SELF_TIME})`,
   `p95(${SPAN_SELF_TIME})`,
-  'p75(transaction.duration)',
-  'transaction.duration',
+  `p75(transaction.duration)`,
+  `transaction.duration`,
   'transaction',
-  'count()',
+  `count()`,
   `${EPM}()`,
   `${TPM}()`,
   `${TIME_SPENT_PERCENTAGE}()`,
diff --git a/static/app/views/insights/common/components/tableCells/spanDescriptionCell.spec.tsx b/static/app/views/insights/common/components/tableCells/spanDescriptionCell.spec.tsx
deleted file mode 100644
index fac858111be9..000000000000
--- a/static/app/views/insights/common/components/tableCells/spanDescriptionCell.spec.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import {OrganizationFixture} from 'sentry-fixture/organization';
-
-import {render, screen} from 'sentry-test/reactTestingLibrary';
-
-import {ModuleName} from 'sentry/views/insights/types';
-
-import {SpanDescriptionCell} from './spanDescriptionCell';
-
-describe('SpanDescriptionCell', () => {
-  const organization = OrganizationFixture();
-
-  it('formats SQL descriptions with bold keywords via toSimpleMarkup', () => {
-    render(
-      <SpanDescriptionCell
-        description="select id, name from users where active = 1"
-        moduleName={ModuleName.DB}
-        projectId={1}
-      />,
-      {organization}
-    );
-
-    // SQLishFormatter.toSimpleMarkup uppercases keywords and wraps them in <b>
-    const boldElements = document.querySelectorAll('b');
-    const boldText = Array.from(boldElements).map(el => el.textContent);
-    expect(boldText).toEqual(['SELECT', 'FROM', 'WHERE']);
-  });
-
-  it('renders raw description for non-DB modules', () => {
-    render(
-      <SpanDescriptionCell
-        description="https://example.com/api/resource"
-        moduleName={ModuleName.RESOURCE}
-        projectId={1}
-        spanOp="resource.script"
-      />,
-      {organization}
-    );
-
-    expect(screen.getByText('https://example.com/api/resource')).toBeInTheDocument();
-  });
-});
diff --git a/static/app/views/insights/common/components/tableCells/spanDescriptionCell.tsx b/static/app/views/insights/common/components/tableCells/spanDescriptionCell.tsx
index cc7758bdd159..c7dec474f85a 100644
--- a/static/app/views/insights/common/components/tableCells/spanDescriptionCell.tsx
+++ b/static/app/views/insights/common/components/tableCells/spanDescriptionCell.tsx
@@ -3,7 +3,7 @@ import styled from '@emotion/styled';
 
 import {Hovercard} from 'sentry/components/hovercard';
 import {t} from 'sentry/locale';
-import {SQLishFormatter} from 'sentry/utils/sqlish';
+import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
 import {FullSpanDescription} from 'sentry/views/insights/common/components/fullSpanDescription';
 import {SpanGroupDetailsLink} from 'sentry/views/insights/common/components/spanGroupDetailsLink';
 import {SupportedDatabaseSystem} from 'sentry/views/insights/database/utils/constants';
diff --git a/static/app/views/insights/common/components/widgets/hooks/useResourceSummarySeries.tsx b/static/app/views/insights/common/components/widgets/hooks/useResourceSummarySeries.tsx
index bba34262bf91..53caa178793d 100644
--- a/static/app/views/insights/common/components/widgets/hooks/useResourceSummarySeries.tsx
+++ b/static/app/views/insights/common/components/widgets/hooks/useResourceSummarySeries.tsx
@@ -47,7 +47,7 @@ export function useResourceSummarySeries(props: Props) {
     {
       query: search,
       yAxis: [
-        'epm()',
+        `epm()`,
         `avg(${SPAN_SELF_TIME})`,
         `avg(${HTTP_RESPONSE_CONTENT_LENGTH})`,
         `avg(${HTTP_DECODED_RESPONSE_CONTENT_LENGTH})`,
diff --git a/static/app/views/insights/common/components/widgets/overviewCacheMissChartWidget.tsx b/static/app/views/insights/common/components/widgets/overviewCacheMissChartWidget.tsx
index 5ab02a0b1c1c..10b87d1ed838 100644
--- a/static/app/views/insights/common/components/widgets/overviewCacheMissChartWidget.tsx
+++ b/static/app/views/insights/common/components/widgets/overviewCacheMissChartWidget.tsx
@@ -129,7 +129,7 @@ export default function OverviewCacheMissChartWidget(props: LoadableChartWidgetP
                 to={
                   organization.features.includes('insight-modules')
                     ? `/insights/backend/caches?project=${item['project.id']}&transaction=${item.transaction}`
-                    : '/insights/backend/caches'
+                    : `/insights/backend/caches`
                 }
               >
                 {item.transaction}
diff --git a/static/app/views/insights/common/components/widgets/releaseNewIssuesChartWidget.tsx b/static/app/views/insights/common/components/widgets/releaseNewIssuesChartWidget.tsx
index 1f1242137cc4..cfa967e80680 100644
--- a/static/app/views/insights/common/components/widgets/releaseNewIssuesChartWidget.tsx
+++ b/static/app/views/insights/common/components/widgets/releaseNewIssuesChartWidget.tsx
@@ -35,7 +35,7 @@ export default function ReleaseNewIssuesChartWidget(props: LoadableChartWidgetPr
       )}
       series={series}
       description={t(
-        "New issue counts over time, grouped by release. The 5 most recent releases are shown, and the rest are grouped into 'other'."
+        `New issue counts over time, grouped by release. The 5 most recent releases are shown, and the rest are grouped into 'other'.`
       )}
       isPending={isPending}
       error={error}
diff --git a/static/app/views/insights/common/queries/useDiscover.spec.tsx b/static/app/views/insights/common/queries/useDiscover.spec.tsx
index b1fa09006bde..43c2a6ab84c1 100644
--- a/static/app/views/insights/common/queries/useDiscover.spec.tsx
+++ b/static/app/views/insights/common/queries/useDiscover.spec.tsx
@@ -119,7 +119,7 @@ describe('useDiscover', () => {
             per_page: 10,
             project: [],
             sort: '-epm()',
-            query: 'span.group:221aa7ebd216 transaction:/api/details release:0.0.1',
+            query: `span.group:221aa7ebd216 transaction:/api/details release:0.0.1`,
             referrer: 'api-spec',
             sampling: SAMPLING_MODE.NORMAL,
             statsPeriod: '10d',
@@ -258,8 +258,7 @@ describe('useDiscover', () => {
             per_page: 10,
             project: [],
             sort: '-span.group',
-            query:
-              'span.group:221aa7ebd216 measurements.inp:<50 measurements.inp:>0 transaction:/api/details release:0.0.1',
+            query: `span.group:221aa7ebd216 measurements.inp:<50 measurements.inp:>0 transaction:/api/details release:0.0.1`,
             referrer: 'api-spec',
             statsPeriod: '10d',
           },
diff --git a/static/app/views/insights/common/queries/useHasTtfdConfigured.tsx b/static/app/views/insights/common/queries/useHasTtfdConfigured.tsx
index ad9b2e12dc55..403e46b36939 100644
--- a/static/app/views/insights/common/queries/useHasTtfdConfigured.tsx
+++ b/static/app/views/insights/common/queries/useHasTtfdConfigured.tsx
@@ -20,8 +20,8 @@ export function useTTFDConfigured(additionalFilters?: string[]) {
       search: queryString,
       enabled: !isReleasesLoading,
       fields: [
-        'avg(measurements.time_to_initial_display)',
-        'avg(measurements.time_to_full_display)',
+        `avg(measurements.time_to_initial_display)`,
+        `avg(measurements.time_to_full_display)`,
         'count()',
       ],
     },
diff --git a/static/app/views/insights/common/queries/useSpanSamples.tsx b/static/app/views/insights/common/queries/useSpanSamples.tsx
index dd3801d0db7b..b098c70d2a56 100644
--- a/static/app/views/insights/common/queries/useSpanSamples.tsx
+++ b/static/app/views/insights/common/queries/useSpanSamples.tsx
@@ -137,7 +137,7 @@ export const useSpanSamples = <Fields extends NonDefaultSpanSampleFields[]>(
     meta: EventsMetaType;
   }>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/spans-samples/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/spans-samples/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/insights/common/utils/buildEventViewQuery.tsx b/static/app/views/insights/common/utils/buildEventViewQuery.tsx
index 39bebed7f0ed..744721feedb1 100644
--- a/static/app/views/insights/common/utils/buildEventViewQuery.tsx
+++ b/static/app/views/insights/common/utils/buildEventViewQuery.tsx
@@ -58,7 +58,7 @@ export function buildEventViewQuery({
 
   if (defined(spanCategory)) {
     if (spanCategory === NULL_SPAN_CATEGORY) {
-      result.push('!has:span.category');
+      result.push(`!has:span.category`);
     } else if (spanCategory !== 'Other') {
       result.push(`span.category:${spanCategory}`);
     }
diff --git a/static/app/views/insights/common/utils/getAlertsUrl.tsx b/static/app/views/insights/common/utils/getAlertsUrl.tsx
index 64f720ace3e0..a0431f4ef386 100644
--- a/static/app/views/insights/common/utils/getAlertsUrl.tsx
+++ b/static/app/views/insights/common/utils/getAlertsUrl.tsx
@@ -63,7 +63,7 @@ export function getAlertsUrl({
 
   return (
     makeAlertsPathname({
-      path: '/new/metric/',
+      path: `/new/metric/`,
       organization,
     }) + `?${qs.stringify(queryParams)}`
   );
diff --git a/static/app/views/insights/common/views/spanSummaryPage/sampleList/index.spec.tsx b/static/app/views/insights/common/views/spanSummaryPage/sampleList/index.spec.tsx
index 6f43fb89c9fb..a50ebefd58cd 100644
--- a/static/app/views/insights/common/views/spanSummaryPage/sampleList/index.spec.tsx
+++ b/static/app/views/insights/common/views/spanSummaryPage/sampleList/index.spec.tsx
@@ -19,7 +19,7 @@ describe('SampleList', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events-timeseries/',
+      url: `/organizations/org-slug/events-timeseries/`,
       method: 'GET',
       body: [],
     });
diff --git a/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.spec.tsx b/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.spec.tsx
index 2e1e8c113757..8e39e6ce7ef5 100644
--- a/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.spec.tsx
+++ b/static/app/views/insights/common/views/spanSummaryPage/sampleList/sampleTable/sampleTable.spec.tsx
@@ -160,7 +160,7 @@ describe('SampleTable', () => {
 
 const initializeMockRequests = () => {
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/events/',
+    url: `/organizations/org-slug/events/`,
     body: {
       data: [
         {
@@ -178,7 +178,7 @@ const initializeMockRequests = () => {
     ],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/events/',
+    url: `/organizations/org-slug/events/`,
     body: {
       data: [
         {
diff --git a/static/app/views/insights/crons/components/monitorForm.tsx b/static/app/views/insights/crons/components/monitorForm.tsx
index b4032206ccb4..8137bd92bda6 100644
--- a/static/app/views/insights/crons/components/monitorForm.tsx
+++ b/static/app/views/insights/crons/components/monitorForm.tsx
@@ -590,7 +590,7 @@ const InputGroup = styled('div')<{noPadding?: boolean}>`
   gap: ${p => p.theme.space.md};
 
   ${FieldWrapper} {
-    ${p => p.noPadding && 'padding: 0;'};
+    ${p => p.noPadding && `padding: 0;`};
   }
 `;
 
diff --git a/static/app/views/insights/crons/components/monitorHeader.tsx b/static/app/views/insights/crons/components/monitorHeader.tsx
index 5af89e2a441f..3d5ef19ed226 100644
--- a/static/app/views/insights/crons/components/monitorHeader.tsx
+++ b/static/app/views/insights/crons/components/monitorHeader.tsx
@@ -19,7 +19,7 @@ export function MonitorHeader({monitor, orgSlug, onUpdate}: Props) {
   const crumbs = [
     {
       label: t('Alerts'),
-      to: makeAlertsPathname({path: '/rules/', organization}),
+      to: makeAlertsPathname({path: `/rules/`, organization}),
       preservePageFilters: true,
     },
     {
diff --git a/static/app/views/insights/crons/components/newMonitorButton.tsx b/static/app/views/insights/crons/components/newMonitorButton.tsx
index ed21d316384d..2c3cc4c5552d 100644
--- a/static/app/views/insights/crons/components/newMonitorButton.tsx
+++ b/static/app/views/insights/crons/components/newMonitorButton.tsx
@@ -11,7 +11,7 @@ export function NewMonitorButton(props: Props) {
 
   return (
     <LinkButton
-      to={makeAlertsPathname({path: '/new/crons/', organization})}
+      to={makeAlertsPathname({path: `/new/crons/`, organization})}
       priority="primary"
       {...props}
     >
diff --git a/static/app/views/insights/crons/components/overviewTimeline/index.tsx b/static/app/views/insights/crons/components/overviewTimeline/index.tsx
index df442cb979bb..f4eb07a61dd5 100644
--- a/static/app/views/insights/crons/components/overviewTimeline/index.tsx
+++ b/static/app/views/insights/crons/components/overviewTimeline/index.tsx
@@ -17,7 +17,7 @@ import {useDateNavigation} from 'sentry/components/checkInTimeline/hooks/useDate
 import {useTimeWindowConfig} from 'sentry/components/checkInTimeline/hooks/useTimeWindowConfig';
 import {Panel} from 'sentry/components/panels/panel';
 import {Sticky} from 'sentry/components/sticky';
-import {useQueryClient} from 'sentry/utils/queryClient';
+import {setApiQueryData, useQueryClient} from 'sentry/utils/queryClient';
 import {useApi} from 'sentry/utils/useApi';
 import {useDebouncedValue} from 'sentry/utils/useDebouncedValue';
 import {useDimensions} from 'sentry/utils/useDimensions';
@@ -25,7 +25,7 @@ import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {CronServiceIncidents} from 'sentry/views/insights/crons/components/serviceIncidents';
 import type {Monitor} from 'sentry/views/insights/crons/types';
-import {monitorListApiOptions} from 'sentry/views/insights/crons/utils';
+import {makeMonitorListQueryKey} from 'sentry/views/insights/crons/utils';
 
 import {OverviewRow} from './overviewRow';
 import {SortSelector} from './sortSelector';
@@ -53,16 +53,14 @@ export function OverviewTimeline({monitorList}: Props) {
       return;
     }
 
-    const monitorListOptions = monitorListApiOptions(organization, location.query);
-
-    queryClient.setQueryData(monitorListOptions.queryKey, old => {
-      if (!old) {
+    const queryKey = makeMonitorListQueryKey(organization, location.query);
+    setApiQueryData<Monitor[]>(queryClient, queryKey, oldMonitorList => {
+      if (!oldMonitorList) {
         return undefined;
       }
-      const oldMonitorList = old.json;
       const oldMonitorIdx = oldMonitorList.findIndex(m => m.slug === monitor.slug);
       if (oldMonitorIdx < 0) {
-        return old;
+        return oldMonitorList;
       }
 
       const oldMonitor = oldMonitorList[oldMonitorIdx]!;
@@ -76,10 +74,10 @@ export function OverviewTimeline({monitorList}: Props) {
       const right = oldMonitorList.slice(oldMonitorIdx + 1);
 
       if (newEnvList.length === 0) {
-        return {...old, json: [...left, ...right]};
+        return [...left, ...right];
       }
 
-      return {...old, json: [...left, updatedMonitor, ...right]};
+      return [...left, updatedMonitor, ...right];
     });
   };
 
@@ -100,14 +98,11 @@ export function OverviewTimeline({monitorList}: Props) {
       return;
     }
 
-    const monitorListOptions = monitorListApiOptions(organization, location.query);
-    queryClient.setQueryData(monitorListOptions.queryKey, old => {
-      return old
-        ? {
-            ...old,
-            // TODO(davidenwang): in future only change the specifically modified environment for optimistic updates
-            json: old.json.map(m => (m.slug === monitor.slug ? resp : m)),
-          }
+    const queryKey = makeMonitorListQueryKey(organization, location.query);
+    setApiQueryData<Monitor[]>(queryClient, queryKey, oldMonitorList => {
+      return oldMonitorList
+        ? // TODO(davidenwang): in future only change the specifically modified environment for optimistic updates
+          oldMonitorList.map(m => (m.slug === monitor.slug ? resp : m))
         : undefined;
     });
   };
@@ -120,15 +115,12 @@ export function OverviewTimeline({monitorList}: Props) {
       return;
     }
 
-    const monitorListOptions = monitorListApiOptions(organization, location.query);
-    queryClient.setQueryData(monitorListOptions.queryKey, old => {
-      return old
-        ? {
-            ...old,
-            json: old.json.map(m =>
-              m.slug === monitor.slug ? {...m, status: resp.status} : m
-            ),
-          }
+    const queryKey = makeMonitorListQueryKey(organization, location.query);
+    setApiQueryData<Monitor[]>(queryClient, queryKey, oldMonitorList => {
+      return oldMonitorList
+        ? oldMonitorList.map(m =>
+            m.slug === monitor.slug ? {...m, status: resp.status} : m
+          )
         : undefined;
     });
   };
diff --git a/static/app/views/insights/crons/utils.tsx b/static/app/views/insights/crons/utils.tsx
index ec11d6386f2e..d5da279e703e 100644
--- a/static/app/views/insights/crons/utils.tsx
+++ b/static/app/views/insights/crons/utils.tsx
@@ -2,36 +2,34 @@ import type {TickStyle} from 'sentry/components/checkInTimeline/types';
 import {t, tn} from 'sentry/locale';
 import type {SelectValue} from 'sentry/types/core';
 import type {Organization} from 'sentry/types/organization';
-import {apiOptions} from 'sentry/utils/api/apiOptions';
 import {getApiUrl} from 'sentry/utils/api/getApiUrl';
 
-import {CheckInStatus, type Monitor} from './types';
+import {CheckInStatus} from './types';
 
-export function monitorListApiOptions(
+export function makeMonitorListQueryKey(
   organization: Organization,
-  queryParams: Partial<
-    Record<
-      'asc' | 'cursor' | 'environment' | 'owner' | 'project' | 'query' | 'sort',
-      unknown
-    >
-  >
+  params: Record<string, any>
 ) {
-  const {query, project, environment, owner, cursor, sort, asc} = queryParams;
-  return apiOptions.as<Monitor[]>()('/organizations/$organizationIdOrSlug/monitors/', {
-    path: {organizationIdOrSlug: organization.slug},
-    query: {
-      cursor,
-      query,
-      project,
-      environment,
-      owner,
-      includeNew: true,
-      per_page: 20,
-      sort,
-      asc,
+  const {query, project, environment, owner, cursor, sort, asc} = params;
+
+  return [
+    getApiUrl('/organizations/$organizationIdOrSlug/monitors/', {
+      path: {organizationIdOrSlug: organization.slug},
+    }),
+    {
+      query: {
+        cursor,
+        query,
+        project,
+        environment,
+        owner,
+        includeNew: true,
+        per_page: 20,
+        sort,
+        asc,
+      },
     },
-    staleTime: 0,
-  });
+  ] as const;
 }
 
 export function makeMonitorDetailsQueryKey(
diff --git a/static/app/views/insights/crons/views/overview.tsx b/static/app/views/insights/crons/views/overview.tsx
index 356948e99497..d2247d63559d 100644
--- a/static/app/views/insights/crons/views/overview.tsx
+++ b/static/app/views/insights/crons/views/overview.tsx
@@ -1,6 +1,5 @@
 import {Fragment} from 'react';
 import styled from '@emotion/styled';
-import {useQuery} from '@tanstack/react-query';
 import * as qs from 'query-string';
 
 import {Alert} from '@sentry/scraps/alert';
@@ -29,7 +28,7 @@ import {SearchBar} from 'sentry/components/searchBar';
 import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle';
 import {IconAdd, IconList} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
-import {selectJsonWithHeaders} from 'sentry/utils/api/apiOptions';
+import {useApiQuery} from 'sentry/utils/queryClient';
 import {decodeList, decodeScalar} from 'sentry/utils/queryString';
 import {useRouteAnalyticsEventNames} from 'sentry/utils/routeAnalytics/useRouteAnalyticsEventNames';
 import {useRouteAnalyticsParams} from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
@@ -44,7 +43,8 @@ import {OwnerFilter} from 'sentry/views/insights/crons/components/ownerFilter';
 import {GlobalMonitorProcessingErrors} from 'sentry/views/insights/crons/components/processingErrors/globalMonitorProcessingErrors';
 import {useCronsUpsertGuideState} from 'sentry/views/insights/crons/components/useCronsUpsertGuideState';
 import {MODULE_DESCRIPTION, MODULE_DOC_LINK} from 'sentry/views/insights/crons/settings';
-import {monitorListApiOptions} from 'sentry/views/insights/crons/utils';
+import type {Monitor} from 'sentry/views/insights/crons/types';
+import {makeMonitorListQueryKey} from 'sentry/views/insights/crons/utils';
 
 const CronsListPageHeader = HookOrDefault({
   hookName: 'component:crons-list-page-header',
@@ -57,24 +57,21 @@ function CronsOverview() {
   const {guideVisible} = useCronsUpsertGuideState();
   const project = decodeList(location.query?.project);
 
-  const {data, isPending, refetch} = useQuery({
-    ...monitorListApiOptions(organization, {
-      cursor: location.query.cursor,
-      query: location.query.query,
-      project: location.query.project,
-      environment: location.query.environment,
-      owner: location.query.owner,
-      sort: location.query.sort,
-      asc: location.query.asc,
-    }),
-    select: selectJsonWithHeaders,
+  const queryKey = makeMonitorListQueryKey(organization, location.query);
+
+  const {
+    data: monitorList,
+    getResponseHeader: monitorListHeaders,
+    isPending,
+    refetch,
+  } = useApiQuery<Monitor[]>(queryKey, {
+    staleTime: 0,
   });
-  const monitorList = data?.json;
 
   useRouteAnalyticsEventNames('monitors.page_viewed', 'Monitors: Page Viewed');
   useRouteAnalyticsParams({empty_state: !monitorList || monitorList.length === 0});
 
-  const monitorListPageLinks = data?.headers.Link;
+  const monitorListPageLinks = monitorListHeaders?.('Link');
 
   const handleSearch = (query: string) => {
     const currentQuery = {...location.query, cursor: undefined};
diff --git a/static/app/views/insights/database/components/tables/queriesTable.tsx b/static/app/views/insights/database/components/tables/queriesTable.tsx
index 8ef2bc723237..de655ebed312 100644
--- a/static/app/views/insights/database/components/tables/queriesTable.tsx
+++ b/static/app/views/insights/database/components/tables/queriesTable.tsx
@@ -54,7 +54,7 @@ const COLUMN_ORDER: Column[] = [
     width: COL_WIDTH_UNDEFINED,
   },
   {
-    key: 'avg(span.self_time)',
+    key: `avg(span.self_time)`,
     name: DataTitles.avg,
     width: COL_WIDTH_UNDEFINED,
   },
diff --git a/static/app/views/insights/database/utils/formatMongoDBQuery.spec.tsx b/static/app/views/insights/database/utils/formatMongoDBQuery.spec.tsx
index db34e81d3579..d4f597db12a6 100644
--- a/static/app/views/insights/database/utils/formatMongoDBQuery.spec.tsx
+++ b/static/app/views/insights/database/utils/formatMongoDBQuery.spec.tsx
@@ -88,8 +88,7 @@ describe('formatMongoDBQuery', () => {
   });
 
   it('handles truncated MongoDB query strings by repairing the JSON', () => {
-    const query =
-      '{"_id":{},"test":"?","insert":"some_collection","address":"?","details":{"email":"?","nam*';
+    const query = `{"_id":{},"test":"?","insert":"some_collection","address":"?","details":{"email":"?","nam*`;
     const tokenizedQuery = formatMongoDBQuery(query, 'insert');
     render(<Fragment>{tokenizedQuery}</Fragment>);
 
@@ -104,8 +103,7 @@ describe('formatMongoDBQuery', () => {
   });
 
   it('properly handles formatting MongoDB queries when the operation entry is the last entry', () => {
-    const query =
-      '{"first_key":"first_value","second_key":"second_value","findOne":"my_collection"}';
+    const query = `{"first_key":"first_value","second_key":"second_value","findOne":"my_collection"}`;
     const tokenizedQuery = formatMongoDBQuery(query, 'findOne');
     render(<Fragment>{tokenizedQuery}</Fragment>);
 
diff --git a/static/app/views/insights/database/views/databaseLandingPage.spec.tsx b/static/app/views/insights/database/views/databaseLandingPage.spec.tsx
index 5bf961673ce0..23c718dfce33 100644
--- a/static/app/views/insights/database/views/databaseLandingPage.spec.tsx
+++ b/static/app/views/insights/database/views/databaseLandingPage.spec.tsx
@@ -19,7 +19,7 @@ describe('DatabaseLandingPage', () => {
       pathname: `/organizations/${organization.slug}/insights/backend/database/`,
       query: {statsPeriod: '10d'},
     },
-    route: '/organizations/:orgId/insights/backend/database/',
+    route: `/organizations/:orgId/insights/backend/database/`,
   };
 
   let spanListRequestMock: jest.Mock;
diff --git a/static/app/views/insights/database/views/databaseSpanSummaryPage.spec.tsx b/static/app/views/insights/database/views/databaseSpanSummaryPage.spec.tsx
index 9de786f261f4..4a415f756f71 100644
--- a/static/app/views/insights/database/views/databaseSpanSummaryPage.spec.tsx
+++ b/static/app/views/insights/database/views/databaseSpanSummaryPage.spec.tsx
@@ -19,7 +19,7 @@ describe('DatabaseSpanSummaryPage', () => {
   const groupId = '1756baf8fd19c116';
 
   const initialRouterConfig = {
-    route: '/organizations/:orgId/insights/backend/database/spans/span/:groupId/',
+    route: `/organizations/:orgId/insights/backend/database/spans/span/:groupId/`,
     location: {
       pathname: `/organizations/${organization.slug}/insights/backend/database/spans/span/${groupId}/`,
       query: {statsPeriod: '10d', transactionsCursor: '0:25:0'},
@@ -138,7 +138,7 @@ describe('DatabaseSpanSummaryPage', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug//releases/1.0.0/',
+      url: `/projects/org-slug//releases/1.0.0/`,
       method: 'GET',
       body: [],
     });
diff --git a/static/app/views/insights/http/components/httpSamplesPanel.spec.tsx b/static/app/views/insights/http/components/httpSamplesPanel.spec.tsx
index f3e59edfc660..a1196d5aa8f8 100644
--- a/static/app/views/insights/http/components/httpSamplesPanel.spec.tsx
+++ b/static/app/views/insights/http/components/httpSamplesPanel.spec.tsx
@@ -20,7 +20,7 @@ describe('HTTPSamplesPanel', () => {
   let eventsRequestMock: jest.Mock;
 
   const basePath = `/organizations/${organization.slug}/insights/backend/http/domains/`;
-  const baseRoute = '/organizations/:orgId/insights/backend/http/domains/';
+  const baseRoute = `/organizations/:orgId/insights/backend/http/domains/`;
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -120,7 +120,7 @@ describe('HTTPSamplesPanel', () => {
         body: {
           timeSeries: [
             TimeSeriesFixture({
-              yAxis: 'epm()',
+              yAxis: `epm()`,
               groupBy: [{key: SpanFields.SPAN_STATUS_CODE, value: '301'}],
               values: [
                 {timestamp: 1699907700000, value: 7810.2},
@@ -128,7 +128,7 @@ describe('HTTPSamplesPanel', () => {
               ],
             }),
             TimeSeriesFixture({
-              yAxis: 'epm()',
+              yAxis: `epm()`,
               groupBy: [{key: SpanFields.SPAN_STATUS_CODE, value: '304'}],
               values: [
                 {timestamp: 1699907700000, value: 2701.5},
diff --git a/static/app/views/insights/http/components/httpSamplesPanel.tsx b/static/app/views/insights/http/components/httpSamplesPanel.tsx
index 44af47157c63..0dbba6298c2b 100644
--- a/static/app/views/insights/http/components/httpSamplesPanel.tsx
+++ b/static/app/views/insights/http/components/httpSamplesPanel.tsx
@@ -214,7 +214,7 @@ export function HTTPSamplesPanel() {
   } = useFetchSpanTimeSeries(
     {
       query: search,
-      yAxis: ['avg(span.self_time)'],
+      yAxis: [`avg(span.self_time)`],
       enabled: isPanelOpen && query.panel === 'duration',
     },
     Referrer.SAMPLES_PANEL_DURATION_CHART
@@ -390,21 +390,21 @@ export function HTTPSamplesPanel() {
 
               <MetricReadout
                 title={t('3XXs')}
-                value={domainTransactionMetrics?.[0]?.['http_response_rate(3)']}
+                value={domainTransactionMetrics?.[0]?.[`http_response_rate(3)`]}
                 unit="percentage"
                 isLoading={areDomainTransactionMetricsFetching}
               />
 
               <MetricReadout
                 title={t('4XXs')}
-                value={domainTransactionMetrics?.[0]?.['http_response_rate(4)']}
+                value={domainTransactionMetrics?.[0]?.[`http_response_rate(4)`]}
                 unit="percentage"
                 isLoading={areDomainTransactionMetricsFetching}
               />
 
               <MetricReadout
                 title={t('5XXs')}
-                value={domainTransactionMetrics?.[0]?.['http_response_rate(5)']}
+                value={domainTransactionMetrics?.[0]?.[`http_response_rate(5)`]}
                 unit="percentage"
                 isLoading={areDomainTransactionMetricsFetching}
               />
diff --git a/static/app/views/insights/http/components/tables/domainTransactionsTable.tsx b/static/app/views/insights/http/components/tables/domainTransactionsTable.tsx
index 4e720ba457bf..52de5bdfed59 100644
--- a/static/app/views/insights/http/components/tables/domainTransactionsTable.tsx
+++ b/static/app/views/insights/http/components/tables/domainTransactionsTable.tsx
@@ -59,22 +59,22 @@ const COLUMN_ORDER: Column[] = [
     width: COL_WIDTH_UNDEFINED,
   },
   {
-    key: 'http_response_rate(3)',
+    key: `http_response_rate(3)`,
     name: t('3XXs'),
     width: 50,
   },
   {
-    key: 'http_response_rate(4)',
+    key: `http_response_rate(4)`,
     name: t('4XXs'),
     width: 50,
   },
   {
-    key: 'http_response_rate(5)',
+    key: `http_response_rate(5)`,
     name: t('5XXs'),
     width: 50,
   },
   {
-    key: 'avg(span.self_time)',
+    key: `avg(span.self_time)`,
     name: DataTitles.avg,
     width: COL_WIDTH_UNDEFINED,
   },
diff --git a/static/app/views/insights/http/components/tables/domainsTable.tsx b/static/app/views/insights/http/components/tables/domainsTable.tsx
index ea28094548b3..5aaa8fbea9aa 100644
--- a/static/app/views/insights/http/components/tables/domainsTable.tsx
+++ b/static/app/views/insights/http/components/tables/domainsTable.tsx
@@ -64,22 +64,22 @@ const COLUMN_ORDER: Column[] = [
     width: COL_WIDTH_UNDEFINED,
   },
   {
-    key: 'http_response_rate(3)',
+    key: `http_response_rate(3)`,
     name: t('3XXs'),
     width: 50,
   },
   {
-    key: 'http_response_rate(4)',
+    key: `http_response_rate(4)`,
     name: t('4XXs'),
     width: 50,
   },
   {
-    key: 'http_response_rate(5)',
+    key: `http_response_rate(5)`,
     name: t('5XXs'),
     width: 50,
   },
   {
-    key: 'avg(span.self_time)',
+    key: `avg(span.self_time)`,
     name: DataTitles.avg,
     width: COL_WIDTH_UNDEFINED,
   },
diff --git a/static/app/views/insights/http/queries/useSpanSamples.spec.tsx b/static/app/views/insights/http/queries/useSpanSamples.spec.tsx
index a0ee7e8e72c4..d89d09993a5a 100644
--- a/static/app/views/insights/http/queries/useSpanSamples.spec.tsx
+++ b/static/app/views/insights/http/queries/useSpanSamples.spec.tsx
@@ -120,7 +120,7 @@ describe('useSpanSamples', () => {
           project: [],
           dataset: 'spans',
           sampling: 'NORMAL',
-          query: 'span.group:221aa7ebd216 release:0.0.1',
+          query: `span.group:221aa7ebd216 release:0.0.1`,
           referrer: 'api-spec',
           statsPeriod: '10d',
           environment: ['prod'],
diff --git a/static/app/views/insights/http/queries/useSpanSamples.tsx b/static/app/views/insights/http/queries/useSpanSamples.tsx
index abf93b9b4434..40b7e82de2d3 100644
--- a/static/app/views/insights/http/queries/useSpanSamples.tsx
+++ b/static/app/views/insights/http/queries/useSpanSamples.tsx
@@ -55,7 +55,7 @@ export const useSpanSamples = <Fields extends NonDefaultSpanSampleFields[]>(
     meta: EventsMetaType;
   }>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/spans-samples/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/spans-samples/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx b/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx
index b7479f9e019d..61bf04355b44 100644
--- a/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx
+++ b/static/app/views/insights/http/views/httpDomainSummaryPage.spec.tsx
@@ -31,7 +31,7 @@ describe('HTTPDomainSummaryPage', () => {
       pathname: `/organizations/${organization.slug}/insights/backend/http/domains/`,
       query: {domain: '*.sentry.dev', statsPeriod: '10d', transactionsCursor: '0:20:0'},
     },
-    route: '/organizations/:orgId/insights/backend/http/domains/',
+    route: `/organizations/:orgId/insights/backend/http/domains/`,
   };
 
   jest.mocked(useReleaseStats).mockReturnValue({
@@ -57,7 +57,7 @@ describe('HTTPDomainSummaryPage', () => {
     });
 
     regionFilterRequestMock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       method: 'GET',
       match: [
         MockApiClient.matchQuery({
diff --git a/static/app/views/insights/http/views/httpDomainSummaryPage.tsx b/static/app/views/insights/http/views/httpDomainSummaryPage.tsx
index 982ea8096468..882afc032a4c 100644
--- a/static/app/views/insights/http/views/httpDomainSummaryPage.tsx
+++ b/static/app/views/insights/http/views/httpDomainSummaryPage.tsx
@@ -198,21 +198,21 @@ export function HTTPDomainSummaryPage() {
 
                     <MetricReadout
                       title={t('3XXs')}
-                      value={domainMetrics?.[0]?.['http_response_rate(3)']}
+                      value={domainMetrics?.[0]?.[`http_response_rate(3)`]}
                       unit="percentage"
                       isLoading={areDomainMetricsLoading}
                     />
 
                     <MetricReadout
                       title={t('4XXs')}
-                      value={domainMetrics?.[0]?.['http_response_rate(4)']}
+                      value={domainMetrics?.[0]?.[`http_response_rate(4)`]}
                       unit="percentage"
                       isLoading={areDomainMetricsLoading}
                     />
 
                     <MetricReadout
                       title={t('5XXs')}
-                      value={domainMetrics?.[0]?.['http_response_rate(5)']}
+                      value={domainMetrics?.[0]?.[`http_response_rate(5)`]}
                       unit="percentage"
                       isLoading={areDomainMetricsLoading}
                     />
diff --git a/static/app/views/insights/http/views/httpLandingPage.spec.tsx b/static/app/views/insights/http/views/httpLandingPage.spec.tsx
index 788855b217fc..ea4966f3c58f 100644
--- a/static/app/views/insights/http/views/httpLandingPage.spec.tsx
+++ b/static/app/views/insights/http/views/httpLandingPage.spec.tsx
@@ -72,7 +72,7 @@ describe('HTTPLandingPage', () => {
     });
 
     regionFilterRequestMock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       method: 'GET',
       match: [
         MockApiClient.matchQuery({
diff --git a/static/app/views/insights/mobile/appStarts/components/eventSamples.spec.tsx b/static/app/views/insights/mobile/appStarts/components/eventSamples.spec.tsx
index ea34be5f70bb..8233c9523cf6 100644
--- a/static/app/views/insights/mobile/appStarts/components/eventSamples.spec.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/eventSamples.spec.tsx
@@ -35,7 +35,7 @@ describe('ScreenLoadEventSamples', () => {
       })
     );
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       method: 'GET',
       match: [
         MockApiClient.matchQuery({
diff --git a/static/app/views/insights/mobile/appStarts/components/spanOpSelector.tsx b/static/app/views/insights/mobile/appStarts/components/spanOpSelector.tsx
index a33b554adefe..7e0a5c0164a4 100644
--- a/static/app/views/insights/mobile/appStarts/components/spanOpSelector.tsx
+++ b/static/app/views/insights/mobile/appStarts/components/spanOpSelector.tsx
@@ -51,7 +51,7 @@ export function SpanOpSelector({transaction, primaryRelease}: Props) {
     'has:span.description',
     'transaction.op:[ui.load,navigation]',
     `transaction:${transaction}`,
-    'has:ttid',
+    `has:ttid`,
     `span.op:[${APP_START_SPANS.join(',')}]`,
     `app_start_type:${appStartType}`,
   ]);
diff --git a/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.spec.tsx b/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.spec.tsx
index aa0cf996cad0..c49f88a5c767 100644
--- a/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.spec.tsx
+++ b/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.spec.tsx
@@ -22,7 +22,7 @@ describe('Screen Summary', () => {
         [SpanFields.APP_START_TYPE]: 'cold',
       },
     },
-    route: '/organizations/:orgId/insights/screens/spans/',
+    route: `/organizations/:orgId/insights/screens/spans/`,
   };
 
   describe('Native Project', () => {
diff --git a/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx b/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx
index d31cd9020b84..2b15022a4022 100644
--- a/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx
+++ b/static/app/views/insights/mobile/appStarts/views/screenSummaryPage.tsx
@@ -91,7 +91,7 @@ export function ScreenSummaryContentPage() {
       `count_if(release,equals,${primaryRelease})`,
     ];
   } else {
-    fields = ['avg(span.duration)', 'count()'];
+    fields = [`avg(span.duration)`, `count()`];
   }
 
   return (
diff --git a/static/app/views/insights/mobile/common/components/spanSamplesPanelContainer.spec.tsx b/static/app/views/insights/mobile/common/components/spanSamplesPanelContainer.spec.tsx
index 3007b5c85778..94c2169ac816 100644
--- a/static/app/views/insights/mobile/common/components/spanSamplesPanelContainer.spec.tsx
+++ b/static/app/views/insights/mobile/common/components/spanSamplesPanelContainer.spec.tsx
@@ -19,7 +19,7 @@ describe('SpanSamplesContainer', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events-timeseries/',
+      url: `/organizations/org-slug/events-timeseries/`,
       method: 'GET',
       body: [],
     });
diff --git a/static/app/views/insights/mobile/common/components/tables/samplesTables.spec.tsx b/static/app/views/insights/mobile/common/components/tables/samplesTables.spec.tsx
index dffac852d343..df74f8361747 100644
--- a/static/app/views/insights/mobile/common/components/tables/samplesTables.spec.tsx
+++ b/static/app/views/insights/mobile/common/components/tables/samplesTables.spec.tsx
@@ -13,7 +13,7 @@ jest.mocked(useReleaseSelection).mockReturnValue({
 describe('SamplesTables', () => {
   beforeEach(() => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       method: 'GET',
       match: [
         MockApiClient.matchQuery({
@@ -29,7 +29,7 @@ describe('SamplesTables', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       method: 'GET',
       match: [
         MockApiClient.matchQuery({
diff --git a/static/app/views/insights/mobile/screenload/components/eventSamples.spec.tsx b/static/app/views/insights/mobile/screenload/components/eventSamples.spec.tsx
index 6544493504f8..32926ecb652d 100644
--- a/static/app/views/insights/mobile/screenload/components/eventSamples.spec.tsx
+++ b/static/app/views/insights/mobile/screenload/components/eventSamples.spec.tsx
@@ -40,7 +40,7 @@ describe('ScreenLoadEventSamples', () => {
       isLoading: false,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       method: 'GET',
       match: [
         MockApiClient.matchQuery({
diff --git a/static/app/views/insights/mobile/screenload/components/eventSamples.tsx b/static/app/views/insights/mobile/screenload/components/eventSamples.tsx
index 6d29723df14e..f04a76b545c8 100644
--- a/static/app/views/insights/mobile/screenload/components/eventSamples.tsx
+++ b/static/app/views/insights/mobile/screenload/components/eventSamples.tsx
@@ -44,7 +44,7 @@ export function ScreenLoadEventSamples({
   const searchQuery = useMemo(() => {
     const baseFilters = [
       'span.op:[ui.load,navigation]',
-      'is_transaction:true',
+      `is_transaction:true`,
       `transaction:${transaction}`,
     ];
 
diff --git a/static/app/views/insights/mobile/screenload/components/platformSelector.spec.tsx b/static/app/views/insights/mobile/screenload/components/platformSelector.spec.tsx
index 569d00be8133..ef204eb1ecc3 100644
--- a/static/app/views/insights/mobile/screenload/components/platformSelector.spec.tsx
+++ b/static/app/views/insights/mobile/screenload/components/platformSelector.spec.tsx
@@ -12,7 +12,7 @@ describe('PlatformSelector', () => {
       pathname: '/organizations/org-slug/insights/mobile/screen-loads/',
       query: {},
     },
-    route: '/organizations/:orgId/insights/mobile/screen-loads/',
+    route: `/organizations/:orgId/insights/mobile/screen-loads/`,
   };
 
   it('renders with iOS and Android options', () => {
diff --git a/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.spec.tsx b/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.spec.tsx
index 837ae6f79efd..8c80fa2132c5 100644
--- a/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.spec.tsx
+++ b/static/app/views/insights/mobile/screenload/components/tables/eventSamplesTable.spec.tsx
@@ -14,7 +14,7 @@ describe('EventSamplesTable', () => {
         statsPeriod: '99d',
       },
     },
-    route: '/organizations/:orgId/insights/mobile/screen-loads/',
+    route: `/organizations/:orgId/insights/mobile/screen-loads/`,
   };
 
   const mockLocation = LocationFixture({
@@ -36,7 +36,7 @@ describe('EventSamplesTable', () => {
     mockEventView = EventView.fromNewQueryWithLocation(mockQuery, mockLocation);
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       method: 'GET',
       match: [
         MockApiClient.matchQuery({
diff --git a/static/app/views/insights/mobile/screens/components/screensOverview.tsx b/static/app/views/insights/mobile/screens/components/screensOverview.tsx
index dbd52749eb2e..99ffb4c6bfbe 100644
--- a/static/app/views/insights/mobile/screens/components/screensOverview.tsx
+++ b/static/app/views/insights/mobile/screens/components/screensOverview.tsx
@@ -48,14 +48,14 @@ const getQueryString = (
 const fields = [
   SpanFields.PROJECT_ID,
   SpanFields.TRANSACTION,
-  'count()',
+  `count()`,
   'avg(measurements.app_start_cold)',
   'avg(measurements.app_start_warm)',
-  'avg(measurements.time_to_initial_display)',
-  'avg(measurements.time_to_full_display)',
-  'division(mobile.slow_frames,mobile.total_frames)',
-  'division(mobile.frozen_frames,mobile.total_frames)',
-  'avg(mobile.frames_delay)',
+  `avg(measurements.time_to_initial_display)`,
+  `avg(measurements.time_to_full_display)`,
+  `division(mobile.slow_frames,mobile.total_frames)`,
+  `division(mobile.frozen_frames,mobile.total_frames)`,
+  `avg(mobile.frames_delay)`,
 ] as const satisfies SpanProperty[];
 
 export function ScreensOverview() {
diff --git a/static/app/views/insights/mobile/screens/components/screensOverviewTable.tsx b/static/app/views/insights/mobile/screens/components/screensOverviewTable.tsx
index 34330a7c9b14..19b21d9b2e67 100644
--- a/static/app/views/insights/mobile/screens/components/screensOverviewTable.tsx
+++ b/static/app/views/insights/mobile/screens/components/screensOverviewTable.tsx
@@ -48,23 +48,23 @@ export function ScreensOverviewTable({data, eventView, isLoading, pageLinks}: Pr
 
   const columnNameMap = {
     transaction: t('Screen'),
-    ['count()']: t('Screen Loads'),
-    ['division(mobile.slow_frames,mobile.total_frames)']: t('Slow Frame Rate'),
-    ['division(mobile.frozen_frames,mobile.total_frames)']: t('Frozen Frame Rate'),
-    ['avg(mobile.frames_delay)']: t('Frame Delay'),
-    ['avg(measurements.time_to_initial_display)']: t('TTID'),
-    ['avg(measurements.time_to_full_display)']: t('TTFD'),
+    [`count()`]: t('Screen Loads'),
+    [`division(mobile.slow_frames,mobile.total_frames)`]: t('Slow Frame Rate'),
+    [`division(mobile.frozen_frames,mobile.total_frames)`]: t('Frozen Frame Rate'),
+    [`avg(mobile.frames_delay)`]: t('Frame Delay'),
+    [`avg(measurements.time_to_initial_display)`]: t('TTID'),
+    [`avg(measurements.time_to_full_display)`]: t('TTFD'),
     ['avg(measurements.app_start_warm)']: t('Warm Start'),
     ['avg(measurements.app_start_cold)']: t('Cold Start'),
   };
   const columnTooltipMap = {
     ['avg(measurements.app_start_cold)']: t('Average Cold Start duration'),
-    ['avg(measurements.app_start_warm)']: t('Average Warm Start duration'),
-    ['division(mobile.slow_frames,mobile.total_frames)']: t('Slow Frame Rate'),
-    ['division(mobile.frozen_frames,mobile.total_frames)']: t('Frozen Frame Rate'),
-    ['avg(mobile.frames_delay)']: t('Average Frame Delay'),
-    ['avg(measurements.time_to_initial_display)']: t('Average Time to Initial Display'),
-    ['avg(measurements.time_to_full_display)']: t('Average Time to Full Display'),
+    [`avg(measurements.app_start_warm)`]: t('Average Warm Start duration'),
+    [`division(mobile.slow_frames,mobile.total_frames)`]: t('Slow Frame Rate'),
+    [`division(mobile.frozen_frames,mobile.total_frames)`]: t('Frozen Frame Rate'),
+    [`avg(mobile.frames_delay)`]: t('Average Frame Delay'),
+    [`avg(measurements.time_to_initial_display)`]: t('Average Time to Initial Display'),
+    [`avg(measurements.time_to_full_display)`]: t('Average Time to Full Display'),
   };
 
   function renderBodyCell(column: any, row: any): React.ReactNode | null {
@@ -85,7 +85,7 @@ export function ScreensOverviewTable({data, eventView, isLoading, pageLinks}: Pr
       return (
         <Fragment>
           <OverflowEllipsisTextContainer>
-            <Link to={link} style={{display: 'block', width: '100%'}}>
+            <Link to={link} style={{display: `block`, width: `100%`}}>
               {row.transaction}
             </Link>
           </OverflowEllipsisTextContainer>
@@ -134,16 +134,16 @@ export function ScreensOverviewTable({data, eventView, isLoading, pageLinks}: Pr
         'transaction',
         'avg(measurements.app_start_cold)',
         'avg(measurements.app_start_warm)',
-        'division(mobile.slow_frames,mobile.total_frames)',
-        'division(mobile.frozen_frames,mobile.total_frames)',
-        'avg(mobile.frames_delay)',
-        'avg(measurements.time_to_initial_display)',
-        'avg(measurements.time_to_full_display)',
-        'count()',
+        `division(mobile.slow_frames,mobile.total_frames)`,
+        `division(mobile.frozen_frames,mobile.total_frames)`,
+        `avg(mobile.frames_delay)`,
+        `avg(measurements.time_to_initial_display)`,
+        `avg(measurements.time_to_full_display)`,
+        `count()`,
       ]}
       defaultSort={[
         {
-          key: 'count()',
+          key: `count()`,
           order: 'desc',
         },
       ]}
diff --git a/static/app/views/insights/mobile/screens/views/screensLandingPage.spec.tsx b/static/app/views/insights/mobile/screens/views/screensLandingPage.spec.tsx
index b17e8e546f01..3fbc37b142b3 100644
--- a/static/app/views/insights/mobile/screens/views/screensLandingPage.spec.tsx
+++ b/static/app/views/insights/mobile/screens/views/screensLandingPage.spec.tsx
@@ -31,7 +31,7 @@ describe('Screens Landing Page', () => {
         project: project.id,
       },
     },
-    route: '/organizations/:orgId/insights/mobile-vitals/',
+    route: `/organizations/:orgId/insights/mobile-vitals/`,
   };
 
   ProjectsStore.loadInitialData([project]);
diff --git a/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx b/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx
index 8e86349bb4c3..72d5789750ea 100644
--- a/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx
+++ b/static/app/views/insights/mobile/screens/views/screensLandingPage.tsx
@@ -125,7 +125,7 @@ function ScreensLandingPage() {
           'https://docs.sentry.io/platforms/android/tracing/instrumentation/automatic-instrumentation/#slow-and-frozen-frames',
         iOS: 'https://docs.sentry.io/platforms/apple/guides/ios/tracing/instrumentation/automatic-instrumentation/#slow-and-frozen-frames',
       },
-      field: 'division(mobile.slow_frames,mobile.total_frames)' as const,
+      field: `division(mobile.slow_frames,mobile.total_frames)` as const,
       dataset: 'spansMetrics',
       getStatus: getDefaultMetricPerformance,
     },
@@ -142,7 +142,7 @@ function ScreensLandingPage() {
           'https://docs.sentry.io/platforms/android/tracing/instrumentation/automatic-instrumentation/#slow-and-frozen-frames',
         iOS: 'https://docs.sentry.io/platforms/apple/guides/ios/tracing/instrumentation/automatic-instrumentation/#slow-and-frozen-frames',
       },
-      field: 'division(mobile.frozen_frames,mobile.total_frames)' as const,
+      field: `division(mobile.frozen_frames,mobile.total_frames)` as const,
       dataset: 'spansMetrics',
       getStatus: getDefaultMetricPerformance,
     },
@@ -161,7 +161,7 @@ function ScreensLandingPage() {
           'https://docs.sentry.io/platforms/android/tracing/instrumentation/automatic-instrumentation/#slow-and-frozen-frames',
         iOS: 'https://docs.sentry.io/platforms/apple/guides/ios/tracing/instrumentation/automatic-instrumentation/#slow-and-frozen-frames',
       },
-      field: 'avg(mobile.frames_delay)' as const,
+      field: `avg(mobile.frames_delay)` as const,
       dataset: 'spansMetrics',
       getStatus: getDefaultMetricPerformance,
     },
@@ -179,7 +179,7 @@ function ScreensLandingPage() {
           'https://docs.sentry.io/platforms/android/tracing/instrumentation/automatic-instrumentation/#time-to-initial-display',
         iOS: 'https://docs.sentry.io/platforms/apple/features/experimental-features/',
       },
-      field: 'avg(measurements.time_to_initial_display)' as const,
+      field: `avg(measurements.time_to_initial_display)` as const,
       dataset: 'metrics',
       getStatus: getDefaultMetricPerformance,
     },
@@ -197,7 +197,7 @@ function ScreensLandingPage() {
           'https://docs.sentry.io/platforms/android/tracing/instrumentation/automatic-instrumentation/#time-to-full-display',
         iOS: 'https://docs.sentry.io/platforms/apple/features/experimental-features/',
       },
-      field: 'avg(measurements.time_to_full_display)' as const,
+      field: `avg(measurements.time_to_full_display)` as const,
       dataset: 'metrics',
       getStatus: getDefaultMetricPerformance,
     },
diff --git a/static/app/views/insights/pages/agents/components/llmCallsWidget.tsx b/static/app/views/insights/pages/agents/components/llmCallsWidget.tsx
index d0bded9f982f..e1629cd5331a 100644
--- a/static/app/views/insights/pages/agents/components/llmCallsWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/llmCallsWidget.tsx
@@ -151,7 +151,7 @@ export function LLMCallsWidget() {
               ],
               groupBy: ['gen_ai.request.model'],
               query: fullQuery,
-              sort: '-count(span.duration)',
+              sort: `-count(span.duration)`,
               interval: pageFilterChartParams.interval,
             }}
             onOpenFullScreen={() => {
diff --git a/static/app/views/insights/pages/agents/components/modelCostWidget.tsx b/static/app/views/insights/pages/agents/components/modelCostWidget.tsx
index 9e01c3d8c086..4adb472b617f 100644
--- a/static/app/views/insights/pages/agents/components/modelCostWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/modelCostWidget.tsx
@@ -151,7 +151,7 @@ export function ModelCostWidget() {
               ],
               groupBy: ['gen_ai.request.model'],
               query: fullQuery,
-              sort: '-sum(gen_ai.cost.total_tokens)',
+              sort: `-sum(gen_ai.cost.total_tokens)`,
               interval: pageFilterChartParams.interval,
             }}
             onOpenFullScreen={() => {
diff --git a/static/app/views/insights/pages/agents/components/tokenTypesWidget.tsx b/static/app/views/insights/pages/agents/components/tokenTypesWidget.tsx
index 9390e651df77..7442d956d356 100644
--- a/static/app/views/insights/pages/agents/components/tokenTypesWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/tokenTypesWidget.tsx
@@ -249,7 +249,7 @@ export function TokenTypesWidget() {
                 },
               ],
               query: fullQuery,
-              sort: '-sum(gen_ai.usage.input_tokens)',
+              sort: `-sum(gen_ai.usage.input_tokens)`,
               interval: pageFilterChartParams.interval,
             }}
             onOpenFullScreen={() => {
diff --git a/static/app/views/insights/pages/agents/components/tokenUsageWidget.tsx b/static/app/views/insights/pages/agents/components/tokenUsageWidget.tsx
index e52ae039973e..bd649f4874f4 100644
--- a/static/app/views/insights/pages/agents/components/tokenUsageWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/tokenUsageWidget.tsx
@@ -154,7 +154,7 @@ export function TokenUsageWidget() {
               ],
               groupBy: ['gen_ai.request.model'],
               query: fullQuery,
-              sort: '-sum(gen_ai.usage.total_tokens)',
+              sort: `-sum(gen_ai.usage.total_tokens)`,
               interval: pageFilterChartParams.interval,
             }}
             onOpenFullScreen={() => {
diff --git a/static/app/views/insights/pages/agents/components/toolCallsWidget.tsx b/static/app/views/insights/pages/agents/components/toolCallsWidget.tsx
index 7d13a9bef7fc..4005443a4468 100644
--- a/static/app/views/insights/pages/agents/components/toolCallsWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/toolCallsWidget.tsx
@@ -149,7 +149,7 @@ export function ToolCallsWidget() {
               ],
               groupBy: ['gen_ai.tool.name'],
               query: fullQuery,
-              sort: '-count(span.duration)',
+              sort: `-count(span.duration)`,
               interval: pageFilterChartParams.interval,
             }}
             onOpenFullScreen={() => {
diff --git a/static/app/views/insights/pages/agents/components/toolErrorsWidget.tsx b/static/app/views/insights/pages/agents/components/toolErrorsWidget.tsx
index 8ed7d485961b..5c642d650c51 100644
--- a/static/app/views/insights/pages/agents/components/toolErrorsWidget.tsx
+++ b/static/app/views/insights/pages/agents/components/toolErrorsWidget.tsx
@@ -151,7 +151,7 @@ export function ToolErrorsWidget() {
               ],
               groupBy: ['gen_ai.tool.name'],
               query: fullQuery,
-              sort: '-count(span.duration)',
+              sort: `-count(span.duration)`,
               interval: pageFilterChartParams.interval,
             }}
             onOpenFullScreen={() => {
diff --git a/static/app/views/insights/pages/agents/components/tracesTable.tsx b/static/app/views/insights/pages/agents/components/tracesTable.tsx
index 2add559a6281..64af2928fa59 100644
--- a/static/app/views/insights/pages/agents/components/tracesTable.tsx
+++ b/static/app/views/insights/pages/agents/components/tracesTable.tsx
@@ -136,7 +136,7 @@ export function TracesTable({
 
   const tracesRequest = useTraces({
     query: combinedQuery,
-    sort: '-timestamp',
+    sort: `-timestamp`,
     keepPreviousData: true,
     cursor,
     limit,
diff --git a/static/app/views/insights/pages/agents/utils/query.tsx b/static/app/views/insights/pages/agents/utils/query.tsx
index 7e9022ccfdfd..20a4bbd916ae 100644
--- a/static/app/views/insights/pages/agents/utils/query.tsx
+++ b/static/app/views/insights/pages/agents/utils/query.tsx
@@ -14,7 +14,7 @@ export function getIsAiGenerationSpan(genAiOpType: string | undefined) {
 }
 
 export function getHasAiSpansFilter() {
-  return 'has:gen_ai.operation.type';
+  return `has:gen_ai.operation.type`;
 }
 
 export const getAgentRunsFilter = ({negated = false}: {negated?: boolean} = {}) => {
@@ -22,15 +22,15 @@ export const getAgentRunsFilter = ({negated = false}: {negated?: boolean} = {})
 };
 
 export const getToolSpansFilter = () => {
-  return 'gen_ai.operation.type:tool';
+  return `gen_ai.operation.type:tool`;
 };
 
 export const getAgentAndAIClientFilter = () => {
-  return 'gen_ai.operation.type:[agent, ai_client]';
+  return `gen_ai.operation.type:[agent, ai_client]`;
 };
 
 export const getAIGenerationsFilter = () => {
-  return 'gen_ai.operation.type:ai_client';
+  return `gen_ai.operation.type:ai_client`;
 };
 
 /**
diff --git a/static/app/views/insights/pages/agents/utils/tokenBreakdown.spec.ts b/static/app/views/insights/pages/agents/utils/tokenBreakdown.spec.ts
deleted file mode 100644
index 60331ae1bb16..000000000000
--- a/static/app/views/insights/pages/agents/utils/tokenBreakdown.spec.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import {getTokenBreakdown} from './tokenBreakdown';
-
-describe('getTokenBreakdown', () => {
-  it('returns input as netNewInput when there are no cached tokens', () => {
-    const result = getTokenBreakdown({
-      inputTokens: 100,
-      cachedTokens: 0,
-      outputTokens: 50,
-      reasoningTokens: 0,
-      totalTokens: 150,
-    });
-
-    expect(result).toEqual({
-      netNewInput: 100,
-      cached: 0,
-      output: 50,
-      total: 150,
-    });
-  });
-
-  it('separates cached from input when cached is included (OTel convention)', () => {
-    // OTel: inputTokens=100 includes 80 cached, output=50, total=150
-    const result = getTokenBreakdown({
-      inputTokens: 100,
-      cachedTokens: 80,
-      outputTokens: 50,
-      reasoningTokens: 0,
-      totalTokens: 150,
-    });
-
-    expect(result).toEqual({
-      netNewInput: 20,
-      cached: 80,
-      output: 50,
-      total: 150,
-    });
-  });
-
-  it('handles providers that report input exclusive of cached', () => {
-    // Some providers: inputTokens=30 (net new only), cached=80, output=90, total=200
-    // getAdjustedInput detects that 30+90+80=200 matches total, so adjusts input to 110
-    const result = getTokenBreakdown({
-      inputTokens: 30,
-      cachedTokens: 80,
-      outputTokens: 90,
-      reasoningTokens: 0,
-      totalTokens: 200,
-    });
-
-    expect(result).toEqual({
-      netNewInput: 30,
-      cached: 80,
-      output: 90,
-      total: 200,
-    });
-  });
-
-  it('clamps netNewInput to 0 when cached exceeds input (inconsistent data)', () => {
-    // Bad data: provider says cached=80 but input=50, and heuristic decides cached is included
-    // input+output=100 is closer to total=100 than input+output+cached=180
-    const result = getTokenBreakdown({
-      inputTokens: 50,
-      cachedTokens: 80,
-      outputTokens: 50,
-      reasoningTokens: 0,
-      totalTokens: 100,
-    });
-
-    expect(result.netNewInput).toBeGreaterThanOrEqual(0);
-  });
-
-  it('folds reasoning into output tokens (OTel convention)', () => {
-    // OTel: outputTokens=100 includes 30 reasoning, total=200
-    const result = getTokenBreakdown({
-      inputTokens: 100,
-      cachedTokens: 0,
-      outputTokens: 100,
-      reasoningTokens: 30,
-      totalTokens: 200,
-    });
-
-    expect(result).toEqual({
-      netNewInput: 100,
-      cached: 0,
-      output: 100,
-      total: 200,
-    });
-  });
-
-  it('adjusts output when reasoning is reported separately', () => {
-    // Provider reports output=70 exclusive of reasoning=30, total=200
-    // getAdjustedOutput detects that 100+70+30=200 matches total
-    const result = getTokenBreakdown({
-      inputTokens: 100,
-      cachedTokens: 0,
-      outputTokens: 70,
-      reasoningTokens: 30,
-      totalTokens: 200,
-    });
-
-    expect(result).toEqual({
-      netNewInput: 100,
-      cached: 0,
-      output: 100,
-      total: 200,
-    });
-  });
-
-  it('handles both cached and reasoning adjustments together', () => {
-    // input=20 (net new), cached=80 (exclusive), output=50 (exclusive of reasoning=30), total=180
-    const result = getTokenBreakdown({
-      inputTokens: 20,
-      cachedTokens: 80,
-      outputTokens: 50,
-      reasoningTokens: 30,
-      totalTokens: 180,
-    });
-
-    expect(result).toEqual({
-      netNewInput: 20,
-      cached: 80,
-      output: 80,
-      total: 180,
-    });
-  });
-
-  it('treats NaN cached as 0', () => {
-    const result = getTokenBreakdown({
-      inputTokens: 100,
-      cachedTokens: NaN,
-      outputTokens: 50,
-      reasoningTokens: 0,
-      totalTokens: 150,
-    });
-
-    expect(result).toEqual({
-      netNewInput: 100,
-      cached: 0,
-      output: 50,
-      total: 150,
-    });
-  });
-
-  it('treats NaN reasoning as 0', () => {
-    const result = getTokenBreakdown({
-      inputTokens: 100,
-      cachedTokens: 0,
-      outputTokens: 50,
-      reasoningTokens: NaN,
-      totalTokens: 150,
-    });
-
-    expect(result).toEqual({
-      netNewInput: 100,
-      cached: 0,
-      output: 50,
-      total: 150,
-    });
-  });
-});
diff --git a/static/app/views/insights/pages/agents/utils/tokenBreakdown.ts b/static/app/views/insights/pages/agents/utils/tokenBreakdown.ts
deleted file mode 100644
index f8bcfbd070d0..000000000000
--- a/static/app/views/insights/pages/agents/utils/tokenBreakdown.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-export interface TokenBreakdown {
-  cached: number;
-  netNewInput: number;
-  output: number;
-  total: number;
-}
-
-/**
- * Computes a display-ready token breakdown from raw span attributes.
- *
- * Per OTel conventions, `inputTokens` includes cached and `outputTokens`
- * includes reasoning. Some providers don't follow this, so we detect the
- * gap and adjust as a fallback (see `getAdjustedInput` / `getAdjustedOutput`).
- *
- * Returns net-new input (excluding cached), cached, output (including
- * reasoning), and total.
- */
-export function getTokenBreakdown({
-  inputTokens,
-  cachedTokens,
-  outputTokens,
-  reasoningTokens,
-  totalTokens,
-}: {
-  cachedTokens: number;
-  inputTokens: number;
-  outputTokens: number;
-  reasoningTokens: number;
-  totalTokens: number;
-}): TokenBreakdown {
-  const cached = isNaN(cachedTokens) ? 0 : cachedTokens;
-  const reasoning = isNaN(reasoningTokens) ? 0 : reasoningTokens;
-
-  const adjustedInput = getAdjustedInput(inputTokens, cached, outputTokens, totalTokens);
-  const adjustedOutput = getAdjustedOutput(
-    adjustedInput,
-    outputTokens,
-    reasoning,
-    totalTokens
-  );
-
-  return {
-    netNewInput: cached > 0 ? Math.max(0, adjustedInput - cached) : adjustedInput,
-    cached,
-    output: adjustedOutput,
-    total: totalTokens,
-  };
-}
-
-/**
- * Some providers report `inputTokens` exclusive of cached; others inclusive.
- * We pick whichever interpretation makes `input + output` closest to `total`.
- */
-function getAdjustedInput(
-  inputTokens: number,
-  cachedTokens: number,
-  outputTokens: number,
-  totalTokens: number
-): number {
-  if (cachedTokens <= 0) {
-    return inputTokens;
-  }
-  const without = inputTokens + outputTokens;
-  const withCached = without + cachedTokens;
-  if (Math.abs(withCached - totalTokens) < Math.abs(without - totalTokens)) {
-    return inputTokens + cachedTokens;
-  }
-  return inputTokens;
-}
-
-/**
- * Same idea for reasoning tokens inside `outputTokens`.
- */
-function getAdjustedOutput(
-  adjustedInput: number,
-  outputTokens: number,
-  reasoningTokens: number,
-  totalTokens: number
-): number {
-  if (reasoningTokens <= 0) {
-    return outputTokens;
-  }
-  const without = adjustedInput + outputTokens;
-  const withReasoning = without + reasoningTokens;
-  if (Math.abs(withReasoning - totalTokens) < Math.abs(without - totalTokens)) {
-    return outputTokens + reasoningTokens;
-  }
-  return outputTokens;
-}
diff --git a/static/app/views/insights/pages/backend/backendTable.tsx b/static/app/views/insights/pages/backend/backendTable.tsx
index 13a30deb6bed..d4f4e7e90938 100644
--- a/static/app/views/insights/pages/backend/backendTable.tsx
+++ b/static/app/views/insights/pages/backend/backendTable.tsx
@@ -81,7 +81,7 @@ const COLUMN_ORDER: Column[] = [
     tooltip: SPAN_HEADER_TOOLTIPS.tpm,
   },
   {
-    key: 'p50(span.duration)',
+    key: `p50(span.duration)`,
     name: t('p50()'),
     width: COL_WIDTH_UNDEFINED,
     tooltip: SPAN_HEADER_TOOLTIPS.p50,
diff --git a/static/app/views/insights/pages/conversations/hooks/useConversation.spec.tsx b/static/app/views/insights/pages/conversations/hooks/useConversation.spec.tsx
index 17933d91724f..4d835c2367de 100644
--- a/static/app/views/insights/pages/conversations/hooks/useConversation.spec.tsx
+++ b/static/app/views/insights/pages/conversations/hooks/useConversation.spec.tsx
@@ -228,23 +228,16 @@ describe('useConversation', () => {
       expect(result.current.isLoading).toBe(false);
     });
 
-    // Verify the API was called with correct timestamps (with 1-hour padding),
-    // ALL_ACCESS_PROJECTS (-1) so it searches across all projects,
-    // and no environment filter so it searches across all environments
+    // Verify the API was called with correct timestamps (with 1-hour padding)
     expect(mockRequest).toHaveBeenCalledWith(
       expect.stringContaining('/ai-conversations/conv-timestamps/'),
       expect.objectContaining({
         query: expect.objectContaining({
           start: new Date(startTimestamp - 60 * 60 * 1000).toISOString(),
           end: new Date(endTimestamp + 60 * 60 * 1000).toISOString(),
-          project: [-1],
         }),
       })
     );
-
-    // Ensure environment is not included in the query when using conversation timestamps
-    const queryArg = mockRequest.mock.calls[0]![1]!.query;
-    expect(queryArg).not.toHaveProperty('environment');
   });
 
   it('falls back to span.name when span.description is empty', async () => {
diff --git a/static/app/views/insights/pages/conversations/hooks/useConversation.tsx b/static/app/views/insights/pages/conversations/hooks/useConversation.tsx
index 3a39015fcb10..829d2c249a38 100644
--- a/static/app/views/insights/pages/conversations/hooks/useConversation.tsx
+++ b/static/app/views/insights/pages/conversations/hooks/useConversation.tsx
@@ -1,6 +1,5 @@
 import {useEffect, useMemo} from 'react';
 
-import {ALL_ACCESS_PROJECTS} from 'sentry/components/pageFilters/constants';
 import {normalizeDateTimeParams} from 'sentry/components/pageFilters/parse';
 import {usePageFilters} from 'sentry/components/pageFilters/usePageFilters';
 import {getApiUrl} from 'sentry/utils/api/getApiUrl';
@@ -194,12 +193,10 @@ export function useConversation(
   const hasConversationTimestamps =
     conversation.startTimestamp !== undefined && conversation.endTimestamp !== undefined;
 
-  // When conversation timestamps are provided (e.g. from a shared link),
-  // search across all projects and environments so the conversation is found
-  // regardless of which project/environment the page filter is currently set to.
   const queryParams = hasConversationTimestamps
     ? {
-        project: [ALL_ACCESS_PROJECTS],
+        project: selection.projects,
+        environment: selection.environments,
         start: new Date(conversation.startTimestamp! - ONE_HOUR_MS).toISOString(),
         end: new Date(conversation.endTimestamp! + ONE_HOUR_MS).toISOString(),
         per_page: 1000,
diff --git a/static/app/views/insights/pages/domainViewHeader.spec.tsx b/static/app/views/insights/pages/domainViewHeader.spec.tsx
index 9143e34dcaef..7d1ae8021f29 100644
--- a/static/app/views/insights/pages/domainViewHeader.spec.tsx
+++ b/static/app/views/insights/pages/domainViewHeader.spec.tsx
@@ -15,7 +15,7 @@ describe('DomainViewHeader', () => {
       pathname: `/organizations/${organization.slug}/insights/frontend/`,
       query: {},
     },
-    route: '/organizations/:orgId/insights/frontend/',
+    route: `/organizations/:orgId/insights/frontend/`,
   };
 
   it('renders', () => {
diff --git a/static/app/views/insights/pages/frontend/frontendOverviewTable.tsx b/static/app/views/insights/pages/frontend/frontendOverviewTable.tsx
index 3e5c8d4d943e..87c5b9f052dc 100644
--- a/static/app/views/insights/pages/frontend/frontendOverviewTable.tsx
+++ b/static/app/views/insights/pages/frontend/frontendOverviewTable.tsx
@@ -75,19 +75,19 @@ const COLUMN_ORDER: Column[] = [
     tooltip: SPAN_HEADER_TOOLTIPS.tpm,
   },
   {
-    key: 'p50_if(span.duration,is_transaction,equals,true)',
+    key: `p50_if(span.duration,is_transaction,equals,true)`,
     name: t('p50()'),
     width: COL_WIDTH_UNDEFINED,
     tooltip: SPAN_HEADER_TOOLTIPS.p50,
   },
   {
-    key: 'p75_if(span.duration,is_transaction,equals,true)',
+    key: `p75_if(span.duration,is_transaction,equals,true)`,
     name: t('p75()'),
     width: COL_WIDTH_UNDEFINED,
     tooltip: SPAN_HEADER_TOOLTIPS.p75,
   },
   {
-    key: 'p95_if(span.duration,is_transaction,equals,true)',
+    key: `p95_if(span.duration,is_transaction,equals,true)`,
     name: t('p95()'),
     width: COL_WIDTH_UNDEFINED,
     tooltip: SPAN_HEADER_TOOLTIPS.p95,
diff --git a/static/app/views/insights/pages/mcp/components/groupedDurationWidget.tsx b/static/app/views/insights/pages/mcp/components/groupedDurationWidget.tsx
index 09630a20420e..c7e72a0d30b9 100644
--- a/static/app/views/insights/pages/mcp/components/groupedDurationWidget.tsx
+++ b/static/app/views/insights/pages/mcp/components/groupedDurationWidget.tsx
@@ -150,7 +150,7 @@ export function GroupedDurationWidget(props: GroupedDurationWidgetProps) {
               ],
               groupBy: [props.groupBy],
               query: fullQuery,
-              sort: '-avg(span.duration)',
+              sort: `-avg(span.duration)`,
               interval: pageFilterChartParams.interval,
             }}
             onOpenFullScreen={() => {
diff --git a/static/app/views/insights/pages/mcp/components/groupedErrorRateWidget.tsx b/static/app/views/insights/pages/mcp/components/groupedErrorRateWidget.tsx
index ec135eb03d44..b01077194c1f 100644
--- a/static/app/views/insights/pages/mcp/components/groupedErrorRateWidget.tsx
+++ b/static/app/views/insights/pages/mcp/components/groupedErrorRateWidget.tsx
@@ -150,7 +150,7 @@ export function GroupedErrorRateWidget(props: GroupedErrorRateWidgetProps) {
               ],
               groupBy: [props.groupBy],
               query: fullQuery,
-              sort: '-failure_rate()',
+              sort: `-failure_rate()`,
               interval: pageFilterChartParams.interval,
             }}
             onOpenFullScreen={() => {
diff --git a/static/app/views/insights/pages/mcp/components/groupedTrafficWidget.tsx b/static/app/views/insights/pages/mcp/components/groupedTrafficWidget.tsx
index 5eacff590332..e06dfa782754 100644
--- a/static/app/views/insights/pages/mcp/components/groupedTrafficWidget.tsx
+++ b/static/app/views/insights/pages/mcp/components/groupedTrafficWidget.tsx
@@ -153,7 +153,7 @@ export function GroupedTrafficWidget(props: GroupedTrafficWidgetProps) {
               ],
               groupBy: [props.groupBy],
               query: fullQuery,
-              sort: '-count(span.duration)',
+              sort: `-count(span.duration)`,
               interval: pageFilterChartParams.interval,
             }}
             onOpenFullScreen={() => {
diff --git a/static/app/views/insights/pages/mcp/components/mcpOverviewTable.tsx b/static/app/views/insights/pages/mcp/components/mcpOverviewTable.tsx
index bed2137d6daa..46549ca7a71a 100644
--- a/static/app/views/insights/pages/mcp/components/mcpOverviewTable.tsx
+++ b/static/app/views/insights/pages/mcp/components/mcpOverviewTable.tsx
@@ -53,7 +53,7 @@ const rightAlignColumns = new Set([
 export function McpOverviewTable() {
   const organization = useOrganization();
   const {selection} = usePageFilters();
-  const query = useCombinedQuery('span.op:mcp.server');
+  const query = useCombinedQuery(`span.op:mcp.server`);
   const {tableSort} = useTableSort();
   const tableDataRequest = useSpanTableData({
     query,
@@ -201,7 +201,7 @@ function SpanDescriptionCell({
       },
     ],
     query: search.formatString(),
-    sort: '-count(span.duration)',
+    sort: `-count(span.duration)`,
     field: fields,
   });
   return <Link to={link}>{spanDescription}</Link>;
diff --git a/static/app/views/insights/pages/mcp/components/mcpPromptsTable.tsx b/static/app/views/insights/pages/mcp/components/mcpPromptsTable.tsx
index 8095888965e3..4c9f2fb5995c 100644
--- a/static/app/views/insights/pages/mcp/components/mcpPromptsTable.tsx
+++ b/static/app/views/insights/pages/mcp/components/mcpPromptsTable.tsx
@@ -176,7 +176,7 @@ function McpPromptCell({prompt}: {prompt: string}) {
       'timestamp',
     ],
     query: search.formatString(),
-    sort: '-count(span.duration)',
+    sort: `-count(span.duration)`,
   });
   return <Link to={link}>{prompt}</Link>;
 }
diff --git a/static/app/views/insights/pages/mcp/components/mcpResourcesTable.tsx b/static/app/views/insights/pages/mcp/components/mcpResourcesTable.tsx
index 2333e9be2c66..2fb528b4a88c 100644
--- a/static/app/views/insights/pages/mcp/components/mcpResourcesTable.tsx
+++ b/static/app/views/insights/pages/mcp/components/mcpResourcesTable.tsx
@@ -170,7 +170,7 @@ function McpResourceCell({resource}: {resource: string}) {
     ],
     field: ['span.description', 'span.status', 'span.duration', 'timestamp'],
     query: search.formatString(),
-    sort: '-count(span.duration)',
+    sort: `-count(span.duration)`,
   });
   return <Link to={link}>{resource}</Link>;
 }
diff --git a/static/app/views/insights/pages/mcp/components/mcpToolsTable.tsx b/static/app/views/insights/pages/mcp/components/mcpToolsTable.tsx
index ea3541196266..e60bc346eafe 100644
--- a/static/app/views/insights/pages/mcp/components/mcpToolsTable.tsx
+++ b/static/app/views/insights/pages/mcp/components/mcpToolsTable.tsx
@@ -169,7 +169,7 @@ function McpToolCell({tool}: {tool: string}) {
       },
     ],
     query: search.formatString(),
-    sort: '-count(span.duration)',
+    sort: `-count(span.duration)`,
     field: ['span.description', 'mcp.tool.result.content', 'span.duration', 'timestamp'],
   });
   return <Link to={link}>{tool}</Link>;
diff --git a/static/app/views/insights/pages/platform/laravel/commandsTable.tsx b/static/app/views/insights/pages/platform/laravel/commandsTable.tsx
index d956c7228eae..76ca8918f4c2 100644
--- a/static/app/views/insights/pages/platform/laravel/commandsTable.tsx
+++ b/static/app/views/insights/pages/platform/laravel/commandsTable.tsx
@@ -144,7 +144,7 @@ function CommandCell({command}: {command: string}) {
       },
     ],
     query: `span.op:console.command* command:${command}`,
-    sort: '-count(span.duration)',
+    sort: `-count(span.duration)`,
   });
   return <Link to={link}>{command}</Link>;
 }
diff --git a/static/app/views/insights/pages/useOverviewPageTrackAnalytics.ts b/static/app/views/insights/pages/useOverviewPageTrackAnalytics.ts
index 59f92f53f360..442988ae8db1 100644
--- a/static/app/views/insights/pages/useOverviewPageTrackAnalytics.ts
+++ b/static/app/views/insights/pages/useOverviewPageTrackAnalytics.ts
@@ -33,7 +33,7 @@ export function useOverviewPageTrackPageload() {
   useEffect(() => {
     if (pageFilters.isReady && projects.initiallyLoaded) {
       const selectedPlatforms = JSON.parse(selectedPlatformsString);
-      trackAnalytics('insights.page_loads.overview', {
+      trackAnalytics(`insights.page_loads.overview`, {
         organization,
         platforms: selectedPlatforms,
         domain: view,
diff --git a/static/app/views/insights/queues/components/messageSpanSamplesPanel.spec.tsx b/static/app/views/insights/queues/components/messageSpanSamplesPanel.spec.tsx
index dfb367d81f64..cbc1bac8ac6c 100644
--- a/static/app/views/insights/queues/components/messageSpanSamplesPanel.spec.tsx
+++ b/static/app/views/insights/queues/components/messageSpanSamplesPanel.spec.tsx
@@ -16,7 +16,7 @@ describe('messageSpanSamplesPanel', () => {
   let traceItemAttributesMock: jest.Mock;
 
   const basePath = `/organizations/${organization.slug}/insights/queues/`;
-  const baseRoute = '/organizations/:orgId/insights/queues/';
+  const baseRoute = `/organizations/:orgId/insights/queues/`;
 
   const baseRouterConfig = {
     location: {
diff --git a/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx b/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx
index f349c770b4c3..77821edc5ac8 100644
--- a/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx
+++ b/static/app/views/insights/queues/components/messageSpanSamplesPanel.tsx
@@ -192,7 +192,7 @@ export function MessageSpanSamplesPanel() {
   } = useFetchSpanTimeSeries(
     {
       query: timeseriesFilters,
-      yAxis: ['avg(span.duration)'],
+      yAxis: [`avg(span.duration)`],
       enabled: isPanelOpen,
     },
     timeseriesReferrer
diff --git a/static/app/views/insights/queues/components/tables/queuesTable.tsx b/static/app/views/insights/queues/components/tables/queuesTable.tsx
index d80668554e2a..9b6278e69086 100644
--- a/static/app/views/insights/queues/components/tables/queuesTable.tsx
+++ b/static/app/views/insights/queues/components/tables/queuesTable.tsx
@@ -92,7 +92,7 @@ const SORTABLE_FIELDS = [
   'count_op(queue.process)',
   'avg_if(span.duration,span.op,equals,queue.process)',
   'avg(messaging.message.receive.latency)',
-  'sum(span.duration)',
+  `sum(span.duration)`,
   'trace_status_rate(ok)',
 ] as const;
 
diff --git a/static/app/views/insights/queues/components/tables/transactionsTable.spec.tsx b/static/app/views/insights/queues/components/tables/transactionsTable.spec.tsx
index c5a0daf95cd3..c24609b58dd3 100644
--- a/static/app/views/insights/queues/components/tables/transactionsTable.spec.tsx
+++ b/static/app/views/insights/queues/components/tables/transactionsTable.spec.tsx
@@ -19,7 +19,7 @@ describe('transactionsTable', () => {
       pathname: `/organizations/${organization.slug}/insights/queues/`,
       query: {statsPeriod: '10d', project: '1'},
     },
-    route: '/organizations/:orgId/insights/queues/',
+    route: `/organizations/:orgId/insights/queues/`,
   };
 
   beforeEach(() => {
diff --git a/static/app/views/insights/queues/components/tables/transactionsTable.tsx b/static/app/views/insights/queues/components/tables/transactionsTable.tsx
index 8e25b6bd1edd..dc6c35f9e0d9 100644
--- a/static/app/views/insights/queues/components/tables/transactionsTable.tsx
+++ b/static/app/views/insights/queues/components/tables/transactionsTable.tsx
@@ -90,7 +90,7 @@ const SORTABLE_FIELDS = [
   'count_op(queue.process)',
   'avg_if(span.duration,span.op,equals,queue.process)',
   'avg(messaging.message.receive.latency)',
-  'sum(span.duration)',
+  `sum(span.duration)`,
   'trace_status_rate(ok)',
 ] as const;
 
diff --git a/static/app/views/insights/queues/views/destinationSummaryPage.spec.tsx b/static/app/views/insights/queues/views/destinationSummaryPage.spec.tsx
index 289ed41717e8..c64f00efc60c 100644
--- a/static/app/views/insights/queues/views/destinationSummaryPage.spec.tsx
+++ b/static/app/views/insights/queues/views/destinationSummaryPage.spec.tsx
@@ -23,7 +23,7 @@ describe('destinationSummaryPage', () => {
       pathname: `/organizations/${organization.slug}/insights/backend/queues/destination/`,
       query: {statsPeriod: '10d', project: project.id},
     },
-    route: '/organizations/:orgId/insights/backend/queues/destination/',
+    route: `/organizations/:orgId/insights/backend/queues/destination/`,
   };
 
   jest.mocked(useReleaseStats).mockReturnValue({
diff --git a/static/app/views/insights/queues/views/queuesLandingPage.spec.tsx b/static/app/views/insights/queues/views/queuesLandingPage.spec.tsx
index ab226945c26b..7e6a532c812c 100644
--- a/static/app/views/insights/queues/views/queuesLandingPage.spec.tsx
+++ b/static/app/views/insights/queues/views/queuesLandingPage.spec.tsx
@@ -23,7 +23,7 @@ describe('queuesLandingPage', () => {
       pathname: `/organizations/${organization.slug}/insights/backend/queues/`,
       query: {statsPeriod: '10d', project: '1'},
     },
-    route: '/organizations/:orgId/insights/backend/queues/',
+    route: `/organizations/:orgId/insights/backend/queues/`,
   };
 
   jest.mocked(useReleaseStats).mockReturnValue({
diff --git a/static/app/views/insights/sessions/charts/chartWithIssues.tsx b/static/app/views/insights/sessions/charts/chartWithIssues.tsx
index cce62242e1ca..f6fc015b6a22 100644
--- a/static/app/views/insights/sessions/charts/chartWithIssues.tsx
+++ b/static/app/views/insights/sessions/charts/chartWithIssues.tsx
@@ -129,7 +129,7 @@ export function ChartWithIssues(props: Props) {
                   <Flex justify="between">
                     {title}
                     {hasData && recentIssues?.length ? (
-                      <LinkButton size="xs" to={{pathname: '/issues/'}}>
+                      <LinkButton size="xs" to={{pathname: `/issues/`}}>
                         {t('View All')}
                       </LinkButton>
                     ) : null}
@@ -154,7 +154,7 @@ export function ChartWithIssues(props: Props) {
             }}
           />
           {hasData && recentIssues?.length ? (
-            <LinkButton size="xs" to={{pathname: '/issues/'}}>
+            <LinkButton size="xs" to={{pathname: `/issues/`}}>
               {t('View All')}
             </LinkButton>
           ) : null}
diff --git a/static/app/views/insights/sessions/queries/useCrashFreeSessions.tsx b/static/app/views/insights/sessions/queries/useCrashFreeSessions.tsx
index b941bd758d08..0f83370eb73d 100644
--- a/static/app/views/insights/sessions/queries/useCrashFreeSessions.tsx
+++ b/static/app/views/insights/sessions/queries/useCrashFreeSessions.tsx
@@ -59,7 +59,7 @@ export function useCrashFreeSessions({pageFilters}: {pageFilters?: PageFilters})
           })),
           meta: {
             fields: {
-              ['crash_free_session_rate']: 'percentage' as const,
+              [`crash_free_session_rate`]: 'percentage' as const,
               time: 'date' as const,
             },
             units: {},
diff --git a/static/app/views/insights/sessions/queries/useReleaseSessionCounts.tsx b/static/app/views/insights/sessions/queries/useReleaseSessionCounts.tsx
index f824f4ce9381..3b7053f1b621 100644
--- a/static/app/views/insights/sessions/queries/useReleaseSessionCounts.tsx
+++ b/static/app/views/insights/sessions/queries/useReleaseSessionCounts.tsx
@@ -55,7 +55,7 @@ export function useReleaseSessionCounts({pageFilters}: {pageFilters?: PageFilter
           })),
           meta: {
             fields: {
-              ['total_sessions']: 'integer' as const,
+              [`total_sessions`]: 'integer' as const,
               time: 'date' as const,
             },
             units: {},
diff --git a/static/app/views/insights/sessions/queries/useReleaseSessionPercentage.tsx b/static/app/views/insights/sessions/queries/useReleaseSessionPercentage.tsx
index 417d18a2b9f2..17c76b2d480e 100644
--- a/static/app/views/insights/sessions/queries/useReleaseSessionPercentage.tsx
+++ b/static/app/views/insights/sessions/queries/useReleaseSessionPercentage.tsx
@@ -55,7 +55,7 @@ export function useReleaseSessionPercentage({pageFilters}: {pageFilters?: PageFi
           })),
           meta: {
             fields: {
-              ['session_percent']: 'percentage' as const,
+              [`session_percent`]: 'percentage' as const,
               time: 'date' as const,
             },
             units: {},
diff --git a/static/app/views/insights/uptime/views/overview.tsx b/static/app/views/insights/uptime/views/overview.tsx
index 5b23b50080d1..64df5b7700f1 100644
--- a/static/app/views/insights/uptime/views/overview.tsx
+++ b/static/app/views/insights/uptime/views/overview.tsx
@@ -86,7 +86,7 @@ export default function UptimeOverview() {
             <LinkButton
               size="sm"
               priority="primary"
-              to={makeAlertsPathname({path: '/new/uptime/', organization})}
+              to={makeAlertsPathname({path: `/new/uptime/`, organization})}
               icon={<IconAdd />}
               disabled={!canCreateAlert}
               tooltipProps={{title: canCreateAlert ? undefined : permissionTooltipText}}
@@ -155,7 +155,7 @@ export default function UptimeOverview() {
                   <LinkButton
                     size="sm"
                     priority="primary"
-                    to={makeAlertsPathname({path: '/new/uptime/', organization})}
+                    to={makeAlertsPathname({path: `/new/uptime/`, organization})}
                     icon={<IconAdd />}
                   >
                     {t('Add Uptime Monitor')}
diff --git a/static/app/views/integrationOrganizationLink/index.tsx b/static/app/views/integrationOrganizationLink/index.tsx
index 1c8f87455e3b..55620a2a68f0 100644
--- a/static/app/views/integrationOrganizationLink/index.tsx
+++ b/static/app/views/integrationOrganizationLink/index.tsx
@@ -326,7 +326,7 @@ export default function IntegrationOrganizationLink() {
     const target_url = `https://github.com/${installationData?.account.login}`;
 
     const alertText = tct(
-      'GitHub user [sender_login] has installed GitHub app to [account_type] [account_login]. Proceed if you want to attach this installation to your Sentry account.',
+      `GitHub user [sender_login] has installed GitHub app to [account_type] [account_login]. Proceed if you want to attach this installation to your Sentry account.`,
       {
         account_type: <strong>{installationData?.account.type}</strong>,
         account_login: (
diff --git a/static/app/views/issueDetails/actions/index.spec.tsx b/static/app/views/issueDetails/actions/index.spec.tsx
index b8e6921bbd21..acd65fe34deb 100644
--- a/static/app/views/issueDetails/actions/index.spec.tsx
+++ b/static/app/views/issueDetails/actions/index.spec.tsx
@@ -197,7 +197,7 @@ describe('GroupActions', () => {
         location: {
           pathname: `/organizations/${org.slug}/issues/${group.id}/`,
         },
-        route: '/organizations/:orgId/issues/:groupId/',
+        route: `/organizations/:orgId/issues/:groupId/`,
       };
       const {router} = render(
         <Fragment>
@@ -248,7 +248,7 @@ describe('GroupActions', () => {
         location: {
           pathname: `/organizations/${org.slug}/issues/${issuePlatformGroup.id}/`,
         },
-        route: '/organizations/:orgId/issues/:groupId/',
+        route: `/organizations/:orgId/issues/:groupId/`,
       };
       const {router} = render(
         <Fragment>
diff --git a/static/app/views/issueDetails/actions/index.tsx b/static/app/views/issueDetails/actions/index.tsx
index f5dc4ab279ba..058338205360 100644
--- a/static/app/views/issueDetails/actions/index.tsx
+++ b/static/app/views/issueDetails/actions/index.tsx
@@ -299,7 +299,7 @@ export function GroupActions({group, project, disabled, event}: GroupActionsProp
                 typeof renderDisabled === 'function' &&
                 renderDisabled({...innerProps, hasFeature, children: null})}
               {t(
-                'Discarding this event will result in the deletion of most data associated with this issue and future events being discarded before reaching your stream. Are you sure you wish to continue?'
+                `Discarding this event will result in the deletion of most data associated with this issue and future events being discarded before reaching your stream. Are you sure you wish to continue?`
               )}
             </Body>
             <Footer>
diff --git a/static/app/views/issueDetails/actions/shareModal.spec.tsx b/static/app/views/issueDetails/actions/shareModal.spec.tsx
index 9e56cfdac5eb..03076abf5190 100644
--- a/static/app/views/issueDetails/actions/shareModal.spec.tsx
+++ b/static/app/views/issueDetails/actions/shareModal.spec.tsx
@@ -52,7 +52,7 @@ describe('ShareIssueModal', () => {
     await userEvent.click(screen.getByRole('button', {name: 'Copy Link'}));
 
     expect(navigator.clipboard.writeText).toHaveBeenCalledWith(
-      'http://localhost/organizations/org-slug/issues/1/'
+      `http://localhost/organizations/org-slug/issues/1/`
     );
   });
 
@@ -81,7 +81,7 @@ describe('ShareIssueModal', () => {
     await userEvent.click(screen.getByRole('button', {name: 'Copy Link'}));
 
     expect(navigator.clipboard.writeText).toHaveBeenCalledWith(
-      'http://localhost/organizations/org-slug/issues/1/events/1/'
+      `http://localhost/organizations/org-slug/issues/1/events/1/`
     );
   });
 
diff --git a/static/app/views/issueDetails/groupCheckIns.spec.tsx b/static/app/views/issueDetails/groupCheckIns.spec.tsx
index 4e0f58539708..4123e38911e2 100644
--- a/static/app/views/issueDetails/groupCheckIns.spec.tsx
+++ b/static/app/views/issueDetails/groupCheckIns.spec.tsx
@@ -32,7 +32,7 @@ describe('GroupCheckIns', () => {
     location: {
       pathname: `/organizations/${organization.slug}/issues/${group.id}/check-ins/`,
     },
-    route: '/organizations/:orgId/issues/:groupId/check-ins/',
+    route: `/organizations/:orgId/issues/:groupId/check-ins/`,
   };
 
   beforeEach(() => {
diff --git a/static/app/views/issueDetails/groupDetails.spec.tsx b/static/app/views/issueDetails/groupDetails.spec.tsx
index 480138984592..4f879500fcf5 100644
--- a/static/app/views/issueDetails/groupDetails.spec.tsx
+++ b/static/app/views/issueDetails/groupDetails.spec.tsx
@@ -86,7 +86,7 @@ describe('groupDetails', () => {
     act(() => ProjectsStore.loadInitialData(defaultInit.projects));
 
     MockApiClient.addMockResponse({
-      url: '/assistant/',
+      url: `/assistant/`,
       body: [],
     });
     MockApiClient.addMockResponse({
@@ -335,7 +335,7 @@ describe('groupDetails', () => {
 
   it('renders error when project does not exist', async () => {
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/other-project-slug/issues/',
+      url: `/projects/org-slug/other-project-slug/issues/`,
       method: 'PUT',
     });
     MockApiClient.addMockResponse({
diff --git a/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.spec.tsx b/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.spec.tsx
index 18f0a4f23176..6502d9a87aa5 100644
--- a/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.spec.tsx
+++ b/static/app/views/issueDetails/groupEventAttachments/groupEventAttachments.spec.tsx
@@ -35,14 +35,14 @@ describe('GroupEventAttachments', () => {
     location: {
       pathname: `/organizations/${organization.slug}/issues/${groupId}/attachments/`,
     },
-    route: '/organizations/:orgId/issues/:groupId/attachments/',
+    route: `/organizations/:orgId/issues/:groupId/attachments/`,
   };
   const screenshotRouterConfig: RouterConfig = {
     location: {
       pathname: `/organizations/${organization.slug}/issues/${groupId}/attachments/`,
       query: {attachmentFilter: 'screenshot'},
     },
-    route: '/organizations/:orgId/issues/:groupId/attachments/',
+    route: `/organizations/:orgId/issues/:groupId/attachments/`,
   };
   let project: Project;
   let getAttachmentsMock: jest.Mock;
@@ -176,7 +176,7 @@ describe('GroupEventAttachments', () => {
             environment: ['staging'],
           },
         },
-        route: '/organizations/:orgId/issues/:groupId/attachments/',
+        route: `/organizations/:orgId/issues/:groupId/attachments/`,
       },
       organization,
     });
diff --git a/static/app/views/issueDetails/groupEventCarousel.spec.tsx b/static/app/views/issueDetails/groupEventCarousel.spec.tsx
index f6414bd92c51..eec8df3309d7 100644
--- a/static/app/views/issueDetails/groupEventCarousel.spec.tsx
+++ b/static/app/views/issueDetails/groupEventCarousel.spec.tsx
@@ -15,7 +15,7 @@ describe('GroupEventCarousel', () => {
     location: {
       pathname: `/organizations/org-slug/issues/${group.id}/events/recommended/`,
     },
-    route: '/organizations/:orgId/issues/:groupId/events/:eventId/',
+    route: `/organizations/:orgId/issues/:groupId/events/:eventId/`,
   };
 
   const testEvent = EventFixture({
@@ -194,11 +194,11 @@ describe('GroupEventCarousel', () => {
 
     expect(screen.getByLabelText(/Previous Event/)).toHaveAttribute(
       'href',
-      '/organizations/org-slug/issues/group-id/events/prev-event-id/?referrer=previous-event'
+      `/organizations/org-slug/issues/group-id/events/prev-event-id/?referrer=previous-event`
     );
     expect(screen.getByLabelText(/Next Event/)).toHaveAttribute(
       'href',
-      '/organizations/org-slug/issues/group-id/events/next-event-id/?referrer=next-event'
+      `/organizations/org-slug/issues/group-id/events/next-event-id/?referrer=next-event`
     );
   });
 
@@ -235,7 +235,7 @@ describe('GroupEventCarousel', () => {
     await userEvent.click(screen.getByRole('menuitemradio', {name: /copy event link/i}));
 
     expect(navigator.clipboard.writeText).toHaveBeenCalledWith(
-      'http://localhost/organizations/org-slug/issues/group-id/events/event-id/'
+      `http://localhost/organizations/org-slug/issues/group-id/events/event-id/`
     );
   });
 
@@ -255,7 +255,7 @@ describe('GroupEventCarousel', () => {
     await userEvent.click(screen.getByRole('menuitemradio', {name: 'JSON (7.0 B)'}));
 
     expect(window.open).toHaveBeenCalledWith(
-      'https://us.sentry.io/api/0/projects/org-slug/project-slug/events/event-id/json/'
+      `https://us.sentry.io/api/0/projects/org-slug/project-slug/events/event-id/json/`
     );
   });
 });
diff --git a/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx b/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx
index 2d05d62cdcb3..cf1da0915e4d 100644
--- a/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx
+++ b/static/app/views/issueDetails/groupEventDetails/groupEventDetails.spec.tsx
@@ -46,7 +46,7 @@ const makeDefaultMockData = (
         pathname: `/organizations/${org.slug}/issues/${group.id}/`,
         query: query ?? {},
       },
-      route: '/organizations/:orgId/issues/:groupId/',
+      route: `/organizations/:orgId/issues/:groupId/`,
     },
     group,
     event: EventFixture({
@@ -305,7 +305,7 @@ const mockGroupApis = (
   });
 
   MockApiClient.addMockResponse({
-    url: '/customers/org-slug/policies/',
+    url: `/customers/org-slug/policies/`,
     body: {},
   });
 
@@ -379,7 +379,7 @@ describe('groupEventDetails', () => {
         ...props.initialRouterConfig.location,
         pathname: `/organizations/${props.organization.slug}/issues/${props.group.id}/events/${props.event.id}/`,
       },
-      route: '/organizations/:orgId/issues/:groupId/events/:eventId/',
+      route: `/organizations/:orgId/issues/:groupId/events/:eventId/`,
     };
     mockGroupApis(props.organization, props.project, props.group, props.event);
 
diff --git a/static/app/views/issueDetails/groupFeatureFlags/flagDrawerContent.spec.tsx b/static/app/views/issueDetails/groupFeatureFlags/flagDrawerContent.spec.tsx
index 32130000e3a5..73f01b15dda5 100644
--- a/static/app/views/issueDetails/groupFeatureFlags/flagDrawerContent.spec.tsx
+++ b/static/app/views/issueDetails/groupFeatureFlags/flagDrawerContent.spec.tsx
@@ -16,7 +16,7 @@ describe('GroupFeatureFlagsDrawerContent', () => {
   beforeEach(() => {
     jest.resetAllMocks();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/tags/',
+      url: `/organizations/org-slug/issues/1/tags/`,
       body: [],
     });
 
@@ -28,7 +28,7 @@ describe('GroupFeatureFlagsDrawerContent', () => {
 
   it('calls flags backend and renders distribution cards', async () => {
     const mockTagsEndpoint = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/tags/',
+      url: `/organizations/org-slug/issues/1/tags/`,
       body: FeatureFlagTagsFixture(),
     });
 
@@ -58,7 +58,7 @@ describe('GroupFeatureFlagsDrawerContent', () => {
 
   it('renders error state', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/tags/',
+      url: `/organizations/org-slug/issues/1/tags/`,
       statusCode: 400,
       body: {
         detail: 'Bad request',
@@ -81,7 +81,7 @@ describe('GroupFeatureFlagsDrawerContent', () => {
 
   it('renders empty state when no flags match the search', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/tags/',
+      url: `/organizations/org-slug/issues/1/tags/`,
       body: FeatureFlagTagsFixture(),
     });
 
diff --git a/static/app/views/issueDetails/groupMerged/mergedItem.tsx b/static/app/views/issueDetails/groupMerged/mergedItem.tsx
index 1bc5b2fe08c4..83ec7be5d10e 100644
--- a/static/app/views/issueDetails/groupMerged/mergedItem.tsx
+++ b/static/app/views/issueDetails/groupMerged/mergedItem.tsx
@@ -185,7 +185,7 @@ const Controls = styled('div')<{expanded: boolean}>`
   }
 
   ${MergedGroup}:last-child & {
-    ${p => !p.expanded && 'border-bottom: none'};
+    ${p => !p.expanded && `border-bottom: none`};
     ${p => !p.expanded && `border-radius: 0 0 ${p.theme.radius.md} ${p.theme.radius.md}`};
   }
 `;
diff --git a/static/app/views/issueDetails/groupReplays/useReplaysFromIssue.tsx b/static/app/views/issueDetails/groupReplays/useReplaysFromIssue.tsx
index 91ef8c92f9d1..6634543fff53 100644
--- a/static/app/views/issueDetails/groupReplays/useReplaysFromIssue.tsx
+++ b/static/app/views/issueDetails/groupReplays/useReplaysFromIssue.tsx
@@ -63,7 +63,7 @@ export function useReplaysFromIssue({
       name: '',
       version: 2,
       fields: REPLAY_LIST_FIELDS,
-      query: replayIds.length ? `id:[${String(replayIds)}]` : 'id:1',
+      query: replayIds.length ? `id:[${String(replayIds)}]` : `id:1`,
       range: '90d',
       projects: [],
       orderby: decodeScalar(location.query.sort, DEFAULT_REPLAY_LIST_SORT),
diff --git a/static/app/views/issueDetails/groupSimilarIssues/similarIssues.spec.tsx b/static/app/views/issueDetails/groupSimilarIssues/similarIssues.spec.tsx
index 97afe26d5974..23874bd43af7 100644
--- a/static/app/views/issueDetails/groupSimilarIssues/similarIssues.spec.tsx
+++ b/static/app/views/issueDetails/groupSimilarIssues/similarIssues.spec.tsx
@@ -31,7 +31,7 @@ describe('Issues Similar View', () => {
     location: {
       pathname: `/organizations/org-slug/issues/${group.id}/similar/`,
     },
-    route: '/organizations/:orgId/issues/:groupId/similar/',
+    route: `/organizations/:orgId/issues/:groupId/similar/`,
   };
 
   const scores = [
@@ -55,7 +55,7 @@ describe('Issues Similar View', () => {
       body: group,
     });
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/',
+      url: `/projects/org-slug/project-slug/`,
       body: {features: ['similarity-view']},
     });
     MockApiClient.addMockResponse({
@@ -197,7 +197,7 @@ describe('Issues Similar Embeddings View', () => {
     location: {
       pathname: `/organizations/org-slug/issues/${group.id}/similar/`,
     },
-    route: '/organizations/:orgId/issues/:groupId/similar/',
+    route: `/organizations/:orgId/issues/:groupId/similar/`,
   };
 
   const similarEmbeddingsScores = [
@@ -224,7 +224,7 @@ describe('Issues Similar Embeddings View', () => {
       body: group,
     });
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/',
+      url: `/projects/org-slug/project-slug/`,
       body: {features: ['similarity-embeddings']},
     });
     MockApiClient.addMockResponse({
diff --git a/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.spec.tsx b/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.spec.tsx
index 0ecb3fdf6a5e..81eb6e9454f7 100644
--- a/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.spec.tsx
+++ b/static/app/views/issueDetails/groupTags/tagDetailsDrawerContent.spec.tsx
@@ -38,7 +38,7 @@ describe('TagDetailsDrawerContent', () => {
       body: tags,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/',
+      url: `/organizations/org-slug/issues/1/`,
       body: GroupFixture(),
     });
   });
@@ -362,7 +362,7 @@ describe('TagDetailsDrawerContent', () => {
       body: deviceValues,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/1/',
+      url: `/organizations/org-slug/issues/1/`,
       body: group,
     });
 
diff --git a/static/app/views/issueDetails/groupUptimeChecks.spec.tsx b/static/app/views/issueDetails/groupUptimeChecks.spec.tsx
index d5d03c2947ca..62b5632d36a6 100644
--- a/static/app/views/issueDetails/groupUptimeChecks.spec.tsx
+++ b/static/app/views/issueDetails/groupUptimeChecks.spec.tsx
@@ -32,7 +32,7 @@ describe('GroupUptimeChecks', () => {
     location: {
       pathname: `/organizations/${organization.slug}/issues/${group.id}/uptime-checks/`,
     },
-    route: '/organizations/:orgId/issues/:groupId/uptime-checks/',
+    route: `/organizations/:orgId/issues/:groupId/uptime-checks/`,
   };
 
   beforeEach(() => {
diff --git a/static/app/views/issueDetails/groupUserFeedback.spec.tsx b/static/app/views/issueDetails/groupUserFeedback.spec.tsx
index bba8820c36ac..acb84d852f51 100644
--- a/static/app/views/issueDetails/groupUserFeedback.spec.tsx
+++ b/static/app/views/issueDetails/groupUserFeedback.spec.tsx
@@ -16,7 +16,7 @@ describe('GroupUserFeedback', () => {
     location: {
       pathname: `/organizations/${organization.slug}/issues/${group.id}/`,
     },
-    route: '/organizations/:orgId/issues/:groupId/',
+    route: `/organizations/:orgId/issues/:groupId/`,
   };
 
   beforeEach(() => {
diff --git a/static/app/views/issueDetails/header.spec.tsx b/static/app/views/issueDetails/header.spec.tsx
index a0e0ab199f17..bd8e9ed7578d 100644
--- a/static/app/views/issueDetails/header.spec.tsx
+++ b/static/app/views/issueDetails/header.spec.tsx
@@ -241,7 +241,7 @@ describe('GroupHeader', () => {
 
     it('can change priority', async () => {
       const mockModifyIssue = MockApiClient.addMockResponse({
-        url: '/organizations/org-slug/issues/',
+        url: `/organizations/org-slug/issues/`,
         method: 'PUT',
         body: {},
       });
diff --git a/static/app/views/issueDetails/streamline/eventList.spec.tsx b/static/app/views/issueDetails/streamline/eventList.spec.tsx
index a1717fe469c9..9790b57bff84 100644
--- a/static/app/views/issueDetails/streamline/eventList.spec.tsx
+++ b/static/app/views/issueDetails/streamline/eventList.spec.tsx
@@ -24,7 +24,7 @@ describe('EventList', () => {
     location: {
       pathname: `/organizations/${organization.slug}/issues/${group.id}/events/`,
     },
-    route: '/organizations/:orgId/issues/:groupId/events/',
+    route: `/organizations/:orgId/issues/:groupId/events/`,
   };
 
   let mockEventList: jest.Mock;
diff --git a/static/app/views/issueDetails/streamline/eventList.tsx b/static/app/views/issueDetails/streamline/eventList.tsx
index 2dc707833c10..39b50d951fdc 100644
--- a/static/app/views/issueDetails/streamline/eventList.tsx
+++ b/static/app/views/issueDetails/streamline/eventList.tsx
@@ -10,6 +10,7 @@ import {parseLinkHeader} from 'sentry/utils/parseLinkHeader';
 import {decodeSorts} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {useEventColumns} from 'sentry/views/issueDetails/allEventsTable';
 import {
   EventListTable,
@@ -32,6 +33,7 @@ export function EventList({group}: EventListProps) {
   const referrer = 'issue_details.streamline_list';
   const location = useLocation();
   const organization = useOrganization();
+  const routes = useRoutes();
   const [_error, setError] = useState('');
   const {fields, columnTitles} = useEventColumns(group, organization);
   const eventView = useIssueDetailsEventView({
@@ -81,6 +83,7 @@ export function EventList({group}: EventListProps) {
         issueId={group.id}
         isRegressionIssue={isRegressionIssue}
         organization={organization}
+        routes={routes}
         excludedTags={ALL_EVENTS_EXCLUDED_TAGS}
         projectSlug={group.project.slug}
         customColumns={['minidump']}
diff --git a/static/app/views/issueDetails/streamline/eventMissingBanner.spec.tsx b/static/app/views/issueDetails/streamline/eventMissingBanner.spec.tsx
index 14cc0ac253a1..3a2f80fbafcb 100644
--- a/static/app/views/issueDetails/streamline/eventMissingBanner.spec.tsx
+++ b/static/app/views/issueDetails/streamline/eventMissingBanner.spec.tsx
@@ -6,9 +6,9 @@ describe('EventMissingBanner', () => {
   it('renders elements for known event IDs', () => {
     const initialRouterConfig = {
       location: {
-        pathname: '/organizations/org-slug/issues/group-1/events/recommended/',
+        pathname: `/organizations/org-slug/issues/group-1/events/recommended/`,
       },
-      route: '/organizations/:orgId/issues/:groupId/events/:eventId/',
+      route: `/organizations/:orgId/issues/:groupId/events/:eventId/`,
     };
 
     render(<EventMissingBanner />, {
@@ -28,9 +28,9 @@ describe('EventMissingBanner', () => {
   it('renders elements for specific event IDs', () => {
     const initialRouterConfig = {
       location: {
-        pathname: '/organizations/org-slug/issues/group-1/events/abc123/',
+        pathname: `/organizations/org-slug/issues/group-1/events/abc123/`,
       },
-      route: '/organizations/:orgId/issues/:groupId/events/:eventId/',
+      route: `/organizations/:orgId/issues/:groupId/events/:eventId/`,
     };
 
     render(<EventMissingBanner />, {
diff --git a/static/app/views/issueDetails/streamline/eventNavigation.spec.tsx b/static/app/views/issueDetails/streamline/eventNavigation.spec.tsx
index a2626de27ed7..dc930d3cc247 100644
--- a/static/app/views/issueDetails/streamline/eventNavigation.spec.tsx
+++ b/static/app/views/issueDetails/streamline/eventNavigation.spec.tsx
@@ -41,7 +41,7 @@ describe('EventNavigation', () => {
     location: {
       pathname: `/organizations/${organization.slug}/issues/${group.id}/events/`,
     },
-    route: '/organizations/:orgId/issues/:groupId/events/',
+    route: `/organizations/:orgId/issues/:groupId/events/`,
   };
 
   beforeEach(() => {
diff --git a/static/app/views/issueDetails/streamline/eventTitle.spec.tsx b/static/app/views/issueDetails/streamline/eventTitle.spec.tsx
index 340609679c83..b89fe2a566dc 100644
--- a/static/app/views/issueDetails/streamline/eventTitle.spec.tsx
+++ b/static/app/views/issueDetails/streamline/eventTitle.spec.tsx
@@ -48,7 +48,7 @@ describe('EventNavigation', () => {
     window.open = jest.fn();
 
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/events/event-id/actionable-items/',
+      url: `/projects/org-slug/project-slug/events/event-id/actionable-items/`,
       body: {
         errors: [],
       },
@@ -90,7 +90,7 @@ describe('EventNavigation', () => {
 
   it('shows processing issue button if there is an event error', async () => {
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/events/event-id/actionable-items/',
+      url: `/projects/org-slug/project-slug/events/event-id/actionable-items/`,
       body: {
         errors: [
           {
diff --git a/static/app/views/issueDetails/streamline/groupDetailsLayout.spec.tsx b/static/app/views/issueDetails/streamline/groupDetailsLayout.spec.tsx
index 6db93fd3a2ac..f5b70b2c01c6 100644
--- a/static/app/views/issueDetails/streamline/groupDetailsLayout.spec.tsx
+++ b/static/app/views/issueDetails/streamline/groupDetailsLayout.spec.tsx
@@ -41,7 +41,7 @@ describe('GroupDetailsLayout', () => {
       body: {},
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/repos/',
+      url: `/organizations/org-slug/repos/`,
       body: {},
     });
     MockApiClient.addMockResponse({
diff --git a/static/app/views/issueDetails/streamline/header/header.spec.tsx b/static/app/views/issueDetails/streamline/header/header.spec.tsx
index 43470e46504e..32c4a4bb45b4 100644
--- a/static/app/views/issueDetails/streamline/header/header.spec.tsx
+++ b/static/app/views/issueDetails/streamline/header/header.spec.tsx
@@ -53,7 +53,7 @@ describe('StreamlinedGroupHeader', () => {
         body: {},
       });
       MockApiClient.addMockResponse({
-        url: '/organizations/org-slug/repos/',
+        url: `/organizations/org-slug/repos/`,
         body: {},
       });
       MockApiClient.addMockResponse({
diff --git a/static/app/views/issueDetails/streamline/hooks/useCopyIssueDetails.tsx b/static/app/views/issueDetails/streamline/hooks/useCopyIssueDetails.tsx
index cec0c53dea8a..5da561ea15cf 100644
--- a/static/app/views/issueDetails/streamline/hooks/useCopyIssueDetails.tsx
+++ b/static/app/views/issueDetails/streamline/hooks/useCopyIssueDetails.tsx
@@ -42,8 +42,8 @@ export function useActiveThreadId() {
 }
 
 function formatStacktraceToMarkdown(stacktrace: StacktraceType): string {
-  let markdownText = '#### Stacktrace\n\n';
-  markdownText += '```\n';
+  let markdownText = `#### Stacktrace\n\n`;
+  markdownText += `\`\`\`\n`;
 
   // Process frames (show at most 16 frames, similar to Python example)
   const maxFrames = 16;
@@ -69,13 +69,13 @@ function formatStacktraceToMarkdown(stacktrace: StacktraceType): string {
 
     // Add variables if available
     if (frame.vars) {
-      markdownText += '---\nVariable values:\n';
+      markdownText += `---\nVariable values:\n`;
       markdownText += JSON.stringify(frame.vars, null, 2) + '\n';
-      markdownText += '\n=======\n';
+      markdownText += `\n=======\n`;
     }
   });
 
-  markdownText += '```\n';
+  markdownText += `\`\`\`\n`;
   return markdownText;
 }
 
@@ -87,7 +87,7 @@ export function formatEventToMarkdown(
 
   // Add tags
   if (event && Array.isArray(event.tags) && event.tags.length > 0) {
-    markdownText += '\n## Tags\n\n';
+    markdownText += `\n## Tags\n\n`;
     event.tags.forEach(tag => {
       if (tag && typeof tag.key === 'string') {
         markdownText += `- **${tag.key}:** ${tag.value}\n`;
@@ -114,7 +114,7 @@ export function formatEventToMarkdown(
           if (exception.stacktrace?.frames && exception.stacktrace.frames.length > 0) {
             markdownText += formatStacktraceToMarkdown(exception.stacktrace);
             if (index < arr.length - 1) {
-              markdownText += '------\n';
+              markdownText += `------\n`;
             }
           }
         }
@@ -127,12 +127,12 @@ export function formatEventToMarkdown(
       if (activeThread?.stacktrace) {
         markdownText += `\n## Thread: ${activeThread.name || ` Thread ${activeThread.id}`}`;
         if (activeThread.crashed) {
-          markdownText += ' (crashed)';
+          markdownText += ` (crashed)`;
         }
         if (activeThread.current) {
-          markdownText += ' (current)';
+          markdownText += ` (current)`;
         }
-        markdownText += '\n\n';
+        markdownText += `\n\n`;
         markdownText += formatStacktraceToMarkdown(activeThread.stacktrace);
       }
     }
diff --git a/static/app/views/issueDetails/streamline/hooks/useEventQuery.spec.tsx b/static/app/views/issueDetails/streamline/hooks/useEventQuery.spec.tsx
index c344aef4d347..207006f94c94 100644
--- a/static/app/views/issueDetails/streamline/hooks/useEventQuery.spec.tsx
+++ b/static/app/views/issueDetails/streamline/hooks/useEventQuery.spec.tsx
@@ -48,14 +48,14 @@ describe('useEventQuery', () => {
 
 describe('sanitizeEventQuery', () => {
   it('should remove basic issue filters from query', () => {
-    const query = 'is:unresolved level:error';
+    const query = `is:unresolved level:error`;
     const sanitizedQuery = getEventSearchFromIssueQuery(query);
     expect(sanitizedQuery).toBe('level:error');
   });
 
   it('handles has/!has by removing disallowed fields and keeping allowed ones', () => {
     // environment is excluded; user.email is an allowed event field
-    const query = 'has:environment has:user.email !has:transaction.status !has:user.id';
+    const query = `has:environment has:user.email !has:transaction.status !has:user.id`;
     const sanitizedQuery = getEventSearchFromIssueQuery(query);
     // Should drop has:environment and !has:transaction.status, keep has:user.email and !has:user.id
     expect(sanitizedQuery).toBe('has:user.email !has:user.id');
diff --git a/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.spec.tsx b/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.spec.tsx
index a9de455c522c..502db78a27d7 100644
--- a/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.spec.tsx
+++ b/static/app/views/issueDetails/streamline/issueDetailsEventNavigation.spec.tsx
@@ -122,11 +122,11 @@ describe('IssueDetailsEventNavigation', () => {
 
     expect(await screen.findByRole('button', {name: 'Previous Event'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/issues/group-id/events/prev-event-id/?referrer=previous-event'
+      `/organizations/org-slug/issues/group-id/events/prev-event-id/?referrer=previous-event`
     );
     expect(screen.getByRole('button', {name: 'Next Event'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/issues/group-id/events/next-event-id/?referrer=next-event'
+      `/organizations/org-slug/issues/group-id/events/next-event-id/?referrer=next-event`
     );
   });
 
@@ -136,11 +136,11 @@ describe('IssueDetailsEventNavigation', () => {
       previousEventID: 'prev-event-id',
     });
     const mockNextEvent = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/group-id/events/next-event-id/',
+      url: `/organizations/org-slug/issues/group-id/events/next-event-id/`,
       body: EventFixture(),
     });
     const mockPreviousEvent = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/issues/group-id/events/prev-event-id/',
+      url: `/organizations/org-slug/issues/group-id/events/prev-event-id/`,
       body: EventFixture(),
     });
     render(<IssueDetailsEventNavigation {...defaultProps} event={event} />, {
diff --git a/static/app/views/issueDetails/traceTimeline/traceTimelineEvents.tsx b/static/app/views/issueDetails/traceTimeline/traceTimelineEvents.tsx
index 18f326778cad..850ea5d6a522 100644
--- a/static/app/views/issueDetails/traceTimeline/traceTimelineEvents.tsx
+++ b/static/app/views/issueDetails/traceTimeline/traceTimelineEvents.tsx
@@ -184,7 +184,7 @@ function NodeGroup({
         <Tooltip
           title={<TraceTimelineTooltip event={event} timelineEvents={colEvents} />}
           overlayStyle={{
-            padding: '0 !important',
+            padding: `0 !important`,
           }}
           position="bottom"
           isHoverable
diff --git a/static/app/views/issueDetails/useGroupDefaultStatsPeriod.tsx b/static/app/views/issueDetails/useGroupDefaultStatsPeriod.tsx
index 2dc16f534339..b94708822e67 100644
--- a/static/app/views/issueDetails/useGroupDefaultStatsPeriod.tsx
+++ b/static/app/views/issueDetails/useGroupDefaultStatsPeriod.tsx
@@ -63,7 +63,7 @@ export function useGroupDefaultStatsPeriod(
 
   if (!maxRetentionDays) {
     isMaxRetention = true;
-    return {statsPeriod: '30d', isMaxRetention};
+    return {statsPeriod: `30d`, isMaxRetention};
   }
 
   const clampedRetentionDays = Math.min(maxRetentionDays, daysSinceFirstSeen);
diff --git a/static/app/views/issueList/actions/utils.tsx b/static/app/views/issueList/actions/utils.tsx
index 75661ecc7bc6..4213d0b9678a 100644
--- a/static/app/views/issueList/actions/utils.tsx
+++ b/static/app/views/issueList/actions/utils.tsx
@@ -85,8 +85,8 @@ export function getConfirm({
       : tn(
           // Use sprintf argument swapping since the number value must come
           // first. See https://github.com/alexei/sprintf.js#argument-swapping
-          'Are you sure you want to %2$s this %s issue%3$s?',
-          'Are you sure you want to %2$s these %s issues%3$s?',
+          `Are you sure you want to %2$s this %s issue%3$s?`,
+          `Are you sure you want to %2$s these %s issues%3$s?`,
           numIssues,
           action,
           append
@@ -150,7 +150,7 @@ export function getLabel(numIssues: number, allInQuerySelected: boolean) {
       ? t('Bulk %s issues', action)
       : // Use sprintf argument swapping to put the capitalized string first. See
         // https://github.com/alexei/sprintf.js#argument-swapping
-        tn('%2$s %s selected issue', '%2$s %s selected issues', numIssues, capitalized);
+        tn(`%2$s %s selected issue`, `%2$s %s selected issues`, numIssues, capitalized);
 
     return text + append;
   };
diff --git a/static/app/views/issueList/issueViews/issueViewsList/issueViewsList.spec.tsx b/static/app/views/issueList/issueViews/issueViewsList/issueViewsList.spec.tsx
index 6a7eff59a1fa..d19a956216d2 100644
--- a/static/app/views/issueList/issueViews/issueViewsList/issueViewsList.spec.tsx
+++ b/static/app/views/issueList/issueViews/issueViewsList/issueViewsList.spec.tsx
@@ -69,7 +69,7 @@ describe('IssueViewsList', () => {
     expect(await screen.findByText('Foo')).toBeInTheDocument();
     expect(screen.getByText('Foo')).toHaveAttribute(
       'href',
-      '/organizations/org-slug/issues/views/1/'
+      `/organizations/org-slug/issues/views/1/`
     );
     expect(screen.getByText(textWithMarkupMatcher('foo is bar'))).toBeInTheDocument();
     expect(screen.getByText('env1')).toBeInTheDocument();
@@ -78,7 +78,7 @@ describe('IssueViewsList', () => {
     expect(await screen.findByText('Bar')).toBeInTheDocument();
     expect(screen.getByText('Bar')).toHaveAttribute(
       'href',
-      '/organizations/org-slug/issues/views/2/'
+      `/organizations/org-slug/issues/views/2/`
     );
     expect(screen.getByText(textWithMarkupMatcher('bar is baz'))).toBeInTheDocument();
     expect(screen.getByText('My Projects')).toBeInTheDocument();
diff --git a/static/app/views/issueList/monitorsDropdown.tsx b/static/app/views/issueList/monitorsDropdown.tsx
index 8ba0f97ac066..428dbd1f3f79 100644
--- a/static/app/views/issueList/monitorsDropdown.tsx
+++ b/static/app/views/issueList/monitorsDropdown.tsx
@@ -21,7 +21,7 @@ export function MonitorsDropdown() {
 
   const {data: cronsData, isPending: cronsIsPending} = useApiQuery<Counts>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/monitors-count/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/monitors-count/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -40,7 +40,7 @@ export function MonitorsDropdown() {
 
   const {data: uptimeData, isPending: uptimeIsPending} = useApiQuery<Counts>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/uptime-count/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/uptime-count/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/issueList/pages/autofix/recentlyRun.tsx b/static/app/views/issueList/pages/autofix/recentlyRun.tsx
index af4db5f9ec47..41306baaa9d1 100644
--- a/static/app/views/issueList/pages/autofix/recentlyRun.tsx
+++ b/static/app/views/issueList/pages/autofix/recentlyRun.tsx
@@ -6,7 +6,7 @@ import {useOrganization} from 'sentry/utils/useOrganization';
 import {IssueListContainer} from 'sentry/views/issueList';
 import IssueListOverview from 'sentry/views/issueList/overview';
 
-const QUERY = 'is:unresolved has:issue.seer_last_run';
+const QUERY = `is:unresolved has:issue.seer_last_run`;
 const label = t('Recently Run');
 
 export default function AutofixRecentlyRunPage() {
diff --git a/static/app/views/issueList/queries/useFetchGroupSearchView.tsx b/static/app/views/issueList/queries/useFetchGroupSearchView.tsx
index 1902b7aeffe6..b6fcf3c68e1f 100644
--- a/static/app/views/issueList/queries/useFetchGroupSearchView.tsx
+++ b/static/app/views/issueList/queries/useFetchGroupSearchView.tsx
@@ -12,7 +12,7 @@ export const makeFetchGroupSearchViewKey = ({
   id,
   orgSlug,
 }: FetchGroupSearchViewsParameters): ApiQueryKey => [
-  getApiUrl('/organizations/$organizationIdOrSlug/group-search-views/$viewId/', {
+  getApiUrl(`/organizations/$organizationIdOrSlug/group-search-views/$viewId/`, {
     path: {organizationIdOrSlug: orgSlug, viewId: id},
   }),
 ];
@@ -22,7 +22,7 @@ export const useFetchGroupSearchView = (
   options: Partial<UseApiQueryOptions<GroupSearchView>> = {}
 ) => {
   return useApiQuery<GroupSearchView>(makeFetchGroupSearchViewKey(parameters), {
-    staleTime: 30_000,
+    staleTime: 0,
     retry: false,
     ...options,
   });
diff --git a/static/app/views/issueList/queries/useFetchIssueCounts.tsx b/static/app/views/issueList/queries/useFetchIssueCounts.tsx
index 3e5553ba9b04..944a1729a4f7 100644
--- a/static/app/views/issueList/queries/useFetchIssueCounts.tsx
+++ b/static/app/views/issueList/queries/useFetchIssueCounts.tsx
@@ -18,7 +18,7 @@ const makeFetchIssueCounts = ({
   orgSlug,
   ...requestParams
 }: FetchIssueCountsParameters): ApiQueryKey => [
-  getApiUrl('/organizations/$organizationIdOrSlug/issues-count/', {
+  getApiUrl(`/organizations/$organizationIdOrSlug/issues-count/`, {
     path: {organizationIdOrSlug: orgSlug},
   }),
   {
diff --git a/static/app/views/issueList/utils/useGenerateIssueViewTitle.tsx b/static/app/views/issueList/utils/useGenerateIssueViewTitle.tsx
index 3df4388dc2ea..820d15c62259 100644
--- a/static/app/views/issueList/utils/useGenerateIssueViewTitle.tsx
+++ b/static/app/views/issueList/utils/useGenerateIssueViewTitle.tsx
@@ -18,7 +18,7 @@ export function useGenerateIssueViewTitle({
   const organization = useOrganization();
   return useApiQuery<GenerateIssueViewTitleResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/issue-view-title/generate/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/issue-view-title/generate/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/lastKnownRouteContextProvider.tsx b/static/app/views/lastKnownRouteContextProvider.tsx
index 6268792ef798..1ce0576179ee 100644
--- a/static/app/views/lastKnownRouteContextProvider.tsx
+++ b/static/app/views/lastKnownRouteContextProvider.tsx
@@ -1,7 +1,7 @@
 import {createContext, useContext, useEffect, useRef} from 'react';
-import {useMatches} from 'react-router-dom';
 
 import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
+import {useRoutes} from 'sentry/utils/useRoutes';
 
 interface Props {
   children: React.ReactNode;
@@ -18,19 +18,19 @@ export function useLastKnownRoute() {
  * This is used to better group issues when we hit "route not found" errors.
  */
 export function LastKnownRouteContextProvider({children}: Props) {
-  const matches = useMatches();
+  const route = useRoutes();
 
   // We could use `usePrevious` here if we didn't need the additional logic to
   // ensure we don't track the not found route, which isn't useful for issue grouping.
-  const prevMatches = useRef(matches);
+  const prevRoute = useRef(route);
   useEffect(() => {
     // only store the new value if it's not the "not found" route
-    if (getRouteStringFromRoutes({matches}) !== '/*') {
-      prevMatches.current = matches;
+    if (getRouteStringFromRoutes(route) !== '/*') {
+      prevRoute.current = route;
     }
-  }, [matches]);
+  }, [route]);
 
-  const lastKnownRoute = getRouteStringFromRoutes({matches: prevMatches.current});
+  const lastKnownRoute = getRouteStringFromRoutes(prevRoute.current);
 
   return <LastKnownRouteContext value={lastKnownRoute}>{children}</LastKnownRouteContext>;
 }
diff --git a/static/app/views/navigation/index.desktop.spec.tsx b/static/app/views/navigation/index.desktop.spec.tsx
index aab284ffb169..414d53ea7b90 100644
--- a/static/app/views/navigation/index.desktop.spec.tsx
+++ b/static/app/views/navigation/index.desktop.spec.tsx
@@ -105,27 +105,27 @@ function setupMocks() {
   ConfigStore.set('customerDomain', null);
 
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/broadcasts/',
+    url: `/organizations/org-slug/broadcasts/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/assistant/',
+    url: `/assistant/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/group-search-views/starred/',
+    url: `/organizations/org-slug/group-search-views/starred/`,
     body: [GroupSearchViewFixture({name: 'Starred View 1'})],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/issues-count/',
+    url: `/organizations/org-slug/issues-count/`,
     body: {},
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/explore/saved/',
+    url: `/organizations/org-slug/explore/saved/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/dashboards/',
+    url: `/organizations/org-slug/dashboards/`,
     body: [
       // This ensures that we test the "All Projects", "My projects", "multiple projects" icons
       DashboardListItemFixture({id: '1', title: 'All projects', projects: []}),
@@ -362,9 +362,9 @@ describe('desktop navigation', () => {
           [`${ORG}/monitors/crons/`, 'Monitors', 'Crons'],
           [`${ORG}/monitors/alerts/`, 'Monitors', 'Alerts'],
           // Settings
-          ['/settings/org-slug/', 'Settings', 'General Settings'],
+          [`/settings/org-slug/`, 'Settings', 'General Settings'],
           [
-            '/settings/org-slug/projects/project-slug/teams/',
+            `/settings/org-slug/projects/project-slug/teams/`,
             'Settings',
             'Project Teams',
             '/settings/:orgId/projects/:projectId/teams/',
diff --git a/static/app/views/navigation/index.mobile.spec.tsx b/static/app/views/navigation/index.mobile.spec.tsx
index 490efc356238..153b507e3d5f 100644
--- a/static/app/views/navigation/index.mobile.spec.tsx
+++ b/static/app/views/navigation/index.mobile.spec.tsx
@@ -62,27 +62,27 @@ function setupMocks() {
   ConfigStore.set('customerDomain', null);
 
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/broadcasts/',
+    url: `/organizations/org-slug/broadcasts/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/assistant/',
+    url: `/assistant/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/group-search-views/starred/',
+    url: `/organizations/org-slug/group-search-views/starred/`,
     body: [GroupSearchViewFixture({name: 'Starred View 1'})],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/issues-count/',
+    url: `/organizations/org-slug/issues-count/`,
     body: {},
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/explore/saved/',
+    url: `/organizations/org-slug/explore/saved/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/dashboards/',
+    url: `/organizations/org-slug/dashboards/`,
     body: [],
   });
 
diff --git a/static/app/views/navigation/primary/components.tsx b/static/app/views/navigation/primary/components.tsx
index c8c4c0ce2d2d..4164b5acbf2c 100644
--- a/static/app/views/navigation/primary/components.tsx
+++ b/static/app/views/navigation/primary/components.tsx
@@ -4,7 +4,6 @@ import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 import {FocusScope} from '@react-aria/focus';
 import {mergeProps} from '@react-aria/utils';
-import {motion} from 'framer-motion';
 import type {LocationDescriptor} from 'history';
 import type {DistributedOmit} from 'type-fest';
 
@@ -758,19 +757,11 @@ export function usePrimaryNavigationButtonOverlay(props: UseOverlayProps = {}) {
  */
 function PrimaryNavigationButtonOverlay(props: PrimaryNavigationButtonOverlayProps) {
   const theme = useTheme();
-  const {layout} = usePrimaryNavigation();
-  const isDesktop = layout !== 'mobile';
 
   return createPortal(
     <FocusScope restoreFocus autoFocus>
       <PositionWrapper zIndex={theme.zIndex.modal} {...props.overlayProps}>
-        <motion.div
-          initial={isDesktop ? {opacity: 0, scale: 0.98} : undefined}
-          animate={isDesktop ? {opacity: 1, scale: 1} : undefined}
-          transition={isDesktop ? theme.motion.framer.enter.moderate : undefined}
-        >
-          <ScrollableOverlay>{props.children}</ScrollableOverlay>
-        </motion.div>
+        <ScrollableOverlay>{props.children}</ScrollableOverlay>
       </PositionWrapper>
     </FocusScope>,
     document.body
diff --git a/static/app/views/navigation/primary/onboarding.spec.tsx b/static/app/views/navigation/primary/onboarding.spec.tsx
index c8e68f1657bd..d1ada1d9b386 100644
--- a/static/app/views/navigation/primary/onboarding.spec.tsx
+++ b/static/app/views/navigation/primary/onboarding.spec.tsx
@@ -24,7 +24,7 @@ function renderMockRequests(organization: Organization) {
   });
 
   const mutateUserOptionsMock = MockApiClient.addMockResponse({
-    url: '/users/me/',
+    url: `/users/me/`,
     method: 'PUT',
   });
 
@@ -51,7 +51,7 @@ describe('Onboarding Status', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/assistant/',
+      url: `/assistant/`,
       body: [],
     });
   });
diff --git a/static/app/views/navigation/primary/organizationDropdown.spec.tsx b/static/app/views/navigation/primary/organizationDropdown.spec.tsx
index f4d14e437341..a62095612622 100644
--- a/static/app/views/navigation/primary/organizationDropdown.spec.tsx
+++ b/static/app/views/navigation/primary/organizationDropdown.spec.tsx
@@ -54,11 +54,11 @@ describe('OrganizationDropdown', () => {
 
     expect(await screen.findByRole('menuitemradio', {name: /Org 1/})).toHaveAttribute(
       'href',
-      '/organizations/org-1/issues/'
+      `/organizations/org-1/issues/`
     );
     expect(await screen.findByRole('menuitemradio', {name: /Org 2/})).toHaveAttribute(
       'href',
-      '/organizations/org-2/issues/'
+      `/organizations/org-2/issues/`
     );
   });
 
diff --git a/static/app/views/navigation/primary/userDropdown.spec.tsx b/static/app/views/navigation/primary/userDropdown.spec.tsx
index 68935ca29505..86982cdefc53 100644
--- a/static/app/views/navigation/primary/userDropdown.spec.tsx
+++ b/static/app/views/navigation/primary/userDropdown.spec.tsx
@@ -58,7 +58,7 @@ describe('UserDropdown', () => {
 
     expect(screen.getByRole('menuitemradio', {name: 'Admin'})).toHaveAttribute(
       'href',
-      '/manage/'
+      `/manage/`
     );
   });
 });
diff --git a/static/app/views/navigation/primary/whatsNew.spec.tsx b/static/app/views/navigation/primary/whatsNew.spec.tsx
index 84ca327515a5..85eabb9fba18 100644
--- a/static/app/views/navigation/primary/whatsNew.spec.tsx
+++ b/static/app/views/navigation/primary/whatsNew.spec.tsx
@@ -15,7 +15,7 @@ describe('WhatsNew', () => {
       method: 'PUT',
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
+      url: `/organizations/org-slug/broadcasts/`,
       match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
       body: [],
     });
@@ -32,7 +32,7 @@ describe('WhatsNew', () => {
 
   it('does not show the unread indicator when all broadcasts are seen', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
+      url: `/organizations/org-slug/broadcasts/`,
       match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
       body: [
         BroadcastFixture({id: '1', hasSeen: true}),
@@ -53,7 +53,7 @@ describe('WhatsNew', () => {
 
   it('renders broadcasts even when all have been seen', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
+      url: `/organizations/org-slug/broadcasts/`,
       match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
       body: [
         BroadcastFixture({id: '1', title: 'Seen Broadcast 1', hasSeen: true}),
@@ -76,7 +76,7 @@ describe('WhatsNew', () => {
     jest.useFakeTimers();
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
+      url: `/organizations/org-slug/broadcasts/`,
       match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
       body: [
         BroadcastFixture({
@@ -115,7 +115,7 @@ describe('WhatsNew', () => {
     jest.useFakeTimers();
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
+      url: `/organizations/org-slug/broadcasts/`,
       match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
       body: [
         BroadcastFixture({id: '1', title: 'Seen Broadcast 1', hasSeen: true}),
@@ -148,7 +148,7 @@ describe('WhatsNew', () => {
     jest.useFakeTimers();
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
+      url: `/organizations/org-slug/broadcasts/`,
       match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
       body: [
         BroadcastFixture({
@@ -203,7 +203,7 @@ describe('WhatsNew', () => {
     jest.useFakeTimers();
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
+      url: `/organizations/org-slug/broadcasts/`,
       match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
       body: [
         BroadcastFixture({
@@ -251,7 +251,7 @@ describe('WhatsNew', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
+      url: `/organizations/org-slug/broadcasts/`,
       match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
       body: [broadcast],
     });
@@ -263,11 +263,7 @@ describe('WhatsNew', () => {
     expect(await screen.findByText('Blog Post')).toBeInTheDocument();
     const titleLink = screen.getByRole('link', {name: broadcast.title});
     expect(titleLink).toHaveAttribute('href', broadcast.link);
-    expect(screen.getByText(broadcast.message, {exact: false})).toBeInTheDocument();
-    expect(screen.getByRole('link', {name: 'Read more'})).toHaveAttribute(
-      'href',
-      broadcast.link
-    );
+    expect(screen.getByText(broadcast.message)).toBeInTheDocument();
 
     await userEvent.click(titleLink);
     expect(trackAnalytics).toHaveBeenCalledWith(
@@ -279,69 +275,9 @@ describe('WhatsNew', () => {
     );
   });
 
-  it('filters out duplicate titles and only shows the first occurrence', async () => {
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
-      match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
-      body: [
-        BroadcastFixture({id: '1', title: 'Duplicate Title', hasSeen: true}),
-        BroadcastFixture({id: '2', title: 'Duplicate Title', hasSeen: true}),
-        BroadcastFixture({id: '3', title: 'Unique Title', hasSeen: true}),
-      ],
-    });
-
-    render(<PrimaryNavigationWhatsNew />);
-
-    await userEvent.click(screen.getByRole('button', {name: "What's New"}));
-
-    expect(await screen.findByText('Duplicate Title')).toBeInTheDocument();
-    expect(screen.getAllByText('Duplicate Title')).toHaveLength(1);
-    expect(screen.getByText('Unique Title')).toBeInTheDocument();
-  });
-
-  it('marks unseen duplicate broadcasts as seen when the panel is opened', async () => {
-    jest.useFakeTimers();
-
-    MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
-      match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
-      body: [
-        BroadcastFixture({id: '1', title: 'Duplicate Title', hasSeen: false}),
-        BroadcastFixture({id: '2', title: 'Duplicate Title', hasSeen: false}),
-        BroadcastFixture({id: '3', title: 'Unique Title', hasSeen: true}),
-      ],
-    });
-
-    const putMock = MockApiClient.addMockResponse({
-      url: '/broadcasts/',
-      method: 'PUT',
-    });
-
-    render(<PrimaryNavigationWhatsNew />);
-
-    await userEvent.click(screen.getByRole('button', {name: "What's New"}), {
-      delay: null,
-    });
-
-    await screen.findByText('Duplicate Title');
-
-    act(() => jest.advanceTimersByTime(2000));
-
-    await waitFor(() => {
-      expect(putMock).toHaveBeenCalledWith(
-        '/broadcasts/',
-        expect.objectContaining({
-          method: 'PUT',
-          query: {id: ['1', '2']},
-          data: {hasSeen: '1'},
-        })
-      );
-    });
-  });
-
   it('renders broadcast items for each category type', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
+      url: `/organizations/org-slug/broadcasts/`,
       match: [MockApiClient.matchQuery({show: 'latest', limit: '3'})],
       body: [
         BroadcastFixture({id: '1', title: 'Broadcast 1', category: 'announcement'}),
diff --git a/static/app/views/navigation/primary/whatsNew.tsx b/static/app/views/navigation/primary/whatsNew.tsx
index 31ee82b2ee27..c515350868a3 100644
--- a/static/app/views/navigation/primary/whatsNew.tsx
+++ b/static/app/views/navigation/primary/whatsNew.tsx
@@ -1,4 +1,4 @@
-import {Fragment, useEffect, useMemo, useState} from 'react';
+import {Fragment, useEffect, useMemo} from 'react';
 
 import {Tag} from '@sentry/scraps/badge';
 import {Image} from '@sentry/scraps/image';
@@ -33,25 +33,6 @@ const BROADCAST_CATEGORIES: Record<NonNullable<Broadcast['category']>, string> =
   video: t('Video'),
 };
 
-function BroadcastImage({src, alt}: {alt: string; src: string}) {
-  const [loaded, setLoaded] = useState(false);
-
-  return (
-    <Fragment>
-      {!loaded && <Placeholder width="100%" height="140px" />}
-      <Image
-        width="100%"
-        src={src}
-        alt={alt}
-        radius="md"
-        loading="eager"
-        onLoad={() => setLoaded(true)}
-        style={loaded ? undefined : {display: 'none'}}
-      />
-    </Fragment>
-  );
-}
-
 function WhatsNewContent({
   unseenPostIds,
   isPending,
@@ -77,7 +58,7 @@ function WhatsNewContent({
       setApiQueryData<Broadcast[]>(
         queryClient,
         [
-          getApiUrl('/organizations/$organizationIdOrSlug/broadcasts/', {
+          getApiUrl(`/organizations/$organizationIdOrSlug/broadcasts/`, {
             path: {organizationIdOrSlug: organization.slug},
           }),
           {query: {show: 'latest', limit: '3'}},
@@ -162,23 +143,9 @@ function WhatsNewContent({
                   </Tag>
                 ) : null}
               </Flex>
-              <Text>
-                {item.message}{' '}
-                <ExternalLink
-                  href={item.link}
-                  onClick={() =>
-                    trackAnalytics('whats_new.link_clicked', {
-                      organization,
-                      title: item.title,
-                      category: item.category,
-                    })
-                  }
-                >
-                  {t('Read more')}
-                </ExternalLink>
-              </Text>
+              <Text>{item.message}</Text>
               {item.mediaUrl ? (
-                <BroadcastImage src={item.mediaUrl} alt={item.title} />
+                <Image width="100%" src={item.mediaUrl} alt={item.title} radius="md" />
               ) : null}
               {idx < broadcasts.length - 1 && <Stack.Separator />}
             </Stack>
@@ -193,7 +160,7 @@ export function PrimaryNavigationWhatsNew() {
   const organization = useOrganization();
   const {isPending, data: broadcasts} = useApiQuery<Broadcast[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/broadcasts/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/broadcasts/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {show: 'latest', limit: '3'}},
@@ -206,25 +173,14 @@ export function PrimaryNavigationWhatsNew() {
       refetchOnWindowFocus: true,
     }
   );
-  const allBroadcasts = useMemo(
-    () => (Array.isArray(broadcasts) ? broadcasts : []),
-    [broadcasts]
-  );
-
   const unseenPostIds = useMemo(
-    () => allBroadcasts.filter(item => !item.hasSeen).map(item => item.id),
-    [allBroadcasts]
+    () =>
+      (Array.isArray(broadcasts) ? broadcasts : [])
+        .filter(item => !item.hasSeen)
+        .map(item => item.id),
+    [broadcasts]
   );
 
-  const uniqueBroadcasts = useMemo(() => {
-    const seenTitles = new Set<string>();
-    return allBroadcasts.filter(item => {
-      if (seenTitles.has(item.title)) return false;
-      seenTitles.add(item.title);
-      return true;
-    });
-  }, [allBroadcasts]);
-
   const {
     isOpen,
     triggerProps: overlayTriggerProps,
@@ -247,7 +203,7 @@ export function PrimaryNavigationWhatsNew() {
           <WhatsNewContent
             unseenPostIds={unseenPostIds}
             isPending={isPending}
-            broadcasts={uniqueBroadcasts}
+            broadcasts={Array.isArray(broadcasts) ? broadcasts : []}
           />
         </PrimaryNavigation.ButtonOverlay>
       )}
diff --git a/static/app/views/navigation/secondary/components.spec.tsx b/static/app/views/navigation/secondary/components.spec.tsx
index 8f23238ec589..096b9274031d 100644
--- a/static/app/views/navigation/secondary/components.spec.tsx
+++ b/static/app/views/navigation/secondary/components.spec.tsx
@@ -36,27 +36,27 @@ function setupMocks() {
   ConfigStore.set('customerDomain', null);
 
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/broadcasts/',
+    url: `/organizations/org-slug/broadcasts/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/assistant/',
+    url: `/assistant/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/group-search-views/starred/',
+    url: `/organizations/org-slug/group-search-views/starred/`,
     body: [GroupSearchViewFixture({name: 'Starred View 1'})],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/issues-count/',
+    url: `/organizations/org-slug/issues-count/`,
     body: {},
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/explore/saved/',
+    url: `/organizations/org-slug/explore/saved/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/dashboards/',
+    url: `/organizations/org-slug/dashboards/`,
     body: [],
   });
 }
diff --git a/static/app/views/navigation/secondary/sections/explore/exploreSecondaryNavigation.spec.tsx b/static/app/views/navigation/secondary/sections/explore/exploreSecondaryNavigation.spec.tsx
index 6512ea0f3bca..1e060f7189b6 100644
--- a/static/app/views/navigation/secondary/sections/explore/exploreSecondaryNavigation.spec.tsx
+++ b/static/app/views/navigation/secondary/sections/explore/exploreSecondaryNavigation.spec.tsx
@@ -27,12 +27,12 @@ describe('ExploreSecondaryNavigation', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/broadcasts/',
+      url: `/organizations/org-slug/broadcasts/`,
       body: [],
     });
 
     MockApiClient.addMockResponse({
-      url: '/assistant/',
+      url: `/assistant/`,
       body: [],
     });
   });
diff --git a/static/app/views/navigation/secondary/sections/issues/issuesSecondaryNavigation.tsx b/static/app/views/navigation/secondary/sections/issues/issuesSecondaryNavigation.tsx
index 3831a7b417c2..1705e53df9a7 100644
--- a/static/app/views/navigation/secondary/sections/issues/issuesSecondaryNavigation.tsx
+++ b/static/app/views/navigation/secondary/sections/issues/issuesSecondaryNavigation.tsx
@@ -2,12 +2,7 @@ import {Fragment} from 'react';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 
-import {Badge} from '@sentry/scraps/badge';
-import {Link} from '@sentry/scraps/link';
-import {Text} from '@sentry/scraps/text';
-import {Tooltip} from '@sentry/scraps/tooltip';
-
-import {t, tct} from 'sentry/locale';
+import {t} from 'sentry/locale';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {makeAutomationBasePathname} from 'sentry/views/automations/pathnames';
 import {ISSUE_TAXONOMY_CONFIG} from 'sentry/views/issueList/taxonomies';
@@ -113,11 +108,11 @@ function ConfigureSection({baseUrl}: {baseUrl: string}) {
   const {layout} = usePrimaryNavigation();
   const isSticky = layout === 'sidebar';
 
-  const hasWorkflowEngineUI = organization.features.includes('workflow-engine-ui');
   const hasRedirectOptOut = organization.features.includes(
     'workflow-engine-redirect-opt-out'
   );
-  const shouldRedirectToWorkflowEngineUI = !hasRedirectOptOut && hasWorkflowEngineUI;
+  const shouldRedirectToWorkflowEngineUI =
+    !hasRedirectOptOut && organization.features.includes('workflow-engine-ui');
 
   const alertsLink = shouldRedirectToWorkflowEngineUI
     ? `${makeAutomationBasePathname(organization.slug)}?alertsRedirect=true`
@@ -138,29 +133,6 @@ function ConfigureSection({baseUrl}: {baseUrl: string}) {
               to={alertsLink}
               {...(!shouldRedirectToWorkflowEngineUI && {activeTo: `${baseUrl}/alerts/`})}
               analyticsItemName="issues_alerts"
-              trailingItems={
-                hasWorkflowEngineUI ? (
-                  <Tooltip
-                    isHoverable
-                    title={
-                      <Fragment>
-                        <Text as="p">{t('Alerts now live under Monitors.')}</Text>
-                        <Text as="p">
-                          {tct('See the [link:new Alerts page here.]', {
-                            link: (
-                              <Link
-                                to={`/organizations/${organization.slug}/monitors/alerts/`}
-                              />
-                            ),
-                          })}
-                        </Text>
-                      </Fragment>
-                    }
-                  >
-                    <Badge variant="muted">{t('Moved')}</Badge>
-                  </Tooltip>
-                ) : null
-              }
             >
               {t('Alerts')}
             </SecondaryNavigation.Link>
diff --git a/static/app/views/navigation/useRedirectNavigationV2Routes.tsx b/static/app/views/navigation/useRedirectNavigationV2Routes.tsx
index 8006eff5ba9d..ffacda6d76fa 100644
--- a/static/app/views/navigation/useRedirectNavigationV2Routes.tsx
+++ b/static/app/views/navigation/useRedirectNavigationV2Routes.tsx
@@ -1,11 +1,11 @@
 import {useEffect} from 'react';
-import {useMatches} from 'react-router-dom';
 import * as Sentry from '@sentry/react';
 
 import {USING_CUSTOMER_DOMAIN} from 'sentry/constants';
 import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {useLastKnownRoute} from 'sentry/views/lastKnownRouteContextProvider';
 
 type Props = {
@@ -32,8 +32,8 @@ function useShouldRedirect(oldPathPrefix: `/${string}`) {
  */
 function useLogUnexpectedNavigationRedirect({shouldRedirect}: {shouldRedirect: boolean}) {
   const lastKnownRoute = useLastKnownRoute();
-  const matches = useMatches();
-  const routeString = getRouteStringFromRoutes({matches});
+  const route = useRoutes();
+  const routeString = getRouteStringFromRoutes(route);
 
   useEffect(() => {
     if (shouldRedirect && lastKnownRoute !== routeString) {
diff --git a/static/app/views/onboarding/components/firstEventFooter.tsx b/static/app/views/onboarding/components/firstEventFooter.tsx
index f5b38b7743e2..bc49c4566ca0 100644
--- a/static/app/views/onboarding/components/firstEventFooter.tsx
+++ b/static/app/views/onboarding/components/firstEventFooter.tsx
@@ -38,7 +38,7 @@ export function FirstEventFooter({
 
   const {data: issues} = useApiQuery<Group[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/issues/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/issues/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
       }),
     ],
diff --git a/static/app/views/onboarding/components/useScmPlatformDetection.ts b/static/app/views/onboarding/components/useScmPlatformDetection.ts
index b1efcaeaadca..e9d9b6d871a3 100644
--- a/static/app/views/onboarding/components/useScmPlatformDetection.ts
+++ b/static/app/views/onboarding/components/useScmPlatformDetection.ts
@@ -20,7 +20,7 @@ export function useScmPlatformDetection(repoId: string | undefined) {
 
   const query = useQuery({
     queryKey: [
-      getApiUrl('/organizations/$organizationIdOrSlug/repos/$repoId/platforms/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/repos/$repoId/platforms/`, {
         path: {
           organizationIdOrSlug: organization.slug,
           repoId: repoId!,
diff --git a/static/app/views/onboarding/components/useScmRepoSearch.ts b/static/app/views/onboarding/components/useScmRepoSearch.ts
index 9d47285e4255..378c20be1314 100644
--- a/static/app/views/onboarding/components/useScmRepoSearch.ts
+++ b/static/app/views/onboarding/components/useScmRepoSearch.ts
@@ -18,7 +18,7 @@ export function useScmRepoSearch(integrationId: string, selectedRepo?: Repositor
   const searchQuery = useQuery({
     queryKey: [
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/integrations/$integrationId/repos/',
+        `/organizations/$organizationIdOrSlug/integrations/$integrationId/repos/`,
         {
           path: {
             organizationIdOrSlug: organization.slug,
diff --git a/static/app/views/onboarding/onboarding.spec.tsx b/static/app/views/onboarding/onboarding.spec.tsx
index 332b6fe20a07..931b526d6b01 100644
--- a/static/app/views/onboarding/onboarding.spec.tsx
+++ b/static/app/views/onboarding/onboarding.spec.tsx
@@ -995,7 +995,7 @@ describe('Onboarding', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/javascript-react-slug/keys/',
+      url: `/projects/org-slug/javascript-react-slug/keys/`,
       method: 'GET',
       body: [ProjectKeysFixture()[0]],
     });
diff --git a/static/app/views/onboarding/onboarding.tsx b/static/app/views/onboarding/onboarding.tsx
index 6407165f8526..b92c9bb1ce7f 100644
--- a/static/app/views/onboarding/onboarding.tsx
+++ b/static/app/views/onboarding/onboarding.tsx
@@ -3,10 +3,9 @@ import styled from '@emotion/styled';
 import {AnimatePresence, motion} from 'framer-motion';
 
 import {Button} from '@sentry/scraps/button';
-import {Container, Stack} from '@sentry/scraps/layout';
+import {Stack} from '@sentry/scraps/layout';
 import {Link} from '@sentry/scraps/link';
 
-import {AnimatedSentryLogo} from 'sentry/components/animatedSentryLogo';
 import Hook from 'sentry/components/hook';
 import {LogoSentry} from 'sentry/components/logoSentry';
 import {
@@ -101,16 +100,6 @@ const scmOnboardingSteps: StepDescriptor[] = [
   },
 ];
 
-/**
- * The SCM steps that display the animated logo progress indicator.
- * Order determines the progress level (first = 0, last = 1).
- */
-const SCM_LOGO_STEPS = [
-  OnboardingStepId.SCM_CONNECT,
-  OnboardingStepId.SCM_PLATFORM_FEATURES,
-  OnboardingStepId.SCM_PROJECT_DETAILS,
-];
-
 function WelcomeVariable(props: StepProps) {
   const hasNewWelcomeUI = useHasNewWelcomeUI();
 
@@ -127,9 +116,7 @@ interface ContainerVariableProps {
 
 function ContainerVariable(props: PropsWithChildren<ContainerVariableProps>) {
   const newWelcomeUIStep = props.hasNewWelcomeUI && props.id === OnboardingStepId.WELCOME;
-  const Component = newWelcomeUIStep
-    ? OnboardingContainerNewWelcomeUI
-    : OnboardingContainer;
+  const Component = newWelcomeUIStep ? ContainerNewWelcomeUI : Container;
 
   return (
     <Component hasFooter={props.hasFooter || newWelcomeUIStep}>
@@ -302,7 +289,7 @@ export function OnboardingWithoutContext() {
           onboardingContext.setSelectedPlatform(undefined);
           activateSidebar({
             userClicked: false,
-            source: 'targeted_onboarding_select_platform_skip',
+            source: `targeted_onboarding_select_platform_skip`,
           });
         }}
         to={normalizeUrl(
@@ -314,12 +301,6 @@ export function OnboardingWithoutContext() {
     );
   };
 
-  const scmLogoIndex = stepObj ? SCM_LOGO_STEPS.indexOf(stepObj.id) : -1;
-  const scmLogoProgress =
-    scmLogoIndex >= 0 && SCM_LOGO_STEPS.length > 1
-      ? scmLogoIndex / (SCM_LOGO_STEPS.length - 1)
-      : null;
-
   // Redirect to the first step if we end up in an invalid state
   const isInvalidDocsStep = stepId === 'setup-docs' && !projectSlug;
   if (!stepObj || stepIndex === -1 || isInvalidDocsStep) {
@@ -389,11 +370,6 @@ export function OnboardingWithoutContext() {
             </Button>
           </BackMotionDiv>
         )}
-        {scmLogoProgress !== null && (
-          <Container alignSelf="center">
-            <AnimatedSentryLogo progress={scmLogoProgress} />
-          </Container>
-        )}
         <AnimatePresence mode="wait" onExitComplete={updateAnimationState}>
           <OnboardingStepVariable id={stepObj.id} hasNewWelcomeUI={hasNewWelcomeUI}>
             {stepObj.Component && (
@@ -424,7 +400,7 @@ function Onboarding() {
   );
 }
 
-const OnboardingContainerNewWelcomeUI = styled('div')<{hasFooter: boolean}>`
+const ContainerNewWelcomeUI = styled('div')<{hasFooter: boolean}>`
   flex-grow: 1;
   display: flex;
   flex-direction: column;
@@ -443,7 +419,7 @@ const OnboardingContainerNewWelcomeUI = styled('div')<{hasFooter: boolean}>`
   }
 `;
 
-const OnboardingContainer = styled('div')<{hasFooter: boolean}>`
+const Container = styled('div')<{hasFooter: boolean}>`
   flex-grow: 1;
   display: flex;
   flex-direction: column;
diff --git a/static/app/views/onboarding/setupDocs.spec.tsx b/static/app/views/onboarding/setupDocs.spec.tsx
index 8c11c742c827..38a62b719cdc 100644
--- a/static/app/views/onboarding/setupDocs.spec.tsx
+++ b/static/app/views/onboarding/setupDocs.spec.tsx
@@ -154,7 +154,7 @@ describe('Onboarding Setup Docs', () => {
                 ],
               },
             },
-            route: '/onboarding/:orgId/setup-docs/',
+            route: `/onboarding/:orgId/setup-docs/`,
           },
         }
       );
@@ -199,7 +199,7 @@ describe('Onboarding Setup Docs', () => {
               pathname: `/onboarding/${organization.slug}/setup-docs/`,
               query: {product: [ProductSolution.PERFORMANCE_MONITORING]},
             },
-            route: '/onboarding/:orgId/setup-docs/',
+            route: `/onboarding/:orgId/setup-docs/`,
           },
         }
       );
@@ -240,7 +240,7 @@ describe('Onboarding Setup Docs', () => {
               pathname: `/onboarding/${organization.slug}/setup-docs/`,
               query: {product: [ProductSolution.SESSION_REPLAY]},
             },
-            route: '/onboarding/:orgId/setup-docs/',
+            route: `/onboarding/:orgId/setup-docs/`,
           },
         }
       );
@@ -281,7 +281,7 @@ describe('Onboarding Setup Docs', () => {
               pathname: `/onboarding/${organization.slug}/setup-docs/`,
               query: {product: []},
             },
-            route: '/onboarding/:orgId/setup-docs/',
+            route: `/onboarding/:orgId/setup-docs/`,
           },
         }
       );
@@ -341,7 +341,7 @@ describe('Onboarding Setup Docs', () => {
                 installationMode: 'auto',
               },
             },
-            route: '/onboarding/:orgId/setup-docs/',
+            route: `/onboarding/:orgId/setup-docs/`,
           },
         }
       );
diff --git a/static/app/views/organizationContext.spec.tsx b/static/app/views/organizationContext.spec.tsx
index 97741833da76..8794382d8d31 100644
--- a/static/app/views/organizationContext.spec.tsx
+++ b/static/app/views/organizationContext.spec.tsx
@@ -190,7 +190,7 @@ describe('OrganizationContext', () => {
         initialRouterConfig: {
           route: '/organizations/',
           location: {
-            pathname: '/organizations/',
+            pathname: `/organizations/`,
           },
         },
       }
diff --git a/static/app/views/organizationCreate/index.tsx b/static/app/views/organizationCreate/index.tsx
index b05266df73ae..70ad5a6306d1 100644
--- a/static/app/views/organizationCreate/index.tsx
+++ b/static/app/views/organizationCreate/index.tsx
@@ -41,7 +41,7 @@ function OrganizationCreate() {
   const termsUrl = ConfigStore.get('termsUrl');
   const privacyUrl = ConfigStore.get('privacyUrl');
   const isSelfHosted = ConfigStore.get('isSelfHosted');
-  const relocationUrl = normalizeUrl('/relocation/');
+  const relocationUrl = normalizeUrl(`/relocation/`);
   const regionChoices = getRegionChoices();
   const client = useApi();
 
diff --git a/static/app/views/organizationRestore/index.tsx b/static/app/views/organizationRestore/index.tsx
index 53b53b8d521e..ff0e238e43d4 100644
--- a/static/app/views/organizationRestore/index.tsx
+++ b/static/app/views/organizationRestore/index.tsx
@@ -36,7 +36,7 @@ type BodyProps = {
 };
 
 function OrganizationRestoreBody({orgSlug}: BodyProps) {
-  const endpoint = getApiUrl('/organizations/$organizationIdOrSlug/', {
+  const endpoint = getApiUrl(`/organizations/$organizationIdOrSlug/`, {
     path: {organizationIdOrSlug: orgSlug},
   });
   const {isPending, isError, data} = useApiQuery<Organization>([endpoint], {
diff --git a/static/app/views/organizationStats/organizationStatsWrapper.tsx b/static/app/views/organizationStats/organizationStatsWrapper.tsx
index f0b3a2082f12..da70ff5b3c9b 100644
--- a/static/app/views/organizationStats/organizationStatsWrapper.tsx
+++ b/static/app/views/organizationStats/organizationStatsWrapper.tsx
@@ -8,7 +8,7 @@ import {useRedirectNavigationV2Routes} from 'sentry/views/navigation/useRedirect
 export function OrganizationStatsWrapper() {
   const redirectPath = useRedirectNavigationV2Routes({
     oldPathPrefix: '/stats/',
-    newPathPrefix: '/settings/stats/',
+    newPathPrefix: `/settings/stats/`,
   });
 
   if (redirectPath) {
diff --git a/static/app/views/organizationStats/teamInsights/health.spec.tsx b/static/app/views/organizationStats/teamInsights/health.spec.tsx
index f6543a769d6c..b10064051599 100644
--- a/static/app/views/organizationStats/teamInsights/health.spec.tsx
+++ b/static/app/views/organizationStats/teamInsights/health.spec.tsx
@@ -49,22 +49,22 @@ describe('TeamStatsHealth', () => {
 
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/projects/',
+      url: `/organizations/org-slug/projects/`,
       body: [],
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/key-transactions-list/',
+      url: `/organizations/org-slug/key-transactions-list/`,
       body: [],
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/legacy-key-transactions-count/',
+      url: `/organizations/org-slug/legacy-key-transactions-count/`,
       body: [],
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/sessions/',
+      url: `/organizations/org-slug/sessions/`,
       body: {
         start: '2021-10-30T00:00:00Z',
         end: '2021-12-24T00:00:00Z',
diff --git a/static/app/views/organizationStats/teamInsights/issues.spec.tsx b/static/app/views/organizationStats/teamInsights/issues.spec.tsx
index 2a9f34c44ecb..4051dd106d9d 100644
--- a/static/app/views/organizationStats/teamInsights/issues.spec.tsx
+++ b/static/app/views/organizationStats/teamInsights/issues.spec.tsx
@@ -61,7 +61,7 @@ describe('TeamStatsIssues', () => {
 
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/projects/',
+      url: `/organizations/org-slug/projects/`,
       body: [],
     });
     MockApiClient.addMockResponse({
diff --git a/static/app/views/organizationStats/teamInsights/issues.tsx b/static/app/views/organizationStats/teamInsights/issues.tsx
index 3805ab1911fa..bb9e4e951e05 100644
--- a/static/app/views/organizationStats/teamInsights/issues.tsx
+++ b/static/app/views/organizationStats/teamInsights/issues.tsx
@@ -145,7 +145,7 @@ export default function TeamStatsIssues() {
             <DescriptionCard
               title={t('Time to Resolution')}
               description={t(
-                'The mean time it took for issues to be resolved by your team.'
+                `The mean time it took for issues to be resolved by your team.`
               )}
             >
               <TeamResolutionTime
diff --git a/static/app/views/organizationStats/teamInsights/teamAlertsTriggered.tsx b/static/app/views/organizationStats/teamInsights/teamAlertsTriggered.tsx
index 55df0f1750fd..5f4ab9885706 100644
--- a/static/app/views/organizationStats/teamInsights/teamAlertsTriggered.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamAlertsTriggered.tsx
@@ -57,7 +57,7 @@ export function TeamAlertsTriggered({
     refetch: refetchAlertsTriggered,
   } = useApiQuery<AlertsTriggered>(
     [
-      getApiUrl('/teams/$organizationIdOrSlug/$teamIdOrSlug/alerts-triggered/', {
+      getApiUrl(`/teams/$organizationIdOrSlug/$teamIdOrSlug/alerts-triggered/`, {
         path: {organizationIdOrSlug: organization.slug, teamIdOrSlug: teamSlug},
       }),
       {
@@ -76,7 +76,7 @@ export function TeamAlertsTriggered({
     refetch: refetchAlertsTriggeredRule,
   } = useApiQuery<AlertsTriggeredRule[]>(
     [
-      getApiUrl('/teams/$organizationIdOrSlug/$teamIdOrSlug/alerts-triggered-index/', {
+      getApiUrl(`/teams/$organizationIdOrSlug/$teamIdOrSlug/alerts-triggered-index/`, {
         path: {organizationIdOrSlug: organization.slug, teamIdOrSlug: teamSlug},
       }),
       {
@@ -163,7 +163,7 @@ export function TeamAlertsTriggered({
               priority="primary"
               size="sm"
               to={makeAlertsPathname({
-                path: '/rules/',
+                path: `/rules/`,
                 organization,
               })}
             >
diff --git a/static/app/views/organizationStats/teamInsights/teamIssuesAge.tsx b/static/app/views/organizationStats/teamInsights/teamIssuesAge.tsx
index a8ce84d706a7..51036e76bf66 100644
--- a/static/app/views/organizationStats/teamInsights/teamIssuesAge.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamIssuesAge.tsx
@@ -60,7 +60,7 @@ export function TeamIssuesAge({organization, teamSlug}: TeamIssuesAgeProps) {
     refetch: refetchOldestIssues,
   } = useApiQuery<Group[]>(
     [
-      getApiUrl('/teams/$organizationIdOrSlug/$teamIdOrSlug/issues/old/', {
+      getApiUrl(`/teams/$organizationIdOrSlug/$teamIdOrSlug/issues/old/`, {
         path: {organizationIdOrSlug: organization.slug, teamIdOrSlug: teamSlug},
       }),
       {
@@ -79,7 +79,7 @@ export function TeamIssuesAge({organization, teamSlug}: TeamIssuesAgeProps) {
     refetch: refetchUnresolvedIssueAge,
   } = useApiQuery<Record<string, number>>(
     [
-      getApiUrl('/teams/$organizationIdOrSlug/$teamIdOrSlug/unresolved-issue-age/', {
+      getApiUrl(`/teams/$organizationIdOrSlug/$teamIdOrSlug/unresolved-issue-age/`, {
         path: {organizationIdOrSlug: organization.slug, teamIdOrSlug: teamSlug},
       }),
     ],
diff --git a/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx b/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx
index f2b02a17202f..80c9c291733d 100644
--- a/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamIssuesBreakdown.tsx
@@ -79,7 +79,7 @@ export function TeamIssuesBreakdown({
     refetch,
   } = useApiQuery<IssuesBreakdown>(
     [
-      getApiUrl('/teams/$organizationIdOrSlug/$teamIdOrSlug/issue-breakdown/', {
+      getApiUrl(`/teams/$organizationIdOrSlug/$teamIdOrSlug/issue-breakdown/`, {
         path: {organizationIdOrSlug: organization.slug, teamIdOrSlug: teamSlug},
       }),
       {
diff --git a/static/app/views/organizationStats/teamInsights/teamMisery.spec.tsx b/static/app/views/organizationStats/teamInsights/teamMisery.spec.tsx
index 224bc0ac7521..4ca07f4de2ea 100644
--- a/static/app/views/organizationStats/teamInsights/teamMisery.spec.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamMisery.spec.tsx
@@ -42,7 +42,7 @@ describe('TeamMisery', () => {
     }));
 
     const weekMisery = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       body: {
         meta,
         data: [
@@ -62,7 +62,7 @@ describe('TeamMisery', () => {
       match: [MockApiClient.matchQuery({statsPeriod: '7d'})],
     });
     const periodMisery = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       body: {
         meta,
         data: [
@@ -127,7 +127,7 @@ describe('TeamMisery', () => {
 
   it('should render empty state on error', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       statusCode: 500,
       body: {},
     });
diff --git a/static/app/views/organizationStats/teamInsights/teamMisery.tsx b/static/app/views/organizationStats/teamInsights/teamMisery.tsx
index 5cd379ff7e09..2850f670bbc2 100644
--- a/static/app/views/organizationStats/teamInsights/teamMisery.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamMisery.tsx
@@ -157,7 +157,7 @@ function TeamMisery({
                   <ScoreWrapper>
                     {trendValue === 0 ? (
                       <SubText>
-                        {'0\u0025 '}
+                        {`0\u0025 `}
                         {t('change')}
                       </SubText>
                     ) : (
diff --git a/static/app/views/organizationStats/teamInsights/teamReleases.spec.tsx b/static/app/views/organizationStats/teamInsights/teamReleases.spec.tsx
index 40539995a5d8..fefe3f951283 100644
--- a/static/app/views/organizationStats/teamInsights/teamReleases.spec.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamReleases.spec.tsx
@@ -17,7 +17,7 @@ describe('TeamReleases', () => {
     const project = ProjectFixture({id: '123'});
 
     const releaseCountApi = MockApiClient.addMockResponse({
-      url: '/teams/org-slug/team-slug/release-count/',
+      url: `/teams/org-slug/team-slug/release-count/`,
       body: TeamReleaseCountsFixture(),
     });
 
@@ -39,7 +39,7 @@ describe('TeamReleases', () => {
 
   it('should render no release counts', async () => {
     MockApiClient.addMockResponse({
-      url: '/teams/org-slug/team-slug/release-count/',
+      url: `/teams/org-slug/team-slug/release-count/`,
       body: TeamReleaseCountsFixture(),
     });
     const team = TeamFixture();
@@ -65,7 +65,7 @@ describe('TeamReleases', () => {
     const projectB = ProjectFixture({id: '234', slug: 'other-project-slug'});
 
     const releaseCountApi = MockApiClient.addMockResponse({
-      url: '/teams/org-slug/team-slug/release-count/',
+      url: `/teams/org-slug/team-slug/release-count/`,
       body: TeamReleaseCountsFixture(),
     });
 
diff --git a/static/app/views/organizationStats/teamInsights/teamReleases.tsx b/static/app/views/organizationStats/teamInsights/teamReleases.tsx
index 45fe238c5b19..187d22620eda 100644
--- a/static/app/views/organizationStats/teamInsights/teamReleases.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamReleases.tsx
@@ -58,7 +58,7 @@ export function TeamReleases({
     refetch: refetchPeriodReleases,
   } = useApiQuery<ProjectReleaseCount>(
     [
-      getApiUrl('/teams/$organizationIdOrSlug/$teamIdOrSlug/release-count/', {
+      getApiUrl(`/teams/$organizationIdOrSlug/$teamIdOrSlug/release-count/`, {
         path: {organizationIdOrSlug: organization.slug, teamIdOrSlug: teamSlug},
       }),
       {
@@ -77,7 +77,7 @@ export function TeamReleases({
     refetch: refetchWeekReleases,
   } = useApiQuery<ProjectReleaseCount>(
     [
-      getApiUrl('/teams/$organizationIdOrSlug/$teamIdOrSlug/release-count/', {
+      getApiUrl(`/teams/$organizationIdOrSlug/$teamIdOrSlug/release-count/`, {
         path: {organizationIdOrSlug: organization.slug, teamIdOrSlug: teamSlug},
       }),
       {
diff --git a/static/app/views/organizationStats/teamInsights/teamResolutionTime.tsx b/static/app/views/organizationStats/teamInsights/teamResolutionTime.tsx
index 911b3f3aa9af..ae6396749baf 100644
--- a/static/app/views/organizationStats/teamInsights/teamResolutionTime.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamResolutionTime.tsx
@@ -39,7 +39,7 @@ export function TeamResolutionTime({
     refetch,
   } = useApiQuery<TimeToResolution>(
     [
-      getApiUrl('/teams/$organizationIdOrSlug/$teamIdOrSlug/time-to-resolution/', {
+      getApiUrl(`/teams/$organizationIdOrSlug/$teamIdOrSlug/time-to-resolution/`, {
         path: {organizationIdOrSlug: organization.slug, teamIdOrSlug: teamSlug},
       }),
       {
diff --git a/static/app/views/organizationStats/teamInsights/teamStability.spec.tsx b/static/app/views/organizationStats/teamInsights/teamStability.spec.tsx
index 608d5d68aee4..3531df83995e 100644
--- a/static/app/views/organizationStats/teamInsights/teamStability.spec.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamStability.spec.tsx
@@ -11,7 +11,7 @@ describe('TeamStability', () => {
   beforeEach(() => {
     MockApiClient.clearMockResponses();
     sessionsApi = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/sessions/',
+      url: `/organizations/org-slug/sessions/`,
       body: SessionStatusCountByProjectInPeriodFixture(),
     });
   });
diff --git a/static/app/views/organizationStats/teamInsights/teamStability.tsx b/static/app/views/organizationStats/teamInsights/teamStability.tsx
index badc218606b9..b23976328e8f 100644
--- a/static/app/views/organizationStats/teamInsights/teamStability.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamStability.tsx
@@ -56,7 +56,7 @@ export function TeamStability({
     refetch: refetchPeriodSessions,
   } = useApiQuery<SessionApiResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sessions/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sessions/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -76,7 +76,7 @@ export function TeamStability({
     refetch: refetchWeekSessions,
   } = useApiQuery<SessionApiResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sessions/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sessions/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx b/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
index 4f7a3b1bc67e..d9e7138078c9 100644
--- a/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
+++ b/static/app/views/organizationStats/teamInsights/teamUnresolvedIssues.tsx
@@ -53,7 +53,7 @@ export function TeamUnresolvedIssues({
     refetch,
   } = useApiQuery<ProjectReleaseCount>(
     [
-      getApiUrl('/teams/$organizationIdOrSlug/$teamIdOrSlug/all-unresolved-issues/', {
+      getApiUrl(`/teams/$organizationIdOrSlug/$teamIdOrSlug/all-unresolved-issues/`, {
         path: {organizationIdOrSlug: organization.slug, teamIdOrSlug: teamSlug},
       }),
       {
diff --git a/static/app/views/organizationStats/usageStatsOrg.tsx b/static/app/views/organizationStats/usageStatsOrg.tsx
index df884be5f5cf..96ef559fa0b8 100644
--- a/static/app/views/organizationStats/usageStatsOrg.tsx
+++ b/static/app/views/organizationStats/usageStatsOrg.tsx
@@ -372,7 +372,7 @@ export function UsageStatsOrganization({
 
   const orgStatsReponse = useApiQuery<UsageSeries | undefined>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/stats_v2/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/stats_v2/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/organizationStats/usageStatsPerMin.tsx b/static/app/views/organizationStats/usageStatsPerMin.tsx
index 0ba0d60addf3..0fc51e3e5e3d 100644
--- a/static/app/views/organizationStats/usageStatsPerMin.tsx
+++ b/static/app/views/organizationStats/usageStatsPerMin.tsx
@@ -39,7 +39,7 @@ export function UsageStatsPerMin({
     isError,
   } = useApiQuery<UsageSeries>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/stats_v2/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/stats_v2/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/organizationStats/usageStatsProjects.tsx b/static/app/views/organizationStats/usageStatsProjects.tsx
index 241142d48d40..c2695c8dfc07 100644
--- a/static/app/views/organizationStats/usageStatsProjects.tsx
+++ b/static/app/views/organizationStats/usageStatsProjects.tsx
@@ -119,7 +119,7 @@ export function UsageStatsProjects({
     isPending: loading,
   } = useApiQuery<UsageSeries>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/stats_v2/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/stats_v2/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/performance/landing/metricsDataSwitcherAlert.tsx b/static/app/views/performance/landing/metricsDataSwitcherAlert.tsx
index 947a4465d6da..291dfec0ab58 100644
--- a/static/app/views/performance/landing/metricsDataSwitcherAlert.tsx
+++ b/static/app/views/performance/landing/metricsDataSwitcherAlert.tsx
@@ -123,7 +123,7 @@ export function MetricsDataSwitcherAlert(
               data-test-id="landing-mep-alert-multi-project-all-incompatible"
             >
               {tct(
-                'A few projects are incompatible with dynamic sampling. To enable this feature [updateSDK].',
+                `A few projects are incompatible with dynamic sampling. To enable this feature [updateSDK].`,
                 {
                   updateSDK,
                 }
@@ -139,7 +139,7 @@ export function MetricsDataSwitcherAlert(
             data-test-id="landing-mep-alert-multi-project-incompatible"
           >
             {tct(
-              'A few projects are incompatible with dynamic sampling. You can either [updateSDK] or [onlyViewCompatible]',
+              `A few projects are incompatible with dynamic sampling. You can either [updateSDK] or [onlyViewCompatible]`,
               {
                 updateSDK,
                 onlyViewCompatible: (
@@ -161,7 +161,7 @@ export function MetricsDataSwitcherAlert(
           data-test-id="landing-mep-alert-single-project-incompatible"
         >
           {tct(
-            'Your project has an outdated SDK which is incompatible with dynamic sampling. To enable this feature [updateSDK].',
+            `Your project has an outdated SDK which is incompatible with dynamic sampling. To enable this feature [updateSDK].`,
             {
               updateSDK,
             }
@@ -178,7 +178,7 @@ export function MetricsDataSwitcherAlert(
         <Alert.Container>
           <Alert variant="warning" data-test-id="landing-mep-alert-unnamed-discover">
             {tct(
-              'You have some unparameterized transactions which are incompatible with dynamic sampling. You can [discover]',
+              `You have some unparameterized transactions which are incompatible with dynamic sampling. You can [discover]`,
               {
                 discover,
               }
@@ -192,7 +192,7 @@ export function MetricsDataSwitcherAlert(
       <Alert.Container>
         <Alert variant="warning" data-test-id="landing-mep-alert-unnamed-discover-or-set">
           {tct(
-            'You have some unparameterized transactions which are incompatible with dynamic sampling. You can either [setNames] or [discover]',
+            `You have some unparameterized transactions which are incompatible with dynamic sampling. You can either [setNames] or [discover]`,
             {
               setNames: (
                 <ExternalLink href={docsLink}>{t('set names manually')}</ExternalLink>
diff --git a/static/app/views/performance/landing/queryBatcher.spec.tsx b/static/app/views/performance/landing/queryBatcher.spec.tsx
index eb18012d6c74..ec4b6fc1583e 100644
--- a/static/app/views/performance/landing/queryBatcher.spec.tsx
+++ b/static/app/views/performance/landing/queryBatcher.spec.tsx
@@ -74,7 +74,7 @@ describe('Performance > Widgets > Query Batching', () => {
 
     eventStatsMock = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-stats/',
+      url: `/organizations/org-slug/events-stats/`,
       body: {
         'epm()': {
           data: [
diff --git a/static/app/views/performance/landing/widgets/components/widgetContainer.spec.tsx b/static/app/views/performance/landing/widgets/components/widgetContainer.spec.tsx
index faedbf529de5..eb029931ce97 100644
--- a/static/app/views/performance/landing/widgets/components/widgetContainer.spec.tsx
+++ b/static/app/views/performance/landing/widgets/components/widgetContainer.spec.tsx
@@ -80,17 +80,17 @@ describe('Performance > Widgets > WidgetContainer', () => {
     ConfigStore.init();
     eventStatsMock = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-stats/',
+      url: `/organizations/org-slug/events-stats/`,
       body: [],
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-timeseries/',
+      url: `/organizations/org-slug/events-timeseries/`,
       body: {},
     });
     eventsMock = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       body: {
         data: [{}],
         meta: {},
@@ -99,7 +99,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
     });
     issuesListMock = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       body: {
         data: [
           {
@@ -123,13 +123,13 @@ describe('Performance > Widgets > WidgetContainer', () => {
 
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/metrics-compatibility/',
+      url: `/organizations/org-slug/metrics-compatibility/`,
       body: [],
     });
 
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/metrics-compatibility-sums/',
+      url: `/organizations/org-slug/metrics-compatibility-sums/`,
       body: [],
     });
   });
@@ -279,7 +279,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
 
     eventStatsMock = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-stats/',
+      url: `/organizations/org-slug/events-stats/`,
       statusCode: 400,
       body: {
         detail: 'Request did not work :(',
@@ -287,7 +287,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-timeseries/',
+      url: `/organizations/org-slug/events-timeseries/`,
       statusCode: 400,
       body: {
         detail: 'Request did not work :(',
@@ -383,7 +383,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
 
     eventStatsMock = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-stats/',
+      url: `/organizations/org-slug/events-stats/`,
       body: {
         data: [],
         isMetricsData: true,
@@ -391,7 +391,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-timeseries/',
+      url: `/organizations/org-slug/events-timeseries/`,
       body: {
         timeSeries: [],
       },
@@ -399,7 +399,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
 
     eventsMock = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       body: {
         data: [{}],
         meta: {isMetricsData: true},
@@ -445,7 +445,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
 
     eventStatsMock = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-stats/',
+      url: `/organizations/org-slug/events-stats/`,
       body: {
         data: [],
         isMetricsData: undefined,
@@ -453,7 +453,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-timeseries/',
+      url: `/organizations/org-slug/events-timeseries/`,
       body: {
         timeSeries: [],
       },
@@ -487,7 +487,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
 
     eventStatsMock = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-stats/',
+      url: `/organizations/org-slug/events-stats/`,
       body: {
         data: [],
         isMetricsData: false,
@@ -495,7 +495,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events-timeseries/',
+      url: `/organizations/org-slug/events-timeseries/`,
       body: {
         timeSeries: [],
       },
@@ -503,7 +503,7 @@ describe('Performance > Widgets > WidgetContainer', () => {
 
     eventsMock = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/events/',
+      url: `/organizations/org-slug/events/`,
       body: {
         data: [{}],
         meta: {isMetricsData: false},
diff --git a/static/app/views/performance/landing/widgets/widgetDefinitions.tsx b/static/app/views/performance/landing/widgets/widgetDefinitions.tsx
index 07bfa71e9feb..d6641b244e33 100644
--- a/static/app/views/performance/landing/widgets/widgetDefinitions.tsx
+++ b/static/app/views/performance/landing/widgets/widgetDefinitions.tsx
@@ -159,7 +159,7 @@ export const WIDGET_DEFINITIONS: ({
     },
     [PerformanceWidgetSetting.USER_MISERY_AREA]: {
       title: t('User Misery'),
-      fields: ['user_misery()'],
+      fields: [`user_misery()`],
       dataType: GenericPerformanceWidgetDataType.AREA,
       chartColor: theme.chart.getColorPalette(0)[0],
       allowsOpenInDiscover: true,
@@ -194,48 +194,48 @@ export const WIDGET_DEFINITIONS: ({
     },
     [PerformanceWidgetSetting.MOST_RELATED_ERRORS]: {
       title: t('Most Related Errors'),
-      fields: ['failure_count()'],
+      fields: [`failure_count()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
       chartColor: theme.chart.getColorPalette(0)[0],
     },
     [PerformanceWidgetSetting.MOST_RELATED_ISSUES]: {
       title: t('Most Related Issues'),
-      fields: ['count()'],
+      fields: [`count()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
       chartColor: theme.chart.getColorPalette(0)[0],
     },
     [PerformanceWidgetSetting.MOST_TIME_SPENT_DB_QUERIES]: {
       title: `${t('Most Time-Consuming')} ${QUERIES_DATA_TYPE_PLURAL}`,
       subTitle: t('Top queries by total duration'),
-      fields: ['time_spent_percentage()'],
+      fields: [`time_spent_percentage()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
       chartColor: theme.chart.getColorPalette(0)[0],
     },
     [PerformanceWidgetSetting.MOST_TIME_CONSUMING_RESOURCES]: {
       title: `${t('Most Time-Consuming')} ${RESOURCES_DATA_TYPE_PLURAL}`,
       subTitle: t('Render blocking for pages'),
-      fields: ['time_spent_percentage()'],
+      fields: [`time_spent_percentage()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
       chartColor: theme.chart.getColorPalette(0)[0],
     },
     [PerformanceWidgetSetting.HIGHEST_CACHE_MISS_RATE_TRANSACTIONS]: {
       title: t('Highest Cache Miss Rates'),
       subTitle: t('Suggested Transactions'),
-      fields: ['cache_miss_rate()'],
+      fields: [`cache_miss_rate()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
       chartColor: theme.chart.getColorPalette(0)[0],
     },
     [PerformanceWidgetSetting.MOST_TIME_CONSUMING_DOMAINS]: {
       title: t('Most Time-Consuming Domains'),
       subTitle: t('Top outgoing HTTP request domains by time spent'),
-      fields: ['time_spent_percentage()'],
+      fields: [`time_spent_percentage()`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
       chartColor: theme.chart.getColorPalette(0)[0],
     },
     [PerformanceWidgetSetting.HIGHEST_OPPORTUNITY_PAGES]: {
       title: t('Best Page Opportunities'),
       subTitle: t('Pages to improve your performance score'),
-      fields: ['count()'],
+      fields: [`count()`],
       dataType: GenericPerformanceWidgetDataType.PERFORMANCE_SCORE_LIST,
     },
     [PerformanceWidgetSetting.OVERALL_PERFORMANCE_SCORE]: {
@@ -246,25 +246,25 @@ export const WIDGET_DEFINITIONS: ({
     },
     [PerformanceWidgetSetting.SLOW_HTTP_OPS]: {
       title: t('Slow HTTP Ops'),
-      fields: ['p75(spans.http)', 'p75(spans.db)'],
+      fields: [`p75(spans.http)`, 'p75(spans.db)'],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
       chartColor: theme.chart.getColorPalette(0)[0],
     },
     [PerformanceWidgetSetting.SLOW_BROWSER_OPS]: {
       title: t('Slow Browser Ops'),
-      fields: ['p75(spans.browser)'],
+      fields: [`p75(spans.browser)`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
       chartColor: theme.chart.getColorPalette(0)[0],
     },
     [PerformanceWidgetSetting.SLOW_RESOURCE_OPS]: {
       title: t('Slow Resource Ops'),
-      fields: ['p75(spans.resource)'],
+      fields: [`p75(spans.resource)`],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
       chartColor: theme.chart.getColorPalette(0)[0],
     },
     [PerformanceWidgetSetting.SLOW_DB_OPS]: {
       title: t('Slow DB Ops'),
-      fields: ['p75(spans.db)', 'p75(spans.http)'],
+      fields: [`p75(spans.db)`, 'p75(spans.http)'],
       dataType: GenericPerformanceWidgetDataType.LINE_LIST,
       chartColor: theme.chart.getColorPalette(0)[0],
     },
diff --git a/static/app/views/performance/newTraceDetails/trace.spec.tsx b/static/app/views/performance/newTraceDetails/trace.spec.tsx
index 223e423b8b36..5bf371cf9dae 100644
--- a/static/app/views/performance/newTraceDetails/trace.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/trace.spec.tsx
@@ -122,7 +122,7 @@ function mockTraceTagsResponse(resp?: Partial<ResponseType>) {
 
 function mockProjectDetailsResponse(resp?: Partial<ResponseType>) {
   MockApiClient.addMockResponse({
-    url: '/projects/org-slug//',
+    url: `/projects/org-slug//`,
     method: 'GET',
     asyncDelay: 1,
     ...resp,
@@ -149,7 +149,7 @@ function mockTraceRootEvent(id: string, resp?: Partial<ResponseType>) {
 
 function mockTraceRootFacets(resp?: Partial<ResponseType>) {
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/events-facets/',
+    url: `/organizations/org-slug/events-facets/`,
     method: 'GET',
     asyncDelay: 1,
     body: {},
@@ -159,7 +159,7 @@ function mockTraceRootFacets(resp?: Partial<ResponseType>) {
 
 function mockTraceEventDetails(resp?: Partial<ResponseType>) {
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/events/',
+    url: `/organizations/org-slug/events/`,
     method: 'GET',
     asyncDelay: 1,
     body: {},
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useReplayTraceMeta.tsx b/static/app/views/performance/newTraceDetails/traceApi/useReplayTraceMeta.tsx
index 1c6c3d9e638c..81fe5a5f3eb9 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useReplayTraceMeta.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useReplayTraceMeta.tsx
@@ -53,7 +53,7 @@ export function useReplayTraceMeta(
     data: TableDataRow[];
   }>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx b/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx
index 96bab500e7fd..2217e47d3e63 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx
@@ -187,7 +187,7 @@ function useDemoTrace(
   const demoEventQuery = useApiQuery<EventTransaction>(
     [
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/events/$projectIdOrSlug:$eventId/',
+        `/organizations/$organizationIdOrSlug/events/$projectIdOrSlug:$eventId/`,
         {
           path: {
             organizationIdOrSlug: organization.slug,
@@ -288,7 +288,7 @@ export function useTrace(
 
   const traceQuery = useApiQuery<TraceSplitResults<TraceTree.Transaction>>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/events-trace/$traceId/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/events-trace/$traceId/`, {
         path: {organizationIdOrSlug: organization.slug, traceId: options.traceSlug ?? ''},
       }),
       {query: queryParams},
@@ -301,7 +301,7 @@ export function useTrace(
 
   const eapTraceQuery = useApiQuery<TraceTree.EAPTrace>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/trace/$traceId/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/trace/$traceId/`, {
         path: {organizationIdOrSlug: organization.slug, traceId: options.traceSlug ?? ''},
       }),
       {
@@ -331,7 +331,7 @@ export function useTrace(
 
   const traceFallbackQuery = useApiQuery<TraceSplitResults<TraceTree.Transaction>>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/events-trace/$traceId/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/events-trace/$traceId/`, {
         path: {organizationIdOrSlug: organization.slug, traceId: options.traceSlug ?? ''},
       }),
       {query: fallbackQueryParams},
@@ -349,7 +349,7 @@ export function useTrace(
 
   const eapTraceFallbackQuery = useApiQuery<TraceTree.EAPTrace>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/trace/$traceId/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/trace/$traceId/`, {
         path: {organizationIdOrSlug: organization.slug, traceId: options.traceSlug ?? ''},
       }),
       {
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useTraceAverageTransactionDuration.tsx b/static/app/views/performance/newTraceDetails/traceApi/useTraceAverageTransactionDuration.tsx
index 37d134a8c6ed..c893e81ed003 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useTraceAverageTransactionDuration.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useTraceAverageTransactionDuration.tsx
@@ -23,7 +23,7 @@ export const useTraceAverageTransactionDuration = ({
 
   const eventView = EventView.fromSavedQuery({
     id: undefined,
-    name: 'Average durations of transactions in the trace',
+    name: `Average durations of transactions in the trace`,
     fields: ['title', 'avg(transaction.duration)'],
     orderby: '-title',
     query: conditions.formatString(),
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useTraceRootEvent.tsx b/static/app/views/performance/newTraceDetails/traceApi/useTraceRootEvent.tsx
index b41558a40fbc..7e606d51f863 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useTraceRootEvent.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useTraceRootEvent.tsx
@@ -43,7 +43,7 @@ export function useTraceRootEvent({
   const legacyRootEvent = useApiQuery<EventTransaction>(
     [
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/events/$projectIdOrSlug:$eventId/',
+        `/organizations/$organizationIdOrSlug/events/$projectIdOrSlug:$eventId/`,
         {
           path: {
             organizationIdOrSlug: organization.slug,
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useTransaction.tsx b/static/app/views/performance/newTraceDetails/traceApi/useTransaction.tsx
index 269152938c34..dc20a1870f5c 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useTransaction.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useTransaction.tsx
@@ -13,7 +13,7 @@ export function useTransaction(props: UseTransactionProps) {
   return useApiQuery<EventTransaction>(
     [
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/events/$projectIdOrSlug:$eventId/',
+        `/organizations/$organizationIdOrSlug/events/$projectIdOrSlug:$eventId/`,
         {
           path: {
             organizationIdOrSlug: props.organization.slug,
diff --git a/static/app/views/performance/newTraceDetails/traceConfigurations.tsx b/static/app/views/performance/newTraceDetails/traceConfigurations.tsx
index 12fad49e2299..6b45d3f4b678 100644
--- a/static/app/views/performance/newTraceDetails/traceConfigurations.tsx
+++ b/static/app/views/performance/newTraceDetails/traceConfigurations.tsx
@@ -38,7 +38,7 @@ function parsePlatform(platform: string): ParsedPlatform {
 export function getCustomInstrumentationLink(project: Project | undefined): string {
   // Default to JavaScript guide if project or platform is not available
   if (!project?.platform) {
-    return 'https://docs.sentry.io/platforms/javascript/tracing/instrumentation/custom-instrumentation/';
+    return `https://docs.sentry.io/platforms/javascript/tracing/instrumentation/custom-instrumentation/`;
   }
 
   const {platformName, framework} = parsePlatform(project.platform);
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/highlightedAttributes.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/highlightedAttributes.tsx
index 504fc65b4427..ec170635ffed 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/highlightedAttributes.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/highlightedAttributes.tsx
@@ -1,4 +1,3 @@
-import {Fragment} from 'react';
 import styled from '@emotion/styled';
 import type {CaptureContext} from '@sentry/core';
 import * as Sentry from '@sentry/react';
@@ -21,7 +20,6 @@ import {
   getToolSpansFilter,
 } from 'sentry/views/insights/pages/agents/utils/query';
 import {Referrer} from 'sentry/views/insights/pages/agents/utils/referrers';
-import {getTokenBreakdown} from 'sentry/views/insights/pages/agents/utils/tokenBreakdown';
 import {SpanFields} from 'sentry/views/insights/types';
 import {tryParseJsonRecursive} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/utils';
 
@@ -358,6 +356,42 @@ function HighlightedTools({
   );
 }
 
+// Per our and OTel conventions, input_tokens includes cached and output_tokens includes
+// reasoning. Some providers don't do this, so we detect the gap and adjust as a fallback.
+function getDisplayInputTokens(
+  inputTokens: number,
+  cachedTokens: number,
+  outputTokens: number,
+  totalTokens: number
+): number {
+  if (cachedTokens <= 0) {
+    return inputTokens;
+  }
+  const without = inputTokens + outputTokens;
+  const withCached = without + cachedTokens;
+  if (Math.abs(withCached - totalTokens) < Math.abs(without - totalTokens)) {
+    return inputTokens + cachedTokens;
+  }
+  return inputTokens;
+}
+
+function getDisplayOutputTokens(
+  displayInput: number,
+  outputTokens: number,
+  reasoningTokens: number,
+  totalTokens: number
+): number {
+  if (reasoningTokens <= 0) {
+    return outputTokens;
+  }
+  const without = displayInput + outputTokens;
+  const withReasoning = without + reasoningTokens;
+  if (Math.abs(withReasoning - totalTokens) < Math.abs(without - totalTokens)) {
+    return outputTokens + reasoningTokens;
+  }
+  return outputTokens;
+}
+
 function HighlightedTokenAttributes({
   inputTokens,
   cachedTokens,
@@ -371,54 +405,50 @@ function HighlightedTokenAttributes({
   reasoningTokens: number;
   totalTokens: number;
 }) {
-  const breakdown = getTokenBreakdown({
+  const effectiveCached = isNaN(cachedTokens) ? 0 : cachedTokens;
+  const effectiveReasoning = isNaN(reasoningTokens) ? 0 : reasoningTokens;
+
+  const displayInput = getDisplayInputTokens(
     inputTokens,
-    cachedTokens,
+    effectiveCached,
     outputTokens,
-    reasoningTokens,
-    totalTokens,
-  });
-
-  const hasCached = breakdown.cached > 0;
+    totalTokens
+  );
+  const displayOutput = getDisplayOutputTokens(
+    displayInput,
+    outputTokens,
+    effectiveReasoning,
+    totalTokens
+  );
 
   return (
     <Tooltip
       title={
         <TokensTooltipTitle>
           <span>{t('Input')}</span>
-          <span>{breakdown.netNewInput.toLocaleString()}</span>
-          {hasCached && (
-            <Fragment>
-              <span>{t('Cached')}</span>
-              <span>{breakdown.cached.toLocaleString()}</span>
-            </Fragment>
-          )}
+          <span>{inputTokens.toString()}</span>
+          <SubTextCell>{t('Cached')}</SubTextCell>
+          <SubTextCell>{effectiveCached.toString()}</SubTextCell>
           <span>{t('Output')}</span>
-          <span>{breakdown.output.toLocaleString()}</span>
+          <span>{outputTokens.toString()}</span>
+          <SubTextCell>{t('Reasoning')}</SubTextCell>
+          <SubTextCell>{effectiveReasoning.toString()}</SubTextCell>
           <span>{t('Total')}</span>
-          <span>{breakdown.total.toLocaleString()}</span>
+          <span>{totalTokens.toString()}</span>
         </TokensTooltipTitle>
       }
     >
       <TokensSpan>
         <span>
-          <Count value={breakdown.netNewInput} /> {t('in')}
+          <Count value={displayInput.toString()} /> {t('in')}
         </span>
-        {hasCached && (
-          <Fragment>
-            <span>+</span>
-            <span>
-              <Count value={breakdown.cached} /> {t('cached')}
-            </span>
-          </Fragment>
-        )}
         <span>+</span>
         <span>
-          <Count value={breakdown.output} /> {t('out')}
+          <Count value={displayOutput.toString()} /> {t('out')}
         </span>
         <span>=</span>
         <span>
-          <Count value={breakdown.total} /> {t('total')}
+          <Count value={totalTokens.toString()} /> {t('total')}
         </span>
       </TokensSpan>
     </Tooltip>
@@ -437,6 +467,11 @@ const TokensTooltipTitle = styled('div')`
   gap: ${p => p.theme.space.xs};
 `;
 
+const SubTextCell = styled('span')`
+  margin-left: ${p => p.theme.space.md};
+  color: ${p => p.theme.tokens.content.secondary};
+`;
+
 const TokensSpan = styled('span')`
   display: flex;
   align-items: center;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issues.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issues.tsx
index 86078e7afdde..1635f46450a5 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issues.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issues.tsx
@@ -57,7 +57,7 @@ function Issue(props: IssueProps) {
     error,
   } = useApiQuery<Group>(
     [
-      getApiUrl('/issues/$issueId/', {path: {issueId: props.issue.issue_id}}),
+      getApiUrl(`/issues/$issueId/`, {path: {issueId: props.issue.issue_id}}),
       {
         query: {
           collapse: 'release',
@@ -201,7 +201,7 @@ export function IssueList({issues, node, organization}: IssueListProps) {
           <Flex align="center" marginLeft="2xs" gap="xs">
             <IconOpen />
             {t(
-              'Open %s more in Issues',
+              `Open %s more in Issues`,
               uniqueIssues.length - MAX_DISPLAYED_ISSUES_COUNT
             )}
           </Flex>
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentDetection.spec.ts b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentDetection.spec.ts
index 2866d3702eee..720e165b7609 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentDetection.spec.ts
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentDetection.spec.ts
@@ -1,7 +1,6 @@
 import {
   detectAIContentType,
   parseXmlTagSegments,
-  preprocessInlineXmlTags,
   tryParsePythonDict,
 } from 'sentry/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentDetection';
 
@@ -128,41 +127,6 @@ describe('tryParsePythonDict', () => {
   });
 });
 
-describe('preprocessInlineXmlTags', () => {
-  it('replaces inline XML tags with italic markdown', () => {
-    const text = 'Before <thinking>inner thought</thinking> After';
-    expect(preprocessInlineXmlTags(text)).toBe('Before *thinking: inner thought* After');
-  });
-
-  it('leaves block-level tags at start of text untouched', () => {
-    const text = '<plan>step 1</plan> then more';
-    expect(preprocessInlineXmlTags(text)).toBe('<plan>step 1</plan> then more');
-  });
-
-  it('leaves block-level tags after newline untouched', () => {
-    const text = 'Some text\n<thinking>deep thought</thinking>';
-    expect(preprocessInlineXmlTags(text)).toBe(text);
-  });
-
-  it('handles mixed inline and block tags', () => {
-    const text =
-      'See the <code>details</code> here.\n<thinking>\ndeep thought\n</thinking>';
-    expect(preprocessInlineXmlTags(text)).toBe(
-      'See the *code: details* here.\n<thinking>\ndeep thought\n</thinking>'
-    );
-  });
-
-  it('trims whitespace from inline tag content', () => {
-    const text = 'before <tag>  spaced  </tag> after';
-    expect(preprocessInlineXmlTags(text)).toBe('before *tag: spaced* after');
-  });
-
-  it('strips nested XML tags from inline tag content', () => {
-    const text = 'Text <outer>before <inner>nested</inner> after</outer> more';
-    expect(preprocessInlineXmlTags(text)).toBe('Text *outer: before nested after* more');
-  });
-});
-
 describe('parseXmlTagSegments', () => {
   it('splits text with XML tags into segments', () => {
     const text = 'Before <thinking>inner thought</thinking> After';
@@ -193,9 +157,9 @@ describe('parseXmlTagSegments', () => {
   });
 
   it('returns single text segment when no XML tags', () => {
-    expect(parseXmlTagSegments('just plain text')).toEqual([
-      {type: 'text', content: 'just plain text'},
-    ]);
+    const text = 'just plain text';
+    const segments = parseXmlTagSegments(text);
+    expect(segments).toEqual([{type: 'text', content: 'just plain text'}]);
   });
 
   it('handles empty string', () => {
@@ -204,20 +168,7 @@ describe('parseXmlTagSegments', () => {
 
   it('handles tags with hyphens in names', () => {
     const text = '<my-tag>content</my-tag>';
-    expect(parseXmlTagSegments(text)).toEqual([
-      {type: 'xml-tag', tagName: 'my-tag', content: 'content'},
-    ]);
-  });
-
-  it('extracts outer tag with nested tags preserved in content', () => {
-    const text =
-      '<bug_report>\n<location>file.ts</location>\n<description>a bug</description>\n</bug_report>';
-    expect(parseXmlTagSegments(text)).toEqual([
-      {
-        type: 'xml-tag',
-        tagName: 'bug_report',
-        content: '\n<location>file.ts</location>\n<description>a bug</description>\n',
-      },
-    ]);
+    const segments = parseXmlTagSegments(text);
+    expect(segments).toEqual([{type: 'xml-tag', tagName: 'my-tag', content: 'content'}]);
   });
 });
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentDetection.ts b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentDetection.ts
index bb39264a545e..9e1161b57667 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentDetection.ts
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentDetection.ts
@@ -18,7 +18,10 @@ interface AIContentDetectionResult {
   wasFixed?: boolean;
 }
 
-/** Best-effort conversion of a Python dict literal to a JSON-parseable string. */
+/**
+ * Best-effort conversion of a Python dict literal to a JSON-parseable string.
+ * Returns the parsed object on success, or null if conversion fails.
+ */
 export function tryParsePythonDict(text: string): Record<PropertyKey, unknown> | null {
   const trimmed = text.trim();
   if (!trimmed.startsWith('{') && !trimmed.startsWith('[')) {
@@ -47,7 +50,10 @@ export function tryParsePythonDict(text: string): Record<PropertyKey, unknown> |
   }
 }
 
-/** Splits text into segments of plain text and XML-like tag blocks. */
+/**
+ * Splits text into segments of plain text and XML-like tag blocks.
+ * Matches `<tagname>...</tagname>` patterns (including multiline content).
+ */
 export function parseXmlTagSegments(text: string): ContentSegment[] {
   const segments: ContentSegment[] = [];
   const xmlTagRegex = /<([a-zA-Z][\w-]*)>([\s\S]*?)<\/\1>/g;
@@ -72,19 +78,6 @@ export function parseXmlTagSegments(text: string): ContentSegment[] {
   return segments;
 }
 
-/** Replaces inline XML tags with italic markdown, leaves block-level tags untouched. */
-export function preprocessInlineXmlTags(text: string): string {
-  const xmlTagRegex = /<([a-zA-Z][\w-]*)>([\s\S]*?)<\/\1>/g;
-  return text.replace(xmlTagRegex, (match, tagName, content, offset) => {
-    const isBlock = offset === 0 || /\n\s*$/.test(text.slice(0, offset));
-    if (isBlock) {
-      return match;
-    }
-    const stripped = content.replace(/<\/?[a-zA-Z][\w-]*>/g, '').trim();
-    return `*${tagName}: ${stripped}*`;
-  });
-}
-
 const XML_TAG_REGEX = /<([a-zA-Z][\w-]*)>[\s\S]*?<\/\1>/;
 
 const MARKDOWN_INDICATORS = [
@@ -98,7 +91,16 @@ const MARKDOWN_INDICATORS = [
   /^```/m, // code fences
 ];
 
-/** Detects AI content type: JSON, Python dict, markdown-with-xml, markdown, or plain text. */
+/**
+ * Detects the content type of an AI response string.
+ * Short-circuits on first match in priority order:
+ * 1. Valid JSON (object/array)
+ * 2. Python dict
+ * 3. Partial/truncated JSON (fixable)
+ * 4. Markdown with XML tags
+ * 5. Markdown
+ * 6. Plain text
+ */
 export function detectAIContentType(text: string): AIContentDetectionResult {
   const trimmed = text.trim();
   if (!trimmed) {
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentRenderer.spec.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentRenderer.spec.tsx
index 82118cef34ef..561f2389c803 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentRenderer.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentRenderer.spec.tsx
@@ -28,32 +28,16 @@ describe('AIContentRenderer', () => {
     expect(screen.getByText('name')).toBeInTheDocument();
   });
 
-  it('renders inline XML tags as italic text within the flow', () => {
+  it('renders XML tags with styled wrappers', () => {
     render(<AIContentRenderer text="Before <thinking>inner thought</thinking> After" />);
-    expect(screen.getByText(/thinking: inner thought/)).toBeInTheDocument();
-  });
-
-  it('renders block XML tags with styled wrappers', () => {
-    render(<AIContentRenderer text={'Text\n<thinking>inner thought</thinking>'} />);
     expect(screen.getByText('thinking')).toBeInTheDocument();
   });
 
-  it('renders inline XML tags as italic text when inline', () => {
+  it('renders XML tags with styled wrappers when inline', () => {
     render(
       <AIContentRenderer text="Before <thinking>inner thought</thinking> After" inline />
     );
-    expect(screen.getByText(/thinking: inner thought/)).toBeInTheDocument();
-  });
-
-  it('renders nested XML tags recursively', () => {
-    const text =
-      '<bug_report>\n<location>file.ts</location>\n<description>a bug</description>\n</bug_report>';
-    render(<AIContentRenderer text={text} />);
-    expect(screen.getByText('bug_report')).toBeInTheDocument();
-    expect(screen.getByText('location')).toBeInTheDocument();
-    expect(screen.getByText('description')).toBeInTheDocument();
-    expect(screen.getByText('file.ts')).toBeInTheDocument();
-    expect(screen.getByText('a bug')).toBeInTheDocument();
+    expect(screen.getByText('thinking')).toBeInTheDocument();
   });
 
   it('wraps plain text in MultilineText by default', () => {
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentRenderer.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentRenderer.tsx
index b591d91e9276..3b5e501a382e 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentRenderer.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentRenderer.tsx
@@ -9,12 +9,12 @@ import {MarkedText} from 'sentry/utils/marked/markedText';
 import {
   detectAIContentType,
   parseXmlTagSegments,
-  preprocessInlineXmlTags,
 } from 'sentry/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiContentDetection';
 import {TraceDrawerComponents} from 'sentry/views/performance/newTraceDetails/traceDrawer/details/styles';
 
 interface AIContentRendererProps {
   text: string;
+  /** When true, renders content directly without a wrapper or raw/pretty toggle. */
   inline?: boolean;
   maxJsonDepth?: number;
 }
@@ -27,23 +27,22 @@ function XmlTagBlock({tagName, content}: {content: string; tagName: string}) {
       direction="column"
       padding="0 0 0 md"
       margin="sm 0"
-      style={{borderLeft: `2px solid ${theme.tokens.border.primary}`}}
+      style={{borderLeft: `3px solid ${theme.tokens.border.accent.moderate}`}}
     >
       <Container margin="0 0 xs 0">
         <Text size="xs" variant="muted">
           {tagName}
         </Text>
       </Container>
-      <MarkdownWithXmlRenderer text={content} />
+      <Text italic>
+        <MarkedText as={TraceDrawerComponents.MarkdownContainer} text={content} />
+      </Text>
     </Flex>
   );
 }
 
 function MarkdownWithXmlRenderer({text}: {text: string}) {
-  const segments = useMemo(
-    () => parseXmlTagSegments(preprocessInlineXmlTags(text)),
-    [text]
-  );
+  const segments = useMemo(() => parseXmlTagSegments(text), [text]);
 
   return (
     <Fragment>
@@ -62,7 +61,10 @@ function MarkdownWithXmlRenderer({text}: {text: string}) {
   );
 }
 
-/** Auto-detects AI content type and renders appropriately. */
+/**
+ * Unified AI content renderer that auto-detects content type and renders appropriately.
+ * Handles JSON, Python dicts, partial JSON, markdown with XML tags, markdown, and plain text.
+ */
 export function AIContentRenderer({
   text,
   inline = false,
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/description.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/description.tsx
index fc5fa50cdc8c..86ce9511e1d7 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/description.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/description.tsx
@@ -16,7 +16,7 @@ import {IconGraph} from 'sentry/icons/iconGraph';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
-import {SQLishFormatter} from 'sentry/utils/sqlish';
+import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
 import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
 import type {TraceItemResponseAttribute} from 'sentry/views/explore/hooks/useTraceItemDetails';
 import {ResourceSize} from 'sentry/views/insights/browser/resources/components/resourceSize';
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/description.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/description.tsx
index accc7e6e2a56..4d6395d034ca 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/description.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/description.tsx
@@ -14,7 +14,7 @@ import {IconGraph} from 'sentry/icons/iconGraph';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
-import {SQLishFormatter} from 'sentry/utils/sqlish';
+import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
 import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
 import {ResourceSize} from 'sentry/views/insights/browser/resources/components/resourceSize';
 import {
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx
index e56137c1dda3..1d115364f2df 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/sections/generalInfo.tsx
@@ -10,7 +10,7 @@ import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import {getDuration} from 'sentry/utils/duration/getDuration';
 import {getDynamicText} from 'sentry/utils/getDynamicText';
-import {SQLishFormatter} from 'sentry/utils/sqlish';
+import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
 import {FullSpanDescription} from 'sentry/views/insights/common/components/fullSpanDescription';
 import {WiderHovercard} from 'sentry/views/insights/common/components/tableCells/spanDescriptionCell';
 import {resolveSpanModule} from 'sentry/views/insights/common/utils/resolveSpanModule';
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
index dbeab032e8d2..cb419c7b95cc 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
@@ -321,15 +321,15 @@ const getDurationComparison = (
 
   const deltaText =
     status === 'equal'
-      ? tct('equal to avg [formattedBaseDuration]', {
+      ? tct(`equal to avg [formattedBaseDuration]`, {
           formattedBaseDuration,
         })
       : status === 'faster'
-        ? tct('[deltaPct] faster than avg [formattedBaseDuration]', {
+        ? tct(`[deltaPct] faster than avg [formattedBaseDuration]`, {
             formattedBaseDuration,
             deltaPct: `${deltaPct}%`,
           })
-        : tct('[deltaPct] slower than avg [formattedBaseDuration]', {
+        : tct(`[deltaPct] slower than avg [formattedBaseDuration]`, {
             formattedBaseDuration,
             deltaPct: `${deltaPct}%`,
           });
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
index 36c003e1e354..d3b8bec5015c 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/traceDrawer.tsx
@@ -138,7 +138,7 @@ export function TraceDrawer(props: TraceDrawerProps) {
       }
 
       if (traceStateRef.current.preferences.layout === 'drawer bottom') {
-        props.traceGridRef.style.gridTemplateColumns = '1fr';
+        props.traceGridRef.style.gridTemplateColumns = `1fr`;
         props.traceGridRef.style.gridTemplateRows = `1fr minmax(${min}px, ${drawerHeight * 100}%)`;
       } else if (traceStateRef.current.preferences.layout === 'drawer left') {
         props.traceGridRef.style.gridTemplateColumns = `minmax(${min}px, ${drawerWidth * 100}%) 1fr`;
@@ -287,15 +287,15 @@ export function TraceDrawer(props: TraceDrawerProps) {
     }
     if (isDrawerMinimized && props.traceGridRef) {
       if (traceStateRef.current.preferences.layout === 'drawer bottom') {
-        props.traceGridRef.style.gridTemplateColumns = '1fr';
+        props.traceGridRef.style.gridTemplateColumns = `1fr`;
         props.traceGridRef.style.gridTemplateRows = `1fr minmax(${minimizedBottomDrawerSize}px, 0%)`;
         size.current = minimizedBottomDrawerSize;
       } else if (traceStateRef.current.preferences.layout === 'drawer left') {
-        props.traceGridRef.style.gridTemplateColumns = 'minmax(0px, 0%) 1fr';
+        props.traceGridRef.style.gridTemplateColumns = `minmax(0px, 0%) 1fr`;
         props.traceGridRef.style.gridTemplateRows = '1fr auto';
         size.current = 0;
       } else {
-        props.traceGridRef.style.gridTemplateColumns = '1fr minmax(0px, 0%)';
+        props.traceGridRef.style.gridTemplateColumns = `1fr minmax(0px, 0%)`;
         props.traceGridRef.style.gridTemplateRows = '1fr auto';
         size.current = 0;
       }
diff --git a/static/app/views/performance/newTraceDetails/traceLinksNavigation/traceLinkNavigationButton.tsx b/static/app/views/performance/newTraceDetails/traceLinksNavigation/traceLinkNavigationButton.tsx
index a276b43b68bd..37a8b42f2188 100644
--- a/static/app/views/performance/newTraceDetails/traceLinksNavigation/traceLinkNavigationButton.tsx
+++ b/static/app/views/performance/newTraceDetails/traceLinksNavigation/traceLinkNavigationButton.tsx
@@ -50,7 +50,7 @@ export function TraceLinkNavigationButton({
         adjacentTraceStartTimestamp: linkedTraceWindowTimestamp,
         iconDirection: 'left' as const,
         ariaLabel: t('Previous Trace'),
-        title: tct('Go to the previous trace of the same session. [link:Learn More]', {
+        title: tct(`Go to the previous trace of the same session. [link:Learn More]`, {
           link: (
             <ExternalLink href="https://docs.sentry.io/concepts/key-terms/tracing/trace-view/#previous-and-next-traces" />
           ),
@@ -62,7 +62,7 @@ export function TraceLinkNavigationButton({
       adjacentTraceStartTimestamp: currentTraceStartTimestamp,
       iconDirection: 'right' as const,
       ariaLabel: t('Next Trace'),
-      title: tct('Go to the next trace of the same session. [link:Learn More]', {
+      title: tct(`Go to the next trace of the same session. [link:Learn More]`, {
         link: (
           <ExternalLink href="https://docs.sentry.io/concepts/key-terms/tracing/trace-view/#previous-and-next-traces" />
         ),
diff --git a/static/app/views/performance/newTraceDetails/traceModels/makeExampleTrace.tsx b/static/app/views/performance/newTraceDetails/traceModels/makeExampleTrace.tsx
index b39a57d64769..547e2b97b5b2 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/makeExampleTrace.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/makeExampleTrace.tsx
@@ -22,8 +22,8 @@ function partialTransaction(
     'transaction.status': 'loading-status',
     generation: 0,
     project_slug: '',
-    event_id: 'event_id',
-    transaction: 'transaction',
+    event_id: `event_id`,
+    transaction: `transaction`,
     children: [],
     ...partial,
   };
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/eapSpanNode.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/eapSpanNode.tsx
index c6de2ac93fe1..892ac390d754 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/eapSpanNode.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/eapSpanNode.tsx
@@ -283,7 +283,7 @@ export class EapSpanNode extends BaseNode<TraceTree.EAPSpan> {
       (this.op || 'unknown span') +
       ' - ' +
       (this.description || 'unknown description') +
-      (this.value.is_transaction ? ' (eap-transaction)' : '')
+      (this.value.is_transaction ? ` (eap-transaction)` : '')
     );
   }
 
diff --git a/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.tsx b/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.tsx
index a5e6c619abb7..fc58ef581c35 100644
--- a/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRenderers/virtualizedViewManager.tsx
@@ -1351,7 +1351,7 @@ export class VirtualizedViewManager {
 
       if (i < start_indicator || i > end_indicator) {
         entry.ref.style.opacity = '0';
-        label.style.opacity = '0';
+        label.style.opacity = `0`;
         continue;
       }
 
@@ -1406,7 +1406,7 @@ export class VirtualizedViewManager {
 
       indicator_label_right = clamped_label_transform + label_width;
 
-      label.style.opacity = '1';
+      label.style.opacity = `1`;
       label.style.transform = `translateX(${clamp(clamped_label_transform, -1, indicator_max)}px)`;
 
       entry.ref.style.opacity = '1';
@@ -1561,7 +1561,7 @@ export class VirtualizedViewManager {
     if (first && last) {
       first.style.opacity = '1';
       last.style.opacity = '1';
-      first.style.transform = 'translateX(0)';
+      first.style.transform = `translateX(0)`;
 
       // 43 px offset is the width of a 0.00ms label, since we usually anchor the label to the right
       // side of the indicator, we need to offset it by the width of the label to make it look like
diff --git a/static/app/views/performance/newTraceDetails/traceRow/traceRow.tsx b/static/app/views/performance/newTraceDetails/traceRow/traceRow.tsx
index bbdc1274bd67..0d44fa5e9900 100644
--- a/static/app/views/performance/newTraceDetails/traceRow/traceRow.tsx
+++ b/static/app/views/performance/newTraceDetails/traceRow/traceRow.tsx
@@ -9,12 +9,12 @@ import type {VirtualizedViewManager} from 'sentry/views/performance/newTraceDeta
 
 export const TRACE_COUNT_FORMATTER = Intl.NumberFormat(undefined, {notation: 'compact'});
 
-export const TRACE_RIGHT_COLUMN_EVEN_CLASSNAME = 'TraceRightColumn';
+export const TRACE_RIGHT_COLUMN_EVEN_CLASSNAME = `TraceRightColumn`;
 export const TRACE_RIGHT_COLUMN_ODD_CLASSNAME = [
   TRACE_RIGHT_COLUMN_EVEN_CLASSNAME,
   'Odd',
 ].join(' ');
-export const TRACE_CHILDREN_COUNT_WRAPPER_CLASSNAME = 'TraceChildrenCountWrapper';
+export const TRACE_CHILDREN_COUNT_WRAPPER_CLASSNAME = `TraceChildrenCountWrapper`;
 export const TRACE_CHILDREN_COUNT_WRAPPER_ORPHANED_CLASSNAME = [
   TRACE_CHILDREN_COUNT_WRAPPER_CLASSNAME,
   'Orphaned',
diff --git a/static/app/views/performance/newTraceDetails/traceSummary.tsx b/static/app/views/performance/newTraceDetails/traceSummary.tsx
index 483c84fd3246..72c2e7d7cd57 100644
--- a/static/app/views/performance/newTraceDetails/traceSummary.tsx
+++ b/static/app/views/performance/newTraceDetails/traceSummary.tsx
@@ -38,7 +38,7 @@ const makeTraceSummaryQueryKey = (
   organizationSlug: string,
   traceSlug: string
 ): ApiQueryKey => [
-  getApiUrl('/organizations/$organizationIdOrSlug/trace-summary/', {
+  getApiUrl(`/organizations/$organizationIdOrSlug/trace-summary/`, {
     path: {organizationIdOrSlug: organizationSlug},
   }),
   {method: 'POST', data: {traceSlug}},
diff --git a/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceSubscriptionDetails.tsx b/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceSubscriptionDetails.tsx
index ada0dc99e798..94a78154e3f8 100644
--- a/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceSubscriptionDetails.tsx
+++ b/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceSubscriptionDetails.tsx
@@ -47,7 +47,7 @@ export function usePerformanceSubscriptionDetails({
 
   const {data: subscription, ...rest} = useApiQuery<Subscription>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx b/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx
index 87c51a208fbe..bf7608cde6c9 100644
--- a/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx
+++ b/static/app/views/performance/newTraceDetails/traceTypeWarnings/usePerformanceUsageStats.tsx
@@ -37,7 +37,7 @@ export function usePerformanceUsageStats({
     : '';
   const end = traceNode ? new Date(traceEndDate.getTime() + ONE_HOUR).toISOString() : '';
 
-  const pathname = getApiUrl('/organizations/$organizationIdOrSlug/stats_v2/', {
+  const pathname = getApiUrl(`/organizations/$organizationIdOrSlug/stats_v2/`, {
     path: {organizationIdOrSlug: organization.slug},
   });
 
diff --git a/static/app/views/performance/newTraceDetails/traceWaterfall.tsx b/static/app/views/performance/newTraceDetails/traceWaterfall.tsx
index 803fd2ab154a..557e42c20ff8 100644
--- a/static/app/views/performance/newTraceDetails/traceWaterfall.tsx
+++ b/static/app/views/performance/newTraceDetails/traceWaterfall.tsx
@@ -773,8 +773,8 @@ export const TraceGrid = styled('div')<{
       'drawer'
       `
       : p.layout === 'drawer left'
-        ? "'drawer trace'"
-        : "'trace drawer'"};
+        ? `'drawer trace'`
+        : `'trace drawer'`};
   grid-template-columns: ${p =>
     p.layout === 'drawer bottom'
       ? '1fr'
diff --git a/static/app/views/performance/newTraceDetails/useInitialTraceMetricData.tsx b/static/app/views/performance/newTraceDetails/useInitialTraceMetricData.tsx
index 3de34abb9a6b..1ceb7e6e46e1 100644
--- a/static/app/views/performance/newTraceDetails/useInitialTraceMetricData.tsx
+++ b/static/app/views/performance/newTraceDetails/useInitialTraceMetricData.tsx
@@ -62,7 +62,7 @@ function traceMetricCountQueryKey({
   }
 
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
       path: {organizationIdOrSlug: orgSlug},
     }),
     {query},
diff --git a/static/app/views/performance/onboarding.spec.tsx b/static/app/views/performance/onboarding.spec.tsx
index 4570437aad4e..449fe31a8117 100644
--- a/static/app/views/performance/onboarding.spec.tsx
+++ b/static/app/views/performance/onboarding.spec.tsx
@@ -39,13 +39,13 @@ describe('Testing new onboarding ui', () => {
 
   beforeEach(() => {
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/keys/',
+      url: `/projects/org-slug/project-slug/keys/`,
       method: 'GET',
       body: [ProjectKeysFixture()[0]],
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/sdks/',
+      url: `/organizations/org-slug/sdks/`,
       method: 'GET',
     });
 
@@ -62,7 +62,7 @@ describe('Testing new onboarding ui', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/',
+      url: `/projects/org-slug/project-slug/`,
       method: 'GET',
       body: projectMock,
     });
@@ -115,7 +115,7 @@ describe('Testing new onboarding ui', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/',
+      url: `/projects/org-slug/project-slug/`,
       method: 'GET',
       body: projectMock,
     });
@@ -177,7 +177,7 @@ describe('Testing new onboarding ui', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/',
+      url: `/projects/org-slug/project-slug/`,
       method: 'GET',
       body: projectMock,
     });
@@ -235,7 +235,7 @@ describe('Testing new onboarding ui', () => {
     render(<Onboarding organization={organization} project={projectMock} />, {
       initialRouterConfig: {
         location: {
-          pathname: '/onboarding/',
+          pathname: `/onboarding/`,
           query: {
             guidedStep: '4',
           },
diff --git a/static/app/views/performance/table.spec.tsx b/static/app/views/performance/table.spec.tsx
index 0511d8b66c76..ee9f72832beb 100644
--- a/static/app/views/performance/table.spec.tsx
+++ b/static/app/views/performance/table.spec.tsx
@@ -176,7 +176,7 @@ describe('Performance > Table', () => {
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/key-transactions-list/',
+      url: `/organizations/org-slug/key-transactions-list/`,
       body: [],
     });
   });
diff --git a/static/app/views/performance/table.tsx b/static/app/views/performance/table.tsx
index 4aa9b6b0dd2d..b1f6cca90490 100644
--- a/static/app/views/performance/table.tsx
+++ b/static/app/views/performance/table.tsx
@@ -336,7 +336,7 @@ export function Table({
           <Link
             to={target}
             onClick={handleSummaryClick}
-            style={{display: 'block', width: '100%'}}
+            style={{display: `block`, width: `100%`}}
           >
             {rendered}
           </Link>
diff --git a/static/app/views/performance/transactionSummary/transactionEvents/content.spec.tsx b/static/app/views/performance/transactionSummary/transactionEvents/content.spec.tsx
index a5be6f0d9e98..84b47ccc2384 100644
--- a/static/app/views/performance/transactionSummary/transactionEvents/content.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionEvents/content.spec.tsx
@@ -154,11 +154,11 @@ describe('Performance Transaction Events Content', () => {
       body: {measurements: false},
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/recent-searches/',
+      url: `/organizations/org-slug/recent-searches/`,
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/tags/',
+      url: `/organizations/org-slug/tags/`,
       body: [],
     });
     initialData = initializeData();
diff --git a/static/app/views/performance/transactionSummary/transactionEvents/content.tsx b/static/app/views/performance/transactionSummary/transactionEvents/content.tsx
index acee4fea9e56..9d93dd5c3fe7 100644
--- a/static/app/views/performance/transactionSummary/transactionEvents/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionEvents/content.tsx
@@ -27,6 +27,7 @@ import {projectSupportsReplay} from 'sentry/utils/replays/projectSupportsReplay'
 import {useDatePageFilterProps} from 'sentry/utils/useDatePageFilterProps';
 import {useMaxPickableDays} from 'sentry/utils/useMaxPickableDays';
 import {useNavigate} from 'sentry/utils/useNavigate';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {hasDatasetSelector} from 'sentry/views/dashboards/utils';
 import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
 import type {SpanOperationBreakdownFilter} from 'sentry/views/performance/transactionSummary/filter';
@@ -82,6 +83,7 @@ export function EventsContent(props: Props) {
     projectId,
     projects,
   } = props;
+  const routes = useRoutes();
   const theme = useTheme();
   const domainViewFilters = useDomainViewFilters();
 
@@ -172,6 +174,7 @@ export function EventsContent(props: Props) {
       theme={theme}
       eventView={eventView}
       organization={organization}
+      routes={routes}
       location={location}
       setError={setError}
       columnTitles={titles}
diff --git a/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.spec.tsx b/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.spec.tsx
index 7e2f552ffbdf..dc4a689cb698 100644
--- a/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.spec.tsx
@@ -155,6 +155,7 @@ describe('Performance GridEditable Table', () => {
         theme={theme}
         eventView={eventView}
         organization={organization}
+        routes={initialData.router.routes}
         location={initialData.router.location}
         setError={() => {}}
         columnTitles={transactionsListTitles}
@@ -199,6 +200,7 @@ describe('Performance GridEditable Table', () => {
         theme={theme}
         eventView={eventView}
         organization={organization}
+        routes={initialData.router.routes}
         location={initialData.router.location}
         setError={() => {}}
         columnTitles={transactionsListTitles}
@@ -232,6 +234,7 @@ describe('Performance GridEditable Table', () => {
         theme={theme}
         eventView={eventView}
         organization={organization}
+        routes={initialData.router.routes}
         location={initialData.router.location}
         setError={() => {}}
         columnTitles={transactionsListTitles}
@@ -270,6 +273,7 @@ describe('Performance GridEditable Table', () => {
         theme={theme}
         eventView={eventView}
         organization={organization}
+        routes={initialData.router.routes}
         location={initialData.router.location}
         setError={() => {}}
         columnTitles={transactionsListTitles}
@@ -313,6 +317,7 @@ describe('Performance GridEditable Table', () => {
         theme={theme}
         eventView={eventView}
         organization={organization}
+        routes={initialData.router.routes}
         location={initialData.router.location}
         setError={() => {}}
         columnTitles={transactionsListTitles}
@@ -347,6 +352,7 @@ describe('Performance GridEditable Table', () => {
         theme={theme}
         eventView={eventView}
         organization={organization}
+        routes={initialData.router.routes}
         location={initialData.router.location}
         setError={() => {}}
         columnTitles={transactionsListTitles}
diff --git a/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.tsx b/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.tsx
index 10316d68a3e3..a0d08c2dee3e 100644
--- a/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.tsx
+++ b/static/app/views/performance/transactionSummary/transactionEvents/eventsTable.tsx
@@ -1,6 +1,5 @@
 import type React from 'react';
 import {Fragment, useCallback, useMemo, useState, type ReactNode} from 'react';
-import {useMatches} from 'react-router-dom';
 import type {Theme} from '@emotion/react';
 import styled from '@emotion/styled';
 import type {Location, LocationDescriptor, LocationDescriptorObject} from 'history';
@@ -18,6 +17,7 @@ import {useStateBasedColumnResize} from 'sentry/components/tables/gridEditable/u
 import {IconProfiling} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import type {IssueAttachment} from 'sentry/types/group';
+import type {RouteContextInterface} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {toArray} from 'sentry/utils/array/toArray';
@@ -79,7 +79,7 @@ function OperationTitle({onClick}: TitleProps) {
         size="xs"
         position="top"
         title={t(
-          'Span durations are summed over the course of an entire transaction. Any overlapping spans are only counted once.'
+          `Span durations are summed over the course of an entire transaction. Any overlapping spans are only counted once.`
         )}
       />
     </div>
@@ -90,6 +90,7 @@ type Props = {
   eventView: EventView;
   location: Location;
   organization: Organization;
+  routes: RouteContextInterface['routes'];
   setError: (msg: string | undefined) => void;
   theme: Theme;
   transactionName: string;
@@ -116,6 +117,7 @@ export function EventsTable({
   eventView,
   location,
   organization,
+  routes,
   setError,
   theme,
   transactionName,
@@ -132,14 +134,13 @@ export function EventsTable({
   referrer,
   renderTableHeader,
 }: Props) {
-  const matches = useMatches();
   const navigate = useNavigate();
   const api = useApi({persistInFlight: true});
   const [lastFetchedCursor, setLastFetchedCursor] = useState('');
   const [attachments, setAttachments] = useState<IssueAttachment[]>([]);
   const [hasMinidumps, setHasMinidumps] = useState(false);
 
-  const replayLinkGenerator = useMemo(() => generateReplayLink(matches), [matches]);
+  const replayLinkGenerator = useMemo(() => generateReplayLink(routes), [routes]);
 
   const handleCellAction = useCallback(
     (column: TableColumn<keyof TableDataRow>) => {
diff --git a/static/app/views/performance/transactionSummary/transactionEvents/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionEvents/index.spec.tsx
index 1256ae73ba8f..671c77e09b56 100644
--- a/static/app/views/performance/transactionSummary/transactionEvents/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionEvents/index.spec.tsx
@@ -138,11 +138,11 @@ const setupMockApiResponeses = () => {
     body: {},
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/recent-searches/',
+    url: `/organizations/org-slug/recent-searches/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/tags/',
+    url: `/organizations/org-slug/tags/`,
     body: [],
   });
 };
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx b/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx
index 98c2a04a06e5..eaf472bdf644 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/content.spec.tsx
@@ -122,7 +122,7 @@ describe('Transaction Summary Content', () => {
       ],
     });
     MockApiClient.addMockResponse({
-      url: '/projects/org-slug/project-slug/profiling/functions/',
+      url: `/projects/org-slug/project-slug/profiling/functions/`,
       body: {functions: []},
     });
     MockApiClient.addMockResponse({
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/content.tsx b/static/app/views/performance/transactionSummary/transactionOverview/content.tsx
index 9b1256931fa4..e2cba0d6058c 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/content.tsx
@@ -1,5 +1,4 @@
 import {Fragment, useCallback, useMemo} from 'react';
-import {useMatches} from 'react-router-dom';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 import type {Location} from 'history';
@@ -38,6 +37,7 @@ import {projectSupportsReplay} from 'sentry/utils/replays/projectSupportsReplay'
 import {useDatePageFilterProps} from 'sentry/utils/useDatePageFilterProps';
 import {useMaxPickableDays} from 'sentry/utils/useMaxPickableDays';
 import {useNavigate} from 'sentry/utils/useNavigate';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {withProjects} from 'sentry/utils/withProjects';
 import Tags from 'sentry/views/discover/results/tags';
 import type {Actions} from 'sentry/views/discover/table/cellAction';
@@ -315,7 +315,7 @@ function SummaryContent({
   onChangeFilter,
 }: Props) {
   const theme = useTheme();
-  const matches = useMatches();
+  const routes = useRoutes();
   const navigate = useNavigate();
   const mepDataContext = useMEPDataContext();
   const domainViewFilters = useDomainViewFilters();
@@ -597,7 +597,7 @@ function SummaryContent({
                 eventView.normalizeDateSelection(location),
                 domainViewFilters.view
               ),
-              replayId: generateReplayLink(matches),
+              replayId: generateReplayLink(routes),
               'profile.id': generateProfileLink(),
             }}
             handleCellAction={handleCellAction}
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/durationChart/index.tsx b/static/app/views/performance/transactionSummary/transactionOverview/durationChart/index.tsx
index ff19b90dfb3b..b2bb4270f5ae 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/durationChart/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/durationChart/index.tsx
@@ -117,7 +117,7 @@ export function DurationChart({
         size="sm"
         position="top"
         title={t(
-          'Duration Breakdown reflects transaction durations by percentile over time.'
+          `Duration Breakdown reflects transaction durations by percentile over time.`
         )}
       />
     </HeaderTitleLegend>
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/content.tsx b/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/content.tsx
index 70f202d8421a..4f850815e84d 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/content.tsx
@@ -76,7 +76,7 @@ export function Content({
     isError,
   } = useApiQuery<{data: ApiResult[]}>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: apiPayload},
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/index.tsx b/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/index.tsx
index 6725435a211a..e593a6f9d999 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/durationPercentileChart/index.tsx
@@ -34,7 +34,7 @@ export function DurationPercentileChart({currentFilter, ...props}: Props) {
         position="top"
         size="sm"
         title={t(
-          'Compare the duration at each percentile. Compare with Latency Histogram to see transaction volume at duration intervals.'
+          `Compare the duration at each percentile. Compare with Latency Histogram to see transaction volume at duration intervals.`
         )}
       />
     </HeaderTitleLegend>
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/eapChartsWidget.tsx b/static/app/views/performance/transactionSummary/transactionOverview/eapChartsWidget.tsx
index 3f8aba1c793f..163aec36d36f 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/eapChartsWidget.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/eapChartsWidget.tsx
@@ -34,7 +34,7 @@ const WIDGET_OPTIONS: Record<
     title: t('Duration Percentiles'),
     spanCategoryTitle: t('Span Category Percentiles'),
     description: t(
-      'Compare the duration at each percentile. Compare with Latency Histogram to see transaction volume at duration intervals.'
+      `Compare the duration at each percentile. Compare with Latency Histogram to see transaction volume at duration intervals.`
     ),
     disabled: false,
   },
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx
index 5809a9423868..76e4acedf64b 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/index.spec.tsx
@@ -400,7 +400,7 @@ describe('Performance > TransactionSummary', () => {
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/key-transactions-list/',
+      url: `/organizations/org-slug/key-transactions-list/`,
       body: teams.map(({id}) => ({
         team: id,
         count: 0,
@@ -431,7 +431,7 @@ describe('Performance > TransactionSummary', () => {
     });
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/metrics-compatibility/',
+      url: `/organizations/org-slug/metrics-compatibility/`,
       body: {
         compatible_projects: [],
         incompatible_projecs: [],
@@ -440,7 +440,7 @@ describe('Performance > TransactionSummary', () => {
 
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/metrics-compatibility-sums/',
+      url: `/organizations/org-slug/metrics-compatibility-sums/`,
       body: {
         sum: {
           metrics: 100,
@@ -801,7 +801,7 @@ describe('Performance > TransactionSummary', () => {
       renderWithLayout(data);
 
       const mockUpdate = MockApiClient.addMockResponse({
-        url: '/organizations/org-slug/key-transactions/',
+        url: `/organizations/org-slug/key-transactions/`,
         method: 'POST',
         body: {},
       });
@@ -1058,7 +1058,7 @@ describe('Performance > TransactionSummary', () => {
     it('does not use MEP dataset for stats query if cardinality fallback fails', async () => {
       MockApiClient.addMockResponse({
         method: 'GET',
-        url: '/organizations/org-slug/metrics-compatibility-sums/',
+        url: `/organizations/org-slug/metrics-compatibility-sums/`,
         body: {
           sum: {
             metrics: 100,
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/latencyChart/index.tsx b/static/app/views/performance/transactionSummary/transactionOverview/latencyChart/index.tsx
index 17788d391425..9cc00cedcda1 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/latencyChart/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/latencyChart/index.tsx
@@ -30,7 +30,7 @@ export function LatencyChart({currentFilter, ...props}: Props) {
         position="top"
         size="sm"
         title={t(
-          'Duration Distribution reflects the volume of transactions per median duration.'
+          `Duration Distribution reflects the volume of transactions per median duration.`
         )}
       />
     </HeaderTitleLegend>
diff --git a/static/app/views/performance/transactionSummary/transactionOverview/vitalsChart/index.tsx b/static/app/views/performance/transactionSummary/transactionOverview/vitalsChart/index.tsx
index f5946e575384..5036e6a8bee4 100644
--- a/static/app/views/performance/transactionSummary/transactionOverview/vitalsChart/index.tsx
+++ b/static/app/views/performance/transactionSummary/transactionOverview/vitalsChart/index.tsx
@@ -114,7 +114,7 @@ export function VitalsChart({
         size="sm"
         position="top"
         title={t(
-          'Web Vitals Breakdown reflects the 75th percentile of web vitals over time.'
+          `Web Vitals Breakdown reflects the 75th percentile of web vitals over time.`
         )}
       />
     </HeaderTitleLegend>
diff --git a/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx b/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
index 04cdf3b07d21..6c8a75976857 100644
--- a/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
+++ b/static/app/views/performance/transactionSummary/transactionProfiles/content.tsx
@@ -322,8 +322,8 @@ const CollapseExpandButton = styled(Button)`
 function IconDoubleChevron(props: React.ComponentProps<typeof IconChevron>) {
   return (
     <Flex>
-      <IconChevron style={{marginRight: '-3px'}} {...props} />
-      <IconChevron style={{marginLeft: '-3px'}} {...props} />
+      <IconChevron style={{marginRight: `-3px`}} {...props} />
+      <IconChevron style={{marginLeft: `-3px`}} {...props} />
     </Flex>
   );
 }
diff --git a/static/app/views/performance/transactionSummary/transactionReplays/index.spec.tsx b/static/app/views/performance/transactionSummary/transactionReplays/index.spec.tsx
index 4789cf4a597a..7c71ab35ad39 100644
--- a/static/app/views/performance/transactionSummary/transactionReplays/index.spec.tsx
+++ b/static/app/views/performance/transactionSummary/transactionReplays/index.spec.tsx
@@ -80,7 +80,7 @@ describe('TransactionReplays', () => {
   beforeEach(() => {
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/organizations/org-slug/sdk-updates/',
+      url: `/organizations/org-slug/sdk-updates/`,
       body: [],
     });
     MockApiClient.addMockResponse({
diff --git a/static/app/views/performance/transactionSummary/transactionReplays/utils.ts b/static/app/views/performance/transactionSummary/transactionReplays/utils.ts
index 902da5037a52..4579d357714c 100644
--- a/static/app/views/performance/transactionSummary/transactionReplays/utils.ts
+++ b/static/app/views/performance/transactionSummary/transactionReplays/utils.ts
@@ -57,7 +57,7 @@ export function generateTransactionReplaysEventView({
 
   return EventView.fromSavedQuery({
     id: '',
-    name: 'Replay events within a transaction',
+    name: `Replay events within a transaction`,
     version: 2,
     fields,
     query: `event.type:transaction transaction:"${transactionName}" !replayId:""`,
diff --git a/static/app/views/performance/transactionSummary/utils.tsx b/static/app/views/performance/transactionSummary/utils.tsx
index 447834de0645..77bd4ae70b1e 100644
--- a/static/app/views/performance/transactionSummary/utils.tsx
+++ b/static/app/views/performance/transactionSummary/utils.tsx
@@ -1,7 +1,7 @@
-import type {UIMatch} from 'react-router-dom';
 import styled from '@emotion/styled';
 import type {Location, LocationDescriptor, Query} from 'history';
 
+import type {PlainRoute} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
 import {getDateFromTimestamp} from 'sentry/utils/dates';
 import type {TableDataRow} from 'sentry/utils/discover/discoverQuery';
@@ -223,8 +223,8 @@ export function generateProfileLink() {
   };
 }
 
-export function generateReplayLink(matches: Array<UIMatch<unknown, unknown>>) {
-  const referrer = getRouteStringFromRoutes({matches});
+export function generateReplayLink(routes: Array<PlainRoute<any>>) {
+  const referrer = getRouteStringFromRoutes(routes);
 
   return (
     organization: Organization,
diff --git a/static/app/views/performance/utils/index.tsx b/static/app/views/performance/utils/index.tsx
index ce2ddce96541..39c5877b5052 100644
--- a/static/app/views/performance/utils/index.tsx
+++ b/static/app/views/performance/utils/index.tsx
@@ -365,7 +365,7 @@ export function usePerformanceGeneralProjectSettings(projectId?: number) {
   return useApiQuery<{enable_images: boolean}>(
     [
       getApiUrl(
-        '/projects/$organizationIdOrSlug/$projectIdOrSlug/performance/configure/',
+        `/projects/$organizationIdOrSlug/$projectIdOrSlug/performance/configure/`,
         {
           path: {
             organizationIdOrSlug: organization.slug,
diff --git a/static/app/views/permissionDenied.tsx b/static/app/views/permissionDenied.tsx
index 2513aa3c186d..361af23fdf6c 100644
--- a/static/app/views/permissionDenied.tsx
+++ b/static/app/views/permissionDenied.tsx
@@ -1,5 +1,4 @@
 import {useEffect} from 'react';
-import {useMatches} from 'react-router-dom';
 import * as Sentry from '@sentry/react';
 
 import {Stack} from '@sentry/scraps/layout';
@@ -9,13 +8,14 @@ import {LoadingError} from 'sentry/components/loadingError';
 import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle';
 import {t, tct} from 'sentry/locale';
 import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
+import {useRoutes} from 'sentry/utils/useRoutes';
 
 const ERROR_NAME = 'Permission Denied';
 
 export function PermissionDenied() {
-  const matches = useMatches();
+  const routes = useRoutes();
   useEffect(() => {
-    const route = getRouteStringFromRoutes({matches});
+    const route = getRouteStringFromRoutes(routes);
     Sentry.addBreadcrumb({
       category: 'auth',
       message: `${ERROR_NAME}${route ? ` : ${route}` : ''}`,
diff --git a/static/app/views/preprod/buildComparison/main/sizeCompareMainContent.tsx b/static/app/views/preprod/buildComparison/main/sizeCompareMainContent.tsx
index 35b9a57deaa3..de8896b2866b 100644
--- a/static/app/views/preprod/buildComparison/main/sizeCompareMainContent.tsx
+++ b/static/app/views/preprod/buildComparison/main/sizeCompareMainContent.tsx
@@ -93,7 +93,7 @@ export function SizeCompareMainContent() {
   const comparisonDataQuery = useApiQuery<SizeAnalysisComparisonResults>(
     [
       getApiUrl(
-        '/projects/$organizationIdOrSlug/$projectIdOrSlug/preprodartifacts/size-analysis/compare/$headSizeMetricId/$baseSizeMetricId/download/',
+        `/projects/$organizationIdOrSlug/$projectIdOrSlug/preprodartifacts/size-analysis/compare/$headSizeMetricId/$baseSizeMetricId/download/`,
         {
           path: {
             organizationIdOrSlug: organization.slug,
diff --git a/static/app/views/preprod/buildComparison/main/treemapDiffSection.tsx b/static/app/views/preprod/buildComparison/main/treemapDiffSection.tsx
index 6f2c213aded8..4ea35d917ff0 100644
--- a/static/app/views/preprod/buildComparison/main/treemapDiffSection.tsx
+++ b/static/app/views/preprod/buildComparison/main/treemapDiffSection.tsx
@@ -116,7 +116,7 @@ export function TreemapDiffSection({diffItems}: TreemapDiffSectionProps) {
       type: 'treemap',
       animationEasing: 'quarticOut',
       animationDuration: 300,
-      height: 'calc(100% - 22px)',
+      height: `calc(100% - 22px)`,
       width: '100%',
       top: '22px',
       leafDepth: 100000,
diff --git a/static/app/views/preprod/buildDetails/buildDetails.spec.tsx b/static/app/views/preprod/buildDetails/buildDetails.spec.tsx
index eccda185af72..0db7b7129e0b 100644
--- a/static/app/views/preprod/buildDetails/buildDetails.spec.tsx
+++ b/static/app/views/preprod/buildDetails/buildDetails.spec.tsx
@@ -24,11 +24,9 @@ describe('BuildDetails', () => {
     route: '/organizations/:orgId/preprod/size/:artifactId/',
   };
 
-  const BUILD_DETAILS_URL =
-    '/organizations/org-slug/preprodartifacts/artifact-1/build-details/';
-  const SIZE_ANALYSIS_URL =
-    '/organizations/org-slug/files/preprodartifacts/artifact-1/size-analysis/';
-  const QUOTA_STATE_URL = '/organizations/org-slug/preprod/quota/';
+  const BUILD_DETAILS_URL = `/organizations/org-slug/preprodartifacts/artifact-1/build-details/`;
+  const SIZE_ANALYSIS_URL = `/organizations/org-slug/files/preprodartifacts/artifact-1/size-analysis/`;
+  const QUOTA_STATE_URL = `/organizations/org-slug/preprod/quota/`;
 
   const createMockSizeAnalysisData = () => ({
     treemap: {
diff --git a/static/app/views/preprod/buildDetails/header/useBuildDetailsActions.tsx b/static/app/views/preprod/buildDetails/header/useBuildDetailsActions.tsx
index 19ebe249a96e..1e71cf08d54c 100644
--- a/static/app/views/preprod/buildDetails/header/useBuildDetailsActions.tsx
+++ b/static/app/views/preprod/buildDetails/header/useBuildDetailsActions.tsx
@@ -47,7 +47,7 @@ export function useBuildDetailsActions({
   const {mutate: rerunAnalysis} = useMutation<void, RequestError>({
     mutationFn: () => {
       return fetchMutation({
-        url: '/internal/preprod-artifact/rerun-analysis/',
+        url: `/internal/preprod-artifact/rerun-analysis/`,
         method: 'POST',
         data: {
           preprod_artifact_id: artifactId,
diff --git a/static/app/views/preprod/buildDetails/main/insights/appSizeInsightsSidebarRow.tsx b/static/app/views/preprod/buildDetails/main/insights/appSizeInsightsSidebarRow.tsx
index 08e90a521068..e9dfd59232c1 100644
--- a/static/app/views/preprod/buildDetails/main/insights/appSizeInsightsSidebarRow.tsx
+++ b/static/app/views/preprod/buildDetails/main/insights/appSizeInsightsSidebarRow.tsx
@@ -38,7 +38,7 @@ export function formatUpside(percentage: number): string {
     return `-${formatPercentage(percentage, 1)}`;
   }
   // Format smaller than 0.001 (so 0.1%) as "(~0%)"
-  return '~0%';
+  return `~0%`;
 }
 
 const INSIGHTS_WITH_MORE_INFO_MODAL = [
diff --git a/static/app/views/preprod/buildDetails/main/insights/stripDebugSymbolsModal.tsx b/static/app/views/preprod/buildDetails/main/insights/stripDebugSymbolsModal.tsx
index bb6ec3d1d92e..80515ed84146 100644
--- a/static/app/views/preprod/buildDetails/main/insights/stripDebugSymbolsModal.tsx
+++ b/static/app/views/preprod/buildDetails/main/insights/stripDebugSymbolsModal.tsx
@@ -7,7 +7,7 @@ import {openInsightInfoModal} from 'sentry/actionCreators/modal';
 import {t} from 'sentry/locale';
 import {CodeBlockWrapper} from 'sentry/views/preprod/buildDetails/main/insights/insightInfoModal';
 
-const STRIP_SINGLE_BINARY = 'strip -rSTx AppBinary -o AppBinaryStripped';
+const STRIP_SINGLE_BINARY = `strip -rSTx AppBinary -o AppBinaryStripped`;
 
 const STRIP_BUILD_SCRIPT = `#!/bin/bash
 set -e
diff --git a/static/app/views/preprod/components/preprodQuotaAlert.tsx b/static/app/views/preprod/components/preprodQuotaAlert.tsx
index 7c0d72c90682..9e1f6e6a545f 100644
--- a/static/app/views/preprod/components/preprodQuotaAlert.tsx
+++ b/static/app/views/preprod/components/preprodQuotaAlert.tsx
@@ -14,7 +14,7 @@ export function PreprodQuotaAlert({system}: {system?: boolean}) {
     hasSizeQuota: boolean;
   }>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/preprod/quota/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/preprod/quota/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/app/views/preprod/components/visualizations/appSizeTreemap.tsx b/static/app/views/preprod/components/visualizations/appSizeTreemap.tsx
index 01d8e78be785..0a22b7d7777f 100644
--- a/static/app/views/preprod/components/visualizations/appSizeTreemap.tsx
+++ b/static/app/views/preprod/components/visualizations/appSizeTreemap.tsx
@@ -288,7 +288,7 @@ export function AppSizeTreemap(props: AppSizeTreemapProps) {
       type: 'treemap',
       animationEasing: 'quarticOut',
       animationDuration: 300,
-      height: 'calc(100% - 22px)',
+      height: `calc(100% - 22px)`,
       width: '100%',
       top: '22px',
       // Controls how many levels deep to render at once.
diff --git a/static/app/views/preprod/snapshots/header/snapshotHeaderActions.tsx b/static/app/views/preprod/snapshots/header/snapshotHeaderActions.tsx
index 44761cf64f2e..ded2ee207b88 100644
--- a/static/app/views/preprod/snapshots/header/snapshotHeaderActions.tsx
+++ b/static/app/views/preprod/snapshots/header/snapshotHeaderActions.tsx
@@ -5,7 +5,6 @@ import {Tag} from '@sentry/scraps/badge';
 import {Button} from '@sentry/scraps/button';
 import {Flex} from '@sentry/scraps/layout';
 import {Text} from '@sentry/scraps/text';
-import {Tooltip} from '@sentry/scraps/tooltip';
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {Client} from 'sentry/api';
@@ -16,7 +15,6 @@ import {
   IconCheckmark,
   IconDelete,
   IconEllipsis,
-  IconInfo,
   IconRefresh,
   IconThumb,
   IconTimer,
@@ -49,7 +47,6 @@ export function SnapshotHeaderActions({
   const [isDeleting, setIsDeleting] = useState(false);
 
   const isApproved = data.approval_info?.status === 'approved';
-  const isAutoApproved = data.approval_info?.is_auto_approved ?? false;
   const approvers: AvatarUser[] = (data.approval_info?.approvers ?? []).map((a, i) => ({
     id: a.id ?? `approver-${i}`,
     name: a.name ?? '',
@@ -151,22 +148,9 @@ export function SnapshotHeaderActions({
       {data.approval_info &&
         (isApproved ? (
           <Flex align="center" gap="xl">
-            <Flex align="center" gap="xs">
-              <Tag variant="success" icon={<IconCheckmark />}>
-                {isAutoApproved ? t('Auto-approved') : t('Approved')}
-              </Tag>
-              {isAutoApproved && (
-                <Tooltip
-                  title={t(
-                    'Automatically approved because the changes match a previously approved build on this PR.'
-                  )}
-                >
-                  <Flex align="center">
-                    <IconInfo size="sm" />
-                  </Flex>
-                </Tooltip>
-              )}
-            </Flex>
+            <Tag variant="success" icon={<IconCheckmark />}>
+              {t('Approved')}
+            </Tag>
             {approvers.length > 0 && (
               <AvatarList users={approvers} avatarSize={24} maxVisibleAvatars={2} />
             )}
diff --git a/static/app/views/preprod/types/snapshotTypes.ts b/static/app/views/preprod/types/snapshotTypes.ts
index 255b4e2fd3f1..fa9dbfb9480e 100644
--- a/static/app/views/preprod/types/snapshotTypes.ts
+++ b/static/app/views/preprod/types/snapshotTypes.ts
@@ -36,7 +36,6 @@ export interface SnapshotApprover {
 export interface SnapshotApprovalInfo {
   approvers: SnapshotApprover[];
   status: 'approved' | 'requires_approval';
-  is_auto_approved?: boolean;
 }
 
 export interface SnapshotDetailsApiResponse {
diff --git a/static/app/views/profiling/content.tsx b/static/app/views/profiling/content.tsx
index 131d6c24506e..8b3f3b0fa1e5 100644
--- a/static/app/views/profiling/content.tsx
+++ b/static/app/views/profiling/content.tsx
@@ -397,6 +397,7 @@ function ProfilingContentPageHeader() {
 const ALL_FIELDS = [
   'transaction',
   'project.id',
+  'last_seen()',
   'p50()',
   'p75()',
   'p95()',
diff --git a/static/app/views/profiling/landingAggregateFlamegraph.tsx b/static/app/views/profiling/landingAggregateFlamegraph.tsx
index 8dcceffb5b05..c672c06eaaa4 100644
--- a/static/app/views/profiling/landingAggregateFlamegraph.tsx
+++ b/static/app/views/profiling/landingAggregateFlamegraph.tsx
@@ -159,8 +159,8 @@ const CollapseExpandButton = styled(Button)`
 function IconDoubleChevron(props: React.ComponentProps<typeof IconChevron>) {
   return (
     <Flex>
-      <IconChevron style={{marginRight: '-3px'}} {...props} />
-      <IconChevron style={{marginLeft: '-3px'}} {...props} />
+      <IconChevron style={{marginRight: `-3px`}} {...props} />
+      <IconChevron style={{marginLeft: `-3px`}} {...props} />
     </Flex>
   );
 }
diff --git a/static/app/views/projectDetail/charts/projectErrorsBasicChart.tsx b/static/app/views/projectDetail/charts/projectErrorsBasicChart.tsx
index 3024065f2b79..4c7656a979a5 100644
--- a/static/app/views/projectDetail/charts/projectErrorsBasicChart.tsx
+++ b/static/app/views/projectDetail/charts/projectErrorsBasicChart.tsx
@@ -37,7 +37,7 @@ export function ProjectErrorsBasicChart({projectId, onTotalValuesChange}: Props)
     isSuccess,
   } = useApiQuery<Project[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/projects/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/projects/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/projectDetail/charts/projectSessionsAnrRequest.tsx b/static/app/views/projectDetail/charts/projectSessionsAnrRequest.tsx
index d8455a8953d2..9aa5fe2ed80e 100644
--- a/static/app/views/projectDetail/charts/projectSessionsAnrRequest.tsx
+++ b/static/app/views/projectDetail/charts/projectSessionsAnrRequest.tsx
@@ -85,7 +85,7 @@ export function ProjectSessionsAnrRequest({
 
   const {data, isRefetching, isError} = useApiQuery<SessionApiResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sessions/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sessions/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: queryParams},
diff --git a/static/app/views/projectDetail/projectCharts.spec.tsx b/static/app/views/projectDetail/projectCharts.spec.tsx
index 8ebd83b7eb4a..3a2e0ed7271f 100644
--- a/static/app/views/projectDetail/projectCharts.spec.tsx
+++ b/static/app/views/projectDetail/projectCharts.spec.tsx
@@ -38,14 +38,14 @@ describe('ProjectDetail > ProjectCharts', () => {
   let mockSessions: jest.Mock;
   beforeEach(() => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/releases/stats/',
+      url: `/organizations/org-slug/releases/stats/`,
       body: [],
     });
 
     mockSessions = MockApiClient.addMockResponse({
       method: 'GET',
       url: '/organizations/org-slug/sessions/',
-      body: SessionsFieldFixture('sum(session)'),
+      body: SessionsFieldFixture(`sum(session)`),
     });
   });
 
diff --git a/static/app/views/projectDetail/projectCharts.tsx b/static/app/views/projectDetail/projectCharts.tsx
index 2cbe0f738268..d18e1ab681e8 100644
--- a/static/app/views/projectDetail/projectCharts.tsx
+++ b/static/app/views/projectDetail/projectCharts.tsx
@@ -363,7 +363,7 @@ class ProjectCharts extends Component<Props, State> {
                     query ?? '',
                   ]).formatString()}
                   yAxis="failure_rate()"
-                  field={['failure_rate()']}
+                  field={[`failure_rate()`]}
                   api={api}
                   location={location}
                   organization={organization}
@@ -383,7 +383,7 @@ class ProjectCharts extends Component<Props, State> {
                     query ?? '',
                   ]).formatString()}
                   yAxis="tpm()"
-                  field={['tpm()']}
+                  field={[`tpm()`]}
                   api={api}
                   location={location}
                   organization={organization}
@@ -404,7 +404,7 @@ class ProjectCharts extends Component<Props, State> {
                       query ?? '',
                     ]).formatString()}
                     yAxis="count()"
-                    field={['count()']}
+                    field={[`count()`]}
                     api={api}
                     location={location}
                     organization={organization}
@@ -432,7 +432,7 @@ class ProjectCharts extends Component<Props, State> {
                     query ?? '',
                   ]).formatString()}
                   yAxis="count()"
-                  field={['count()']}
+                  field={[`count()`]}
                   api={api}
                   location={location}
                   organization={organization}
diff --git a/static/app/views/projectDetail/projectIssues.tsx b/static/app/views/projectDetail/projectIssues.tsx
index 069199f0b35a..557e4246bef3 100644
--- a/static/app/views/projectDetail/projectIssues.tsx
+++ b/static/app/views/projectDetail/projectIssues.tsx
@@ -150,7 +150,7 @@ export function ProjectIssues({organization, location, projectId, query, api}: P
   function getDiscoverUrl() {
     return {
       pathname: makeDiscoverPathname({
-        path: '/results/',
+        path: `/results/`,
         organization,
       }),
       query: {
diff --git a/static/app/views/projectDetail/projectLatestAlerts.tsx b/static/app/views/projectDetail/projectLatestAlerts.tsx
index 42537f485171..e89792f57c3f 100644
--- a/static/app/views/projectDetail/projectLatestAlerts.tsx
+++ b/static/app/views/projectDetail/projectLatestAlerts.tsx
@@ -97,7 +97,7 @@ export function ProjectLatestAlerts({
     isError: unresolvedAlertsIsError,
   } = useApiQuery<Incident[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/incidents/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/incidents/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {...query, status: 'open'}},
@@ -110,7 +110,7 @@ export function ProjectLatestAlerts({
     isError: resolvedAlertsIsError,
   } = useApiQuery<Incident[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/incidents/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/incidents/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {...query, status: 'closed'}},
@@ -126,7 +126,7 @@ export function ProjectLatestAlerts({
   // This is only used to determine if we should show the "Create Alert" button
   const {data: alertRules = [], isPending: alertRulesLoading} = useApiQuery<any[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/alert-rules/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/alert-rules/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -180,7 +180,7 @@ export function ProjectLatestAlerts({
         <StyledIconLink
           to={{
             pathname: makeAlertsPathname({
-              path: '/',
+              path: `/`,
               organization,
             }),
             query: {
diff --git a/static/app/views/projectDetail/projectLatestReleases.tsx b/static/app/views/projectDetail/projectLatestReleases.tsx
index 3a9b0f368084..66580dee4f34 100644
--- a/static/app/views/projectDetail/projectLatestReleases.tsx
+++ b/static/app/views/projectDetail/projectLatestReleases.tsx
@@ -66,7 +66,7 @@ function useHasOlderReleases({
 
   const {data: olderReleases, isPending} = useApiQuery<Release[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/releases/stats/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/releases/stats/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -168,7 +168,7 @@ export function ProjectLatestReleases({
     isError,
   } = useApiQuery<Release[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/releases/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/releases/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectSlug},
       }),
       {
diff --git a/static/app/views/projectDetail/projectScoreCards/projectApdexScoreCard.tsx b/static/app/views/projectDetail/projectScoreCards/projectApdexScoreCard.tsx
index d1f15328eb46..494018817f40 100644
--- a/static/app/views/projectDetail/projectScoreCards/projectApdexScoreCard.tsx
+++ b/static/app/views/projectDetail/projectScoreCards/projectApdexScoreCard.tsx
@@ -57,7 +57,7 @@ const useApdex = (props: Props) => {
 
   const currentQuery = useApiQuery<TableData>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -78,7 +78,7 @@ const useApdex = (props: Props) => {
 
   const previousQuery = useApiQuery<TableData>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/projectDetail/projectScoreCards/projectStabilityScoreCard.tsx b/static/app/views/projectDetail/projectScoreCards/projectStabilityScoreCard.tsx
index c2a606c1bfef..4569b0317445 100644
--- a/static/app/views/projectDetail/projectScoreCards/projectStabilityScoreCard.tsx
+++ b/static/app/views/projectDetail/projectScoreCards/projectStabilityScoreCard.tsx
@@ -61,7 +61,7 @@ const useCrashFreeRate = (props: Props) => {
 
   const currentQuery = useApiQuery<SessionApiResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sessions/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sessions/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -82,7 +82,7 @@ const useCrashFreeRate = (props: Props) => {
 
   const previousQuery = useApiQuery<SessionApiResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sessions/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sessions/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/projectDetail/projectScoreCards/projectVelocityScoreCard.tsx b/static/app/views/projectDetail/projectScoreCards/projectVelocityScoreCard.tsx
index 48172c142561..82860693914b 100644
--- a/static/app/views/projectDetail/projectScoreCards/projectVelocityScoreCard.tsx
+++ b/static/app/views/projectDetail/projectScoreCards/projectVelocityScoreCard.tsx
@@ -46,7 +46,7 @@ const useReleaseCount = (props: Props) => {
 
   const currentQuery = useApiQuery<Release[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/releases/stats/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/releases/stats/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -67,7 +67,7 @@ const useReleaseCount = (props: Props) => {
 
   const previousQuery = useApiQuery<Release[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/releases/stats/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/releases/stats/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -95,7 +95,7 @@ const useReleaseCount = (props: Props) => {
 
   const allTimeQuery = useApiQuery<Release[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/releases/stats/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/releases/stats/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/projectEventRedirect.tsx b/static/app/views/projectEventRedirect.tsx
index 5e39a00e27b3..34d2ef4f54ea 100644
--- a/static/app/views/projectEventRedirect.tsx
+++ b/static/app/views/projectEventRedirect.tsx
@@ -45,7 +45,7 @@ export function ProjectEventRedirect() {
   } = useApiQuery<Event>(
     [
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/events/$projectIdOrSlug:$eventId/',
+        `/organizations/$organizationIdOrSlug/events/$projectIdOrSlug:$eventId/`,
         {
           path: {
             organizationIdOrSlug: organization.slug,
diff --git a/static/app/views/projectInstall/createProject.spec.tsx b/static/app/views/projectInstall/createProject.spec.tsx
index 8b6d7df50c1c..5d1a32b7cf78 100644
--- a/static/app/views/projectInstall/createProject.spec.tsx
+++ b/static/app/views/projectInstall/createProject.spec.tsx
@@ -90,7 +90,7 @@ describe('CreateProject', () => {
     TeamStore.loadUserTeams([teamNoAccess]);
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/integrations/',
+      url: `/organizations/org-slug/integrations/`,
       body: [integration],
       match: [MockApiClient.matchQuery({integrationType: 'messaging'})],
     });
diff --git a/static/app/views/projectInstall/gettingStarted.spec.tsx b/static/app/views/projectInstall/gettingStarted.spec.tsx
index 25f635873e75..1ddd67851a07 100644
--- a/static/app/views/projectInstall/gettingStarted.spec.tsx
+++ b/static/app/views/projectInstall/gettingStarted.spec.tsx
@@ -44,7 +44,7 @@ function mockProjectApiResponses(projects: Array<Project | ProjectWithBadPlatfor
   });
 
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/sdks/',
+    url: `/organizations/org-slug/sdks/`,
     body: {},
   });
 }
diff --git a/static/app/views/projectInstall/gettingStarted.tsx b/static/app/views/projectInstall/gettingStarted.tsx
index 685d9d34a8cd..1be7999afbae 100644
--- a/static/app/views/projectInstall/gettingStarted.tsx
+++ b/static/app/views/projectInstall/gettingStarted.tsx
@@ -39,7 +39,7 @@ export default function GettingStarted() {
       ) : (
         <Redirect
           to={makeProjectsPathname({
-            path: '/new/',
+            path: `/new/`,
             organization,
           })}
         />
diff --git a/static/app/views/projectInstall/issueAlertNotificationOptions.tsx b/static/app/views/projectInstall/issueAlertNotificationOptions.tsx
index 6a08c824b65c..4228a7ab93a2 100644
--- a/static/app/views/projectInstall/issueAlertNotificationOptions.tsx
+++ b/static/app/views/projectInstall/issueAlertNotificationOptions.tsx
@@ -93,7 +93,7 @@ export function useCreateNotificationAction({
 
   const messagingIntegrationsQuery = useApiQuery<OrganizationIntegration[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {integrationType: 'messaging'}},
diff --git a/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx b/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx
index 4c652312d885..2e84bdde1dcb 100644
--- a/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx
+++ b/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx
@@ -39,7 +39,7 @@ export function MessagingIntegrationAlertRule({
   const {data: channels, isPending} = useApiQuery<ChannelListResponse>(
     [
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/integrations/$integrationId/channels/',
+        `/organizations/$organizationIdOrSlug/integrations/$integrationId/channels/`,
         {
           path: {
             organizationIdOrSlug: organization.slug,
diff --git a/static/app/views/projectInstall/otherPlatformsInfo.tsx b/static/app/views/projectInstall/otherPlatformsInfo.tsx
index 74788049943b..6c56ac7827c9 100644
--- a/static/app/views/projectInstall/otherPlatformsInfo.tsx
+++ b/static/app/views/projectInstall/otherPlatformsInfo.tsx
@@ -30,7 +30,7 @@ export function OtherPlatformsInfo({
     refetch,
   } = useApiQuery<ProjectKey[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectSlug},
       }),
     ],
diff --git a/static/app/views/projectInstall/platform.spec.tsx b/static/app/views/projectInstall/platform.spec.tsx
index 3430a38ea2d7..9122a67aceae 100644
--- a/static/app/views/projectInstall/platform.spec.tsx
+++ b/static/app/views/projectInstall/platform.spec.tsx
@@ -57,7 +57,7 @@ function mockProjectApiResponses(projects: Array<Project | ProjectWithBadPlatfor
   });
 
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/sdks/',
+    url: `/organizations/org-slug/sdks/`,
     body: {},
   });
 }
diff --git a/static/app/views/projectInstall/platform.tsx b/static/app/views/projectInstall/platform.tsx
index 9e8c7e5af66b..cc7d7fe91415 100644
--- a/static/app/views/projectInstall/platform.tsx
+++ b/static/app/views/projectInstall/platform.tsx
@@ -113,7 +113,7 @@ export function ProjectInstallPlatform({project, platform}: Props) {
                 <Alert.Container>
                   <StyledAlert variant="info">
                     {t(
-                      'Your selected platform supports performance, but your organization does not have performance enabled.'
+                      `Your selected platform supports performance, but your organization does not have performance enabled.`
                     )}
                   </StyledAlert>
                 </Alert.Container>
diff --git a/static/app/views/projectInstall/useValidateChannel.ts b/static/app/views/projectInstall/useValidateChannel.ts
index b061414ada2c..11098c5996cd 100644
--- a/static/app/views/projectInstall/useValidateChannel.ts
+++ b/static/app/views/projectInstall/useValidateChannel.ts
@@ -29,7 +29,7 @@ export function useValidateChannel({
   const queryKey: ApiQueryKey = useMemo(
     () => [
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/integrations/$integrationId/channel-validate/',
+        `/organizations/$organizationIdOrSlug/integrations/$integrationId/channel-validate/`,
         {
           path: {
             organizationIdOrSlug: organization.slug,
diff --git a/static/app/views/pullRequest/details/main/pullRequestDetailsSizeContent.tsx b/static/app/views/pullRequest/details/main/pullRequestDetailsSizeContent.tsx
index 0c6a0e23bfad..371e81bf7006 100644
--- a/static/app/views/pullRequest/details/main/pullRequestDetailsSizeContent.tsx
+++ b/static/app/views/pullRequest/details/main/pullRequestDetailsSizeContent.tsx
@@ -84,7 +84,7 @@ export function PullRequestDetailsSizeContent({
           </SelectContainer>
         </Flex>
       )}
-      <Grid areas='"main sidebar"' columns="1fr 325px" gap="3xl">
+      <Grid areas={`"main sidebar"`} columns="1fr 325px" gap="3xl">
         <Flex area="sidebar">
           {buildDetails.length > 0 && (
             <BuildDetailsSidebarContent
diff --git a/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx b/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx
index 97c69d0ade75..7cafd7376c9d 100644
--- a/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx
+++ b/static/app/views/releases/detail/commitsAndFiles/filesChanged.tsx
@@ -1,5 +1,4 @@
 import {Fragment, useContext} from 'react';
-import {useQuery} from '@tanstack/react-query';
 
 import * as Layout from 'sentry/components/layouts/thirds';
 import {LoadingError} from 'sentry/components/loadingError';
@@ -13,7 +12,6 @@ import {t, tn} from 'sentry/locale';
 import type {Repository} from 'sentry/types/integrations';
 import type {Organization} from 'sentry/types/organization';
 import type {Project} from 'sentry/types/project';
-import {selectJsonWithHeaders} from 'sentry/utils/api/apiOptions';
 import {routeTitleGen} from 'sentry/utils/routeTitle';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
@@ -27,7 +25,7 @@ import {
   getQuery,
   getReposToRender,
 } from 'sentry/views/releases/detail/utils';
-import {releaseCommitFilesApiOptions} from 'sentry/views/releases/utils/releaseCommitFilesApiOptions';
+import {useReleaseCommitFiles} from 'sentry/views/releases/utils/useReleaseCommitFiles';
 
 import {EmptyState, NoReleaseRepos, NoRepositories} from './emptyState';
 import {FileChange} from './fileChange';
@@ -47,24 +45,20 @@ function FilesChangedList({organization, releaseRepos, projectSlug}: FilesChange
 
   const query = getQuery({location});
   const {
-    data,
+    data: fileList = [],
     isPending: isLoadingFileList,
     error: fileListError,
     refetch,
-  } = useQuery({
-    ...releaseCommitFilesApiOptions({
-      organization,
-      release: params.release,
-      activeRepository: activeReleaseRepo,
-      ...query,
-    }),
-    select: selectJsonWithHeaders,
+    getResponseHeader,
+  } = useReleaseCommitFiles({
+    release: params.release,
+    activeRepository: activeReleaseRepo,
+    ...query,
   });
-  const fileList = data?.json ?? [];
 
   const filesByRepository = getFilesByRepository(fileList);
   const reposToRender = getReposToRender(Object.keys(filesByRepository));
-  const fileListPageLinks = data?.headers.Link;
+  const fileListPageLinks = getResponseHeader?.('Link');
 
   return (
     <Fragment>
diff --git a/static/app/views/releases/detail/commitsAndFiles/releaseCommit.tsx b/static/app/views/releases/detail/commitsAndFiles/releaseCommit.tsx
index 56a69969618e..0d7e4de48e0f 100644
--- a/static/app/views/releases/detail/commitsAndFiles/releaseCommit.tsx
+++ b/static/app/views/releases/detail/commitsAndFiles/releaseCommit.tsx
@@ -39,7 +39,7 @@ export function ReleaseCommit({commit}: ReleaseCommitProps) {
 
       if (!commit.author?.email) {
         Sentry.captureException(
-          new Error('Commit author has no email or id, invite flow is broken.')
+          new Error(`Commit author has no email or id, invite flow is broken.`)
         );
         return;
       }
diff --git a/static/app/views/releases/detail/header/releaseActions.tsx b/static/app/views/releases/detail/header/releaseActions.tsx
index 435d6ed52bc4..e22e756ace86 100644
--- a/static/app/views/releases/detail/header/releaseActions.tsx
+++ b/static/app/views/releases/detail/header/releaseActions.tsx
@@ -126,7 +126,7 @@ export function ReleaseActions({projectSlug, release, releaseMeta, refetchData}:
   }
 
   function handleNavigationClick(direction: string) {
-    trackAnalytics('release_detail.pagination', {
+    trackAnalytics(`release_detail.pagination`, {
       organization,
       direction,
     });
diff --git a/static/app/views/releases/detail/header/releaseHeader.tsx b/static/app/views/releases/detail/header/releaseHeader.tsx
index 4e7261d7cf60..e1ffebb6a4cd 100644
--- a/static/app/views/releases/detail/header/releaseHeader.tsx
+++ b/static/app/views/releases/detail/header/releaseHeader.tsx
@@ -61,7 +61,7 @@ export function ReleaseHeader({
         ),
       }),
       textValue: t('Commits %s', formatAbbreviatedNumber(commitCount)),
-      to: 'commits/',
+      to: `commits/`,
     },
     {
       title: tct('Files Changed [count]', {
@@ -72,7 +72,7 @@ export function ReleaseHeader({
         ),
       }),
       textValue: t('Files Changed %s', formatAbbreviatedNumber(commitFilesChanged)),
-      to: 'files-changed/',
+      to: `files-changed/`,
     },
   ];
 
@@ -97,7 +97,7 @@ export function ReleaseHeader({
         ),
     }),
     textValue: t('Mobile Builds %s', numberOfMobileBuilds),
-    to: 'builds/',
+    to: `builds/`,
   };
 
   if (
diff --git a/static/app/views/releases/detail/index.tsx b/static/app/views/releases/detail/index.tsx
index 02bed66c833b..c33e8e3a3dad 100644
--- a/static/app/views/releases/detail/index.tsx
+++ b/static/app/views/releases/detail/index.tsx
@@ -120,7 +120,7 @@ function ReleasesDetail({
     error: sessionsError,
   } = useApiQuery<SessionApiResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sessions/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sessions/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/releases/detail/overview/releaseComparisonChart/index.spec.tsx b/static/app/views/releases/detail/overview/releaseComparisonChart/index.spec.tsx
index 117573c0fe0e..367e3eeaf6f1 100644
--- a/static/app/views/releases/detail/overview/releaseComparisonChart/index.spec.tsx
+++ b/static/app/views/releases/detail/overview/releaseComparisonChart/index.spec.tsx
@@ -66,7 +66,7 @@ describe('Releases > Detail > Overview > ReleaseComparison', () => {
     expect(
       screen.getByTestId('release-comparison-table').textContent
     ).toMatchInlineSnapshot(
-      '"DescriptionAll ReleasesThis ReleaseChangeCrash Free Session Rate99.516%95.006%4.51% Crash Free User Rate99.908%75%24.908% Show 2 Others"'
+      `"DescriptionAll ReleasesThis ReleaseChangeCrash Free Session Rate99.516%95.006%4.51% Crash Free User Rate99.908%75%24.908% Show 2 Others"`
     );
   });
 
@@ -133,7 +133,7 @@ describe('Releases > Detail > Overview > ReleaseComparison', () => {
     expect(
       screen.getByTestId('release-comparison-table').textContent
     ).toMatchInlineSnapshot(
-      '"DescriptionAll ReleasesThis ReleaseChangeCrash Free Session Rate99.516%95.006%4.51% Healthy98.564%94.001%4.563% Abnormal0%0%0% Errored0.953%1.005%0.052% Unhandled0%0%0% Crashed Session Rate0.484%4.994%4.511% Crash Free User Rate99.908%75%24.908% Healthy98.994%72.022%26.972% Abnormal0%0%0% Errored0.914%2.493%1.579% Unhandled0%0%0% Crashed User Rate0.092%25.485%25.393% Session Count205K9.8K—User Count100K361—Hide 2 Others"'
+      `"DescriptionAll ReleasesThis ReleaseChangeCrash Free Session Rate99.516%95.006%4.51% Healthy98.564%94.001%4.563% Abnormal0%0%0% Errored0.953%1.005%0.052% Unhandled0%0%0% Crashed Session Rate0.484%4.994%4.511% Crash Free User Rate99.908%75%24.908% Healthy98.994%72.022%26.972% Abnormal0%0%0% Errored0.914%2.493%1.579% Unhandled0%0%0% Crashed User Rate0.092%25.485%25.393% Session Count205K9.8K—User Count100K361—Hide 2 Others"`
     );
 
     // toggle back
diff --git a/static/app/views/releases/detail/overview/releaseIssues.tsx b/static/app/views/releases/detail/overview/releaseIssues.tsx
index 7d4440be5dc4..b1b424778c15 100644
--- a/static/app/views/releases/detail/overview/releaseIssues.tsx
+++ b/static/app/views/releases/detail/overview/releaseIssues.tsx
@@ -373,7 +373,7 @@ class ReleaseIssues extends Component<Props, State> {
             id={DemoTourStep.RELEASES_ISSUES}
             title={t('New and regressed issues')}
             description={t(
-              'Along with reviewing how your release is trending over time compared to previous releases, you can view new and regressed issues here.'
+              `Along with reviewing how your release is trending over time compared to previous releases, you can view new and regressed issues here.`
             )}
             position="top-start"
           >
diff --git a/static/app/views/releases/detail/overview/sidebar/releaseAdoption.tsx b/static/app/views/releases/detail/overview/sidebar/releaseAdoption.tsx
index 7e86f2b13128..8d703817ce64 100644
--- a/static/app/views/releases/detail/overview/sidebar/releaseAdoption.tsx
+++ b/static/app/views/releases/detail/overview/sidebar/releaseAdoption.tsx
@@ -256,7 +256,7 @@ export function ReleaseAdoption({
                   </Tag>
                 </Tooltip>
                 <AdoptionEnvironment>
-                  {tct('in [environment]', {environment})}
+                  {tct(`in [environment]`, {environment})}
                 </AdoptionEnvironment>
               </div>
             ) : (
diff --git a/static/app/views/releases/drawer/filesChangedList.tsx b/static/app/views/releases/drawer/filesChangedList.tsx
index 7e06fcae95e2..b9e23729ae3a 100644
--- a/static/app/views/releases/drawer/filesChangedList.tsx
+++ b/static/app/views/releases/drawer/filesChangedList.tsx
@@ -1,5 +1,4 @@
 import {Fragment} from 'react';
-import {useQuery} from '@tanstack/react-query';
 
 import {Container} from '@sentry/scraps/layout';
 
@@ -11,17 +10,15 @@ import {PanelHeader} from 'sentry/components/panels/panelHeader';
 import {Placeholder} from 'sentry/components/placeholder';
 import {t, tn} from 'sentry/locale';
 import type {Repository} from 'sentry/types/integrations';
-import {selectJsonWithHeaders} from 'sentry/utils/api/apiOptions';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {useLocationQuery} from 'sentry/utils/url/useLocationQuery';
 import {useNavigate} from 'sentry/utils/useNavigate';
-import {useOrganization} from 'sentry/utils/useOrganization';
 import {EmptyState} from 'sentry/views/releases/detail/commitsAndFiles/emptyState';
 import {FileChange} from 'sentry/views/releases/detail/commitsAndFiles/fileChange';
 import {RepositorySwitcher} from 'sentry/views/releases/detail/commitsAndFiles/repositorySwitcher';
 import {getFilesByRepository, getReposToRender} from 'sentry/views/releases/detail/utils';
 import {ReleasesDrawerFields} from 'sentry/views/releases/drawer/utils';
-import {releaseCommitFilesApiOptions} from 'sentry/views/releases/utils/releaseCommitFilesApiOptions';
+import {useReleaseCommitFiles} from 'sentry/views/releases/utils/useReleaseCommitFiles';
 
 interface FilesChangedProps {
   release: string;
@@ -30,7 +27,6 @@ interface FilesChangedProps {
 
 export function FilesChangedList({releaseRepos, release}: FilesChangedProps) {
   const navigate = useNavigate();
-  const organization = useOrganization();
   const {
     [ReleasesDrawerFields.ACTIVE_REPO]: rdActiveRepo,
     [ReleasesDrawerFields.FILES_CURSOR]: rdFilesCursor,
@@ -44,24 +40,20 @@ export function FilesChangedList({releaseRepos, release}: FilesChangedProps) {
     releaseRepos.find(repo => repo.name === rdActiveRepo) ?? releaseRepos[0];
 
   const {
-    data,
+    data: fileList = [],
     isPending: isLoadingFileList,
     error: fileListError,
     refetch,
-  } = useQuery({
-    ...releaseCommitFilesApiOptions({
-      organization,
-      release,
-      activeRepository: activeReleaseRepo,
-      cursor: rdFilesCursor,
-    }),
-    select: selectJsonWithHeaders,
+    getResponseHeader,
+  } = useReleaseCommitFiles({
+    release,
+    activeRepository: activeReleaseRepo,
+    cursor: rdFilesCursor,
   });
-  const fileList = data?.json ?? [];
 
   const filesByRepository = getFilesByRepository(fileList);
   const reposToRender = getReposToRender(Object.keys(filesByRepository));
-  const fileListPageLinks = data?.headers.Link;
+  const fileListPageLinks = getResponseHeader?.('Link');
 
   return (
     <div>
diff --git a/static/app/views/releases/drawer/releasesDrawerTable.tsx b/static/app/views/releases/drawer/releasesDrawerTable.tsx
index 8cdf947419f3..8fd0bb4c33c5 100644
--- a/static/app/views/releases/drawer/releasesDrawerTable.tsx
+++ b/static/app/views/releases/drawer/releasesDrawerTable.tsx
@@ -79,7 +79,7 @@ export function ReleasesDrawerTable({
   const organization = useOrganization();
   const {data, isLoading, isError, getResponseHeader} = useApiQuery<Release[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/releases/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/releases/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/releases/list/index.spec.tsx b/static/app/views/releases/list/index.spec.tsx
index d175e0a8fed5..61d597152be6 100644
--- a/static/app/views/releases/list/index.spec.tsx
+++ b/static/app/views/releases/list/index.spec.tsx
@@ -82,7 +82,7 @@ describe('ReleasesList', () => {
     });
 
     sessionApiMock = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/sessions/',
+      url: `/organizations/org-slug/sessions/`,
       body: null,
     });
 
diff --git a/static/app/views/releases/list/index.tsx b/static/app/views/releases/list/index.tsx
index ce0c456ca807..1bbf566b9ef3 100644
--- a/static/app/views/releases/list/index.tsx
+++ b/static/app/views/releases/list/index.tsx
@@ -99,7 +99,7 @@ function makeReleaseListQueryKey({
   };
 
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/releases/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/releases/`, {
       path: {organizationIdOrSlug: organizationSlug},
     }),
     {query},
diff --git a/static/app/views/releases/list/releasesPromo.tsx b/static/app/views/releases/list/releasesPromo.tsx
index 3ad3b624d36e..7f531c0c31c5 100644
--- a/static/app/views/releases/list/releasesPromo.tsx
+++ b/static/app/views/releases/list/releasesPromo.tsx
@@ -103,7 +103,7 @@ type Props = {
 export function ReleasesPromo({organization, project}: Props) {
   const {data, isPending} = useApiQuery<SentryApp[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sentry-apps/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sentry-apps/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {status: 'internal'}},
diff --git a/static/app/views/releases/list/releasesRequest.spec.tsx b/static/app/views/releases/list/releasesRequest.spec.tsx
index 6dfb0d5d0057..7c3a3e883569 100644
--- a/static/app/views/releases/list/releasesRequest.spec.tsx
+++ b/static/app/views/releases/list/releasesRequest.spec.tsx
@@ -37,7 +37,7 @@ describe('ReleasesRequest', () => {
 
   beforeEach(() => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/sessions/',
+      url: `/organizations/org-slug/sessions/`,
       body: SessionStatusCountByReleaseInPeriodFixture(),
       match: [
         MockApiClient.matchQuery({
@@ -53,7 +53,7 @@ describe('ReleasesRequest', () => {
     });
 
     requestForAutoHealthStatsPeriodSessionHistogram = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/sessions/',
+      url: `/organizations/org-slug/sessions/`,
       body: SessionStatusCountByProjectInPeriodFixture(),
       match: [
         MockApiClient.matchQuery({
@@ -68,7 +68,7 @@ describe('ReleasesRequest', () => {
     });
 
     requestForAutoTotalCountByProjectInPeriod = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/sessions/',
+      url: `/organizations/org-slug/sessions/`,
       body: SessionTotalCountByProjectIn24hFixture(),
       match: [
         MockApiClient.matchQuery({
@@ -83,7 +83,7 @@ describe('ReleasesRequest', () => {
     });
 
     requestForAutoTotalCountByReleaseInPeriod = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/sessions/',
+      url: `/organizations/org-slug/sessions/`,
       body: SesssionTotalCountByReleaseIn24hFixture(),
       match: [
         MockApiClient.matchQuery({
@@ -115,7 +115,7 @@ describe('ReleasesRequest', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/sessions/',
+      url: `/organizations/org-slug/sessions/`,
       body: SessionTotalCountByProjectIn24hFixture(),
       match: [
         MockApiClient.matchQuery({
@@ -130,7 +130,7 @@ describe('ReleasesRequest', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/sessions/',
+      url: `/organizations/org-slug/sessions/`,
       body: SessionUserStatusCountByReleaseInPeriodFixture(),
       match: [
         MockApiClient.matchQuery({
@@ -162,7 +162,7 @@ describe('ReleasesRequest', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/sessions/',
+      url: `/organizations/org-slug/sessions/`,
       body: UserTotalCountByProjectIn24hFixture(),
       match: [
         MockApiClient.matchQuery({
diff --git a/static/app/views/releases/utils/index.tsx b/static/app/views/releases/utils/index.tsx
index d8a388fbf8e9..ae0986d4ead2 100644
--- a/static/app/views/releases/utils/index.tsx
+++ b/static/app/views/releases/utils/index.tsx
@@ -46,7 +46,7 @@ export const displayCrashFreePercent = (
   }
 
   if (formatLessThanOnePercent && percent < 1 && percent > 0) {
-    return '<1\u0025';
+    return `<1\u0025`;
   }
 
   const rounded = getCrashFreePercent(
diff --git a/static/app/views/releases/utils/releaseCommitFilesApiOptions.tsx b/static/app/views/releases/utils/releaseCommitFilesApiOptions.tsx
deleted file mode 100644
index 662a1302a9fc..000000000000
--- a/static/app/views/releases/utils/releaseCommitFilesApiOptions.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import type {CommitFile, Repository} from 'sentry/types/integrations';
-import type {Organization} from 'sentry/types/organization';
-import {apiOptions} from 'sentry/utils/api/apiOptions';
-
-// These are the URL params that our project/date/env picker generates (+ cursor for pagination)
-type PageFilterUrlParams =
-  | 'start'
-  | 'end'
-  | 'utc'
-  | 'statsPeriod'
-  | 'project'
-  | 'environment';
-type OtherUrlParams = 'cursor' | 'perPage';
-
-interface Params extends Partial<
-  Record<
-    PageFilterUrlParams | OtherUrlParams,
-    string | string[] | number | null | undefined
-  >
-> {
-  organization: Organization;
-  release: string;
-  activeRepository?: Repository;
-}
-export function releaseCommitFilesApiOptions({
-  release,
-  organization,
-  activeRepository,
-  perPage = 40,
-  ...query
-}: Params) {
-  return apiOptions.as<CommitFile[]>()(
-    '/organizations/$organizationIdOrSlug/releases/$version/commitfiles/',
-    {
-      path: {organizationIdOrSlug: organization.slug, version: release},
-      query: {
-        ...query,
-        per_page: perPage,
-        ...(activeRepository
-          ? {
-              repo_id: activeRepository.externalId,
-              repo_name: activeRepository.name,
-            }
-          : {}),
-      },
-      staleTime: Infinity,
-    }
-  );
-}
diff --git a/static/app/views/releases/utils/useReleaseCommitFiles.tsx b/static/app/views/releases/utils/useReleaseCommitFiles.tsx
new file mode 100644
index 000000000000..562f539c94c6
--- /dev/null
+++ b/static/app/views/releases/utils/useReleaseCommitFiles.tsx
@@ -0,0 +1,53 @@
+import type {CommitFile, Repository} from 'sentry/types/integrations';
+import {getApiUrl} from 'sentry/utils/api/getApiUrl';
+import {useApiQuery, type UseApiQueryOptions} from 'sentry/utils/queryClient';
+import {useOrganization} from 'sentry/utils/useOrganization';
+
+// These are the URL params that our project/date/env picker generates (+ cursor for pagination)
+type PageFilterUrlParams =
+  | 'start'
+  | 'end'
+  | 'utc'
+  | 'statsPeriod'
+  | 'project'
+  | 'environment';
+type OtherUrlParams = 'cursor' | 'perPage';
+
+interface UseReleaseCommitFilesParams extends Partial<
+  Record<
+    PageFilterUrlParams | OtherUrlParams,
+    string | string[] | number | null | undefined
+  >
+> {
+  release: string;
+  activeRepository?: Repository;
+}
+export function useReleaseCommitFiles(
+  {release, activeRepository, perPage = 40, ...query}: UseReleaseCommitFilesParams,
+  queryOptions?: UseApiQueryOptions<CommitFile[]>
+) {
+  const organization = useOrganization();
+  return useApiQuery<CommitFile[]>(
+    [
+      getApiUrl('/organizations/$organizationIdOrSlug/releases/$version/commitfiles/', {
+        path: {organizationIdOrSlug: organization.slug, version: release},
+      }),
+      {
+        query: {
+          ...query,
+          per_page: perPage,
+          ...(activeRepository
+            ? {
+                repo_id: activeRepository.externalId,
+                repo_name: activeRepository.name,
+              }
+            : {}),
+        },
+      },
+    ],
+    {
+      staleTime: Infinity,
+      ...queryOptions,
+    }
+  );
+}
diff --git a/static/app/views/releases/utils/useReleaseDetails.tsx b/static/app/views/releases/utils/useReleaseDetails.tsx
index 4dea0ccc69fe..115cf1b9c98f 100644
--- a/static/app/views/releases/utils/useReleaseDetails.tsx
+++ b/static/app/views/releases/utils/useReleaseDetails.tsx
@@ -10,7 +10,7 @@ export function useReleaseDetails(
   const organization = useOrganization();
   return useApiQuery<ReleaseWithHealth>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/releases/$version/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/releases/$version/`, {
         path: {organizationIdOrSlug: organization.slug, version: release},
       }),
       {
diff --git a/static/app/views/releases/utils/useReleaseMeta.tsx b/static/app/views/releases/utils/useReleaseMeta.tsx
index d444a299b38d..970b6e74a504 100644
--- a/static/app/views/releases/utils/useReleaseMeta.tsx
+++ b/static/app/views/releases/utils/useReleaseMeta.tsx
@@ -7,7 +7,7 @@ export function useReleaseMeta({release}: {release: string}) {
   const organization = useOrganization();
   return useApiQuery<ReleaseMeta>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/releases/$version/meta/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/releases/$version/meta/`, {
         path: {organizationIdOrSlug: organization.slug, version: release},
       }),
       {
diff --git a/static/app/views/relocation/relocation.spec.tsx b/static/app/views/relocation/relocation.spec.tsx
index 24a8ea718558..d0d78c6565bd 100644
--- a/static/app/views/relocation/relocation.spec.tsx
+++ b/static/app/views/relocation/relocation.spec.tsx
@@ -14,7 +14,7 @@ jest.mock('sentry/actionCreators/indicator');
 
 const fakeOrgSlug = 'test-org';
 const fakePromoCode = 'free-hugs';
-const fakePublicKey = 'FAKE-PK-ANY';
+const fakePublicKey = `FAKE-PK-ANY`;
 
 type FakeRegion = {
   name: string;
@@ -215,7 +215,7 @@ describe('Relocation', () => {
       // Note: only one fails, but that is enough.
       const failingFetchExistingEarthRelocation = MockApiClient.addMockResponse({
         host: fakeRegions.Earth!.url,
-        url: '/relocations/',
+        url: `/relocations/`,
         statusCode: 400,
       });
       const successfulFetchExistingMoonRelocation = MockApiClient.addMockResponse({
@@ -297,7 +297,7 @@ describe('Relocation', () => {
       // Note: only one fails, but that is enough.
       const failingFetchEarthPublicKey = MockApiClient.addMockResponse({
         host: fakeRegions.Earth!.url,
-        url: '/publickeys/relocations/',
+        url: `/publickeys/relocations/`,
         statusCode: 400,
       });
       const successfulFetchMoonPublicKey = MockApiClient.addMockResponse({
@@ -452,7 +452,7 @@ describe('Relocation', () => {
 
     it('starts relocation job if form data is available from previous steps', async () => {
       const postRelocation = MockApiClient.addMockResponse({
-        url: '/relocations/',
+        url: `/relocations/`,
         method: 'POST',
         responseJSON: [
           {
@@ -489,7 +489,7 @@ describe('Relocation', () => {
 
     it('throws error if user already has an in-progress relocation job', async () => {
       const postRelocation = MockApiClient.addMockResponse({
-        url: '/relocations/',
+        url: `/relocations/`,
         method: 'POST',
         statusCode: 409,
       });
@@ -514,7 +514,7 @@ describe('Relocation', () => {
 
     it('throws error if daily limit of relocations has been reached', async () => {
       const postRelocation = MockApiClient.addMockResponse({
-        url: '/relocations/',
+        url: `/relocations/`,
         method: 'POST',
         statusCode: 429,
       });
@@ -539,7 +539,7 @@ describe('Relocation', () => {
 
     it('throws error if user session has expired', async () => {
       const postRelocation = MockApiClient.addMockResponse({
-        url: '/relocations/',
+        url: `/relocations/`,
         method: 'POST',
         statusCode: 401,
       });
@@ -562,7 +562,7 @@ describe('Relocation', () => {
 
     it('throws error for 500 error', async () => {
       const postRelocation = MockApiClient.addMockResponse({
-        url: '/relocations/',
+        url: `/relocations/`,
         method: 'POST',
         statusCode: 500,
       });
diff --git a/static/app/views/relocation/relocation.tsx b/static/app/views/relocation/relocation.tsx
index afe46982a4c2..2377f4092e22 100644
--- a/static/app/views/relocation/relocation.tsx
+++ b/static/app/views/relocation/relocation.tsx
@@ -96,7 +96,7 @@ export function RelocationOnboarding() {
     setExistingRelocationState(LoadingState.FETCHING);
     return Promise.all(
       regions.map(region =>
-        api.requestPromise('/relocations/', {
+        api.requestPromise(`/relocations/`, {
           method: 'GET',
           host: region.url,
         })
@@ -152,7 +152,7 @@ export function RelocationOnboarding() {
     setPublicKeysState(LoadingState.FETCHING);
     return Promise.all(
       regions.map(region =>
-        api.requestPromise('/publickeys/relocations/', {
+        api.requestPromise(`/publickeys/relocations/`, {
           method: 'GET',
           host: region.url,
         })
diff --git a/static/app/views/relocation/uploadBackup.tsx b/static/app/views/relocation/uploadBackup.tsx
index 4c43d34dc0f5..b2d2db016a80 100644
--- a/static/app/views/relocation/uploadBackup.tsx
+++ b/static/app/views/relocation/uploadBackup.tsx
@@ -80,7 +80,7 @@ export function UploadBackup({relocationState, onComplete}: StepProps) {
       formData.set('promo_code', promoCode);
     }
     try {
-      const result = await api.requestPromise('/relocations/', {
+      const result = await api.requestPromise(`/relocations/`, {
         method: 'POST',
         host: regionUrl,
         data: formData,
diff --git a/static/app/views/replays/detail/ai/ai.tsx b/static/app/views/replays/detail/ai/ai.tsx
index c25d7475dc5a..cc2e21941722 100644
--- a/static/app/views/replays/detail/ai/ai.tsx
+++ b/static/app/views/replays/detail/ai/ai.tsx
@@ -267,7 +267,7 @@ function ThumbsUpDownButton({
       aria-label={t('Give feedback on the replay summary section')}
       icon={<IconThumb direction={type === 'positive' ? 'up' : 'down'} />}
       tooltipProps={{
-        title: type === 'positive' ? t('I like this') : t("I don't like this"),
+        title: type === 'positive' ? t('I like this') : t(`I don't like this`),
       }}
       size="xs"
       disabled={disabled}
diff --git a/static/app/views/replays/detail/ai/useReplaySummary.tsx b/static/app/views/replays/detail/ai/useReplaySummary.tsx
index 2394d8d81bce..d2dad90049b4 100644
--- a/static/app/views/replays/detail/ai/useReplaySummary.tsx
+++ b/static/app/views/replays/detail/ai/useReplaySummary.tsx
@@ -76,7 +76,7 @@ function createAISummaryQueryKey(
 ): ApiQueryKey {
   return [
     getApiUrl(
-      '/projects/$organizationIdOrSlug/$projectIdOrSlug/replays/$replayId/summarize/',
+      `/projects/$organizationIdOrSlug/$projectIdOrSlug/replays/$replayId/summarize/`,
       {
         path: {organizationIdOrSlug: orgSlug, projectIdOrSlug: projectSlug!, replayId},
       }
diff --git a/static/app/views/replays/detail/errorList/useErrorFilters.spec.tsx b/static/app/views/replays/detail/errorList/useErrorFilters.spec.tsx
index 746c29e2930d..baa0b150a677 100644
--- a/static/app/views/replays/detail/errorList/useErrorFilters.spec.tsx
+++ b/static/app/views/replays/detail/errorList/useErrorFilters.spec.tsx
@@ -40,7 +40,7 @@ const {
       id: 'ac43b19f1886bb41ddab96415ecb5c85',
       'issue.id': 22,
       issue: 'NEXTJS-TYPE',
-      title: "undefined is not an object (evaluating 'e.apply').",
+      title: `undefined is not an object (evaluating 'e.apply').`,
       level: 'error',
       'project.name': 'next-js',
     }),
@@ -50,7 +50,7 @@ const {
       id: '9f1886bb41ddab96415ecb5c85ac43b1',
       'issue.id': 22,
       issue: 'JAVASCRIPT-UNDEF',
-      title: 'Maximum update depth exceeded',
+      title: `Maximum update depth exceeded`,
       level: 'error',
       'project.name': 'javascript',
     }),
diff --git a/static/app/views/replays/detail/errorList/useSortErrors.spec.tsx b/static/app/views/replays/detail/errorList/useSortErrors.spec.tsx
index 49fbc8c2cdb0..efc4e113a02e 100644
--- a/static/app/views/replays/detail/errorList/useSortErrors.spec.tsx
+++ b/static/app/views/replays/detail/errorList/useSortErrors.spec.tsx
@@ -27,7 +27,7 @@ const {
       id: 'ac43b19f1886bb41ddab96415ecb5c85',
       'issue.id': 22,
       issue: 'NEXTJS-TYPE',
-      title: "undefined is not an object (evaluating 'e.apply').",
+      title: `undefined is not an object (evaluating 'e.apply').`,
       level: 'error',
       'project.name': 'next-js',
     }),
@@ -37,7 +37,7 @@ const {
       id: '9f1886bb41ddab96415ecb5c85ac43b1',
       'issue.id': 22,
       issue: 'JAVASCRIPT-UNDEF',
-      title: 'Maximum update depth exceeded',
+      title: `Maximum update depth exceeded`,
       level: 'error',
       'project.name': 'javascript',
     }),
diff --git a/static/app/views/replays/detail/layout/focusTabs.tsx b/static/app/views/replays/detail/layout/focusTabs.tsx
index 6eeb261f140d..9c219b87dc6d 100644
--- a/static/app/views/replays/detail/layout/focusTabs.tsx
+++ b/static/app/views/replays/detail/layout/focusTabs.tsx
@@ -43,7 +43,7 @@ function getReplayTabs({
           <Tooltip
             isHoverable
             title={tct(
-              'Powered by generative AI. Learn more about our [link:AI privacy principles].',
+              `Powered by generative AI. Learn more about our [link:AI privacy principles].`,
               {
                 link: (
                   <ExternalLink href="https://docs.sentry.io/product/ai-in-sentry/ai-privacy-and-security/" />
diff --git a/static/app/views/replays/detail/network/details/onboarding.spec.tsx b/static/app/views/replays/detail/network/details/onboarding.spec.tsx
index 72df1cadbdf3..815f4e9c30ed 100644
--- a/static/app/views/replays/detail/network/details/onboarding.spec.tsx
+++ b/static/app/views/replays/detail/network/details/onboarding.spec.tsx
@@ -44,18 +44,18 @@ describe('Setup', () => {
       ).toBeInTheDocument();
 
       const expectedSnippet = [
-        'Sentry.init({',
-        '  integrations: [',
-        '    Sentry.replayIntegration({',
-        "      networkDetailAllowUrls: ['/api/0/organizations/1/issues/1234'],",
-        "      networkRequestHeaders: ['X-Custom-Header'],",
-        "      networkResponseHeaders: ['X-Custom-Header'],",
-        '    }),',
-        '  ],',
-        '})',
+        `Sentry.init({`,
+        `  integrations: [`,
+        `    Sentry.replayIntegration({`,
+        `      networkDetailAllowUrls: ['/api/0/organizations/1/issues/1234'],`,
+        `      networkRequestHeaders: ['X-Custom-Header'],`,
+        `      networkResponseHeaders: ['X-Custom-Header'],`,
+        `    }),`,
+        `  ],`,
+        `})`,
       ].join('\n');
       const snippetElem = screen.getByText(
-        "networkRequestHeaders: ['X-Custom-Header'],",
+        `networkRequestHeaders: ['X-Custom-Header'],`,
         {exact: false}
       );
       // Using toHaveTextContent would be nice here, but it loses the newlines.
diff --git a/static/app/views/replays/detail/network/details/onboarding.tsx b/static/app/views/replays/detail/network/details/onboarding.tsx
index 9a8e7d235f9d..e61f75f21fa9 100644
--- a/static/app/views/replays/detail/network/details/onboarding.tsx
+++ b/static/app/views/replays/detail/network/details/onboarding.tsx
@@ -37,7 +37,7 @@ export function UnsupportedOp({type}: {type: 'headers' | 'bodies'}) {
       <h1>{title}</h1>
       <p>
         {tct(
-          'This feature is only compatible with [fetch] and [xhr] request types. [link].',
+          `This feature is only compatible with [fetch] and [xhr] request types. [link].`,
           {
             fetch: <code>fetch</code>,
             xhr: <code>xhr</code>,
@@ -162,7 +162,7 @@ function SetupInstructions({
       <h1>{title}</h1>
       <p>
         {tct(
-          'To protect user privacy, Session Replay defaults to not capturing the request or response headers. However, we provide the option to do so, if it’s critical to your debugging process. [link].',
+          `To protect user privacy, Session Replay defaults to not capturing the request or response headers. However, we provide the option to do so, if it’s critical to your debugging process. [link].`,
           {
             link: (
               <ExternalLink href="https://docs.sentry.io/platforms/javascript/session-replay/configuration/#network-details">
diff --git a/static/app/views/replays/detail/network/truncateJson/fixJson.spec.ts b/static/app/views/replays/detail/network/truncateJson/fixJson.spec.ts
index ec0268dfcbf1..29dca6f274d9 100644
--- a/static/app/views/replays/detail/network/truncateJson/fixJson.spec.ts
+++ b/static/app/views/replays/detail/network/truncateJson/fixJson.spec.ts
@@ -79,10 +79,8 @@ describe('Unit  | coreHandlers | util | truncateJson | fixJson', () => {
 
 const fixtures = {
   '1': {
-    incompleteJson:
-      '[{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-04-28T20:30:27.149789Z","lastLogin":"2023-04-13T19:40:13.734339Z","has2fa":true,"lastActive":"2023-04-14T17:36:23.756369Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"manager","roleName":"Manager","orgRole":"manager","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-04-28T20:30:27.572480Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-08-24T13:30:01.719798Z","lastLogin":"2023-04-18T20:19:32.572869Z","has2fa":true,"lastActive":"2023-04-18T21:18:53.674493Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-08-24T13:30:02.620935Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-07-26T17:38:43.681246Z","lastLogin":"2023-04-18T20:54:31.433191Z","has2fa":true,"lastActive":"2023-04-18T21:11:15.027754Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"219db453b9ef4a47a6c071fc836752a8"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-07-26T17:38:44.185908Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-05-12T17:47:51.719114Z","lastLogin":"2022-12-20T23:26:24.301088Z","has2fa":true,"lastActive":"2023-01-03T23:40:16.202147Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-05-12T17:47:52.127039Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-08-08T16:44:23.558695Z","lastLogin":"2023-04-07T07:52:12.808207Z","has2fa":true,"lastActive":"2023-04-18T17:53:21.169085Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"4548fe09d6c949ecb027c70af1d1e8fd"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-08-10T11:13:06.618597Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2023-02-01T19:03:04.268258Z","lastLogin":"2023-04-11T17:41:59.073515Z","has2fa":true,"lastActive":"2023-04-17T23:10:34.614992Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2023-02-03T19:52:50.750648Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-09-19T20:21:02.168949Z","lastLogin":"2023-04-17T20:27:01.536887Z","has2fa":true,"lastActive":"2023-04-18T21:09:26.940838Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"9e67f1e04e184833b8b3bfa45beea7ea"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2023-01-05T15:31:45.227526Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sentry","snuba"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2021-08-10T13:59:05.267005Z","lastLogin":"2023-04-18T17:28:59.989484Z","has2fa":true,"lastActive":"2023-04-18T17:28:50.801466Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":"5b2c870c491841d0bc114c9df5bb6d2e"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-08-10T13:59:06.023687Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-08-05T22:12:41.902738Z","lastLogin":"2023-04-18T21:02:34.963627Z","has2fa":true,"lastActive":"2023-04-18T21:17:28.257879Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-09-16T18:05:51.667528Z","inviteStatus":"approved","inviterName":"richard.ma@sentry.io","orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-10-14T23:15:17.528252Z","lastLogin":"2023-03-31T20:53:37.291706Z","has2fa":false,"lastActive":"2023-04-18T20:12:14.438701Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-10-19T19:38:46.936422Z","inviteStatus":"approved","inviterName":"isabel.matwawana@sentry.io","orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-12-09T23:20:23.346432Z","lastLogin":"2022-12-09T23:20:23.765878Z","has2fa":false,"lastActive":"2022-12-23T02:01:40.052033Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-12-09T23:20:23.745693Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2018-02-26T23:57:43.766558Z","lastLogin":"2023-01-19T19:11:45.061167Z","has2fa":true,"lastActive":"2023-01-19T19:11:31.930426Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2018-02-26T16:04:56.738643Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-03-07T14:05:53.423324Z","lastLogin":"2023-04-18T07:29:18.311034Z","has2fa":true,"lastActive":"2023-04-18T16:17:56.241831Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"1836fd44387a413a917cf052523623cc"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-03-07T14:05:54.238336Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sdks-publish","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-02-07T14:25:08.448480Z","lastLogin":"2023-04-13T08:24:55.740046Z","has2fa":true,"lastActive":"2023-04-18T17:53:19.914958Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"835ade1ffa314f788b1e1015af13cacb"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-02-07T14:25:08.946588Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2017-11-15T09:07:16.014572Z","lastLogin":"2023-04-18T17:50:00.282464Z","has2fa":true,"lastActive":"2023-04-18T17:55:17.126066Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2017-11-15T09:07:16.036013Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance","snuba"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2019-02-08T21:51:46.074436Z","lastLogin":"2023-04-18T20:03:13.403607Z","has2fa":true,"lastActive":"2023-04-18T20:35:34.150539Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2019-02-08T21:51:46.795772Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-06-27T18:14:49.652095Z","lastLogin":"2023-04-18T18:26:07.379897Z","has2fa":true,"lastActive":"2023-04-18T21:22:08.385362Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"1fc882a55f7e43caad0069765a940d72"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-06-27T18:14:50.014771Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2019-10-01T12:26:22.368368Z","lastLogin":"2023-04-18T16:28:34.978170Z","has2fa":true,"lastActive":"2023-04-18T17:53:44.185207Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2019-10-01T12:26:22.971086Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sdks-publish","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.p',
-    completeJson:
-      '[{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-04-28T20:30:27.149789Z","lastLogin":"2023-04-13T19:40:13.734339Z","has2fa":true,"lastActive":"2023-04-14T17:36:23.756369Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"manager","roleName":"Manager","orgRole":"manager","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-04-28T20:30:27.572480Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-08-24T13:30:01.719798Z","lastLogin":"2023-04-18T20:19:32.572869Z","has2fa":true,"lastActive":"2023-04-18T21:18:53.674493Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-08-24T13:30:02.620935Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-07-26T17:38:43.681246Z","lastLogin":"2023-04-18T20:54:31.433191Z","has2fa":true,"lastActive":"2023-04-18T21:11:15.027754Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"219db453b9ef4a47a6c071fc836752a8"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-07-26T17:38:44.185908Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-05-12T17:47:51.719114Z","lastLogin":"2022-12-20T23:26:24.301088Z","has2fa":true,"lastActive":"2023-01-03T23:40:16.202147Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-05-12T17:47:52.127039Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-08-08T16:44:23.558695Z","lastLogin":"2023-04-07T07:52:12.808207Z","has2fa":true,"lastActive":"2023-04-18T17:53:21.169085Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"4548fe09d6c949ecb027c70af1d1e8fd"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-08-10T11:13:06.618597Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2023-02-01T19:03:04.268258Z","lastLogin":"2023-04-11T17:41:59.073515Z","has2fa":true,"lastActive":"2023-04-17T23:10:34.614992Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2023-02-03T19:52:50.750648Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-09-19T20:21:02.168949Z","lastLogin":"2023-04-17T20:27:01.536887Z","has2fa":true,"lastActive":"2023-04-18T21:09:26.940838Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"9e67f1e04e184833b8b3bfa45beea7ea"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2023-01-05T15:31:45.227526Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sentry","snuba"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2021-08-10T13:59:05.267005Z","lastLogin":"2023-04-18T17:28:59.989484Z","has2fa":true,"lastActive":"2023-04-18T17:28:50.801466Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":"5b2c870c491841d0bc114c9df5bb6d2e"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-08-10T13:59:06.023687Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-08-05T22:12:41.902738Z","lastLogin":"2023-04-18T21:02:34.963627Z","has2fa":true,"lastActive":"2023-04-18T21:17:28.257879Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-09-16T18:05:51.667528Z","inviteStatus":"approved","inviterName":"richard.ma@sentry.io","orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-10-14T23:15:17.528252Z","lastLogin":"2023-03-31T20:53:37.291706Z","has2fa":false,"lastActive":"2023-04-18T20:12:14.438701Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-10-19T19:38:46.936422Z","inviteStatus":"approved","inviterName":"isabel.matwawana@sentry.io","orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-12-09T23:20:23.346432Z","lastLogin":"2022-12-09T23:20:23.765878Z","has2fa":false,"lastActive":"2022-12-23T02:01:40.052033Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-12-09T23:20:23.745693Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2018-02-26T23:57:43.766558Z","lastLogin":"2023-01-19T19:11:45.061167Z","has2fa":true,"lastActive":"2023-01-19T19:11:31.930426Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2018-02-26T16:04:56.738643Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-03-07T14:05:53.423324Z","lastLogin":"2023-04-18T07:29:18.311034Z","has2fa":true,"lastActive":"2023-04-18T16:17:56.241831Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"1836fd44387a413a917cf052523623cc"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-03-07T14:05:54.238336Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sdks-publish","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-02-07T14:25:08.448480Z","lastLogin":"2023-04-13T08:24:55.740046Z","has2fa":true,"lastActive":"2023-04-18T17:53:19.914958Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"835ade1ffa314f788b1e1015af13cacb"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-02-07T14:25:08.946588Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2017-11-15T09:07:16.014572Z","lastLogin":"2023-04-18T17:50:00.282464Z","has2fa":true,"lastActive":"2023-04-18T17:55:17.126066Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2017-11-15T09:07:16.036013Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance","snuba"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2019-02-08T21:51:46.074436Z","lastLogin":"2023-04-18T20:03:13.403607Z","has2fa":true,"lastActive":"2023-04-18T20:35:34.150539Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2019-02-08T21:51:46.795772Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-06-27T18:14:49.652095Z","lastLogin":"2023-04-18T18:26:07.379897Z","has2fa":true,"lastActive":"2023-04-18T21:22:08.385362Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"1fc882a55f7e43caad0069765a940d72"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-06-27T18:14:50.014771Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2019-10-01T12:26:22.368368Z","lastLogin":"2023-04-18T16:28:34.978170Z","has2fa":true,"lastActive":"2023-04-18T17:53:44.185207Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2019-10-01T12:26:22.971086Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sdks-publish","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.p~~"}}]',
+    incompleteJson: `[{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-04-28T20:30:27.149789Z","lastLogin":"2023-04-13T19:40:13.734339Z","has2fa":true,"lastActive":"2023-04-14T17:36:23.756369Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"manager","roleName":"Manager","orgRole":"manager","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-04-28T20:30:27.572480Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-08-24T13:30:01.719798Z","lastLogin":"2023-04-18T20:19:32.572869Z","has2fa":true,"lastActive":"2023-04-18T21:18:53.674493Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-08-24T13:30:02.620935Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-07-26T17:38:43.681246Z","lastLogin":"2023-04-18T20:54:31.433191Z","has2fa":true,"lastActive":"2023-04-18T21:11:15.027754Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"219db453b9ef4a47a6c071fc836752a8"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-07-26T17:38:44.185908Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-05-12T17:47:51.719114Z","lastLogin":"2022-12-20T23:26:24.301088Z","has2fa":true,"lastActive":"2023-01-03T23:40:16.202147Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-05-12T17:47:52.127039Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-08-08T16:44:23.558695Z","lastLogin":"2023-04-07T07:52:12.808207Z","has2fa":true,"lastActive":"2023-04-18T17:53:21.169085Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"4548fe09d6c949ecb027c70af1d1e8fd"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-08-10T11:13:06.618597Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2023-02-01T19:03:04.268258Z","lastLogin":"2023-04-11T17:41:59.073515Z","has2fa":true,"lastActive":"2023-04-17T23:10:34.614992Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2023-02-03T19:52:50.750648Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-09-19T20:21:02.168949Z","lastLogin":"2023-04-17T20:27:01.536887Z","has2fa":true,"lastActive":"2023-04-18T21:09:26.940838Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"9e67f1e04e184833b8b3bfa45beea7ea"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2023-01-05T15:31:45.227526Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sentry","snuba"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2021-08-10T13:59:05.267005Z","lastLogin":"2023-04-18T17:28:59.989484Z","has2fa":true,"lastActive":"2023-04-18T17:28:50.801466Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":"5b2c870c491841d0bc114c9df5bb6d2e"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-08-10T13:59:06.023687Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-08-05T22:12:41.902738Z","lastLogin":"2023-04-18T21:02:34.963627Z","has2fa":true,"lastActive":"2023-04-18T21:17:28.257879Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-09-16T18:05:51.667528Z","inviteStatus":"approved","inviterName":"richard.ma@sentry.io","orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-10-14T23:15:17.528252Z","lastLogin":"2023-03-31T20:53:37.291706Z","has2fa":false,"lastActive":"2023-04-18T20:12:14.438701Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-10-19T19:38:46.936422Z","inviteStatus":"approved","inviterName":"isabel.matwawana@sentry.io","orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-12-09T23:20:23.346432Z","lastLogin":"2022-12-09T23:20:23.765878Z","has2fa":false,"lastActive":"2022-12-23T02:01:40.052033Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-12-09T23:20:23.745693Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2018-02-26T23:57:43.766558Z","lastLogin":"2023-01-19T19:11:45.061167Z","has2fa":true,"lastActive":"2023-01-19T19:11:31.930426Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2018-02-26T16:04:56.738643Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-03-07T14:05:53.423324Z","lastLogin":"2023-04-18T07:29:18.311034Z","has2fa":true,"lastActive":"2023-04-18T16:17:56.241831Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"1836fd44387a413a917cf052523623cc"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-03-07T14:05:54.238336Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sdks-publish","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-02-07T14:25:08.448480Z","lastLogin":"2023-04-13T08:24:55.740046Z","has2fa":true,"lastActive":"2023-04-18T17:53:19.914958Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"835ade1ffa314f788b1e1015af13cacb"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-02-07T14:25:08.946588Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2017-11-15T09:07:16.014572Z","lastLogin":"2023-04-18T17:50:00.282464Z","has2fa":true,"lastActive":"2023-04-18T17:55:17.126066Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2017-11-15T09:07:16.036013Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance","snuba"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2019-02-08T21:51:46.074436Z","lastLogin":"2023-04-18T20:03:13.403607Z","has2fa":true,"lastActive":"2023-04-18T20:35:34.150539Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2019-02-08T21:51:46.795772Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-06-27T18:14:49.652095Z","lastLogin":"2023-04-18T18:26:07.379897Z","has2fa":true,"lastActive":"2023-04-18T21:22:08.385362Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"1fc882a55f7e43caad0069765a940d72"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-06-27T18:14:50.014771Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2019-10-01T12:26:22.368368Z","lastLogin":"2023-04-18T16:28:34.978170Z","has2fa":true,"lastActive":"2023-04-18T17:53:44.185207Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2019-10-01T12:26:22.971086Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sdks-publish","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.p`,
+    completeJson: `[{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-04-28T20:30:27.149789Z","lastLogin":"2023-04-13T19:40:13.734339Z","has2fa":true,"lastActive":"2023-04-14T17:36:23.756369Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"manager","roleName":"Manager","orgRole":"manager","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-04-28T20:30:27.572480Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-08-24T13:30:01.719798Z","lastLogin":"2023-04-18T20:19:32.572869Z","has2fa":true,"lastActive":"2023-04-18T21:18:53.674493Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-08-24T13:30:02.620935Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-07-26T17:38:43.681246Z","lastLogin":"2023-04-18T20:54:31.433191Z","has2fa":true,"lastActive":"2023-04-18T21:11:15.027754Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"219db453b9ef4a47a6c071fc836752a8"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-07-26T17:38:44.185908Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-05-12T17:47:51.719114Z","lastLogin":"2022-12-20T23:26:24.301088Z","has2fa":true,"lastActive":"2023-01-03T23:40:16.202147Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-05-12T17:47:52.127039Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-08-08T16:44:23.558695Z","lastLogin":"2023-04-07T07:52:12.808207Z","has2fa":true,"lastActive":"2023-04-18T17:53:21.169085Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"4548fe09d6c949ecb027c70af1d1e8fd"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-08-10T11:13:06.618597Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2023-02-01T19:03:04.268258Z","lastLogin":"2023-04-11T17:41:59.073515Z","has2fa":true,"lastActive":"2023-04-17T23:10:34.614992Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2023-02-03T19:52:50.750648Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-09-19T20:21:02.168949Z","lastLogin":"2023-04-17T20:27:01.536887Z","has2fa":true,"lastActive":"2023-04-18T21:09:26.940838Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"9e67f1e04e184833b8b3bfa45beea7ea"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2023-01-05T15:31:45.227526Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sentry","snuba"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2021-08-10T13:59:05.267005Z","lastLogin":"2023-04-18T17:28:59.989484Z","has2fa":true,"lastActive":"2023-04-18T17:28:50.801466Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":"5b2c870c491841d0bc114c9df5bb6d2e"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2021-08-10T13:59:06.023687Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2021-08-05T22:12:41.902738Z","lastLogin":"2023-04-18T21:02:34.963627Z","has2fa":true,"lastActive":"2023-04-18T21:17:28.257879Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-09-16T18:05:51.667528Z","inviteStatus":"approved","inviterName":"richard.ma@sentry.io","orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-10-14T23:15:17.528252Z","lastLogin":"2023-03-31T20:53:37.291706Z","has2fa":false,"lastActive":"2023-04-18T20:12:14.438701Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-10-19T19:38:46.936422Z","inviteStatus":"approved","inviterName":"isabel.matwawana@sentry.io","orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-12-09T23:20:23.346432Z","lastLogin":"2022-12-09T23:20:23.765878Z","has2fa":false,"lastActive":"2022-12-23T02:01:40.052033Z","isSuperuser":false,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-12-09T23:20:23.745693Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2018-02-26T23:57:43.766558Z","lastLogin":"2023-01-19T19:11:45.061167Z","has2fa":true,"lastActive":"2023-01-19T19:11:31.930426Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":false,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2018-02-26T16:04:56.738643Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-03-07T14:05:53.423324Z","lastLogin":"2023-04-18T07:29:18.311034Z","has2fa":true,"lastActive":"2023-04-18T16:17:56.241831Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"1836fd44387a413a917cf052523623cc"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-03-07T14:05:54.238336Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sdks-publish","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2022-02-07T14:25:08.448480Z","lastLogin":"2023-04-13T08:24:55.740046Z","has2fa":true,"lastActive":"2023-04-18T17:53:19.914958Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"835ade1ffa314f788b1e1015af13cacb"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-02-07T14:25:08.946588Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sdks-publish","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2017-11-15T09:07:16.014572Z","lastLogin":"2023-04-18T17:50:00.282464Z","has2fa":true,"lastActive":"2023-04-18T17:55:17.126066Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2017-11-15T09:07:16.036013Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance","snuba"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2019-02-08T21:51:46.074436Z","lastLogin":"2023-04-18T20:03:13.403607Z","has2fa":true,"lastActive":"2023-04-18T20:35:34.150539Z","isSuperuser":true,"isStaff":true,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2019-02-08T21:51:46.795772Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":true,"isManaged":false,"dateJoined":"2022-06-27T18:14:49.652095Z","lastLogin":"2023-04-18T18:26:07.379897Z","has2fa":true,"lastActive":"2023-04-18T21:22:08.385362Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true},{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"upload","avatarUuid":"1fc882a55f7e43caad0069765a940d72"}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2022-06-27T18:14:50.014771Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["feedback","javascript","sentry","sentry-tests-acceptance"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.png","isActive":true,"hasPasswordAuth":false,"isManaged":false,"dateJoined":"2019-10-01T12:26:22.368368Z","lastLogin":"2023-04-18T16:28:34.978170Z","has2fa":true,"lastActive":"2023-04-18T17:53:44.185207Z","isSuperuser":true,"isStaff":false,"experiments":{},"emails":[{"id":"1234","email":"test-user-email@sentry.io","is_verified":true}],"avatar":{"avatarType":"letter_avatar","avatarUuid":null}},"role":"member","roleName":"Member","orgRole":"member","pending":false,"expired":false,"flags":{"idp:provisioned":false,"idp:role-restricted":false,"sso:linked":true,"sso:invalid":false,"member-limit:restricted":false},"dateCreated":"2019-10-01T12:26:22.971086Z","inviteStatus":"approved","inviterName":null,"orgRolesFromTeams":[],"projects":["javascript","sdks-publish","sentry"]},{"id":"1234","email":"test-user-email@sentry.io","name":"Sentry Test User","user":{"id":"1234","name":"Sentry Test User","username":"ABCD1234","email":"test-user-email@sentry.io","avatarUrl":"https://avatar-url.com/my-avatar.p~~"}}]`,
   },
   '2': {
     incompleteJson: `[
diff --git a/static/app/views/replays/list.spec.tsx b/static/app/views/replays/list.spec.tsx
index 2c992f51c8f2..f70c4dabbe64 100644
--- a/static/app/views/replays/list.spec.tsx
+++ b/static/app/views/replays/list.spec.tsx
@@ -76,7 +76,7 @@ describe('ReplayList', () => {
       body: [],
     });
     mockFetchReplayListRequest = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/replays/',
+      url: `/organizations/org-slug/replays/`,
       body: {},
     });
     // Request made by SearchQueryBuilder:
diff --git a/static/app/views/replays/list/replayIndexTable.tsx b/static/app/views/replays/list/replayIndexTable.tsx
index 2a2abf65701f..877e025d4d32 100644
--- a/static/app/views/replays/list/replayIndexTable.tsx
+++ b/static/app/views/replays/list/replayIndexTable.tsx
@@ -80,7 +80,7 @@ export function ReplayIndexTable({
     !rageClicksSdkVersion.needsUpdate && !allMobileProj && !isLoading;
 
   const [widgetIsOpen, setWidgetIsOpen] = useLocalStorageState(
-    'replay-dead-rage-widget-open',
+    `replay-dead-rage-widget-open`,
     true
   );
 
diff --git a/static/app/views/replays/list/setupReplaysCTA.spec.tsx b/static/app/views/replays/list/setupReplaysCTA.spec.tsx
index ddaad30fe96c..7b1955a31f48 100644
--- a/static/app/views/replays/list/setupReplaysCTA.spec.tsx
+++ b/static/app/views/replays/list/setupReplaysCTA.spec.tsx
@@ -22,7 +22,7 @@ describe('SetupReplaysCTA', () => {
     expect(createBtn).toBeInTheDocument();
     expect(createBtn).toHaveAttribute(
       'href',
-      '/organizations/org-slug/insights/projects/new/'
+      `/organizations/org-slug/insights/projects/new/`
     );
   });
 
diff --git a/static/app/views/replays/selectors/exampleReplaysList.tsx b/static/app/views/replays/selectors/exampleReplaysList.tsx
index e7f115519e88..b49af9304dab 100644
--- a/static/app/views/replays/selectors/exampleReplaysList.tsx
+++ b/static/app/views/replays/selectors/exampleReplaysList.tsx
@@ -1,5 +1,4 @@
 import {Fragment, useMemo} from 'react';
-import {useMatches} from 'react-router-dom';
 import styled from '@emotion/styled';
 import type {Location} from 'history';
 
@@ -18,6 +17,7 @@ import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
 import {useReplayList} from 'sentry/utils/replays/hooks/useReplayList';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {useProjectFromId} from 'sentry/utils/useProjectFromId';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {makeReplaysPathname} from 'sentry/views/replays/pathnames';
 import type {ReplayListRecord} from 'sentry/views/replays/types';
 
@@ -32,7 +32,7 @@ export function ExampleReplaysList({
   projectId: number;
   selectorQuery: string;
 }) {
-  const matches = useMatches();
+  const routes = useRoutes();
   const organization = useOrganization();
 
   const {project, environment, start, statsPeriod, utc, end} = location.query;
@@ -82,7 +82,7 @@ export function ExampleReplaysList({
     perPage: 3,
   });
 
-  const referrer = getRouteStringFromRoutes({matches});
+  const referrer = getRouteStringFromRoutes(routes);
   const linkEventView = EventView.fromLocation(location);
 
   return (
diff --git a/static/app/views/replays/selectors/utils.tsx b/static/app/views/replays/selectors/utils.tsx
index 8fb2ffaea53c..c1044ca06f6e 100644
--- a/static/app/views/replays/selectors/utils.tsx
+++ b/static/app/views/replays/selectors/utils.tsx
@@ -1,6 +1,6 @@
 export function transformSelectorQuery(selector: string) {
   return selector
-    .replaceAll('"', '\\"')
+    .replaceAll('"', `\\"`)
     .replaceAll('aria=', 'aria-label=')
     .replaceAll('testid=', 'data-test-id=')
     .replaceAll(':', '\\:')
diff --git a/static/app/views/routeAnalyticsContextProvider.tsx b/static/app/views/routeAnalyticsContextProvider.tsx
index 4a73e73c6d7c..581f1bcc42b1 100644
--- a/static/app/views/routeAnalyticsContextProvider.tsx
+++ b/static/app/views/routeAnalyticsContextProvider.tsx
@@ -1,5 +1,4 @@
 import {createContext, useMemo} from 'react';
-import {useMatches} from 'react-router-dom';
 
 import {HookStore} from 'sentry/stores/hookStore';
 import type {RouteContextInterface} from 'sentry/types/legacyReactRouter';
@@ -46,7 +45,6 @@ export function RouteAnalyticsContextProvider({children}: Props) {
     routes: useRoutes(),
     router: useRouter(),
     location: useLocation(),
-    matches: useMatches(),
   };
 
   const {
diff --git a/static/app/views/routeError.spec.tsx b/static/app/views/routeError.spec.tsx
index 53de1a05fe85..74b09aa61a89 100644
--- a/static/app/views/routeError.spec.tsx
+++ b/static/app/views/routeError.spec.tsx
@@ -2,11 +2,19 @@ import * as Sentry from '@sentry/react';
 
 import {render, waitFor} from 'sentry-test/reactTestingLibrary';
 
-import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import RouteError from 'sentry/views/routeError';
 
-jest.mock('sentry/utils/getRouteStringFromRoutes');
-jest.mocked(getRouteStringFromRoutes).mockReturnValue('/organizations/:orgId/api-keys/');
+jest.mock('sentry/utils/useRoutes');
+
+jest
+  .mocked(useRoutes)
+  .mockReturnValue([
+    {path: '/'},
+    {path: '/:orgId/'},
+    {path: '/organizations/:orgId/'},
+    {path: 'api-keys/'},
+  ]);
 
 describe('RouteError', () => {
   it('captures errors with sentry', async () => {
diff --git a/static/app/views/routeError.tsx b/static/app/views/routeError.tsx
index 267c973ce31e..f0ff614fc3d6 100644
--- a/static/app/views/routeError.tsx
+++ b/static/app/views/routeError.tsx
@@ -1,5 +1,4 @@
 import {useEffect} from 'react';
-import {useMatches} from 'react-router-dom';
 import styled from '@emotion/styled';
 import type {Scope} from '@sentry/core';
 import * as Sentry from '@sentry/react';
@@ -15,6 +14,7 @@ import {OrganizationStore} from 'sentry/stores/organizationStore';
 import {useLegacyStore} from 'sentry/stores/useLegacyStore';
 import type {Project} from 'sentry/types/project';
 import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {withProject} from 'sentry/utils/withProject';
 
 type Props = {
@@ -31,7 +31,7 @@ type Props = {
 };
 
 function RouteError({error, disableLogSentry, disableReport, project}: Props) {
-  const matches = useMatches();
+  const routes = useRoutes();
   const {organization} = useLegacyStore(OrganizationStore);
 
   useEffect(() => {
@@ -42,7 +42,7 @@ function RouteError({error, disableLogSentry, disableReport, project}: Props) {
       return undefined;
     }
 
-    const route = getRouteStringFromRoutes({matches});
+    const route = getRouteStringFromRoutes(routes);
     const enrichScopeContext = (scope: Scope) => {
       scope.setExtra('route', route);
       scope.setExtra('orgFeatures', organization?.features ?? []);
@@ -112,7 +112,7 @@ function RouteError({error, disableLogSentry, disableReport, project}: Props) {
             </ListItem>
           )}
           <ListItem>
-            {tct('Give it a few seconds and [link:reload the page].', {
+            {tct(`Give it a few seconds and [link:reload the page].`, {
               link: (
                 <a
                   onClick={() => {
@@ -124,7 +124,7 @@ function RouteError({error, disableLogSentry, disableReport, project}: Props) {
           </ListItem>
           <ListItem>
             {tct(
-              'Still stuck? Our [link:troubleshooting guide] has tips for common browser-related issues.',
+              `Still stuck? Our [link:troubleshooting guide] has tips for common browser-related issues.`,
               {
                 link: (
                   <ExternalLink href="https://sentry.zendesk.com/hc/en-us/articles/22088541158555-Why-Sentry-io-is-not-loading" />
@@ -135,7 +135,7 @@ function RouteError({error, disableLogSentry, disableReport, project}: Props) {
         </List>
         <p style={{marginTop: '1em', marginBottom: 0}}>
           {tct(
-            'If the guide does not help, [link:contact support] — include as many of these details as you can:',
+            `If the guide does not help, [link:contact support] — include as many of these details as you can:`,
             {
               link: <ExternalLink href="https://sentry.zendesk.com/hc/en-us" />,
             }
diff --git a/static/app/views/seerExplorer/explorerMenu.tsx b/static/app/views/seerExplorer/explorerMenu.tsx
index a8ada675ad0e..9d464f135532 100644
--- a/static/app/views/seerExplorer/explorerMenu.tsx
+++ b/static/app/views/seerExplorer/explorerMenu.tsx
@@ -476,7 +476,7 @@ const MenuPanel = styled('div')<{
   border-radius: ${p => p.theme.radius.md};
   box-shadow: ${p => p.theme.dropShadowHeavy};
   max-height: ${p =>
-    p.panelSize === 'max' ? 'calc(100vh - 120px)' : 'calc(50vh - 80px)'};
+    p.panelSize === 'max' ? 'calc(100vh - 120px)' : `calc(50vh - 80px)`};
   overflow-y: auto;
   z-index: 10;
 `;
diff --git a/static/app/views/seerExplorer/hooks/useExplorerSessions.tsx b/static/app/views/seerExplorer/hooks/useExplorerSessions.tsx
index c74b16c2ea49..51fccb55ab8e 100644
--- a/static/app/views/seerExplorer/hooks/useExplorerSessions.tsx
+++ b/static/app/views/seerExplorer/hooks/useExplorerSessions.tsx
@@ -17,7 +17,7 @@ export function useExplorerSessions({
   const organization = useOrganization({allowNull: true});
   const query = useApiQuery<SessionsResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/seer/explorer-runs/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/seer/explorer-runs/`, {
         path: {organizationIdOrSlug: organization?.slug ?? ''},
       }),
       {
diff --git a/static/app/views/seerExplorer/utils.tsx b/static/app/views/seerExplorer/utils.tsx
index d9a043b71ad6..8bcf9d15d876 100644
--- a/static/app/views/seerExplorer/utils.tsx
+++ b/static/app/views/seerExplorer/utils.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useEffect, useRef, useState} from 'react';
-import {useMatches} from 'react-router-dom';
 import type {LocationDescriptor} from 'history';
 import queryString from 'query-string';
 
@@ -9,6 +8,7 @@ import {trackAnalytics} from 'sentry/utils/analytics';
 import {getApiUrl} from 'sentry/utils/api/getApiUrl';
 import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
 import type {ApiQueryKey} from 'sentry/utils/queryClient';
+import {useRoutes} from 'sentry/utils/useRoutes';
 import {
   LOGS_GROUP_BY_KEY,
   LOGS_QUERY_KEY,
@@ -142,7 +142,7 @@ const TOOL_FORMATTERS: Record<string, ToolFormatter> = {
     }
 
     // shouldn't happen (issue_id required)
-    return isLoading ? 'Inspecting issue...' : 'Inspected issue';
+    return isLoading ? `Inspecting issue...` : `Inspected issue`;
   },
 
   get_event_details: (args, isLoading, resultMetadata) => {
@@ -168,7 +168,7 @@ const TOOL_FORMATTERS: Record<string, ToolFormatter> = {
     }
 
     // shouldn't happen (either event_id or issue_id required)
-    return isLoading ? 'Analyzing event...' : 'Analyzed event';
+    return isLoading ? `Analyzing event...` : `Analyzed event`;
   },
 
   code_search: (args, isLoading) => {
@@ -852,8 +852,8 @@ export function getValidToolLinks(
  */
 export function usePageReferrer(): {getPageReferrer: () => string} {
   // Track the normalized path of the current page (e.g. /issues/:groupId/) for analytics.
-  const matches = useMatches();
-  const routeString = getRouteStringFromRoutes({matches});
+  const routes = useRoutes();
+  const routeString = getRouteStringFromRoutes(routes);
   const routeStringRef = useRef(routeString);
 
   useEffect(() => {
diff --git a/static/app/views/sentryAppExternalInstallation/index.spec.tsx b/static/app/views/sentryAppExternalInstallation/index.spec.tsx
index caf5a52117a0..d7aba228a4c6 100644
--- a/static/app/views/sentryAppExternalInstallation/index.spec.tsx
+++ b/static/app/views/sentryAppExternalInstallation/index.spec.tsx
@@ -98,7 +98,7 @@ describe('SentryAppExternalInstallation', () => {
     it('sets the org automatically', async () => {
       render(<SentryAppExternalInstallation />, {
         initialRouterConfig: {
-          route: '/sentry-apps/:sentryAppSlug/external-install/',
+          route: `/sentry-apps/:sentryAppSlug/external-install/`,
           location: {
             pathname: `/sentry-apps/${sentryApp.slug}/external-install/`,
           },
@@ -134,7 +134,7 @@ describe('SentryAppExternalInstallation', () => {
 
       render(<SentryAppExternalInstallation />, {
         initialRouterConfig: {
-          route: '/sentry-apps/:sentryAppSlug/external-install/',
+          route: `/sentry-apps/:sentryAppSlug/external-install/`,
           location: {
             pathname: `/sentry-apps/${sentryApp.slug}/external-install/`,
           },
@@ -174,7 +174,7 @@ describe('SentryAppExternalInstallation', () => {
 
       render(<SentryAppExternalInstallation />, {
         initialRouterConfig: {
-          route: '/sentry-apps/:sentryAppSlug/external-install/',
+          route: `/sentry-apps/:sentryAppSlug/external-install/`,
           location: {
             pathname: `/sentry-apps/${sentryApp.slug}/external-install/`,
             query: {state},
@@ -234,7 +234,7 @@ describe('SentryAppExternalInstallation', () => {
     it('sets the org automatically', async () => {
       render(<SentryAppExternalInstallation />, {
         initialRouterConfig: {
-          route: '/sentry-apps/:sentryAppSlug/external-install/',
+          route: `/sentry-apps/:sentryAppSlug/external-install/`,
           location: {
             pathname: `/sentry-apps/${sentryApp.slug}/external-install/`,
           },
@@ -273,7 +273,7 @@ describe('SentryAppExternalInstallation', () => {
 
       render(<SentryAppExternalInstallation />, {
         initialRouterConfig: {
-          route: '/sentry-apps/:sentryAppSlug/external-install/',
+          route: `/sentry-apps/:sentryAppSlug/external-install/`,
           location: {
             pathname: `/sentry-apps/${sentryApp.slug}/external-install/`,
           },
@@ -301,7 +301,7 @@ describe('SentryAppExternalInstallation', () => {
       ConfigStore.loadInitialData(window.__initialData);
 
       getOrgMock = MockApiClient.addMockResponse({
-        url: '/organizations/org1/',
+        url: `/organizations/org1/`,
         body: preselectedOrg,
       });
       getInstallationsMock = MockApiClient.addMockResponse({
@@ -312,7 +312,7 @@ describe('SentryAppExternalInstallation', () => {
       render(<SentryAppExternalInstallation />, {
         organization: preselectedOrg,
         initialRouterConfig: {
-          route: '/sentry-apps/:sentryAppSlug/external-install/',
+          route: `/sentry-apps/:sentryAppSlug/external-install/`,
           location: {
             pathname: `/sentry-apps/${sentryApp.slug}/external-install/`,
           },
diff --git a/static/app/views/settings/account/accountClose.tsx b/static/app/views/settings/account/accountClose.tsx
index 943751ddb0ab..fcf872d72060 100644
--- a/static/app/views/settings/account/accountClose.tsx
+++ b/static/app/views/settings/account/accountClose.tsx
@@ -155,7 +155,7 @@ function AccountClose() {
         <PanelBody>
           <PanelAlert variant="warning">
             {t(
-              "Organizations with checked boxes will be deleted. Boxes which can't be unchecked mean that you are the only organization owner and the organization will be deleted. If an organization is not deleted, its ownership will persist among other organization owners."
+              `Organizations with checked boxes will be deleted. Boxes which can't be unchecked mean that you are the only organization owner and the organization will be deleted. If an organization is not deleted, its ownership will persist among other organization owners.`
             )}
           </PanelAlert>
 
diff --git a/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.spec.tsx b/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.spec.tsx
index a2404147c340..80113de402a1 100644
--- a/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.spec.tsx
+++ b/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.spec.tsx
@@ -99,7 +99,7 @@ describe('AccountSecurityEnroll', () => {
         method: 'POST',
       });
       const fetchOrgsMock = MockApiClient.addMockResponse({
-        url: '/organizations/',
+        url: `/organizations/`,
         body: [usorg],
       });
 
@@ -150,7 +150,7 @@ describe('AccountSecurityEnroll', () => {
         method: 'POST',
       });
       const fetchOrgsMock = MockApiClient.addMockResponse({
-        url: '/organizations/',
+        url: `/organizations/`,
         body: [usorg],
       });
 
diff --git a/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.tsx b/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.tsx
index 3f6aa3d74afa..d5e07dc553af 100644
--- a/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.tsx
+++ b/static/app/views/settings/account/accountSecurity/accountSecurityEnroll.tsx
@@ -159,10 +159,10 @@ export default function AccountSecurityEnroll() {
   const [sendingCode, setSendingCode] = useState(false);
   const [isMutationPending, setIsMutationPending] = useState(false);
 
-  const authenticatorEndpoint = getApiUrl('/users/$userId/authenticators/$authId/', {
+  const authenticatorEndpoint = getApiUrl(`/users/$userId/authenticators/$authId/`, {
     path: {userId: 'me', authId},
   });
-  const enrollEndpoint = getApiUrl('/users/$userId/authenticators/$interfaceId/enroll/', {
+  const enrollEndpoint = getApiUrl(`/users/$userId/authenticators/$interfaceId/enroll/`, {
     path: {userId: 'me', interfaceId: authId},
   });
 
diff --git a/static/app/views/settings/account/accountSecurity/index.tsx b/static/app/views/settings/account/accountSecurity/index.tsx
index 48ba4ccdfc1f..5a70d98301c9 100644
--- a/static/app/views/settings/account/accountSecurity/index.tsx
+++ b/static/app/views/settings/account/accountSecurity/index.tsx
@@ -82,7 +82,7 @@ export default function AccountSecurity() {
         ? 'sessionHistory'
         : 'settings';
 
-  const routePrefix = '/settings/account/security/';
+  const routePrefix = `/settings/account/security/`;
   return (
     <SentryDocumentTitle title={t('Security')}>
       <SettingsPageHeader
@@ -207,7 +207,7 @@ export default function AccountSecurity() {
                           tooltipProps={{
                             title: deleteDisabled
                               ? t(
-                                  'Two-factor authentication is required for organization(s): %s.',
+                                  `Two-factor authentication is required for organization(s): %s.`,
                                   formatOrgSlugs()
                                 )
                               : undefined,
diff --git a/static/app/views/settings/account/accountSecurity/sessionHistory/index.tsx b/static/app/views/settings/account/accountSecurity/sessionHistory/index.tsx
index 372927401f76..b1827c943ed1 100644
--- a/static/app/views/settings/account/accountSecurity/sessionHistory/index.tsx
+++ b/static/app/views/settings/account/accountSecurity/sessionHistory/index.tsx
@@ -55,7 +55,7 @@ export default function SessionHistory() {
         ? 'sessionHistory'
         : 'settings';
 
-  const routePrefix = '/settings/account/security/';
+  const routePrefix = `/settings/account/security/`;
   return (
     <SentryDocumentTitle title={t('Session History')}>
       <SettingsPageHeader
diff --git a/static/app/views/settings/account/apiApplications/details.tsx b/static/app/views/settings/account/apiApplications/details.tsx
index f9538d454eb0..aac78bc69d44 100644
--- a/static/app/views/settings/account/apiApplications/details.tsx
+++ b/static/app/views/settings/account/apiApplications/details.tsx
@@ -39,7 +39,7 @@ const PAGE_TITLE = t('Application Details');
 
 function getAppQueryKey(appId: string): ApiQueryKey {
   return [
-    getApiUrl('/api-applications/$appId/', {
+    getApiUrl(`/api-applications/$appId/`, {
       path: {appId},
     }),
   ];
diff --git a/static/app/views/settings/account/apiNewToken.spec.tsx b/static/app/views/settings/account/apiNewToken.spec.tsx
index a2bf832d87f6..0fbdc6d86b5e 100644
--- a/static/app/views/settings/account/apiNewToken.spec.tsx
+++ b/static/app/views/settings/account/apiNewToken.spec.tsx
@@ -27,7 +27,7 @@ describe('ApiNewToken', () => {
     MockApiClient.clearMockResponses();
     const assignMock = MockApiClient.addMockResponse({
       method: 'POST',
-      url: '/api-tokens/',
+      url: `/api-tokens/`,
     });
 
     render(<ApiNewToken />);
@@ -80,7 +80,7 @@ describe('ApiNewToken', () => {
     MockApiClient.clearMockResponses();
     const assignMock = MockApiClient.addMockResponse({
       method: 'POST',
-      url: '/api-tokens/',
+      url: `/api-tokens/`,
     });
 
     render(<ApiNewToken />);
@@ -118,7 +118,7 @@ describe('ApiNewToken', () => {
     MockApiClient.clearMockResponses();
     const assignMock = MockApiClient.addMockResponse({
       method: 'POST',
-      url: '/api-tokens/',
+      url: `/api-tokens/`,
     });
 
     render(<ApiNewToken />);
diff --git a/static/app/views/settings/account/apiTokenDetails.spec.tsx b/static/app/views/settings/account/apiTokenDetails.spec.tsx
index 750202dfe145..9aa6231a4b7c 100644
--- a/static/app/views/settings/account/apiTokenDetails.spec.tsx
+++ b/static/app/views/settings/account/apiTokenDetails.spec.tsx
@@ -7,9 +7,9 @@ import ApiTokenDetails from 'sentry/views/settings/account/apiTokenDetails';
 
 const ROUTER_CONFIG = {
   initialRouterConfig: {
-    route: '/api/auth-tokens/:tokenId/',
+    route: `/api/auth-tokens/:tokenId/`,
     location: {
-      pathname: '/api/auth-tokens/1/',
+      pathname: `/api/auth-tokens/1/`,
     },
   },
 };
@@ -19,7 +19,7 @@ describe('ApiTokenDetails', () => {
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/api-tokens/1/',
+      url: `/api-tokens/1/`,
       body: ApiTokenFixture({
         id: '1',
         name: 'My Token',
@@ -40,7 +40,7 @@ describe('ApiTokenDetails', () => {
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/api-tokens/1/',
+      url: `/api-tokens/1/`,
       statusCode: 500,
     });
 
@@ -55,7 +55,7 @@ describe('ApiTokenDetails', () => {
 
     const mock1 = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/api-tokens/1/',
+      url: `/api-tokens/1/`,
       body: ApiTokenFixture({id: '1', name: 'token1'}),
     });
 
@@ -65,7 +65,7 @@ describe('ApiTokenDetails', () => {
 
     const assignMock = MockApiClient.addMockResponse({
       method: 'PUT',
-      url: '/api-tokens/1/',
+      url: `/api-tokens/1/`,
     });
 
     await userEvent.type(await screen.findByRole('textbox', {name: /name/i}), ' new');
@@ -93,7 +93,7 @@ describe('ApiTokenDetails', () => {
 
     const mock1 = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/api-tokens/1/',
+      url: `/api-tokens/1/`,
       body: ApiTokenFixture({id: '1', name: 'token1'}),
     });
 
@@ -103,7 +103,7 @@ describe('ApiTokenDetails', () => {
 
     const assignMock = MockApiClient.addMockResponse({
       method: 'PUT',
-      url: '/api-tokens/1/',
+      url: `/api-tokens/1/`,
     });
 
     await userEvent.clear(await screen.findByRole('textbox', {name: /name/i}));
@@ -131,7 +131,7 @@ describe('ApiTokenDetails', () => {
 
     const mock1 = MockApiClient.addMockResponse({
       method: 'GET',
-      url: '/api-tokens/1/',
+      url: `/api-tokens/1/`,
       body: ApiTokenFixture({id: '1', name: 'token1'}),
     });
 
@@ -141,7 +141,7 @@ describe('ApiTokenDetails', () => {
 
     const assignMock = MockApiClient.addMockResponse({
       method: 'PUT',
-      url: '/api-tokens/1/',
+      url: `/api-tokens/1/`,
       statusCode: 400,
     });
 
diff --git a/static/app/views/settings/account/apiTokenDetails.tsx b/static/app/views/settings/account/apiTokenDetails.tsx
index b24fb26c2b07..0ffa6113402f 100644
--- a/static/app/views/settings/account/apiTokenDetails.tsx
+++ b/static/app/views/settings/account/apiTokenDetails.tsx
@@ -43,7 +43,7 @@ type FetchApiTokenParameters = {
 type FetchApiTokenResponse = InternalAppApiToken;
 
 const makeFetchApiTokenKey = ({tokenId}: FetchApiTokenParameters) =>
-  [getApiUrl('/api-tokens/$tokenId/', {path: {tokenId}})] as const;
+  [getApiUrl(`/api-tokens/$tokenId/`, {path: {tokenId}})] as const;
 
 const API_TOKEN_LIST_KEY = [getApiUrl('/api-tokens/')] as const;
 
diff --git a/static/app/views/settings/account/mergeAccounts.tsx b/static/app/views/settings/account/mergeAccounts.tsx
index b2cd8a94e1f1..ca28e599ac1e 100644
--- a/static/app/views/settings/account/mergeAccounts.tsx
+++ b/static/app/views/settings/account/mergeAccounts.tsx
@@ -153,7 +153,7 @@ function MergeAccounts() {
         <SettingsPageHeader title={t('Merge Accounts')} />
         <div>
           {t(
-            "Only one account was found with your primary email address. You're all set."
+            `Only one account was found with your primary email address. You're all set.`
           )}
         </div>
       </Fragment>
@@ -166,7 +166,7 @@ function MergeAccounts() {
       <SettingsPageHeader title={t('Merge Accounts')} />
       <List symbol="colored-numeric">
         <StyledListItem>{t('Generate Verification Code')}</StyledListItem>
-        <div>{t("Check your email for your code. You'll need it in Step 3.")}</div>
+        <div>{t(`Check your email for your code. You'll need it in Step 3.`)}</div>
         <ButtonSection>
           <Button
             priority="primary"
@@ -241,11 +241,11 @@ function AccountSelection({users, onSelect, selectedUsers}: AccountSelectionProp
           }
         )}
       </TextBlock>
-      <TextBlock>{t('Your currently active account:')}</TextBlock>
+      <TextBlock>{t(`Your currently active account:`)}</TextBlock>
       <IsPrimaryUserContext value>
         <Users users={currentAccount} onSelect={onSelect} selectedUsers={selectedUsers} />
       </IsPrimaryUserContext>
-      <TextBlock>{t('Your other accounts:')}</TextBlock>
+      <TextBlock>{t(`Your other accounts:`)}</TextBlock>
       <IsPrimaryUserContext value={false}>
         <Users users={otherAccounts} onSelect={onSelect} selectedUsers={selectedUsers} />
       </IsPrimaryUserContext>
diff --git a/static/app/views/settings/account/notifications/fields.tsx b/static/app/views/settings/account/notifications/fields.tsx
index 1d5056430ceb..4c4cc91838eb 100644
--- a/static/app/views/settings/account/notifications/fields.tsx
+++ b/static/app/views/settings/account/notifications/fields.tsx
@@ -267,7 +267,7 @@ const CATEGORY_QUOTA_FIELDS = Object.values(DATA_CATEGORY_INFO)
       name: 'quota' + upperFirst(categoryInfo.plural),
       label: categoryInfo.titleName,
       help: tct(
-        'Receive notifications about your [displayName] quotas. [learnMore:Learn more]',
+        `Receive notifications about your [displayName] quotas. [learnMore:Learn more]`,
         {
           displayName: categoryInfo.displayName,
           learnMore: (
@@ -287,7 +287,7 @@ const quotaSeerBudgetField = {
   // This maps to NotificationSettingEnum.QUOTA_SEER_BUDGET
   name: 'quotaSeerBudget',
   label: t('Seer Budget'),
-  help: tct('Receive notifications for your Seer budget. [learnMore:Learn more]', {
+  help: tct(`Receive notifications for your Seer budget. [learnMore:Learn more]`, {
     learnMore: (
       <ExternalLink
         href={getPricingDocsLinkForEventType(DataCategoryExact.SEER_AUTOFIX)}
diff --git a/static/app/views/settings/account/notifications/notificationSettingsByEntity.tsx b/static/app/views/settings/account/notifications/notificationSettingsByEntity.tsx
index 3c5aa4c5f285..49bb1389d92a 100644
--- a/static/app/views/settings/account/notifications/notificationSettingsByEntity.tsx
+++ b/static/app/views/settings/account/notifications/notificationSettingsByEntity.tsx
@@ -81,7 +81,7 @@ export function NotificationSettingsByEntity({
     refetch,
   } = useApiQuery<Project[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/projects/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/projects/`, {
         path: {organizationIdOrSlug: orgSlug!},
       }),
       {
diff --git a/static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx b/static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx
index 1a1f450c7277..99f37b624822 100644
--- a/static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx
+++ b/static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx
@@ -49,7 +49,7 @@ function renderMockRequests({
   });
 
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/projects/',
+    url: `/organizations/org-slug/projects/`,
     method: 'GET',
     body: [
       {
@@ -173,7 +173,7 @@ describe('NotificationSettingsByType', () => {
     await selectEvent.select(screen.getByText('Value\u2026'), 'On');
 
     const addSettingMock = MockApiClient.addMockResponse({
-      url: '/users/me/notification-options/',
+      url: `/users/me/notification-options/`,
       method: 'PUT',
       body: {
         id: '7',
@@ -190,7 +190,7 @@ describe('NotificationSettingsByType', () => {
 
     // check it hits delete
     const deleteSettingMock = MockApiClient.addMockResponse({
-      url: '/users/me/notification-options/7/',
+      url: `/users/me/notification-options/7/`,
       method: 'DELETE',
       body: {},
     });
@@ -210,7 +210,7 @@ describe('NotificationSettingsByType', () => {
       ],
     });
     const editSettingMock = MockApiClient.addMockResponse({
-      url: '/users/me/notification-options/',
+      url: `/users/me/notification-options/`,
       method: 'PUT',
       body: {
         id: '7',
@@ -252,7 +252,7 @@ describe('NotificationSettingsByType', () => {
       ],
     });
     const changeProvidersMock = MockApiClient.addMockResponse({
-      url: '/users/me/notification-providers/',
+      url: `/users/me/notification-providers/`,
       method: 'PUT',
       body: [],
     });
@@ -290,7 +290,7 @@ describe('NotificationSettingsByType', () => {
     expect(await screen.findAllByText('Spend Notifications')).toHaveLength(2);
 
     const editSettingMock = MockApiClient.addMockResponse({
-      url: '/users/me/notification-options/',
+      url: `/users/me/notification-options/`,
       method: 'PUT',
       body: {
         id: '7',
@@ -352,7 +352,7 @@ describe('NotificationSettingsByType', () => {
     expect(screen.queryByText('Transactions')).not.toBeInTheDocument();
 
     const editSettingMock = MockApiClient.addMockResponse({
-      url: '/users/me/notification-options/',
+      url: `/users/me/notification-options/`,
       method: 'PUT',
       body: {
         id: '7',
@@ -466,7 +466,7 @@ describe('NotificationSettingsByType', () => {
     expect(screen.getByText('Seer Budget')).toBeInTheDocument();
 
     const editSettingMock = MockApiClient.addMockResponse({
-      url: '/users/me/notification-options/',
+      url: `/users/me/notification-options/`,
       method: 'PUT',
       body: {
         id: '7',
diff --git a/static/app/views/settings/account/notifications/organizationSelectHeader.tsx b/static/app/views/settings/account/notifications/organizationSelectHeader.tsx
index e346a715ca89..230fad5dfcd1 100644
--- a/static/app/views/settings/account/notifications/organizationSelectHeader.tsx
+++ b/static/app/views/settings/account/notifications/organizationSelectHeader.tsx
@@ -41,7 +41,7 @@ export function OrganizationSelectHeader({
         styles={{
           container: (provided: Record<string, string>) => ({
             ...provided,
-            minWidth: '200px',
+            minWidth: `200px`,
           }),
         }}
       />
diff --git a/static/app/views/settings/components/dataScrubbing/index.spec.tsx b/static/app/views/settings/components/dataScrubbing/index.spec.tsx
index 7daaf983e65c..e972a2fbbac7 100644
--- a/static/app/views/settings/components/dataScrubbing/index.spec.tsx
+++ b/static/app/views/settings/components/dataScrubbing/index.spec.tsx
@@ -48,7 +48,7 @@ describe('Data Scrubbing', () => {
         screen.getByRole('link', {name: 'full documentation on data scrubbing'})
       ).toHaveAttribute(
         'href',
-        'https://docs.sentry.io/product/data-management-settings/scrubbing/advanced-datascrubbing/'
+        `https://docs.sentry.io/product/data-management-settings/scrubbing/advanced-datascrubbing/`
       );
 
       // Body
@@ -57,7 +57,7 @@ describe('Data Scrubbing', () => {
       // Actions
       expect(screen.getByRole('button', {name: 'Read Docs'})).toHaveAttribute(
         'href',
-        'https://docs.sentry.io/product/data-management-settings/scrubbing/advanced-datascrubbing/'
+        `https://docs.sentry.io/product/data-management-settings/scrubbing/advanced-datascrubbing/`
       );
       expect(screen.getByRole('button', {name: 'Add Rule'})).toBeEnabled();
     });
diff --git a/static/app/views/settings/components/dataScrubbing/modals/dataScrubFormModal.tsx b/static/app/views/settings/components/dataScrubbing/modals/dataScrubFormModal.tsx
index 25d9ee24af70..86ac906cee94 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/dataScrubFormModal.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/dataScrubFormModal.tsx
@@ -449,7 +449,7 @@ export function DataScrubFormModal({
                           {containsRootDeepWildcard(sourceValue) && (
                             <Alert variant="warning" style={{marginTop: '8px'}}>
                               {t(
-                                "Deep wildcards ('**') apply to all datasets unless negated (eg. ** || !$logs.**)"
+                                `Deep wildcards ('**') apply to all datasets unless negated (eg. ** || !$logs.**)`
                               )}
                             </Alert>
                           )}
diff --git a/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx b/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx
index 2cae36de0654..f7a557d0b208 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/form/sourceField.tsx
@@ -454,7 +454,7 @@ export class SourceField extends Component<Props, State> {
 const Wrapper = styled('div')<{hideCaret?: boolean}>`
   position: relative;
   width: 100%;
-  ${p => p.hideCaret && 'caret-color: transparent;'}
+  ${p => p.hideCaret && `caret-color: transparent;`}
 `;
 
 const StyledInput = styled(Input)`
diff --git a/static/app/views/settings/components/settingsBreadcrumb/context.tsx b/static/app/views/settings/components/settingsBreadcrumb/context.tsx
index 6a6c41b86385..a82f73cbb9ab 100644
--- a/static/app/views/settings/components/settingsBreadcrumb/context.tsx
+++ b/static/app/views/settings/components/settingsBreadcrumb/context.tsx
@@ -1,8 +1,8 @@
 import {createContext, useCallback, useContext, useEffect, useState} from 'react';
-import {useMatches} from 'react-router-dom';
 
 import type {PlainRoute} from 'sentry/types/legacyReactRouter';
 import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
+import {useRoutes} from 'sentry/utils/useRoutes';
 
 type ExplicitTitleProps = {
   routes: PlainRoute[];
@@ -32,7 +32,7 @@ type ProviderProps = {
 };
 
 function BreadcrumbProvider({children}: ProviderProps) {
-  const matches = useMatches();
+  const routes = useRoutes();
 
   // Maps path strings to breadcrumb names
   const [pathMap, setPathMap] = useState<PathMap>({});
@@ -46,7 +46,7 @@ function BreadcrumbProvider({children}: ProviderProps) {
   useEffect(
     () =>
       setPathMap(oldPathMap => {
-        const routePath = getRouteStringFromRoutes({matches});
+        const routePath = getRouteStringFromRoutes(routes);
         const newPathMap = {...oldPathMap};
 
         for (const fullPath in newPathMap) {
@@ -57,12 +57,12 @@ function BreadcrumbProvider({children}: ProviderProps) {
 
         return newPathMap;
       }),
-    [matches, setPathMap]
+    [routes, setPathMap]
   );
 
   const setExplicitTitle = useCallback(
     ({routes: updateRoutes, title}: ExplicitTitleProps) => {
-      const key = getRouteStringFromRoutes({routes: updateRoutes});
+      const key = getRouteStringFromRoutes(updateRoutes);
 
       setExplicitPathMap(lastState => ({...lastState, [key]: title}));
 
diff --git a/static/app/views/settings/components/settingsBreadcrumb/index.tsx b/static/app/views/settings/components/settingsBreadcrumb/index.tsx
index ca820790f747..c95aff00cb44 100644
--- a/static/app/views/settings/components/settingsBreadcrumb/index.tsx
+++ b/static/app/views/settings/components/settingsBreadcrumb/index.tsx
@@ -48,8 +48,7 @@ export function SettingsBreadcrumb({className, routes, params}: Props) {
         if (!route.name) {
           return null;
         }
-        const pathTitle =
-          pathMap[getRouteStringFromRoutes({routes: routes.slice(0, i + 1)})];
+        const pathTitle = pathMap[getRouteStringFromRoutes(routes.slice(0, i + 1))];
         const isLast = i === lastRouteIndex;
         const Menu = MENUS[route.name];
         const hasMenu = !!Menu;
diff --git a/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx b/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx
index 037506bd50ac..7fcab628899e 100644
--- a/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx
+++ b/static/app/views/settings/dynamicSampling/utils/useProjectSampleCounts.tsx
@@ -35,7 +35,7 @@ export function useProjectSampleCounts({period}: {period: ProjectionSamplePeriod
 
   const {data, isPending, isError, refetch} = useApiQuery<MetricsQueryApiResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sampling/project-root-counts/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sampling/project-root-counts/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/settings/earlyFeatures/settingsForm.tsx b/static/app/views/settings/earlyFeatures/settingsForm.tsx
index 9c68cbd2eb1e..66701f65b480 100644
--- a/static/app/views/settings/earlyFeatures/settingsForm.tsx
+++ b/static/app/views/settings/earlyFeatures/settingsForm.tsx
@@ -26,7 +26,7 @@ export function EarlyFeaturesSettingsForm({access}: Props) {
   const {data: authProvider, isPending: authProviderIsLoading} =
     useApiQuery<OrganizationAuthProvider>(
       [
-        getApiUrl('/organizations/$organizationIdOrSlug/auth-provider/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/auth-provider/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
       ],
diff --git a/static/app/views/settings/featureFlags/changeTracking/index.tsx b/static/app/views/settings/featureFlags/changeTracking/index.tsx
index f41ab1e81ef6..7b19fa9832ac 100644
--- a/static/app/views/settings/featureFlags/changeTracking/index.tsx
+++ b/static/app/views/settings/featureFlags/changeTracking/index.tsx
@@ -49,7 +49,7 @@ type RemoveSecretQueryVariables = {
 
 export const makeFetchSecretQueryKey = ({orgSlug}: FetchSecretParameters) =>
   [
-    getApiUrl('/organizations/$organizationIdOrSlug/flags/signing-secrets/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/flags/signing-secrets/`, {
       path: {organizationIdOrSlug: orgSlug},
     }),
   ] as const;
diff --git a/static/app/views/settings/organizationApiKeys/index.tsx b/static/app/views/settings/organizationApiKeys/index.tsx
index d157c4c6b0f0..3a4242e05e8a 100644
--- a/static/app/views/settings/organizationApiKeys/index.tsx
+++ b/static/app/views/settings/organizationApiKeys/index.tsx
@@ -35,7 +35,7 @@ function OrganizationApiKeys() {
     refetch,
   } = useApiQuery<DeprecatedApiKey[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/api-keys/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/api-keys/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
@@ -61,7 +61,7 @@ function OrganizationApiKeys() {
       setApiQueryData<DeprecatedApiKey[]>(
         queryClient,
         [
-          getApiUrl('/organizations/$organizationIdOrSlug/api-keys/', {
+          getApiUrl(`/organizations/$organizationIdOrSlug/api-keys/`, {
             path: {organizationIdOrSlug: organization.slug},
           }),
         ],
diff --git a/static/app/views/settings/organizationAuditLog/auditLogView.spec.tsx b/static/app/views/settings/organizationAuditLog/auditLogView.spec.tsx
index 6a3ef365c846..76508b958962 100644
--- a/static/app/views/settings/organizationAuditLog/auditLogView.spec.tsx
+++ b/static/app/views/settings/organizationAuditLog/auditLogView.spec.tsx
@@ -82,7 +82,7 @@ describe('OrganizationAuditLog', () => {
   it('replaces text in rule and alertrule entries', async () => {
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/audit-logs/',
+      url: `/organizations/org-slug/audit-logs/`,
       method: 'GET',
       body: {
         rows: [
diff --git a/static/app/views/settings/organizationAuditLog/index.spec.tsx b/static/app/views/settings/organizationAuditLog/index.spec.tsx
index 6611d3118e52..81186b4e9859 100644
--- a/static/app/views/settings/organizationAuditLog/index.spec.tsx
+++ b/static/app/views/settings/organizationAuditLog/index.spec.tsx
@@ -12,7 +12,7 @@ import OrganizationAuditLog from 'sentry/views/settings/organizationAuditLog';
 describe('OrganizationAuditLog', () => {
   it('renders', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/audit-logs/',
+      url: `/organizations/org-slug/audit-logs/`,
       method: 'GET',
       body: {
         rows: AuditLogsFixture(),
@@ -41,7 +41,7 @@ describe('OrganizationAuditLog', () => {
     ProjectsStore.loadInitialData(projects);
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/audit-logs/',
+      url: `/organizations/org-slug/audit-logs/`,
       method: 'GET',
       body: {
         rows: [
@@ -115,7 +115,7 @@ describe('OrganizationAuditLog', () => {
 
   it('Handles absolute date range', async () => {
     const absoluteDateMockResponse = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/audit-logs/',
+      url: `/organizations/org-slug/audit-logs/`,
       method: 'GET',
       body: {
         rows: AuditLogsFixture(),
diff --git a/static/app/views/settings/organizationAuth/index.tsx b/static/app/views/settings/organizationAuth/index.tsx
index 794c25aedec5..bf2ef411ecf7 100644
--- a/static/app/views/settings/organizationAuth/index.tsx
+++ b/static/app/views/settings/organizationAuth/index.tsx
@@ -20,7 +20,7 @@ function OrganizationAuth() {
     error: errorProviders,
   } = useApiQuery<AuthProvider[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/auth-providers/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/auth-providers/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
@@ -32,7 +32,7 @@ function OrganizationAuth() {
     error: errorProvider,
   } = useApiQuery<AuthProvider>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/auth-provider/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/auth-provider/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/app/views/settings/organizationAuthTokens/authTokenDetails.tsx b/static/app/views/settings/organizationAuthTokens/authTokenDetails.tsx
index a106b22951cd..bd520a25d1c5 100644
--- a/static/app/views/settings/organizationAuthTokens/authTokenDetails.tsx
+++ b/static/app/views/settings/organizationAuthTokens/authTokenDetails.tsx
@@ -46,7 +46,7 @@ type FetchOrgAuthTokenResponse = OrgAuthToken;
 
 const makeFetchOrgAuthTokenKey = ({orgSlug, tokenId}: FetchOrgAuthTokenParameters) =>
   [
-    getApiUrl('/organizations/$organizationIdOrSlug/org-auth-tokens/$tokenId/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/org-auth-tokens/$tokenId/`, {
       path: {organizationIdOrSlug: orgSlug, tokenId},
     }),
   ] as const;
diff --git a/static/app/views/settings/organizationConsoleSdkInvites/hooks.tsx b/static/app/views/settings/organizationConsoleSdkInvites/hooks.tsx
index 28cfc84e423a..623b7ba28ef8 100644
--- a/static/app/views/settings/organizationConsoleSdkInvites/hooks.tsx
+++ b/static/app/views/settings/organizationConsoleSdkInvites/hooks.tsx
@@ -36,7 +36,7 @@ interface UseRevokeConsoleSdkPlatformInviteParams {
 export function useConsoleSdkInvites(orgSlug: string) {
   return useApiQuery<ConsoleSdkInviteUser[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/console-sdk-invites/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/console-sdk-invites/`, {
         path: {organizationIdOrSlug: orgSlug},
       }),
     ],
diff --git a/static/app/views/settings/organizationDataForwarding/util/hooks.tsx b/static/app/views/settings/organizationDataForwarding/util/hooks.tsx
index 411b810827ab..f91923c22676 100644
--- a/static/app/views/settings/organizationDataForwarding/util/hooks.tsx
+++ b/static/app/views/settings/organizationDataForwarding/util/hooks.tsx
@@ -18,7 +18,7 @@ import {
 } from 'sentry/views/settings/organizationDataForwarding/util/types';
 
 const makeDataForwarderQueryKey = (params: {orgSlug: string}): ApiQueryKey => [
-  getApiUrl('/organizations/$organizationIdOrSlug/forwarding/', {
+  getApiUrl(`/organizations/$organizationIdOrSlug/forwarding/`, {
     path: {organizationIdOrSlug: params.orgSlug},
   }),
 ];
@@ -40,7 +40,7 @@ const makeDataForwarderMutationQueryKey = (params: {
   dataForwarderId: string;
   orgSlug: string;
 }): ApiQueryKey => [
-  getApiUrl('/organizations/$organizationIdOrSlug/forwarding/$dataForwarderId/', {
+  getApiUrl(`/organizations/$organizationIdOrSlug/forwarding/$dataForwarderId/`, {
     path: {organizationIdOrSlug: params.orgSlug, dataForwarderId: params.dataForwarderId},
   }),
 ];
diff --git a/static/app/views/settings/organizationDeveloperSettings/index.tsx b/static/app/views/settings/organizationDeveloperSettings/index.tsx
index aa0fc0e847a1..d0b868f88528 100644
--- a/static/app/views/settings/organizationDeveloperSettings/index.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/index.tsx
@@ -60,7 +60,7 @@ function OrganizationDeveloperSettings() {
     refetch,
   } = useApiQuery<SentryApp[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sentry-apps/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sentry-apps/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx
index cd210864a2ae..72ed8d12de5f 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/index.tsx
@@ -53,7 +53,7 @@ function SentryApplicationDashboard() {
     isError: isAppError,
   } = useApiQuery<SentryApp>(
     [
-      getApiUrl('/sentry-apps/$sentryAppIdOrSlug/', {
+      getApiUrl(`/sentry-apps/$sentryAppIdOrSlug/`, {
         path: {sentryAppIdOrSlug: appSlug},
       }),
     ],
@@ -66,7 +66,7 @@ function SentryApplicationDashboard() {
     isError: isInteractionsError,
   } = useApiQuery<Interactions>(
     [
-      getApiUrl('/sentry-apps/$sentryAppIdOrSlug/interaction/', {
+      getApiUrl(`/sentry-apps/$sentryAppIdOrSlug/interaction/`, {
         path: {sentryAppIdOrSlug: appSlug},
       }),
       {query: {since: now - ninety_days_ago, until: now}},
@@ -80,7 +80,7 @@ function SentryApplicationDashboard() {
     isError: isStatsError,
   } = useApiQuery<Stats>(
     [
-      getApiUrl('/sentry-apps/$sentryAppIdOrSlug/stats/', {
+      getApiUrl(`/sentry-apps/$sentryAppIdOrSlug/stats/`, {
         path: {sentryAppIdOrSlug: appSlug},
       }),
       {query: {since: now - ninety_days_ago, until: now}},
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/requestLog.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/requestLog.tsx
index 4af52bd6160e..b479dc81c1a8 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/requestLog.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDashboard/requestLog.tsx
@@ -128,7 +128,7 @@ function makeRequestLogQueryKey(
   query: Record<string, string>
 ): ApiQueryKey {
   return [
-    getApiUrl('/sentry-apps/$sentryAppIdOrSlug/webhook-requests/', {
+    getApiUrl(`/sentry-apps/$sentryAppIdOrSlug/webhook-requests/`, {
       path: {sentryAppIdOrSlug: slug},
     }),
     {query},
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.spec.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.spec.tsx
index 3f7fbb784d50..ef3b0e2bfc5f 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.spec.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.spec.tsx
@@ -167,7 +167,7 @@ describe('Sentry Application Details', () => {
   describe('Renders public app', () => {
     const initialRouterConfig: RouterConfig = {
       location: {
-        pathname: '/sentry-apps/sample-app/',
+        pathname: `/sentry-apps/sample-app/`,
       },
       route: '/sentry-apps/:appSlug/',
     };
@@ -229,7 +229,7 @@ describe('Sentry Application Details', () => {
   describe('Renders for internal apps', () => {
     const initialRouterConfig: RouterConfig = {
       location: {
-        pathname: '/sentry-apps/sample-app/',
+        pathname: `/sentry-apps/sample-app/`,
       },
       route: '/sentry-apps/:appSlug/',
     };
@@ -295,7 +295,7 @@ describe('Sentry Application Details', () => {
   describe('Renders masked values', () => {
     const initialRouterConfig: RouterConfig = {
       location: {
-        pathname: '/sentry-apps/sample-app/',
+        pathname: `/sentry-apps/sample-app/`,
       },
       route: '/sentry-apps/:appSlug/',
     };
@@ -342,7 +342,7 @@ describe('Sentry Application Details', () => {
   describe('Editing internal app tokens', () => {
     const initialRouterConfig: RouterConfig = {
       location: {
-        pathname: '/sentry-apps/sample-app/',
+        pathname: `/sentry-apps/sample-app/`,
       },
       route: '/sentry-apps/:appSlug/',
     };
@@ -429,7 +429,7 @@ describe('Sentry Application Details', () => {
   describe('Editing an existing public Sentry App', () => {
     const initialRouterConfig: RouterConfig = {
       location: {
-        pathname: '/sentry-apps/sample-app/',
+        pathname: `/sentry-apps/sample-app/`,
       },
       route: '/sentry-apps/:appSlug/',
     };
@@ -517,7 +517,7 @@ describe('Sentry Application Details', () => {
   describe('Editing an existing public Sentry App with a scope error', () => {
     const initialRouterConfig: RouterConfig = {
       location: {
-        pathname: '/sentry-apps/sample-app/',
+        pathname: `/sentry-apps/sample-app/`,
       },
       route: '/sentry-apps/:appSlug/',
     };
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx
index 504e9ec0d22e..fb4b16a987c6 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx
@@ -155,7 +155,7 @@ class SentryAppFormModel extends FormModel {
 
 const makeSentryAppQueryKey = (appSlug: string): ApiQueryKey => {
   return [
-    getApiUrl('/sentry-apps/$sentryAppIdOrSlug/', {
+    getApiUrl(`/sentry-apps/$sentryAppIdOrSlug/`, {
       path: {sentryAppIdOrSlug: appSlug},
     }),
   ];
@@ -163,7 +163,7 @@ const makeSentryAppQueryKey = (appSlug: string): ApiQueryKey => {
 
 const makeSentryAppApiTokensQueryKey = (appSlug: string): ApiQueryKey => {
   return [
-    getApiUrl('/sentry-apps/$sentryAppIdOrSlug/api-tokens/', {
+    getApiUrl(`/sentry-apps/$sentryAppIdOrSlug/api-tokens/`, {
       path: {sentryAppIdOrSlug: appSlug},
     }),
   ];
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationRow/actionButtons.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationRow/actionButtons.tsx
index 4d6559e08063..37809f0204d0 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationRow/actionButtons.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationRow/actionButtons.tsx
@@ -53,7 +53,7 @@ export function ActionButtons({
   ) : null;
 
   const deleteConfirmMessage = t(
-    'Deleting %s will also delete any and all of its installations. This is a permanent action. Do you wish to continue?',
+    `Deleting %s will also delete any and all of its installations. This is a permanent action. Do you wish to continue?`,
     app.slug
   );
   const deleteButton = showDelete ? (
diff --git a/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx b/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx
index 9f3648557738..552e87f7343e 100644
--- a/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx
@@ -59,7 +59,7 @@ function SubscriptionBox({
   }
 
   const DESCRIPTIONS: Record<(typeof EVENT_CHOICES)[number], string> = {
-    issue: 'created, resolved, assigned, archived, unresolved',
+    issue: `created, resolved, assigned, archived, unresolved`,
     error: 'created',
     comment: 'created, edited, deleted',
     seer: 'root_cause_started, root_cause_completed, solution_started, solution_completed, coding_started, coding_completed, pr_created',
diff --git a/static/app/views/settings/organizationIntegrations/configureIntegration.tsx b/static/app/views/settings/organizationIntegrations/configureIntegration.tsx
index dfefc3e297bf..e947156176d6 100644
--- a/static/app/views/settings/organizationIntegrations/configureIntegration.tsx
+++ b/static/app/views/settings/organizationIntegrations/configureIntegration.tsx
@@ -67,7 +67,7 @@ const makeIntegrationQuery = (
   integrationId: string
 ): ApiQueryKey => {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/integrations/$integrationId/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/integrations/$integrationId/`, {
       path: {organizationIdOrSlug: organization.slug, integrationId},
     }),
   ];
@@ -75,7 +75,7 @@ const makeIntegrationQuery = (
 
 const makePluginQuery = (organization: Organization): ApiQueryKey => {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/plugins/configs/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/plugins/configs/`, {
       path: {organizationIdOrSlug: organization.slug},
     }),
   ];
@@ -103,7 +103,7 @@ function ConfigureIntegration() {
     providers: IntegrationProvider[];
   }>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/config/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/config/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/app/views/settings/organizationIntegrations/directEnableButton.tsx b/static/app/views/settings/organizationIntegrations/directEnableButton.tsx
index 9d47c985df67..7c43067cee20 100644
--- a/static/app/views/settings/organizationIntegrations/directEnableButton.tsx
+++ b/static/app/views/settings/organizationIntegrations/directEnableButton.tsx
@@ -38,14 +38,14 @@ export function DirectEnableButton({
     onSuccess: () => {
       queryClient.invalidateQueries({
         queryKey: [
-          getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+          getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
             path: {organizationIdOrSlug: organization.slug},
           }),
         ],
       });
       queryClient.invalidateQueries({
         queryKey: [
-          getApiUrl('/organizations/$organizationIdOrSlug/config/integrations/', {
+          getApiUrl(`/organizations/$organizationIdOrSlug/config/integrations/`, {
             path: {organizationIdOrSlug: organization.slug},
           }),
         ],
diff --git a/static/app/views/settings/organizationIntegrations/docIntegrationDetailedView.tsx b/static/app/views/settings/organizationIntegrations/docIntegrationDetailedView.tsx
index ec4d821e7362..cc0cc2aac346 100644
--- a/static/app/views/settings/organizationIntegrations/docIntegrationDetailedView.tsx
+++ b/static/app/views/settings/organizationIntegrations/docIntegrationDetailedView.tsx
@@ -27,7 +27,7 @@ export default function DocIntegrationDetailsView() {
 
   const {data: doc, isPending} = useApiQuery<DocIntegration>(
     [
-      getApiUrl('/doc-integrations/$docIntegrationIdOrSlug/', {
+      getApiUrl(`/doc-integrations/$docIntegrationIdOrSlug/`, {
         path: {docIntegrationIdOrSlug: integrationSlug},
       }),
     ],
diff --git a/static/app/views/settings/organizationIntegrations/integrationCodeMappings.tsx b/static/app/views/settings/organizationIntegrations/integrationCodeMappings.tsx
index a8fb24128180..b284a66fd14f 100644
--- a/static/app/views/settings/organizationIntegrations/integrationCodeMappings.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationCodeMappings.tsx
@@ -23,13 +23,10 @@ import type {
   RepositoryProjectPathConfig,
 } from 'sentry/types/integrations';
 import {trackAnalytics} from 'sentry/utils/analytics';
-import {useFetchAllPages} from 'sentry/utils/api/apiFetch';
-import {apiOptions} from 'sentry/utils/api/apiOptions';
 import {getApiUrl} from 'sentry/utils/api/getApiUrl';
 import {getIntegrationIcon} from 'sentry/utils/integrationUtil';
 import {
   useApiQuery,
-  useInfiniteQuery,
   useMutation,
   useQueryClient,
   type ApiQueryKey,
@@ -79,7 +76,7 @@ function makePathConfigQueryKey({
   cursor?: string | string[] | null;
 }): ApiQueryKey {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/code-mappings/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/code-mappings/`, {
       path: {organizationIdOrSlug: orgSlug},
     }),
     {query: {integrationId, cursor}},
@@ -162,31 +159,19 @@ export function IntegrationCodeMappings({integration}: {integration: Integration
     {staleTime: 10_000}
   );
 
-  const repositoriesQuery = useInfiniteQuery({
-    ...apiOptions.asInfinite<Repository[]>()(
-      '/organizations/$organizationIdOrSlug/repos/',
-      {
-        path: {organizationIdOrSlug: organization.slug},
-        query: {status: 'active', per_page: 100},
-        staleTime: 10_000,
-      }
-    ),
-    select: data => data.pages.flatMap(page => page.json),
-  });
-  useFetchAllPages({result: repositoriesQuery});
-
   const {
     data: fetchedRepos = [],
-    isPending: isPendingReposQuery,
+    isPending: isPendingRepos,
     isError: isErrorRepos,
-    hasNextPage: hasNextReposPage,
-    isFetchingNextPage: isFetchingNextReposPage,
-  } = repositoriesQuery;
-
-  const isPendingRepos =
-    isPendingReposQuery ||
-    isFetchingNextReposPage ||
-    (!!hasNextReposPage && !isErrorRepos);
+  } = useApiQuery<Repository[]>(
+    [
+      getApiUrl(`/organizations/$organizationIdOrSlug/repos/`, {
+        path: {organizationIdOrSlug: organization.slug},
+      }),
+      {query: {status: 'active'}},
+    ],
+    {staleTime: 10_000}
+  );
 
   const pathConfigs = useMemo(() => {
     return sortBy(fetchedPathConfigs, [
@@ -266,7 +251,7 @@ export function IntegrationCodeMappings({integration}: {integration: Integration
     <Fragment>
       <TextBlock>
         {tct(
-          'Code Mappings are used to map stack trace file paths to source code file paths. These mappings are the basis for features like Stack Trace Linking. To learn more, [link: read the docs].',
+          `Code Mappings are used to map stack trace file paths to source code file paths. These mappings are the basis for features like Stack Trace Linking. To learn more, [link: read the docs].`,
           {
             link: (
               <ExternalLink
diff --git a/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx b/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx
index 212628b74d50..b324bb10f3af 100644
--- a/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationDetailedView.tsx
@@ -98,7 +98,7 @@ function makeIntegrationQueryKey({
   orgSlug: string;
 }): ApiQueryKey {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
       path: {organizationIdOrSlug: orgSlug},
     }),
     {
@@ -129,7 +129,7 @@ export default function IntegrationDetailedView() {
     isError: isInformationError,
   } = useApiQuery<IntegrationInformation>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/config/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/config/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -245,7 +245,7 @@ export default function IntegrationDetailedView() {
         });
         queryClient.invalidateQueries({
           queryKey: [
-            getApiUrl('/organizations/$organizationIdOrSlug/config/integrations/', {
+            getApiUrl(`/organizations/$organizationIdOrSlug/config/integrations/`, {
               path: {organizationIdOrSlug: organization.slug},
             }),
           ],
diff --git a/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx b/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx
index 2e616458ef21..9f9e135326fb 100644
--- a/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationExternalMappings.tsx
@@ -81,7 +81,7 @@ export function IntegrationExternalMappings(props: Props) {
     refetch,
   } = useApiQuery<CodeOwnersAssociationMappings>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/codeowners-associations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/codeowners-associations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {provider: integration.provider.key}},
diff --git a/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx b/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx
index 710e000857e3..23ce8a78f82e 100644
--- a/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationListDirectory.tsx
@@ -86,7 +86,7 @@ function useIntegrationList() {
     providers: IntegrationProvider[];
   }>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/config/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/config/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
@@ -98,7 +98,7 @@ function useIntegrationList() {
     isError: isIntegrationsError,
   } = useApiQuery<Integration[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {includeConfig: 0}},
@@ -111,7 +111,7 @@ function useIntegrationList() {
     isError: isOrgOwnedAppsError,
   } = useApiQuery<SentryApp[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sentry-apps/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sentry-apps/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
@@ -131,7 +131,7 @@ function useIntegrationList() {
     isError: isAppInstallsError,
   } = useApiQuery<SentryAppInstallation[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sentry-app-installations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sentry-app-installations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
@@ -143,7 +143,7 @@ function useIntegrationList() {
     isError: isPluginsError,
   } = useApiQuery<PluginWithProjectList[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/plugins/configs/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/plugins/configs/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/app/views/settings/organizationIntegrations/integrationReposAddRepository.tsx b/static/app/views/settings/organizationIntegrations/integrationReposAddRepository.tsx
index fb597609e7a7..4bfbebfee74d 100644
--- a/static/app/views/settings/organizationIntegrations/integrationReposAddRepository.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationReposAddRepository.tsx
@@ -48,7 +48,7 @@ export function IntegrationReposAddRepository({
   const query = useQuery({
     queryKey: [
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/integrations/$integrationId/repos/',
+        `/organizations/$organizationIdOrSlug/integrations/$integrationId/repos/`,
         {path: {organizationIdOrSlug: organization.slug, integrationId: integration.id}}
       ),
       {method: 'GET', query: {search: debouncedSearch, installableOnly: false}},
diff --git a/static/app/views/settings/organizationIntegrations/integrationServerlessFunctions.tsx b/static/app/views/settings/organizationIntegrations/integrationServerlessFunctions.tsx
index a42bda71999f..887fc9fb9361 100644
--- a/static/app/views/settings/organizationIntegrations/integrationServerlessFunctions.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationServerlessFunctions.tsx
@@ -31,7 +31,7 @@ export function IntegrationServerlessFunctions({
   const queryClient = useQueryClient();
   const queryKey: ApiQueryKey = [
     getApiUrl(
-      '/organizations/$organizationIdOrSlug/integrations/$integrationId/serverless-functions/',
+      `/organizations/$organizationIdOrSlug/integrations/$integrationId/serverless-functions/`,
       {
         path: {organizationIdOrSlug: organization.slug, integrationId: integration.id},
       }
diff --git a/static/app/views/settings/organizationIntegrations/integrationServerlessRow.tsx b/static/app/views/settings/organizationIntegrations/integrationServerlessRow.tsx
index c23f4cdabb46..69693d0b54ef 100644
--- a/static/app/views/settings/organizationIntegrations/integrationServerlessRow.tsx
+++ b/static/app/views/settings/organizationIntegrations/integrationServerlessRow.tsx
@@ -175,7 +175,7 @@ const StyledSwitch = styled(Switch)`
 
 const UpdateButton = styled(Button)``;
 
-const Name = styled('span')`
+const Name = styled(`span`)`
   padding-bottom: ${p => p.theme.space.md};
 `;
 
diff --git a/static/app/views/settings/organizationIntegrations/pluginDetailedView.tsx b/static/app/views/settings/organizationIntegrations/pluginDetailedView.tsx
index 58a82d50ac4c..cadfbeefde6f 100644
--- a/static/app/views/settings/organizationIntegrations/pluginDetailedView.tsx
+++ b/static/app/views/settings/organizationIntegrations/pluginDetailedView.tsx
@@ -52,7 +52,7 @@ function makePluginQueryKey({
   pluginSlug: string;
 }): ApiQueryKey {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/plugins/configs/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/plugins/configs/`, {
       path: {organizationIdOrSlug: orgSlug},
     }),
     {query: {plugins: pluginSlug}},
diff --git a/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigForm.tsx b/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigForm.tsx
index dca8ad8da753..e6e6562d20ee 100644
--- a/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigForm.tsx
+++ b/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigForm.tsx
@@ -86,10 +86,10 @@ export function RepositoryProjectPathConfigModal({
   const repoOptions = repos.map(({name, id}) => ({value: id, label: name}));
 
   const endpoint = existingConfig
-    ? getApiUrl('/organizations/$organizationIdOrSlug/code-mappings/$configId/', {
+    ? getApiUrl(`/organizations/$organizationIdOrSlug/code-mappings/$configId/`, {
         path: {organizationIdOrSlug: organization.slug, configId: existingConfig.id},
       })
-    : getApiUrl('/organizations/$organizationIdOrSlug/code-mappings/', {
+    : getApiUrl(`/organizations/$organizationIdOrSlug/code-mappings/`, {
         path: {organizationIdOrSlug: organization.slug},
       });
 
diff --git a/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigRow.tsx b/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigRow.tsx
index 223fae4cbaa8..aeb692de85bb 100644
--- a/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigRow.tsx
+++ b/static/app/views/settings/organizationIntegrations/repositoryProjectPathConfigRow.tsx
@@ -79,7 +79,7 @@ export function RepositoryProjectPathConfigRow({
   );
 }
 
-const RepoName = styled('span')`
+const RepoName = styled(`span`)`
   padding-bottom: ${p => p.theme.space.md};
 `;
 
diff --git a/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.spec.tsx b/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.spec.tsx
index a20a09cf19e5..3b9f209795e6 100644
--- a/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.spec.tsx
+++ b/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.spec.tsx
@@ -44,7 +44,7 @@ describe('SentryAppDetailedView', () => {
 
     beforeEach(() => {
       sentryAppInteractionRequest = MockApiClient.addMockResponse({
-        url: '/sentry-apps/clickup/interaction/',
+        url: `/sentry-apps/clickup/interaction/`,
         method: 'POST',
         statusCode: 200,
         body: {},
@@ -111,7 +111,7 @@ describe('SentryAppDetailedView', () => {
       renderSentryAppDetailedView({integrationSlug: 'clickup'});
 
       expect(sentryAppInteractionRequest).toHaveBeenCalledWith(
-        '/sentry-apps/clickup/interaction/',
+        `/sentry-apps/clickup/interaction/`,
         expect.objectContaining({
           method: 'POST',
           data: {
@@ -152,7 +152,7 @@ describe('SentryAppDetailedView', () => {
   describe('Internal Sentry App', () => {
     beforeEach(() => {
       MockApiClient.addMockResponse({
-        url: '/sentry-apps/my-headband-washer-289499/interaction/',
+        url: `/sentry-apps/my-headband-washer-289499/interaction/`,
         method: 'POST',
         statusCode: 200,
         body: {},
@@ -221,7 +221,7 @@ describe('SentryAppDetailedView', () => {
 
     beforeEach(() => {
       MockApiClient.addMockResponse({
-        url: '/sentry-apps/la-croix-monitor/interaction/',
+        url: `/sentry-apps/la-croix-monitor/interaction/`,
         method: 'POST',
         statusCode: 200,
         body: {},
@@ -302,7 +302,7 @@ describe('SentryAppDetailedView', () => {
     let createRequest: jest.Mock;
     beforeEach(() => {
       MockApiClient.addMockResponse({
-        url: '/sentry-apps/go-to-google/interaction/',
+        url: `/sentry-apps/go-to-google/interaction/`,
         method: 'POST',
         statusCode: 200,
         body: {},
diff --git a/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.tsx b/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.tsx
index 9eefb2c8b7be..9c4930ebdded 100644
--- a/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.tsx
+++ b/static/app/views/settings/organizationIntegrations/sentryAppDetailedView.tsx
@@ -49,7 +49,7 @@ import {SplitInstallationIdModal} from 'sentry/views/settings/organizationIntegr
 
 function makeSentryAppInstallationsQueryKey({orgSlug}: {orgSlug: string}): ApiQueryKey {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/sentry-app-installations/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/sentry-app-installations/`, {
       path: {organizationIdOrSlug: orgSlug},
     }),
   ];
@@ -70,7 +70,7 @@ export default function SentryAppDetailedView() {
     isError: isSentryAppError,
   } = useApiQuery<SentryApp>(
     [
-      getApiUrl('/sentry-apps/$sentryAppIdOrSlug/', {
+      getApiUrl(`/sentry-apps/$sentryAppIdOrSlug/`, {
         path: {sentryAppIdOrSlug: integrationSlug},
       }),
     ],
@@ -86,7 +86,7 @@ export default function SentryAppDetailedView() {
     isError: isFeatureDataError,
   } = useApiQuery<IntegrationFeature[]>(
     [
-      getApiUrl('/sentry-apps/$sentryAppIdOrSlug/features/', {
+      getApiUrl(`/sentry-apps/$sentryAppIdOrSlug/features/`, {
         path: {sentryAppIdOrSlug: integrationSlug},
       }),
     ],
diff --git a/static/app/views/settings/organizationMembers/inviteBanner.tsx b/static/app/views/settings/organizationMembers/inviteBanner.tsx
index 129b1fd385ed..d827c8e60f97 100644
--- a/static/app/views/settings/organizationMembers/inviteBanner.tsx
+++ b/static/app/views/settings/organizationMembers/inviteBanner.tsx
@@ -50,7 +50,7 @@ export function InviteBanner({
 
   const api = useApi();
   // NOTE: this is currently used for Github only
-  const promptsFeature = 'github_missing_members';
+  const promptsFeature = `github_missing_members`;
   const location = useLocation();
 
   const snoozePrompt = useCallback(async () => {
diff --git a/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx b/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx
index b64bdd623bb7..7f2d5dc0096c 100644
--- a/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMemberDetail.tsx
@@ -86,7 +86,7 @@ function MemberStatus({
 }
 
 const getMemberQueryKey = (orgSlug: string, memberId: string): ApiQueryKey => [
-  getApiUrl('/organizations/$organizationIdOrSlug/members/$memberId/', {
+  getApiUrl(`/organizations/$organizationIdOrSlug/members/$memberId/`, {
     path: {organizationIdOrSlug: orgSlug, memberId},
   }),
 ];
diff --git a/static/app/views/settings/organizationMembers/organizationMembersList.tsx b/static/app/views/settings/organizationMembers/organizationMembersList.tsx
index dbb77991d1e1..b92eda100b68 100644
--- a/static/app/views/settings/organizationMembers/organizationMembersList.tsx
+++ b/static/app/views/settings/organizationMembers/organizationMembersList.tsx
@@ -65,14 +65,14 @@ const getMembersQueryKey = ({
   orgSlug: string;
   query: Record<string, string>;
 }): ApiQueryKey => [
-  getApiUrl('/organizations/$organizationIdOrSlug/members/', {
+  getApiUrl(`/organizations/$organizationIdOrSlug/members/`, {
     path: {organizationIdOrSlug: orgSlug},
   }),
   {query},
 ];
 
 const getInviteRequestsQueryKey = ({organization}: any): ApiQueryKey => [
-  getApiUrl('/organizations/$organizationIdOrSlug/invite-requests/', {
+  getApiUrl(`/organizations/$organizationIdOrSlug/invite-requests/`, {
     path: {organizationIdOrSlug: organization.slug},
   }),
 ];
@@ -88,7 +88,7 @@ function OrganizationMembersList() {
   >(getInviteRequestsQueryKey({organization}), {staleTime: 0});
   const {data: authProvider} = useApiQuery<OrganizationAuthProvider>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/auth-provider/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/auth-provider/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
@@ -96,7 +96,7 @@ function OrganizationMembersList() {
   );
   const {data: currentMember} = useApiQuery<Member>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/members/$memberId/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/members/$memberId/`, {
         path: {organizationIdOrSlug: organization.slug, memberId: 'me'},
       }),
     ],
@@ -476,7 +476,7 @@ function InviteMembersButton({
       <Tooltip
         skipWrapper
         title={t(
-          'Your organization must use its single sign-on provider to register new members.'
+          `Your organization must use its single sign-on provider to register new members.`
         )}
       >
         {action}
diff --git a/static/app/views/settings/organizationProjects/index.tsx b/static/app/views/settings/organizationProjects/index.tsx
index 95056d4119a5..1f6a11bc2284 100644
--- a/static/app/views/settings/organizationProjects/index.tsx
+++ b/static/app/views/settings/organizationProjects/index.tsx
@@ -45,7 +45,7 @@ function OrganizationProjects() {
     isError,
   } = useApiQuery<Project[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/projects/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/projects/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/settings/organizationRelay/relayWrapper.tsx b/static/app/views/settings/organizationRelay/relayWrapper.tsx
index efdbc53e09a7..2cfd23c1755c 100644
--- a/static/app/views/settings/organizationRelay/relayWrapper.tsx
+++ b/static/app/views/settings/organizationRelay/relayWrapper.tsx
@@ -161,7 +161,7 @@ function RelayUsageList({
 }) {
   const {isPending, isError, refetch, data} = useApiQuery<RelayActivity[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/relay_usage/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/relay_usage/`, {
         path: {organizationIdOrSlug: orgSlug},
       }),
     ],
diff --git a/static/app/views/settings/organizationRepositories/index.tsx b/static/app/views/settings/organizationRepositories/index.tsx
index f75f690ecd29..f5402a0947cc 100644
--- a/static/app/views/settings/organizationRepositories/index.tsx
+++ b/static/app/views/settings/organizationRepositories/index.tsx
@@ -20,7 +20,7 @@ export default function OrganizationRepositories() {
       <SettingsPageHeader
         title={t('Repositories')}
         subtitle={tct(
-          'Integrate with a [scm:Source Code Management] provider and then connect repositories with Sentry. Connecting a repo to a project enables [suspect_commits:Suspect Commits] on issues, [suggested_assignees:Suggested Assignees] based on code owners, the ability to mark an issue [resolved_via_commit:Resolved via Commit or PR], and is a requirement for [seer:Seer].',
+          `Integrate with a [scm:Source Code Management] provider and then connect repositories with Sentry. Connecting a repo to a project enables [suspect_commits:Suspect Commits] on issues, [suggested_assignees:Suggested Assignees] based on code owners, the ability to mark an issue [resolved_via_commit:Resolved via Commit or PR], and is a requirement for [seer:Seer].`,
           {
             scm: (
               <ExternalLink href="https://docs.sentry.io/organization/getting-started/#source-code-management" />
diff --git a/static/app/views/settings/organizationTeams/index.tsx b/static/app/views/settings/organizationTeams/index.tsx
index 022a8ffafd89..788a41e8a4d5 100644
--- a/static/app/views/settings/organizationTeams/index.tsx
+++ b/static/app/views/settings/organizationTeams/index.tsx
@@ -18,7 +18,7 @@ export default function OrganizationTeamsContainer() {
   const queryKey = useMemo(
     () =>
       [
-        getApiUrl('/organizations/$organizationIdOrSlug/access-requests/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/access-requests/`, {
           path: {organizationIdOrSlug: organization?.slug!},
         }),
       ] as const,
diff --git a/static/app/views/settings/organizationTeams/teamMembers.tsx b/static/app/views/settings/organizationTeams/teamMembers.tsx
index 2def159f02b0..67b4fa1aed64 100644
--- a/static/app/views/settings/organizationTeams/teamMembers.tsx
+++ b/static/app/views/settings/organizationTeams/teamMembers.tsx
@@ -87,7 +87,7 @@ function AddMemberDropdown({
   const debouncedMemberQuery = useDebouncedValue(memberQuery, 50);
   const {data: orgMembers = [], isFetching: isOrgMembersFetching} = useApiQuery<Member[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/members/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/members/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/settings/organizationTeams/teamNotifications.tsx b/static/app/views/settings/organizationTeams/teamNotifications.tsx
index 59aa062eb2ad..b3f9876903c5 100644
--- a/static/app/views/settings/organizationTeams/teamNotifications.tsx
+++ b/static/app/views/settings/organizationTeams/teamNotifications.tsx
@@ -158,7 +158,7 @@ export default function TeamNotificationSettings() {
     refetch: refetchTeam,
   } = useApiQuery<Team>(
     [
-      getApiUrl('/teams/$organizationIdOrSlug/$teamIdOrSlug/', {
+      getApiUrl(`/teams/$organizationIdOrSlug/$teamIdOrSlug/`, {
         path: {organizationIdOrSlug: organization.slug, teamIdOrSlug: params.teamId},
       }),
       {
@@ -177,7 +177,7 @@ export default function TeamNotificationSettings() {
     refetch: refetchIntegrations,
   } = useApiQuery<Integration[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/settings/organizationTeams/teamProjects.tsx b/static/app/views/settings/organizationTeams/teamProjects.tsx
index b63ee638c46c..66ea206ec19c 100644
--- a/static/app/views/settings/organizationTeams/teamProjects.tsx
+++ b/static/app/views/settings/organizationTeams/teamProjects.tsx
@@ -45,7 +45,7 @@ export default function TeamProjects() {
     refetch: refetchLinkedProjects,
   } = useApiQuery<Project[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/projects/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/projects/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -63,7 +63,7 @@ export default function TeamProjects() {
     refetch: refetchUnlinkedProjects,
   } = useApiQuery<Project[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/projects/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/projects/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/settings/project/projectFilters/projectFiltersChart.tsx b/static/app/views/settings/project/projectFilters/projectFiltersChart.tsx
index 5f3d36ac0a6a..ba83532494b2 100644
--- a/static/app/views/settings/project/projectFilters/projectFiltersChart.tsx
+++ b/static/app/views/settings/project/projectFilters/projectFiltersChart.tsx
@@ -49,7 +49,7 @@ export function ProjectFiltersChart({project}: Props) {
 
   const {data, isError, isPending, refetch} = useApiQuery<UsageSeries>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/stats_v2/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/stats_v2/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx b/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx
index 7e527f79d2ea..a9b0fb58a73e 100644
--- a/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx
+++ b/static/app/views/settings/project/projectFilters/projectFiltersSettings.tsx
@@ -403,7 +403,7 @@ export function ProjectFiltersSettings({project, params, features}: Props) {
     refetch,
   } = useApiQuery<Filter[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/filters/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/filters/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectSlug},
       }),
     ],
diff --git a/static/app/views/settings/project/projectKeys/credentials/otlp.tsx b/static/app/views/settings/project/projectKeys/credentials/otlp.tsx
index 90e503b749a7..46ee45cf5777 100644
--- a/static/app/views/settings/project/projectKeys/credentials/otlp.tsx
+++ b/static/app/views/settings/project/projectKeys/credentials/otlp.tsx
@@ -69,7 +69,7 @@ export function OtlpTab({
           <FieldGroup
             label={t('OTLP Logs Endpoint')}
             help={tct(
-              "Set this URL as your OTLP exporter's log endpoint. [link:Learn more]",
+              `Set this URL as your OTLP exporter's log endpoint. [link:Learn more]`,
               {
                 link: (
                   <ExternalLink href="https://docs.sentry.io/concepts/otlp/#opentelemetry-logs" />
@@ -86,7 +86,7 @@ export function OtlpTab({
 
           <FieldGroup
             label={t('OTLP Logs Endpoint Headers')}
-            help={t('Set these security headers when configuring your OTLP exporter.')}
+            help={t(`Set these security headers when configuring your OTLP exporter.`)}
             inline={false}
             flexibleControlStateSize
           >
@@ -102,7 +102,7 @@ export function OtlpTab({
           <FieldGroup
             label={t('OTLP Traces Endpoint')}
             help={tct(
-              "Set this URL as your OTLP exporter's trace endpoint. [link:Learn more]",
+              `Set this URL as your OTLP exporter's trace endpoint. [link:Learn more]`,
               {
                 link: (
                   <ExternalLink href="https://docs.sentry.io/concepts/otlp/#opentelemetry-traces" />
@@ -119,7 +119,7 @@ export function OtlpTab({
 
           <FieldGroup
             label={t('OTLP Traces Endpoint Headers')}
-            help={t('Set these security headers when configuring your OTLP exporter.')}
+            help={t(`Set these security headers when configuring your OTLP exporter.`)}
             inline={false}
             flexibleControlStateSize
           >
diff --git a/static/app/views/settings/project/projectKeys/credentials/vercel.tsx b/static/app/views/settings/project/projectKeys/credentials/vercel.tsx
index c916e74fec1a..e86ce0ae57cb 100644
--- a/static/app/views/settings/project/projectKeys/credentials/vercel.tsx
+++ b/static/app/views/settings/project/projectKeys/credentials/vercel.tsx
@@ -53,7 +53,7 @@ export function VercelTab({
           <FieldGroup
             label={t('Vercel Trace Drain Endpoint')}
             help={tct(
-              'Set this URL as your Vercel Trace Drain Endpoint (OTLP format). [link:Learn more]',
+              `Set this URL as your Vercel Trace Drain Endpoint (OTLP format). [link:Learn more]`,
               {
                 link: (
                   <ExternalLink href="https://docs.sentry.io/product/drains/integration/vercel/#trace-drains" />
@@ -71,7 +71,7 @@ export function VercelTab({
           <FieldGroup
             label={t('Vercel Trace Drain Authentication Headers')}
             help={t(
-              'Set these security headers when configuring your Vercel Trace Drain.'
+              `Set these security headers when configuring your Vercel Trace Drain.`
             )}
             inline={false}
             flexibleControlStateSize
diff --git a/static/app/views/settings/project/projectKeys/details/index.tsx b/static/app/views/settings/project/projectKeys/details/index.tsx
index 4b75513e3b8d..da3d7816a112 100644
--- a/static/app/views/settings/project/projectKeys/details/index.tsx
+++ b/static/app/views/settings/project/projectKeys/details/index.tsx
@@ -34,7 +34,7 @@ export default function ProjectKeyDetails() {
     isPending,
   } = useApiQuery<ProjectKey>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/$keyId/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/$keyId/`, {
         path: {
           organizationIdOrSlug: organization.slug,
           projectIdOrSlug: projectId,
@@ -49,7 +49,7 @@ export default function ProjectKeyDetails() {
     setApiQueryData<ProjectKey>(
       queryClient,
       [
-        getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/$keyId/', {
+        getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/$keyId/`, {
           path: {
             organizationIdOrSlug: organization.slug,
             projectIdOrSlug: projectId,
diff --git a/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx b/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx
index 8cedf6fe1640..dc9749ac4b69 100644
--- a/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx
+++ b/static/app/views/settings/project/projectKeys/details/loaderSettings.tsx
@@ -248,7 +248,7 @@ export function LoaderSettings({keyId, orgSlug, project, data, updateData}: Prop
               sdkVersionSupportsPerformanceAndReplay(data.browserSdkVersion)
                 ? data.dynamicSdkLoaderOptions.hasReplay
                   ? tct(
-                      '[es5Warning]The default config is [codeReplay:replaysSessionSampleRate: 0.1] and [codeError:replaysOnErrorSampleRate: 1]. [configDocs:Read the docs] to learn how to configure this.',
+                      `[es5Warning]The default config is [codeReplay:replaysSessionSampleRate: 0.1] and [codeError:replaysOnErrorSampleRate: 1]. [configDocs:Read the docs] to learn how to configure this.`,
                       {
                         es5Warning:
                           // latest is deprecated but resolves to v7
@@ -329,7 +329,7 @@ export function LoaderSettings({keyId, orgSlug, project, data, updateData}: Prop
               sdkVersionSupportsPerformanceAndReplay(data.browserSdkVersion)
                 ? data.dynamicSdkLoaderOptions.hasFeedback
                   ? tct(
-                      '[es6Warning]The default config is [codeAutoInject:autoInject: true]. [configDocs:Read the docs] to learn how to configure this.',
+                      `[es6Warning]The default config is [codeAutoInject:autoInject: true]. [configDocs:Read the docs] to learn how to configure this.`,
                       {
                         es6Warning:
                           // latest is deprecated but resolves to v7
diff --git a/static/app/views/settings/project/projectKeys/list/index.tsx b/static/app/views/settings/project/projectKeys/list/index.tsx
index a16e37ba906d..23056d8a035b 100644
--- a/static/app/views/settings/project/projectKeys/list/index.tsx
+++ b/static/app/views/settings/project/projectKeys/list/index.tsx
@@ -51,7 +51,7 @@ export default function ProjectKeys() {
     getResponseHeader,
   } = useApiQuery<ProjectKey[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
       }),
       {
diff --git a/static/app/views/settings/project/projectOwnership/addCodeOwnerModal.tsx b/static/app/views/settings/project/projectOwnership/addCodeOwnerModal.tsx
index 8d957e352975..8d4a662c4543 100644
--- a/static/app/views/settings/project/projectOwnership/addCodeOwnerModal.tsx
+++ b/static/app/views/settings/project/projectOwnership/addCodeOwnerModal.tsx
@@ -61,7 +61,7 @@ export function AddCodeOwnerModal({
     isError: isCodeMappingsError,
   } = useApiQuery<RepositoryProjectPathConfig[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/code-mappings/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/code-mappings/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {project: project.id}},
@@ -75,7 +75,7 @@ export function AddCodeOwnerModal({
     isError: isIntegrationsError,
   } = useApiQuery<Integration[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {features: ['codeowners']}},
@@ -88,7 +88,7 @@ export function AddCodeOwnerModal({
   const {data: codeownersFile} = useApiQuery<CodeownersFile>(
     [
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/code-mappings/$configId/codeowners/',
+        `/organizations/$organizationIdOrSlug/code-mappings/$configId/codeowners/`,
         {
           path: {
             organizationIdOrSlug: organization.slug,
diff --git a/static/app/views/settings/project/projectOwnership/codeownerErrors.spec.tsx b/static/app/views/settings/project/projectOwnership/codeownerErrors.spec.tsx
index ea8b11cf7cf6..5783d6ad0ad2 100644
--- a/static/app/views/settings/project/projectOwnership/codeownerErrors.spec.tsx
+++ b/static/app/views/settings/project/projectOwnership/codeownerErrors.spec.tsx
@@ -34,7 +34,7 @@ describe('CodeownerErrors', () => {
       )
     );
     expect(
-      screen.getByText('There’s a problem linking teams and members from an integration')
+      screen.getByText(`There’s a problem linking teams and members from an integration`)
     ).toBeInTheDocument();
     expect(screen.getByText('@getsentry/something')).toBeInTheDocument();
   });
@@ -63,7 +63,7 @@ describe('CodeownerErrors', () => {
       )
     );
     expect(
-      screen.getByText('There’s a problem linking teams and members from an integration')
+      screen.getByText(`There’s a problem linking teams and members from an integration`)
     ).toBeInTheDocument();
     expect(screen.getByText('@getsentry/something')).toBeInTheDocument();
   });
diff --git a/static/app/views/settings/project/projectOwnership/codeownerErrors.tsx b/static/app/views/settings/project/projectOwnership/codeownerErrors.tsx
index 572a30e2013c..da48283ed029 100644
--- a/static/app/views/settings/project/projectOwnership/codeownerErrors.tsx
+++ b/static/app/views/settings/project/projectOwnership/codeownerErrors.tsx
@@ -139,7 +139,7 @@ export function CodeOwnerErrors({
             message={`The following users are not on a team that has access to the project: ${projectSlug}`}
             values={values}
             linkFunction={email => `/settings/${orgSlug}/members/?query=${email}`}
-            linkValueFunction={() => 'Configure Member Settings'}
+            linkValueFunction={() => `Configure Member Settings`}
           />
         );
       default:
diff --git a/static/app/views/settings/project/projectOwnership/index.tsx b/static/app/views/settings/project/projectOwnership/index.tsx
index 35a0becc3f86..235db6a1221f 100644
--- a/static/app/views/settings/project/projectOwnership/index.tsx
+++ b/static/app/views/settings/project/projectOwnership/index.tsx
@@ -48,7 +48,7 @@ export default function ProjectOwnership() {
   const {project} = useProjectSettingsOutlet();
 
   const ownershipQueryKey: ApiQueryKey = [
-    getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/ownership/', {
+    getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/ownership/`, {
       path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
     }),
   ];
@@ -59,7 +59,7 @@ export default function ProjectOwnership() {
   } = useApiQuery<IssueOwnership>(ownershipQueryKey, {staleTime: Infinity});
 
   const codeownersQueryKey: ApiQueryKey = [
-    getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/codeowners/', {
+    getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/codeowners/`, {
       path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
     }),
     {query: {expand: ['codeMapping', 'ownershipSyntax']}},
@@ -180,7 +180,7 @@ export default function ProjectOwnership() {
         />
         <TextBlock>
           {tct(
-            'Auto-assign issues to users and teams. To learn more, [link:read the docs].',
+            `Auto-assign issues to users and teams. To learn more, [link:read the docs].`,
             {
               link: (
                 <ExternalLink href="https://docs.sentry.io/product/error-monitoring/issue-owners/" />
diff --git a/static/app/views/settings/project/projectOwnership/modal.tsx b/static/app/views/settings/project/projectOwnership/modal.tsx
index ad32f1f804c6..616a80d7a82f 100644
--- a/static/app/views/settings/project/projectOwnership/modal.tsx
+++ b/static/app/views/settings/project/projectOwnership/modal.tsx
@@ -121,7 +121,7 @@ export function ProjectOwnershipModal({
     error,
   } = useApiQuery<TagWithTopValues>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/issues/$issueId/tags/$key/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/issues/$issueId/tags/$key/`, {
         path: {organizationIdOrSlug: organization.slug, issueId, key: 'url'},
       }),
     ],
@@ -134,7 +134,7 @@ export function ProjectOwnershipModal({
     isError: isOwnershipError,
   } = useApiQuery<IssueOwnershipResponse>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/ownership/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/ownership/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
       }),
     ],
diff --git a/static/app/views/settings/project/projectOwnership/ownershipRulesTable.spec.tsx b/static/app/views/settings/project/projectOwnership/ownershipRulesTable.spec.tsx
index 31fcf86747c4..e6ef8ee998ba 100644
--- a/static/app/views/settings/project/projectOwnership/ownershipRulesTable.spec.tsx
+++ b/static/app/views/settings/project/projectOwnership/ownershipRulesTable.spec.tsx
@@ -168,32 +168,6 @@ describe('OwnershipRulesTable', () => {
     expect(screen.getByRole('button', {name: 'Everyone'})).toBeInTheDocument();
   });
 
-  it('should render owners without an id', async () => {
-    const rules: ParsedOwnershipRule[] = [
-      {
-        matcher: {pattern: 'src/app/*', type: 'path'},
-        owners: [{type: 'user', name: 'unresolved-user@example.com'}],
-      },
-      {
-        matcher: {pattern: 'src/utils/*', type: 'path'},
-        owners: [
-          {type: 'user', id: user1.id, name: user1.name},
-          {type: 'team', name: 'backend'},
-        ],
-      },
-    ];
-
-    render(<OwnershipRulesTable projectRules={rules} codeowners={[]} />);
-
-    // Clear the "My Teams" filter to see all rules
-    await userEvent.click(screen.getByRole('button', {name: 'My Teams'}));
-    await userEvent.click(screen.getByRole('button', {name: 'Clear'}));
-
-    expect(screen.getByText('src/app/*')).toBeInTheDocument();
-    expect(screen.getByText('unresolved-user@example.com')).toBeInTheDocument();
-    expect(screen.getByText('src/utils/*')).toBeInTheDocument();
-  });
-
   it('should paginate results', async () => {
     const owners: Actor[] = [{type: 'user', id: user1.id, name: user1.name}];
     const rules: ParsedOwnershipRule[] = new Array(100).fill(0).map((_, i) => ({
diff --git a/static/app/views/settings/project/projectOwnership/ownershipRulesTable.tsx b/static/app/views/settings/project/projectOwnership/ownershipRulesTable.tsx
index bd66c67f6593..bc14bcda65d4 100644
--- a/static/app/views/settings/project/projectOwnership/ownershipRulesTable.tsx
+++ b/static/app/views/settings/project/projectOwnership/ownershipRulesTable.tsx
@@ -16,10 +16,8 @@ import {IconChevron} from 'sentry/icons';
 import {t, tn} from 'sentry/locale';
 import {MemberListStore} from 'sentry/stores/memberListStore';
 import {TeamStore} from 'sentry/stores/teamStore';
-import type {Actor} from 'sentry/types/core';
 import type {ParsedOwnershipRule} from 'sentry/types/group';
 import type {CodeOwner} from 'sentry/types/integrations';
-import {defined} from 'sentry/utils';
 import {useTeams} from 'sentry/utils/useTeams';
 import {useUser} from 'sentry/utils/useUser';
 import {OwnershipOwnerFilter} from 'sentry/views/settings/project/projectOwnership/ownershipOwnerFilter';
@@ -86,10 +84,6 @@ export function OwnershipRulesTable({
   const myTeams = useMemo(() => {
     const memberTeamsIds = teams.filter(team => team.isMember).map(team => team.id);
     return allActors.filter(actor => {
-      if (!defined(actor.id)) {
-        return false;
-      }
-
       if (actor.type === 'user') {
         return actor.id === user.id;
       }
@@ -146,7 +140,7 @@ export function OwnershipRulesTable({
     <RulesTableWrapper data-test-id="ownership-rules-table">
       <Flex align="center" gap="xl">
         <OwnershipOwnerFilter
-          actors={allActors.filter((actor): actor is Actor => defined(actor.id))}
+          actors={allActors}
           selectedTeams={selectedActors ?? []}
           handleChangeFilter={handleChangeFilter}
           isMyTeams={
@@ -172,11 +166,7 @@ export function OwnershipRulesTable({
         emptyMessage={t('No ownership rules found')}
       >
         {chunkedRules[page]?.map((rule, index) => {
-          const hasUnknownOwners = rule.owners.some(owner => !defined(owner.id));
           const ownerNames = rule.owners.map(owner => {
-            if (!owner.id) {
-              return owner.name;
-            }
             if (owner.type === 'team') {
               const team = TeamStore.getById(owner.id);
               return team?.slug ? `#${team.slug}` : owner.name;
@@ -195,15 +185,12 @@ export function OwnershipRulesTable({
               <RowRule>{rule.matcher.pattern}</RowRule>
               <Flex align="center" gap="md">
                 <AvatarContainer numAvatars={Math.min(rule.owners.length, 3)}>
-                  {/* Avoid attempting to render the avatar stack if there are broken owners */}
-                  {!hasUnknownOwners && (
-                    <SuggestedAvatarStack
-                      owners={rule.owners as Actor[]}
-                      suggested={false}
-                      reverse={false}
-                      tooltip={ownerNames.join(', ')}
-                    />
-                  )}
+                  <SuggestedAvatarStack
+                    owners={rule.owners}
+                    suggested={false}
+                    reverse={false}
+                    tooltip={ownerNames.join(', ')}
+                  />
                 </AvatarContainer>
                 {name}
                 {rule.owners.length > 1 &&
diff --git a/static/app/views/settings/project/projectOwnership/viewCodeOwnerModal.spec.tsx b/static/app/views/settings/project/projectOwnership/viewCodeOwnerModal.spec.tsx
index cfd4f6d5d3fb..e8dff31f001d 100644
--- a/static/app/views/settings/project/projectOwnership/viewCodeOwnerModal.spec.tsx
+++ b/static/app/views/settings/project/projectOwnership/viewCodeOwnerModal.spec.tsx
@@ -10,8 +10,7 @@ describe('ViewCodeOwnerModal', () => {
   );
 
   it('should display parsed codeowners file', () => {
-    const ownershipSyntax =
-      'codeowners:/src/sentry/migrations/ #developer-infrastructure\n';
+    const ownershipSyntax = `codeowners:/src/sentry/migrations/ #developer-infrastructure\n`;
     render(
       <ViewCodeOwnerModal
         codeowner={CodeOwnerFixture({ownershipSyntax})}
diff --git a/static/app/views/settings/project/projectReleaseTracking.tsx b/static/app/views/settings/project/projectReleaseTracking.tsx
index c9251825cd60..9eebe3e1fa30 100644
--- a/static/app/views/settings/project/projectReleaseTracking.tsx
+++ b/static/app/views/settings/project/projectReleaseTracking.tsx
@@ -47,7 +47,7 @@ function getReleaseTokenQueryKey(
   projectSlug: string
 ): ApiQueryKey {
   return [
-    getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/releases/token/', {
+    getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/releases/token/`, {
       path: {organizationIdOrSlug: organizationSlug, projectIdOrSlug: projectSlug},
     }),
   ];
@@ -74,7 +74,7 @@ export default function ProjectReleaseTracking() {
 
   const {data: fetchedPlugins = [], isPending: isPluginsLoading} = useApiQuery<Plugin[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/plugins/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/plugins/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
       }),
     ],
diff --git a/static/app/views/settings/project/projectServiceHookDetails.tsx b/static/app/views/settings/project/projectServiceHookDetails.tsx
index 00028ec23f30..73398b2c1efa 100644
--- a/static/app/views/settings/project/projectServiceHookDetails.tsx
+++ b/static/app/views/settings/project/projectServiceHookDetails.tsx
@@ -44,7 +44,7 @@ function HookStats() {
     refetch,
   } = useApiQuery<Array<{total: number; ts: number}>>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/hooks/$hookId/stats/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/hooks/$hookId/stats/`, {
         path: {
           organizationIdOrSlug: organization.slug,
           projectIdOrSlug: projectId,
@@ -123,7 +123,7 @@ export default function ProjectServiceHookDetails() {
     refetch,
   } = useApiQuery<ServiceHook>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/hooks/$hookId/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/hooks/$hookId/`, {
         path: {
           organizationIdOrSlug: organization.slug,
           projectIdOrSlug: projectId,
diff --git a/static/app/views/settings/project/projectServiceHooks.tsx b/static/app/views/settings/project/projectServiceHooks.tsx
index e1ff5dd91273..0f800cf1b221 100644
--- a/static/app/views/settings/project/projectServiceHooks.tsx
+++ b/static/app/views/settings/project/projectServiceHooks.tsx
@@ -79,7 +79,7 @@ export default function ProjectServiceHooks() {
     refetch,
   } = useApiQuery<ServiceHook[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/hooks/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/hooks/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectId},
       }),
     ],
@@ -108,7 +108,7 @@ export default function ProjectServiceHooks() {
       setApiQueryData<ServiceHook[]>(
         queryClient,
         [
-          getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/hooks/', {
+          getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/hooks/`, {
             path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectId},
           }),
         ],
diff --git a/static/app/views/settings/project/projectToolbar.tsx b/static/app/views/settings/project/projectToolbar.tsx
index c2e188bc6408..8a5406a95f85 100644
--- a/static/app/views/settings/project/projectToolbar.tsx
+++ b/static/app/views/settings/project/projectToolbar.tsx
@@ -47,7 +47,7 @@ export default function ProjectToolbarSettings() {
         />
         <TextBlock>
           {t(
-            'Bring critical Sentry insights and tools directly into your web app for easier troubleshooting with the Dev Toolbar.'
+            `Bring critical Sentry insights and tools directly into your web app for easier troubleshooting with the Dev Toolbar.`
           )}
         </TextBlock>
         <ProjectPermissionAlert project={project} />
diff --git a/static/app/views/settings/project/tempest/DevKitSettings.tsx b/static/app/views/settings/project/tempest/DevKitSettings.tsx
index f3520d12794c..4d368ae112ea 100644
--- a/static/app/views/settings/project/tempest/DevKitSettings.tsx
+++ b/static/app/views/settings/project/tempest/DevKitSettings.tsx
@@ -117,7 +117,7 @@ export function DevKitSettings({organization, project}: Props) {
                                   <Stack gap="md">
                                     <p>
                                       {t(
-                                        "Using the Windows tool enter the URL as the 'Request Check URL' and 'Upload URL'."
+                                        `Using the Windows tool enter the URL as the 'Request Check URL' and 'Upload URL'.`
                                       )}
                                     </p>
                                   </Stack>
@@ -143,7 +143,7 @@ export function DevKitSettings({organization, project}: Props) {
                                   <Stack gap="md">
                                     <p>
                                       {t(
-                                        "If you haven't done it via the Windows tool, you can set up the 'Upload URL' and 'Request Check URL' directly in the DevKit. This can be done under 'Debug Settings' > 'Core Dump' > 'Upload' > 'Upload URL' and 'Debug Settings' > 'Core Dump' > 'Data Request' > 'Request Check URL' respectively."
+                                        `If you haven't done it via the Windows tool, you can set up the 'Upload URL' and 'Request Check URL' directly in the DevKit. This can be done under 'Debug Settings' > 'Core Dump' > 'Upload' > 'Upload URL' and 'Debug Settings' > 'Core Dump' > 'Data Request' > 'Request Check URL' respectively.`
                                       )}
                                     </p>
                                   </Stack>
diff --git a/static/app/views/settings/project/tempest/hooks/useFetchTempestCredentials.ts b/static/app/views/settings/project/tempest/hooks/useFetchTempestCredentials.ts
index 2489fb744d33..e707081ed825 100644
--- a/static/app/views/settings/project/tempest/hooks/useFetchTempestCredentials.ts
+++ b/static/app/views/settings/project/tempest/hooks/useFetchTempestCredentials.ts
@@ -12,7 +12,7 @@ const makeFetchTempestCredentialsQueryKey = ({
   projectSlug: string;
 }) =>
   [
-    getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/tempest-credentials/', {
+    getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/tempest-credentials/`, {
       path: {organizationIdOrSlug: orgSlug, projectIdOrSlug: projectSlug},
     }),
   ] as const;
diff --git a/static/app/views/settings/project/tempest/index.tsx b/static/app/views/settings/project/tempest/index.tsx
index 64072a3056a4..76eced2e1f45 100644
--- a/static/app/views/settings/project/tempest/index.tsx
+++ b/static/app/views/settings/project/tempest/index.tsx
@@ -138,7 +138,7 @@ export default function TempestSettings() {
               }
             >
               {t(
-                "Currently Sentry only supports PlayStation 5. If you're looking for PS4 support, please let us know!"
+                `Currently Sentry only supports PlayStation 5. If you're looking for PS4 support, please let us know!`
               )}
             </Alert>
           </Alert.Container>
diff --git a/static/app/views/settings/projectAlerts/settings.tsx b/static/app/views/settings/projectAlerts/settings.tsx
index c408e7f81ea9..0a7618b2de52 100644
--- a/static/app/views/settings/projectAlerts/settings.tsx
+++ b/static/app/views/settings/projectAlerts/settings.tsx
@@ -29,7 +29,7 @@ function makeFetchProjectPluginsQueryKey(
   projectSlug: string
 ): ApiQueryKey {
   return [
-    getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/plugins/', {
+    getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/plugins/`, {
       path: {organizationIdOrSlug: organizationSlug, projectIdOrSlug: projectSlug},
     }),
   ];
@@ -64,7 +64,7 @@ export default function ProjectAlertSettings() {
           <LinkButton
             to={{
               pathname: makeAlertsPathname({
-                path: '/rules/',
+                path: `/rules/`,
                 organization,
               }),
               query: {project: project?.id},
diff --git a/static/app/views/settings/projectDebugFiles/index.tsx b/static/app/views/settings/projectDebugFiles/index.tsx
index a24265dfe64d..d67e4918dbff 100644
--- a/static/app/views/settings/projectDebugFiles/index.tsx
+++ b/static/app/views/settings/projectDebugFiles/index.tsx
@@ -47,7 +47,7 @@ function makeDebugFilesQueryKey({
   query: {cursor: string | undefined; query: string | undefined};
 }): ApiQueryKey {
   return [
-    getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/files/dsyms/', {
+    getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/files/dsyms/`, {
       path: {organizationIdOrSlug: orgSlug, projectIdOrSlug: projectSlug},
     }),
     {query},
@@ -62,7 +62,7 @@ function makeSymbolSourcesQueryKey({
   platform?: string;
 }): ApiQueryKey {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/builtin-symbol-sources/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/builtin-symbol-sources/`, {
       path: {organizationIdOrSlug: orgSlug},
     }),
     {query: {platform}},
diff --git a/static/app/views/settings/projectDebugFiles/sources/builtInRepositories.tsx b/static/app/views/settings/projectDebugFiles/sources/builtInRepositories.tsx
index 07a98f3b71d4..2ab3993db5ef 100644
--- a/static/app/views/settings/projectDebugFiles/sources/builtInRepositories.tsx
+++ b/static/app/views/settings/projectDebugFiles/sources/builtInRepositories.tsx
@@ -118,5 +118,5 @@ export function BuiltInRepositories({
 }
 
 const StyledSelectField = styled(SelectField)`
-  ${p => p.disabled && 'cursor: not-allowed'}
+  ${p => p.disabled && `cursor: not-allowed`}
 `;
diff --git a/static/app/views/settings/projectGeneralSettings/index.spec.tsx b/static/app/views/settings/projectGeneralSettings/index.spec.tsx
index 993f415d2328..9aaf6e86a565 100644
--- a/static/app/views/settings/projectGeneralSettings/index.spec.tsx
+++ b/static/app/views/settings/projectGeneralSettings/index.spec.tsx
@@ -472,17 +472,17 @@ describe('projectGeneralSettings', () => {
       mockOnChangeSlug.mockClear();
       MockApiClient.clearMockResponses();
       MockApiClient.addMockResponse({
-        url: '/organizations/org-slug/grouping-configs/',
+        url: `/organizations/org-slug/grouping-configs/`,
         method: 'GET',
         body: groupingConfigs,
       });
       MockApiClient.addMockResponse({
-        url: '/projects/org-slug/project-slug/environments/',
+        url: `/projects/org-slug/project-slug/environments/`,
         method: 'GET',
         body: [],
       });
       MockApiClient.addMockResponse({
-        url: '/organizations/org-slug/users/',
+        url: `/organizations/org-slug/users/`,
         method: 'GET',
         body: [],
       });
diff --git a/static/app/views/settings/projectGeneralSettings/index.tsx b/static/app/views/settings/projectGeneralSettings/index.tsx
index b18768c2446d..be9af290f0a1 100644
--- a/static/app/views/settings/projectGeneralSettings/index.tsx
+++ b/static/app/views/settings/projectGeneralSettings/index.tsx
@@ -80,7 +80,7 @@ export function ProjectGeneralSettings({project, onChangeSlug}: Props) {
   const api = useApi({persistInFlight: true});
 
   const makeProjectSettingsQueryKey: ApiQueryKey = [
-    getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/', {
+    getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/`, {
       path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
     }),
   ];
diff --git a/static/app/views/settings/projectIssueGrouping/index.tsx b/static/app/views/settings/projectIssueGrouping/index.tsx
index d822c49c78c6..409b6bc889ed 100644
--- a/static/app/views/settings/projectIssueGrouping/index.tsx
+++ b/static/app/views/settings/projectIssueGrouping/index.tsx
@@ -73,7 +73,7 @@ export default function ProjectIssueGrouping() {
 
       <TextBlock>
         {tct(
-          'All events have a fingerprint. Events with the same fingerprint are grouped together into an issue. To learn more about issue grouping, [link: read the docs].',
+          `All events have a fingerprint. Events with the same fingerprint are grouped together into an issue. To learn more about issue grouping, [link: read the docs].`,
           {
             link: (
               <ExternalLink href="https://docs.sentry.io/product/data-management-settings/event-grouping/" />
diff --git a/static/app/views/settings/projectPerformance/projectPerformance.tsx b/static/app/views/settings/projectPerformance/projectPerformance.tsx
index cf62a2314974..62813c49ce06 100644
--- a/static/app/views/settings/projectPerformance/projectPerformance.tsx
+++ b/static/app/views/settings/projectPerformance/projectPerformance.tsx
@@ -159,7 +159,7 @@ const formFields: Field[] = [
 
 const getThresholdQueryKey = (orgSlug: string, projectSlug: string): ApiQueryKey => [
   getApiUrl(
-    '/projects/$organizationIdOrSlug/$projectIdOrSlug/transaction-threshold/configure/',
+    `/projects/$organizationIdOrSlug/$projectIdOrSlug/transaction-threshold/configure/`,
     {
       path: {organizationIdOrSlug: orgSlug, projectIdOrSlug: projectSlug},
     }
@@ -171,7 +171,7 @@ const getPerformanceIssueSettingsQueryKey = (
   projectSlug: string
 ): ApiQueryKey => [
   getApiUrl(
-    '/projects/$organizationIdOrSlug/$projectIdOrSlug/performance-issues/configure/',
+    `/projects/$organizationIdOrSlug/$projectIdOrSlug/performance-issues/configure/`,
     {
       path: {organizationIdOrSlug: orgSlug, projectIdOrSlug: projectSlug},
     }
@@ -223,7 +223,7 @@ export function ProjectPerformance() {
   } = useApiQuery<any>(
     [
       getApiUrl(
-        '/projects/$organizationIdOrSlug/$projectIdOrSlug/performance/configure/',
+        `/projects/$organizationIdOrSlug/$projectIdOrSlug/performance/configure/`,
         {
           path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectSlug},
         }
diff --git a/static/app/views/settings/projectProguard/index.tsx b/static/app/views/settings/projectProguard/index.tsx
index 3a71ddc0fa0c..9686c7e80c99 100644
--- a/static/app/views/settings/projectProguard/index.tsx
+++ b/static/app/views/settings/projectProguard/index.tsx
@@ -40,7 +40,7 @@ export default function ProjectProguard() {
     refetch: fetchData,
   } = useApiQuery<DebugFile[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/files/dsyms/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/files/dsyms/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
       }),
       {
@@ -112,7 +112,7 @@ export default function ProjectProguard() {
 
       <TextBlock>
         {tct(
-          'ProGuard mapping files are used to convert minified classes, methods and field names into a human readable format. To learn more about proguard mapping files, [link: read the docs].',
+          `ProGuard mapping files are used to convert minified classes, methods and field names into a human readable format. To learn more about proguard mapping files, [link: read the docs].`,
           {
             link: (
               <ExternalLink href="https://docs.sentry.io/platforms/android/proguard/" />
diff --git a/static/app/views/settings/projectSecurityHeaders/csp.spec.tsx b/static/app/views/settings/projectSecurityHeaders/csp.spec.tsx
index 2d5a9a4fc261..87cbe6f02411 100644
--- a/static/app/views/settings/projectSecurityHeaders/csp.spec.tsx
+++ b/static/app/views/settings/projectSecurityHeaders/csp.spec.tsx
@@ -118,7 +118,7 @@ describe('ProjectCspReports', () => {
         data: {
           // XXX: Org details endpoints accept these multiline inputs as a list, where as it looks like project details accepts it as a string with newlines
           options: {
-            'sentry:csp_ignored_sources': 'test\ntest2',
+            'sentry:csp_ignored_sources': `test\ntest2`,
           },
         },
       })
diff --git a/static/app/views/settings/projectSecurityHeaders/csp.tsx b/static/app/views/settings/projectSecurityHeaders/csp.tsx
index da759222c5d3..5a87d1af703a 100644
--- a/static/app/views/settings/projectSecurityHeaders/csp.tsx
+++ b/static/app/views/settings/projectSecurityHeaders/csp.tsx
@@ -76,7 +76,7 @@ export default function ProjectCspReports() {
     refetch: refetchKeyList,
   } = useApiQuery<ProjectKey[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectId},
       }),
     ],
@@ -91,7 +91,7 @@ export default function ProjectCspReports() {
     refetch: refetchProject,
   } = useApiQuery<Project>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectId},
       }),
     ],
@@ -117,7 +117,7 @@ export default function ProjectCspReports() {
 
   const projectEndpoint = `/projects/${organization.slug}/${projectId}/`;
   const projectQueryKey: ApiQueryKey = [
-    getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/', {
+    getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/`, {
       path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectId},
     }),
   ];
diff --git a/static/app/views/settings/projectSecurityHeaders/expectCt.tsx b/static/app/views/settings/projectSecurityHeaders/expectCt.tsx
index 9a53a674edcc..3d022c305cfa 100644
--- a/static/app/views/settings/projectSecurityHeaders/expectCt.tsx
+++ b/static/app/views/settings/projectSecurityHeaders/expectCt.tsx
@@ -35,7 +35,7 @@ function ProjectExpectCtReports() {
     refetch,
   } = useApiQuery<ProjectKey[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectId},
       }),
     ],
diff --git a/static/app/views/settings/projectSecurityHeaders/hpkp.tsx b/static/app/views/settings/projectSecurityHeaders/hpkp.tsx
index 4bc73ff54a33..bb64b6b645bb 100644
--- a/static/app/views/settings/projectSecurityHeaders/hpkp.tsx
+++ b/static/app/views/settings/projectSecurityHeaders/hpkp.tsx
@@ -55,7 +55,7 @@ function ProjectHpkpReports() {
     refetch,
   } = useApiQuery<ProjectKey[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectId},
       }),
     ],
diff --git a/static/app/views/settings/projectSecurityHeaders/index.tsx b/static/app/views/settings/projectSecurityHeaders/index.tsx
index 420490adf5b8..af74dfdafd1e 100644
--- a/static/app/views/settings/projectSecurityHeaders/index.tsx
+++ b/static/app/views/settings/projectSecurityHeaders/index.tsx
@@ -37,7 +37,7 @@ function ProjectSecurityHeaders() {
     refetch,
   } = useApiQuery<ProjectKey[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/keys/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: projectId},
       }),
     ],
diff --git a/static/app/views/settings/projectSeer/index.tsx b/static/app/views/settings/projectSeer/index.tsx
index dd87f9a7d90a..f7a686fd9141 100644
--- a/static/app/views/settings/projectSeer/index.tsx
+++ b/static/app/views/settings/projectSeer/index.tsx
@@ -214,7 +214,7 @@ function ProjectSeerGeneralForm({project}: {project: Project}) {
   const handleSubmitSuccess = useCallback(
     (resp: Project) => {
       const projectSettingsQueryKey: ApiQueryKey = [
-        getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/', {
+        getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/`, {
           path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
         }),
       ];
diff --git a/static/app/views/settings/projectSourceMaps/sourceMapsDetails.tsx b/static/app/views/settings/projectSourceMaps/sourceMapsDetails.tsx
index ac13de38e6a1..38ea5a505945 100644
--- a/static/app/views/settings/projectSourceMaps/sourceMapsDetails.tsx
+++ b/static/app/views/settings/projectSourceMaps/sourceMapsDetails.tsx
@@ -186,7 +186,7 @@ export function SourceMapsDetails({bundleId, project}: Props) {
 
   const {data: releasesData, isPending: releasesLoading} = useApiQuery<Release[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/releases/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/releases/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/app/views/settings/projectSourceMaps/sourceMapsList.tsx b/static/app/views/settings/projectSourceMaps/sourceMapsList.tsx
index 941f2a579ed4..3377f9cc384c 100644
--- a/static/app/views/settings/projectSourceMaps/sourceMapsList.tsx
+++ b/static/app/views/settings/projectSourceMaps/sourceMapsList.tsx
@@ -95,7 +95,7 @@ function useSourceMapUploads({
     refetch: archivesRefetch,
   } = useApiQuery<SourceMapsArchive[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/files/source-maps/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/files/source-maps/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
       }),
       {
@@ -116,7 +116,7 @@ function useSourceMapUploads({
   } = useApiQuery<DebugIdBundle[]>(
     [
       getApiUrl(
-        '/projects/$organizationIdOrSlug/$projectIdOrSlug/files/artifact-bundles/',
+        `/projects/$organizationIdOrSlug/$projectIdOrSlug/files/artifact-bundles/`,
         {
           path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
         }
@@ -138,7 +138,7 @@ function useSourceMapUploads({
 
   const {data: releasesData, isPending: releasesLoading} = useApiQuery<Release[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/releases/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/releases/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -223,7 +223,7 @@ export function SourceMapsList({project}: Props) {
       <SettingsPageHeader title={t('Source Map Uploads')} />
       <TextBlock>
         {tct(
-          'These source map archives help Sentry identify where to look when code is minified. By providing this information, you can get better context for your stack traces when debugging. To learn more about source maps, [link: read the docs].',
+          `These source map archives help Sentry identify where to look when code is minified. By providing this information, you can get better context for your stack traces when debugging. To learn more about source maps, [link: read the docs].`,
           {
             link: <ExternalLink href={sourceMapsLinks.sourcemaps} />,
           }
diff --git a/static/app/views/settings/projectTags/index.tsx b/static/app/views/settings/projectTags/index.tsx
index bbecb30c277d..bb14752f7f23 100644
--- a/static/app/views/settings/projectTags/index.tsx
+++ b/static/app/views/settings/projectTags/index.tsx
@@ -53,7 +53,7 @@ export default function ProjectTags() {
     isError,
   } = useApiQuery<TagWithTopValues[]>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/tags/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/tags/`, {
         path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug},
       }),
     ],
@@ -69,7 +69,7 @@ export default function ProjectTags() {
       setApiQueryData<TagWithTopValues[]>(
         queryClient,
         [
-          getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/tags/', {
+          getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/tags/`, {
             path: {
               organizationIdOrSlug: organization.slug,
               projectIdOrSlug: project.slug,
diff --git a/static/app/views/settings/seer/overview/autofixOverviewSection.spec.tsx b/static/app/views/settings/seer/overview/autofixOverviewSection.spec.tsx
index c70adb83d7da..e7f430a9c194 100644
--- a/static/app/views/settings/seer/overview/autofixOverviewSection.spec.tsx
+++ b/static/app/views/settings/seer/overview/autofixOverviewSection.spec.tsx
@@ -38,7 +38,7 @@ describe('autofixOverviewSection', () => {
   describe('useAutofixOverviewData', () => {
     function setupSettingsMock(settings: AutofixAutomationSettings[]) {
       return MockApiClient.addMockResponse({
-        url: '/organizations/org-slug/autofix/automation-settings/',
+        url: `/organizations/org-slug/autofix/automation-settings/`,
         method: 'GET',
         body: settings,
       });
diff --git a/static/app/views/settings/seer/overview/codeReviewOverviewSection.tsx b/static/app/views/settings/seer/overview/codeReviewOverviewSection.tsx
index bb218427bf5d..d3e2e643345e 100644
--- a/static/app/views/settings/seer/overview/codeReviewOverviewSection.tsx
+++ b/static/app/views/settings/seer/overview/codeReviewOverviewSection.tsx
@@ -15,7 +15,7 @@ import {organizationRepositoriesInfiniteOptions} from 'sentry/components/events/
 import {useSeerSupportedProviderIds} from 'sentry/components/events/autofix/utils';
 import {useBulkUpdateRepositorySettings} from 'sentry/components/repositories/useBulkUpdateRepositorySettings';
 import {getRepositoryWithSettingsQueryKey} from 'sentry/components/repositories/useRepositoryWithSettings';
-import {IconSettings} from 'sentry/icons';
+import {IconRefresh, IconSettings} from 'sentry/icons';
 import {t, tct, tn} from 'sentry/locale';
 import {DEFAULT_CODE_REVIEW_TRIGGERS} from 'sentry/types/integrations';
 import type {Organization} from 'sentry/types/organization';
@@ -65,6 +65,7 @@ export function CodeReviewOverviewSection({
   isPending,
   organization,
   data,
+  refetch,
 }: Props) {
   const queryClient = useQueryClient();
 
@@ -173,8 +174,16 @@ export function CodeReviewOverviewSection({
     <FieldGroup
       title={
         <Flex justify="between" gap="md" flexGrow={1}>
-          <span>{t('Code Review')}</span>
-
+          <Flex align="center" gap="md">
+            <span>{t('Code Review')}</span>
+            <Button
+              size="zero"
+              priority="link"
+              icon={<IconRefresh size="xs" />}
+              aria-label={t('Reload repositories')}
+              onClick={() => refetch()}
+            />
+          </Flex>
           <Text uppercase={false}>
             <Link to={`/settings/${organization.slug}/seer/repos/`}>
               <Flex align="center" gap="xs">
diff --git a/static/app/views/settings/seer/seerAgentHooks.spec.tsx b/static/app/views/settings/seer/seerAgentHooks.spec.tsx
index 82691b24dd67..5a34dbf3596a 100644
--- a/static/app/views/settings/seer/seerAgentHooks.spec.tsx
+++ b/static/app/views/settings/seer/seerAgentHooks.spec.tsx
@@ -13,6 +13,7 @@ import type {CodingAgentIntegration} from 'sentry/components/events/autofix/useA
 import {ProjectsStore} from 'sentry/stores/projectsStore';
 import {useQueryClient} from 'sentry/utils/queryClient';
 import {
+  useAgentOptions,
   useBulkMutateCreatePr,
   useMutateCreatePr,
   useMutateSelectedAgent,
@@ -34,31 +35,65 @@ describe('seerAgentHooks', () => {
     ProjectsStore.reset();
   });
 
+  describe('useAgentOptions', () => {
+    it('returns Seer, integration options', () => {
+      const integrations: CodingAgentIntegration[] = [
+        {id: '42', name: 'Cursor', provider: 'cursor'},
+      ];
+
+      const {result} = renderHookWithProviders(useAgentOptions, {
+        initialProps: {integrations},
+        organization,
+      });
+
+      const options = result.current;
+      expect(options).toHaveLength(3);
+      expect(options[0]).toEqual({value: 'seer', label: expect.any(String)});
+      expect(options[1]).toMatchObject({
+        value: {id: '42', name: 'Cursor', provider: 'cursor'},
+        label: 'Cursor',
+      });
+      expect(options[2]).toEqual({value: 'none', label: 'No Handoff'});
+    });
+
+    it('filters out integrations without id', () => {
+      const integrations: CodingAgentIntegration[] = [
+        {id: null, name: 'No Id', provider: 'other'},
+        {id: '1', name: 'With Id', provider: 'cursor'},
+      ];
+
+      const {result} = renderHookWithProviders(useAgentOptions, {
+        initialProps: {integrations},
+        organization,
+      });
+
+      const options = result.current;
+      expect(options).toHaveLength(3);
+      expect(options[1]!.value).toMatchObject({id: '1', name: 'With Id'});
+    });
+  });
+
   describe('useSelectedAgentFromProjectSettings', () => {
-    it('returns "seer" when no automation_handoff integration_id', () => {
+    it('returns "none" when project autofixAutomationTuning is off', () => {
+      const p = ProjectFixture({...project, autofixAutomationTuning: 'off'});
+
       const {result} = renderHookWithProviders(useSelectedAgentFromProjectSettings, {
         initialProps: {
-          preference: {
-            repositories: [],
-          },
+          preference: {repositories: []},
+          project: p,
           integrations: [],
         },
         organization,
       });
 
-      expect(result.current).toBe('seer');
+      expect(result.current).toBe('none');
     });
 
-    it('returns "seer" when no automation_handoff integration_id, ignoring autofixAutomationTuning', () => {
+    it('returns "seer" when no automation_handoff integration_id', () => {
       const {result} = renderHookWithProviders(useSelectedAgentFromProjectSettings, {
         initialProps: {
-          preference: {
-            projectId: '1',
-            autofixAutomationTuning: 'off',
-            automatedRunStoppingPoint: 'code_changes',
-            automation_handoff: undefined,
-            repositories: [],
-          },
+          preference: {repositories: []},
+          project,
           integrations: [],
         },
         organization,
@@ -82,6 +117,7 @@ describe('seerAgentHooks', () => {
               integration_id: 99,
             },
           },
+          project,
           integrations,
         },
         organization,
@@ -92,7 +128,7 @@ describe('seerAgentHooks', () => {
   });
 
   describe('useSelectedAgentFromBulkSettings', () => {
-    it('returns "seer" when automationHandoff undefined, doesnt look at autofixAutomationTuning', () => {
+    it('returns "none" when autofixAutomationTuning is off', () => {
       const {result} = renderHookWithProviders(useSelectedAgentFromBulkSettings, {
         initialProps: {
           autofixSettings: {
@@ -107,7 +143,7 @@ describe('seerAgentHooks', () => {
         organization,
       });
 
-      expect(result.current).toBe('seer');
+      expect(result.current).toBe('none');
     });
 
     it('returns "seer" when no automationHandoff integration_id', () => {
diff --git a/static/app/views/settings/seer/seerAgentHooks.tsx b/static/app/views/settings/seer/seerAgentHooks.tsx
index 962b7b52941a..770ed07b8e3f 100644
--- a/static/app/views/settings/seer/seerAgentHooks.tsx
+++ b/static/app/views/settings/seer/seerAgentHooks.tsx
@@ -23,14 +23,39 @@ import {fetchDataQuery, fetchMutation, useQueryClient} from 'sentry/utils/queryC
 import {RequestError} from 'sentry/utils/requestError/requestError';
 import {useOrganization} from 'sentry/utils/useOrganization';
 
+export function useAgentOptions({
+  integrations,
+}: {
+  integrations: CodingAgentIntegration[];
+}) {
+  return useMemo(() => {
+    return [
+      {value: 'seer' as const, label: t('Seer Agent')},
+      ...integrations
+        .filter(integration => integration.id)
+        .map(integration => ({
+          value: integration,
+          label: integration.name,
+        })),
+      {value: 'none' as const, label: t('No Handoff')},
+    ];
+  }, [integrations]);
+}
+
 export function useSelectedAgentFromProjectSettings({
   integrations,
   preference,
+  project,
 }: {
   integrations: CodingAgentIntegration[];
   preference: ProjectSeerPreferences;
+  project: Project;
 }) {
   return useMemo(() => {
+    // If we have autofixAutomationTuning==OFF then 'none' is picked
+    if (project.autofixAutomationTuning === 'off') {
+      return 'none';
+    }
     // If we have nothing in preferences, then we have Seer
     if (!preference?.automation_handoff?.integration_id) {
       return 'seer';
@@ -40,7 +65,11 @@ export function useSelectedAgentFromProjectSettings({
       integration =>
         integration.id === String(preference.automation_handoff?.integration_id)
     );
-  }, [preference.automation_handoff?.integration_id, integrations]);
+  }, [
+    preference?.automation_handoff?.integration_id,
+    project.autofixAutomationTuning,
+    integrations,
+  ]);
 }
 
 export function useSelectedAgentFromBulkSettings({
@@ -51,6 +80,10 @@ export function useSelectedAgentFromBulkSettings({
   integrations: CodingAgentIntegration[];
 }) {
   return useMemo(() => {
+    // If we have autofixAutomationTuning==OFF then 'none' is picked
+    if (autofixSettings.autofixAutomationTuning === 'off') {
+      return 'none';
+    }
     // If we have nothing in preferences, then we have Seer
     if (!autofixSettings?.automationHandoff?.integration_id) {
       return 'seer';
@@ -60,7 +93,11 @@ export function useSelectedAgentFromBulkSettings({
       integration =>
         integration.id === String(autofixSettings.automationHandoff?.integration_id)
     );
-  }, [autofixSettings.automationHandoff?.integration_id, integrations]);
+  }, [
+    autofixSettings.automationHandoff?.integration_id,
+    autofixSettings.autofixAutomationTuning,
+    integrations,
+  ]);
 }
 
 function useApplyOptimisticUpdate({project}: {project: Project}) {
diff --git a/static/app/views/setupWizard/utils/useOrganizationDetails.tsx b/static/app/views/setupWizard/utils/useOrganizationDetails.tsx
index dd4edf778dd8..00db6d0239b1 100644
--- a/static/app/views/setupWizard/utils/useOrganizationDetails.tsx
+++ b/static/app/views/setupWizard/utils/useOrganizationDetails.tsx
@@ -10,7 +10,7 @@ export function useOrganizationDetails({
 }) {
   return useQuery({
     queryKey: [
-      getApiUrl('/organizations/$organizationIdOrSlug/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/`, {
         path: {organizationIdOrSlug: organization?.slug!},
       }),
       {
diff --git a/static/app/views/setupWizard/utils/useOrganizationProjects.tsx b/static/app/views/setupWizard/utils/useOrganizationProjects.tsx
index 997c05298652..bd7a834a4554 100644
--- a/static/app/views/setupWizard/utils/useOrganizationProjects.tsx
+++ b/static/app/views/setupWizard/utils/useOrganizationProjects.tsx
@@ -12,7 +12,7 @@ export function useOrganizationProjects({
 }) {
   return useQuery({
     queryKey: [
-      getApiUrl('/organizations/$organizationIdOrSlug/projects/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/projects/`, {
         path: {organizationIdOrSlug: organization?.slug!},
       }),
       {
diff --git a/static/app/views/setupWizard/utils/useOrganizationTeams.tsx b/static/app/views/setupWizard/utils/useOrganizationTeams.tsx
index 357d1db638d1..c85a3ce3d478 100644
--- a/static/app/views/setupWizard/utils/useOrganizationTeams.tsx
+++ b/static/app/views/setupWizard/utils/useOrganizationTeams.tsx
@@ -10,7 +10,7 @@ export function useOrganizationTeams({
 }) {
   return useQuery({
     queryKey: [
-      getApiUrl('/organizations/$organizationIdOrSlug/teams/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/teams/`, {
         path: {organizationIdOrSlug: organization?.slug!},
       }),
       {
diff --git a/static/app/views/setupWizard/utils/useOrganizationsWithRegion.tsx b/static/app/views/setupWizard/utils/useOrganizationsWithRegion.tsx
index 714141bbe3b3..c152fe8e0918 100644
--- a/static/app/views/setupWizard/utils/useOrganizationsWithRegion.tsx
+++ b/static/app/views/setupWizard/utils/useOrganizationsWithRegion.tsx
@@ -16,7 +16,7 @@ export function useOrganizationsWithRegion() {
       const results = await Promise.all(
         regions.map<Promise<[Region, Organization[]]>>(async region => [
           region,
-          await api.requestPromise('/organizations/', {
+          await api.requestPromise(`/organizations/`, {
             host: region.url,
             // Authentication errors can happen as we span regions.
             allowAuthError: true,
diff --git a/static/app/views/sharedGroupDetails/index.tsx b/static/app/views/sharedGroupDetails/index.tsx
index d782ad35c2ec..44814961ddc4 100644
--- a/static/app/views/sharedGroupDetails/index.tsx
+++ b/static/app/views/sharedGroupDetails/index.tsx
@@ -46,7 +46,7 @@ function SharedGroupDetails() {
     refetch,
   } = useApiQuery<Group>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/shared/issues/$shareId/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/shared/issues/$shareId/`, {
         path: {organizationIdOrSlug: orgSlug!, shareId},
       }),
     ],
diff --git a/static/eslint/eslintPluginScraps/src/rules/no-token-import.ts b/static/eslint/eslintPluginScraps/src/rules/no-token-import.ts
index e884c72de75c..d47d8e6d881f 100644
--- a/static/eslint/eslintPluginScraps/src/rules/no-token-import.ts
+++ b/static/eslint/eslintPluginScraps/src/rules/no-token-import.ts
@@ -29,7 +29,7 @@ export const noTokenImport = ESLintUtils.RuleCreator.withoutDocs({
     },
     schema: [],
     messages: {
-      forbidden: 'Do not import scraps tokens directly - prefer using theme tokens.',
+      forbidden: `Do not import scraps tokens directly - prefer using theme tokens.`,
     },
   },
   create(context) {
diff --git a/static/eslint/eslintPluginSentry/no-default-exports.spec.ts b/static/eslint/eslintPluginSentry/no-default-exports.spec.ts
index ce1491714ad5..b381e9d798a8 100644
--- a/static/eslint/eslintPluginSentry/no-default-exports.spec.ts
+++ b/static/eslint/eslintPluginSentry/no-default-exports.spec.ts
@@ -16,7 +16,7 @@ const ruleTester = new RuleTester({
 ruleTester.run('no-default-exports', noDefaultExports, {
   valid: [
     {
-      code: 'export function MyComponent() { return <div />; }',
+      code: `export function MyComponent() { return <div />; }`,
       filename: 'valid.tsx',
     },
     {
@@ -27,11 +27,11 @@ export default wrap(MyComponentInner);
       filename: 'valid.tsx',
     },
     {
-      code: 'export const MyComponent = () => <div />;',
+      code: `export const MyComponent = () => <div />;`,
       filename: 'valid.tsx',
     },
     {
-      code: 'export const util = () => null;',
+      code: `export const util = () => null;`,
       filename: 'valid.tsx',
     },
     {
@@ -42,23 +42,23 @@ export default wrap(MyComponentInner);
       filename: 'valid.tsx',
     },
     {
-      code: 'export class MyClass {}',
+      code: `export class MyClass {}`,
       filename: 'valid.tsx',
     },
     {
-      code: 'const x = 1;',
+      code: `const x = 1;`,
       filename: 'valid.tsx',
     },
     {
-      code: 'export default withConfig(MyComponent);',
+      code: `export default withConfig(MyComponent);`,
       filename: 'valid.tsx',
     },
     {
-      code: 'export default styled(MyComponent)`color: red;`;',
+      code: `export default styled(MyComponent)\`color: red;\`;`,
       filename: 'valid.tsx',
     },
     {
-      code: 'export default withConfig(MyComponent) as React.FC;',
+      code: `export default withConfig(MyComponent) as React.FC;`,
       filename: 'valid.tsx',
     },
   ],
@@ -175,24 +175,24 @@ export default wrap(MyComponentInner);
       filename: 'invalid.tsx',
     },
     {
-      code: 'export default function myFunction() { return 1; }',
-      output: 'export function myFunction() { return 1; }',
+      code: `export default function myFunction() { return 1; }`,
+      output: `export function myFunction() { return 1; }`,
       errors: [{messageId: 'forbidden'}],
       filename: 'invalid.tsx',
     },
     {
-      code: 'export default class MyClass {}',
-      output: 'export class MyClass {}',
+      code: `export default class MyClass {}`,
+      output: `export class MyClass {}`,
       errors: [{messageId: 'forbidden'}],
       filename: 'invalid.tsx',
     },
     {
-      code: 'export default function() { return 1; }',
+      code: `export default function() { return 1; }`,
       errors: [{messageId: 'forbidden'}],
       filename: 'invalid.tsx',
     },
     {
-      code: 'export default class {}',
+      code: `export default class {}`,
       errors: [{messageId: 'forbidden'}],
       filename: 'invalid.tsx',
     },
@@ -219,27 +219,27 @@ export default wrap(MyComponentInner);
       filename: 'invalid.tsx',
     },
     {
-      code: 'export default { key: "value" };',
+      code: `export default { key: "value" };`,
       errors: [{messageId: 'forbidden'}],
       filename: 'invalid.tsx',
     },
     {
-      code: 'export default [1, 2, 3];',
+      code: `export default [1, 2, 3];`,
       errors: [{messageId: 'forbidden'}],
       filename: 'invalid.tsx',
     },
     {
-      code: 'export default "hello";',
+      code: `export default "hello";`,
       errors: [{messageId: 'forbidden'}],
       filename: 'invalid.tsx',
     },
     {
-      code: 'export default 42;',
+      code: `export default 42;`,
       errors: [{messageId: 'forbidden'}],
       filename: 'invalid.tsx',
     },
     {
-      code: 'export default () => null;',
+      code: `export default () => null;`,
       errors: [{messageId: 'forbidden'}],
       filename: 'invalid.tsx',
     },
diff --git a/static/gsAdmin/components/changePlanAction.tsx b/static/gsAdmin/components/changePlanAction.tsx
index f208a094824e..0c05431da690 100644
--- a/static/gsAdmin/components/changePlanAction.tsx
+++ b/static/gsAdmin/components/changePlanAction.tsx
@@ -57,7 +57,7 @@ function ChangePlanAction({
     isError,
   } = useApiQuery<BillingConfig>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/billing-config/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/billing-config/`, {
         path: {organizationIdOrSlug: orgId},
       }),
       {query: {tier: 'all'}},
diff --git a/static/gsAdmin/components/createBroadcastModal.tsx b/static/gsAdmin/components/createBroadcastModal.tsx
index c642f73fa16b..c7076abb3ac4 100644
--- a/static/gsAdmin/components/createBroadcastModal.tsx
+++ b/static/gsAdmin/components/createBroadcastModal.tsx
@@ -27,7 +27,7 @@ export function CreateBroadcastModal({
 
   const {mutate: updateBroadcast} = useMutation({
     mutationFn: (data: Broadcast) => {
-      return api.requestPromise('/broadcasts/', {
+      return api.requestPromise(`/broadcasts/`, {
         method: 'POST',
         data,
       });
diff --git a/static/gsAdmin/components/customers/customerOverview.tsx b/static/gsAdmin/components/customers/customerOverview.tsx
index f5db40da36dc..5d2aea8bdd74 100644
--- a/static/gsAdmin/components/customers/customerOverview.tsx
+++ b/static/gsAdmin/components/customers/customerOverview.tsx
@@ -405,7 +405,7 @@ function DynamicSampling({organization}: {organization: Organization}) {
 
   const {data, isPending, isError} = useApiQuery<{effectiveSampleRate: number | null}>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/sampling/effective-sample-rate/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/sampling/effective-sample-rate/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
@@ -624,7 +624,7 @@ export function CustomerOverview({customer, onAction, organization}: Props) {
               disabled={!hasActiveProductTrial || lessThanOneDayLeft}
               tooltipProps={{
                 title: lessThanOneDayLeft
-                  ? 'Current product trial will end in less than one day'
+                  ? `Current product trial will end in less than one day`
                   : hasActiveProductTrial
                     ? `Stop the current product trial for ${formattedTrialName}`
                     : `No product trial is active for ${formattedTrialName}`,
diff --git a/static/gsAdmin/components/customers/customerStats.tsx b/static/gsAdmin/components/customers/customerStats.tsx
index ca0578a01b4e..ec408a18eb0d 100644
--- a/static/gsAdmin/components/customers/customerStats.tsx
+++ b/static/gsAdmin/components/customers/customerStats.tsx
@@ -476,7 +476,7 @@ export const CustomerStats = memo(
       };
     }, [location.query, onDemandPeriodStart, onDemandPeriodEnd]);
 
-    const statsEndpointUrl = getApiUrl('/organizations/$organizationIdOrSlug/stats_v2/', {
+    const statsEndpointUrl = getApiUrl(`/organizations/$organizationIdOrSlug/stats_v2/`, {
       path: {organizationIdOrSlug: orgSlug},
     });
 
diff --git a/static/gsAdmin/components/docIntegrationModal.tsx b/static/gsAdmin/components/docIntegrationModal.tsx
index 366b75c99fe6..27e599b8dfd8 100644
--- a/static/gsAdmin/components/docIntegrationModal.tsx
+++ b/static/gsAdmin/components/docIntegrationModal.tsx
@@ -49,7 +49,7 @@ export function DocIntegrationModal(props: Props) {
     isError,
     isPending,
     refetch,
-  } = useApiQuery<IntegrationFeature[]>([getApiUrl('/integration-features/')], {
+  } = useApiQuery<IntegrationFeature[]>([getApiUrl(`/integration-features/`)], {
     staleTime: 0,
   });
 
diff --git a/static/gsAdmin/components/mergeAccounts.tsx b/static/gsAdmin/components/mergeAccounts.tsx
index b43e14eb3edd..2148c70e8732 100644
--- a/static/gsAdmin/components/mergeAccounts.tsx
+++ b/static/gsAdmin/components/mergeAccounts.tsx
@@ -34,7 +34,7 @@ export function MergeAccountsModal(props: Props) {
   const queryClient = useQueryClient();
 
   const makeMergeAccountsQueryKey = (): ApiQueryKey => [
-    getApiUrl('/users/$userId/merge-accounts/', {
+    getApiUrl(`/users/$userId/merge-accounts/`, {
       path: {userId},
     }),
   ];
diff --git a/static/gsAdmin/components/sentryAppUpdateModal.tsx b/static/gsAdmin/components/sentryAppUpdateModal.tsx
index 255d461cdce7..597ae7632468 100644
--- a/static/gsAdmin/components/sentryAppUpdateModal.tsx
+++ b/static/gsAdmin/components/sentryAppUpdateModal.tsx
@@ -81,7 +81,7 @@ export function SentryAppUpdateModal(props: Props) {
     isPending,
     isError,
     refetch,
-  } = useApiQuery<IntegrationFeature[]>([getApiUrl('/integration-features/')], {
+  } = useApiQuery<IntegrationFeature[]>([getApiUrl(`/integration-features/`)], {
     staleTime: 0,
   });
 
diff --git a/static/gsAdmin/components/users/userPermissionsModal.tsx b/static/gsAdmin/components/users/userPermissionsModal.tsx
index 7a8b4bb92895..172211c9cedf 100644
--- a/static/gsAdmin/components/users/userPermissionsModal.tsx
+++ b/static/gsAdmin/components/users/userPermissionsModal.tsx
@@ -31,7 +31,7 @@ export function UserPermissionsModal({Body, Header, user, onSubmit, closeModal}:
     isError: availablePermissionsError,
   } = useApiQuery<string[]>(
     [
-      getApiUrl('/users/$userId/permissions/config/', {
+      getApiUrl(`/users/$userId/permissions/config/`, {
         path: {userId: user.id},
       }),
     ],
@@ -43,7 +43,7 @@ export function UserPermissionsModal({Body, Header, user, onSubmit, closeModal}:
     isError: permissionListError,
   } = useApiQuery<string[]>(
     [
-      getApiUrl('/users/$userId/permissions/', {
+      getApiUrl(`/users/$userId/permissions/`, {
         path: {userId: user.id},
       }),
     ],
diff --git a/static/gsAdmin/views/beaconDetails.tsx b/static/gsAdmin/views/beaconDetails.tsx
index e4be59b9b4d6..b596a39a0a2b 100644
--- a/static/gsAdmin/views/beaconDetails.tsx
+++ b/static/gsAdmin/views/beaconDetails.tsx
@@ -14,7 +14,7 @@ export function BeaconDetails() {
   const params = useParams<{beaconId: string}>();
   const {data, isPending, isError} = useApiQuery<BeaconData>(
     [
-      getApiUrl('/beacons/$beaconId/', {
+      getApiUrl(`/beacons/$beaconId/`, {
         path: {beaconId: params.beaconId},
       }),
     ],
diff --git a/static/gsAdmin/views/broadcastDetails.spec.tsx b/static/gsAdmin/views/broadcastDetails.spec.tsx
index c9bcfe2bf593..702d8e46fcd7 100644
--- a/static/gsAdmin/views/broadcastDetails.spec.tsx
+++ b/static/gsAdmin/views/broadcastDetails.spec.tsx
@@ -48,20 +48,20 @@ describe('Broadcast Details', () => {
       screen.getByText(textWithMarkupMatcher(`Media URL:${broadcast.mediaUrl}`))
     ).toBeInTheDocument();
     expect(
-      screen.getByText(textWithMarkupMatcher('Category:Blog Post'))
+      screen.getByText(textWithMarkupMatcher(`Category:Blog Post`))
     ).toBeInTheDocument();
-    expect(screen.getByText(textWithMarkupMatcher('Region:DE'))).toBeInTheDocument();
+    expect(screen.getByText(textWithMarkupMatcher(`Region:DE`))).toBeInTheDocument();
     expect(
-      screen.getByText(textWithMarkupMatcher('Platform:Bun, Capacitor'))
+      screen.getByText(textWithMarkupMatcher(`Platform:Bun, Capacitor`))
     ).toBeInTheDocument();
     expect(
-      screen.getByText(textWithMarkupMatcher('Product:Errors, Spans'))
+      screen.getByText(textWithMarkupMatcher(`Product:Errors, Spans`))
     ).toBeInTheDocument();
     expect(
-      screen.getByText(textWithMarkupMatcher('Created By:admin@sentry.io'))
+      screen.getByText(textWithMarkupMatcher(`Created By:admin@sentry.io`))
     ).toBeInTheDocument();
     expect(
-      screen.getByText(textWithMarkupMatcher('Early Adopter:Yes'))
+      screen.getByText(textWithMarkupMatcher(`Early Adopter:Yes`))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/gsAdmin/views/broadcastDetails.tsx b/static/gsAdmin/views/broadcastDetails.tsx
index de5fac6aaed4..0e6f12212376 100644
--- a/static/gsAdmin/views/broadcastDetails.tsx
+++ b/static/gsAdmin/views/broadcastDetails.tsx
@@ -36,7 +36,7 @@ export function BroadcastDetails() {
 
   const {data, isPending, isError, refetch} = useApiQuery<any>(
     [
-      getApiUrl('/broadcasts/$broadcastId/', {
+      getApiUrl(`/broadcasts/$broadcastId/`, {
         path: {broadcastId},
       }),
     ],
@@ -67,7 +67,7 @@ export function BroadcastDetails() {
       setApiQueryData<Record<string, unknown>>(
         queryClient,
         [
-          getApiUrl('/broadcasts/$broadcastId/', {
+          getApiUrl(`/broadcasts/$broadcastId/`, {
             path: {broadcastId},
           }),
         ],
diff --git a/static/gsAdmin/views/customerContractDetails.tsx b/static/gsAdmin/views/customerContractDetails.tsx
index 3a5819f54595..97f9e0b3ceac 100644
--- a/static/gsAdmin/views/customerContractDetails.tsx
+++ b/static/gsAdmin/views/customerContractDetails.tsx
@@ -242,7 +242,7 @@ export function CustomerContractDetails() {
   const {orgId} = useParams<{orgId: string}>();
   const {data, isPending, isError, refetch} = useApiQuery<Contract>(
     [
-      getApiUrl('/_admin/customers/$organizationIdOrSlug/contract/', {
+      getApiUrl(`/_admin/customers/$organizationIdOrSlug/contract/`, {
         path: {organizationIdOrSlug: orgId},
       }),
     ],
diff --git a/static/gsAdmin/views/customerDetails.spec.tsx b/static/gsAdmin/views/customerDetails.spec.tsx
index b06c987cd22a..e11aad0b022d 100644
--- a/static/gsAdmin/views/customerDetails.spec.tsx
+++ b/static/gsAdmin/views/customerDetails.spec.tsx
@@ -1120,7 +1120,7 @@ describe('Customer Details', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -1134,7 +1134,7 @@ describe('Customer Details', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -1174,7 +1174,7 @@ describe('Customer Details', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -1197,7 +1197,7 @@ describe('Customer Details', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -1220,7 +1220,7 @@ describe('Customer Details', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -1265,7 +1265,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -1297,7 +1297,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${softCapOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: softCapOrg,
       });
@@ -1320,7 +1320,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${softCapOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: softCapOrg,
       });
@@ -1349,7 +1349,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${softCapOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: softCapOrg,
       });
@@ -1394,7 +1394,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${softCapOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: softCapOrg,
       });
@@ -1446,7 +1446,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${softCapOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: softCapOrg,
       });
@@ -1473,7 +1473,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${softCapOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: softCapOrg,
       });
@@ -1506,7 +1506,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${softCapOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: softCapOrg,
       });
@@ -1554,7 +1554,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${noNotificationsOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: noNotificationsOrg,
       });
@@ -1596,7 +1596,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${pendingChangesOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: pendingChangesOrg,
       });
@@ -1618,7 +1618,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -1644,7 +1644,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${cannotTrialOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: cannotTrialOrg,
       });
@@ -1666,7 +1666,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -1688,7 +1688,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -1716,7 +1716,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${cannotTrialOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: cannotTrialOrg,
       });
@@ -1764,7 +1764,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${terminateOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: terminateOrg,
       });
@@ -1807,7 +1807,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${terminateOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: terminateOrg,
       });
@@ -1845,7 +1845,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${terminateOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: terminateOrg,
       });
@@ -1890,7 +1890,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -1951,7 +1951,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2020,7 +2020,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2059,7 +2059,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2132,7 +2132,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2181,7 +2181,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${cancelSubOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: cancelSubOrg,
       });
@@ -2208,7 +2208,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${cancelSubOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: cancelSubOrg,
       });
@@ -2278,7 +2278,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2326,7 +2326,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2364,7 +2364,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2395,7 +2395,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${trialOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: trialOrg,
       });
@@ -2433,7 +2433,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2483,7 +2483,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${onDemandInvoicedOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: onDemandInvoicedOrg,
       });
@@ -2519,7 +2519,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${onDemandInvoicedOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: onDemandInvoicedOrg,
       });
@@ -2555,7 +2555,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${onDemandInvoicedOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: onDemandInvoicedOrg,
       });
@@ -2596,7 +2596,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${invoicedOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: invoicedOrg,
       });
@@ -2653,7 +2653,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${onDemandInvoicedOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: onDemandInvoicedOrg,
       });
@@ -2699,7 +2699,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2765,7 +2765,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2814,7 +2814,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2841,7 +2841,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2876,7 +2876,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2932,7 +2932,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -2990,7 +2990,7 @@ describe('Customer Details', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -3047,7 +3047,7 @@ describe('Customer Details', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -3103,7 +3103,7 @@ describe('Customer Details', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -3128,7 +3128,7 @@ describe('Customer Details', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -3154,7 +3154,7 @@ describe('Customer Details', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -3219,7 +3219,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${invoicedOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: invoicedOrg,
       });
@@ -3245,7 +3245,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${invoicedOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: invoicedOrg,
       });
@@ -3277,7 +3277,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${suspendedOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: suspendedOrg,
       });
@@ -3305,7 +3305,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${suspendedOrg.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: suspendedOrg,
       });
@@ -3349,7 +3349,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -3405,7 +3405,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -3428,7 +3428,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -3457,7 +3457,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${organization.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization,
       });
@@ -3517,7 +3517,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${orgWithDeleteFeature.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: orgWithDeleteFeature,
       });
@@ -3544,7 +3544,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${orgWithoutDeleteFeature.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: orgWithoutDeleteFeature,
       });
@@ -3570,7 +3570,7 @@ describe('Customer Details', () => {
       render(<CustomerDetails />, {
         initialRouterConfig: {
           location: {pathname: `/customers/${org.slug}`},
-          route: '/customers/:orgId',
+          route: `/customers/:orgId`,
         },
         organization: org,
       });
@@ -3658,7 +3658,7 @@ describe('Gift Categories Availability', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -3684,7 +3684,7 @@ describe('Gift Categories Availability', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -3710,7 +3710,7 @@ describe('Gift Categories Availability', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -3736,7 +3736,7 @@ describe('Gift Categories Availability', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -3763,7 +3763,7 @@ describe('Gift Categories Availability', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
@@ -3788,7 +3788,7 @@ describe('Gift Categories Availability', () => {
     render(<CustomerDetails />, {
       initialRouterConfig: {
         location: {pathname: `/customers/${organization.slug}`},
-        route: '/customers/:orgId',
+        route: `/customers/:orgId`,
       },
       organization,
     });
diff --git a/static/gsAdmin/views/customerDetails.tsx b/static/gsAdmin/views/customerDetails.tsx
index 210c0fa95f93..0ac8adfe10f3 100644
--- a/static/gsAdmin/views/customerDetails.tsx
+++ b/static/gsAdmin/views/customerDetails.tsx
@@ -90,7 +90,7 @@ const DEFAULT_ERROR_MESSAGE = 'Unable to update the customer account';
 
 function makeSubscriptionQueryKey(orgId: string): ApiQueryKey {
   return [
-    getApiUrl('/customers/$organizationIdOrSlug/', {
+    getApiUrl(`/customers/$organizationIdOrSlug/`, {
       path: {organizationIdOrSlug: orgId},
     }),
   ];
@@ -98,7 +98,7 @@ function makeSubscriptionQueryKey(orgId: string): ApiQueryKey {
 
 function makeOrganizationQueryKey(orgId: string): ApiQueryKey {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/`, {
       path: {organizationIdOrSlug: orgId},
     }),
     {query: {detailed: 0, include_feature_flags: 1}},
@@ -107,7 +107,7 @@ function makeOrganizationQueryKey(orgId: string): ApiQueryKey {
 
 function makeBillingConfigQueryKey(orgId: string): ApiQueryKey {
   return [
-    getApiUrl('/customers/$organizationIdOrSlug/billing-config/', {
+    getApiUrl(`/customers/$organizationIdOrSlug/billing-config/`, {
       path: {organizationIdOrSlug: orgId},
     }),
     {query: {tier: 'all'}},
diff --git a/static/gsAdmin/views/customerUpgradeRequest.tsx b/static/gsAdmin/views/customerUpgradeRequest.tsx
index 362fd4faca77..67cc46b62716 100644
--- a/static/gsAdmin/views/customerUpgradeRequest.tsx
+++ b/static/gsAdmin/views/customerUpgradeRequest.tsx
@@ -49,7 +49,7 @@ export function CustomerUpgradeRequest() {
     isError,
   } = useApiQuery<Subscription>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/`, {
         path: {organizationIdOrSlug: orgId},
       }),
     ],
diff --git a/static/gsAdmin/views/dataRequests.tsx b/static/gsAdmin/views/dataRequests.tsx
index 85e32cfde910..69b3992d0d1c 100644
--- a/static/gsAdmin/views/dataRequests.tsx
+++ b/static/gsAdmin/views/dataRequests.tsx
@@ -45,7 +45,7 @@ export function DataRequests() {
 
   const {data: eventsData = [], isLoading: isLoadingEvents} = useApiQuery<any[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/events/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/events/`, {
         path: {organizationIdOrSlug: queryFromRouterOrgSlug},
       }),
       {query: {query: 'user.email:' + queryFromRouterEmail}},
diff --git a/static/gsAdmin/views/docIntegrationDetails.tsx b/static/gsAdmin/views/docIntegrationDetails.tsx
index 6d527ff3ac4e..3537edbbcf2b 100644
--- a/static/gsAdmin/views/docIntegrationDetails.tsx
+++ b/static/gsAdmin/views/docIntegrationDetails.tsx
@@ -36,7 +36,7 @@ export function DocIntegrationDetails() {
   const queryClient = useQueryClient();
   const navigate = useNavigate();
 
-  const ENDPOINT = getApiUrl('/doc-integrations/$docIntegrationIdOrSlug/', {
+  const ENDPOINT = getApiUrl(`/doc-integrations/$docIntegrationIdOrSlug/`, {
     path: {docIntegrationIdOrSlug: docIntegrationSlug},
   });
 
diff --git a/static/gsAdmin/views/docIntegrations.spec.tsx b/static/gsAdmin/views/docIntegrations.spec.tsx
index 48ae434f716b..fc2a3758f0ee 100644
--- a/static/gsAdmin/views/docIntegrations.spec.tsx
+++ b/static/gsAdmin/views/docIntegrations.spec.tsx
@@ -48,7 +48,7 @@ describe('Doc Integration Details', () => {
         location: {
           pathname: `/admin/doc-integrations/${mockDocIntegration.slug}/`,
         },
-        route: '/admin/doc-integrations/:docIntegrationSlug/',
+        route: `/admin/doc-integrations/:docIntegrationSlug/`,
       },
     });
 
@@ -83,7 +83,7 @@ describe('Doc Integration Details', () => {
         location: {
           pathname: `/admin/doc-integrations/${mockDocIntegration.slug}/`,
         },
-        route: '/admin/doc-integrations/:docIntegrationSlug/',
+        route: `/admin/doc-integrations/:docIntegrationSlug/`,
       },
     });
 
@@ -140,7 +140,7 @@ describe('Doc Integration Details', () => {
         location: {
           pathname: `/admin/doc-integrations/${mockDocIntegration.slug}/`,
         },
-        route: '/admin/doc-integrations/:docIntegrationSlug/',
+        route: `/admin/doc-integrations/:docIntegrationSlug/`,
       },
     });
     expect(
@@ -196,7 +196,7 @@ describe('Doc Integration Details', () => {
         location: {
           pathname: `/admin/doc-integrations/${mockDocIntegration.slug}/`,
         },
-        route: '/admin/doc-integrations/:docIntegrationSlug/',
+        route: `/admin/doc-integrations/:docIntegrationSlug/`,
       },
     });
 
diff --git a/static/gsAdmin/views/dynamicSamplingPanel.tsx b/static/gsAdmin/views/dynamicSamplingPanel.tsx
index b588ac0e39c6..da6c41b6aa25 100644
--- a/static/gsAdmin/views/dynamicSamplingPanel.tsx
+++ b/static/gsAdmin/views/dynamicSamplingPanel.tsx
@@ -184,7 +184,7 @@ export function DynamicSamplingPanel({projectId, organization}: Props) {
 
   async function invalidateProjectConfig() {
     try {
-      await api.requestPromise('/internal/project-config/', {
+      await api.requestPromise(`/internal/project-config/`, {
         host: regionHost,
         method: 'POST',
         data: {projectId},
@@ -336,7 +336,7 @@ function DynamicSamplingRulesTable({
       return `${round(samplingValue.value * 100)}%`;
     }
     if (samplingValue.type === 'reservoir') {
-      return '100%';
+      return `100%`;
     }
     return `* ${round(samplingValue.value)}`;
   };
diff --git a/static/gsAdmin/views/instanceLevelOAuth/components/confirmClientDeleteModal.tsx b/static/gsAdmin/views/instanceLevelOAuth/components/confirmClientDeleteModal.tsx
index 567e06f9feb0..71a797f04cb2 100644
--- a/static/gsAdmin/views/instanceLevelOAuth/components/confirmClientDeleteModal.tsx
+++ b/static/gsAdmin/views/instanceLevelOAuth/components/confirmClientDeleteModal.tsx
@@ -24,7 +24,7 @@ export function ConfirmClientDeleteModal({Body, Header, clientID, name}: Props)
         method: 'DELETE',
       });
       addSuccessMessage(`Client "${name}" deleted successfully`);
-      browserHistory.push('/_admin/instance-level-oauth/');
+      browserHistory.push(`/_admin/instance-level-oauth/`);
     } catch (err) {
       const message = 'Unable to load client data';
       handleXhrErrorResponse(message, err as RequestError);
diff --git a/static/gsAdmin/views/invoiceDetails.spec.tsx b/static/gsAdmin/views/invoiceDetails.spec.tsx
index 9c04891f1a04..ca985cf42508 100644
--- a/static/gsAdmin/views/invoiceDetails.spec.tsx
+++ b/static/gsAdmin/views/invoiceDetails.spec.tsx
@@ -63,7 +63,7 @@ describe('InvoiceDetails', () => {
           location: {
             pathname: `/organizations/${mockOrg.slug}/invoices/us/${invoice.id}/`,
           },
-          route: '/organizations/:orgId/invoices/:region/:invoiceId/',
+          route: `/organizations/:orgId/invoices/:region/:invoiceId/`,
         },
       });
 
@@ -91,7 +91,7 @@ describe('InvoiceDetails', () => {
           location: {
             pathname: `/organizations/${mockOrg.slug}/invoices/de/${invoice.id}/`,
           },
-          route: '/organizations/:orgId/invoices/:region/:invoiceId/',
+          route: `/organizations/:orgId/invoices/:region/:invoiceId/`,
         },
       });
 
@@ -120,7 +120,7 @@ describe('InvoiceDetails', () => {
           location: {
             pathname: `/organizations/${mockOrg.slug}/invoices/us/${invoice.id}/`,
           },
-          route: '/organizations/:orgId/invoices/:region/:invoiceId/',
+          route: `/organizations/:orgId/invoices/:region/:invoiceId/`,
         },
       });
 
@@ -157,7 +157,7 @@ describe('InvoiceDetails', () => {
           location: {
             pathname: `/organizations/${mockOrg.slug}/invoices/us/${invoice.id}/`,
           },
-          route: '/organizations/:orgId/invoices/:region/:invoiceId/',
+          route: `/organizations/:orgId/invoices/:region/:invoiceId/`,
         },
       });
 
@@ -185,7 +185,7 @@ describe('InvoiceDetails', () => {
           location: {
             pathname: `/organizations/${mockOrg.slug}/invoices/us/${invoice.id}/`,
           },
-          route: '/organizations/:orgId/invoices/:region/:invoiceId/',
+          route: `/organizations/:orgId/invoices/:region/:invoiceId/`,
         },
       });
 
diff --git a/static/gsAdmin/views/invoiceDetails.tsx b/static/gsAdmin/views/invoiceDetails.tsx
index 445d671ec4e9..29937575ea29 100644
--- a/static/gsAdmin/views/invoiceDetails.tsx
+++ b/static/gsAdmin/views/invoiceDetails.tsx
@@ -42,7 +42,7 @@ export function InvoiceDetails() {
   const api = useApi({persistInFlight: true});
   const queryClient = useQueryClient();
   const QUERY_KEY: ApiQueryKey = [
-    getApiUrl('/_admin/cells/$region/admin-invoices/$invoiceId/', {
+    getApiUrl(`/_admin/cells/$region/admin-invoices/$invoiceId/`, {
       path: {region, invoiceId},
     }),
     {
diff --git a/static/gsAdmin/views/launchpadAdminPage.tsx b/static/gsAdmin/views/launchpadAdminPage.tsx
index b45aa2b48800..3fa872758fe4 100644
--- a/static/gsAdmin/views/launchpadAdminPage.tsx
+++ b/static/gsAdmin/views/launchpadAdminPage.tsx
@@ -34,7 +34,7 @@ export function LaunchpadAdminPage() {
   const {mutate: rerunAnalysis} = useMutation({
     mutationFn: () => {
       return fetchMutation({
-        url: '/internal/preprod-artifact/rerun-analysis/',
+        url: `/internal/preprod-artifact/rerun-analysis/`,
         method: 'POST',
         data: {
           preprod_artifact_id: rerunArtifactId,
@@ -58,7 +58,7 @@ export function LaunchpadAdminPage() {
   const {mutate: deleteArtifactData} = useMutation({
     mutationFn: () => {
       return fetchMutation({
-        url: '/internal/preprod-artifact/batch-delete/',
+        url: `/internal/preprod-artifact/batch-delete/`,
         method: 'DELETE',
         data: {
           preprod_artifact_ids: [deleteArtifactId],
@@ -108,7 +108,7 @@ export function LaunchpadAdminPage() {
   const {mutate: batchDeleteArtifacts} = useMutation({
     mutationFn: () => {
       return fetchMutation({
-        url: '/internal/preprod-artifact/batch-delete/',
+        url: `/internal/preprod-artifact/batch-delete/`,
         method: 'DELETE',
         data: {
           preprod_artifact_ids: batchDeleteArtifactIds
@@ -129,7 +129,7 @@ export function LaunchpadAdminPage() {
       setBatchDeleteArtifactIds('');
     },
     onError: () => {
-      addErrorMessage('Failed to batch delete artifacts');
+      addErrorMessage(`Failed to batch delete artifacts`);
     },
   });
 
diff --git a/static/gsAdmin/views/layout.tsx b/static/gsAdmin/views/layout.tsx
index ec6fdcb2895c..e8dea99ae760 100644
--- a/static/gsAdmin/views/layout.tsx
+++ b/static/gsAdmin/views/layout.tsx
@@ -116,7 +116,7 @@ const AppContainer = styled('div')`
   padding-left: var(--sidebarWidth);
 `;
 
-const Content = styled('main')`
+const Content = styled(`main`)`
   width: 100%;
   max-width: var(--contentWidth);
   padding: 0 ${p => p.theme.space['2xl']};
diff --git a/static/gsAdmin/views/policyDetails.tsx b/static/gsAdmin/views/policyDetails.tsx
index 7ea0604b6f66..80cb995ac3c7 100644
--- a/static/gsAdmin/views/policyDetails.tsx
+++ b/static/gsAdmin/views/policyDetails.tsx
@@ -32,7 +32,7 @@ export function PolicyDetails() {
     refetch,
   } = useApiQuery<Policy>(
     [
-      getApiUrl('/policies/$policySlug/', {
+      getApiUrl(`/policies/$policySlug/`, {
         path: {policySlug},
       }),
     ],
diff --git a/static/gsAdmin/views/projectDetails.tsx b/static/gsAdmin/views/projectDetails.tsx
index 1ca3ef3f74af..5a3aa08f5f9d 100644
--- a/static/gsAdmin/views/projectDetails.tsx
+++ b/static/gsAdmin/views/projectDetails.tsx
@@ -35,7 +35,7 @@ export function ProjectDetails() {
   }>();
   const {data, isPending, isError} = useApiQuery<Project>(
     [
-      getApiUrl('/projects/$organizationIdOrSlug/$projectIdOrSlug/', {
+      getApiUrl(`/projects/$organizationIdOrSlug/$projectIdOrSlug/`, {
         path: {organizationIdOrSlug: orgId, projectIdOrSlug: projectId},
       }),
     ],
diff --git a/static/gsAdmin/views/promoCodeDetails.tsx b/static/gsAdmin/views/promoCodeDetails.tsx
index ddd662e3d878..7b0ef8926cb1 100644
--- a/static/gsAdmin/views/promoCodeDetails.tsx
+++ b/static/gsAdmin/views/promoCodeDetails.tsx
@@ -32,7 +32,7 @@ export function PromoCodeDetails() {
   const {codeId} = useParams<{codeId: string}>();
   const api = useApi({persistInFlight: true});
   const queryClient = useQueryClient();
-  const ENDPOINT = getApiUrl('/promocodes/$code/', {path: {code: codeId}});
+  const ENDPOINT = getApiUrl(`/promocodes/$code/`, {path: {code: codeId}});
 
   const {
     data: promoCode,
diff --git a/static/gsAdmin/views/relocationArtifactDetails.tsx b/static/gsAdmin/views/relocationArtifactDetails.tsx
index f89819d8b6c4..b014b643fb7d 100644
--- a/static/gsAdmin/views/relocationArtifactDetails.tsx
+++ b/static/gsAdmin/views/relocationArtifactDetails.tsx
@@ -25,7 +25,7 @@ export function RelocationArtifactDetails() {
 
   const {data, isPending, isError} = useApiQuery<RelocationData>(
     [
-      getApiUrl('/relocations/$relocationUuid/artifacts/$artifactKind/$fileName', {
+      getApiUrl(`/relocations/$relocationUuid/artifacts/$artifactKind/$fileName`, {
         path: {relocationUuid, artifactKind, fileName},
       }),
       {
diff --git a/static/gsAdmin/views/relocationCreate.spec.tsx b/static/gsAdmin/views/relocationCreate.spec.tsx
index a9738def71dd..946367cfed81 100644
--- a/static/gsAdmin/views/relocationCreate.spec.tsx
+++ b/static/gsAdmin/views/relocationCreate.spec.tsx
@@ -94,7 +94,7 @@ describe('Relocation Create', () => {
 
   it('should submit form if data is correct', async () => {
     const mockapi = MockApiClient.addMockResponse({
-      url: '/relocations/',
+      url: `/relocations/`,
       method: 'POST',
       body: {
         dateAdded: '2023-12-18T01:02:03:45.678Z',
@@ -134,7 +134,7 @@ describe('Relocation Create', () => {
     expect(mockapi).toHaveBeenCalled();
     expect(router.location).toEqual(
       expect.objectContaining({
-        pathname: '/_admin/relocations/test/d39f84fc-554a-4d7d-95b7-78f983bcba73/',
+        pathname: `/_admin/relocations/test/d39f84fc-554a-4d7d-95b7-78f983bcba73/`,
       })
     );
   });
diff --git a/static/gsAdmin/views/relocationCreate.tsx b/static/gsAdmin/views/relocationCreate.tsx
index 17d395704baf..be28d417e3ce 100644
--- a/static/gsAdmin/views/relocationCreate.tsx
+++ b/static/gsAdmin/views/relocationCreate.tsx
@@ -60,7 +60,7 @@ function RelocationForm() {
       }
 
       // Start the relocation.
-      const response = await api.requestPromise('/relocations/', {
+      const response = await api.requestPromise(`/relocations/`, {
         method: 'POST',
         host: region.url,
         data: formData,
diff --git a/static/gsAdmin/views/relocationDetails.spec.tsx b/static/gsAdmin/views/relocationDetails.spec.tsx
index 19199fa9a517..61c5b63aab3e 100644
--- a/static/gsAdmin/views/relocationDetails.spec.tsx
+++ b/static/gsAdmin/views/relocationDetails.spec.tsx
@@ -98,7 +98,7 @@ describe('Relocation Details', () => {
         location: {
           pathname: `/admin/relocations/test/${uuid}/`,
         },
-        route: '/admin/relocations/:regionName/:relocationUuid/',
+        route: `/admin/relocations/:regionName/:relocationUuid/`,
       },
     });
 
@@ -130,7 +130,7 @@ describe('Relocation Details', () => {
         location: {
           pathname: `/admin/relocations/test/${uuid}/`,
         },
-        route: '/admin/relocations/:regionName/:relocationUuid/',
+        route: `/admin/relocations/:regionName/:relocationUuid/`,
       },
     });
 
@@ -239,7 +239,7 @@ describe('Relocation Details', () => {
         location: {
           pathname: `/admin/relocations/test/${uuid}/`,
         },
-        route: '/admin/relocations/:regionName/:relocationUuid/',
+        route: `/admin/relocations/:regionName/:relocationUuid/`,
       },
     });
 
@@ -315,7 +315,7 @@ describe('Relocation Details', () => {
         location: {
           pathname: `/admin/relocations/test/${uuid}/`,
         },
-        route: '/admin/relocations/:regionName/:relocationUuid/',
+        route: `/admin/relocations/:regionName/:relocationUuid/`,
       },
     });
 
@@ -344,7 +344,7 @@ describe('Relocation Details', () => {
         location: {
           pathname: `/admin/relocations/test/${uuid}/`,
         },
-        route: '/admin/relocations/:regionName/:relocationUuid/',
+        route: `/admin/relocations/:regionName/:relocationUuid/`,
       },
     });
 
@@ -447,7 +447,7 @@ describe('Relocation Details', () => {
         location: {
           pathname: `/admin/relocations/test/${uuid}/`,
         },
-        route: '/admin/relocations/:regionName/:relocationUuid/',
+        route: `/admin/relocations/:regionName/:relocationUuid/`,
       },
     });
 
@@ -502,7 +502,7 @@ describe('Relocation Details', () => {
         location: {
           pathname: `/admin/relocations/test/${old_uuid}/`,
         },
-        route: '/admin/relocations/:regionName/:relocationUuid/',
+        route: `/admin/relocations/:regionName/:relocationUuid/`,
       },
     });
 
diff --git a/static/gsAdmin/views/relocationDetails.tsx b/static/gsAdmin/views/relocationDetails.tsx
index 872109479ce5..7f304ec1e28b 100644
--- a/static/gsAdmin/views/relocationDetails.tsx
+++ b/static/gsAdmin/views/relocationDetails.tsx
@@ -187,7 +187,7 @@ export function RelocationDetails() {
 
   const {data, isPending, isError, refetch} = useApiQuery<Relocation>(
     [
-      getApiUrl('/relocations/$relocationUuid/', {
+      getApiUrl(`/relocations/$relocationUuid/`, {
         path: {relocationUuid},
       }),
       {host: region ? region.url : ''},
@@ -226,8 +226,8 @@ export function RelocationDetails() {
     ) {
       actions.push({
         key: 'artifacts',
-        name: 'Show Artifacts',
-        help: 'Show all artifacts (files, findings, etc) associated with this relocation for further review. You may need special admin privileges to use this feature.',
+        name: `Show Artifacts`,
+        help: `Show all artifacts (files, findings, etc) associated with this relocation for further review. You may need special admin privileges to use this feature.`,
         skipConfirmModal: true,
         onAction: () => {
           // artifact state is either disabled or error
diff --git a/static/gsAdmin/views/sentryAppDetails.spec.tsx b/static/gsAdmin/views/sentryAppDetails.spec.tsx
deleted file mode 100644
index 7b797cf1a56c..000000000000
--- a/static/gsAdmin/views/sentryAppDetails.spec.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import {SentryAppFixture} from 'sentry-fixture/sentryApp';
-
-import {render, screen} from 'sentry-test/reactTestingLibrary';
-
-import {SentryAppDetails} from 'admin/views/sentryAppDetails';
-
-describe('SentryAppDetails', () => {
-  beforeEach(() => {
-    MockApiClient.clearMockResponses();
-  });
-
-  it('renders an unpublished app without crashing', async () => {
-    const sentryApp = {
-      ...SentryAppFixture({
-        slug: 'cursor-staging',
-        status: 'unpublished',
-      }),
-      owner: {slug: 'cursor'},
-    };
-
-    MockApiClient.addMockResponse({
-      url: `/sentry-apps/${sentryApp.slug}/`,
-      method: 'GET',
-      body: sentryApp,
-    });
-
-    render(<SentryAppDetails />, {
-      initialRouterConfig: {
-        location: {
-          pathname: `/_admin/sentry-apps/${sentryApp.slug}/`,
-        },
-        route: '/_admin/sentry-apps/:sentryAppSlug/',
-      },
-    });
-
-    expect(await screen.findByRole('heading', {name: 'Sentry Apps'})).toBeInTheDocument();
-    expect(screen.getAllByText('unpublished')).not.toHaveLength(0);
-  });
-});
diff --git a/static/gsAdmin/views/sentryAppDetails.tsx b/static/gsAdmin/views/sentryAppDetails.tsx
index 64ce3c1180a5..9e69f21b3ab8 100644
--- a/static/gsAdmin/views/sentryAppDetails.tsx
+++ b/static/gsAdmin/views/sentryAppDetails.tsx
@@ -24,13 +24,13 @@ import {useParams} from 'sentry/utils/useParams';
 import {DetailLabel} from 'admin/components/detailLabel';
 import {DetailList} from 'admin/components/detailList';
 import {DetailsContainer} from 'admin/components/detailsContainer';
-import type {ActionItem, BadgeItem} from 'admin/components/detailsPage';
+import type {ActionItem} from 'admin/components/detailsPage';
 import {DetailsPage} from 'admin/components/detailsPage';
 import {SentryAppUpdateModal} from 'admin/components/sentryAppUpdateModal';
 
 export function SentryAppDetails() {
   const {sentryAppSlug} = useParams<{sentryAppSlug: string}>();
-  const ENDPOINT = getApiUrl('/sentry-apps/$sentryAppIdOrSlug/', {
+  const ENDPOINT = getApiUrl(`/sentry-apps/$sentryAppIdOrSlug/`, {
     path: {sentryAppIdOrSlug: sentryAppSlug},
   });
   const api = useApi();
@@ -112,10 +112,6 @@ export function SentryAppDetails() {
     publishingAction === undefined
       ? [updateDetailsAction]
       : [updateDetailsAction, publishingAction];
-  const sentryAppBadgeLevel: Partial<Record<string, NonNullable<BadgeItem['level']>>> = {
-    unpublished: 'danger',
-    internal: 'warning',
-  };
 
   const overview = (
     <DetailsContainer>
@@ -164,7 +160,8 @@ export function SentryAppDetails() {
       badges={[
         {
           name: data.status,
-          level: sentryAppBadgeLevel[data.status] ?? 'success',
+          // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
+          level: {unpublished: 'error', internal: 'warning'}[data.status] ?? 'success',
         },
       ]}
       actions={actions}
diff --git a/static/gsAdmin/views/userDetails.spec.tsx b/static/gsAdmin/views/userDetails.spec.tsx
index 4ad1ac453cef..959eb6cc3cf0 100644
--- a/static/gsAdmin/views/userDetails.spec.tsx
+++ b/static/gsAdmin/views/userDetails.spec.tsx
@@ -28,7 +28,7 @@ describe('User Details', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/api-tokens/',
+      url: `/api-tokens/`,
       body: [
         {
           id: '8',
@@ -56,7 +56,7 @@ describe('User Details', () => {
           location: {
             pathname: `/admin/users/${mockUser.id}/`,
           },
-          route: '/admin/users/:userId/',
+          route: `/admin/users/:userId/`,
         },
       });
 
@@ -71,7 +71,7 @@ describe('User Details', () => {
           location: {
             pathname: `/admin/users/${mockUser.id}/`,
           },
-          route: '/admin/users/:userId/',
+          route: `/admin/users/:userId/`,
         },
       });
 
@@ -88,7 +88,7 @@ describe('User Details', () => {
           location: {
             pathname: `/admin/users/${mockUser.id}/`,
           },
-          route: '/admin/users/:userId/',
+          route: `/admin/users/:userId/`,
         },
       });
 
diff --git a/static/gsAdmin/views/userDetails.tsx b/static/gsAdmin/views/userDetails.tsx
index 5c59a506e451..1b943d429f3b 100644
--- a/static/gsAdmin/views/userDetails.tsx
+++ b/static/gsAdmin/views/userDetails.tsx
@@ -38,17 +38,17 @@ export function UserDetails() {
   const queryClient = useQueryClient();
 
   const makeFetchUserQueryKey = (): ApiQueryKey => [
-    getApiUrl('/users/$userId/', {
+    getApiUrl(`/users/$userId/`, {
       path: {userId},
     }),
   ];
   const makeFetchUserIdentitiesQueryKey = (): ApiQueryKey => [
-    getApiUrl('/users/$userId/user-identities/', {
+    getApiUrl(`/users/$userId/user-identities/`, {
       path: {userId},
     }),
   ];
   const makeFetchTokensQueryKey = (): ApiQueryKey => [
-    getApiUrl('/api-tokens/'),
+    getApiUrl(`/api-tokens/`),
     {query: {userId}},
   ];
 
diff --git a/static/gsApp/components/creditCardEdit/setup.tsx b/static/gsApp/components/creditCardEdit/setup.tsx
index d86d1278b283..ddcc2be849af 100644
--- a/static/gsApp/components/creditCardEdit/setup.tsx
+++ b/static/gsApp/components/creditCardEdit/setup.tsx
@@ -56,7 +56,7 @@ export function CreditCardSetup({
         cardMode="setup"
         intentDataQueryKey={
           [
-            getApiUrl('/organizations/$organizationIdOrSlug/payments/setup/', {
+            getApiUrl(`/organizations/$organizationIdOrSlug/payments/setup/`, {
               path: {organizationIdOrSlug: organization.slug},
             }),
           ] satisfies ApiQueryKey
diff --git a/static/gsApp/components/crons/cronsBillingBanner.tsx b/static/gsApp/components/crons/cronsBillingBanner.tsx
index 03c8c71bc5e5..1460969ed1c7 100644
--- a/static/gsApp/components/crons/cronsBillingBanner.tsx
+++ b/static/gsApp/components/crons/cronsBillingBanner.tsx
@@ -53,7 +53,7 @@ export function CronsBillingBanner({organization, subscription}: Props) {
 
   const {data, isPending} = useApiQuery<MonitorCountResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/monitor-count/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/monitor-count/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/gsApp/components/features/disabledAlertsPage.tsx b/static/gsApp/components/features/disabledAlertsPage.tsx
index 765ce54481e7..519d035d03b2 100644
--- a/static/gsApp/components/features/disabledAlertsPage.tsx
+++ b/static/gsApp/components/features/disabledAlertsPage.tsx
@@ -32,7 +32,7 @@ function DisabledAlertsPage({
   children: _children,
   ...props
 }: Props) {
-  const requiredPlan = tct("You'll need a [plan] or up to view metric alerts.", {
+  const requiredPlan = tct(`You'll need a [plan] or up to view metric alerts.`, {
     plan: (
       <PlanFeature organization={organization} features={features}>
         {({plan}) => (
diff --git a/static/gsApp/components/features/disabledPerformancePage.tsx b/static/gsApp/components/features/disabledPerformancePage.tsx
index 539fe888c94f..2878e4e8647a 100644
--- a/static/gsApp/components/features/disabledPerformancePage.tsx
+++ b/static/gsApp/components/features/disabledPerformancePage.tsx
@@ -27,7 +27,7 @@ function DisabledPerformancePage({
   ...props
 }: Props) {
   const requiredPlan = tct(
-    "You'll need to migrate to a new plan with [strong:Transactions] to access Performance.",
+    `You'll need to migrate to a new plan with [strong:Transactions] to access Performance.`,
     {
       strong: <strong />,
     }
diff --git a/static/gsApp/components/features/insightsDateRangeQueryLimitFooter.spec.tsx b/static/gsApp/components/features/insightsDateRangeQueryLimitFooter.spec.tsx
index 6296b1339f5f..562dbcc410db 100644
--- a/static/gsApp/components/features/insightsDateRangeQueryLimitFooter.spec.tsx
+++ b/static/gsApp/components/features/insightsDateRangeQueryLimitFooter.spec.tsx
@@ -23,7 +23,7 @@ describe('InsightsUpsellPage', () => {
       body: BillingConfigFixture(PlanTier.AM3),
     });
     MockApiClient.addMockResponse({
-      url: '/customers/org-slug/',
+      url: `/customers/org-slug/`,
       body: {},
     });
 
diff --git a/static/gsApp/components/features/performanceNewProjectPrompt.tsx b/static/gsApp/components/features/performanceNewProjectPrompt.tsx
index 4983b401e8eb..443f2775c153 100644
--- a/static/gsApp/components/features/performanceNewProjectPrompt.tsx
+++ b/static/gsApp/components/features/performanceNewProjectPrompt.tsx
@@ -20,7 +20,7 @@ export function PerformanceNewProjectPrompt({organization}: Props) {
       <StyledAlert variant="info">
         <Container>
           {t(
-            "Performance is available for your platform, but your organization's plan does not include performance monitoring."
+            `Performance is available for your platform, but your organization's plan does not include performance monitoring.`
           )}
           <StyledButton
             size="sm"
diff --git a/static/gsApp/components/forcedTrialModal.tsx b/static/gsApp/components/forcedTrialModal.tsx
index 478c7e3bd164..cf667349c1f6 100644
--- a/static/gsApp/components/forcedTrialModal.tsx
+++ b/static/gsApp/components/forcedTrialModal.tsx
@@ -36,7 +36,7 @@ function ForcedTrialModal(props: ForcedTrialModalProps) {
     isError,
   } = useApiQuery<Integration[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -79,7 +79,7 @@ function ForcedTrialModal(props: ForcedTrialModalProps) {
 
   const firstParagraph = disallowedIntegration
     ? t(
-        'Your %s organization is on the Developer plan and does not support the %s integration.',
+        `Your %s organization is on the Developer plan and does not support the %s integration.`,
         organization.slug,
         disallowedIntegration.provider.name
       )
diff --git a/static/gsApp/components/gsBanner.spec.tsx b/static/gsApp/components/gsBanner.spec.tsx
index 73295a584d45..b886950c5587 100644
--- a/static/gsApp/components/gsBanner.spec.tsx
+++ b/static/gsApp/components/gsBanner.spec.tsx
@@ -48,19 +48,19 @@ function setUpTests() {
     body: {},
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/projects/',
+    url: `/organizations/org-slug/projects/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/teams/',
+    url: `/organizations/org-slug/teams/`,
     body: [],
   });
   MockApiClient.addMockResponse({
-    url: '/customers/org-slug/',
+    url: `/customers/org-slug/`,
     body: {},
   });
   MockApiClient.addMockResponse({
-    url: '/organizations/org-slug/',
+    url: `/organizations/org-slug/`,
     body: {},
   });
 
@@ -1197,7 +1197,7 @@ describe('GSBanner', () => {
       screen.getByRole('button', {name: /update payment information/i})
     ).toHaveAttribute(
       'href',
-      '/settings/past-due/billing/details/?referrer=banner-billing-failure'
+      `/settings/past-due/billing/details/?referrer=banner-billing-failure`
     );
     expect(await screen.findByTestId('modal-past-due')).toBeInTheDocument();
 
@@ -1211,7 +1211,7 @@ describe('GSBanner', () => {
     await waitFor(() => {
       expect(router.location).toEqual(
         expect.objectContaining({
-          pathname: '/settings/past-due/billing/details/',
+          pathname: `/settings/past-due/billing/details/`,
           query: {
             referrer: 'banner-billing-failure',
           },
diff --git a/static/gsApp/components/gsBanner.tsx b/static/gsApp/components/gsBanner.tsx
index 87825ebd9fa8..8d2eb32896b8 100644
--- a/static/gsApp/components/gsBanner.tsx
+++ b/static/gsApp/components/gsBanner.tsx
@@ -202,7 +202,7 @@ function NoticeModal({
     case ModalType.USAGE_EXCEEDED:
       title = t('Usage exceeded');
       body = t(
-        'Your organization has depleted its event capacity for the current usage period and is currently not receiving new events.'
+        `Your organization has depleted its event capacity for the current usage period and is currently not receiving new events.`
       );
       link = normalizeUrl(`/settings/${organization.slug}/billing/overview/`);
       primaryButtonMessage = t('Continue');
@@ -211,10 +211,10 @@ function NoticeModal({
       title = t('Unable to bill your account');
       body = billingPermissions
         ? t(
-            'There was an issue with your payment. Update your payment information to ensure uninterrupted access to Sentry.'
+            `There was an issue with your payment. Update your payment information to ensure uninterrupted access to Sentry.`
           )
         : t(
-            'There was an issue with your payment. Please have the Org Owner or Billing Member update your payment information to ensure continued access to Sentry.'
+            `There was an issue with your payment. Please have the Org Owner or Billing Member update your payment information to ensure continued access to Sentry.`
           );
       link = billingPermissions
         ? normalizeUrl(
@@ -249,7 +249,7 @@ function NoticeModal({
         : t('To ensure uninterrupted service, upgrade your subscription.');
     } else {
       subText = tct(
-        'To ensure uninterrupted service, upgrade your subscription or increase your [budgetTerm] spend limit.',
+        `To ensure uninterrupted service, upgrade your subscription or increase your [budgetTerm] spend limit.`,
         {
           budgetTerm: subscription.planDetails.budgetTerm,
         }
@@ -1042,7 +1042,7 @@ class GSBanner extends Component<Props, State> {
               }
             >
               {tct(
-                '[firstSentence] [middleSentence] Upgrade your plan to increase your limit.',
+                `[firstSentence] [middleSentence] Upgrade your plan to increase your limit.`,
                 {
                   firstSentence:
                     subscription.totalLicenses === 1
diff --git a/static/gsApp/components/partnerPlanEndingModal.spec.tsx b/static/gsApp/components/partnerPlanEndingModal.spec.tsx
index eab07c48667b..99c12c6eb199 100644
--- a/static/gsApp/components/partnerPlanEndingModal.spec.tsx
+++ b/static/gsApp/components/partnerPlanEndingModal.spec.tsx
@@ -16,7 +16,7 @@ describe('PartnerPlanEndingModal', () => {
 
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/members/',
+      url: `/organizations/org-slug/members/`,
       method: 'GET',
       body: [
         MemberFixture({
@@ -36,7 +36,7 @@ describe('PartnerPlanEndingModal', () => {
     SubscriptionStore.set(org.slug, sub);
 
     const mockCall = MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/partner-migration-request/?referrer=partner_plan_ending_modal',
+      url: `/organizations/org-slug/partner-migration-request/?referrer=partner_plan_ending_modal`,
       method: 'POST',
     });
 
diff --git a/static/gsApp/components/partnerPlanEndingModal.tsx b/static/gsApp/components/partnerPlanEndingModal.tsx
index 3cdbdb20f03b..9f30f5dc606d 100644
--- a/static/gsApp/components/partnerPlanEndingModal.tsx
+++ b/static/gsApp/components/partnerPlanEndingModal.tsx
@@ -112,7 +112,7 @@ function PartnerPlanEndingModal({organization, subscription, closeModal}: Props)
             {tn('%s day left', '%s days left', daysLeft)}
           </Tag>
           <h2 data-test-id="partner-plan-ending-header">
-            {tct('Your promotional plan with [partnerName] ends soon', {
+            {tct(`Your promotional plan with [partnerName] ends soon`, {
               partnerName,
             })}
           </h2>
@@ -134,7 +134,7 @@ function PartnerPlanEndingModal({organization, subscription, closeModal}: Props)
         </PartnerPlanHeading>
         <Flex justify="between">
           <PathContainer>
-            <SubHeading>{tct('New Plan on [endDate]', {endDate})}</SubHeading>
+            <SubHeading>{tct(`New Plan on [endDate]`, {endDate})}</SubHeading>
             <PathHeading>{t('Developer')}</PathHeading>
             <p>{t('For solo devs working on small projects')}</p>
             <Bullets>{leftColumnItems.map(DeveloperItem)}</Bullets>
@@ -142,7 +142,7 @@ function PartnerPlanEndingModal({organization, subscription, closeModal}: Props)
 
           <PathContainer>
             <SubHeading>{t('Recommended Plan')}</SubHeading>
-            <PathHeading>{tct('[returnPlan]', {returnPlan})}</PathHeading>
+            <PathHeading>{tct(`[returnPlan]`, {returnPlan})}</PathHeading>
             <p>{t('For multiple teams that operate at scale')}</p>
             <Bullets data-test-id="partner-plan-ending-bullet">
               {rightColumnItems.map(UpgradeItem)}
diff --git a/static/gsApp/components/primaryNavSeerConfigReminder.tsx b/static/gsApp/components/primaryNavSeerConfigReminder.tsx
index 186f96826f35..ba625eec5434 100644
--- a/static/gsApp/components/primaryNavSeerConfigReminder.tsx
+++ b/static/gsApp/components/primaryNavSeerConfigReminder.tsx
@@ -39,7 +39,7 @@ function useScmIntegrations() {
   const organization = useOrganization();
   const {data, isPending} = useApiQuery<Integration[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {includeConfig: 0}},
diff --git a/static/gsApp/components/productSelectionAvailability.spec.tsx b/static/gsApp/components/productSelectionAvailability.spec.tsx
index e74286e7fbb2..d8fc54448b91 100644
--- a/static/gsApp/components/productSelectionAvailability.spec.tsx
+++ b/static/gsApp/components/productSelectionAvailability.spec.tsx
@@ -42,7 +42,7 @@ function renderMockRequests({
   act(() => SubscriptionStore.set(organization.slug, subscription));
 
   MockApiClient.addMockResponse({
-    url: '/customers/org-slug/',
+    url: `/customers/org-slug/`,
     body: {
       planTier,
       canSelfServe,
diff --git a/static/gsApp/components/productUnavailableCTA.spec.tsx b/static/gsApp/components/productUnavailableCTA.spec.tsx
index e8916c097c3c..63792a6c5c69 100644
--- a/static/gsApp/components/productUnavailableCTA.spec.tsx
+++ b/static/gsApp/components/productUnavailableCTA.spec.tsx
@@ -103,7 +103,7 @@ describe('ProductUnavailableCTA', () => {
 
       await waitFor(() => {
         expect(mockRequests?.requestUpdatePlan).toHaveBeenCalledWith(
-          '/organizations/org-slug/plan-upgrade-request/',
+          `/organizations/org-slug/plan-upgrade-request/`,
           expect.objectContaining({
             method: 'POST',
           })
diff --git a/static/gsApp/components/profiling/alerts.tsx b/static/gsApp/components/profiling/alerts.tsx
index d9654987e188..569d01c37f04 100644
--- a/static/gsApp/components/profiling/alerts.tsx
+++ b/static/gsApp/components/profiling/alerts.tsx
@@ -617,7 +617,7 @@ function useSDKDeprecations() {
   const organization = useOrganization();
   const {selection} = usePageFilters();
 
-  const path = getApiUrl('/organizations/$organizationIdOrSlug/sdk-deprecations/', {
+  const path = getApiUrl(`/organizations/$organizationIdOrSlug/sdk-deprecations/`, {
     path: {organizationIdOrSlug: organization.slug},
   });
   const options = {
diff --git a/static/gsApp/components/trialEndingModal.spec.tsx b/static/gsApp/components/trialEndingModal.spec.tsx
index 1ecc11936b14..c8c53a69eb44 100644
--- a/static/gsApp/components/trialEndingModal.spec.tsx
+++ b/static/gsApp/components/trialEndingModal.spec.tsx
@@ -14,7 +14,7 @@ describe('TrialEndingModal', () => {
 
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/members/',
+      url: `/organizations/org-slug/members/`,
       method: 'GET',
       body: [
         MemberFixture({
diff --git a/static/gsApp/components/tryBusinessSidebarItem.tsx b/static/gsApp/components/tryBusinessSidebarItem.tsx
index 4ff7eb07a33f..a357baa7a646 100644
--- a/static/gsApp/components/tryBusinessSidebarItem.tsx
+++ b/static/gsApp/components/tryBusinessSidebarItem.tsx
@@ -20,7 +20,7 @@ type Props = Parameters<Hooks['sidebar:try-business']>[0] & {
   subscription: Subscription;
 };
 
-const TRY_BUSINESS_SEEN_KEY = 'sidebar-new-seen:try-business-v1';
+const TRY_BUSINESS_SEEN_KEY = `sidebar-new-seen:try-business-v1`;
 
 function TryBusinessNavigationItem({
   organization,
diff --git a/static/gsApp/components/upgradeNowModal/usePreviewData.tsx b/static/gsApp/components/upgradeNowModal/usePreviewData.tsx
index 19055d8c6e0a..f9fd89ec651c 100644
--- a/static/gsApp/components/upgradeNowModal/usePreviewData.tsx
+++ b/static/gsApp/components/upgradeNowModal/usePreviewData.tsx
@@ -57,7 +57,7 @@ export function usePreviewData({
     data: previewData,
   } = useApiQuery<PreviewData>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/subscription/preview/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/subscription/preview/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/gsApp/components/upgradeNowModal/useUpgradeNowParams.tsx b/static/gsApp/components/upgradeNowModal/useUpgradeNowParams.tsx
index da65046da757..d02c2a6de0b1 100644
--- a/static/gsApp/components/upgradeNowModal/useUpgradeNowParams.tsx
+++ b/static/gsApp/components/upgradeNowModal/useUpgradeNowParams.tsx
@@ -36,7 +36,7 @@ function canComparePrices(subscription: Subscription, initialPlan: Plan) {
 export function useUpgradeNowParams({organization, subscription, enabled = true}: Opts) {
   const {isPending, data: billingConfig} = useApiQuery<BillingConfig>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/billing-config/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/billing-config/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/gsApp/components/upsellModal/details.tsx b/static/gsApp/components/upsellModal/details.tsx
index 8a5563a515d0..45edb02fabc0 100644
--- a/static/gsApp/components/upsellModal/details.tsx
+++ b/static/gsApp/components/upsellModal/details.tsx
@@ -82,7 +82,7 @@ const ALL_FEATURE_LIST: Feature[] = [
     name: t('Extended Data Retention'),
     image: dataRetentionImg,
     desc: tct(
-      'Want to access your event data for longer? Extend your data history to 90 days for more visibility into events and the root cause of exceptions.',
+      `Want to access your event data for longer? Extend your data history to 90 days for more visibility into events and the root cause of exceptions.`,
       {strong: <strong />}
     ),
   },
@@ -92,7 +92,7 @@ const ALL_FEATURE_LIST: Feature[] = [
     name: t('SAML2 Sign In'),
     image: ssoImg,
     desc: tct(
-      'Streamline onboarding and off-boarding by logging in securely through one of our SSO integrations: [strong: Okta, Active Directory, OneLogin, and AuthO].',
+      `Streamline onboarding and off-boarding by logging in securely through one of our SSO integrations: [strong: Okta, Active Directory, OneLogin, and AuthO].`,
       {strong: <strong />}
     ),
   },
@@ -102,7 +102,7 @@ const ALL_FEATURE_LIST: Feature[] = [
     name: t('Event Volume Controls'),
     image: dataVolumeImg,
     desc: tct(
-      'Control event volume with robust data filters and rate limits. Have something big coming up? Track daily usage by project in Organization Stats.',
+      `Control event volume with robust data filters and rate limits. Have something big coming up? Track daily usage by project in Organization Stats.`,
       {strong: <strong />}
     ),
   },
@@ -112,7 +112,7 @@ const ALL_FEATURE_LIST: Feature[] = [
     name: t('Error Metric Alerts'),
     image: incidentsImg,
     desc: tct(
-      'Go beyond Issues and set Metric Alerts to detect critical spikes on the frequency of any subset of your events, filtered on tags or attributes.',
+      `Go beyond Issues and set Metric Alerts to detect critical spikes on the frequency of any subset of your events, filtered on tags or attributes.`,
       {strong: <strong />}
     ),
   },
@@ -122,7 +122,7 @@ const ALL_FEATURE_LIST: Feature[] = [
     name: t('Metric Alerts'),
     image: incidentsPerformanceImg,
     desc: tct(
-      'Set metric alerts to detect spikes in error count, latency, apdex, failure rate, throughput and more. Assign them to the most relevant teams.',
+      `Set metric alerts to detect spikes in error count, latency, apdex, failure rate, throughput and more. Assign them to the most relevant teams.`,
       {strong: <strong />}
     ),
   },
@@ -132,7 +132,7 @@ const ALL_FEATURE_LIST: Feature[] = [
     name: t('Distributed Tracing'),
     image: tracingImg,
     desc: tct(
-      'Track the performance of your app to identify N+1 queries, associated errors, or any other bottlenecks, from frontend web vitals to backend API calls.',
+      `Track the performance of your app to identify N+1 queries, associated errors, or any other bottlenecks, from frontend web vitals to backend API calls.`,
       {strong: <strong />}
     ),
   },
@@ -142,7 +142,7 @@ const ALL_FEATURE_LIST: Feature[] = [
     name: t('Transaction Summary'),
     image: performanceViewImg,
     desc: tct(
-      "Understand how transactions are doing by percentile, operation, and more. We'll narrow down what's causing slowdowns and link to any related issues.",
+      `Understand how transactions are doing by percentile, operation, and more. We'll narrow down what's causing slowdowns and link to any related issues.`,
       {strong: <strong />}
     ),
   },
@@ -164,7 +164,7 @@ const ALL_FEATURE_LIST: Feature[] = [
     name: t('Unlimited Custom Dashboards'),
     image: dashboardsImg,
     desc: tct(
-      'Build custom dashboards for your team with a range of rich data visualizations such as histograms, time series, tables, global maps and more.',
+      `Build custom dashboards for your team with a range of rich data visualizations such as histograms, time series, tables, global maps and more.`,
       {strong: <strong />}
     ),
   },
@@ -174,7 +174,7 @@ const ALL_FEATURE_LIST: Feature[] = [
     name: t('Advanced Integrations'),
     image: integrationAlerts,
     desc: tct(
-      'Automatically create Jira and Azure DevOps Tickets based on custom alerts you set up in Sentry. Stop manually filling out forms.',
+      `Automatically create Jira and Azure DevOps Tickets based on custom alerts you set up in Sentry. Stop manually filling out forms.`,
       {strong: <strong />}
     ),
   },
@@ -226,7 +226,7 @@ export class Details extends Component<Props, State> {
 
   componentDidMount() {
     const {organization, source, subscription} = this.props;
-    trackGetsentryAnalytics('business_landing.viewed', {
+    trackGetsentryAnalytics(`business_landing.viewed`, {
       organization,
       subscription,
       source,
@@ -248,7 +248,7 @@ export class Details extends Component<Props, State> {
 
   componentWillUnmount() {
     const {organization, source, subscription} = this.props;
-    trackGetsentryAnalytics('business_landing.closed', {
+    trackGetsentryAnalytics(`business_landing.closed`, {
       organization,
       subscription,
       source,
@@ -293,7 +293,7 @@ export class Details extends Component<Props, State> {
       hasClickedFeature: true,
     }));
     const {organization, source, subscription} = this.props;
-    trackGetsentryAnalytics('business_landing.clicked', {
+    trackGetsentryAnalytics(`business_landing.clicked`, {
       organization,
       subscription,
       source,
@@ -307,10 +307,10 @@ export class Details extends Component<Props, State> {
     if (showTrialResetContent) {
       return [
         t(
-          'Here’s another free 14-day trial of the Sentry Business Plan, because we believe in second chances.'
+          `Here’s another free 14-day trial of the Sentry Business Plan, because we believe in second chances.`
         ),
         t(
-          'Your Sentry organization is perfect just the way it is, but try out all the Business Plan features to make it even better.'
+          `Your Sentry organization is perfect just the way it is, but try out all the Business Plan features to make it even better.`
         ),
       ];
     }
@@ -382,7 +382,7 @@ export class Details extends Component<Props, State> {
     const {subscription, organization, showTrialResetContent} = this.props;
     if (showTrialResetContent) {
       return t(
-        'Start your trial again to invite team members, integrate with Sentry with services like Slack, GitHub, and Jira, and build custom dashboards to view issues across projects.'
+        `Start your trial again to invite team members, integrate with Sentry with services like Slack, GitHub, and Jira, and build custom dashboards to view issues across projects.`
       );
     }
     return subscription.canTrial && !subscription.isTrial
diff --git a/static/gsApp/components/upsellProvider.spec.tsx b/static/gsApp/components/upsellProvider.spec.tsx
index c3d4bc10384b..ccc911d5bce6 100644
--- a/static/gsApp/components/upsellProvider.spec.tsx
+++ b/static/gsApp/components/upsellProvider.spec.tsx
@@ -41,7 +41,7 @@ describe('UpsellProvider', () => {
 
     // might re-load the org/sub after a trial starts
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/',
+      url: `/organizations/org-slug/`,
       body: org,
     });
 
diff --git a/static/gsApp/components/upsellProvider.tsx b/static/gsApp/components/upsellProvider.tsx
index 0e03cb47f2a3..46597d801741 100644
--- a/static/gsApp/components/upsellProvider.tsx
+++ b/static/gsApp/components/upsellProvider.tsx
@@ -157,7 +157,7 @@ function UpsellProvider({
       return (
         <div data-test-id="confirm-content">
           {tct(
-            'Your organization is about to start a [trialLength]-day free trial. Click confirm to start your trial.',
+            `Your organization is about to start a [trialLength]-day free trial. Click confirm to start your trial.`,
             {
               trialLength,
             }
diff --git a/static/gsApp/hooks/dashboardsLimit.tsx b/static/gsApp/hooks/dashboardsLimit.tsx
index 1237f6208ddc..bdc32a789bbc 100644
--- a/static/gsApp/hooks/dashboardsLimit.tsx
+++ b/static/gsApp/hooks/dashboardsLimit.tsx
@@ -35,7 +35,7 @@ export function useDashboardsLimit(): UseDashboardsLimitResult {
   const {data: dashboardsTotalCount, isLoading: isLoadingDashboardsTotalCount} =
     useApiQuery<DashboardListItem[]>(
       [
-        getApiUrl('/organizations/$organizationIdOrSlug/dashboards/', {
+        getApiUrl(`/organizations/$organizationIdOrSlug/dashboards/`, {
           path: {organizationIdOrSlug: organization.slug},
         }),
         {
diff --git a/static/gsApp/hooks/disabledMemberView.spec.tsx b/static/gsApp/hooks/disabledMemberView.spec.tsx
index 6523980162f3..3f5b9ea583cd 100644
--- a/static/gsApp/hooks/disabledMemberView.spec.tsx
+++ b/static/gsApp/hooks/disabledMemberView.spec.tsx
@@ -15,7 +15,7 @@ describe('DisabledMemberView', () => {
     SubscriptionStore.set(organization.slug, sub);
 
     MockApiClient.addMockResponse({
-      url: '/customers/org-slug/',
+      url: `/customers/org-slug/`,
       body: sub,
     });
 
diff --git a/static/gsApp/hooks/disabledMemberView.tsx b/static/gsApp/hooks/disabledMemberView.tsx
index fab373cacdf7..8e1ea982c087 100644
--- a/static/gsApp/hooks/disabledMemberView.tsx
+++ b/static/gsApp/hooks/disabledMemberView.tsx
@@ -45,7 +45,7 @@ function DisabledMemberView(props: Props) {
     refetch,
   } = useApiQuery<Organization>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/`, {
         path: {organizationIdOrSlug: orgSlug},
       }),
       {query: {detailed: '0', include_feature_flags: '1'}},
diff --git a/static/gsApp/hooks/performance/usePerformanceUsageStats.tsx b/static/gsApp/hooks/performance/usePerformanceUsageStats.tsx
index 05babe42660e..247eb38eb4e0 100644
--- a/static/gsApp/hooks/performance/usePerformanceUsageStats.tsx
+++ b/static/gsApp/hooks/performance/usePerformanceUsageStats.tsx
@@ -27,7 +27,7 @@ export function usePerformanceUsageStats({
   projectIds: PageFilters['projects'];
 }) {
   const {start, end, period} = dateRange;
-  const pathname = getApiUrl('/organizations/$organizationIdOrSlug/stats_v2/', {
+  const pathname = getApiUrl(`/organizations/$organizationIdOrSlug/stats_v2/`, {
     path: {organizationIdOrSlug: organization.slug},
   });
 
diff --git a/static/gsApp/hooks/spendVisibility/enhancedUsageStatsOrganization.tsx b/static/gsApp/hooks/spendVisibility/enhancedUsageStatsOrganization.tsx
index 0b5aa0d9d6e5..780d7b75e1b3 100644
--- a/static/gsApp/hooks/spendVisibility/enhancedUsageStatsOrganization.tsx
+++ b/static/gsApp/hooks/spendVisibility/enhancedUsageStatsOrganization.tsx
@@ -259,7 +259,7 @@ function EnhancedUsageStatsOrganization({
   const projectWithSpikeProjectionOption = useApiQuery<Project[]>(
     [
       // This endpoint refetches the specific project with an added query for the SP option
-      getApiUrl('/organizations/$organizationIdOrSlug/projects/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/projects/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
@@ -281,7 +281,7 @@ function EnhancedUsageStatsOrganization({
     [
       // Get all the spikes in the time period
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/spikes/projects/$projectIdOrSlug/',
+        `/organizations/$organizationIdOrSlug/spikes/projects/$projectIdOrSlug/`,
         {
           path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project?.id!},
         }
@@ -300,7 +300,7 @@ function EnhancedUsageStatsOrganization({
     [
       // Only fetch spike thresholds if the interval is 1h
       getApiUrl(
-        '/organizations/$organizationIdOrSlug/spike-projection/projects/$projectIdOrSlug/',
+        `/organizations/$organizationIdOrSlug/spike-projection/projects/$projectIdOrSlug/`,
         {
           path: {
             organizationIdOrSlug: organization.slug,
diff --git a/static/gsApp/hooks/useBillingConfig.tsx b/static/gsApp/hooks/useBillingConfig.tsx
index e0791fb01166..d1585cd82229 100644
--- a/static/gsApp/hooks/useBillingConfig.tsx
+++ b/static/gsApp/hooks/useBillingConfig.tsx
@@ -17,7 +17,7 @@ export function useBillingConfig({organization, subscription}: UseBillingConfigP
       : UPSELL_TIER;
   return useApiQuery<BillingConfig>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/billing-config/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/billing-config/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {tier: upsellTier}},
diff --git a/static/gsApp/hooks/useBillingDetails.tsx b/static/gsApp/hooks/useBillingDetails.tsx
index ed5e97a578f2..f3206b12cc50 100644
--- a/static/gsApp/hooks/useBillingDetails.tsx
+++ b/static/gsApp/hooks/useBillingDetails.tsx
@@ -9,7 +9,7 @@ export function useBillingDetails() {
 
   return useApiQuery<BillingDetails>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/billing-details/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/billing-details/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/gsApp/hooks/useButtonTracking.tsx b/static/gsApp/hooks/useButtonTracking.tsx
index f02c7d7d9c8e..d8c6f61f00a9 100644
--- a/static/gsApp/hooks/useButtonTracking.tsx
+++ b/static/gsApp/hooks/useButtonTracking.tsx
@@ -1,9 +1,9 @@
 import {useCallback} from 'react';
-import {useMatches} from 'react-router-dom';
 
 import type {ButtonProps} from '@sentry/scraps/button';
 
 import {useOrganization} from 'sentry/utils/useOrganization';
+import {useRoutes} from 'sentry/utils/useRoutes';
 
 import {rawTrackAnalyticsEvent} from 'getsentry/utils/rawTrackAnalyticsEvent';
 import {convertToReloadPath, getEventPath} from 'getsentry/utils/routeAnalytics';
@@ -17,13 +17,13 @@ export function useButtonTracking({
   'aria-label': ariaLabel,
 }: Props) {
   const organization = useOrganization({allowNull: true});
-  const matches = useMatches();
+  const routes = useRoutes();
 
   const trackButton = useCallback(() => {
-    const considerSendingAnalytics = organization && Boolean(matches);
+    const considerSendingAnalytics = organization && Boolean(routes);
 
     if (considerSendingAnalytics) {
-      const routeString = getEventPath(matches);
+      const routeString = getEventPath(routes);
       const reloadPath = convertToReloadPath(routeString);
 
       // optional way to override the event name for Reload and Amplitude
@@ -51,7 +51,7 @@ export function useButtonTracking({
     analyticsParams,
     ariaLabel,
     organization,
-    matches,
+    routes,
   ]);
 
   return trackButton;
diff --git a/static/gsApp/hooks/useCurrentBillingHistory.tsx b/static/gsApp/hooks/useCurrentBillingHistory.tsx
index 571e01897838..324dfe737ee9 100644
--- a/static/gsApp/hooks/useCurrentBillingHistory.tsx
+++ b/static/gsApp/hooks/useCurrentBillingHistory.tsx
@@ -15,7 +15,7 @@ export function useCurrentBillingHistory() {
     isError,
   } = useApiQuery<BillingHistory>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/history/current/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/history/current/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/gsApp/hooks/useExperiment.spec.tsx b/static/gsApp/hooks/useExperiment.spec.tsx
index f19ad37e00b8..c7c3252e2e03 100644
--- a/static/gsApp/hooks/useExperiment.spec.tsx
+++ b/static/gsApp/hooks/useExperiment.spec.tsx
@@ -28,9 +28,8 @@ describe('useExperiment (gsApp)', () => {
     _resetExposureTracking();
   });
 
-  it('returns inExperiment: true when feature is enabled', () => {
+  it('returns inExperiment: true when assignment is active', () => {
     const org = OrganizationFixture({
-      features: ['test-experiment'],
       experiments: {'test-experiment': 'active'},
     });
     render(<TestComponent feature="test-experiment" reportExposure={false} />, {
@@ -40,7 +39,7 @@ describe('useExperiment (gsApp)', () => {
     expect(screen.getByTestId('assignment')).toHaveTextContent('active');
   });
 
-  it('returns inExperiment: false when feature is not enabled', () => {
+  it('returns inExperiment: false when assignment is control', () => {
     const org = OrganizationFixture({
       experiments: {'test-experiment': 'control'},
     });
@@ -51,17 +50,6 @@ describe('useExperiment (gsApp)', () => {
     expect(screen.getByTestId('assignment')).toHaveTextContent('control');
   });
 
-  it('returns inExperiment: true with feature flag even without experiments entry', () => {
-    const org = OrganizationFixture({
-      features: ['test-experiment'],
-    });
-    render(<TestComponent feature="test-experiment" reportExposure={false} />, {
-      organization: org,
-    });
-    expect(screen.getByTestId('in-experiment')).toHaveTextContent('true');
-    expect(screen.getByTestId('assignment')).toHaveTextContent('control');
-  });
-
   it('returns control when experiment is not present', () => {
     const org = OrganizationFixture({experiments: {}});
     render(<TestComponent feature="missing-experiment" reportExposure={false} />, {
@@ -71,9 +59,8 @@ describe('useExperiment (gsApp)', () => {
     expect(screen.getByTestId('assignment')).toHaveTextContent('control');
   });
 
-  it('posts exposure on mount when reportExposure is true and experiments entry exists', async () => {
+  it('posts exposure on mount when reportExposure is true', async () => {
     const org = OrganizationFixture({
-      features: ['test-experiment'],
       experiments: {'test-experiment': 'active'},
     });
     const mockExposure = MockApiClient.addMockResponse({
@@ -97,7 +84,6 @@ describe('useExperiment (gsApp)', () => {
 
   it('does not post exposure when reportExposure is false', () => {
     const org = OrganizationFixture({
-      features: ['test-experiment'],
       experiments: {'test-experiment': 'active'},
     });
     const mockExposure = MockApiClient.addMockResponse({
@@ -115,7 +101,6 @@ describe('useExperiment (gsApp)', () => {
 
   it('reports exposure when reportExposure changes from false to true', async () => {
     const org = OrganizationFixture({
-      features: ['test-experiment'],
       experiments: {'test-experiment': 'active'},
     });
     const mockExposure = MockApiClient.addMockResponse({
@@ -138,7 +123,6 @@ describe('useExperiment (gsApp)', () => {
 
   it('deduplicates exposure reports across remounts', async () => {
     const org = OrganizationFixture({
-      features: ['test-experiment'],
       experiments: {'test-experiment': 'active'},
     });
     const mockExposure = MockApiClient.addMockResponse({
@@ -162,6 +146,10 @@ describe('useExperiment (gsApp)', () => {
     expect(mockExposure).toHaveBeenCalledTimes(1);
   });
 
+  // This verifies the dedupe key includes the assignment so a changed
+  // assignment is treated as a distinct exposure. This scenario is unlikely in
+  // practice since we don't typically reload the organization after the app
+  // boots.
   it('re-reports exposure when assignment changes', async () => {
     const org = OrganizationFixture({
       experiments: {'test-experiment': 'control'},
@@ -181,7 +169,6 @@ describe('useExperiment (gsApp)', () => {
     unmount();
 
     const updatedOrg = OrganizationFixture({
-      features: ['test-experiment'],
       experiments: {'test-experiment': 'active'},
     });
 
diff --git a/static/gsApp/hooks/useExperiment.tsx b/static/gsApp/hooks/useExperiment.tsx
index b2a0415361d2..2ea48226e54e 100644
--- a/static/gsApp/hooks/useExperiment.tsx
+++ b/static/gsApp/hooks/useExperiment.tsx
@@ -18,14 +18,8 @@ export function useExperiment(options: UseExperimentOptions): UseExperimentResul
   const {feature, reportExposure = true} = options;
   const organization = useOrganization();
 
-  // Gate on organization.features so that SENTRY_FEATURES, self.feature(),
-  // and devlocal.py all work without needing experiment-specific overrides.
-  const inExperiment = organization.features.includes(feature);
-
-  // Use organization.experiments only for exposure tracking — this field is
-  // populated by get_experiment_assignments which requires the getsentry
-  // entity handler and is empty in plain sentry / test environments.
   const assignment = organization.experiments?.[feature] ?? 'control';
+  const inExperiment = assignment === 'active';
 
   const {mutate: logExposure} = useMutation({
     mutationFn: () =>
diff --git a/static/gsApp/hooks/useMetricDetectorLimit.tsx b/static/gsApp/hooks/useMetricDetectorLimit.tsx
index b35b66c195b8..c4a915888227 100644
--- a/static/gsApp/hooks/useMetricDetectorLimit.tsx
+++ b/static/gsApp/hooks/useMetricDetectorLimit.tsx
@@ -45,7 +45,7 @@ export function useMetricDetectorLimit(): MetricDetectorLimitResponse {
     getResponseHeader: getMetricRulesResponseHeader,
   } = useApiQuery<any[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/alert-rules/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/alert-rules/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {limit: 1}},
diff --git a/static/gsApp/hooks/usePlanMigrations.tsx b/static/gsApp/hooks/usePlanMigrations.tsx
index 2f79d539dfcb..f8832c6e10ce 100644
--- a/static/gsApp/hooks/usePlanMigrations.tsx
+++ b/static/gsApp/hooks/usePlanMigrations.tsx
@@ -19,7 +19,7 @@ export function usePlanMigrations(): PlanMigrationsHook {
   const enabled = hasBillingAccess(organization) || user.isStaff;
   const {data: planMigrations, isPending} = useApiQuery<PlanMigration[]>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/plan-migrations/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/plan-migrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {scheduled: 1, applied: 0}},
diff --git a/static/gsApp/hooks/useRecurringCredits.tsx b/static/gsApp/hooks/useRecurringCredits.tsx
index 976aa9ac180a..dbb6baffe189 100644
--- a/static/gsApp/hooks/useRecurringCredits.tsx
+++ b/static/gsApp/hooks/useRecurringCredits.tsx
@@ -17,7 +17,7 @@ export function useRecurringCredits(): RecurringCreditsContext {
   const enabled = hasBilling(organization);
   const {data: recurringCredits = [], isPending} = useApiQuery<RecurringCredit[]>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/recurring-credits/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/recurring-credits/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/gsApp/hooks/useRouteActivatedHook.spec.tsx b/static/gsApp/hooks/useRouteActivatedHook.spec.tsx
index 3444d311c224..f32b7cab164f 100644
--- a/static/gsApp/hooks/useRouteActivatedHook.spec.tsx
+++ b/static/gsApp/hooks/useRouteActivatedHook.spec.tsx
@@ -1,6 +1,6 @@
-import type {UIMatch} from 'react-router-dom';
 import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {OrganizationFixture} from 'sentry-fixture/organization';
+import {RouterPropsFixture} from 'sentry-fixture/routerPropsFixture';
 
 import {ProjectFixture} from 'getsentry-test/fixtures/project';
 import {SubscriptionFixture} from 'getsentry-test/fixtures/subscription';
@@ -18,13 +18,6 @@ const HALF_ADVANCE_PERIOD = DELAY_TIME_MS * 0.6;
 
 jest.mock('getsentry/utils/rawTrackAnalyticsEvent');
 
-function makeMatch(path: string): UIMatch {
-  return {id: path, pathname: path, params: {}, data: undefined, handle: {path}};
-}
-
-const SETTINGS_MATCHES = [makeMatch('/settings/:orgId/projects/:projectId/')];
-const RELEASES_MATCHES = [makeMatch('/organizations/:orgId/releases/:release/')];
-
 describe('useRouteActivatedHook', () => {
   const organization = OrganizationFixture();
   const project = ProjectFixture({organization});
@@ -34,13 +27,18 @@ describe('useRouteActivatedHook', () => {
   function genProps(extraRouteParams = {}): any {
     const props = {
       organization,
-      location: LocationFixture({
-        pathname: `/settings/${organization.slug}/${project.slug}/`,
+      ...RouterPropsFixture({
+        location: LocationFixture({
+          pathname: `/settings/${organization.slug}/${project.slug}/`,
+        }),
+        params: {orgId: organization.slug},
+        routes: [
+          {path: '/'},
+          {path: '/settings/'},
+          {path: ':orgId/'},
+          {path: 'projects/:projectId/'},
+        ],
       }),
-      params: {orgId: organization.slug},
-      routes: [],
-      router: {} as any,
-      matches: SETTINGS_MATCHES,
       ...extraRouteParams,
     };
     return props;
@@ -175,7 +173,14 @@ describe('useRouteActivatedHook', () => {
       location: LocationFixture({
         pathname: `/organizations/${organization.slug}/releases/some-release/`,
       }),
-      matches: RELEASES_MATCHES,
+      routes: [
+        {path: '/'},
+        {path: '/organizations/:orgId/releases/'},
+        {path: ':release/'},
+      ],
+      ...LocationFixture({
+        pathname: `/organizations/${organization.slug}/releases/some-release/`,
+      }),
     });
     const loadTime = Date.now();
     act(() => rerender(newProps));
@@ -220,7 +225,6 @@ describe('useRouteActivatedHook', () => {
   it('route changes triggers early analytics event', () => {
     jest.useFakeTimers();
     let loadTime = Date.now();
-
     const {result, rerender} = renderHook(useRouteActivatedHook, {
       initialProps: props,
     });
@@ -231,7 +235,14 @@ describe('useRouteActivatedHook', () => {
       location: LocationFixture({
         pathname: `/organizations/${organization.slug}/releases/some-release/`,
       }),
-      matches: RELEASES_MATCHES,
+      routes: [
+        {path: '/'},
+        {path: '/organizations/:orgId/releases/'},
+        {path: ':release/'},
+      ],
+      ...LocationFixture({
+        pathname: `/organizations/${organization.slug}/releases/some-release/`,
+      }),
     });
     expect(rawTrackAnalyticsEvent).toHaveBeenCalledTimes(0);
 
diff --git a/static/gsApp/hooks/useRouteActivatedHook.tsx b/static/gsApp/hooks/useRouteActivatedHook.tsx
index bd854fcb5315..bedb0bf7f75f 100644
--- a/static/gsApp/hooks/useRouteActivatedHook.tsx
+++ b/static/gsApp/hooks/useRouteActivatedHook.tsx
@@ -17,13 +17,14 @@ export const DELAY_TIME_MS = 7000;
 
 type Props = Parameters<Hooks['react-hook:route-activated']>[0];
 
-export function useRouteActivatedHook({location, matches}: Props) {
+export function useRouteActivatedHook(props: Props) {
+  const {routes, location} = props;
   const [analyticsParams, _setRouteAnalyticsParams] = useState({});
   const [disableAnalytics, _setDisableRouteAnalytics] = useState(false);
   const [hasSentAnalytics, setHasSentAnalytics] = useState(false);
   const [readyToSend, setReadyToSend] = useState(false);
   const [mountTime, setMountTime] = useState(0);
-  const prevMatches = usePrevious(matches);
+  const prevRoutes = usePrevious(routes);
   const prevLocation = usePrevious(location);
   // Reload event name
   const [_eventKey, setEventKey] = useState<string | undefined>(undefined);
@@ -36,8 +37,8 @@ export function useRouteActivatedHook({location, matches}: Props) {
   // keep track of the previous URL so we can detect trigger hooks after resetting the route params
   const previousUrl = getUrlFromLocation(prevLocation);
 
-  const currentRoute = getEventPath(matches);
-  const prevRoute = getEventPath(prevMatches);
+  const currentRoute = getEventPath(routes);
+  const prevRoute = getEventPath(prevRoutes);
 
   const considerSendingAnalytics =
     organization && !hasSentAnalytics && !disableAnalytics && mountTime > 0;
diff --git a/static/gsApp/utils/routeAnalytics.tsx b/static/gsApp/utils/routeAnalytics.tsx
index 694a84131d1d..70ee2740a733 100644
--- a/static/gsApp/utils/routeAnalytics.tsx
+++ b/static/gsApp/utils/routeAnalytics.tsx
@@ -1,8 +1,8 @@
-import type {UIMatch} from 'react-router-dom';
 import type {Location} from 'history';
 import capitalize from 'lodash/capitalize';
 import snakeCase from 'lodash/snakeCase';
 
+import type {PlainRoute} from 'sentry/types/legacyReactRouter';
 import {getRouteStringFromRoutes} from 'sentry/utils/getRouteStringFromRoutes';
 
 /**
@@ -22,13 +22,13 @@ const camelCaseRouteParameter = (word: string) => {
 };
 
 /**
- * @param matches Matches from React Router
+ * @param routes Routes from React Router
  * @returns A string representing the route path
  * Ex: /organizations/:orgid/alerts/new/:alerttype/ ->
  * Organizations :orgid Alerts New :alerttype
  */
-export function getEventPath(matches: Array<UIMatch<unknown, unknown>>) {
-  const routeString = getRouteStringFromRoutes({matches});
+export function getEventPath(routes: PlainRoute[]) {
+  const routeString = getRouteStringFromRoutes(routes);
   return routeString
     .split('/')
     .map(camelCaseRouteParameter)
diff --git a/static/gsApp/utils/useCodecovJwt.tsx b/static/gsApp/utils/useCodecovJwt.tsx
index 08d6e551f1c8..1405c5453b98 100644
--- a/static/gsApp/utils/useCodecovJwt.tsx
+++ b/static/gsApp/utils/useCodecovJwt.tsx
@@ -12,7 +12,7 @@ export function useCodecovJwt(
 ) {
   return useApiQuery<CodecovJWTResponse>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/codecov-jwt/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/codecov-jwt/`, {
         path: {organizationIdOrSlug: orgSlug},
       }),
     ],
diff --git a/static/gsApp/utils/usePromotionTriggerCheck.tsx b/static/gsApp/utils/usePromotionTriggerCheck.tsx
index 069827d66991..98f16bab8f76 100644
--- a/static/gsApp/utils/usePromotionTriggerCheck.tsx
+++ b/static/gsApp/utils/usePromotionTriggerCheck.tsx
@@ -6,7 +6,7 @@ import type {PromotionData} from 'getsentry/types';
 
 export function createPromotionCheckQueryKey(orgSlug: string): ApiQueryKey {
   return [
-    getApiUrl('/organizations/$organizationIdOrSlug/promotions/trigger-check/', {
+    getApiUrl(`/organizations/$organizationIdOrSlug/promotions/trigger-check/`, {
       path: {organizationIdOrSlug: orgSlug},
     }),
     {method: 'POST'},
diff --git a/static/gsApp/views/amCheckout/components/planFeatures.tsx b/static/gsApp/views/amCheckout/components/planFeatures.tsx
index 49b540bfc135..008ec295ee54 100644
--- a/static/gsApp/views/amCheckout/components/planFeatures.tsx
+++ b/static/gsApp/views/amCheckout/components/planFeatures.tsx
@@ -531,7 +531,7 @@ export function PlanFeatures({
         gap="xl"
         direction="column"
       >
-        <Grid columns={{xs: '1fr', sm: 'repeat(2, 1fr)'}} gap="xl">
+        <Grid columns={{xs: '1fr', sm: `repeat(2, 1fr)`}} gap="xl">
           <MonitoringAndDataFeatures planOptions={planOptions} activePlan={activePlan} />
           <ExpansionPackFeatures activePlan={activePlan} />
         </Grid>
diff --git a/static/gsApp/views/amCheckout/index.tsx b/static/gsApp/views/amCheckout/index.tsx
index eb58f16ac90a..7e485ff08dca 100644
--- a/static/gsApp/views/amCheckout/index.tsx
+++ b/static/gsApp/views/amCheckout/index.tsx
@@ -776,7 +776,7 @@ function AMCheckout(props: Props) {
             {showAnnualTerms && (
               <Text size="xs" align="center" variant="muted">
                 {tct(
-                  'Annual subscriptions require a one-year non-cancellable commitment. By using Sentry you agree to our [terms: Terms of Service].',
+                  `Annual subscriptions require a one-year non-cancellable commitment. By using Sentry you agree to our [terms: Terms of Service].`,
                   {terms: <a href="https://sentry.io/terms/" />}
                 )}
               </Text>
diff --git a/static/gsApp/views/cancelSubscription.tsx b/static/gsApp/views/cancelSubscription.tsx
index a7096c03929e..abd6e6d37244 100644
--- a/static/gsApp/views/cancelSubscription.tsx
+++ b/static/gsApp/views/cancelSubscription.tsx
@@ -102,7 +102,7 @@ function CancelSubscriptionForm() {
   const api = useApi();
   const {data: subscription, isPending} = useApiQuery<Subscription>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/gsApp/views/contactBillingMembers.spec.tsx b/static/gsApp/views/contactBillingMembers.spec.tsx
index 4696249f1607..29b071ae4ea2 100644
--- a/static/gsApp/views/contactBillingMembers.spec.tsx
+++ b/static/gsApp/views/contactBillingMembers.spec.tsx
@@ -8,7 +8,7 @@ describe('ContactBillingMembers', () => {
   it('renders helpful members', async () => {
     const member = MemberFixture();
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/members/',
+      url: `/organizations/org-slug/members/`,
       method: 'GET',
       body: [member],
     });
@@ -22,7 +22,7 @@ describe('ContactBillingMembers', () => {
 
   it('does not render helpful members', async () => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/members/',
+      url: `/organizations/org-slug/members/`,
       method: 'GET',
       body: [],
     });
@@ -30,7 +30,7 @@ describe('ContactBillingMembers', () => {
     render(<ContactBillingMembers />);
     expect(
       await screen.findByText(
-        "You don't have access to manage billing and subscription details."
+        `You don't have access to manage billing and subscription details.`
       )
     ).toBeInTheDocument();
   });
diff --git a/static/gsApp/views/contactBillingMembers.tsx b/static/gsApp/views/contactBillingMembers.tsx
index 60c16bd9ffe8..07f905d1450a 100644
--- a/static/gsApp/views/contactBillingMembers.tsx
+++ b/static/gsApp/views/contactBillingMembers.tsx
@@ -13,7 +13,7 @@ function HelpfulMembers() {
   const organization = useOrganization();
   const {data: billingMembers} = useApiQuery<Member[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/members/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/members/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {query: {query: 'scope:"org:billing"'}},
diff --git a/static/gsApp/views/invoiceDetails/index.tsx b/static/gsApp/views/invoiceDetails/index.tsx
index 22eb2b37b463..ec925ec8a2a1 100644
--- a/static/gsApp/views/invoiceDetails/index.tsx
+++ b/static/gsApp/views/invoiceDetails/index.tsx
@@ -35,7 +35,7 @@ function InvoiceDetails() {
     refetch: billingDetailsRefetch,
   } = useApiQuery<BillingDetails>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/billing-details/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/billing-details/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
@@ -51,7 +51,7 @@ function InvoiceDetails() {
     refetch: invoiceRefetch,
   } = useApiQuery<Invoice>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/invoices/$invoiceId/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/invoices/$invoiceId/`, {
         path: {organizationIdOrSlug: organization.slug, invoiceId: invoiceGuid},
       }),
     ],
diff --git a/static/gsApp/views/legalAndCompliance/termsAndConditions.tsx b/static/gsApp/views/legalAndCompliance/termsAndConditions.tsx
index a8d8ad231b7e..3219117f4d39 100644
--- a/static/gsApp/views/legalAndCompliance/termsAndConditions.tsx
+++ b/static/gsApp/views/legalAndCompliance/termsAndConditions.tsx
@@ -42,7 +42,7 @@ interface TermsProps {
 
 function makeFetchPoliciesQueryKey(subscription: Subscription): ApiQueryKey {
   return [
-    getApiUrl('/customers/$organizationIdOrSlug/policies/', {
+    getApiUrl(`/customers/$organizationIdOrSlug/policies/`, {
       path: {organizationIdOrSlug: subscription.slug},
     }),
   ];
diff --git a/static/gsApp/views/seerAutomation/components/projectDetails/autofixAgent.tsx b/static/gsApp/views/seerAutomation/components/projectDetails/autofixAgent.tsx
index 958b32849a10..aae2ff52378e 100644
--- a/static/gsApp/views/seerAutomation/components/projectDetails/autofixAgent.tsx
+++ b/static/gsApp/views/seerAutomation/components/projectDetails/autofixAgent.tsx
@@ -20,13 +20,13 @@ import {t, tct} from 'sentry/locale';
 import type {Project} from 'sentry/types/project';
 import {useMutation, useQuery, useQueryClient} from 'sentry/utils/queryClient';
 import {useOrganization} from 'sentry/utils/useOrganization';
-import {useFetchAgentOptions} from 'sentry/views/settings/seer/overview/utils/seerPreferredAgent';
 import {
   getProjectStoppingPointMutationOptions,
   getProjectStoppingPointValue,
   useFetchStoppingPointOptions,
 } from 'sentry/views/settings/seer/overview/utils/seerStoppingPoint';
 import {
+  useAgentOptions,
   useMutateSelectedAgent,
   useSelectedAgentFromProjectSettings,
 } from 'sentry/views/settings/seer/seerAgentHooks';
@@ -44,11 +44,14 @@ function AgentSpecificFields({
   integration,
   ...props
 }: Props & {
-  integration: 'seer' | CodingAgentIntegration;
+  integration: 'seer' | 'none' | CodingAgentIntegration;
 }) {
   if (integration === 'seer') {
     return <SeerAgentSettings {...props} />;
   }
+  if (integration === 'none') {
+    return null;
+  }
   if (integration.provider === 'cursor' || integration.provider === 'claude_code') {
     return <CodingAgentSettings integration={integration} {...props} />;
   }
@@ -65,9 +68,10 @@ export function AutofixAgent({canWrite, preference, project}: Props) {
     ...organizationIntegrationsCodingAgents(organization),
     select: data => data.json.integrations ?? [],
   });
-  const options = useFetchAgentOptions({organization});
+  const options = useAgentOptions({integrations: integrations ?? []});
   const selected = useSelectedAgentFromProjectSettings({
     preference,
+    project,
     integrations: integrations ?? [],
   });
   const mutateSelectedAgent = useMutateSelectedAgent({project});
@@ -102,29 +106,37 @@ export function AutofixAgent({canWrite, preference, project}: Props) {
                   ),
                 }
               )}
-              options={options.data ?? []}
+              options={options}
               value={selected}
-              onChange={(integration: 'seer' | CodingAgentIntegration) => {
+              onChange={(integration: 'seer' | 'none' | CodingAgentIntegration) => {
                 mutateSelectedAgent(integration, {
                   onSuccess: () =>
                     addSuccessMessage(
-                      tct('Started using [name] as coding agent', {
-                        name: (
-                          <strong>
-                            {integration === 'seer' ? t('Seer Agent') : integration.name}
-                          </strong>
-                        ),
-                      })
+                      integration === 'none'
+                        ? t('Removed coding agent')
+                        : tct('Started using [name] as coding agent', {
+                            name: (
+                              <strong>
+                                {integration === 'seer'
+                                  ? t('Seer Agent')
+                                  : integration.name}
+                              </strong>
+                            ),
+                          })
                     ),
                   onError: () =>
                     addErrorMessage(
-                      tct('Failed to set [name] as coding agent', {
-                        name: (
-                          <strong>
-                            {integration === 'seer' ? t('Seer Agent') : integration.name}
-                          </strong>
-                        ),
-                      })
+                      integration === 'none'
+                        ? t('Failed to update coding agent')
+                        : tct('Failed to set [name] as coding agent', {
+                            name: (
+                              <strong>
+                                {integration === 'seer'
+                                  ? t('Seer Agent')
+                                  : integration.name}
+                              </strong>
+                            ),
+                          })
                     ),
                 });
               }}
@@ -138,7 +150,7 @@ export function AutofixAgent({canWrite, preference, project}: Props) {
               />
             ) : null}
 
-            {selected ? (
+            {selected && selected !== 'none' ? (
               <StoppingPointField
                 agent={selected}
                 canWrite={canWrite}
diff --git a/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTable.tsx b/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTable.tsx
index 043c065e45e0..d89259ee7cf1 100644
--- a/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTable.tsx
+++ b/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTable.tsx
@@ -25,7 +25,6 @@ import type {ApiQueryKey} from 'sentry/utils/queryClient';
 import {parseAsSort} from 'sentry/utils/url/parseAsSort';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {useProjects} from 'sentry/utils/useProjects';
-import {useFetchAgentOptions} from 'sentry/views/settings/seer/overview/utils/seerPreferredAgent';
 
 import {ProjectTableHeader} from 'getsentry/views/seerAutomation/components/projectTable/seerProjectTableHeader';
 import {SeerProjectTableRow} from 'getsentry/views/seerAutomation/components/projectTable/seerProjectTableRow';
@@ -35,8 +34,6 @@ export function SeerProjectTable() {
   const organization = useOrganization();
   const {projects, fetching, fetchError} = useProjects();
 
-  const agentOptions = useFetchAgentOptions({organization});
-
   const autofixSettingsQueryOptions = bulkAutofixAutomationSettingsInfiniteOptions({
     organization,
   });
@@ -131,24 +128,19 @@ export function SeerProjectTable() {
           : b.name.localeCompare(a.name);
       }
 
-      const aSettings = autofixSettingsByProjectId.get(a.id);
-      const bSettings = autofixSettingsByProjectId.get(b.id);
-      if (sort.field === 'agent') {
-        const aAgent = aSettings?.automationHandoff?.target ?? 'seer';
-        const bAgent = bSettings?.automationHandoff?.target ?? 'seer';
-        return sort.kind === 'asc'
-          ? aAgent.localeCompare(bAgent)
-          : bAgent.localeCompare(aAgent);
-      }
-
-      if (sort.field === 'repo_count') {
-        return sort.kind === 'asc'
-          ? (aSettings?.reposCount ?? 0) - (bSettings?.reposCount ?? 0)
-          : (bSettings?.reposCount ?? 0) - (aSettings?.reposCount ?? 0);
-      }
+      // TODO: if we can bulk-fetch all the preferences, then it'll be easier to sort by fixes, pr creation, and repos
+      // if (sort.field === 'fixes') {
+      //   return a.slug.localeCompare(b.slug);
+      // }
+      // if (sort.field === 'pr_creation') {
+      //   return a.platform.localeCompare(b.platform);
+      // }
+      // if (sort.field === 'repos') {
+      //   return a.status.localeCompare(b.status);
+      // }
       return 0;
     });
-  }, [projects, sort, autofixSettingsByProjectId]);
+  }, [projects, sort]);
 
   const filteredProjects = useMemo(() => {
     const lowerCase = searchTerm?.toLowerCase() ?? '';
@@ -224,7 +216,6 @@ export function SeerProjectTable() {
               integrations={integrations ?? []}
               isPendingIntegrations={isPendingIntegrations}
               project={project}
-              agentOptions={agentOptions}
             />
           ))
         )}
diff --git a/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTableHeader.tsx b/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTableHeader.tsx
index 8887ec8e89fa..b6db2925f8f8 100644
--- a/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTableHeader.tsx
+++ b/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTableHeader.tsx
@@ -34,7 +34,7 @@ interface Props {
 
 const COLUMNS = [
   {title: t('Project'), key: 'project', sortKey: 'project'},
-  {title: t('Agent'), key: 'fixes', sortKey: 'agent'},
+  {title: t('Autofix Handoff'), key: 'fixes'},
   {
     title: (
       <Flex gap="sm" align="center">
@@ -48,7 +48,7 @@ const COLUMNS = [
     ),
     key: 'pr_creation',
   },
-  {title: t('Repos'), key: 'repos', sortKey: 'repo_count'},
+  {title: t('Repos'), key: 'repos'},
 ];
 
 function getMutationCallbacks(count: number) {
diff --git a/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTableRow.tsx b/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTableRow.tsx
index 47aca85c1a3b..73c0b6404fd4 100644
--- a/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTableRow.tsx
+++ b/static/gsApp/views/seerAutomation/components/projectTable/seerProjectTableRow.tsx
@@ -20,8 +20,8 @@ import {t, tct} from 'sentry/locale';
 import type {Project} from 'sentry/types/project';
 import {useListItemCheckboxContext} from 'sentry/utils/list/useListItemCheckboxState';
 import {useOrganization} from 'sentry/utils/useOrganization';
-import type {useFetchAgentOptions} from 'sentry/views/settings/seer/overview/utils/seerPreferredAgent';
 import {
+  useAgentOptions,
   useMutateCreatePr,
   useMutateSelectedAgent,
   useSelectedAgentFromBulkSettings,
@@ -30,7 +30,6 @@ import {
 import {useCanWriteSettings} from 'getsentry/views/seerAutomation/components/useCanWriteSettings';
 
 interface Props {
-  agentOptions: ReturnType<typeof useFetchAgentOptions>;
   autofixSettings: undefined | AutofixAutomationSettings;
   integrations: CodingAgentIntegration[];
   isPendingIntegrations: boolean;
@@ -38,16 +37,16 @@ interface Props {
 }
 
 export function SeerProjectTableRow({
-  agentOptions,
   autofixSettings,
-  integrations,
   isPendingIntegrations,
   project,
+  integrations,
 }: Props) {
   const organization = useOrganization();
   const canWrite = useCanWriteSettings();
   const {isSelected, toggleSelected} = useListItemCheckboxContext();
 
+  const options = useAgentOptions({integrations: integrations ?? []});
   const autofixAgent = useSelectedAgentFromBulkSettings({
     autofixSettings: autofixSettings ?? {
       autofixAutomationTuning: 'off',
@@ -95,24 +94,28 @@ export function SeerProjectTableRow({
               size="xs"
               disabled={!canWrite}
               name="autofixAgent"
-              options={agentOptions.data ?? []}
+              options={options}
               value={autofixAgent}
-              onChange={option => {
+              onChange={(option: ReturnType<typeof useAgentOptions>[number]) => {
                 mutateSelectedAgent(option.value, {
                   onSuccess: () => {
                     addSuccessMessage(
-                      tct('Selected [name] for [project]', {
-                        name: <strong>{option.label}</strong>,
-                        project: project.name,
-                      })
+                      option.value === 'none'
+                        ? t('Removed autofix agent from %s', project.name)
+                        : tct('Started using [name] for [project]', {
+                            name: <strong>{option.label}</strong>,
+                            project: project.name,
+                          })
                     );
                   },
                   onError: () =>
                     addErrorMessage(
-                      tct('Failed to set [name] for [project]', {
-                        name: <strong>{option.label}</strong>,
-                        project: project.name,
-                      })
+                      option.value === 'none'
+                        ? t('Failed to update autofix agent')
+                        : tct('Failed to set [name] for [project]', {
+                            name: <strong>{option.label}</strong>,
+                            project: project.name,
+                          })
                     ),
                 });
               }}
@@ -122,49 +125,53 @@ export function SeerProjectTableRow({
       </SimpleTable.RowCell>
       <SimpleTable.RowCell justify="end">
         {autofixSettings ? (
-          <Flex align="center" gap="sm">
-            {organization.enableSeerCoding === false && autofixAgent === 'seer' ? (
-              <InfoTip
-                title={tct(
-                  '[settings:"Enable Code Generation"] must be enabled for Seer to create pull requests.',
-                  {
-                    settings: (
-                      <Link
-                        to={`/settings/${organization.slug}/seer/#enableSeerCoding`}
-                      />
-                    ),
-                  }
-                )}
-                size="xs"
-              />
-            ) : null}
+          autofixAgent === 'none' ? (
+            <span>{'\u2014'}</span>
+          ) : (
+            <Flex align="center" gap="sm">
+              {organization.enableSeerCoding === false && autofixAgent === 'seer' ? (
+                <InfoTip
+                  title={tct(
+                    '[settings:"Enable Code Generation"] must be enabled for Seer to create pull requests.',
+                    {
+                      settings: (
+                        <Link
+                          to={`/settings/${organization.slug}/seer/#enableSeerCoding`}
+                        />
+                      ),
+                    }
+                  )}
+                  size="xs"
+                />
+              ) : null}
 
-            <Switch
-              disabled={
-                !canWrite ||
-                (organization.enableSeerCoding === false && autofixAgent === 'seer')
-              }
-              checked={isCreatePrEnabled}
-              onChange={e => {
-                const value = e.target.checked;
-                mutateCreatePr(autofixAgent, value, {
-                  onSuccess: () =>
-                    addSuccessMessage(
-                      value
-                        ? t('Enabled auto create pull requests for %s', project.name)
-                        : t('Disabled auto create pull requests for %s', project.name)
-                    ),
-                  onError: () =>
-                    addErrorMessage(
-                      t(
-                        'Failed to update auto create pull requests setting for %s',
-                        project.name
-                      )
-                    ),
-                });
-              }}
-            />
-          </Flex>
+              <Switch
+                disabled={
+                  !canWrite ||
+                  (organization.enableSeerCoding === false && autofixAgent === 'seer')
+                }
+                checked={isCreatePrEnabled}
+                onChange={e => {
+                  const value = e.target.checked;
+                  mutateCreatePr(autofixAgent, value, {
+                    onSuccess: () =>
+                      addSuccessMessage(
+                        value
+                          ? t('Enabled auto create pull requests for %s', project.name)
+                          : t('Disabled auto create pull requests for %s', project.name)
+                      ),
+                    onError: () =>
+                      addErrorMessage(
+                        t(
+                          'Failed to update auto create pull requests setting for %s',
+                          project.name
+                        )
+                      ),
+                  });
+                }}
+              />
+            </Flex>
+          )
         ) : (
           <Placeholder height="28px" width="36px" />
         )}
diff --git a/static/gsApp/views/seerAutomation/onboarding/configureCodeReviewStep.tsx b/static/gsApp/views/seerAutomation/onboarding/configureCodeReviewStep.tsx
index b4151e769be8..abd5295a7261 100644
--- a/static/gsApp/views/seerAutomation/onboarding/configureCodeReviewStep.tsx
+++ b/static/gsApp/views/seerAutomation/onboarding/configureCodeReviewStep.tsx
@@ -151,14 +151,14 @@ export function ConfigureCodeReviewStep() {
           <PanelBody>
             <PanelDescription>
               <Flex direction="column" gap="lg">
-                <Text>{t("You've successfully connected to GitHub!")}</Text>
+                <Text>{t(`You've successfully connected to GitHub!`)}</Text>
                 <Separator orientation="horizontal" border="muted" />
 
                 <Flex direction="column" gap="sm">
                   <Text bold>{t('AI Code Review')}</Text>
                   <Text variant="muted" density="comfortable">
                     {t(
-                      "For all selected repositories below, Seer's AI Code Review will be run to review your PRs and flag potential bugs. "
+                      `For all selected repositories below, Seer's AI Code Review will be run to review your PRs and flag potential bugs. `
                     )}
                   </Text>
                 </Flex>
diff --git a/static/gsApp/views/seerAutomation/onboarding/configureDefaultsStep.tsx b/static/gsApp/views/seerAutomation/onboarding/configureDefaultsStep.tsx
index d3057546eee8..9858598be924 100644
--- a/static/gsApp/views/seerAutomation/onboarding/configureDefaultsStep.tsx
+++ b/static/gsApp/views/seerAutomation/onboarding/configureDefaultsStep.tsx
@@ -101,7 +101,7 @@ export function ConfigureDefaultsStep() {
               <Flex direction="column" gap="md">
                 <Text density="comfortable">
                   {tct(
-                    'Create default settings for all future projects and repositories. If you don’t turn this defaults on now, you can always manage them from the [link:Seer Settings Page].',
+                    `Create default settings for all future projects and repositories. If you don’t turn this defaults on now, you can always manage them from the [link:Seer Settings Page].`,
                     {
                       link: <Link to={`/settings/${organization.slug}/seer/`} />,
                     }
@@ -109,7 +109,7 @@ export function ConfigureDefaultsStep() {
                 </Text>
                 <Text density="comfortable">
                   {t(
-                    'This will not effect the configuration of the repos and projects on the previous two steps.'
+                    `This will not effect the configuration of the repos and projects on the previous two steps.`
                   )}
                 </Text>
               </Flex>
diff --git a/static/gsApp/views/seerAutomation/onboarding/hooks/useCodeMappings.tsx b/static/gsApp/views/seerAutomation/onboarding/hooks/useCodeMappings.tsx
index a70554b72645..2985a7edf5b0 100644
--- a/static/gsApp/views/seerAutomation/onboarding/hooks/useCodeMappings.tsx
+++ b/static/gsApp/views/seerAutomation/onboarding/hooks/useCodeMappings.tsx
@@ -21,7 +21,7 @@ export function useCodeMappings({enabled}: UseCodeMappingsParams) {
     isError,
   } = useApiQuery<RepositoryProjectPathConfig[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/code-mappings/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/code-mappings/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/gsApp/views/seerAutomation/onboarding/hooks/useIntegrationInstallation.tsx b/static/gsApp/views/seerAutomation/onboarding/hooks/useIntegrationInstallation.tsx
index 96d44263eadf..82f074ced8f2 100644
--- a/static/gsApp/views/seerAutomation/onboarding/hooks/useIntegrationInstallation.tsx
+++ b/static/gsApp/views/seerAutomation/onboarding/hooks/useIntegrationInstallation.tsx
@@ -13,7 +13,7 @@ export function useIntegrationInstallation(provider_key: string) {
   const organization = useOrganization();
   const {data, isPending} = useApiQuery<OrganizationIntegration[]>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/gsApp/views/seerAutomation/onboarding/hooks/useIntegrationProvider.tsx b/static/gsApp/views/seerAutomation/onboarding/hooks/useIntegrationProvider.tsx
index e5a93dee4a32..5ad65a59440d 100644
--- a/static/gsApp/views/seerAutomation/onboarding/hooks/useIntegrationProvider.tsx
+++ b/static/gsApp/views/seerAutomation/onboarding/hooks/useIntegrationProvider.tsx
@@ -9,7 +9,7 @@ export function useIntegrationProvider(provider_key: string) {
   const organization = useOrganization();
   const {data, isPending} = useApiQuery<IntegrationInformation>(
     [
-      getApiUrl('/organizations/$organizationIdOrSlug/config/integrations/', {
+      getApiUrl(`/organizations/$organizationIdOrSlug/config/integrations/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/gsApp/views/seerAutomation/onboarding/repositorySelector.tsx b/static/gsApp/views/seerAutomation/onboarding/repositorySelector.tsx
index bbdf97025fa6..111fc3ea5060 100644
--- a/static/gsApp/views/seerAutomation/onboarding/repositorySelector.tsx
+++ b/static/gsApp/views/seerAutomation/onboarding/repositorySelector.tsx
@@ -146,7 +146,7 @@ export function RepositorySelector() {
               hasAccess ? (
                 <Text density="comfortable">
                   {tct(
-                    "Can't find a repository? [link:Manage your GitHub integration] and ensure you have granted access to the correct repositories.",
+                    `Can't find a repository? [link:Manage your GitHub integration] and ensure you have granted access to the correct repositories.`,
                     {
                       link: (
                         <IntegrationButton
diff --git a/static/gsApp/views/seerAutomation/projects.tsx b/static/gsApp/views/seerAutomation/projects.tsx
index 66c16b27437f..cda92ed6f105 100644
--- a/static/gsApp/views/seerAutomation/projects.tsx
+++ b/static/gsApp/views/seerAutomation/projects.tsx
@@ -17,7 +17,7 @@ export default function SeerAutomationProjects() {
         <SettingsPageHeader
           title={t('Autofix')}
           subtitle={tct(
-            'Configure [rca:Autofix] by connecting your repositories with projects. Connecting your source code is required and gives the coding agent context for Root Cause Analysis, Solution generation, and PR creation. Enable Autofix Handoff to automatically process and fix actionable issues as they are detected. [docs:Read the docs] to learn what Seer can do.',
+            `Configure [rca:Autofix] by connecting your repositories with projects. Connecting your source code is required and gives the coding agent context for Root Cause Analysis, Solution generation, and PR creation. Enable Autofix Handoff to automatically process and fix actionable issues as they are detected. [docs:Read the docs] to learn what Seer can do.`,
             {
               rca: (
                 <ExternalLink href="https://docs.sentry.io/product/ai-in-sentry/seer/autofix/#root-cause-analysis" />
diff --git a/static/gsApp/views/seerAutomation/repos.tsx b/static/gsApp/views/seerAutomation/repos.tsx
index f64dad0d365e..2ae65dc0b6d0 100644
--- a/static/gsApp/views/seerAutomation/repos.tsx
+++ b/static/gsApp/views/seerAutomation/repos.tsx
@@ -17,7 +17,7 @@ export default function SeerAutomationRepos() {
         <SettingsPageHeader
           title={t('Code Review')}
           subtitle={tct(
-            "Enable [code_review:Code Review] on your repositories to automatically catch bugs before they're merged into production. Reviews can be triggered when a PR is ready for review, after each update to a PR, and always manually by tagging [code:@sentry review] in the comments. [docs:Read the docs] to learn what Seer can do.",
+            `Enable [code_review:Code Review] on your repositories to automatically catch bugs before they're merged into production. Reviews can be triggered when a PR is ready for review, after each update to a PR, and always manually by tagging [code:@sentry review] in the comments. [docs:Read the docs] to learn what Seer can do.`,
             {
               code: <code />,
               code_review: (
diff --git a/static/gsApp/views/seerAutomation/scm.tsx b/static/gsApp/views/seerAutomation/scm.tsx
index 0a53e0e1fd0b..a86bc59e785f 100644
--- a/static/gsApp/views/seerAutomation/scm.tsx
+++ b/static/gsApp/views/seerAutomation/scm.tsx
@@ -22,7 +22,7 @@ export default function SeerAutomationSCM() {
         <SettingsPageHeader
           title={t('Repositories')}
           subtitle={tct(
-            'Integrate with a Seer compatible [scm:Source Code Management] provider and then connect repositories with Sentry. Seer needs read access to your source code to perform code review, and analyze your issues. [read_the_docs:Read the docs] and our [privacy:AI Privacy Principles] to learn more.',
+            `Integrate with a Seer compatible [scm:Source Code Management] provider and then connect repositories with Sentry. Seer needs read access to your source code to perform code review, and analyze your issues. [read_the_docs:Read the docs] and our [privacy:AI Privacy Principles] to learn more.`,
             {
               scm: (
                 <ExternalLink href="https://docs.sentry.io/organization/getting-started/#source-code-management" />
diff --git a/static/gsApp/views/seerAutomation/seerAutomation.spec.tsx b/static/gsApp/views/seerAutomation/seerAutomation.spec.tsx
index 5514062fadd8..c6032cb4c33c 100644
--- a/static/gsApp/views/seerAutomation/seerAutomation.spec.tsx
+++ b/static/gsApp/views/seerAutomation/seerAutomation.spec.tsx
@@ -7,7 +7,7 @@ import SeerAutomation from 'getsentry/views/seerAutomation/seerAutomation';
 describe('SeerAutomation', () => {
   beforeEach(() => {
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/seer/onboarding-check/',
+      url: `/organizations/org-slug/seer/onboarding-check/`,
       method: 'GET',
       body: {
         hasSupportedScmIntegration: true,
@@ -17,22 +17,22 @@ describe('SeerAutomation', () => {
       },
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/config/integrations/',
+      url: `/organizations/org-slug/config/integrations/`,
       method: 'GET',
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/integrations/',
+      url: `/organizations/org-slug/integrations/`,
       method: 'GET',
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/repos/',
+      url: `/organizations/org-slug/repos/`,
       method: 'GET',
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/autofix/automation-settings/',
+      url: `/organizations/org-slug/autofix/automation-settings/`,
       method: 'GET',
       body: [],
     });
@@ -99,7 +99,7 @@ describe('SeerAutomation', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/seer/onboarding-check/',
+      url: `/organizations/org-slug/seer/onboarding-check/`,
       method: 'GET',
       body: {
         hasSupportedScmIntegration: true,
@@ -143,7 +143,7 @@ describe('SeerAutomation', () => {
     });
 
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/seer/onboarding-check/',
+      url: `/organizations/org-slug/seer/onboarding-check/`,
       method: 'GET',
       body: {
         hasSupportedScmIntegration: true,
diff --git a/static/gsApp/views/seerAutomation/settings.tsx b/static/gsApp/views/seerAutomation/settings.tsx
index 2515bbd60c6a..f189c27c4f03 100644
--- a/static/gsApp/views/seerAutomation/settings.tsx
+++ b/static/gsApp/views/seerAutomation/settings.tsx
@@ -79,7 +79,7 @@ export function SeerAutomationSettings() {
       <SettingsPageHeader
         title={t('Seer Overview')}
         subtitle={tct(
-          'Configure how Seer works with your codebase. Seer includes [autofix:Autofix] and [code_review:Code Review]. Autofix will triage your Issues as they are created, and can automatically send them to a coding agent for Root Cause Analysis, Solution generation, and PR creation. Code Review will review your pull requests to detect issues before they happen. [docs:Read the docs] to learn what Seer can do.',
+          `Configure how Seer works with your codebase. Seer includes [autofix:Autofix] and [code_review:Code Review]. Autofix will triage your Issues as they are created, and can automatically send them to a coding agent for Root Cause Analysis, Solution generation, and PR creation. Code Review will review your pull requests to detect issues before they happen. [docs:Read the docs] to learn what Seer can do.`,
           {
             autofix: (
               <ExternalLink href="https://docs.sentry.io/product/ai-in-sentry/seer/autofix/#root-cause-analysis" />
@@ -94,13 +94,14 @@ export function SeerAutomationSettings() {
         )}
       />
       <SeerSettingsPageContent>
+        <SCMOverviewSection
+          {...scmOverviewData}
+          canWrite={canWrite}
+          organizationSlug={organization.slug}
+        />
+
         {showSeerOverview ? (
-          <div>
-            <SCMOverviewSection
-              {...scmOverviewData}
-              canWrite={canWrite}
-              organizationSlug={organization.slug}
-            />
+          <Fragment>
             <AutofixOverviewSection
               {...autofixOverviewData}
               canWrite={canWrite}
@@ -111,14 +112,9 @@ export function SeerAutomationSettings() {
               canWrite={canWrite}
               organization={organization}
             />
-          </div>
+          </Fragment>
         ) : (
           <Fragment>
-            <SCMOverviewSection
-              {...scmOverviewData}
-              canWrite={canWrite}
-              organizationSlug={organization.slug}
-            />
             <FieldGroup
               title={
                 <Flex gap="md">
diff --git a/static/gsApp/views/seerAutomation/trial.tsx b/static/gsApp/views/seerAutomation/trial.tsx
index 95f34f37bb75..13364eead218 100644
--- a/static/gsApp/views/seerAutomation/trial.tsx
+++ b/static/gsApp/views/seerAutomation/trial.tsx
@@ -115,7 +115,7 @@ export default function SeerAutomationTrial() {
 
           <Text>
             {tct(
-              "With Seer, issues [em:almost] fix themselves. Choose your favorite coding agent and run Autofix on Issues as they're detected, and use Code Review to prevent bugs before they happen. [docs:Read the docs] for more.",
+              `With Seer, issues [em:almost] fix themselves. Choose your favorite coding agent and run Autofix on Issues as they're detected, and use Code Review to prevent bugs before they happen. [docs:Read the docs] for more.`,
               {
                 em: <em />,
                 docs: (
diff --git a/static/gsApp/views/spendAllocations/index.tsx b/static/gsApp/views/spendAllocations/index.tsx
index a66941d09bdb..f4cb1b52f45f 100644
--- a/static/gsApp/views/spendAllocations/index.tsx
+++ b/static/gsApp/views/spendAllocations/index.tsx
@@ -394,7 +394,7 @@ export function SpendAllocationsRoot({organization, subscription}: Props) {
       />
       <div>
         {tct(
-          "Allocate a portion of your subscription's reserved quota to your projects and guarantee a minimum volume for them. Read the [docsLink: docs]",
+          `Allocate a portion of your subscription's reserved quota to your projects and guarantee a minimum volume for them. Read the [docsLink: docs]`,
           {
             docsLink: (
               <ExternalLink href="https://docs.sentry.io/pricing/quotas/spend-allocation/" />
diff --git a/static/gsApp/views/spendAllocations/rootAllocationCard.tsx b/static/gsApp/views/spendAllocations/rootAllocationCard.tsx
index a49132dd7b57..5b745c445084 100644
--- a/static/gsApp/views/spendAllocations/rootAllocationCard.tsx
+++ b/static/gsApp/views/spendAllocations/rootAllocationCard.tsx
@@ -97,7 +97,7 @@ export function RootAllocationCard({
               </Container>
               <Container padding="md">
                 {tct(
-                  'The un-allocated pool represents the remaining Reserved Volume available for your projects. Excess project consumption will first consume events from your un-allocated pool, and then from your [pricingLink] volume, if available',
+                  `The un-allocated pool represents the remaining Reserved Volume available for your projects. Excess project consumption will first consume events from your un-allocated pool, and then from your [pricingLink] volume, if available`,
                   {
                     pricingLink: (
                       <ExternalLink href="https://docs.sentry.io/pricing/">
diff --git a/static/gsApp/views/spikeProtection/spikeProtectionProjects.spec.tsx b/static/gsApp/views/spikeProtection/spikeProtectionProjects.spec.tsx
index 86dcee45341c..2efb2f8ac46b 100644
--- a/static/gsApp/views/spikeProtection/spikeProtectionProjects.spec.tsx
+++ b/static/gsApp/views/spikeProtection/spikeProtectionProjects.spec.tsx
@@ -234,13 +234,13 @@ describe('project renders and toggles', () => {
       statusCode: 200,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/notifications/available-actions/',
+      url: `/organizations/org-slug/notifications/available-actions/`,
       method: 'GET',
       body: AvailableNotificationActionsFixture(),
       statusCode: 200,
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/notifications/actions/',
+      url: `/organizations/org-slug/notifications/actions/`,
       match: [MockApiClient.matchQuery({triggerType: 'spike-protection'})],
       method: 'GET',
       body: [],
@@ -312,7 +312,7 @@ describe('project renders and toggles', () => {
     await validateComponents(projects[0]!, false);
     await validateComponents(projects[1]!, true);
 
-    const enableAll = await screen.findByTestId('sp-enable-all');
+    const enableAll = await screen.findByTestId(`sp-enable-all`);
 
     await userEvent.click(enableAll);
     await userEvent.click(await screen.findByTestId('confirm-button'));
@@ -333,7 +333,7 @@ describe('project renders and toggles', () => {
     await validateComponents(projects[0]!, false);
     await validateComponents(projects[1]!, true);
 
-    const disableAll = await screen.findByTestId('sp-disable-all');
+    const disableAll = await screen.findByTestId(`sp-disable-all`);
 
     await userEvent.click(disableAll);
     await userEvent.click(await screen.findByTestId('confirm-button'));
diff --git a/static/gsApp/views/spikeProtection/spikeProtectionProjects.tsx b/static/gsApp/views/spikeProtection/spikeProtectionProjects.tsx
index 0de9ed330883..68d924a6de62 100644
--- a/static/gsApp/views/spikeProtection/spikeProtectionProjects.tsx
+++ b/static/gsApp/views/spikeProtection/spikeProtectionProjects.tsx
@@ -159,7 +159,7 @@ function SpikeProtectionProjects({subscription}: Props) {
         setProjects(newProjects);
         await fetchData();
         addSuccessMessage(
-          tct('[action] spike protection for all projects', {
+          tct(`[action] spike protection for all projects`, {
             action: isEnabling ? t('Enabled') : t('Disabled'),
           })
         );
@@ -200,7 +200,7 @@ function SpikeProtectionProjects({subscription}: Props) {
   function AllProjectsAction(isEnabling: boolean) {
     const action = isEnabling ? t('Enable') : t('Disable');
     const confirmationText = tct(
-      'This will [action] spike protection for all projects in the organization immediately. Are you sure?',
+      `This will [action] spike protection for all projects in the organization immediately. Are you sure?`,
       {action: action.toLowerCase()}
     );
     return (
@@ -219,7 +219,7 @@ function SpikeProtectionProjects({subscription}: Props) {
             title: hasOrgWrite
               ? undefined
               : tct(
-                  'You do not have permission to [action] spike protection for all projects.',
+                  `You do not have permission to [action] spike protection for all projects.`,
                   {action: action.toLowerCase()}
                 ),
           }}
diff --git a/static/gsApp/views/subscriptionPage/headerCards/nextBillCard.tsx b/static/gsApp/views/subscriptionPage/headerCards/nextBillCard.tsx
index ca411493285a..8fcb9f702393 100644
--- a/static/gsApp/views/subscriptionPage/headerCards/nextBillCard.tsx
+++ b/static/gsApp/views/subscriptionPage/headerCards/nextBillCard.tsx
@@ -35,7 +35,7 @@ export function NextBillCard({
     isError,
   } = useApiQuery<PreviewData>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/subscription/next-bill/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/subscription/next-bill/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/gsApp/views/subscriptionPage/notifications.spec.tsx b/static/gsApp/views/subscriptionPage/notifications.spec.tsx
index b0f0ddf7a2ba..32ab83b39f9c 100644
--- a/static/gsApp/views/subscriptionPage/notifications.spec.tsx
+++ b/static/gsApp/views/subscriptionPage/notifications.spec.tsx
@@ -35,7 +35,7 @@ describe('Subscription > Notifications', () => {
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/members/',
+      url: `/organizations/org-slug/members/`,
       method: 'GET',
       body: [],
     });
diff --git a/static/gsApp/views/subscriptionPage/notifications.tsx b/static/gsApp/views/subscriptionPage/notifications.tsx
index ffe74f8355f5..82c2b12c5c5d 100644
--- a/static/gsApp/views/subscriptionPage/notifications.tsx
+++ b/static/gsApp/views/subscriptionPage/notifications.tsx
@@ -74,7 +74,7 @@ function SubscriptionNotifications({subscription}: SubscriptionNotificationsProp
     isError,
   } = useApiQuery<ThresholdsType>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/spend-notifications/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/spend-notifications/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/gsApp/views/subscriptionPage/overview.tsx b/static/gsApp/views/subscriptionPage/overview.tsx
index 82164e49879d..6a1bea78600f 100644
--- a/static/gsApp/views/subscriptionPage/overview.tsx
+++ b/static/gsApp/views/subscriptionPage/overview.tsx
@@ -44,7 +44,7 @@ function Overview({subscription}: Props) {
     isError,
   } = useApiQuery<CustomerUsage>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/usage/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/usage/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
     ],
diff --git a/static/gsApp/views/subscriptionPage/paymentHistory.spec.tsx b/static/gsApp/views/subscriptionPage/paymentHistory.spec.tsx
index 52df999d38cc..67279ef25393 100644
--- a/static/gsApp/views/subscriptionPage/paymentHistory.spec.tsx
+++ b/static/gsApp/views/subscriptionPage/paymentHistory.spec.tsx
@@ -13,27 +13,27 @@ describe('Subscription > PaymentHistory', () => {
   beforeEach(() => {
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: '/customers/dogz-rule/billing-config/',
+      url: `/customers/dogz-rule/billing-config/`,
       method: 'GET',
       body: BillingConfigFixture(PlanTier.AM1),
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/dogz-rule/promotions/trigger-check/',
+      url: `/organizations/dogz-rule/promotions/trigger-check/`,
       method: 'POST',
     });
     MockApiClient.addMockResponse({
-      url: '/customers/dogz-rule/plan-migrations/',
+      url: `/customers/dogz-rule/plan-migrations/`,
       query: {scheduled: 1, applied: 0},
       method: 'GET',
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/customers/dogz-rule/recurring-credits/',
+      url: `/customers/dogz-rule/recurring-credits/`,
       method: 'GET',
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/dogz-rule/prompts-activity/',
+      url: `/organizations/dogz-rule/prompts-activity/`,
       body: {},
     });
   });
diff --git a/static/gsApp/views/subscriptionPage/paymentHistory.tsx b/static/gsApp/views/subscriptionPage/paymentHistory.tsx
index 72e82e72e154..fd801504f616 100644
--- a/static/gsApp/views/subscriptionPage/paymentHistory.tsx
+++ b/static/gsApp/views/subscriptionPage/paymentHistory.tsx
@@ -55,7 +55,7 @@ function PaymentHistory() {
     getResponseHeader,
   } = useApiQuery<InvoiceBase[]>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/invoices/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/invoices/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx b/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx
index 549f6d858f19..3f08ec4219d1 100644
--- a/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx
+++ b/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx
@@ -305,7 +305,7 @@ function chartTooltip(category: DataCategory, displayMode: 'usage' | 'cost') {
           .join(''),
         '</div>',
         `<div class="tooltip-footer tooltip-footer-centered">${time}</div>`,
-        '<div class="tooltip-arrow"></div>',
+        `<div class="tooltip-arrow"></div>`,
       ].join('');
     },
   });
@@ -751,7 +751,7 @@ export function ProductUsageChart({
               position: 'insideStartBottom',
               formatter:
                 displayMode === 'usage'
-                  ? t('Plan Quota (%s)', yAxisQuotaLineLabel)
+                  ? t(`Plan Quota (%s)`, yAxisQuotaLineLabel)
                   : t('Max Spend'),
               color: theme.tokens.content.secondary,
               backgroundColor: theme.tokens.background.primary,
diff --git a/static/gsApp/views/subscriptionPage/subscriptionHeader.spec.tsx b/static/gsApp/views/subscriptionPage/subscriptionHeader.spec.tsx
index 5e81c3e1ed60..79a63d52e883 100644
--- a/static/gsApp/views/subscriptionPage/subscriptionHeader.spec.tsx
+++ b/static/gsApp/views/subscriptionPage/subscriptionHeader.spec.tsx
@@ -18,35 +18,35 @@ describe('SubscriptionHeader', () => {
   beforeEach(() => {
     MockApiClient.clearMockResponses();
     MockApiClient.addMockResponse({
-      url: '/customers/org-slug/billing-config/',
+      url: `/customers/org-slug/billing-config/`,
       method: 'GET',
       body: BillingConfigFixture(PlanTier.AM1),
     });
     MockApiClient.addMockResponse({
-      url: '/customers/org-slug/billing-details/',
+      url: `/customers/org-slug/billing-details/`,
       method: 'GET',
     });
     MockApiClient.addMockResponse({
-      url: '/customers/org-slug/',
+      url: `/customers/org-slug/`,
       method: 'GET',
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/promotions/trigger-check/',
+      url: `/organizations/org-slug/promotions/trigger-check/`,
       method: 'POST',
     });
     MockApiClient.addMockResponse({
-      url: '/customers/org-slug/plan-migrations/',
+      url: `/customers/org-slug/plan-migrations/`,
       query: {scheduled: 1, applied: 0},
       method: 'GET',
       body: [],
     });
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/prompts-activity/',
+      url: `/organizations/org-slug/prompts-activity/`,
       body: {},
     });
     MockApiClient.addMockResponse({
-      url: '/customers/org-slug/subscription/next-bill/',
+      url: `/customers/org-slug/subscription/next-bill/`,
       method: 'GET',
     });
   });
diff --git a/static/gsApp/views/subscriptionPage/subscriptionUpsellBanner.spec.tsx b/static/gsApp/views/subscriptionPage/subscriptionUpsellBanner.spec.tsx
index 45e83f37754a..7b8e64d5eebf 100644
--- a/static/gsApp/views/subscriptionPage/subscriptionUpsellBanner.spec.tsx
+++ b/static/gsApp/views/subscriptionPage/subscriptionUpsellBanner.spec.tsx
@@ -12,20 +12,20 @@ describe('SubscriptionUpsellBanner', () => {
       snoozed_ts: undefined,
     };
     MockApiClient.addMockResponse({
-      url: '/organizations/org-slug/prompts-activity/',
+      url: `/organizations/org-slug/prompts-activity/`,
       body: promptResponse,
     });
     MockApiClient.addMockResponse({
-      url: '/customers/org-slug/plan-migrations/?applied=0',
+      url: `/customers/org-slug/plan-migrations/?applied=0`,
       method: 'GET',
       body: {},
     });
     MockApiClient.addMockResponse({
-      url: '/customers/org-slug/',
+      url: `/customers/org-slug/`,
       body: {},
     });
     MockApiClient.addMockResponse({
-      url: '/customers/org-slug/plan-migrations/',
+      url: `/customers/org-slug/plan-migrations/`,
       query: {scheduled: 1, applied: 0},
       method: 'GET',
       body: [],
diff --git a/static/gsApp/views/subscriptionPage/subscriptionUpsellBanner.tsx b/static/gsApp/views/subscriptionPage/subscriptionUpsellBanner.tsx
index 200e08f4a4e3..ff08363a0515 100644
--- a/static/gsApp/views/subscriptionPage/subscriptionUpsellBanner.tsx
+++ b/static/gsApp/views/subscriptionPage/subscriptionUpsellBanner.tsx
@@ -37,7 +37,7 @@ const getSubscriptionBannerText = (
           ? t('Try Sentry Business for Free')
           : t('Try Performance for Free'),
         tct(
-          "Activate your trial to take advantage of Sentry's [featuresName] features.",
+          `Activate your trial to take advantage of Sentry's [featuresName] features.`,
           {featuresName}
         ),
       ];
diff --git a/static/gsApp/views/subscriptionPage/trialAlert.spec.tsx b/static/gsApp/views/subscriptionPage/trialAlert.spec.tsx
index 89b100b9e53b..c777633df1a6 100644
--- a/static/gsApp/views/subscriptionPage/trialAlert.spec.tsx
+++ b/static/gsApp/views/subscriptionPage/trialAlert.spec.tsx
@@ -134,7 +134,7 @@ describe('Subscription > TrialAlert', () => {
     expect(screen.getByText('Performance Trial')).toBeInTheDocument();
     expect(
       screen.getByText(
-        "With your trial you have access to Sentry's performance features."
+        `With your trial you have access to Sentry's performance features.`
       )
     ).toBeInTheDocument();
   });
diff --git a/static/gsApp/views/subscriptionPage/usageAlert.tsx b/static/gsApp/views/subscriptionPage/usageAlert.tsx
index 946dcc100034..b6f2ad17ce23 100644
--- a/static/gsApp/views/subscriptionPage/usageAlert.tsx
+++ b/static/gsApp/views/subscriptionPage/usageAlert.tsx
@@ -136,7 +136,7 @@ export function UsageAlert({subscription, usage}: Props) {
               <h3>{t('Projected Overage')}</h3>
               <Description>
                 {tct(
-                  'Based on your previous usage, we predict your organization will need at least [totals].',
+                  `Based on your previous usage, we predict your organization will need at least [totals].`,
                   {totals: oxfordizeArray(projectedOverages)}
                 )}{' '}
                 {getActionSentence()}
@@ -223,7 +223,7 @@ export function UsageAlert({subscription, usage}: Props) {
               <h3>{t('Usage Exceeded')}</h3>
               <Description>
                 {tct(
-                  'Your organization has depleted its [quotasExceeded] capacity for the current usage period.',
+                  `Your organization has depleted its [quotasExceeded] capacity for the current usage period.`,
                   {quotasExceeded}
                 )}{' '}
                 {getActionSentence()}
diff --git a/static/gsApp/views/subscriptionPage/usageHistory.tsx b/static/gsApp/views/subscriptionPage/usageHistory.tsx
index 64c3b03c535b..634c7db1e470 100644
--- a/static/gsApp/views/subscriptionPage/usageHistory.tsx
+++ b/static/gsApp/views/subscriptionPage/usageHistory.tsx
@@ -97,7 +97,7 @@ function UsageHistory({subscription}: Props) {
     getResponseHeader,
   } = useApiQuery<BillingHistory[]>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/history/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/history/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/gsApp/views/subscriptionPage/usageLog.tsx b/static/gsApp/views/subscriptionPage/usageLog.tsx
index 102fe356ef1a..4447c6e0275b 100644
--- a/static/gsApp/views/subscriptionPage/usageLog.tsx
+++ b/static/gsApp/views/subscriptionPage/usageLog.tsx
@@ -99,7 +99,7 @@ export default function UsageLog() {
     refetch,
   } = useApiQuery<UsageLogs>(
     [
-      getApiUrl('/customers/$organizationIdOrSlug/subscription/usage-logs/', {
+      getApiUrl(`/customers/$organizationIdOrSlug/subscription/usage-logs/`, {
         path: {organizationIdOrSlug: organization.slug},
       }),
       {
diff --git a/static/gsApp/views/subscriptionPage/usageOverview/components/billedSeats.tsx b/static/gsApp/views/subscriptionPage/usageOverview/components/billedSeats.tsx
index a350c695cf62..b57833d758ad 100644
--- a/static/gsApp/views/subscriptionPage/usageOverview/components/billedSeats.tsx
+++ b/static/gsApp/views/subscriptionPage/usageOverview/components/billedSeats.tsx
@@ -41,7 +41,7 @@ export function BilledSeats({
   const shouldShowBilledSeats =
     selectedProduct === AddOnCategory.SEER && defined(billedCategory) && isEnabled;
   const billedSeatsQueryKey = [
-    getApiUrl('/customers/$organizationIdOrSlug/billing-seats/current/', {
+    getApiUrl(`/customers/$organizationIdOrSlug/billing-seats/current/`, {
       path: {organizationIdOrSlug: organization.slug},
     }),
     {query: {billingMetric: billedCategory}},
diff --git a/static/gsApp/views/subscriptionPage/usageOverview/components/tableRow.tsx b/static/gsApp/views/subscriptionPage/usageOverview/components/tableRow.tsx
index 886d203f268b..ba7e3e639697 100644
--- a/static/gsApp/views/subscriptionPage/usageOverview/components/tableRow.tsx
+++ b/static/gsApp/views/subscriptionPage/usageOverview/components/tableRow.tsx
@@ -315,7 +315,7 @@ export function UsageOverviewTableRow({
                 )}
               </Text>
               {formattedFree && (
-                <Text size="xs">{tct(' ([formattedFree] gifted)', {formattedFree})}</Text>
+                <Text size="xs">{tct(` ([formattedFree] gifted)`, {formattedFree})}</Text>
               )}
             </Flex>
           </td>
diff --git a/tests/js/fixtures/routerPropsFixture.ts b/tests/js/fixtures/routerPropsFixture.ts
new file mode 100644
index 000000000000..480ca078d3f1
--- /dev/null
+++ b/tests/js/fixtures/routerPropsFixture.ts
@@ -0,0 +1,11 @@
+import {LocationFixture} from 'sentry-fixture/locationFixture';
+
+export function RouterPropsFixture(params = {}) {
+  return {
+    location: LocationFixture(),
+    params: {},
+    routes: [],
+    stepBack: () => {},
+    ...params,
+  };
+}
diff --git a/tests/js/sentry-test/onboarding/renderWithOnboardingLayout.tsx b/tests/js/sentry-test/onboarding/renderWithOnboardingLayout.tsx
index cb6a260af958..b2eae82fea5c 100644
--- a/tests/js/sentry-test/onboarding/renderWithOnboardingLayout.tsx
+++ b/tests/js/sentry-test/onboarding/renderWithOnboardingLayout.tsx
@@ -50,7 +50,7 @@ export function renderWithOnboardingLayout<
       pathname: `/organizations/${organization.slug}/projects/${project.slug}/getting-started/`,
       query: selectedOptions,
     },
-    route: '/organizations/:orgId/projects/:projectId/getting-started/',
+    route: `/organizations/:orgId/projects/:projectId/getting-started/`,
   };
 
   const projectKey = 'test-project-key-id';
diff --git a/tests/sentry/api/endpoints/test_organization_insights_tree.py b/tests/sentry/api/endpoints/test_organization_insights_tree.py
index 234f3cb93378..ab7180c57159 100644
--- a/tests/sentry/api/endpoints/test_organization_insights_tree.py
+++ b/tests/sentry/api/endpoints/test_organization_insights_tree.py
@@ -1,8 +1,7 @@
 import pytest
 from django.urls import reverse
 
-from sentry.api.endpoints.organization_insights_tree import OrganizationInsightsTreeEndpoint
-from sentry.testutils.cases import SnubaTestCase, SpanTestCase, TestCase
+from sentry.testutils.cases import SnubaTestCase, SpanTestCase
 from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.skips import requires_snuba
 from tests.snuba.api.endpoints.test_organization_events import OrganizationEventsEndpointTestBase
@@ -31,7 +30,6 @@ def setUp(self) -> None:
         self._store_unrelated_spans()
 
     def _store_nextjs_function_spans(self) -> None:
-        # Old SDK format (<10.32.0): '{ComponentType} Server Component ({route})'
         descriptions = [
             "Page Server Component (/app/dashboard/)",
             "Loading Server Component (/app/dashboard/)",
@@ -52,13 +50,6 @@ def _store_nextjs_function_spans(self) -> None:
             "Page Server Component (/app/[id]/)",
             "Page Server Component (/app/[...slug]/)",
             "Page Server Component (/app/[[...optional]]/)",
-            # New SDK format (>=10.32.0): 'resolve {type} server component "{route_or_segment}"'
-            'resolve page server component "/dashboard"',
-            'resolve page server component "/nested-layout/[dynamic]"',
-            'resolve layout server component "nested-layout"',
-            'resolve layout server component "(route-group)"',
-            'resolve layout server component "[dynamic]"',
-            "resolve root layout server component",
             "unrelated description",
         ]
         spans = []
@@ -134,61 +125,4 @@ def test_get_nextjs_function_data(self) -> None:
         assert element["function.nextjs.component_type"] == "Page Server Component"
         assert element["function.nextjs.path"] == ["app", "[...slug]"]
 
-        # New SDK format: resolve page server component with full route
-        resolve_page_idx = span_descriptions.index(
-            'resolve page server component "/nested-layout/[dynamic]"'
-        )
-        element = response.data["data"][resolve_page_idx]
-        assert element["function.nextjs.component_type"] == "Page Server Component"
-        assert element["function.nextjs.path"] == ["nested-layout", "[dynamic]"]
-
-        # New SDK format: resolve layout server component with segment
-        resolve_layout_idx = span_descriptions.index(
-            'resolve layout server component "nested-layout"'
-        )
-        element = response.data["data"][resolve_layout_idx]
-        assert element["function.nextjs.component_type"] == "Layout Server Component"
-        assert element["function.nextjs.path"] == ["nested-layout"]
-
-        # New SDK format: resolve root layout server component (no path)
-        resolve_root_idx = span_descriptions.index("resolve root layout server component")
-        element = response.data["data"][resolve_root_idx]
-        assert element["function.nextjs.component_type"] == "Layout Server Component"
-        assert element["function.nextjs.path"] == []
-
-        # New SDK format: route group segment
-        resolve_group_idx = span_descriptions.index(
-            'resolve layout server component "(route-group)"'
-        )
-        element = response.data["data"][resolve_group_idx]
-        assert element["function.nextjs.component_type"] == "Layout Server Component"
-        assert element["function.nextjs.path"] == ["(route-group)"]
-
         assert "INSERT value INTO table" not in span_descriptions
-
-
-class DescriptionParsingTest(TestCase):
-    """Verifies that old (<10.32.0) and new (>=10.32.0) SDK formats produce identical parsed output."""
-
-    _endpoint = OrganizationInsightsTreeEndpoint()
-
-    def _parse(self, desc):
-        response = type("R", (), {"data": {"data": [{"span.description": desc}]}})()
-        self._endpoint._separate_span_description_info(response)
-        row = response.data["data"][0]
-        return row["function.nextjs.component_type"], row["function.nextjs.path"]
-
-    def test_page_simple_route(self):
-        assert self._parse("Page Server Component (/dashboard)") == self._parse(
-            'resolve page server component "/dashboard"'
-        )
-
-    def test_page_nested_route(self):
-        assert self._parse("Page Server Component (/nested/route)") == self._parse(
-            'resolve page server component "/nested/route"'
-        )
-
-    def test_layout_simple_route(self):
-        assert self._parse("Layout Server Component (/settings)") == self._parse(
-            'resolve layout server component "/settings"'
-        )
diff --git a/tests/sentry/api/endpoints/test_rpc.py b/tests/sentry/api/endpoints/test_rpc.py
index 2890a5350f6b..2cb505ea946e 100644
--- a/tests/sentry/api/endpoints/test_rpc.py
+++ b/tests/sentry/api/endpoints/test_rpc.py
@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from typing import Any
-from unittest.mock import patch
 
 import orjson
 from django.test import override_settings
@@ -11,7 +10,6 @@
 from sentry.hybridcloud.rpc.service import generate_request_signature
 from sentry.organizations.services.organization import RpcUserOrganizationContext
 from sentry.testutils.cases import APITestCase
-from sentry.viewer_context import ActorType, ViewerContext, get_viewer_context
 
 
 @override_settings(RPC_SHARED_SECRET=["a-long-value-that-is-hard-to-guess"])
@@ -144,107 +142,3 @@ def test_with_invalid_arguments(self) -> None:
         assert response.data == {
             "detail": ErrorDetail(string="Malformed request.", code="parse_error")
         }
-
-    def test_viewer_context_propagated_from_meta(self) -> None:
-        """ViewerContext in meta is set as the contextvar during dispatch."""
-        organization = self.create_organization()
-        captured_contexts: list[ViewerContext | None] = []
-
-        original_dispatch = __import__(
-            "sentry.hybridcloud.rpc.service", fromlist=["dispatch_to_local_service"]
-        ).dispatch_to_local_service
-
-        def capturing_dispatch(*args, **kwargs):
-            captured_contexts.append(get_viewer_context())
-            return original_dispatch(*args, **kwargs)
-
-        path = self._get_path("organization", "get_organization_by_id")
-        data = {
-            "args": {"id": organization.id},
-            "meta": {
-                "viewer_context": {
-                    "organization_id": organization.id,
-                    "user_id": 42,
-                    "actor_type": "user",
-                }
-            },
-        }
-
-        with patch(
-            "sentry.api.endpoints.internal.rpc.dispatch_to_local_service",
-            side_effect=capturing_dispatch,
-        ):
-            response = self._send_post_request(path, data)
-
-        assert response.status_code == 200
-        assert len(captured_contexts) == 1
-        ctx = captured_contexts[0]
-        assert ctx is not None
-        assert ctx.organization_id == organization.id
-        assert ctx.user_id == 42
-        assert ctx.actor_type == ActorType.USER
-
-    def test_viewer_context_unknown_when_meta_empty(self) -> None:
-        """Empty ViewerContext with UNKNOWN actor type when meta has no viewer_context."""
-        organization = self.create_organization()
-        captured_contexts: list[ViewerContext | None] = []
-
-        original_dispatch = __import__(
-            "sentry.hybridcloud.rpc.service", fromlist=["dispatch_to_local_service"]
-        ).dispatch_to_local_service
-
-        def capturing_dispatch(*args, **kwargs):
-            captured_contexts.append(get_viewer_context())
-            return original_dispatch(*args, **kwargs)
-
-        path = self._get_path("organization", "get_organization_by_id")
-        data = {"args": {"id": organization.id}, "meta": {}}
-
-        with patch(
-            "sentry.api.endpoints.internal.rpc.dispatch_to_local_service",
-            side_effect=capturing_dispatch,
-        ):
-            response = self._send_post_request(path, data)
-
-        assert response.status_code == 200
-        assert len(captured_contexts) == 1
-        ctx = captured_contexts[0]
-        assert ctx is not None
-        assert ctx.user_id is None
-        assert ctx.organization_id is None
-        assert ctx.actor_type == ActorType.UNKNOWN
-
-    def test_viewer_context_roundtrip_through_meta(self) -> None:
-        """ViewerContext set on the sending side arrives on the receiving side."""
-        organization = self.create_organization()
-        captured_contexts: list[ViewerContext | None] = []
-
-        original_dispatch = __import__(
-            "sentry.hybridcloud.rpc.service", fromlist=["dispatch_to_local_service"]
-        ).dispatch_to_local_service
-
-        def capturing_dispatch(*args, **kwargs):
-            captured_contexts.append(get_viewer_context())
-            return original_dispatch(*args, **kwargs)
-
-        # Simulate what _send_to_remote_silo builds when ViewerContext is set
-        ctx = ViewerContext(organization_id=organization.id, user_id=42, actor_type=ActorType.USER)
-        path = self._get_path("organization", "get_organization_by_id")
-        data = {
-            "args": {"id": organization.id},
-            "meta": {"viewer_context": ctx.serialize()},
-        }
-
-        with patch(
-            "sentry.api.endpoints.internal.rpc.dispatch_to_local_service",
-            side_effect=capturing_dispatch,
-        ):
-            response = self._send_post_request(path, data)
-
-        assert response.status_code == 200
-        assert len(captured_contexts) == 1
-        restored = captured_contexts[0]
-        assert restored is not None
-        assert restored.organization_id == ctx.organization_id
-        assert restored.user_id == ctx.user_id
-        assert restored.actor_type == ctx.actor_type
diff --git a/tests/sentry/api/serializers/test_team.py b/tests/sentry/api/serializers/test_team.py
index 522598bc7ece..1fa55996baa1 100644
--- a/tests/sentry/api/serializers/test_team.py
+++ b/tests/sentry/api/serializers/test_team.py
@@ -277,20 +277,6 @@ def test_simple(self) -> None:
             "externalTeams": [],
         }
 
-    def test_project_on_multiple_teams_no_duplicate_features(self) -> None:
-        """A project belonging to multiple teams should not have its features list duplicated."""
-        user = self.create_user(username="foo")
-        organization = self.create_organization()
-        team1 = self.create_team(organization=organization)
-        team2 = self.create_team(organization=organization)
-        self.create_project(teams=[team1, team2], organization=organization)
-
-        result = serialize([team1, team2], user, TeamWithProjectsSerializer())
-        features = result[0]["projects"][0]["features"]
-
-        assert len(features) > 0
-        assert features == list(dict.fromkeys(features))
-
 
 class TeamSCIMSerializerTest(TestCase):
     def test_simple_with_members(self) -> None:
diff --git a/tests/sentry/deletions/test_detector.py b/tests/sentry/deletions/test_detector.py
index 84b4fe99a32a..6b4320f82590 100644
--- a/tests/sentry/deletions/test_detector.py
+++ b/tests/sentry/deletions/test_detector.py
@@ -3,16 +3,12 @@
 import pytest
 
 from sentry.constants import ObjectStatus
-from sentry.deletions.tasks.scheduled import reattempt_deletions, run_scheduled_deletions
+from sentry.deletions.tasks.scheduled import run_scheduled_deletions
 from sentry.incidents.grouptype import MetricIssue
-from sentry.incidents.models.alert_rule import AlertRule, AlertRuleTrigger
 from sentry.snuba.models import QuerySubscription, SnubaQuery
 from sentry.testutils.hybrid_cloud import HybridCloudTestMixin
 from sentry.uptime.models import UptimeSubscription, get_uptime_subscription
-from sentry.workflow_engine.migration_helpers.alert_rule import dual_write_alert_rule
 from sentry.workflow_engine.models import (
-    AlertRuleDetector,
-    AlertRuleWorkflow,
     DataCondition,
     DataConditionGroup,
     DataSource,
@@ -129,58 +125,6 @@ def test_data_source_not_deleted(self) -> None:
         assert DataSource.objects.filter(id=self.data_source.id).exists()
         assert DataSourceDetector.objects.filter(id=data_source_detector_2.id).exists()
 
-    def test_dangling_fk_causes_stuck_deletion_loop(self) -> None:
-        """Regression test for the infinite-retry failure mode this fix addresses.
-
-        Before the fix, accessing instance.workflow_condition_group (a descriptor) with
-        a dangling FK raised DataConditionGroup.DoesNotExist inside get_child_relations.
-        In production, _run_deletion swallows the exception and exits cleanly, leaving
-        the deletion record stuck with in_progress=True and the detector undeleted.
-        reattempt_deletions eventually resets in_progress=False, but the next run hits
-        the same error — resulting in an infinite loop.
-        """
-        from datetime import timedelta
-
-        from django.utils import timezone
-
-        from sentry.deletions.models.scheduleddeletion import CellScheduledDeletion
-
-        schedule = self.ScheduledDeletion.schedule(instance=self.detector, days=0)
-
-        with (
-            # Simulate the pre-fix crash: descriptor access raises DoesNotExist for a dangling FK
-            mock.patch(
-                "sentry.deletions.defaults.detector.DetectorDeletionTask.get_child_relations",
-                side_effect=DataConditionGroup.DoesNotExist,
-            ),
-            # Simulate production: _run_deletion swallows exceptions instead of re-raising
-            mock.patch("sentry.deletions.tasks.scheduled.in_test_environment", return_value=False),
-            mock.patch("sentry.deletions.tasks.scheduled.sentry_sdk"),
-        ):
-            # First run: exception is swallowed; detector not deleted, record stuck in_progress
-            with self.tasks():
-                run_scheduled_deletions()
-
-            assert Detector.objects_for_deletion.filter(id=self.detector.id).exists()
-            assert CellScheduledDeletion.objects.filter(id=schedule.id, in_progress=True).exists()
-
-            # reattempt_deletions resets in_progress after 6+ hours — but the root cause remains
-            CellScheduledDeletion.objects.filter(id=schedule.id).update(
-                date_scheduled=timezone.now() - timedelta(hours=7)
-            )
-            with self.tasks():
-                reattempt_deletions()
-
-            schedule.refresh_from_db()
-            assert not schedule.in_progress
-
-            # Second run: same failure — the loop repeats indefinitely
-            with self.tasks():
-                run_scheduled_deletions()
-
-            assert Detector.objects_for_deletion.filter(id=self.detector.id).exists()
-            assert CellScheduledDeletion.objects.filter(id=schedule.id, in_progress=True).exists()
-
     def test_delete_uptime_detector(self) -> None:
         detector = self.create_uptime_detector()
         uptime_sub = get_uptime_subscription(detector)
@@ -232,20 +176,6 @@ def test_delete_uptime_detector_succeeds_when_remove_seat_fails(
         # Verify the error path in DetectorDeletionTask was actually exercised.
         mock_remove_seat_subscriptions.assert_called_once()
 
-    def test_dangling_workflow_condition_group(self) -> None:
-        """Deletion succeeds when workflow_condition_group_id references a deleted DataConditionGroup."""
-        # Simulate a dangling FK — points to a non-existent DataConditionGroup row
-        Detector.objects_for_deletion.filter(id=self.detector.id).update(
-            workflow_condition_group_id=999999
-        )
-
-        self.ScheduledDeletion.schedule(instance=self.detector, days=0)
-
-        with self.tasks():
-            run_scheduled_deletions()
-
-        assert not Detector.objects_for_deletion.filter(id=self.detector.id).exists()
-
     def test_delete_uptime_subscription_without_detector(self) -> None:
         """UptimeSubscription deletion proceeds when the detector no longer exists."""
         detector = self.create_uptime_detector()
@@ -266,34 +196,3 @@ def test_delete_uptime_subscription_without_detector(self) -> None:
             run_scheduled_deletions()
 
         assert not UptimeSubscription.objects.filter(id=uptime_sub_id).exists()
-
-
-class DeleteDualWrittenDetectorTest(BaseWorkflowTest, HybridCloudTestMixin):
-    def test_deleting_detector_deletes_associated_alert_rule(self) -> None:
-        alert_rule = self.create_alert_rule(
-            organization=self.organization,
-            projects=[self.project],
-        )
-        trigger = self.create_alert_rule_trigger(alert_rule=alert_rule)
-        dual_write_alert_rule(alert_rule)
-
-        snuba_query = alert_rule.snuba_query
-        subscription = QuerySubscription.objects.get(snuba_query=snuba_query)
-        detector = AlertRuleDetector.objects.get(alert_rule_id=alert_rule.id).detector
-        data_source = DataSource.objects.get(source_id=str(subscription.id))
-
-        detector.status = ObjectStatus.PENDING_DELETION
-        detector.save()
-        self.ScheduledDeletion.schedule(instance=detector, days=0)
-
-        with self.tasks():
-            run_scheduled_deletions()
-
-        assert not Detector.objects.filter(id=detector.id).exists()
-        assert not AlertRuleDetector.objects.filter(alert_rule_id=alert_rule.id).exists()
-        assert not AlertRuleWorkflow.objects.filter(alert_rule_id=alert_rule.id).exists()
-        assert not AlertRule.objects.filter(id=alert_rule.id).exists()
-        assert not AlertRuleTrigger.objects.filter(id=trigger.id).exists()
-        assert not DataSource.objects.filter(id=data_source.id).exists()
-        assert not QuerySubscription.objects.filter(id=subscription.id).exists()
-        assert not SnubaQuery.objects.filter(id=snuba_query.id).exists()
diff --git a/tests/sentry/deletions/test_workflow.py b/tests/sentry/deletions/test_workflow.py
index 170e8ed83e5c..bfc974a295c9 100644
--- a/tests/sentry/deletions/test_workflow.py
+++ b/tests/sentry/deletions/test_workflow.py
@@ -59,22 +59,6 @@ def setUp(self) -> None:
         self.workflow.status = ObjectStatus.PENDING_DELETION
         self.workflow.save()
 
-    def test_dangling_when_condition_group(self) -> None:
-        """Deletion succeeds when when_condition_group_id references a deleted DataConditionGroup."""
-        from sentry.workflow_engine.models import Workflow
-
-        # Simulate a dangling FK — points to a non-existent DataConditionGroup row
-        Workflow.objects_for_deletion.filter(id=self.workflow.id).update(
-            when_condition_group_id=999999
-        )
-
-        self.ScheduledDeletion.schedule(instance=self.workflow, days=0)
-
-        with self.tasks():
-            run_scheduled_deletions()
-
-        assert not Workflow.objects_for_deletion.filter(id=self.workflow.id).exists()
-
     @pytest.mark.parametrize(
         "instance_attr",
         [
diff --git a/tests/sentry/incidents/endpoints/test_organization_alert_rule_index.py b/tests/sentry/incidents/endpoints/test_organization_alert_rule_index.py
index 83741624b328..7a60b6c1c222 100644
--- a/tests/sentry/incidents/endpoints/test_organization_alert_rule_index.py
+++ b/tests/sentry/incidents/endpoints/test_organization_alert_rule_index.py
@@ -99,7 +99,7 @@ def alert_rule_dict(self):
         return {
             "aggregate": "count()",
             "query": "",
-            "timeWindow": "5",
+            "timeWindow": "300",
             "resolveThreshold": 100,
             "thresholdType": 0,
             "triggers": [
@@ -2067,18 +2067,13 @@ def test_eap_alert_with_invalid_time_window(self) -> None:
         data = deepcopy(self.alert_rule_dict)
         data["dataset"] = "events_analytics_platform"
         data["alertType"] = "eap_metrics"
-
-        # Below the 5-minute floor
         data["timeWindow"] = 1
         with self.feature(["organizations:incidents", "organizations:performance-view"]):
             resp = self.get_error_response(self.organization.slug, status_code=400, **data)
-        assert "Invalid Time Window" in resp.data["nonFieldErrors"][0]
-
-        # Above the floor but not a valid granularity (7 minutes = 420 seconds)
-        data["timeWindow"] = 7
-        with self.feature(["organizations:incidents", "organizations:performance-view"]):
-            resp = self.get_error_response(self.organization.slug, status_code=400, **data)
-        assert "Invalid Time Window" in resp.data["nonFieldErrors"][0]
+        assert (
+            resp.data["nonFieldErrors"][0]
+            == "Invalid Time Window: Time window for this alert type must be at least 5 minutes."
+        )
 
     def test_transactions_dataset_deprecation_validation(self) -> None:
         data = deepcopy(self.alert_rule_dict)
diff --git a/tests/sentry/incidents/endpoints/test_serializers.py b/tests/sentry/incidents/endpoints/test_serializers.py
index bb751db874e7..c9b424e30c2e 100644
--- a/tests/sentry/incidents/endpoints/test_serializers.py
+++ b/tests/sentry/incidents/endpoints/test_serializers.py
@@ -171,23 +171,21 @@ def test_time_window(self) -> None:
         )
 
     def test_span_alert_time_window_validation(self) -> None:
-        base_params = self.valid_params.copy()
-        base_params["dataset"] = Dataset.EventsAnalyticsPlatform.value
-        base_params["event_types"] = [SnubaQueryEventType.EventType.TRACE_ITEM_SPAN.name.lower()]
-        base_params["query"] = "span.op:http.client"
-        base_params["aggregate"] = "count()"
-
-        # Below the 5-minute floor
-        base_params["time_window"] = 1
-        serializer = AlertRuleSerializer(context=self.context, data=base_params)
-        assert not serializer.is_valid()
-        assert "Invalid Time Window" in serializer.errors["nonFieldErrors"][0]
+        params = self.valid_params.copy()
+        params["dataset"] = Dataset.EventsAnalyticsPlatform.value
+        params["event_types"] = [SnubaQueryEventType.EventType.TRACE_ITEM_SPAN.name.lower()]
+        params["time_window"] = 1
+        params["query"] = "span.op:http.client"
+        params["aggregate"] = "count()"
 
-        # Above the floor but not a valid granularity (7 minutes = 420 seconds)
-        base_params["time_window"] = 7
-        serializer = AlertRuleSerializer(context=self.context, data=base_params)
-        assert not serializer.is_valid()
-        assert "Invalid Time Window" in serializer.errors["nonFieldErrors"][0]
+        self.run_fail_validation_test(
+            params,
+            {
+                "nonFieldErrors": [
+                    "Invalid Time Window: Time window for this alert type must be at least 5 minutes."
+                ]
+            },
+        )
 
     def test_dataset(self) -> None:
         invalid_values = ["Invalid dataset, valid values are %s" % [item.value for item in Dataset]]
diff --git a/tests/sentry/integrations/github/tasks/test_sync_repos.py b/tests/sentry/integrations/github/tasks/test_sync_repos.py
index bb1f14f74fb5..f6f224b0c737 100644
--- a/tests/sentry/integrations/github/tasks/test_sync_repos.py
+++ b/tests/sentry/integrations/github/tasks/test_sync_repos.py
@@ -8,12 +8,11 @@
 from sentry.constants import ObjectStatus
 from sentry.integrations.github.integration import GitHubIntegrationProvider
 from sentry.integrations.github.tasks.sync_repos import sync_repos_for_org
-from sentry.integrations.github_enterprise.integration import GitHubEnterpriseIntegrationProvider
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.models.auditlogentry import AuditLogEntry
 from sentry.models.repository import Repository
 from sentry.silo.base import SiloMode
-from sentry.testutils.cases import IntegrationTestCase, TestCase
+from sentry.testutils.cases import IntegrationTestCase
 from sentry.testutils.silo import assume_test_silo_mode, assume_test_silo_mode_of, control_silo_test
 
 
@@ -219,44 +218,3 @@ def test_rate_limited_raises_for_retry(self, _: MagicMock) -> None:
 
         with self.feature("organizations:github-repo-auto-sync"), pytest.raises(RetryTaskError):
             sync_repos_for_org(self.oi.id)
-
-
-@control_silo_test
-class SyncReposForOrgGHETestCase(TestCase):
-    @patch("sentry.integrations.github.client.GitHubBaseClient.get_repos")
-    def test_creates_new_repos_for_ghe(self, mock_get_repos: MagicMock) -> None:
-        GitHubEnterpriseIntegrationProvider().setup()
-
-        integration = self.create_integration(
-            organization=self.organization,
-            external_id="35.232.149.196:12345",
-            provider="github_enterprise",
-            metadata={
-                "domain_name": "35.232.149.196/testorg",
-                "installation_id": "12345",
-                "installation": {
-                    "id": "2",
-                    "private_key": "private_key",
-                    "verify_ssl": True,
-                },
-            },
-        )
-        oi = OrganizationIntegration.objects.get(
-            organization_id=self.organization.id, integration=integration
-        )
-
-        mock_get_repos.return_value = [
-            {"id": 1, "full_name": "testorg/repo1"},
-            {"id": 2, "full_name": "testorg/repo2"},
-        ]
-
-        with self.feature(
-            ["organizations:github-repo-auto-sync", "organizations:github-repo-auto-sync-apply"]
-        ):
-            sync_repos_for_org(oi.id)
-
-        with assume_test_silo_mode(SiloMode.CELL):
-            repos = Repository.objects.filter(organization_id=self.organization.id).order_by("name")
-
-        assert len(repos) == 2
-        assert repos[0].provider == "integrations:github_enterprise"
diff --git a/tests/sentry/integrations/github_enterprise/test_webhooks.py b/tests/sentry/integrations/github_enterprise/test_webhooks.py
index 849e25261f56..cbf5456cd32c 100644
--- a/tests/sentry/integrations/github_enterprise/test_webhooks.py
+++ b/tests/sentry/integrations/github_enterprise/test_webhooks.py
@@ -14,9 +14,6 @@
     PULL_REQUEST_OPENED_EVENT_EXAMPLE,
     PUSH_EVENT_EXAMPLE_INSTALLATION,
 )
-from sentry.integrations.github_enterprise.webhook import (
-    GitHubEnterpriseInstallationRepositoriesEventWebhook,
-)
 from sentry.integrations.services.integration import integration_service
 from sentry.models.commit import Commit
 from sentry.models.commitauthor import CommitAuthor
@@ -256,66 +253,6 @@ def test_missing_signature_fail_without_option_set(self, mock_installation: Magi
         assert b"Missing headers X-Hub-Signature-256 or X-Hub-Signature" in response.content
 
 
-@patch("sentry.integrations.github_enterprise.client.get_jwt")
-@patch("sentry.integrations.github_enterprise.webhook.get_installation_metadata")
-class InstallationRepositoriesEventWebhookTest(APITestCase):
-    def setUp(self) -> None:
-        self.url = "/extensions/github-enterprise/webhook/"
-        self.metadata = {
-            "url": "35.232.149.196",
-            "id": "2",
-            "name": "test-app",
-            "webhook_secret": "b3002c3e321d4b7880360d397db2ccfd",
-            "private_key": "private_key",
-            "verify_ssl": True,
-        }
-
-    @patch(
-        "sentry.integrations.github.tasks.sync_repos_on_install_change.sync_repos_on_install_change.apply_async"
-    )
-    def test_handler_dispatches_task_with_ghe_provider(
-        self,
-        mock_apply_async: MagicMock,
-        mock_get_installation_metadata: MagicMock,
-        mock_get_jwt: MagicMock,
-    ) -> None:
-        """Verify the GHE handler looks up integrations with the correct provider."""
-        mock_get_jwt.return_value = ""
-        mock_get_installation_metadata.return_value = self.metadata
-
-        integration = self.create_integration(
-            external_id="35.232.149.196:12345",
-            organization=self.project.organization,
-            provider="github_enterprise",
-            metadata={
-                "domain_name": "35.232.149.196/testorg",
-                "installation_id": "12345",
-                "installation": {
-                    "id": "2",
-                    "private_key": "private_key",
-                    "verify_ssl": True,
-                },
-            },
-        )
-
-        handler = GitHubEnterpriseInstallationRepositoriesEventWebhook()
-        handler(
-            event={
-                "installation": {"id": 12345},
-                "action": "added",
-                "repositories_added": [{"id": 1, "full_name": "testorg/repo", "private": False}],
-                "repositories_removed": [],
-                "repository_selection": "selected",
-                "sender": {"id": 1, "login": "testuser"},
-            },
-            host="35.232.149.196",
-        )
-
-        mock_apply_async.assert_called_once()
-        kwargs = mock_apply_async.call_args[1]["kwargs"]
-        assert kwargs["integration_id"] == integration.id
-
-
 @patch("sentry.integrations.github_enterprise.client.get_jwt")
 @patch("sentry.integrations.github_enterprise.webhook.get_installation_metadata")
 class PushEventWebhookTest(APITestCase):
diff --git a/tests/sentry/integrations/slack/tasks/test_tasks.py b/tests/sentry/integrations/slack/tasks/test_tasks.py
index 8972d1164126..e41771101536 100644
--- a/tests/sentry/integrations/slack/tasks/test_tasks.py
+++ b/tests/sentry/integrations/slack/tasks/test_tasks.py
@@ -16,10 +16,10 @@
 from sentry.integrations.slack.utils.channel import SlackChannelIdData
 from sentry.integrations.slack.utils.rule_status import RedisRuleStatus
 from sentry.models.rule import Rule
+from sentry.receivers.rules import DEFAULT_RULE_LABEL
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers import install_slack
 from sentry.testutils.skips import requires_snuba
-from sentry.workflow_engine.receivers.project_workflows import DEFAULT_RULE_LABEL
 from tests.sentry.integrations.slack.utils.test_mock_slack_response import mock_slack_response
 
 pytestmark = [requires_snuba]
@@ -192,9 +192,7 @@ def test_task_new_rule_with_owner(self, mock_set_value: MagicMock) -> None:
         with self.tasks():
             find_channel_id_for_rule(**data)
 
-        rule = Rule.objects.exclude(label__in=[DEFAULT_RULE_LABEL]).get(
-            project_id=self.project.id,
-        )
+        rule = Rule.objects.exclude(label__in=[DEFAULT_RULE_LABEL]).get(project_id=self.project.id)
         mock_set_value.assert_called_with("success", rule.id)
         assert rule.label == "New Rule with Owner"
         assert rule.owner_team_id == team.id
diff --git a/tests/sentry/integrations/slack/test_integration.py b/tests/sentry/integrations/slack/test_integration.py
index 48646b7a8a4e..6c324640dafb 100644
--- a/tests/sentry/integrations/slack/test_integration.py
+++ b/tests/sentry/integrations/slack/test_integration.py
@@ -1,13 +1,9 @@
-from __future__ import annotations
-
-from typing import Any
 from unittest.mock import MagicMock, patch
 from urllib.parse import parse_qs, urlencode, urlparse
 
 import orjson
 import pytest
 import responses
-from django.urls import reverse
 from responses.matchers import query_string_matcher
 from slack_sdk.errors import SlackApiError
 from slack_sdk.web import SlackResponse
@@ -15,7 +11,6 @@
 from sentry import audit_log
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
-from sentry.integrations.pipeline import IntegrationPipeline
 from sentry.integrations.slack import SlackIntegration, SlackIntegrationProvider
 from sentry.integrations.slack.utils.constants import SlackScope
 from sentry.integrations.slack.utils.users import SLACK_GET_USERS_PAGE_SIZE
@@ -663,114 +658,3 @@ def test_get_thread_history_error_returns_empty_list(
             channel_id=self.channel_id, thread_ts=self.thread_ts
         )
         assert result == []
-
-
-@control_silo_test
-class SlackApiPipelineTest(APITestCase):
-    endpoint = "sentry-api-0-organization-pipeline"
-    method = "post"
-
-    def setUp(self) -> None:
-        super().setUp()
-        self.login_as(self.user)
-
-    def tearDown(self) -> None:
-        responses.reset()
-        super().tearDown()
-
-    def _get_pipeline_url(self) -> str:
-        return reverse(
-            self.endpoint,
-            args=[self.organization.slug, IntegrationPipeline.pipeline_name],
-        )
-
-    def _initialize_pipeline(self) -> Any:
-        return self.client.post(
-            self._get_pipeline_url(),
-            data={"action": "initialize", "provider": "slack"},
-            format="json",
-        )
-
-    def _advance_step(self, data: dict[str, Any]) -> Any:
-        return self.client.post(self._get_pipeline_url(), data=data, format="json")
-
-    def _get_pipeline_signature(self, resp: Any) -> str:
-        return resp.data["data"]["oauthUrl"].split("state=")[1].split("&")[0]
-
-    @responses.activate
-    def test_initialize_pipeline(self) -> None:
-        resp = self._initialize_pipeline()
-        assert resp.status_code == 200
-        assert resp.data["step"] == "oauth_login"
-        assert resp.data["stepIndex"] == 0
-        assert resp.data["totalSteps"] == 1
-        assert resp.data["provider"] == "slack"
-        oauth_url = resp.data["data"]["oauthUrl"]
-        assert "slack.com/oauth/v2/authorize" in oauth_url
-        assert "user_scope=" in oauth_url
-
-        # Verify the OAuth URL requests the correct bot scopes, not the
-        # identity provider's default scopes
-        parsed = urlparse(oauth_url)
-        params = parse_qs(parsed.query)
-        requested_scopes = set(params["scope"][0].split(" "))
-        assert requested_scopes == SlackIntegrationProvider.identity_oauth_scopes
-
-    @responses.activate
-    def test_oauth_step_missing_code(self) -> None:
-        self._initialize_pipeline()
-        resp = self._advance_step({})
-        assert resp.status_code == 400
-
-    @responses.activate
-    @patch("sentry.integrations.slack.integration.WebClient")
-    def test_full_pipeline_flow(self, mock_web_client_cls: MagicMock) -> None:
-        mock_client = MagicMock()
-        mock_web_client_cls.return_value = mock_client
-        mock_client.team_info.return_value = SlackResponse(
-            client=mock_client,
-            http_verb="GET",
-            api_url="https://slack.com/api/team.info",
-            req_args={},
-            data={
-                "ok": True,
-                "team": {
-                    "name": "Test Team",
-                    "id": "T1234",
-                    "domain": "test-team",
-                    "icon": {"image_132": "https://example.com/icon.png"},
-                },
-            },
-            headers={},
-            status_code=200,
-        )
-
-        responses.add(
-            responses.POST,
-            "https://slack.com/api/oauth.v2.access",
-            json={
-                "ok": True,
-                "access_token": "xoxb-test-token",
-                "scope": "channels:read,chat:write",
-                "team": {"name": "Test Team", "id": "T1234"},
-                "authed_user": {"id": "U1234"},
-            },
-        )
-
-        resp = self._initialize_pipeline()
-        assert resp.data["step"] == "oauth_login"
-        pipeline_signature = self._get_pipeline_signature(resp)
-
-        resp = self._advance_step({"code": "slack-auth-code", "state": pipeline_signature})
-        assert resp.status_code == 200
-        assert resp.data["status"] == "complete"
-        assert "data" in resp.data
-
-        integration = Integration.objects.get(provider="slack")
-        assert integration.external_id == "T1234"
-        assert integration.name == "Test Team"
-
-        assert OrganizationIntegration.objects.filter(
-            organization_id=self.organization.id,
-            integration=integration,
-        ).exists()
diff --git a/tests/sentry/management/commands/test_generate_controlsilo_urls.py b/tests/sentry/management/commands/test_generate_controlsilo_urls.py
index 5c75cc3d235a..5fee6aa9ebf0 100644
--- a/tests/sentry/management/commands/test_generate_controlsilo_urls.py
+++ b/tests/sentry/management/commands/test_generate_controlsilo_urls.py
@@ -27,13 +27,9 @@ def test_render_text(self) -> None:
     def test_render_code(self) -> None:
         result = self.call_command(format="js")
         assert "new RegExp('^api/0/users/$')," in result
+        assert "new RegExp('^api/0/internal/integration-proxy/$')," in result
         assert "export const controlsiloUrlPatterns: RegExp[] = [" in result
 
-        assert "api/0/internal/org-cell-mappings" not in result
-        assert "api/0/internal/projectkey-cell-mappings" not in result
-        assert "api/0/internal/integration-proxy" not in result
-        assert "api/0/internal/rpc" not in result
-
     def test_write_file(self) -> None:
         with tempfile.NamedTemporaryFile() as tf:
             self.call_command(format="js", output=tf.name)
diff --git a/tests/sentry/preprod/snapshots/test_auto_approve.py b/tests/sentry/preprod/snapshots/test_auto_approve.py
deleted file mode 100644
index 310c3617dc9d..000000000000
--- a/tests/sentry/preprod/snapshots/test_auto_approve.py
+++ /dev/null
@@ -1,523 +0,0 @@
-from __future__ import annotations
-
-from unittest.mock import MagicMock
-
-import orjson
-
-from sentry.preprod.models import PreprodArtifact, PreprodComparisonApproval
-from sentry.preprod.snapshots.manifest import (
-    ComparisonImageResult,
-    ComparisonManifest,
-    ComparisonSummary,
-)
-from sentry.preprod.snapshots.models import PreprodSnapshotComparison, PreprodSnapshotMetrics
-from sentry.preprod.snapshots.tasks import (
-    ImageFingerprint,
-    _build_comparison_fingerprints,
-    _try_auto_approve_snapshot,
-)
-from sentry.testutils.cases import TestCase
-from sentry.testutils.silo import cell_silo_test
-
-
-class BuildComparisonFingerprintsTest(TestCase):
-    def _make_manifest(self, images: dict[str, ComparisonImageResult]) -> ComparisonManifest:
-        changed = sum(1 for i in images.values() if i.status == "changed")
-        added = sum(1 for i in images.values() if i.status == "added")
-        removed = sum(1 for i in images.values() if i.status == "removed")
-        errored = sum(1 for i in images.values() if i.status == "errored")
-        renamed = sum(1 for i in images.values() if i.status == "renamed")
-        unchanged = sum(1 for i in images.values() if i.status == "unchanged")
-        return ComparisonManifest(
-            head_artifact_id=1,
-            base_artifact_id=2,
-            summary=ComparisonSummary(
-                total=len(images),
-                changed=changed,
-                added=added,
-                removed=removed,
-                errored=errored,
-                renamed=renamed,
-                unchanged=unchanged,
-            ),
-            images=images,
-        )
-
-    def test_mixed_statuses(self):
-        manifest = self._make_manifest(
-            {
-                "unchanged.png": ComparisonImageResult(
-                    status="unchanged", head_hash="a", base_hash="a"
-                ),
-                "changed.png": ComparisonImageResult(
-                    status="changed", head_hash="b", base_hash="c"
-                ),
-                "added.png": ComparisonImageResult(status="added", head_hash="d"),
-                "removed.png": ComparisonImageResult(status="removed", base_hash="e"),
-                "errored.png": ComparisonImageResult(status="errored"),
-                "renamed.png": ComparisonImageResult(
-                    status="renamed", head_hash="f", previous_image_file_name="old.png"
-                ),
-            }
-        )
-        fps = _build_comparison_fingerprints(manifest)
-        assert fps == {
-            ImageFingerprint("changed.png", "changed", "b"),
-            ImageFingerprint("added.png", "added", "d"),
-            ImageFingerprint("removed.png", "removed"),
-            ImageFingerprint("errored.png", "errored"),
-            ImageFingerprint("renamed.png", "renamed", "f", "old.png"),
-        }
-
-    def test_empty_manifest_returns_empty_set(self):
-        manifest = self._make_manifest({})
-        fps = _build_comparison_fingerprints(manifest)
-        assert fps == set()
-
-    def test_skips_changed_with_missing_head_hash(self):
-        manifest = self._make_manifest(
-            {
-                "no_hash.png": ComparisonImageResult(status="changed", base_hash="abc"),
-                "has_hash.png": ComparisonImageResult(
-                    status="changed", head_hash="def", base_hash="ghi"
-                ),
-            }
-        )
-        fps = _build_comparison_fingerprints(manifest)
-        assert fps == {ImageFingerprint("has_hash.png", "changed", "def")}
-
-    def test_skips_renamed_with_missing_hash_or_previous_name(self):
-        manifest = self._make_manifest(
-            {
-                "no_hash.png": ComparisonImageResult(
-                    status="renamed", previous_image_file_name="old.png"
-                ),
-                "no_prev.png": ComparisonImageResult(status="renamed", head_hash="abc"),
-                "valid.png": ComparisonImageResult(
-                    status="renamed", head_hash="def", previous_image_file_name="old_valid.png"
-                ),
-            }
-        )
-        fps = _build_comparison_fingerprints(manifest)
-        assert fps == {ImageFingerprint("valid.png", "renamed", "def", "old_valid.png")}
-
-
-def _mock_session_with_manifests(manifests_by_key: dict[str, bytes]) -> MagicMock:
-    session = MagicMock()
-
-    def _get(key):
-        result = MagicMock()
-        if key in manifests_by_key:
-            result.payload.read.return_value = manifests_by_key[key]
-        else:
-            raise Exception(f"Key not found: {key}")
-        return result
-
-    session.get.side_effect = _get
-    return session
-
-
-@cell_silo_test
-class TryAutoApproveSnapshotTest(TestCase):
-    def setUp(self):
-        super().setUp()
-        self.organization = self.create_organization(owner=self.user)
-        self.project = self.create_project(organization=self.organization)
-
-    def _create_approved_sibling(
-        self,
-        pr_number: int,
-        comparison_images: dict,
-        app_id: str = "com.example.app",
-        build_configuration=None,
-    ) -> tuple[PreprodArtifact, str, bytes]:
-        cc = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=pr_number,
-            head_repo_name="owner/repo",
-        )
-        artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc,
-            app_id=app_id,
-            build_configuration=build_configuration,
-        )
-        head_metrics = PreprodSnapshotMetrics.objects.create(
-            preprod_artifact=artifact,
-            image_count=10,
-        )
-        base_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=self.create_commit_comparison(organization=self.organization),
-        )
-        base_metrics = PreprodSnapshotMetrics.objects.create(
-            preprod_artifact=base_artifact,
-            image_count=10,
-        )
-        comparison_key = f"{self.organization.id}/{self.project.id}/{artifact.id}/{base_artifact.id}/comparison.json"
-        PreprodSnapshotComparison.objects.create(
-            head_snapshot_metrics=head_metrics,
-            base_snapshot_metrics=base_metrics,
-            state=PreprodSnapshotComparison.State.SUCCESS,
-            images_changed=1,
-            extras={"comparison_key": comparison_key},
-        )
-        PreprodComparisonApproval.objects.create(
-            preprod_artifact=artifact,
-            preprod_feature_type=PreprodComparisonApproval.FeatureType.SNAPSHOTS,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        )
-
-        manifest = ComparisonManifest(
-            head_artifact_id=artifact.id,
-            base_artifact_id=base_artifact.id,
-            summary=ComparisonSummary(
-                total=len(comparison_images),
-                changed=sum(1 for i in comparison_images.values() if i.status == "changed"),
-                added=sum(1 for i in comparison_images.values() if i.status == "added"),
-                removed=sum(1 for i in comparison_images.values() if i.status == "removed"),
-                errored=sum(1 for i in comparison_images.values() if i.status == "errored"),
-                renamed=sum(1 for i in comparison_images.values() if i.status == "renamed"),
-                unchanged=sum(1 for i in comparison_images.values() if i.status == "unchanged"),
-            ),
-            images=comparison_images,
-        )
-        return artifact, comparison_key, orjson.dumps(manifest.dict())
-
-    def _create_head_manifest(self, images: dict) -> ComparisonManifest:
-        return ComparisonManifest(
-            head_artifact_id=999,
-            base_artifact_id=998,
-            summary=ComparisonSummary(
-                total=len(images),
-                changed=sum(1 for i in images.values() if i.status == "changed"),
-                added=sum(1 for i in images.values() if i.status == "added"),
-                removed=sum(1 for i in images.values() if i.status == "removed"),
-                errored=sum(1 for i in images.values() if i.status == "errored"),
-                renamed=sum(1 for i in images.values() if i.status == "renamed"),
-                unchanged=sum(1 for i in images.values() if i.status == "unchanged"),
-            ),
-            images=images,
-        )
-
-    def test_auto_approves_when_fingerprints_match(self):
-        shared_images = {
-            "screen1.png": ComparisonImageResult(
-                status="changed", head_hash="abc", base_hash="old1"
-            ),
-            "screen2.png": ComparisonImageResult(
-                status="unchanged", head_hash="same", base_hash="same"
-            ),
-        }
-        sibling, comp_key, comp_json = self._create_approved_sibling(
-            pr_number=42,
-            comparison_images=shared_images,
-        )
-
-        cc = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=42,
-            head_repo_name="owner/repo",
-        )
-        head_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc,
-            app_id="com.example.app",
-        )
-
-        head_manifest = self._create_head_manifest(
-            {
-                "screen1.png": ComparisonImageResult(
-                    status="changed", head_hash="abc", base_hash="new_base1"
-                ),
-                "screen2.png": ComparisonImageResult(
-                    status="unchanged", head_hash="same", base_hash="same"
-                ),
-                "screen3.png": ComparisonImageResult(
-                    status="unchanged", head_hash="extra", base_hash="extra"
-                ),
-            }
-        )
-
-        session = _mock_session_with_manifests({comp_key: comp_json})
-        _try_auto_approve_snapshot(head_artifact, head_manifest, session)
-
-        approval = PreprodComparisonApproval.objects.get(
-            preprod_artifact=head_artifact,
-            preprod_feature_type=PreprodComparisonApproval.FeatureType.SNAPSHOTS,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        )
-        assert approval.approved_by_id is None
-        assert approval.approved_at is not None
-        assert approval.extras is not None
-        assert approval.extras["auto_approval"] is True
-        assert approval.extras["prev_approved_artifact_id"] == sibling.id
-
-    def test_no_auto_approve_when_fingerprints_differ(self):
-        sibling_images = {
-            "screen1.png": ComparisonImageResult(
-                status="changed", head_hash="abc", base_hash="old1"
-            ),
-        }
-        _, comp_key, comp_json = self._create_approved_sibling(
-            pr_number=42,
-            comparison_images=sibling_images,
-        )
-
-        cc = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=42,
-            head_repo_name="owner/repo",
-        )
-        head_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc,
-            app_id="com.example.app",
-        )
-
-        head_manifest = self._create_head_manifest(
-            {
-                "screen1.png": ComparisonImageResult(
-                    status="changed", head_hash="DIFFERENT", base_hash="old1"
-                ),
-            }
-        )
-
-        session = _mock_session_with_manifests({comp_key: comp_json})
-        _try_auto_approve_snapshot(head_artifact, head_manifest, session)
-
-        assert not PreprodComparisonApproval.objects.filter(
-            preprod_artifact=head_artifact,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        ).exists()
-
-    def test_no_auto_approve_when_no_pr_number(self):
-        cc = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=None,
-        )
-        head_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc,
-        )
-        head_manifest = self._create_head_manifest(
-            {
-                "screen1.png": ComparisonImageResult(status="changed", head_hash="abc"),
-            }
-        )
-        session = MagicMock()
-        _try_auto_approve_snapshot(head_artifact, head_manifest, session)
-        assert not PreprodComparisonApproval.objects.filter(
-            preprod_artifact=head_artifact,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        ).exists()
-
-    def test_no_auto_approve_when_no_approved_sibling(self):
-        cc = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=42,
-            head_repo_name="owner/repo",
-        )
-        head_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc,
-            app_id="com.example.app",
-        )
-        head_manifest = self._create_head_manifest(
-            {
-                "screen1.png": ComparisonImageResult(status="changed", head_hash="abc"),
-            }
-        )
-        session = MagicMock()
-        _try_auto_approve_snapshot(head_artifact, head_manifest, session)
-        assert not PreprodComparisonApproval.objects.filter(
-            preprod_artifact=head_artifact,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        ).exists()
-
-    def test_no_auto_approve_when_no_changes(self):
-        cc = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=42,
-            head_repo_name="owner/repo",
-        )
-        head_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc,
-        )
-        head_manifest = self._create_head_manifest(
-            {
-                "screen1.png": ComparisonImageResult(
-                    status="unchanged", head_hash="a", base_hash="a"
-                ),
-            }
-        )
-        session = MagicMock()
-        _try_auto_approve_snapshot(head_artifact, head_manifest, session)
-        assert not PreprodComparisonApproval.objects.filter(
-            preprod_artifact=head_artifact,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        ).exists()
-
-    def test_handles_missing_comparison_manifest(self):
-        sibling_images = {
-            "screen1.png": ComparisonImageResult(
-                status="changed", head_hash="abc", base_hash="old1"
-            ),
-        }
-        _, comp_key, _ = self._create_approved_sibling(
-            pr_number=42,
-            comparison_images=sibling_images,
-        )
-
-        cc = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=42,
-            head_repo_name="owner/repo",
-        )
-        head_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc,
-            app_id="com.example.app",
-        )
-        head_manifest = self._create_head_manifest(
-            {
-                "screen1.png": ComparisonImageResult(status="changed", head_hash="abc"),
-            }
-        )
-
-        session = MagicMock()
-        session.get.side_effect = Exception("Not found")
-        _try_auto_approve_snapshot(head_artifact, head_manifest, session)
-        assert not PreprodComparisonApproval.objects.filter(
-            preprod_artifact=head_artifact,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        ).exists()
-
-    def test_matches_on_app_id_and_build_config(self):
-        shared_images = {
-            "screen1.png": ComparisonImageResult(
-                status="changed", head_hash="abc", base_hash="old1"
-            ),
-        }
-        self._create_approved_sibling(
-            pr_number=42,
-            comparison_images=shared_images,
-            app_id="com.other.app",
-        )
-
-        cc = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=42,
-            head_repo_name="owner/repo",
-        )
-        head_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc,
-            app_id="com.example.app",
-        )
-        head_manifest = self._create_head_manifest(
-            {
-                "screen1.png": ComparisonImageResult(status="changed", head_hash="abc"),
-            }
-        )
-        session = MagicMock()
-        _try_auto_approve_snapshot(head_artifact, head_manifest, session)
-        assert not PreprodComparisonApproval.objects.filter(
-            preprod_artifact=head_artifact,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        ).exists()
-
-    def test_no_auto_approve_when_sibling_not_approved_for_snapshots(self):
-        cc = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=42,
-            head_repo_name="owner/repo",
-        )
-        sibling = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc,
-            app_id="com.example.app",
-        )
-        head_metrics = PreprodSnapshotMetrics.objects.create(
-            preprod_artifact=sibling,
-            image_count=10,
-        )
-        base_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=self.create_commit_comparison(organization=self.organization),
-        )
-        base_metrics = PreprodSnapshotMetrics.objects.create(
-            preprod_artifact=base_artifact,
-            image_count=10,
-        )
-        PreprodSnapshotComparison.objects.create(
-            head_snapshot_metrics=head_metrics,
-            base_snapshot_metrics=base_metrics,
-            state=PreprodSnapshotComparison.State.SUCCESS,
-            images_changed=1,
-        )
-        PreprodComparisonApproval.objects.create(
-            preprod_artifact=sibling,
-            preprod_feature_type=PreprodComparisonApproval.FeatureType.SIZE,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        )
-
-        cc2 = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=42,
-            head_repo_name="owner/repo",
-        )
-        head_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc2,
-            app_id="com.example.app",
-        )
-        head_manifest = self._create_head_manifest(
-            {
-                "screen1.png": ComparisonImageResult(status="changed", head_hash="abc"),
-            }
-        )
-        session = MagicMock()
-        _try_auto_approve_snapshot(head_artifact, head_manifest, session)
-        assert not PreprodComparisonApproval.objects.filter(
-            preprod_artifact=head_artifact,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        ).exists()
-
-    def test_auto_approves_with_renamed_images(self):
-        shared_images = {
-            "new_name.png": ComparisonImageResult(
-                status="renamed", head_hash="abc", previous_image_file_name="old_name.png"
-            ),
-        }
-        _, comp_key, comp_json = self._create_approved_sibling(
-            pr_number=42,
-            comparison_images=shared_images,
-        )
-
-        cc = self.create_commit_comparison(
-            organization=self.organization,
-            pr_number=42,
-            head_repo_name="owner/repo",
-        )
-        head_artifact = self.create_preprod_artifact(
-            project=self.project,
-            commit_comparison=cc,
-            app_id="com.example.app",
-        )
-
-        head_manifest = self._create_head_manifest(
-            {
-                "new_name.png": ComparisonImageResult(
-                    status="renamed", head_hash="abc", previous_image_file_name="old_name.png"
-                ),
-            }
-        )
-
-        session = _mock_session_with_manifests({comp_key: comp_json})
-        _try_auto_approve_snapshot(head_artifact, head_manifest, session)
-        assert PreprodComparisonApproval.objects.filter(
-            preprod_artifact=head_artifact,
-            approval_status=PreprodComparisonApproval.ApprovalStatus.APPROVED,
-        ).exists()
diff --git a/tests/sentry/preprod/vcs/pr_comments/test_templates.py b/tests/sentry/preprod/vcs/pr_comments/test_templates.py
index f0728211158c..9aa229f360a6 100644
--- a/tests/sentry/preprod/vcs/pr_comments/test_templates.py
+++ b/tests/sentry/preprod/vcs/pr_comments/test_templates.py
@@ -56,7 +56,7 @@ def _create_artifact(
     def test_single_ios_artifact(self) -> None:
         artifact = self._create_artifact()
 
-        result = format_pr_comment([artifact], project=self.project)
+        result = format_pr_comment([artifact])
 
         assert "## Sentry Build Distribution" in result
         assert "| App Name | App ID | Version | Configuration | Install Page |" in result
@@ -74,7 +74,7 @@ def test_single_android_artifact(self) -> None:
             app_name="AndroidApp",
         )
 
-        result = format_pr_comment([artifact], project=self.project)
+        result = format_pr_comment([artifact])
 
         assert "AndroidApp" in result
         assert "### Android" not in result
@@ -87,21 +87,13 @@ def test_multiple_platforms_shows_subheaders(self) -> None:
             app_name="AndroidApp",
         )
 
-        result = format_pr_comment([ios_artifact, android_artifact], project=self.project)
+        result = format_pr_comment([ios_artifact, android_artifact])
 
         assert "### iOS" in result
         assert "### Android" in result
         assert "iOSApp" in result
         assert "AndroidApp" in result
 
-    def test_settings_link(self) -> None:
-        artifact = self._create_artifact()
-
-        result = format_pr_comment([artifact], project=self.project)
-
-        assert f"[Configure {self.project.name} build distribution settings](" in result
-        assert f"/settings/projects/{self.project.slug}/mobile-builds/?tab=distribution" in result
-
     def test_empty_list_raises(self) -> None:
         with pytest.raises(ValueError, match="No installable artifacts"):
-            format_pr_comment([], project=self.project)
+            format_pr_comment([])
diff --git a/tests/sentry/receivers/test_featureadoption.py b/tests/sentry/receivers/test_featureadoption.py
index 4a39b5b7db04..8af0c697c197 100644
--- a/tests/sentry/receivers/test_featureadoption.py
+++ b/tests/sentry/receivers/test_featureadoption.py
@@ -6,6 +6,7 @@
 from sentry.models.rule import Rule
 from sentry.plugins.bases.issue2 import IssueTrackingPlugin2
 from sentry.plugins.bases.notify import NotificationPlugin
+from sentry.receivers.rules import DEFAULT_RULE_DATA
 from sentry.signals import (
     advanced_search,
     alert_rule_created,
@@ -23,7 +24,6 @@
     user_feedback_received,
 )
 from sentry.testutils.cases import SnubaTestCase, TestCase
-from sentry.workflow_engine.receivers.project_workflows import DEFAULT_RULE_DATA
 
 
 class FeatureAdoptionTest(TestCase, SnubaTestCase):
diff --git a/tests/sentry/receivers/test_onboarding.py b/tests/sentry/receivers/test_onboarding.py
index 90b6c9939c6e..7162c7c16609 100644
--- a/tests/sentry/receivers/test_onboarding.py
+++ b/tests/sentry/receivers/test_onboarding.py
@@ -33,6 +33,7 @@
 )
 from sentry.models.project import Project
 from sentry.models.rule import Rule
+from sentry.receivers.rules import DEFAULT_RULE_LABEL
 from sentry.signals import (
     alert_rule_created,
     event_processed,
@@ -58,7 +59,6 @@
 from sentry.testutils.skips import requires_snuba
 from sentry.utils.event import has_event_minified_stack_trace
 from sentry.utils.samples import load_data
-from sentry.workflow_engine.defaults.workflows import DEFAULT_WORKFLOW_LABEL
 from sentry.workflow_engine.models import Workflow
 from sentry.workflow_engine.models.detector import Detector
 from sentry.workflow_engine.models.detector_workflow import DetectorWorkflow
@@ -168,24 +168,11 @@ def test_project_created__default_workflow(self) -> None:
         project = self.create_project(fire_project_created=True)
 
         assert Rule.objects.filter(project=project).exists()
-        workflow = Workflow.objects.get(
-            organization=project.organization,
-            name=DEFAULT_WORKFLOW_LABEL,
-        )
+        workflow = Workflow.objects.get(organization=project.organization, name=DEFAULT_RULE_LABEL)
 
         assert Detector.objects.filter(project=project, type=ErrorGroupType.slug).count() == 1
-
-        issue_stream_detectors = Detector.objects.filter(
-            project=project,
-            type=IssueStreamGroupType.slug,
-        )
-
-        assert len(issue_stream_detectors) == 1
-
-        # Ensure we have 1 connection to the issue stream, this triggers for both monitors above.
-        result_connections = DetectorWorkflow.objects.filter(workflow=workflow)
-        assert result_connections.count() == 1
-        assert result_connections[0].detector_id == issue_stream_detectors[0].id
+        assert Detector.objects.filter(project=project, type=IssueStreamGroupType.slug).count() == 1
+        assert DetectorWorkflow.objects.filter(workflow=workflow).count() == 2
 
     @patch("sentry.analytics.record", wraps=record)
     def test_project_created_with_origin(self, record_analytics: MagicMock) -> None:
diff --git a/tests/sentry/runner/commands/test_cleanup.py b/tests/sentry/runner/commands/test_cleanup.py
index 5bea5b2d1823..dd68699eca0f 100644
--- a/tests/sentry/runner/commands/test_cleanup.py
+++ b/tests/sentry/runner/commands/test_cleanup.py
@@ -9,7 +9,6 @@
 from sentry.constants import ObjectStatus
 from sentry.models.files.file import File
 from sentry.models.group import Group
-from sentry.models.groupopenperiodactivity import GroupOpenPeriodActivity
 from sentry.runner.commands.cleanup import (
     _cleanup,
     generate_bulk_query_deletes,
@@ -235,15 +234,13 @@ def test_project_id_passed_to_task_queue(self) -> None:
 
 
 class RemoveCrossProjectBulkQueryModelsTest(TestCase):
-    def test_removes_cross_project_models(self) -> None:
+    def test_removes_workflow_fire_history(self) -> None:
         bulk_query_deletes = generate_bulk_query_deletes()
         models_before = {m for m, _, _ in bulk_query_deletes}
-        assert GroupOpenPeriodActivity in models_before
         assert WorkflowFireHistory in models_before
 
         remove_cross_project_bulk_query_models(bulk_query_deletes)
         models_after = {m for m, _, _ in bulk_query_deletes}
-        assert GroupOpenPeriodActivity not in models_after
         assert WorkflowFireHistory not in models_after
 
 
diff --git a/tests/sentry/scm/unit/private/test_ipc.py b/tests/sentry/scm/unit/private/test_ipc.py
index 6ddb3b3590b8..4c4c1bf03b96 100644
--- a/tests/sentry/scm/unit/private/test_ipc.py
+++ b/tests/sentry/scm/unit/private/test_ipc.py
@@ -3,7 +3,6 @@
 import msgspec
 import pytest
 
-from sentry.scm.errors import SCMProviderEventNotSupported
 from sentry.scm.private.event_stream import SourceCodeManagerEventStream
 from sentry.scm.private.ipc import (
     AuthorParser,
@@ -775,7 +774,6 @@ def mock_produce(message, event_type_hint, listener_name, silo):
         "type": "github",
     }
 
-    with pytest.raises(SCMProviderEventNotSupported):
+    with mock.patch("sentry.scm.private.ipc.deserialize_raw_event", lambda e: None):
         produce_to_listeners(subscription_event, "region", mock_produce)
-
-    assert len(produced_messages) == 0
+        assert len(produced_messages) == 0
diff --git a/tests/sentry/scm/unit/test_stream_producer.py b/tests/sentry/scm/unit/test_stream_producer.py
index 3cb891f51556..dbfe97c4d627 100644
--- a/tests/sentry/scm/unit/test_stream_producer.py
+++ b/tests/sentry/scm/unit/test_stream_producer.py
@@ -54,7 +54,7 @@ def record_count(k, a, t):
         (
             "sentry.scm.produce_event_to_scm_stream.failed",
             1,
-            {"reason": "provider-not-supported", "provider": event["type"]},
+            {"reason": "not-supported", "provider": event["type"]},
         )
     ]
 
diff --git a/tests/sentry/seer/autofix/test_issue_summary.py b/tests/sentry/seer/autofix/test_issue_summary.py
index 548b83ebe7c1..05ea097c4e69 100644
--- a/tests/sentry/seer/autofix/test_issue_summary.py
+++ b/tests/sentry/seer/autofix/test_issue_summary.py
@@ -960,14 +960,14 @@ def setUp(self) -> None:
         event_data = load_data("python")
         self.event = self.store_event(data=event_data, project_id=self.project.id)
 
-    @patch("sentry.seer.autofix.issue_summary.trigger_explorer_lightweight_rca")
+    @patch("sentry.seer.autofix.issue_summary.trigger_lightweight_rca")
     @patch("sentry.seer.autofix.issue_summary.trigger_autofix_explorer", return_value=42)
     def test_lightweight_rca_called_on_explorer_path(
         self,
         mock_explorer,
-        mock_explorer_lightweight_rca,
+        mock_lightweight_rca,
     ):
-        """trigger_explorer_lightweight_rca is called when the explorer path is taken"""
+        """trigger_lightweight_rca is called when the explorer path is taken"""
         _trigger_autofix_task(
             group_id=self.group.id,
             event_id=self.event.event_id,
@@ -976,18 +976,18 @@ def test_lightweight_rca_called_on_explorer_path(
         )
 
         mock_explorer.assert_called_once()
-        mock_explorer_lightweight_rca.assert_called_once_with(self.group)
+        mock_lightweight_rca.assert_called_once_with(self.group)
 
-    @patch("sentry.seer.autofix.issue_summary.trigger_explorer_lightweight_rca")
+    @patch("sentry.seer.autofix.issue_summary.trigger_lightweight_rca")
     @patch(
         "sentry.seer.autofix.issue_summary.trigger_autofix", return_value=Mock(data={"run_id": 42})
     )
     def test_lightweight_rca_not_called_on_legacy_path(
         self,
         mock_autofix,
-        mock_explorer_lightweight_rca,
+        mock_lightweight_rca,
     ):
-        """trigger_explorer_lightweight_rca is NOT called on the legacy autofix path"""
+        """trigger_lightweight_rca is NOT called on the legacy autofix path"""
         with self.feature(
             {
                 "organizations:seer-explorer": False,
@@ -1002,17 +1002,17 @@ def test_lightweight_rca_not_called_on_legacy_path(
             )
 
         mock_autofix.assert_called_once()
-        mock_explorer_lightweight_rca.assert_not_called()
+        mock_lightweight_rca.assert_not_called()
 
-    @patch("sentry.seer.autofix.issue_summary.trigger_explorer_lightweight_rca")
+    @patch("sentry.seer.autofix.issue_summary.trigger_lightweight_rca")
     @patch("sentry.seer.autofix.issue_summary.trigger_autofix_explorer", return_value=42)
     def test_lightweight_rca_failure_does_not_block_explorer(
         self,
         mock_explorer,
-        mock_explorer_lightweight_rca,
+        mock_lightweight_rca,
     ):
-        """Failure in trigger_explorer_lightweight_rca doesn't prevent the explorer autofix from completing"""
-        mock_explorer_lightweight_rca.side_effect = Exception("lightweight RCA failed")
+        """Failure in trigger_lightweight_rca doesn't prevent the explorer autofix from completing"""
+        mock_lightweight_rca.side_effect = Exception("lightweight RCA failed")
 
         _trigger_autofix_task(
             group_id=self.group.id,
@@ -1022,7 +1022,7 @@ def test_lightweight_rca_failure_does_not_block_explorer(
         )
 
         mock_explorer.assert_called_once()
-        mock_explorer_lightweight_rca.assert_called_once_with(self.group)
+        mock_lightweight_rca.assert_called_once_with(self.group)
 
 
 class TestFetchUserPreference:
diff --git a/tests/sentry/seer/endpoints/test_group_ai_autofix.py b/tests/sentry/seer/endpoints/test_group_ai_autofix.py
index 9df8e7a22516..e892e451bf05 100644
--- a/tests/sentry/seer/endpoints/test_group_ai_autofix.py
+++ b/tests/sentry/seer/endpoints/test_group_ai_autofix.py
@@ -940,35 +940,6 @@ def test_stopping_point(self, mock_trigger_explorer):
                 run_id=None,
                 intelligence_level="low",
                 user_context=None,
-                insert_index=None,
-            )
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.trigger_autofix_explorer")
-    def test_insert_index_passed_through(self, mock_trigger_explorer):
-        """POST passes insert_index to trigger_autofix_explorer for retry-from-step."""
-        for flag in EXPLORER_FLAGS:
-            mock_trigger_explorer.reset_mock()
-            group = self.create_group()
-            mock_trigger_explorer.return_value = 123
-
-            self.login_as(user=self.user)
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={"step": "solution", "run_id": 42, "insert_index": 3},
-                    format="json",
-                )
-
-            assert response.status_code == 202, f"Failed for {flag}: {response.data}"
-            mock_trigger_explorer.assert_called_once_with(
-                group=group,
-                step=AutofixStep.SOLUTION,
-                referrer=AutofixReferrer.GROUP_AUTOFIX_ENDPOINT,
-                stopping_point=None,
-                run_id=42,
-                intelligence_level="low",
-                user_context=None,
-                insert_index=3,
             )
 
     @patch("sentry.seer.autofix.autofix._call_autofix")
diff --git a/tests/sentry/seer/endpoints/test_organization_seer_explorer_chat.py b/tests/sentry/seer/endpoints/test_organization_seer_explorer_chat.py
index a72dc1bfddde..0cffcbd03e37 100644
--- a/tests/sentry/seer/endpoints/test_organization_seer_explorer_chat.py
+++ b/tests/sentry/seer/endpoints/test_organization_seer_explorer_chat.py
@@ -252,7 +252,7 @@ def test_post_json_on_page_context_converted_to_markdown(
         assert response.status_code == 200
         call_kwargs = mock_client.start_run.call_args[1]
         context = call_kwargs["on_page_context"]
-        assert "# Dashboard" in context
+        assert "# dashboard" in context
         assert '- **title**: "My Dashboard"' in context
 
     @patch("sentry.seer.endpoints.organization_seer_explorer_chat.SeerExplorerClient")
diff --git a/tests/sentry/seer/explorer/test_client_utils.py b/tests/sentry/seer/explorer/test_client_utils.py
index 83d107f92da4..2bb873038e36 100644
--- a/tests/sentry/seer/explorer/test_client_utils.py
+++ b/tests/sentry/seer/explorer/test_client_utils.py
@@ -200,7 +200,7 @@ def test_single_node(self) -> None:
             ],
         }
         result = snapshot_to_markdown(snapshot)
-        assert "# Dashboard" in result
+        assert "# dashboard" in result
         assert '- **title**: "Backend Health"' in result
         assert "- **widgetCount**: 3" in result
 
@@ -228,9 +228,9 @@ def test_nested_nodes(self) -> None:
             ],
         }
         result = snapshot_to_markdown(snapshot)
-        assert "# Dashboard" in result
-        assert "## Widget" in result
-        assert "### Chart" in result
+        assert "# dashboard" in result
+        assert "## widget" in result
+        assert "### chart" in result
         assert '- **query**: "count()"' in result
 
     def test_empty_nodes(self) -> None:
@@ -242,7 +242,7 @@ def test_node_with_no_data(self) -> None:
             "nodes": [{"nodeType": "dashboard", "data": None, "children": []}],
         }
         result = snapshot_to_markdown(snapshot)
-        assert "# Dashboard" in result
+        assert "# dashboard" in result
         assert "not an exact screenshot" in result
 
     def test_node_with_non_dict_data(self) -> None:
@@ -251,5 +251,5 @@ def test_node_with_non_dict_data(self) -> None:
             "nodes": [{"nodeType": "widget", "data": "some string", "children": []}],
         }
         result = snapshot_to_markdown(snapshot)
-        assert "# Widget" in result
+        assert "# widget" in result
         assert '- "some string"' in result
diff --git a/tests/sentry/seer/supergroups/endpoints/test_organization_supergroups_by_group.py b/tests/sentry/seer/supergroups/endpoints/test_organization_supergroups_by_group.py
index 4419d8246028..7f239d45207e 100644
--- a/tests/sentry/seer/supergroups/endpoints/test_organization_supergroups_by_group.py
+++ b/tests/sentry/seer/supergroups/endpoints/test_organization_supergroups_by_group.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from typing import Any
 from unittest.mock import MagicMock, patch
 
 import orjson
@@ -9,7 +8,7 @@
 from sentry.testutils.cases import APITestCase
 
 
-def mock_seer_response(data: dict[str, Any]) -> MagicMock:
+def mock_seer_response(data):
     response = MagicMock()
     response.status = 200
     response.data = orjson.dumps(data)
@@ -30,41 +29,18 @@ def setUp(self):
     @patch(
         "sentry.seer.supergroups.endpoints.organization_supergroups_by_group.make_supergroups_get_by_group_ids_request"
     )
-    def test_status_filter_strips_resolved_from_response(self, mock_seer):
-        extra_unresolved = self.create_group(project=self.project, status=GroupStatus.UNRESOLVED)
-        mock_seer.return_value = mock_seer_response(
-            {
-                "data": [
-                    {
-                        "id": 1,
-                        "group_ids": [
-                            self.unresolved_group.id,
-                            self.resolved_group.id,
-                            extra_unresolved.id,
-                        ],
-                        "title": "kept",
-                    },
-                    {
-                        "id": 2,
-                        "group_ids": [self.resolved_group.id],
-                        "title": "dropped",
-                    },
-                ]
-            }
-        )
+    def test_status_filter(self, mock_seer):
+        mock_seer.return_value = mock_seer_response({"supergroups": []})
 
         with self.feature("organizations:top-issues-ui"):
-            response = self.get_success_response(
+            self.get_success_response(
                 self.organization.slug,
                 group_id=[self.unresolved_group.id, self.resolved_group.id],
                 status="unresolved",
             )
 
-        assert len(response.data["data"]) == 1
-        assert response.data["data"][0]["group_ids"] == [
-            self.unresolved_group.id,
-            extra_unresolved.id,
-        ]
+        body = mock_seer.call_args[0][0]
+        assert body["group_ids"] == [self.unresolved_group.id]
 
     def test_status_filter_invalid(self):
         with self.feature("organizations:top-issues-ui"):
@@ -74,3 +50,12 @@ def test_status_filter_invalid(self):
                 status="bogus",
                 status_code=400,
             )
+
+    def test_status_filter_all_filtered_out(self):
+        with self.feature("organizations:top-issues-ui"):
+            self.get_error_response(
+                self.organization.slug,
+                group_id=[self.resolved_group.id],
+                status="unresolved",
+                status_code=404,
+            )
diff --git a/tests/sentry/seer/supergroups/test_explorer_lightweight_rca.py b/tests/sentry/seer/supergroups/test_lightweight_rca.py
similarity index 76%
rename from tests/sentry/seer/supergroups/test_explorer_lightweight_rca.py
rename to tests/sentry/seer/supergroups/test_lightweight_rca.py
index e3c054468406..9d5033ae8ea9 100644
--- a/tests/sentry/seer/supergroups/test_explorer_lightweight_rca.py
+++ b/tests/sentry/seer/supergroups/test_lightweight_rca.py
@@ -1,10 +1,10 @@
 from unittest.mock import MagicMock, patch
 
-from sentry.seer.supergroups.explorer_lightweight_rca import trigger_explorer_lightweight_rca
+from sentry.seer.supergroups.lightweight_rca import trigger_lightweight_rca
 from sentry.testutils.cases import TestCase
 
 
-class TestTriggerExplorerLightweightRca(TestCase):
+class TestTriggerLightweightRca(TestCase):
     def setUp(self) -> None:
         super().setUp()
         self.user = self.create_user()
@@ -13,18 +13,18 @@ def setUp(self) -> None:
         self.group = self.create_group(project=self.project)
 
     def test_returns_none_when_feature_flag_off(self) -> None:
-        run_id = trigger_explorer_lightweight_rca(self.group)
+        run_id = trigger_lightweight_rca(self.group)
 
         assert run_id is None
 
-    @patch("sentry.seer.supergroups.explorer_lightweight_rca.SeerExplorerClient")
+    @patch("sentry.seer.supergroups.lightweight_rca.SeerExplorerClient")
     def test_creates_client_with_correct_params(self, mock_client_cls):
         mock_client = MagicMock()
         mock_client.start_run.return_value = 42
         mock_client_cls.return_value = mock_client
 
         with self.feature("projects:supergroup-lightweight-rca"):
-            run_id = trigger_explorer_lightweight_rca(self.group)
+            run_id = trigger_lightweight_rca(self.group)
 
         assert run_id == 42
         mock_client_cls.assert_called_once()
@@ -38,14 +38,14 @@ def test_creates_client_with_correct_params(self, mock_client_cls):
         assert kwargs["category_key"] == "lightweight_rca"
         assert kwargs["category_value"] == str(self.group.id)
 
-    @patch("sentry.seer.supergroups.explorer_lightweight_rca.SeerExplorerClient")
+    @patch("sentry.seer.supergroups.lightweight_rca.SeerExplorerClient")
     def test_start_run_called_with_correct_params(self, mock_client_cls):
         mock_client = MagicMock()
         mock_client.start_run.return_value = 42
         mock_client_cls.return_value = mock_client
 
         with self.feature("projects:supergroup-lightweight-rca"):
-            trigger_explorer_lightweight_rca(self.group)
+            trigger_lightweight_rca(self.group)
 
         mock_client.start_run.assert_called_once()
         kwargs = mock_client.start_run.call_args[1]
@@ -54,11 +54,11 @@ def test_start_run_called_with_correct_params(self, mock_client_cls):
         assert kwargs["metadata"] == {"group_id": self.group.id}
         assert "root cause" in kwargs["prompt"].lower()
 
-    @patch("sentry.seer.supergroups.explorer_lightweight_rca.SeerExplorerClient")
+    @patch("sentry.seer.supergroups.lightweight_rca.SeerExplorerClient")
     def test_returns_none_on_error(self, mock_client_cls):
         mock_client_cls.side_effect = Exception("connection failed")
 
         with self.feature("projects:supergroup-lightweight-rca"):
-            run_id = trigger_explorer_lightweight_rca(self.group)
+            run_id = trigger_lightweight_rca(self.group)
 
         assert run_id is None
diff --git a/tests/sentry/seer/supergroups/test_lightweight_rca_cluster.py b/tests/sentry/seer/supergroups/test_lightweight_rca_cluster.py
deleted file mode 100644
index 956c3df75ff7..000000000000
--- a/tests/sentry/seer/supergroups/test_lightweight_rca_cluster.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from unittest.mock import patch
-
-import pytest
-
-from sentry.seer.supergroups.lightweight_rca_cluster import trigger_lightweight_rca_cluster
-from sentry.testutils.cases import TestCase
-
-
-class TriggerLightweightRCAClusterTest(TestCase):
-    def setUp(self):
-        super().setUp()
-        self.event = self.store_event(
-            data={"message": "test error", "level": "error"},
-            project_id=self.project.id,
-        )
-        self.group = self.event.group
-
-    @patch("sentry.seer.supergroups.lightweight_rca_cluster.make_lightweight_rca_cluster_request")
-    def test_calls_seer_with_correct_payload(self, mock_request):
-        mock_request.return_value.status = 200
-
-        trigger_lightweight_rca_cluster(self.group)
-
-        mock_request.assert_called_once()
-        body = mock_request.call_args.args[0]
-        assert body["group_id"] == self.group.id
-        assert body["organization_id"] == self.group.organization.id
-        assert body["organization_slug"] == self.group.organization.slug
-        assert body["project_id"] == self.group.project.id
-        assert body["issue"]["id"] == self.group.id
-        assert body["issue"]["title"] == self.group.title
-        assert "events" in body["issue"]
-        assert len(body["issue"]["events"]) == 1
-
-    @patch("sentry.seer.supergroups.lightweight_rca_cluster.make_lightweight_rca_cluster_request")
-    def test_raises_on_seer_error(self, mock_request):
-        mock_request.return_value.status = 500
-
-        with pytest.raises(Exception):
-            trigger_lightweight_rca_cluster(self.group)
diff --git a/tests/sentry/spans/consumers/process_segments/test_message.py b/tests/sentry/spans/consumers/process_segments/test_message.py
index 9c69f0b0e196..8edc17ff8829 100644
--- a/tests/sentry/spans/consumers/process_segments/test_message.py
+++ b/tests/sentry/spans/consumers/process_segments/test_message.py
@@ -405,45 +405,6 @@ def test_no_skip_enrichment_for_other_project(self, mock_enrich: mock.MagicMock)
 
         mock_enrich.assert_called_once()
 
-    @mock.patch(
-        "sentry.spans.consumers.process_segments.message.TreeEnricher.enrich_spans",
-        wraps=None,
-    )
-    def test_skip_enrichment_flag(self, mock_enrich: mock.MagicMock) -> None:
-        """Test that enrichment is skipped when skip_enrichment=True is passed."""
-        segment_span = build_mock_span(
-            project_id=self.project.id,
-            is_segment=True,
-        )
-        child_span = build_mock_span(
-            project_id=self.project.id,
-            parent_span_id=segment_span["span_id"],
-        )
-
-        processed_spans = process_segment([child_span, segment_span], skip_enrichment=True)
-
-        mock_enrich.assert_not_called()
-        assert len(processed_spans) == 2
-
-    @mock.patch(
-        "sentry.spans.consumers.process_segments.message.TreeEnricher.enrich_spans",
-    )
-    def test_no_skip_enrichment_when_flag_is_false(self, mock_enrich: mock.MagicMock) -> None:
-        """Test that enrichment runs normally when skip_enrichment=False."""
-        mock_enrich.return_value = (None, [])
-        segment_span = build_mock_span(
-            project_id=self.project.id,
-            is_segment=True,
-        )
-        child_span = build_mock_span(
-            project_id=self.project.id,
-            parent_span_id=segment_span["span_id"],
-        )
-
-        process_segment([child_span, segment_span], skip_enrichment=False)
-
-        mock_enrich.assert_called_once()
-
 
 @exclude_experimental_detectors
 class TestSegmentDropKillswitch(TestCase):
diff --git a/tests/sentry/tasks/seer/test_night_shift.py b/tests/sentry/tasks/seer/test_night_shift.py
deleted file mode 100644
index b379f605b1f5..000000000000
--- a/tests/sentry/tasks/seer/test_night_shift.py
+++ /dev/null
@@ -1,79 +0,0 @@
-from unittest.mock import patch
-
-from sentry.tasks.seer.night_shift import (
-    run_night_shift_for_org,
-    schedule_night_shift,
-)
-from sentry.testutils.cases import TestCase
-from sentry.testutils.pytest.fixtures import django_db_all
-
-
-@django_db_all
-class TestScheduleNightShift(TestCase):
-    def test_disabled_by_option(self) -> None:
-        with (
-            self.options({"seer.night_shift.enable": False}),
-            patch("sentry.tasks.seer.night_shift.run_night_shift_for_org") as mock_worker,
-        ):
-            schedule_night_shift()
-            mock_worker.apply_async.assert_not_called()
-
-    def test_dispatches_eligible_orgs(self) -> None:
-        org = self.create_organization()
-
-        with (
-            self.options({"seer.night_shift.enable": True}),
-            self.feature(
-                {
-                    "organizations:seer-night-shift": [org.slug],
-                    "organizations:gen-ai-features": [org.slug],
-                }
-            ),
-            patch("sentry.tasks.seer.night_shift.run_night_shift_for_org") as mock_worker,
-        ):
-            schedule_night_shift()
-            mock_worker.apply_async.assert_called_once()
-            assert mock_worker.apply_async.call_args.kwargs["args"] == [org.id]
-
-    def test_skips_ineligible_orgs(self) -> None:
-        self.create_organization()
-
-        with (
-            self.options({"seer.night_shift.enable": True}),
-            patch("sentry.tasks.seer.night_shift.run_night_shift_for_org") as mock_worker,
-        ):
-            schedule_night_shift()
-            mock_worker.apply_async.assert_not_called()
-
-    def test_skips_orgs_with_hidden_ai(self) -> None:
-        org = self.create_organization()
-        org.update_option("sentry:hide_ai_features", True)
-
-        with (
-            self.options({"seer.night_shift.enable": True}),
-            self.feature(
-                {
-                    "organizations:seer-night-shift": [org.slug],
-                    "organizations:gen-ai-features": [org.slug],
-                }
-            ),
-            patch("sentry.tasks.seer.night_shift.run_night_shift_for_org") as mock_worker,
-        ):
-            schedule_night_shift()
-            mock_worker.apply_async.assert_not_called()
-
-
-@django_db_all
-class TestRunNightShiftForOrg(TestCase):
-    def test_logs_for_valid_org(self) -> None:
-        org = self.create_organization()
-
-        with patch("sentry.tasks.seer.night_shift.logger") as mock_logger:
-            run_night_shift_for_org(org.id)
-            mock_logger.info.assert_called_once()
-            assert mock_logger.info.call_args.args[0] == "night_shift.org_dispatched"
-
-    def test_nonexistent_org(self) -> None:
-        with patch("sentry.tasks.seer.night_shift.logger") as mock_logger:
-            run_night_shift_for_org(999999999)
-            mock_logger.info.assert_not_called()
diff --git a/tests/sentry/tasks/test_post_process.py b/tests/sentry/tasks/test_post_process.py
index 9ee29b5d7fc7..ef745e87d12c 100644
--- a/tests/sentry/tasks/test_post_process.py
+++ b/tests/sentry/tasks/test_post_process.py
@@ -3070,59 +3070,6 @@ def test_kick_off_seer_automation_with_hide_ai_features_enabled(
         mock_generate_summary_and_run_automation.assert_not_called()
 
 
-class KickOffLightweightRCAClusterTestMixin(BasePostProcessGroupMixin):
-    @patch("sentry.tasks.seer.lightweight_rca_cluster.trigger_lightweight_rca_cluster_task.delay")
-    def test_kick_off_lightweight_rca_cluster_when_enabled(self, mock_task):
-        event = self.create_event(
-            data={"message": "testing"},
-            project_id=self.project.id,
-        )
-
-        with self.options({"supergroups.lightweight-enabled-orgs": [self.project.organization.id]}):
-            self.call_post_process_group(
-                is_new=True,
-                is_regression=False,
-                is_new_group_environment=True,
-                event=event,
-            )
-
-        mock_task.assert_called_once_with(event.group.id)
-
-    @patch("sentry.tasks.seer.lightweight_rca_cluster.trigger_lightweight_rca_cluster_task.delay")
-    def test_kick_off_lightweight_rca_cluster_skips_when_not_enabled(self, mock_task):
-        event = self.create_event(
-            data={"message": "testing"},
-            project_id=self.project.id,
-        )
-
-        with self.options({"supergroups.lightweight-enabled-orgs": []}):
-            self.call_post_process_group(
-                is_new=True,
-                is_regression=False,
-                is_new_group_environment=True,
-                event=event,
-            )
-
-        mock_task.assert_not_called()
-
-    @patch("sentry.tasks.seer.lightweight_rca_cluster.trigger_lightweight_rca_cluster_task.delay")
-    def test_kick_off_lightweight_rca_cluster_skips_when_not_new(self, mock_task):
-        event = self.create_event(
-            data={"message": "testing"},
-            project_id=self.project.id,
-        )
-
-        with self.options({"supergroups.lightweight-enabled-orgs": [self.project.organization.id]}):
-            self.call_post_process_group(
-                is_new=False,
-                is_regression=False,
-                is_new_group_environment=False,
-                event=event,
-            )
-
-        mock_task.assert_not_called()
-
-
 @patch("sentry.seer.autofix.utils.is_seer_seat_based_tier_enabled", return_value=True)
 class TriageSignalsV0TestMixin(BasePostProcessGroupMixin):
     """Tests for the triage signals V0 flow."""
@@ -3550,7 +3497,6 @@ class PostProcessGroupErrorTest(
     InboxTestMixin,
     ResourceChangeBoundsTestMixin,
     KickOffSeerAutomationTestMixin,
-    KickOffLightweightRCAClusterTestMixin,
     TriageSignalsV0TestMixin,
     SeerAutomationHelperFunctionsTestMixin,
     WorkflowEngineTestMixin,
diff --git a/tests/sentry/workflow_engine/defaults/test_workflows.py b/tests/sentry/workflow_engine/defaults/test_workflows.py
deleted file mode 100644
index a8572b63f104..000000000000
--- a/tests/sentry/workflow_engine/defaults/test_workflows.py
+++ /dev/null
@@ -1,190 +0,0 @@
-from sentry.notifications.types import FallthroughChoiceType
-from sentry.testutils.cases import TestCase
-from sentry.workflow_engine.defaults.detectors import ensure_default_detectors
-from sentry.workflow_engine.defaults.workflows import (
-    connect_workflows_to_issue_stream,
-    create_priority_workflow,
-    ensure_default_workflows,
-)
-from sentry.workflow_engine.models import (
-    Action,
-    DataCondition,
-    DataConditionGroup,
-    DataConditionGroupAction,
-    Detector,
-    DetectorWorkflow,
-    Workflow,
-    WorkflowDataConditionGroup,
-)
-from sentry.workflow_engine.models.data_condition import Condition
-from sentry.workflow_engine.typings.grouptype import IssueStreamGroupType
-
-
-class TestConnectWorkflowsToIssueStream(TestCase):
-    def test_creates_detector_workflow_connections(self) -> None:
-        project = self.create_project(create_default_detectors=False)
-        workflow1 = self.create_workflow(
-            name="Test Workflow 1",
-            organization=project.organization,
-        )
-        workflow2 = self.create_workflow(
-            name="Test Workflow 2",
-            organization=project.organization,
-        )
-
-        connections = connect_workflows_to_issue_stream(project, [workflow1, workflow2])
-
-        assert len(connections) == 2
-        assert DetectorWorkflow.objects.filter(workflow=workflow1).exists()
-        assert DetectorWorkflow.objects.filter(workflow=workflow2).exists()
-
-        # Verify all workflows are connected to the same issue stream detector
-        detector_ids = {c.detector_id for c in connections}
-        assert len(detector_ids) == 1
-        detector = Detector.objects.get(id=detector_ids.pop())
-        assert detector.type == IssueStreamGroupType.slug
-
-    def test_uses_issue_stream_detector(self) -> None:
-        project = self.create_project(create_default_detectors=False)
-        workflow = self.create_workflow(
-            organization=project.organization,
-            name="Test Workflow",
-        )
-
-        connections = connect_workflows_to_issue_stream(project, [workflow])
-
-        connection = connections[0]
-        assert connection.detector.type == IssueStreamGroupType.slug
-        assert connection.detector.project_id == project.id
-
-        # Verify only one issue stream detector exists
-        issue_stream_detectors = Detector.objects.filter(
-            project=project, type=IssueStreamGroupType.slug
-        )
-        assert issue_stream_detectors.count() == 1
-
-    def test_uses_preexisting_issue_stream_detector(self) -> None:
-        """Integration test: verifies that if an issue stream detector already exists, it reuses it."""
-        project = self.create_project(create_default_detectors=False)
-
-        # Create the default detectors first (simulating project setup signal)
-        default_detectors = ensure_default_detectors(project)
-        existing_detector = default_detectors[IssueStreamGroupType.slug]
-
-        # Now connect workflows - should use the existing detector
-        workflow = self.create_workflow(
-            organization=project.organization,
-            name="Test Workflow",
-        )
-
-        connections = connect_workflows_to_issue_stream(project, [workflow])
-
-        # Verify it used the pre-existing detector
-        assert connections[0].detector_id == existing_detector.id
-
-        # Verify still only one issue stream detector exists
-        issue_stream_detectors = Detector.objects.filter(
-            project=project, type=IssueStreamGroupType.slug
-        )
-        assert issue_stream_detectors.count() == 1
-
-
-class TestCreatePriorityWorkflow(TestCase):
-    def test_creates_workflow_with_correct_name(self) -> None:
-        org = self.create_organization()
-        workflow = create_priority_workflow(org)
-
-        assert workflow.name == "Send a notification for high priority issues"
-        assert workflow.organization_id == org.id
-
-    def test_creates_when_condition_group(self) -> None:
-        org = self.create_organization()
-        workflow = create_priority_workflow(org)
-
-        assert workflow.when_condition_group is not None
-        assert workflow.when_condition_group.logic_type == DataConditionGroup.Type.ANY_SHORT_CIRCUIT
-
-    def test_creates_data_conditions(self) -> None:
-        org = self.create_organization()
-        workflow = create_priority_workflow(org)
-
-        conditions = DataCondition.objects.filter(condition_group=workflow.when_condition_group)
-        assert conditions.count() == 2
-
-        condition_types = {c.type for c in conditions}
-        assert Condition.NEW_HIGH_PRIORITY_ISSUE in condition_types
-        assert Condition.EXISTING_HIGH_PRIORITY_ISSUE in condition_types
-
-        for condition in conditions:
-            assert condition.comparison is True
-            assert condition.condition_result is True
-
-    def test_creates_email_action(self) -> None:
-        org = self.create_organization()
-
-        create_priority_workflow(org)
-
-        action = Action.objects.get(type=Action.Type.EMAIL)
-        assert action.config == {
-            "target_type": 4,
-            "target_identifier": None,
-        }
-        assert action.data == {
-            "fallthrough_type": FallthroughChoiceType.ACTIVE_MEMBERS.value,
-        }
-
-    def test_creates_action_filter_and_links(self) -> None:
-        org = self.create_organization()
-
-        workflow = create_priority_workflow(org)
-
-        # Verify WorkflowDataConditionGroup exists
-        workflow_dcg = WorkflowDataConditionGroup.objects.get(workflow=workflow)
-        action_filter = workflow_dcg.condition_group
-
-        # Verify action is linked to the filter
-        action = Action.objects.get(type=Action.Type.EMAIL)
-        dcg_action = DataConditionGroupAction.objects.get(action=action)
-        assert dcg_action.condition_group == action_filter
-
-        # Verify action filter has correct logic type
-        assert action_filter.logic_type == DataConditionGroup.Type.ANY_SHORT_CIRCUIT
-
-    def test_idempotent_returns_existing_workflow(self) -> None:
-        org = self.create_organization()
-
-        workflow1 = create_priority_workflow(org)
-        workflow2 = create_priority_workflow(org)
-
-        assert workflow1.id == workflow2.id
-        # Should only have one workflow
-        assert (
-            Workflow.objects.filter(
-                organization=org, name="Send a notification for high priority issues"
-            ).count()
-            == 1
-        )
-
-
-class TestEnsureDefaultWorkflows(TestCase):
-    def test_creates_and_connects_workflows(self) -> None:
-        project = self.create_project()
-
-        workflows = ensure_default_workflows(project)
-
-        assert len(workflows) == 1
-        workflow = workflows[0]
-        assert workflow.name == "Send a notification for high priority issues"
-
-        # Verify connection to issue stream detector
-        connection = DetectorWorkflow.objects.get(workflow=workflow)
-        assert connection.detector.type == IssueStreamGroupType.slug
-        assert connection.detector.project_id == project.id
-
-    def test_returns_workflows_list(self) -> None:
-        project = self.create_project()
-
-        workflows = ensure_default_workflows(project)
-
-        assert isinstance(workflows, list)
-        assert all(isinstance(w, Workflow) for w in workflows)
diff --git a/tests/sentry/workflow_engine/endpoints/test_organization_detector_details.py b/tests/sentry/workflow_engine/endpoints/test_organization_detector_details.py
index f386b09283fb..1ffb89af8f30 100644
--- a/tests/sentry/workflow_engine/endpoints/test_organization_detector_details.py
+++ b/tests/sentry/workflow_engine/endpoints/test_organization_detector_details.py
@@ -326,47 +326,6 @@ def test_update_description(self) -> None:
         self.detector.refresh_from_db()
         assert self.detector.description == "New description for the detector"
 
-    def test_update_eap_invalid_time_window_rejected(self) -> None:
-        data = {**self.valid_data}
-        data["dataSources"] = [
-            {
-                "queryType": SnubaQuery.Type.PERFORMANCE.value,
-                "dataset": Dataset.EventsAnalyticsPlatform.value,
-                "query": "span.op:http.client",
-                "aggregate": "count()",
-                "timeWindow": 60,  # below the 300-second EAP floor
-                "environment": self.environment.name,
-                "eventTypes": [SnubaQueryEventType.EventType.TRACE_ITEM_SPAN.name.lower()],
-            }
-        ]
-        response = self.get_error_response(
-            self.organization.slug,
-            self.detector.id,
-            **data,
-            status_code=400,
-        )
-        assert "Invalid Time Window" in str(response.data)
-
-        # 450 seconds is above the floor but not a valid granularity
-        data["dataSources"][0]["timeWindow"] = 450
-        response = self.get_error_response(
-            self.organization.slug,
-            self.detector.id,
-            **data,
-            status_code=400,
-        )
-        assert "Invalid Time Window" in str(response.data)
-
-        # 300 seconds (5 minutes) is the smallest valid EAP window
-        data["dataSources"][0]["timeWindow"] = 300
-        with self.tasks():
-            self.get_success_response(
-                self.organization.slug,
-                self.detector.id,
-                **data,
-                status_code=200,
-            )
-
     def test_update_add_data_condition(self) -> None:
         """
         Test that we can add an additional data condition
diff --git a/tests/sentry/workflow_engine/endpoints/test_organization_detector_index.py b/tests/sentry/workflow_engine/endpoints/test_organization_detector_index.py
index dcaae8de2ab7..e2de2217d55f 100644
--- a/tests/sentry/workflow_engine/endpoints/test_organization_detector_index.py
+++ b/tests/sentry/workflow_engine/endpoints/test_organization_detector_index.py
@@ -9,11 +9,9 @@
 from sentry.deletions.tasks.scheduled import run_scheduled_deletions
 from sentry.grouping.grouptype import ErrorGroupType
 from sentry.incidents.grouptype import MetricIssue
-from sentry.incidents.models.alert_rule import AlertRule
 from sentry.models.environment import Environment
 from sentry.monitors.grouptype import MonitorIncidentType
 from sentry.search.utils import _HACKY_INVALID_USER
-from sentry.snuba.models import QuerySubscription, SnubaQuery
 from sentry.testutils.asserts import assert_org_audit_log_exists
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers.datetime import before_now
@@ -25,12 +23,7 @@
     DATA_SOURCE_UPTIME_SUBSCRIPTION,
 )
 from sentry.workflow_engine.endpoints.organization_detector_index import convert_assignee_values
-from sentry.workflow_engine.migration_helpers.alert_rule import dual_write_alert_rule
-from sentry.workflow_engine.models import (
-    AlertRuleDetector,
-    DataConditionGroup,
-    Detector,
-)
+from sentry.workflow_engine.models import DataConditionGroup, Detector
 from sentry.workflow_engine.models.detector_group import DetectorGroup
 from sentry.workflow_engine.typings.grouptype import IssueStreamGroupType
 
@@ -1376,30 +1369,3 @@ def test_delete_system_and_user_created_with_query_filters(self) -> None:
         )
 
         self.assert_unaffected_detectors([self.detector, error_detector])
-
-    def test_delete_dual_written_detector_cleans_up_alert_rule(self) -> None:
-        alert_rule = self.create_alert_rule(
-            organization=self.organization,
-            projects=[self.project],
-        )
-        self.create_alert_rule_trigger(alert_rule=alert_rule)
-        dual_write_alert_rule(alert_rule)
-
-        detector = AlertRuleDetector.objects.get(alert_rule_id=alert_rule.id).detector
-        snuba_query = alert_rule.snuba_query
-        subscription = QuerySubscription.objects.get(snuba_query=snuba_query)
-
-        with outbox_runner():
-            self.get_success_response(
-                self.organization.slug,
-                qs_params={"id": str(detector.id)},
-                status_code=204,
-            )
-
-        with self.tasks():
-            run_scheduled_deletions()
-
-        assert not Detector.objects.filter(id=detector.id).exists()
-        assert not AlertRule.objects.filter(id=alert_rule.id).exists()
-        assert not QuerySubscription.objects.filter(id=subscription.id).exists()
-        assert not SnubaQuery.objects.filter(id=snuba_query.id).exists()
diff --git a/tests/sentry/workflow_engine/endpoints/test_organization_project_detector_index.py b/tests/sentry/workflow_engine/endpoints/test_organization_project_detector_index.py
index bbdacfb54d88..1a15b9662fd2 100644
--- a/tests/sentry/workflow_engine/endpoints/test_organization_project_detector_index.py
+++ b/tests/sentry/workflow_engine/endpoints/test_organization_project_detector_index.py
@@ -337,47 +337,6 @@ def test_missing_name(self) -> None:
         )
         assert response.data == {"name": ["This field is required."]}
 
-    def test_eap_invalid_time_window_rejected(self) -> None:
-        data = {**self.valid_data}
-        data["dataSources"] = [
-            {
-                "queryType": SnubaQuery.Type.PERFORMANCE.value,
-                "dataset": Dataset.EventsAnalyticsPlatform.value,
-                "query": "span.op:http.client",
-                "aggregate": "count()",
-                "timeWindow": 60,  # 60 seconds — below the 300-second EAP floor
-                "environment": self.environment.name,
-                "eventTypes": [SnubaQueryEventType.EventType.TRACE_ITEM_SPAN.name.lower()],
-            }
-        ]
-        response = self.get_error_response(
-            self.organization.slug,
-            self.project.slug,
-            **data,
-            status_code=400,
-        )
-        assert "Invalid Time Window" in str(response.data)
-
-        # 450 seconds is above the floor but not a valid granularity
-        data["dataSources"][0]["timeWindow"] = 450
-        response = self.get_error_response(
-            self.organization.slug,
-            self.project.slug,
-            **data,
-            status_code=400,
-        )
-        assert "Invalid Time Window" in str(response.data)
-
-        # 300 seconds (5 minutes) is the smallest valid EAP window
-        data["dataSources"][0]["timeWindow"] = 300
-        with self.tasks():
-            self.get_success_response(
-                self.organization.slug,
-                self.project.slug,
-                **data,
-                status_code=201,
-            )
-
 
 @cell_silo_test
 class OrganizationProjectDetectorIndexMonitorPostTest(APITestCase):
diff --git a/tests/sentry/workflow_engine/migration_helpers/test_issue_alert_migration.py b/tests/sentry/workflow_engine/migration_helpers/test_issue_alert_migration.py
index 9887c67a4476..3a4059f13c1b 100644
--- a/tests/sentry/workflow_engine/migration_helpers/test_issue_alert_migration.py
+++ b/tests/sentry/workflow_engine/migration_helpers/test_issue_alert_migration.py
@@ -148,14 +148,8 @@ def assert_error_detector_migrated(self, issue_alert: Rule, workflow: Workflow)
         assert error_detector.type == ErrorGroupType.slug
         assert error_detector.config == {}
 
-        ## This ensures that the error detector is not directly connected to the workflow,
-        # _and_ confirms that the issue stream detector would trigger for the general use case.
-        assert not DetectorWorkflow.objects.filter(detector=error_detector).exists()
-        assert DetectorWorkflow.objects.filter(
-            detector__type=IssueStreamGroupType.slug,
-            detector__project=self.project,
-            workflow=workflow,
-        ).exists()
+        error_detector_workflow = DetectorWorkflow.objects.get(detector=error_detector)
+        assert error_detector_workflow.workflow == workflow
 
         return error_detector
 
diff --git a/tests/sentry/workflow_engine/test_integration.py b/tests/sentry/workflow_engine/test_integration.py
index eff6345eded6..78d1e52fe85d 100644
--- a/tests/sentry/workflow_engine/test_integration.py
+++ b/tests/sentry/workflow_engine/test_integration.py
@@ -8,6 +8,7 @@
 from django.utils import timezone
 
 from sentry.eventstream.types import EventStreamEventType
+from sentry.grouping.grouptype import ErrorGroupType
 from sentry.incidents.grouptype import MetricIssue
 from sentry.incidents.utils.types import DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION
 from sentry.issues.ingest import save_issue_occurrence
@@ -27,7 +28,6 @@
 from sentry.workflow_engine.tasks.delayed_workflows import process_delayed_workflows
 from sentry.workflow_engine.tasks.workflows import schedule_delayed_workflows
 from sentry.workflow_engine.types import DetectorPriorityLevel
-from sentry.workflow_engine.typings.grouptype import IssueStreamGroupType
 from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
 
 
@@ -220,7 +220,7 @@ def test_default_workflow(self, mock_trigger: MagicMock) -> None:
         from sentry.types.group import GroupSubStatus
 
         project = self.create_project(fire_project_created=True)
-        detector = Detector.objects.get(project=project, type=IssueStreamGroupType.slug)
+        detector = Detector.objects.get(project=project, type=ErrorGroupType.slug)
         workflow = DetectorWorkflow.objects.get(detector=detector).workflow
         workflow.update(config={"frequency": 0})
 
@@ -263,10 +263,7 @@ def test_default_workflow(self, mock_trigger: MagicMock) -> None:
         # does not fire for low priority issue
         mock_trigger.reset_mock()
         low_priority_event = self.create_error_event(
-            project=project,
-            detector=detector,
-            fingerprint="asdf",
-            level="warning",
+            project=project, detector=detector, fingerprint="asdf", level="warning"
         )
         self.post_process_error(low_priority_event, is_new=True)
         assert not mock_trigger.called
diff --git a/tests/snuba/api/endpoints/test_organization_events_trace_metrics.py b/tests/snuba/api/endpoints/test_organization_events_trace_metrics.py
index a0cee374d7de..a317afcd2b38 100644
--- a/tests/snuba/api/endpoints/test_organization_events_trace_metrics.py
+++ b/tests/snuba/api/endpoints/test_organization_events_trace_metrics.py
@@ -839,73 +839,3 @@ def test_errors_if_query_in_query(self):
             }
         )
         assert response.status_code == 400, response.content
-
-    def test_per_second_formula_with_arbitrary_search_term(self) -> None:
-        # Store 6 trace metrics over a 10 minute period
-        self.store_eap_items(
-            [
-                self.create_trace_metric(
-                    "test_metric", 1.0, "counter", attributes={"release": "abcdef"}
-                )
-                for _ in range(6)
-            ]
-        )
-        # Store one more without the attribute
-        self.store_eap_items(
-            [self.create_trace_metric("test_metric", 1.0, "counter") for _ in range(6)]
-        )
-
-        response = self.do_request(
-            {
-                "metricName": "test_metric",
-                "metricType": "counter",
-                "field": ["per_second_if(`release:abcdef`,value)"],
-                "project": self.project.id,
-                "dataset": self.dataset,
-                "statsPeriod": "10m",
-            }
-        )
-        assert response.status_code == 200, response.content
-        data = response.data["data"]
-        meta = response.data["meta"]
-        assert len(data) == 1
-        assert (
-            data[0]["per_second_if(`release:abcdef`,value)"] == 0.01
-        )  # Over ten minute period, 6 events / 600 seconds = 0.01 events per second
-        assert meta["fields"]["per_second_if(`release:abcdef`,value)"] == "rate"
-        assert meta["units"]["per_second_if(`release:abcdef`,value)"] == "1/second"
-        assert meta["dataset"] == "tracemetrics"
-
-    def test_per_minute_formula_with_arbitrary_search_term(self) -> None:
-        # Store 6 trace metrics over a 10 minute period
-        self.store_eap_items(
-            [
-                self.create_trace_metric(
-                    "test_metric", 1.0, "counter", attributes={"release": "abcdef"}
-                )
-                for _ in range(6)
-            ]
-        )
-        # Store one more without the attribute
-        self.store_eap_items(
-            [self.create_trace_metric("test_metric", 1.0, "counter") for _ in range(6)]
-        )
-
-        response = self.do_request(
-            {
-                "metricName": "test_metric",
-                "metricType": "counter",
-                "field": ["per_minute_if(`release:abcdef`,value)"],
-                "project": self.project.id,
-                "dataset": self.dataset,
-                "statsPeriod": "10m",
-            }
-        )
-        assert response.status_code == 200, response.content
-        data = response.data["data"]
-        meta = response.data["meta"]
-        assert len(data) == 1
-        assert data[0]["per_minute_if(`release:abcdef`,value)"] == 0.6
-        assert meta["fields"]["per_minute_if(`release:abcdef`,value)"] == "rate"
-        assert meta["units"]["per_minute_if(`release:abcdef`,value)"] == "1/minute"
-        assert meta["dataset"] == "tracemetrics"