From 053c345f95fb4b11a92a14d5097aeb46dd209470 Mon Sep 17 00:00:00 2001 From: Brian Yencho Date: Wed, 6 Dec 2023 10:00:52 -0600 Subject: [PATCH] BIT-853: Updated email when switching account on Vault Unlock screen (#332) --- .../ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt | 1 + .../ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt index e55a3ed124..ad6e09fde3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt @@ -171,6 +171,7 @@ class VaultUnlockViewModel @Inject constructor( initials = activeAccountSummary.initials, avatarColorString = activeAccountSummary.avatarColorHex, accountSummaries = accountSummaries, + email = activeAccountSummary.email, ) } } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt index 793042a545..ae064e0fa1 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt @@ -98,7 +98,7 @@ class VaultUnlockViewModelTest : BaseViewModelTest() { UserState.Account( userId = "activeUserId", name = "Other User", - email = "active@bitwarden.com", + email = "active+test@bitwarden.com", avatarColorHex = "#00aaaa", isPremium = true, isVaultUnlocked = true, @@ -110,11 +110,12 @@ class VaultUnlockViewModelTest : BaseViewModelTest() { DEFAULT_STATE.copy( avatarColorString = "#00aaaa", initials = "OU", + email = "active+test@bitwarden.com", accountSummaries = listOf( AccountSummary( userId = "activeUserId", name = "Other User", - email = "active@bitwarden.com", + email = "active+test@bitwarden.com", avatarColorHex = "#00aaaa", status = AccountSummary.Status.ACTIVE, ),