2 files changed, 11 insertions, 13 deletions
diff --git a/src/state/models/content/list.ts b/src/state/models/content/list.ts
index 2498cf581..5d4ffb4fa 100644
--- a/src/state/models/content/list.ts
+++ b/src/state/models/content/list.ts
@@ -306,7 +306,7 @@ export class ListModel {
     this.hasMore = !!this.loadMoreCursor
     this.list = res.data.list
     this.items = this.items.concat(
-      res.data.items.map(item => ({...item, _reactKey: item.subject})),
+      res.data.items.map(item => ({...item, _reactKey: item.subject.did})),
     )
   }
 }
diff --git a/src/state/models/ui/shell.ts b/src/state/models/ui/shell.ts
index 348fa4899..e5fd5d426 100644
--- a/src/state/models/ui/shell.ts
+++ b/src/state/models/ui/shell.ts
@@ -48,16 +48,15 @@ export interface ModerationDetailsModal {
   moderation: ModerationUI
 }
 
-export interface ReportPostModal {
-  name: 'report-post'
-  postUri: string
-  postCid: string
-}
-
-export interface ReportAccountModal {
-  name: 'report-account'
-  did: string
-}
+export type ReportModal = {
+  name: 'report'
+} & (
+  | {
+      uri: string
+      cid: string
+    }
+  | {did: string}
+)
 
 export interface CreateOrEditMuteListModal {
   name: 'create-or-edit-mute-list'
@@ -159,8 +158,7 @@ export type Modal =
 
   // Moderation
   | ModerationDetailsModal
-  | ReportAccountModal
-  | ReportPostModal
+  | ReportModal
   | CreateOrEditMuteListModal
   | ListAddRemoveUserModal