From 18e040e51ff835f5f6c8218392496865b6f8737a Mon Sep 17 00:00:00 2001 From: edouardparis Date: Wed, 6 Mar 2024 10:36:41 +0100 Subject: [PATCH] fix: override unpaginated pending events and txs pending events and txs are passed unpaginated and in full list through PendingTransactions and PendingPayments. It is useless and armful to append to them to an existing list of pending events as a new rbf replacement event should override the previous one and only one of them must be displayed. --- gui/src/app/state/mod.rs | 6 +----- gui/src/app/state/transactions.rs | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/gui/src/app/state/mod.rs b/gui/src/app/state/mod.rs index df2c9b54..0a0bc154 100644 --- a/gui/src/app/state/mod.rs +++ b/gui/src/app/state/mod.rs @@ -186,11 +186,7 @@ impl State for Home { Err(e) => self.warning = Some(e), Ok(events) => { self.warning = None; - for event in events { - if !self.pending_events.iter().any(|other| other.tx == event.tx) { - self.pending_events.push(event); - } - } + self.pending_events = events; } }, Message::View(view::Message::Label(_, _)) | Message::LabelsUpdated(_) => { diff --git a/gui/src/app/state/transactions.rs b/gui/src/app/state/transactions.rs index 621c95d7..e0da0740 100644 --- a/gui/src/app/state/transactions.rs +++ b/gui/src/app/state/transactions.rs @@ -105,11 +105,7 @@ impl State for TransactionsPanel { Err(e) => self.warning = Some(e), Ok(txs) => { self.warning = None; - for tx in txs { - if !self.pending_txs.iter().any(|other| other.tx == tx.tx) { - self.pending_txs.push(tx); - } - } + self.pending_txs = txs; } }, Message::RbfModal(tx, is_cancel, res) => match res {