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

Add sign all checkbox. Fix list entry display #3450

Merged
merged 2 commits into from Oct 23, 2019
Merged

Add sign all checkbox. Fix list entry display #3450

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a7411a
Add sign all checkbox. Fix list entry display
chimp1984 Oct 23, 2019
dfa558f
Add summary to log and clipboard
chimp1984 Oct 23, 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
34 changes: 31 additions & 3 deletions desktop/src/main/java/bisq/desktop/main/overlays/windows/SignPaymentAccountsWindow.java
View file
Open in desktop
Expand Up @@ -23,20 +23,24 @@
import bisq.desktop.main.overlays.popups.Popup;

import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.app.AppOptionKeys;
import bisq.core.locale.Res;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.arbitration.ArbitrationManager;
import bisq.core.support.dispute.arbitration.TraderDataItem;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.util.BSFormatter;

import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3;
import bisq.common.util.Utilities;

import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.Utils;

import javax.inject.Inject;
import javax.inject.Named;

import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
Expand Down Expand Up @@ -84,15 +88,18 @@ public class SignPaymentAccountsWindow extends Overlay<SignPaymentAccountsWindow
private final AccountAgeWitnessService accountAgeWitnessService;
private final ArbitratorManager arbitratorManager;
private final ArbitrationManager arbitrationManager;
private final String appName;


@Inject
public SignPaymentAccountsWindow(AccountAgeWitnessService accountAgeWitnessService,
ArbitratorManager arbitratorManager,
ArbitrationManager arbitrationManager) {
ArbitrationManager arbitrationManager,
@Named(AppOptionKeys.APP_NAME_KEY) String appName) {
this.accountAgeWitnessService = accountAgeWitnessService;
this.arbitratorManager = arbitratorManager;
this.arbitrationManager = arbitrationManager;
this.appName = appName;
}

@Override
Expand Down Expand Up @@ -189,6 +196,7 @@ private void addSelectedAccountsContent() {
ObservableList<Dispute> disputesAsObservableList = arbitrationManager.getDisputesAsObservableList();
long safeDate = datePicker.getValue().atStartOfDay().toEpochSecond(ZoneOffset.UTC) * 1000;
List<TraderDataItem> traderDataItemList;
StringBuilder sb = new StringBuilder("Summary for ").append(appName).append("\n");
if (signAllCheckbox.isSelected()) {
traderDataItemList = new ArrayList<>();
getPaymentMethods().forEach(paymentMethod -> {
Expand All @@ -197,14 +205,34 @@ private void addSelectedAccountsContent() {
paymentMethod,
disputesAsObservableList);
traderDataItemList.addAll(list);

sb.append("\nPayment method: ").append(Res.get(paymentMethod.getId()))
.append(" (No. of signed accounts: ").append(list.size()).append(")\n");
list.forEach(traderDataItem -> {
sb.append("Account created: ")
.append(BSFormatter.formatDateTime(new Date(traderDataItem.getAccountAgeWitness().getDate()), true))
.append(" Account: ")
.append(traderDataItem.getPaymentAccountPayload().getPaymentDetails()).append("\n");
});
});
sb.append("\nTotal accounts signed: ").append(traderDataItemList.size());
} else {
PaymentMethod selectedPaymentMethod = paymentMethodComboBox.getSelectionModel().getSelectedItem();
PaymentMethod paymentMethod = paymentMethodComboBox.getSelectionModel().getSelectedItem();
traderDataItemList = accountAgeWitnessService.getTraderPaymentAccounts(
safeDate,
selectedPaymentMethod,
paymentMethod,
disputesAsObservableList);
sb.append("\nPayment method: ").append(Res.get(paymentMethod.getId()))
.append(" (No. of signed accounts: ").append(traderDataItemList.size()).append(")\n");
traderDataItemList.forEach(traderDataItem -> {
sb.append("Account created: ")
.append(BSFormatter.formatDateTime(new Date(traderDataItem.getAccountAgeWitness().getDate()), true))
.append(" Account: ")
.append(traderDataItem.getPaymentAccountPayload().getPaymentDetails()).append("\n");
});
}
log.info(sb.toString());
Utilities.copyToClipboard(sb.toString());

selectedPaymentAccountsList.setItems(FXCollections.observableArrayList(traderDataItemList));

Expand Down