Revert "Revert invalid verification code string changes"

This reverts commit 5ab5f0e.
bitwarden · Feb 26, 2025 · 46947fd · 46947fd
1 parent eb267f9
commit 46947fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...c/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt b/...c/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/...st/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt b/...st/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(),