Merge pull request #1336 from radixdlt/feature/ABW-4081-security-shie…

…lds-list [ABW-4081] Security shields list
radixdlt · Feb 18, 2025 · 15e582e · 15e582e
2 parents 4138ec3 + e90a2e7
commit 15e582e
Show file tree

Hide file tree

Showing 25 changed files with 1,059 additions and 87 deletions.
diff --git a/...babylon/wallet/android/presentation/settings/debug/factors/SecurityFactorSamplesScreen.kt b/...babylon/wallet/android/presentation/settings/debug/factors/SecurityFactorSamplesScreen.kt
@@ -32,7 +32,7 @@ import com.babylon.wallet.android.presentation.ui.composables.statusBarsAndBanne
 import com.babylon.wallet.android.presentation.ui.model.factors.FactorSourceCard
 import com.babylon.wallet.android.presentation.ui.model.factors.FactorSourceKindCard
 import com.babylon.wallet.android.presentation.ui.model.factors.FactorSourceStatusMessage
-import com.babylon.wallet.android.presentation.ui.model.factors.StatusMessage
+import com.babylon.wallet.android.presentation.ui.model.shared.StatusMessage
 import com.radixdlt.sargon.Account
 import com.radixdlt.sargon.FactorSourceId
 import com.radixdlt.sargon.FactorSourceKind

diff --git a/...ylon/wallet/android/presentation/settings/debug/factors/SecurityFactorSamplesViewModel.kt b/...ylon/wallet/android/presentation/settings/debug/factors/SecurityFactorSamplesViewModel.kt
@@ -6,7 +6,7 @@ import com.babylon.wallet.android.presentation.common.UiState
 import com.babylon.wallet.android.presentation.ui.model.factors.FactorSourceCard
 import com.babylon.wallet.android.presentation.ui.model.factors.FactorSourceKindCard
 import com.babylon.wallet.android.presentation.ui.model.factors.FactorSourceStatusMessage
-import com.babylon.wallet.android.presentation.ui.model.factors.StatusMessage
+import com.babylon.wallet.android.presentation.ui.model.shared.StatusMessage
 import com.babylon.wallet.android.utils.relativeTimeFormatted
 import com.radixdlt.sargon.Account
 import com.radixdlt.sargon.DeviceFactorSource

diff --git a/...om/babylon/wallet/android/presentation/settings/securitycenter/SecurityCenterViewModel.kt b/...om/babylon/wallet/android/presentation/settings/securitycenter/SecurityCenterViewModel.kt
@@ -9,6 +9,8 @@ import com.babylon.wallet.android.presentation.common.OneOffEventHandler
 import com.babylon.wallet.android.presentation.common.OneOffEventHandlerImpl
 import com.babylon.wallet.android.presentation.common.StateViewModel
 import com.babylon.wallet.android.presentation.common.UiState
+import com.babylon.wallet.android.utils.callSafely
+import com.radixdlt.sargon.os.SargonOsManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
@@ -19,8 +21,9 @@ import javax.inject.Inject
 
 @HiltViewModel
 class SecurityCenterViewModel @Inject constructor(
+    private val sargonOsManager: SargonOsManager,
     getSecurityProblemsUseCase: GetSecurityProblemsUseCase,
-    @DefaultDispatcher dispatcher: CoroutineDispatcher
+    @DefaultDispatcher private val defaultDispatcher: CoroutineDispatcher
 ) : StateViewModel<SecurityCenterViewModel.SecurityCenterUiState>(),
     OneOffEventHandler<SecurityCenterViewModel.Event> by OneOffEventHandlerImpl() {
 
@@ -37,14 +40,15 @@ class SecurityCenterViewModel @Inject constructor(
                     )
                 )
             }
-            .flowOn(dispatcher)
+            .flowOn(defaultDispatcher)
             .launchIn(viewModelScope)
     }
 
     fun onSecurityShieldsClick() {
         viewModelScope.launch {
-            // TODO perform the actual check
-            val hasSecurityShields = false
+            val hasSecurityShields = sargonOsManager.callSafely(defaultDispatcher) {
+                getShieldsForDisplay().isNotEmpty()
+            }.getOrElse { false }
             sendEvent(
                 if (hasSecurityShields) {
                     Event.ToSecurityShields

diff --git a/.../android/presentation/settings/securitycenter/common/composables/ShieldSetupStatusView.kt b/.../android/presentation/settings/securitycenter/common/composables/ShieldSetupStatusView.kt
@@ -8,7 +8,7 @@ import com.babylon.wallet.android.R
 import com.babylon.wallet.android.designsystem.theme.RadixTheme
 import com.babylon.wallet.android.presentation.dialogs.info.GlossaryItem
 import com.babylon.wallet.android.presentation.ui.composables.StatusMessageText
-import com.babylon.wallet.android.presentation.ui.model.factors.StatusMessage
+import com.babylon.wallet.android.presentation.ui.model.shared.StatusMessage
 import com.babylon.wallet.android.presentation.ui.modifier.noIndicationClickable
 import com.babylon.wallet.android.utils.formattedSpans
 
@@ -53,8 +53,7 @@ fun ShieldSetupNotEnoughFactorsStatusView(
     StatusMessageText(
         modifier = modifier.noIndicationClickable { onInfoClick(GlossaryItem.buildingshield) },
         message = StatusMessage(
-            // TODO crowdin
-            message = "You haven’t chosen enough factors to build a Shield. Learn about **Factors required for Shield**".formattedSpans(
+            message = stringResource(R.string.shieldSetupStatus_notEnoughFactors).formattedSpans(
                 boldStyle = SpanStyle(
                     color = RadixTheme.colors.blue2,
                     fontWeight = RadixTheme.typography.body1StandaloneLink.fontWeight,

diff --git a/...wallet/android/presentation/settings/securitycenter/securityshields/SecurityShieldsNav.kt b/...wallet/android/presentation/settings/securitycenter/securityshields/SecurityShieldsNav.kt
@@ -9,6 +9,7 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptionsBuilder
 import androidx.navigation.compose.composable
 import androidx.navigation.navigation
+import com.babylon.wallet.android.presentation.dialogs.info.infoDialog
 import com.babylon.wallet.android.presentation.settings.securitycenter.applyshield.applyShieldNavGraph
 import com.babylon.wallet.android.presentation.settings.securitycenter.securityshields.addfactor.addFactor
 import com.babylon.wallet.android.presentation.settings.securitycenter.securityshields.factorsready.factorsReady
@@ -70,8 +71,10 @@ fun NavGraphBuilder.securityShieldsScreen(
     ) {
         SecurityShieldsScreen(
             viewModel = hiltViewModel(),
+            onNavigateToSecurityShieldDetails = { /* TODO security shield details screen */ },
+            onCreateNewSecurityShieldClick = { navController.securityShieldOnboarding() },
+            onInfoClick = { glossaryItem -> navController.infoDialog(glossaryItem) },
             onBackClick = { navController.navigateUp() },
-            onCreateShieldClick = { navController.securityShieldOnboarding() }
         )
     }
 }