From 547a843c5cf33b4b4da5fa5da60b7437b8fc5129 Mon Sep 17 00:00:00 2001
From: Elise Richards <erichards@mozilla.com>
Date: Tue, 6 Apr 2021 14:40:32 -0500
Subject: [PATCH] For #18770 - Correct addons position in three dot menu based
 on toolbar position (#18828)

---
 .../components/toolbar/DefaultToolbarMenu.kt  | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index ca3c39ba5d..5f926f3e4e 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -83,13 +83,13 @@ open class DefaultToolbarMenu(
                 } else {
                     oldCoreMenuItems
                 },
-            endOfMenuAlwaysVisible = !shouldUseBottomToolbar,
+            endOfMenuAlwaysVisible = shouldUseBottomToolbar,
             store = store,
             webExtIconTintColorResource = primaryTextColor,
             onAddonsManagerTapped = {
                 onItemTapped.invoke(ToolbarMenu.Item.AddonsManager)
             },
-            appendExtensionSubMenuAtStart = !shouldUseBottomToolbar
+            appendExtensionSubMenuAtStart = shouldUseBottomToolbar
         )
     }
 
@@ -374,6 +374,7 @@ open class DefaultToolbarMenu(
             menuItems.reversed()
         }
     }
+
     val newTabItem = BrowserMenuImageText(
         context.getString(R.string.library_new_tab),
         R.drawable.ic_new,
@@ -402,21 +403,21 @@ open class DefaultToolbarMenu(
         id = WebExtensionPlaceholderMenuItem.MAIN_EXTENSIONS_MENU_ID
     )
 
-        val accountManager = context.components.backgroundServices.accountManager
-        val account = accountManager.authenticatedAccount()
-        val syncItemTitle = if (account != null && accountManager.accountProfile()?.email != null) {
-            context.getString(R.string.sync_signed_as, accountManager.accountProfile()?.email)
-        } else {
-            context.getString(R.string.sync_menu_sign_in)
-        }
+    val accountManager = context.components.backgroundServices.accountManager
+    val account = accountManager.authenticatedAccount()
+    val syncItemTitle = if (account != null && accountManager.accountProfile()?.email != null) {
+        context.getString(R.string.sync_signed_as, accountManager.accountProfile()?.email)
+    } else {
+        context.getString(R.string.sync_menu_sign_in)
+    }
 
-        val syncedTabs = BrowserMenuImageText(
-            syncItemTitle,
-            R.drawable.ic_synced_tabs,
-            primaryTextColor()
-        ) {
-            onItemTapped.invoke(ToolbarMenu.Item.SyncedTabs)
-        }
+    val syncedTabs = BrowserMenuImageText(
+        syncItemTitle,
+        R.drawable.ic_synced_tabs,
+        primaryTextColor()
+    ) {
+        onItemTapped.invoke(ToolbarMenu.Item.SyncedTabs)
+    }
 
     val findInPageItem = BrowserMenuImageText(
         label = context.getString(R.string.browser_menu_find_in_page),