From 43258395033b35fd095c9584b5c956d139bf46ea Mon Sep 17 00:00:00 2001
From: Fabian Freund <github@fabi.online>
Date: Fri, 13 Mar 2026 03:29:20 +0100
Subject: [PATCH] fix button duplication issue when tab bar in top mode

---
 .../widgets/browser_modules/bottom_app_bar.dart        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart b/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart
index 41354953..e7bd5820 100644
--- a/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart
+++ b/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart
@@ -67,6 +67,8 @@ class BrowserTopAppBar extends StatelessWidget {
       displayedSheet: null,
       showContextualToolbar: false,
       showQuickTabSwitcherBar: false,
+      hideMainToolbarButtonsDuplicatedInContextualToolbar:
+          showContextualToolbar,
     );
   }
 
@@ -101,6 +103,8 @@ class BrowserBottomAppBar extends StatelessWidget {
       showMainToolbar: showMainToolbar,
       showContextualToolbar: showContextualToolbar,
       showQuickTabSwitcherBar: showQuickTabSwitcherBar,
+      hideMainToolbarButtonsDuplicatedInContextualToolbar:
+          showContextualToolbar,
     );
   }
 
@@ -127,6 +131,7 @@ class BrowserTabBar extends HookConsumerWidget {
   final bool showContextualToolbar;
   final bool showQuickTabSwitcherBar;
   final Sheet? displayedSheet;
+  final bool hideMainToolbarButtonsDuplicatedInContextualToolbar;
 
   const BrowserTabBar({
     super.key,
@@ -134,6 +139,7 @@ class BrowserTabBar extends HookConsumerWidget {
     required this.displayedSheet,
     required this.showContextualToolbar,
     required this.showQuickTabSwitcherBar,
+    this.hideMainToolbarButtonsDuplicatedInContextualToolbar = false,
   });
 
   static const contextualToolabarHeight = 54.0;
@@ -176,13 +182,13 @@ class BrowserTabBar extends HookConsumerWidget {
         .value;
 
     final tabsCountInContextual =
-        showContextualToolbar &&
+        hideMainToolbarButtonsDuplicatedInContextualToolbar &&
         contextualConfigs.any(
           (c) => c.buttonId == ToolbarButtonId.tabsCount.name && c.isVisible,
         );
 
     final menuInContextual =
-        showContextualToolbar &&
+        hideMainToolbarButtonsDuplicatedInContextualToolbar &&
         contextualConfigs.any(
           (c) =>
               c.buttonId == ToolbarButtonId.navigationMenu.name && c.isVisible,