[PR #3719] [MERGED] [PM-10664] Display server error message during 2FA login #4370

Closed
opened 2025-11-26 23:43:33 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/3719
Author: @SaintPatrck
Created: 8/12/2024
Status: Merged
Merged: 8/14/2024
Merged by: @SaintPatrck

Base: mainHead: PM-9089/2fa-verification-err-msg


📝 Commits (2)

  • 3ef18ef [PM-9089] Display server error message during 2FA login
  • 93b6b14 Merge branch 'main' into PM-9089/2fa-verification-err-msg

📊 Changes

3 files changed (+89 additions, -1 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt (+30 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt (+2 -1)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt (+57 -0)

📄 Description

🎟️ Tracking

PM-10664

📔 Objective

Display server error message during 2FA login.

📸 Screenshots

Coming soon!

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed
    issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/3719 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 8/12/2024 **Status:** ✅ Merged **Merged:** 8/14/2024 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `PM-9089/2fa-verification-err-msg` --- ### 📝 Commits (2) - [`3ef18ef`](https://github.com/bitwarden/android/commit/3ef18efa656a15826a35ed1fa0e8780025f2a77d) [PM-9089] Display server error message during 2FA login - [`93b6b14`](https://github.com/bitwarden/android/commit/93b6b147f7323e33d99e43539abc1268c1b850df) Merge branch 'main' into PM-9089/2fa-verification-err-msg ### 📊 Changes **3 files changed** (+89 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt` (+30 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt` (+2 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt` (+57 -0) </details> ### 📄 Description ## 🎟️ Tracking PM-10664 ## 📔 Objective Display server error message during 2FA login. ## 📸 Screenshots Coming soon! ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-26 23:43:33 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#4370