mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2025-01-10 20:54:33 +00:00
received jsplit not showing as confirmed in ui fix
This commit is contained in:
parent
1da49a014d
commit
16cd9b6cee
1 changed files with 8 additions and 29 deletions
|
@ -2769,34 +2769,12 @@ class FiroWallet extends CoinServiceAPI {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value.txType == "Received" &&
|
if (value.txType == "Received" && value.subType != "mint") {
|
||||||
!listLelantusTxData.containsKey(value.txid)) {
|
// Every receive other than a mint should be shown. Mints will be collected and shown from the send side
|
||||||
// Every receive should be listed whether minted or not.
|
|
||||||
listLelantusTxData[value.txid] = value;
|
listLelantusTxData[value.txid] = value;
|
||||||
} else if (value.txType == "Sent"
|
} else if (value.txType == "Sent") {
|
||||||
// &&
|
// all sends should be shown, mints will be displayed correctly in the ui
|
||||||
// hasAtLeastOneReceive &&
|
|
||||||
// value.subType == "mint"
|
|
||||||
) {
|
|
||||||
listLelantusTxData[value.txid] = value;
|
listLelantusTxData[value.txid] = value;
|
||||||
|
|
||||||
// use mint sends to update receives with user readable values.
|
|
||||||
|
|
||||||
// int sharedFee = value.fees ~/ howManyReceiveInputs;
|
|
||||||
//
|
|
||||||
// for (var element in value.inputs) {
|
|
||||||
// if (listLelantusTxData.containsKey(element.txid) &&
|
|
||||||
// listLelantusTxData[element.txid]!.txType == "Received") {
|
|
||||||
// listLelantusTxData[element.txid] =
|
|
||||||
// listLelantusTxData[element.txid]!.copyWith(
|
|
||||||
// fees: sharedFee,
|
|
||||||
// subType: "mint",
|
|
||||||
// height: value.height,
|
|
||||||
// confirmedStatus: value.confirmedStatus,
|
|
||||||
// otherData: value.txid,
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -3305,11 +3283,12 @@ class FiroWallet extends CoinServiceAPI {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final int confirms = txObject["confirmations"] as int? ?? 0;
|
||||||
|
|
||||||
// create final tx map
|
// create final tx map
|
||||||
midSortedTx["txid"] = txObject["txid"];
|
midSortedTx["txid"] = txObject["txid"];
|
||||||
midSortedTx["confirmed_status"] = (txObject["confirmations"] is int) &&
|
midSortedTx["confirmed_status"] = confirms >= MINIMUM_CONFIRMATIONS;
|
||||||
(txObject["confirmations"] as int > 0);
|
midSortedTx["confirmations"] = confirms;
|
||||||
midSortedTx["confirmations"] = txObject["confirmations"] ?? 0;
|
|
||||||
midSortedTx["timestamp"] = txObject["blocktime"] ??
|
midSortedTx["timestamp"] = txObject["blocktime"] ??
|
||||||
(DateTime.now().millisecondsSinceEpoch ~/ 1000);
|
(DateTime.now().millisecondsSinceEpoch ~/ 1000);
|
||||||
if (foundInSenders) {
|
if (foundInSenders) {
|
||||||
|
|
Loading…
Reference in a new issue