github-jwinterm/grim
1
0
Fork 0
mirror of https://github.com/jwinterm/grim.git synced 2026-10-22 15:58:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet: accounts selection, fix config access from different threads

Browse Source
This commit is contained in:
ardocrat
2023-10-18 02:26:22 +03:00
parent d628390e97
commit 4b48195b75
14 changed files with 337 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/wallets/setup/common.rs
+13 -10
View File
@@ -75,17 +75,18 @@ impl CommonSetup {
self.modal_content_ui(ui, wallet, cb);
ui.vertical_centered(|ui| {
let wallet_name = wallet.get_config().name;
// Show wallet name.
ui.add_space(2.0);
ui.label(RichText::new(t!("wallets.name")).size(16.0).color(Colors::GRAY));
ui.add_space(2.0);
ui.label(RichText::new(wallet.config.name.clone()).size(16.0).color(Colors::BLACK));
ui.label(RichText::new(wallet_name.clone()).size(16.0).color(Colors::BLACK));
ui.add_space(8.0);
// Show wallet name setup.
let name_text = format!("{} {}", PENCIL, t!("change"));
View::button(ui, name_text, Colors::BUTTON, || {
self.name_edit = wallet.config.name.clone();
self.name_edit = wallet_name;
// Show wallet name modal.
Modal::new(NAME_EDIT_MODAL)
.position(ModalPosition::CenterTop)
@@ -125,9 +126,10 @@ impl CommonSetup {
ui.add_space(6.0);
// Show minimum amount of confirmations value setup.
let min_conf_text = format!("{} {}", CLOCK_COUNTDOWN, wallet.config.min_confirmations);
let min_confirmations = wallet.get_config().min_confirmations;
let min_conf_text = format!("{} {}", CLOCK_COUNTDOWN, min_confirmations);
View::button(ui, min_conf_text, Colors::BUTTON, || {
self.min_confirmations_edit = wallet.config.min_confirmations.to_string();
self.min_confirmations_edit = min_confirmations.to_string();
// Show minimum amount of confirmations value modal.
Modal::new(MIN_CONFIRMATIONS_EDIT_MODAL)
.position(ModalPosition::CenterTop)
@@ -187,7 +189,7 @@ impl CommonSetup {
// Draw wallet name edit.
let text_edit_resp = egui::TextEdit::singleline(&mut self.name_edit)
.id(Id::from(modal.id).with(wallet.config.id))
.id(Id::from(modal.id).with(wallet.get_config().id))
.font(TextStyle::Heading)
.desired_width(ui.available_width())
.cursor_at_end(true)
@@ -216,8 +218,7 @@ impl CommonSetup {
// Save button callback.
let mut on_save = || {
if !self.name_edit.is_empty() {
wallet.config.name = self.name_edit.clone();
wallet.config.save();
wallet.change_name(self.name_edit.clone());
cb.hide_keyboard();
modal.close();
}
@@ -240,6 +241,8 @@ impl CommonSetup {
wallet: &mut Wallet,
modal: &Modal,
cb: &dyn PlatformCallbacks) {
let wallet_id = wallet.get_config().id;
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("wallets.current_pass"))
@@ -260,7 +263,7 @@ impl CommonSetup {
ui.allocate_ui_with_layout(layout_size, Layout::left_to_right(Align::Center), |ui| {
// Draw current wallet password text edit.
let old_pass_resp = egui::TextEdit::singleline(&mut self.current_pass_edit)
.id(Id::from(modal.id).with(wallet.config.id).with("old_pass"))
.id(Id::from(modal.id).with(wallet_id).with("old_pass"))
.font(TextStyle::Heading)
.desired_width(ui.available_width())
.cursor_at_end(true)
@@ -297,7 +300,7 @@ impl CommonSetup {
ui.allocate_ui_with_layout(layout_size, Layout::left_to_right(Align::Center), |ui| {
// Draw new wallet password text edit.
let new_pass_resp = egui::TextEdit::singleline(&mut self.new_pass_edit)
.id(Id::from(modal.id).with(wallet.config.id).with("new_pass"))
.id(Id::from(modal.id).with(wallet_id).with("new_pass"))
.font(TextStyle::Heading)
.desired_width(ui.available_width())
.cursor_at_end(true)
@@ -426,7 +429,7 @@ impl CommonSetup {
// Save button callback.
let mut on_save = || {
if let Ok(min_conf) = self.min_confirmations_edit.parse::<u64>() {
wallet.config.min_confirmations = min_conf;
wallet.update_min_confirmations(min_conf);
cb.hide_keyboard();
modal.close();
}
src/gui/views/wallets/setup/connection.rs
+6 -6
View File
@@ -103,7 +103,7 @@ impl ConnectionSetup {
}
// Setup connection value from provided wallet.
match wallet.config.ext_conn_id {
match wallet.get_config().ext_conn_id {
None => self.method = ConnectionMethod::Integrated,
Some(id) => self.method = ConnectionMethod::External(id)
}
@@ -112,25 +112,25 @@ impl ConnectionSetup {
self.ui(ui, frame, cb);
// Setup wallet connection value after change.
let config = wallet.get_config();
let changed = match self.method {
ConnectionMethod::Integrated => {
let changed = wallet.config.ext_conn_id.is_some();
let changed = config.ext_conn_id.is_some();
if changed {
wallet.config.ext_conn_id = None;
wallet.update_ext_conn_id(None);
}
changed
}
ConnectionMethod::External(id) => {
let changed = wallet.config.ext_conn_id != Some(id);
let changed = config.ext_conn_id != Some(id);
if changed {
wallet.config.ext_conn_id = Some(id);
wallet.update_ext_conn_id(Some(id));
}
changed
}
};
if changed {
wallet.config.save();
// Show reopen confirmation modal.
Modal::new(REOPEN_WALLET_CONFIRMATION_MODAL)
.position(ModalPosition::Center)
src/gui/views/wallets/setup/recovery.rs
+1 -1
View File
@@ -204,7 +204,7 @@ impl RecoverySetup {
ui.allocate_ui_with_layout(layout_size, Layout::left_to_right(Align::Center), |ui| {
// Draw current wallet password text edit.
let pass_resp = egui::TextEdit::singleline(&mut self.pass_edit)
.id(Id::from(modal.id).with(wallet.config.id).with("recovery_phrase"))
.id(Id::from(modal.id).with(wallet.get_config().id).with("recovery_phrase"))
.font(TextStyle::Heading)
.desired_width(ui.available_width())
.cursor_at_end(true)