ui: small fixes
This commit is contained in:
parent
4f2a247719
commit
61cba2dba6
4 changed files with 6 additions and 11 deletions
|
@ -13,5 +13,5 @@
|
|||
// limitations under the License.
|
||||
|
||||
fn main() {
|
||||
built::write_built_file().expect("Failed to acquire build-time information");;
|
||||
built::write_built_file().expect("Failed to acquire build-time information");
|
||||
}
|
||||
|
|
|
@ -274,6 +274,7 @@ impl ConnectionsContent {
|
|||
url_edit_opts.focus = true;
|
||||
}
|
||||
View::text_edit(ui, cb, &mut self.ext_node_url_edit, url_edit_opts);
|
||||
ui.add_space(8.0);
|
||||
|
||||
ui.label(RichText::new(t!("wallets.node_secret"))
|
||||
.size(17.0)
|
||||
|
|
|
@ -25,10 +25,10 @@ use crate::gui::platform::PlatformCallbacks;
|
|||
use crate::gui::views::{Modal, Root, View};
|
||||
use crate::gui::views::types::{ModalPosition, TextEditOptions};
|
||||
use crate::gui::views::wallets::{WalletInfo, WalletReceive, WalletSend, WalletSettings};
|
||||
use crate::gui::views::wallets::types::{WalletTab, WalletTabType};
|
||||
use crate::gui::views::wallets::types::{GRIN, WalletTab, WalletTabType};
|
||||
use crate::node::Node;
|
||||
use crate::wallet::{Wallet, WalletConfig};
|
||||
use crate::wallet::types::{GRIN, WalletAccount, WalletData};
|
||||
use crate::wallet::types::{WalletAccount, WalletData};
|
||||
|
||||
/// Selected and opened wallet content.
|
||||
pub struct WalletContent {
|
||||
|
|
|
@ -158,7 +158,7 @@ impl WalletInfo {
|
|||
}
|
||||
|
||||
/// Height of transaction list item.
|
||||
const TX_ITEM_HEIGHT: f32 = 75.0;
|
||||
const TX_ITEM_HEIGHT: f32 = 76.0;
|
||||
|
||||
/// Draw transaction item.
|
||||
fn tx_item_ui(ui: &mut egui::Ui,
|
||||
|
@ -194,7 +194,6 @@ fn tx_item_ui(ui: &mut egui::Ui,
|
|||
&& tx.tx_type != TxLogEntryType::TxSentCancelled {
|
||||
View::item_button(ui, Rounding::default(), PROHIBIT, Some(Colors::RED), || {
|
||||
wallet.cancel(tx.id);
|
||||
//TODO: Cancel tx
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -289,12 +288,7 @@ fn tx_item_ui(ui: &mut egui::Ui,
|
|||
ui.label(RichText::new(status_text).size(15.0).color(status_color));
|
||||
|
||||
// Setup transaction time.
|
||||
let tx_ts = if tx.confirmed && tx.confirmation_ts.is_some() {
|
||||
tx.confirmation_ts.unwrap()
|
||||
} else {
|
||||
tx.creation_ts
|
||||
}.timestamp();
|
||||
let tx_time = View::format_time(tx_ts);
|
||||
let tx_time = View::format_time(tx.creation_ts.timestamp());
|
||||
let tx_time_text = format!("{} {}", CALENDAR_CHECK, tx_time);
|
||||
ui.label(RichText::new(tx_time_text).size(15.0).color(Colors::GRAY));
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue