diff --git a/Shared/EnvironmentValues.swift b/Shared/EnvironmentValues.swift index f7ae140d..6edd4a9f 100644 --- a/Shared/EnvironmentValues.swift +++ b/Shared/EnvironmentValues.swift @@ -30,10 +30,10 @@ private struct CurrentPlaylistID: EnvironmentKey { } private struct LoadMoreContentHandler: EnvironmentKey { - static let defaultValue: LoadMoreContentHandlerClosure = { print("infinite load") } + static let defaultValue: LoadMoreContentHandlerType = { } } -typealias LoadMoreContentHandlerClosure = () -> Void +typealias LoadMoreContentHandlerType = () -> Void extension EnvironmentValues { var inNavigationView: Bool { @@ -66,7 +66,7 @@ extension EnvironmentValues { set { self[CurrentPlaylistID.self] = newValue } } - var loadMoreContentHandler: LoadMoreContentHandlerClosure { + var loadMoreContentHandler: LoadMoreContentHandlerType { get { self[LoadMoreContentHandler.self] } set { self[LoadMoreContentHandler.self] = newValue } } diff --git a/Shared/MenuCommands.swift b/Shared/MenuCommands.swift index db186b6d..d20028fc 100644 --- a/Shared/MenuCommands.swift +++ b/Shared/MenuCommands.swift @@ -25,7 +25,7 @@ struct MenuCommands: Commands { Button("Popular") { model.navigation?.tabSelection = .popular } - .disabled(!(model.accounts?.app.supportsPopular ?? true)) + .disabled(!(model.accounts?.app.supportsPopular ?? false)) .keyboardShortcut("3") Button("Trending") {