From b1c051466cfb235f66efb0646e4d76a752e2f8c6 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Wed, 15 Oct 2025 18:07:03 -0500
Subject: [PATCH] Integrate in remaining spots

---
 src/components/dms/ConvoMenu.tsx                   | 7 +++----
 src/screens/Messages/components/RequestButtons.tsx | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx
index 1b1ebbcd59..152b686f86 100644
--- a/src/components/dms/ConvoMenu.tsx
+++ b/src/components/dms/ConvoMenu.tsx
@@ -20,7 +20,6 @@ import {Button, ButtonIcon} from '#/components/Button'
 import {BlockedByListDialog} from '#/components/dms/BlockedByListDialog'
 import {LeaveConvoPrompt} from '#/components/dms/LeaveConvoPrompt'
 import {ReportConversationPrompt} from '#/components/dms/ReportConversationPrompt'
-import {ReportDialog} from '#/components/dms/ReportDialog'
 import {ArrowBoxLeft_Stroke2_Corner0_Rounded as ArrowBoxLeft} from '#/components/icons/ArrowBoxLeft'
 import {Bubble_Stroke2_Corner2_Rounded as Bubble} from '#/components/icons/Bubble'
 import {DotGrid_Stroke2_Corner0_Rounded as DotsHorizontal} from '#/components/icons/DotGrid'
@@ -33,6 +32,7 @@ import {
 } from '#/components/icons/Person'
 import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as Unmute} from '#/components/icons/Speaker'
 import * as Menu from '#/components/Menu'
+import {ReportDialog} from '#/components/moderation/ReportDialog'
 import * as Prompt from '#/components/Prompt'
 import type * as bsky from '#/types/bsky'
 
@@ -114,9 +114,8 @@ let ConvoMenu = ({
       />
       {latestReportableMessage ? (
         <ReportDialog
-          currentScreen={currentScreen}
-          params={{
-            type: 'convoMessage',
+          subject={{
+            view: 'convo',
             convoId: convo.id,
             message: latestReportableMessage,
           }}
diff --git a/src/screens/Messages/components/RequestButtons.tsx b/src/screens/Messages/components/RequestButtons.tsx
index 4437a9a43f..41e92be6a3 100644
--- a/src/screens/Messages/components/RequestButtons.tsx
+++ b/src/screens/Messages/components/RequestButtons.tsx
@@ -25,12 +25,12 @@ import {
   EmailDialogScreenID,
   useEmailDialogControl,
 } from '#/components/dialogs/EmailDialog'
-import {ReportDialog} from '#/components/dms/ReportDialog'
 import {CircleX_Stroke2_Corner0_Rounded} from '#/components/icons/CircleX'
 import {Flag_Stroke2_Corner0_Rounded as FlagIcon} from '#/components/icons/Flag'
 import {PersonX_Stroke2_Corner0_Rounded as PersonXIcon} from '#/components/icons/Person'
 import {Loader} from '#/components/Loader'
 import * as Menu from '#/components/Menu'
+import {ReportDialog} from '#/components/moderation/ReportDialog'
 
 export function RejectMenu({
   convo,
@@ -163,9 +163,8 @@ export function RejectMenu({
       </Menu.Root>
       {lastMessage && (
         <ReportDialog
-          currentScreen={currentScreen}
-          params={{
-            type: 'convoMessage',
+          subject={{
+            view: 'convo',
             convoId: convo.id,
             message: lastMessage,
           }}