Fix #8535: Fix toggling night mode

brave · Dec 17, 2023 · 5a6580a · 5a6580a
1 parent a9f0557
commit 5a6580a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift b/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift
@@ -285,9 +285,7 @@ extension BrowserViewController {
             browserViewController.dismiss(animated: true)
             browserViewController.tabToolbarDidPressShare()
           }
-          NightModeMenuButton(dismiss: {
-            browserViewController.dismiss(animated: true)
-          })
+          NightModeMenuButton()
           MenuItemButton(icon: Image(braveSystemName: "leo.browser.bookmark-add"), title: Strings.addToMenuItem) {
             browserViewController.dismiss(animated: true) {
               browserViewController.openAddBookmark()

diff --git a/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/NightModeMenuButton.swift b/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/NightModeMenuButton.swift
@@ -13,8 +13,6 @@ import Preferences
 struct NightModeMenuButton: View {
   @ObservedObject private var nightMode = Preferences.General.nightModeEnabled
 
-  var dismiss: () -> Void
-
   var body: some View {
     HStack {
       MenuItemHeaderView(
@@ -24,16 +22,12 @@ struct NightModeMenuButton: View {
       Toggle("", isOn: $nightMode.value)
         .labelsHidden()
         .toggleStyle(SwitchToggleStyle(tint: .accentColor))
-        .onChange(of: nightMode.value) { _ in
-          dismiss()
-        }
     }
     .padding(.horizontal, 14)
     .frame(maxWidth: .infinity, minHeight: 48.0)
     .background(
       Button(action: {
         Preferences.General.nightModeEnabled.value.toggle()
-        dismiss()
       }) {
         Color.clear
       }