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

Account signing: revert dev date setting for trusted accounts #3404

Merged
merged 2 commits into from
Oct 14, 2019
Merged

Account signing: revert dev date setting for trusted accounts #3404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b92d019
Revert temporary value for dev testing
ripcurlx Oct 14, 2019
d4a61db
Only enable button if there are accounts to be signed
ripcurlx Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@
public class AccountAgeWitnessService {
private static final Date RELEASE = Utilities.getUTCDate(2017, GregorianCalendar.NOVEMBER, 11);
public static final Date FULL_ACTIVATION = Utilities.getUTCDate(2018, GregorianCalendar.FEBRUARY, 15);
// TODO: Change to March, 1, 2019 before release
private static final long SAFE_ACCOUNT_AGE_DATE = Utilities.getUTCDate(2019, GregorianCalendar.SEPTEMBER, 1).getTime();
private static final long SAFE_ACCOUNT_AGE_DATE = Utilities.getUTCDate(2019, GregorianCalendar.MARCH, 1).getTime();

public enum AccountAge {
UNVERIFIED,
Expand Down
2 changes: 2 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/overlays/windows/SignPaymentAccountsWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ private void addSelectedAccountsContent() {
selectedPaymentAccountsList.getItems().size()));
((AutoTooltipButton) actionButton).updateText(Res.get("popup.accountSigning.confirmSelectedAccounts.button"));

actionButton.setDisable(selectedPaymentAccountsList.getItems().size() == 0);

actionButton.setOnAction(e -> addAccountsToSignContent());

selectedPaymentAccountsList.setCellFactory(new Callback<>() {
Expand Down