diff --git a/Packages/Notifications/Sources/Notifications/Models/NotificationTypeExt.swift b/Packages/Notifications/Sources/Notifications/Models/NotificationTypeExt.swift index 2a197e2cc..0177ab016 100644 --- a/Packages/Notifications/Sources/Notifications/Models/NotificationTypeExt.swift +++ b/Packages/Notifications/Sources/Notifications/Models/NotificationTypeExt.swift @@ -22,7 +22,7 @@ extension Models.Notification.NotificationType { case .update: "notifications.label.update" case .quote: - "quoted a status" + "quoted your post" case .quoted_update: "updated a quoted status" } diff --git a/Packages/Notifications/Sources/Notifications/Row/NotificationRowContentView.swift b/Packages/Notifications/Sources/Notifications/Row/NotificationRowContentView.swift index 822421112..14bcd6735 100644 --- a/Packages/Notifications/Sources/Notifications/Row/NotificationRowContentView.swift +++ b/Packages/Notifications/Sources/Notifications/Row/NotificationRowContentView.swift @@ -14,27 +14,41 @@ struct NotificationRowContentView: View { var body: some View { if let status = notification.status { - HStack { - if notification.type == .mention { - StatusRowExternalView( - viewModel: .init( - status: status, - client: client, - routerPath: routerPath, - showActions: true) - ) - .environment(\.isNotificationsTab, false) - .environment(\.isMediaCompact, false) - } else { - StatusRowExternalView( - viewModel: .init( - status: status, + HStack(alignment: .top) { + VStack(alignment: .leading, spacing: 8) { + if notification.type == .mention { + StatusRowExternalView( + viewModel: .init( + status: status, + client: client, + routerPath: routerPath, + showActions: true) + ) + .environment(\.isNotificationsTab, false) + .environment(\.isMediaCompact, false) + } else { + StatusRowExternalView( + viewModel: .init( + status: status, + client: client, + routerPath: routerPath, + showActions: false, + textDisabled: notification.type != .quote) + ) + .environment(\.isMediaCompact, true) + } + + if notification.type == .quote, + status.quote?.state == .accepted, + let quotedStatus = status.quote?.quotedStatus + { + StatusEmbeddedView( + status: quotedStatus, client: client, - routerPath: routerPath, - showActions: false, - textDisabled: true) - ) - .environment(\.isMediaCompact, true) + routerPath: routerPath + ) + .padding(.bottom, 8) + } } Spacer() }