[PR #5284] [MERGED] PM-21631: Check for Search Screen when navigating after deleting a Send #5640

Closed
opened 2025-11-27 00:11:21 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5284
Author: @david-livefront
Created: 5/29/2025
Status: Merged
Merged: 5/29/2025
Merged by: @david-livefront

Base: mainHead: PM-21631-delete-sent-navigate


📝 Commits (1)

  • 474d0d3 PM-21631: Check for Search Screen when navigating after deleting a Send

📊 Changes

6 files changed (+23 additions, -16 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt (+10 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendNavigation.kt (+2 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendScreen.kt (+2 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendViewModel.kt (+3 -3)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendScreenTest.kt (+5 -5)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendViewModelTest.kt (+1 -1)

📄 Description

🎟️ Tracking

PM-21631

📔 Objective

When deleting a Send from the AddEditSendScreen, we need to check if the user came from the SearchScreen in order to navigate to the correct location. If they came from Search then we should go there, otherwise the Root is the correct destination.

📸 Screenshots

Before After

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) 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/5284 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 5/29/2025 **Status:** ✅ Merged **Merged:** 5/29/2025 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-21631-delete-sent-navigate` --- ### 📝 Commits (1) - [`474d0d3`](https://github.com/bitwarden/android/commit/474d0d34ef68d31974a3ae636f35e3c7eb5a7ea8) PM-21631: Check for Search Screen when navigating after deleting a Send ### 📊 Changes **6 files changed** (+23 additions, -16 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt` (+10 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendNavigation.kt` (+2 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendScreen.kt` (+2 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendViewModel.kt` (+3 -3) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendScreenTest.kt` (+5 -5) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendViewModelTest.kt` (+1 -1) </details> ### 📄 Description ## 🎟️ Tracking [PM-21631](https://bitwarden.atlassian.net/browse/PM-21631) ## 📔 Objective When deleting a Send from the `AddEditSendScreen`, we need to check if the user came from the `SearchScreen` in order to navigate to the correct location. If they came from Search then we should go there, otherwise the Root is the correct destination. ## 📸 Screenshots | Before | After | | --- | --- | | <video src="https://github.com/user-attachments/assets/60e1791f-b79e-4150-a348-a1eb3e34d5f8" width="300" /> | <video src="https://github.com/user-attachments/assets/383967d8-1302-420c-bafe-6117a88ea7e5" width="300" /> | ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) 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 [PM-21631]: https://bitwarden.atlassian.net/browse/PM-21631?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <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-27 00:11:21 -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#5640