From abbc6543f423efdcd26f44666d9847ecd70779dc Mon Sep 17 00:00:00 2001 From: Foysal Ahamed Date: Tue, 15 Aug 2023 23:32:06 +0200 Subject: :sparkles: Repurpose report post modal and re-use for list reporting (#1070) * :sparkles: Repupose report post modal and re-use for list reporting * :sparkles: Allow reporting a feed generator * :sparkles: :recycle: Refactor report modal into one shared component for reporting different collections * :white_check_mark: Adjust report option selector in tests * :white_check_mark: Add test for list reporting * :recycle: :sparkles: Refactor reason options and add options for list and feedgen * :broom: Cleanup remaining todo * Fix to mutelist react keys * Fix regression from rebase * Improve customfeed mobile header --------- Co-authored-by: Paul Frazee --- src/state/models/ui/shell.ts | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/state/models/ui/shell.ts') 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 -- cgit 1.4.1