Swap in new dialog in all cases but chat

src/screens/Profile/components/ProfileFeedHeader.tsx

@@ -46,7 +46,10 @@ import {Trash_Stroke2_Corner0_Rounded as Trash} from '#/components/icons/Trash'
 import * as Layout from '#/components/Layout'
 import {InlineLinkText} from '#/components/Link'
 import * as Menu from '#/components/Menu'
-import {ReportDialog, useReportDialogControl} from '#/components/ReportDialog'
+import {
+  ReportDialog,
+  useReportDialogControl,
+} from '#/components/moderation/ReportDialog'
 import {RichText} from '#/components/RichText'
 import {Text} from '#/components/Typography'
 
@@ -551,14 +554,15 @@ function DialogInner({
               </Button>
             </View>
 
-            <ReportDialog
-              control={reportDialogControl}
-              params={{
-                type: 'feedgen',
-                uri: info.uri,
-                cid: info.cid,
-              }}
-            />
+            {info.view && (
+              <ReportDialog
+                control={reportDialogControl}
+                subject={{
+                  ...info.view,
+                  $type: 'app.bsky.feed.defs#generatorView',
+                }}
+              />
+            )}
           </View>
         </>
       )}

src/screens/StarterPack/StarterPackScreen.tsx

@@ -57,8 +57,11 @@ import * as Layout from '#/components/Layout'
 import {ListMaybePlaceholder} from '#/components/Lists'
 import {Loader} from '#/components/Loader'
 import * as Menu from '#/components/Menu'
+import {
+  ReportDialog,
+  useReportDialogControl,
+} from '#/components/moderation/ReportDialog'
 import * as Prompt from '#/components/Prompt'
-import {ReportDialog, useReportDialogControl} from '#/components/ReportDialog'
 import {RichText} from '#/components/RichText'
 import {FeedsList} from '#/components/StarterPack/Main/FeedsList'
 import {PostsList} from '#/components/StarterPack/Main/PostsList'
@@ -624,10 +627,9 @@ function OverflowMenu({
       {starterPack.list && (
         <ReportDialog
           control={reportDialogControl}
-          params={{
-            type: 'starterpack',
-            uri: starterPack.uri,
-            cid: starterPack.cid,
+          subject={{
+            ...starterPack,
+            $type: 'app.bsky.graph.defs#starterPackView',
           }}
         />
       )}

src/view/com/profile/ProfileMenu.tsx

@@ -38,8 +38,11 @@ import {
 import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus'
 import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as Unmute} from '#/components/icons/Speaker'
 import * as Menu from '#/components/Menu'
+import {
+  ReportDialog,
+  useReportDialogControl,
+} from '#/components/moderation/ReportDialog'
 import * as Prompt from '#/components/Prompt'
-import {ReportDialog, useReportDialogControl} from '#/components/ReportDialog'
 
 let ProfileMenu = ({
   profile,
@@ -365,7 +368,10 @@ let ProfileMenu = ({
 
       <ReportDialog
         control={reportDialogControl}
-        params={{type: 'account', did: profile.did}}
+        subject={{
+          ...profile,
+          $type: 'app.bsky.actor.defs#profileViewDetailed',
+        }}
       />
 
       <Prompt.Basic

src/view/com/util/forms/PostDropdownBtnMenuItems.tsx

@@ -80,8 +80,11 @@ import {Trash_Stroke2_Corner0_Rounded as Trash} from '#/components/icons/Trash'
 import {Warning_Stroke2_Corner0_Rounded as Warning} from '#/components/icons/Warning'
 import {Loader} from '#/components/Loader'
 import * as Menu from '#/components/Menu'
+import {
+  ReportDialog,
+  useReportDialogControl,
+} from '#/components/moderation/ReportDialog'
 import * as Prompt from '#/components/Prompt'
-import {ReportDialog, useReportDialogControl} from '#/components/ReportDialog'
 import * as Toast from '../Toast'
 
 let PostDropdownMenuItems = ({
@@ -756,10 +759,9 @@ let PostDropdownMenuItems = ({
 
       <ReportDialog
         control={reportDialogControl}
-        params={{
-          type: 'post',
-          uri: postUri,
-          cid: postCid,
+        subject={{
+          ...post,
+          $type: 'app.bsky.feed.defs#postView',
         }}
       />
 

src/view/screens/ProfileList.tsx

@@ -75,8 +75,11 @@ import {useDialogControl} from '#/components/Dialog'
 import {PersonPlus_Stroke2_Corner0_Rounded as PersonPlusIcon} from '#/components/icons/Person'
 import * as Layout from '#/components/Layout'
 import * as Hider from '#/components/moderation/Hider'
+import {
+  ReportDialog,
+  useReportDialogControl,
+} from '#/components/moderation/ReportDialog'
 import * as Prompt from '#/components/Prompt'
-import {ReportDialog, useReportDialogControl} from '#/components/ReportDialog'
 import {RichText} from '#/components/RichText'
 
 const SECTION_TITLES_CURATE = ['Posts', 'People']
@@ -672,10 +675,9 @@ function Header({
         avatarType="list">
         <ReportDialog
           control={reportDialogControl}
-          params={{
-            type: 'list',
-            uri: list.uri,
-            cid: list.cid,
+          subject={{
+            ...list,
+            $type: 'app.bsky.graph.defs#listView',
           }}
         />
         {isCurateList ? (