fix: alerts for re-enable expired 2fa

Author: angelix

common/src/commonMain/composeResources/drawable/re_enable_two_factor.xml

@@ -1676,4 +1676,5 @@
     <string name="id_generate_amp_id">Generate AMP ID</string>
     <string name="id_copy_amp_id">Copy AMP ID</string>
     <string name="id_data_not_available">Data not available</string>
+    <string name="id_some_coins_are_no_longer_2fa_protected">Some coins are no longer 2FA protected.</string>
 </resources>

common/src/commonMain/composeResources/values/strings.xml

@@ -13,4 +13,5 @@ sealed class AlertType {
     data class Banner(val banner: com.blockstream.green.data.banner.Banner) : AlertType()
     data object FailedNetworkLogin : AlertType()
     data class LspStatus(val maintenance: Boolean) : AlertType()
+    data object ReEnable2FA : AlertType()
 }

common/src/commonMain/kotlin/com/blockstream/common/data/AlertType.kt

@@ -66,4 +66,30 @@ public fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(
         args[6] as T7,
         args[7] as T8,
     )
+}
+
+@Suppress("UNCHECKED_CAST")
+public fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(
+    flow: Flow<T1>,
+    flow2: Flow<T2>,
+    flow3: Flow<T3>,
+    flow4: Flow<T4>,
+    flow5: Flow<T5>,
+    flow6: Flow<T6>,
+    flow7: Flow<T7>,
+    flow8: Flow<T8>,
+    flow9: Flow<T9>,
+    transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9) -> R
+): Flow<R> = kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6, flow7, flow8, flow9) { args: Array<*> ->
+    transform(
+        args[0] as T1,
+        args[1] as T2,
+        args[2] as T3,
+        args[3] as T4,
+        args[4] as T5,
+        args[5] as T6,
+        args[6] as T7,
+        args[7] as T8,
+        args[8] as T9,
+    )
 }

common/src/commonMain/kotlin/com/blockstream/common/extensions/Zip.kt

@@ -3070,7 +3070,7 @@ class GdkSession constructor(
         scope.launch(context = logException(countly)) {
             _expired2FAStateFlow.value = accounts.value.filter {
 
-                it.type == AccountType.STANDARD && !it.needs2faActivation(this@GdkSession) && getUnspentOutputs(
+                it.type == AccountType.STANDARD && getUnspentOutputs(
                     account = it,
                     isExpired = true
                 ).unspentOutputs.isNotEmpty()

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

@@ -220,18 +220,20 @@ class WalletOverviewViewModel(
             .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), greenWallet),
         _twoFactorState,
         _systemMessage,
+        session.expired2FA,
         session.failedNetworks,
         session.lightningSdkOrNull?.healthCheckStatus ?: MutableStateFlow(null),
         banner,
         hideWalletBackupAlert,
         session.walletTotalBalance
-    ) { greenWallet, twoFactorState, systemMessage, failedNetworkLogins, lspHeath, banner, hideWalletBackupAlert, walletTotalBalance ->
+    ) { greenWallet, twoFactorState, systemMessage, expired2FA, failedNetworkLogins, lspHeath, banner, hideWalletBackupAlert, walletTotalBalance ->
         listOfNotNull(
             if (!greenWallet.isRecoveryConfirmed && !hideWalletBackupAlert && walletTotalBalance > 0) AlertType.RecoveryIsUnconfirmed(
                 withCloseButton = true
             ) else null,
             twoFactorState,
             systemMessage,
+            if (expired2FA.isNotEmpty()) AlertType.ReEnable2FA else null,
             if (greenWallet.isBip39Ephemeral) AlertType.EphemeralBip39 else null,
             banner?.let { AlertType.Banner(it) },
             if (session.isTestnet) AlertType.TestnetWarning else null,
@@ -286,7 +288,7 @@ class WalletOverviewViewModel(
             // Support only for Bitcoin
             session.bitcoinMultisig?.let { network ->
                 session.twoFactorReset(network).filter { session.isConnected }.onEach {
-                    _twoFactorState.value = if (it != null && it.isActive == true) {
+                    _twoFactorState.value = if (it?.isActive == true) {
                         if (it.isDisputed == true) {
                             AlertType.Dispute2FA(network, it)
                         } else {

common/src/commonMain/kotlin/com/blockstream/common/models/overview/WalletOverviewViewModel.kt

@@ -477,7 +477,7 @@ abstract class CreateTransactionViewModelAbstract(
 
                 session.pendingTransaction = null // clear pending transaction
                 postSideEffect(SideEffects.Snackbar(StringHolder.create(Res.string.id_transaction_sent)))
-                postSideEffect(SideEffects.NavigateToRoot(popTo = PopTo.Transact))
+                postSideEffect(SideEffects.NavigateToTransactTab)
             } else {
                 postSideEffect(
                     SideEffects.Dialog(

common/src/commonMain/kotlin/com/blockstream/common/models/send/CreateTransactionViewModel.kt

@@ -1,8 +1,10 @@
 package com.blockstream.common.utils
 
 import com.blockstream.common.data.DataState
+import com.blockstream.common.events.Events
 import com.blockstream.common.models.login.LoginViewModel
 import com.blockstream.common.models.login.LoginViewModelAbstract
+import com.blockstream.common.sideeffects.SideEffects
 import com.blockstream.green.data.config.AppInfo
 import com.rickclephas.kmp.observableviewmodel.launch
 import kotlinx.coroutines.flow.first
@@ -40,6 +42,7 @@ class SetupDevelopmentEnv : KoinComponent {
             // If PIN credentials are available, attempt auto-login
             if (pinCredentialsState is DataState.Success) {
                 viewModel.postEvent(LoginViewModel.LocalEvents.LoginWithPin(appInfo.developmentPin!!))
+                viewModel.postEvent(Events.EventSideEffect(SideEffects.Snackbar(StringHolder(string = "Login with development PIN"))))
             }
         }
     }