From 4dd2bf7301042e54d89f685e0b1498620436b770 Mon Sep 17 00:00:00 2001
From: Florent CHAMPIGNY <champigny.florent@gmail.com>
Date: Thu, 9 Oct 2025 09:21:03 +0200
Subject: [PATCH] Feat databases view (#318)

Co-authored-by: Florent Champigny <florent@bere.al>
---
 .../flocondesktop/features/database/DatabaseViewModel.kt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/database/DatabaseViewModel.kt b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/database/DatabaseViewModel.kt
index b107b7a7..1c03a9af 100644
--- a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/database/DatabaseViewModel.kt
+++ b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/database/DatabaseViewModel.kt
@@ -59,11 +59,8 @@ class DatabaseViewModel(
 
     init {
         viewModelScope.launch(dispatcherProvider.viewModel) {
-            combines(
-                observeCurrentDeviceIdAndPackageNameUseCase(),
-                databaseSelectorDelegate.deviceDataBases,
-            ).collect { (device, databases) ->
-                if (_tabs.value[device].isNullOrEmpty()) {
+            databaseSelectorDelegate.deviceDataBases.collect { databases ->
+                getCurrentDeviceIdAndPackageNameUseCase()?.let {
                     databases.selectedDatabase()?.let {
                         createTabForDatabase(it.id)
                     }
@@ -137,7 +134,7 @@ class DatabaseViewModel(
         if (selectedTab.value == tab) {
             _selectedTab.update {
                 val newTab = _tabs.value[deviceIdAndPackageName]?.firstOrNull()
-                if(newTab == null) {
+                if (newTab == null) {
                     it - deviceIdAndPackageName
                 } else {
                     it + (deviceIdAndPackageName to newTab)