From 5a2f2e6d86335534773a33772cf0463ab6d4f7a2 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Wed, 15 May 2019 10:51:04 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/2224: Removes select bookmark
 and fixes crash

---
 .../org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt  | 5 -----
 .../bookmarks/selectfolder/SelectBookmarkFolderFragment.kt   | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt
index eecf49d226..84d0644f80 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt
@@ -37,11 +37,6 @@ class BookmarkItemMenu(
                     onItemTapped.invoke(BookmarkItemMenu.Item.Edit)
                 }
             } else null,
-            if (item.type in listOf(BookmarkNodeType.ITEM, BookmarkNodeType.FOLDER)) {
-                SimpleBrowserMenuItem(context.getString(R.string.bookmark_menu_select_button)) {
-                    onItemTapped.invoke(BookmarkItemMenu.Item.Select)
-                }
-            } else null,
             if (item.type == BookmarkNodeType.ITEM) {
                 SimpleBrowserMenuItem(context.getString(R.string.bookmark_menu_copy_button)) {
                     onItemTapped.invoke(BookmarkItemMenu.Item.Copy)
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt
index 138c7037ce..682aa2c4ac 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt
@@ -73,7 +73,7 @@ class SelectBookmarkFolderFragment : Fragment(), CoroutineScope, AccountObserver
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.fragment_select_bookmark_folder, container, false)
         signInComponent = SignInComponent(
-            view.bookmark_layout,
+            view.select_bookmark_layout,
             ActionBusFactory.get(this),
             FenixViewModelProvider.create(
                 this,