diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index f0f8db6d55..0b35d4ea75 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -666,6 +666,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope { val selectedSet = mutableSetOf(tabs) viewModel?.selectedTabs = selectedSet viewModel?.saveCollectionStep = SaveCollectionStep.SelectCollection + viewModel?.tabCollections = requireComponents.core.tabCollectionStorage.cachedTabCollections.reversed() view?.let { val directions = BrowserFragmentDirections.actionBrowserFragmentToCreateCollectionFragment() Navigation.findNavController(it).navigate(directions) diff --git a/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt b/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt index 9040c09bc6..1914e0706a 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt @@ -121,8 +121,9 @@ class CreateCollectionFragment : DialogFragment(), CoroutineScope { is CollectionCreationAction.SaveCollectionName -> { showSavedSnackbar(it.tabs.size) dismiss() + context?.let { context -> - val sessionBundle = it.tabs.toSessionBundle(context) + val sessionBundle = viewModel.selectedTabs.toList().toSessionBundle(context) launch(Dispatchers.IO) { requireComponents.core.tabCollectionStorage.createCollection(it.name, sessionBundle) }