Skip to content

Commit 6bed12e

Browse files
committed
Merge branch 'develop' of github.com:duckduckgo/Android into develop
2 parents eb90bb8 + 72bb818 commit 6bed12e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModel.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,6 @@ class TabSwitcherViewModel @Inject constructor(
671671

672672
val dynamicInterface = when (mode) {
673673
is Normal -> {
674-
val isThereOnlyNewTabPage = tabs.size == 1 && tabs.first().isNewTabPage
675674
DynamicInterface(
676675
isFireButtonVisible = true,
677676
isNewTabButtonVisible = isNewToolbarEnabled,
@@ -688,7 +687,7 @@ class TabSwitcherViewModel @Inject constructor(
688687
isCloseOtherTabsVisible = false,
689688
isCloseAllTabsDividerVisible = true,
690689
isCloseAllTabsVisible = true,
691-
isMenuButtonEnabled = !isThereOnlyNewTabPage,
690+
isMenuButtonEnabled = true,
692691
isMainFabVisible = !isNewToolbarEnabled,
693692
isAIFabVisible = isDuckAIButtonVisible && !isNewToolbarEnabled,
694693
mainFabType = FabType.NEW_TAB,

app/src/test/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModelTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ class TabSwitcherViewModelTest {
920920
isCloseOtherTabsVisible = false,
921921
isCloseAllTabsDividerVisible = true,
922922
isCloseAllTabsVisible = true,
923-
isMenuButtonEnabled = false,
923+
isMenuButtonEnabled = true,
924924
isMainFabVisible = true,
925925
isAIFabVisible = true,
926926
mainFabType = FabType.NEW_TAB,
@@ -1341,7 +1341,7 @@ class TabSwitcherViewModelTest {
13411341
isCloseOtherTabsVisible = false,
13421342
isCloseAllTabsDividerVisible = true,
13431343
isCloseAllTabsVisible = true,
1344-
isMenuButtonEnabled = false,
1344+
isMenuButtonEnabled = true,
13451345
isMainFabVisible = false,
13461346
isAIFabVisible = false,
13471347
mainFabType = FabType.NEW_TAB,

0 commit comments

Comments
 (0)