From 4ba4b589dea1c466a8f4f2d18d95aea7099ca799 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Thu, 13 Aug 2020 22:47:30 -0400
Subject: [PATCH] For #13293: Show Add To Collections after tabs load

---
 app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index 3be06f084..8e8781e65 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -137,12 +137,14 @@ class TabTrayView(
 
         setTopOffset(startingInLandscape)
 
+        val concatAdapter = ConcatAdapter(tabsAdapter)
+
         view.tabsTray.apply {
             layoutManager = LinearLayoutManager(container.context).apply {
                 reverseLayout = true
                 stackFromEnd = true
             }
-            adapter = ConcatAdapter(collectionsButtonAdapter, tabsAdapter)
+            adapter = concatAdapter
 
             tabsTouchHelper = TabsTouchHelper(
                 observable = tabsAdapter,
@@ -153,6 +155,9 @@ class TabTrayView(
 
             tabsAdapter.tabTrayInteractor = interactor
             tabsAdapter.onTabsUpdated = {
+                // Put the 'Add to collections' button after the tabs have loaded.
+                concatAdapter.addAdapter(0, collectionsButtonAdapter)
+
                 if (hasAccessibilityEnabled) {
                     tabsAdapter.notifyDataSetChanged()
                 }