From 3fe5ec5ffa98e5e5bbea529c29c3b9dd2cde5745 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Mon, 4 Dec 2023 09:16:35 +0200 Subject: [PATCH] Fix secure backup recovery badges not being show when incomplete --- .../SecureBackupScreen/View/SecureBackupScreen.swift | 1 + .../Settings/SettingsScreen/SettingsScreenViewModel.swift | 2 +- .../test_secureBackupScreen.Recovery-incomplete.png | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupScreen/View/SecureBackupScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupScreen/View/SecureBackupScreen.swift index 0f19bf279..eb35a42fd 100644 --- a/ElementX/Sources/Screens/SecureBackup/SecureBackupScreen/View/SecureBackupScreen.swift +++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupScreen/View/SecureBackupScreen.swift @@ -99,6 +99,7 @@ struct SecureBackupScreen: View { kind: .navigationLink { context.send(viewAction: .recoveryKey) }) case .incomplete: ListRow(label: .plain(title: L10n.screenChatBackupRecoveryActionConfirm), + details: .icon(BadgeView(size: 10)), kind: .navigationLink { context.send(viewAction: .recoveryKey) }) default: ListRow(label: .plain(title: L10n.commonLoading), details: .isWaiting(true), kind: .label) diff --git a/ElementX/Sources/Screens/Settings/SettingsScreen/SettingsScreenViewModel.swift b/ElementX/Sources/Screens/Settings/SettingsScreen/SettingsScreenViewModel.swift index c8b98af71..590560787 100644 --- a/ElementX/Sources/Screens/Settings/SettingsScreen/SettingsScreenViewModel.swift +++ b/ElementX/Sources/Screens/Settings/SettingsScreen/SettingsScreenViewModel.swift @@ -59,7 +59,7 @@ class SettingsScreenViewModel: SettingsScreenViewModelType, SettingsScreenViewMo .sink { [weak self] state in guard let self else { return } - self.state.showSecureBackupBadge = (state == .unknown || state == .disabled) && appSettings.chatBackupEnabled + self.state.showSecureBackupBadge = (state == .incomplete || state == .disabled) && appSettings.chatBackupEnabled } .store(in: &cancellables) diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Recovery-incomplete.png b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Recovery-incomplete.png index 4e24b42c0..eedfe2f81 100644 --- a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Recovery-incomplete.png +++ b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Recovery-incomplete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2429e552323f33b2e8feb64f8ed222752546dbacaab15c649bd0fe85900024d -size 111841 +oid sha256:333cd9be32f2a653d622db63d36697c31913a8bb29a3175a63744d1010aa358c +size 112225