diff --git a/src/gui/views/wallets/setup/connection.rs b/src/gui/views/wallets/setup/connection.rs index 0ab89d9..f39489c 100644 --- a/src/gui/views/wallets/setup/connection.rs +++ b/src/gui/views/wallets/setup/connection.rs @@ -16,7 +16,7 @@ use egui::{Align, Id, Layout, RichText, Rounding}; use url::Url; use crate::gui::Colors; -use crate::gui::icons::{CHECK, CHECK_CIRCLE, CHECK_FAT, COMPUTER_TOWER, DOTS_THREE_CIRCLE, GLOBE, PLUS_CIRCLE, POWER, X_CIRCLE}; +use crate::gui::icons::{CHECK, CHECK_CIRCLE, CHECK_FAT, COMPUTER_TOWER, DOTS_THREE_CIRCLE, GLOBE, GLOBE_SIMPLE, PLUS_CIRCLE, POWER, X_CIRCLE}; use crate::gui::platform::PlatformCallbacks; use crate::gui::views::{Modal, View}; use crate::gui::views::types::{ModalContainer, ModalPosition, TextEditOptions}; @@ -296,7 +296,7 @@ impl ConnectionSetup { ui.vertical(|ui| { // Draw connections URL. ui.add_space(4.0); - let conn_text = format!("{} {}", COMPUTER_TOWER, conn.url); + let conn_text = format!("{} {}", GLOBE_SIMPLE, conn.url); View::ellipsize_text(ui, conn_text, 15.0, Colors::TITLE); ui.add_space(1.0); // Setup connection status text. diff --git a/src/gui/views/wallets/wallet/messages.rs b/src/gui/views/wallets/wallet/messages.rs index f3d9c3f..5e33829 100644 --- a/src/gui/views/wallets/wallet/messages.rs +++ b/src/gui/views/wallets/wallet/messages.rs @@ -916,7 +916,7 @@ impl WalletMessages { .size(17.0) .color(Colors::RED)); }); - ui.add_space(6.0); + ui.add_space(12.0); // Setup spacing between buttons. ui.spacing_mut().item_spacing = egui::Vec2::new(6.0, 0.0); diff --git a/src/gui/views/wallets/wallet/txs.rs b/src/gui/views/wallets/wallet/txs.rs index c1ddf56..86b3261 100644 --- a/src/gui/views/wallets/wallet/txs.rs +++ b/src/gui/views/wallets/wallet/txs.rs @@ -572,18 +572,18 @@ impl WalletTransactions { // Show buttons to close modal or come back to text request content. ui.columns(2, |cols| { cols[0].vertical_centered_justified(|ui| { - View::button(ui, t!("back"), Colors::WHITE, || { - self.tx_info_qr_code_content.clear_state(); - self.tx_info_show_qr = false; - }); - }); - cols[1].vertical_centered_justified(|ui| { View::button(ui, t!("close"), Colors::WHITE, || { self.tx_info_qr_code_content.clear_state(); self.tx_info_show_qr = false; modal.close(); }); }); + cols[1].vertical_centered_justified(|ui| { + View::button(ui, t!("back"), Colors::WHITE, || { + self.tx_info_qr_code_content.clear_state(); + self.tx_info_show_qr = false; + }); + }); }); } else if self.tx_info_show_scanner { // Show buttons to close modal or scanner. @@ -715,7 +715,6 @@ impl WalletTransactions { self.tx_info_show_scanner = false; } else { self.tx_info_scanner_content.ui(ui, cb); - ui.add_space(2.0); } return; } diff --git a/src/wallet/connections/external.rs b/src/wallet/connections/external.rs index 3f9cbe7..f3ef5c2 100644 --- a/src/wallet/connections/external.rs +++ b/src/wallet/connections/external.rs @@ -57,7 +57,6 @@ impl ExternalConnection { .build() .unwrap() .block_on(async { - println!("check {}", conn.url); let url = url::Url::parse(conn.url.as_str()).unwrap(); if let Ok(_) = url.socket_addrs(|| None) { let addr = format!("{}v2/foreign", url.to_string());