From 6a3306047356e6a479a25bece79c4a2e2fde9206 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 18 Jul 2020 15:24:48 -0500 Subject: [PATCH] Fix sidebar rename bug --- Multiplatform/Shared/Sidebar/SidebarItem.swift | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Multiplatform/Shared/Sidebar/SidebarItem.swift b/Multiplatform/Shared/Sidebar/SidebarItem.swift index 1e1f54f88..a848cc887 100644 --- a/Multiplatform/Shared/Sidebar/SidebarItem.swift +++ b/Multiplatform/Shared/Sidebar/SidebarItem.swift @@ -27,11 +27,7 @@ struct SidebarItem: Identifiable { var children: [SidebarItem] = [SidebarItem]() var unreadCount: Int - - var nameForDisplay: String { - guard let displayNameProvider = represented as? DisplayNameProvider else { return "" } - return displayNameProvider.nameForDisplay - } + var nameForDisplay: String var feed: Feed? { represented as? Feed @@ -64,18 +60,21 @@ struct SidebarItem: Identifiable { self.id = .smartFeedController self.represented = smartFeedsController self.unreadCount = 0 + self.nameForDisplay = smartFeedsController.nameForDisplay } init(_ account: Account) { self.id = .account(account.accountID) self.represented = account self.unreadCount = account.unreadCount + self.nameForDisplay = account.nameForDisplay } init(_ feed: Feed, unreadCount: Int) { self.id = .feed(feed.feedID!) self.represented = feed self.unreadCount = unreadCount + self.nameForDisplay = feed.nameForDisplay } mutating func addChild(_ sidebarItem: SidebarItem) {