Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve tx display for BTC withdrawal from BSQ wallet #2655

Merged
merged 4 commits into from Apr 5, 2019
Merged

Improve tx display for BTC withdrawal from BSQ wallet #2655

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3275dfe
Improve transaction display for BTC withrawals from BSQ wallet
ripcurlx Apr 5, 2019
79376f3
Prevent user from creating transactions that will burn money (mining …
ripcurlx Apr 5, 2019
dda54f8
Show zero BSQ transferred for BTC withdrawal form BSQ wallet
ripcurlx Apr 5, 2019
e5d28b6
Prevent transaction already when there is a zero BTC output
ripcurlx Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
View file
Open in desktop
Expand Up @@ -297,7 +297,7 @@ private void addSendBtcGroup() {
Transaction signedTx = bsqWalletService.signTx(txWithBtcFee);
Coin miningFee = signedTx.getFee();

if (miningFee.getValue() > receiverAmount.getValue())
if (miningFee.getValue() >= receiverAmount.getValue())
GUIUtil.showWantToBurnBTCPopup(miningFee, receiverAmount, btcFormatter);
else {
int txSize = signedTx.bitcoinSerialize().length;
Expand Down
14 changes: 11 additions & 3 deletions desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java
View file
Open in desktop
Expand Up @@ -501,9 +501,17 @@ public void updateItem(final BsqTxListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null && !empty) {
TxType txType = item.getTxType();
setText(item.getConfirmations() > 0 && isValidType(txType) ?
bsqFormatter.formatCoin(item.getAmount()) :
Res.get("shared.na"));

String bsqAmount = Res.get("shared.na");

if (item.getConfirmations() > 0) {
if (isValidType(txType))
bsqAmount = bsqFormatter.formatCoin(item.getAmount());
else if (item.isWithdrawalToBTCWallet())
bsqAmount = bsqFormatter.formatBSQSatoshis(0L);
}

setText(bsqAmount);
} else
setText("");
}
Expand Down