GUI/grim
1
1
Fork 0
Code Issues 6 Pull requests Projects Releases 8 Packages Wiki Activity Actions

wallet: posting status for two transactions with same slate id

Browse source
This commit is contained in:
ardocrat 2024-04-21 12:04:23 +03:00
parent 10d184fab2
commit f42fd94281
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/wallet/wallet.rs
View file

@ -956,7 +956,7 @@ fn sync_wallet_data(wallet: &Wallet) {
}).collect::<Vec<TxLogEntry>>(); }).collect::<Vec<TxLogEntry>>();
// Create wallet txs. // Create wallet txs.
let mut txs = vec![]; let mut txs: Vec<WalletTransaction> = vec![];
for tx in &filter_txs { for tx in &filter_txs {
println!("{}", serde_json::to_string(tx).unwrap()); println!("{}", serde_json::to_string(tx).unwrap());
let amount = if tx.amount_debited > tx.amount_credited { let amount = if tx.amount_debited > tx.amount_credited {
@ -969,13 +969,28 @@ fn sync_wallet_data(wallet: &Wallet) {
let posting = if (tx.tx_type == TxLogEntryType::TxSent || let posting = if (tx.tx_type == TxLogEntryType::TxSent ||
tx.tx_type == TxLogEntryType::TxReceived) && tx.tx_type == TxLogEntryType::TxReceived) &&
!tx.confirmed && tx.tx_slate_id.is_some() { !tx.confirmed && tx.tx_slate_id.is_some() {
// Create slate to check existing file.
let mut slate = Slate::blank(1, false); let mut slate = Slate::blank(1, false);
slate.id = tx.tx_slate_id.unwrap(); slate.id = tx.tx_slate_id.unwrap();
slate.state = match tx.tx_type { slate.state = match tx.tx_type {
TxLogEntryType::TxReceived => SlateState::Invoice3, TxLogEntryType::TxReceived => SlateState::Invoice3,
_ => SlateState::Standard3 _ => SlateState::Standard3
}; };
wallet.read_slatepack(&slate).is_some()
// Setup posting status if we have other tx with same slate id.
let mut same_tx_posting = false;
for t in &mut txs {
if t.data.tx_slate_id == tx.tx_slate_id &&
tx.tx_type != t.data.tx_type {
same_tx_posting = t.posting ||
wallet.read_slatepack(&slate).is_some();
if same_tx_posting && !t.posting {
t.posting = true;
}
break;
}
}
same_tx_posting || wallet.read_slatepack(&slate).is_some()
} else { } else {
false false
}; };