Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/ui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,10 @@ impl Screen {
Screen::AddNewWalletScreen(screen) => screen.app_context = app_context,
Screen::TransferScreen(screen) => screen.app_context = app_context,
Screen::TopUpIdentityScreen(screen) => screen.app_context = app_context,
Screen::WalletsBalancesScreen(screen) => screen.app_context = app_context,
Screen::WalletsBalancesScreen(screen) => {
screen.app_context = app_context;
screen.update_selected_wallet_for_network();
}
Screen::ImportWalletScreen(screen) => screen.app_context = app_context,
Screen::ProofLogScreen(screen) => screen.app_context = app_context,
Screen::AddContractsScreen(screen) => screen.app_context = app_context,
Expand Down
3 changes: 2 additions & 1 deletion src/ui/wallets/add_new_wallet_screen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use crate::ui::ScreenLike;
use crate::ui::components::left_panel::add_left_panel;
use crate::ui::components::styled::island_central_panel;
use crate::ui::components::top_panel::add_top_panel;
use crate::ui::theme::DashColors;
use eframe::egui::Context;

use crate::model::wallet::encryption::{DASH_SECRET_MESSAGE, encrypt_message};
Expand Down Expand Up @@ -433,7 +434,7 @@ impl ScreenLike for AddNewWalletScreen {
// Centered "Save Wallet" button at the bottom
ui.with_layout(Layout::centered_and_justified(Direction::TopDown), |ui| {
let save_button = egui::Button::new(
RichText::new("Save Wallet").strong().size(30.0),
RichText::new("Save Wallet").strong().size(30.0).color(DashColors::text_primary(ui.ctx().style().visuals.dark_mode)),
)
.min_size(Vec2::new(300.0, 60.0))
.corner_radius(10.0)
Expand Down
23 changes: 23 additions & 0 deletions src/ui/wallets/wallets_screen/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,29 @@ impl WalletsBalancesScreen {
}
}

pub(crate) fn update_selected_wallet_for_network(&mut self) {
let selected_seed = self
.selected_wallet
.as_ref()
.and_then(|wallet| wallet.read().ok().map(|wallet| wallet.seed_hash()));

let wallets = match self.app_context.wallets.read() {
Ok(guard) => guard,
Err(_) => {
self.selected_wallet = None;
return;
}
};

if let Some(seed_hash) = selected_seed
&& let Some(wallet) = wallets.get(&seed_hash) {
self.selected_wallet = Some(wallet.clone());
return;
}

self.selected_wallet = wallets.values().next().cloned();
}

fn add_receiving_address(&mut self) {
if let Some(wallet) = &self.selected_wallet {
let result = {
Expand Down
Loading