From 46947fdba54a77651131525d23688868872743ff Mon Sep 17 00:00:00 2001 From: Andre Rosado Date: Wed, 26 Feb 2025 12:13:07 +0000 Subject: [PATCH] Revert "Revert invalid verification code string changes" This reverts commit 5ab5f0edcc5ff335a02d18874a854fca596b7448. --- .../auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt | 6 ++---- .../feature/twofactorlogin/TwoFactorLoginViewModelTest.kt | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt index 831bfbac1a0..6ba084b00e7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt @@ -306,8 +306,7 @@ class TwoFactorLoginViewModel @Inject constructor( it.copy( dialogState = TwoFactorLoginState.DialogState.Error( title = R.string.an_error_has_occurred.asText(), - message = loginResult.errorMessage?.asText() - ?: R.string.invalid_verification_code.asText(), + message = R.string.invalid_verification_code.asText(), ), ) } @@ -330,8 +329,7 @@ class TwoFactorLoginViewModel @Inject constructor( it.copy( dialogState = TwoFactorLoginState.DialogState.Error( title = R.string.an_error_has_occurred.asText(), - message = loginResult.errorMessage?.asText() - ?: R.string.invalid_verification_code.asText(), + message = R.string.invalid_verification_code.asText(), ), ) } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt index c7ba138fb94..67f41308421 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt @@ -672,7 +672,7 @@ class TwoFactorLoginViewModelTest : BaseViewModelTest() { DEFAULT_STATE.copy( dialogState = TwoFactorLoginState.DialogState.Error( title = R.string.an_error_has_occurred.asText(), - message = "Mock error message".asText(), + message = R.string.invalid_verification_code.asText(), ), ), awaitItem(), @@ -852,7 +852,7 @@ class TwoFactorLoginViewModelTest : BaseViewModelTest() { DEFAULT_STATE.copy( dialogState = TwoFactorLoginState.DialogState.Error( title = R.string.an_error_has_occurred.asText(), - message = "new device verification required".asText(), + message = R.string.invalid_verification_code.asText(), ), ), awaitItem(),