Skip to content

Commit

Permalink
Account signing: revert dev date setting for trusted accounts (#3404)
Browse files Browse the repository at this point in the history
* Revert temporary value for dev testing

* Only enable button if there are accounts to be signed
  • Loading branch information
ripcurlx authored and sqrrm committed Oct 14, 2019
1 parent 2fae05c commit 8e45a07
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
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
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

0 comments on commit 8e45a07

Please sign in to comment.