From d7a3f8962d18d6711377a44bb8586772c7f6e050 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 30 Nov 2022 15:00:20 +0800 Subject: [PATCH] update vault's password edit to use the new persistent field --- apps/vault/src/actions.rs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/apps/vault/src/actions.rs b/apps/vault/src/actions.rs index a8b9d2b62..89f4c23c7 100644 --- a/apps/vault/src/actions.rs +++ b/apps/vault/src/actions.rs @@ -630,13 +630,24 @@ impl<'a> ActionManager<'a> { } }; - let edit_data = self.modals + let edit_data = if pw.notes != t!("vault.notes", xous::LANG) { + self.modals .alert_builder(t!("vault.edit_dialog", xous::LANG)) - .field(Some(pw.description), Some(password_validator)) - .field(Some(pw.username), Some(password_validator)) - .field(Some(pw.password), Some(password_validator)) + .field_placeholder_persist(Some(pw.description), Some(password_validator)) + .field_placeholder_persist(Some(pw.username), Some(password_validator)) + .field_placeholder_persist(Some(pw.password), Some(password_validator)) + .field_placeholder_persist(Some(pw.notes), Some(password_validator)) + .build().expect("modals error in edit") + } else { // note is placeholder text, treat it as such + self.modals + .alert_builder(t!("vault.edit_dialog", xous::LANG)) + .field_placeholder_persist(Some(pw.description), Some(password_validator)) + .field_placeholder_persist(Some(pw.username), Some(password_validator)) + .field_placeholder_persist(Some(pw.password), Some(password_validator)) .field(Some(pw.notes), Some(password_validator)) - .build().expect("modals error in edit"); + .build().expect("modals error in edit") + }; + pw.description = edit_data.content()[0].content.as_str().unwrap().to_string(); pw.username = edit_data.content()[1].content.as_str().unwrap().to_string(); pw.password = edit_data.content()[2].content.as_str().unwrap().to_string();