feat: unarchive funded accounts

Author: angelix

common/src/commonMain/kotlin/com/blockstream/common/gdk/GdkSession.kt

@@ -1754,7 +1754,7 @@ class GdkSession constructor(
     private suspend fun initializeSessionData(wallet: GreenWallet?, initNetwork: String?, initAccount: Long?) {
         // Check if active account index was archived from 1) a different client (multisig) or 2) from cached Singlesig hww session
         // Expect refresh = true to be already called
-        updateAccounts()
+        updateAccounts(unarchiveFunded = true)
 
         _activeAccountStateFlow.value = accounts.value.find {
             it.networkId == initNetwork && it.pointer == initAccount && !it.hidden
@@ -2054,7 +2054,7 @@ class GdkSession constructor(
         _activeAccountStateFlow.value = accounts.value.find { it.id == account.id } ?: account
     }
 
-    fun removeAccount(account: Account) {
+    suspend fun removeAccount(account: Account) {
         if (account.isLightning) {
             hasLightning = false
 
@@ -2217,7 +2217,7 @@ class GdkSession constructor(
                 accountsAndBalancesMutex.withLock {
 
                     // Update accounts
-                    updateAccounts(refresh = refresh)
+                    updateAccounts(refresh = refresh, unarchiveFunded = true)
 
                     for (account in this@GdkSession.allAccounts.value) {
                         if ((updateBalancesForAccounts == null && updateBalancesForNetwork == null) || updateBalancesForAccounts?.find { account.id == it.id } != null || account.network == updateBalancesForNetwork) {
@@ -2634,14 +2634,22 @@ class GdkSession constructor(
         }
     }
 
-    private fun updateAccounts(refresh: Boolean = false) {
+    private suspend fun updateAccounts(refresh: Boolean = false, unarchiveFunded: Boolean = false) {
         getAccounts(refresh).also { fetchedAccounts ->
             _allAccountsStateFlow.value = fetchedAccounts
+
             fetchedAccounts.filter { !it.hidden }.also {
                 _accountsStateFlow.value = it
                 _zeroAccounts.value = it.isEmpty() && failedNetworks.value.isEmpty()
             }
 
+            if (unarchiveFunded) {
+                // Unarchive accounts if they are hidden and funded
+                fetchedAccounts.filter { it.hidden && it.isFunded(this) }.forEach {
+                    updateAccount(it, isHidden = false)
+                }
+            }
+
             // Update active account to get fresh data, also prevent it from being archived and active
             _activeAccountStateFlow.value = accounts.value.find {
                 activeAccount.value?.id == it.id

common/src/commonMain/kotlin/com/blockstream/common/models/archived/ArchivedAccountsViewModel.kt

@@ -9,6 +9,7 @@ import com.blockstream.common.extensions.launchIn
 import com.blockstream.common.extensions.previewAccountAssetBalance
 import com.blockstream.common.extensions.previewWallet
 import com.blockstream.common.gdk.data.AccountAssetBalance
+import com.blockstream.common.gdk.data.AccountType
 import com.blockstream.common.models.GreenViewModel
 import com.blockstream.ui.navigation.NavData
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState
@@ -35,9 +36,13 @@ class ArchivedAccountsViewModel(greenWallet: GreenWallet, navigateToRoot: Boolea
     ArchivedAccountsViewModelAbstract(greenWallet = greenWallet, navigateToRoot = navigateToRoot) {
 
     override val archivedAccounts: StateFlow<DataState<List<AccountAssetBalance>>> =
-        session.allAccounts.map {
+        session.allAccounts.map { allAccounts ->
             DataState.Success(
-                it.filter { it.hidden && it.hasHistory(session) }.map {
+                allAccounts.filter {
+                    it.hidden
+                }.filter {
+                    it.hasHistory(session) || !(it.type == AccountType.BIP49_SEGWIT_WRAPPED && it.pointer == 0L) // GDK default account
+                }.map {
                     AccountAssetBalance.create(accountAsset = it.accountAsset, session = session)
                 }
             )

common/src/commonMain/kotlin/com/blockstream/common/models/assetaccounts/AssetAccountDetailsViewModel.kt

@@ -26,7 +26,6 @@ import com.blockstream.green.utils.Loggable
 import com.blockstream.ui.events.Event
 import com.blockstream.ui.navigation.NavAction
 import com.blockstream.ui.navigation.NavData
-import org.jetbrains.compose.resources.getString
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState
 import com.rickclephas.kmp.observableviewmodel.coroutineScope
 import com.rickclephas.kmp.observableviewmodel.launch
@@ -38,6 +37,7 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
+import org.jetbrains.compose.resources.getString
 
 abstract class AssetAccountDetailsViewModelAbstract(
     greenWallet: GreenWallet, accountAssetOrNull: AccountAsset? = null
@@ -232,7 +232,7 @@ class AssetAccountDetailsViewModel(
         accountAsset: AccountAsset?,
         watchOnly: Boolean
     ): List<NavAction> {
-        if (account.isLightning) {
+        if (account.isLightning || watchOnly) {
             return emptyList()
         }
 
@@ -244,7 +244,7 @@ class AssetAccountDetailsViewModel(
                 onClick = {
                     postEvent(NavigateDestinations.RenameAccount(greenWallet = greenWallet, account = account))
                 }
-            ).takeIf { !watchOnly },
+            ),
 
             NavAction(
                 title = getString(Res.string.id_watchonly),
@@ -260,20 +260,17 @@ class AssetAccountDetailsViewModel(
                         postEvent(NavigateDestinations.WatchOnlyCredentialsSettings(greenWallet = greenWallet, network = account.network))
                     }
                 }
-            ).takeIf { !watchOnly },
+            ),
 
             NavAction(
                 title = getString(Res.string.id_archive_account),
                 icon = Res.drawable.box_arrow_down,
                 isMenuEntry = true,
+                enabled = !account.isFunded(session) && !account.hasUnconfirmedTransactions(session),
                 onClick = {
                     postEvent(Events.ArchiveAccount(account))
                 }
-            ).takeIf { 
-                !watchOnly &&
-                !account.isFunded(session) &&
-                !account.hasUnconfirmedTransactions(session)
-            }
+            )
         )
     }
 

compose/src/commonMain/kotlin/com/blockstream/compose/components/PopupMenu.kt

@@ -36,6 +36,7 @@ data class MenuEntry(
     val title: String,
     val iconRes: DrawableResource? = null,
     val imageVector: ImageVector? = null,
+    val enabled: Boolean = true,
     val onClick: () -> Unit = {}
 ) {
     companion object {
@@ -46,6 +47,7 @@ data class MenuEntry(
                 title = navAction.title ?: stringResource(navAction.titleRes!!),
                 iconRes = navAction.icon,
                 imageVector = navAction.imageVector,
+                enabled = navAction.enabled,
                 onClick = navAction.onClick
             )
         }
@@ -70,6 +72,7 @@ fun PopupMenu(modifier: Modifier = Modifier, state: PopupState, entries: List<Me
         entries.forEach {
             DropdownMenuItem(
                 text = { Text(it.title) },
+                enabled = it.enabled,
                 onClick = {
                     it.onClick.invoke()
                     state.isContextMenuVisible.value = false
@@ -115,14 +118,15 @@ fun ActionMenu(
                     TextButton(
                         onClick = it.onClick,
                         modifier = Modifier.align(Alignment.CenterVertically),
+                        enabled = it.enabled,
                         colors = ButtonDefaults.textButtonColors(contentColor = MaterialTheme.colorScheme.onSurface)
                     ) {
                         Text(text = it.title ?: stringResource(it.titleRes!!), style = labelMedium)
                     }
                 } else {
                     IconButton(onClick = {
                         it.onClick()
-                    }) {
+                    }, enabled = it.enabled) {
                         it.icon?.also {
                             Icon(
                                 painter = painterResource(it),

ui-common/src/commonMain/kotlin/com/blockstream/ui/navigation/AppBarState.kt

@@ -43,6 +43,7 @@ data class NavAction(
     val icon: DrawableResource? = null,
     val imageVector: ImageVector? = null,
     val isMenuEntry: Boolean = false,
+    val enabled: Boolean = true,
     val onClick: () -> Unit = { }
 )