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

fix: action repeat tor tx, no resend for tor

Browse Source
This commit is contained in:
ardocrat
2025-06-25 12:51:29 +03:00
parent a89a9bcaed
commit 1b78118f51
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/wallets/wallet/txs/content.rs
+4 -4
View File
@@ -189,9 +189,9 @@ impl WalletTransactions {
.show();
});
}
// Draw button to repeat transaction action or resend with tor.
if tx.action_error.is_some() || rebroadcast || tx.can_resend_tor() {
// Draw button to repeat transaction action.
if tx.can_repeat_action() || rebroadcast {
Self::tx_repeat_button_ui(ui, CornerRadius::default(), tx, wallet, rebroadcast);
}
});
@@ -459,7 +459,7 @@ impl WalletTransactions {
TxLogEntryType::TxSentCancelled => Colors::inactive_text(),
TxLogEntryType::TxReverted => Colors::inactive_text(),
};
ui.label(RichText::new(status_text).size(15.0).color(status_color));
View::ellipsize_text(ui, status_text, 15.0, status_color);
// Setup transaction time.
let tx_time = View::format_time(tx.data.creation_ts.timestamp());
src/gui/views/wallets/wallet/txs/tx.rs
+2 -2
View File
@@ -22,7 +22,7 @@ use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::wallets::wallet::txs::WalletTransactions;
use crate::gui::views::{CameraContent, FilePickContent, FilePickContentType, Modal, QrCodeContent, View};
use crate::gui::Colors;
use crate::wallet::types::{WalletTask, WalletTransaction};
use crate::wallet::types::{WalletTask, WalletTransaction, WalletTransactionAction};
use crate::wallet::Wallet;
/// Transaction information [`Modal`] content.
@@ -274,7 +274,7 @@ impl WalletTransactionContent {
}
// Draw button to repeat transaction action.
if tx.action_error.is_some() || rebroadcast || tx.can_resend_tor() {
if tx.can_repeat_action() || rebroadcast {
let r = if tx.can_finalize() || tx.can_cancel() {
CornerRadius::default()
} else {