From d1912244741b5a0f1ab7e68851e0a0a085dac3bd Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Mon, 10 Aug 2026 20:14:44 +0300
Subject: [PATCH] restore missing rebase fixes

---
 src/components/moderation/ReportDialog/index.tsx | 2 +-
 src/state/cache/profile-shadow.ts                | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/moderation/ReportDialog/index.tsx b/src/components/moderation/ReportDialog/index.tsx
index 4890f377ad..01014a0d75 100644
--- a/src/components/moderation/ReportDialog/index.tsx
+++ b/src/components/moderation/ReportDialog/index.tsx
@@ -644,7 +644,7 @@ function Inner(
               </View>
 
               {videoTimestampSeconds !== undefined &&
-                state.selectedLabeler?.creator.did === BSKY_LABELER_DID && (
+                state.selectedLabeler?.creator.did === api.moderation.did && (
                   <IncludeVideoTimestampToggle
                     seconds={videoTimestampSeconds}
                     selected={state.includeVideoTimestamp}
diff --git a/src/state/cache/profile-shadow.ts b/src/state/cache/profile-shadow.ts
index 1426e26c0b..ca516024d7 100644
--- a/src/state/cache/profile-shadow.ts
+++ b/src/state/cache/profile-shadow.ts
@@ -1,4 +1,5 @@
 import {useEffect, useMemo, useState} from 'react'
+import {type AtUriString} from '@atproto/lex'
 import {type QueryClient} from '@tanstack/react-query'
 import {EventEmitter} from 'eventemitter3'
 
@@ -279,7 +280,7 @@ export function mergeShadow<TProfileView extends bsky.profile.AnyProfileView>(
       ...(profile.viewer || {}),
       following:
         'followingUri' in shadow
-          ? shadow.followingUri
+          ? (shadow.followingUri as AtUriString)
           : profile.viewer?.following,
       muted: 'muted' in shadow ? shadow.muted : profile.viewer?.muted,
       mutedOnlyReposts:
@@ -287,12 +288,14 @@ export function mergeShadow<TProfileView extends bsky.profile.AnyProfileView>(
           ? shadow.mutedOnlyReposts
           : profile.viewer?.mutedOnlyReposts,
       blocking:
-        'blockingUri' in shadow ? shadow.blockingUri : profile.viewer?.blocking,
+        'blockingUri' in shadow
+          ? (shadow.blockingUri as AtUriString)
+          : profile.viewer?.blocking,
       activitySubscription:
         'activitySubscription' in shadow
           ? shadow.activitySubscription
           : profile.viewer?.activitySubscription,
-    } satisfies AppBskyActorDefs.ViewerState,
+    } satisfies app.bsky.actor.defs.ViewerState,
     verification:
       'verification' in shadow ? shadow.verification : profile.verification,
     status: