Skip to content

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Nov 17, 2022

@hebasto hebasto added this to the 22.1 milestone Nov 17, 2022
@DrahtBot
Copy link
Contributor

DrahtBot commented Nov 17, 2022

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK jarolrod

@fanquake
Copy link
Member

Is there a reason this doesn't include bitcoin-core/gui#631, or is that no-longer being backported to 22.x? If so, can you remove the label.

achow101 and others added 2 commits November 21, 2022 10:31
Watchonly wallets do not have any private keys to encrypt. It does not
make sense to encrypt such wallets, so disable the option to encrypt
them.

This avoids an assertion that can be hit when encrypting watchonly descriptor
wallets.

Github-Pull: bitcoin-core/gui#631
Rebased-From: 4c49541
MacOS 13 sends a window focus change notification after the main
window has been destroyed but before the QTApplication has been
destroyed. This results in the menu bar receiving a notification
despite it no longer existing. The solution is to pass the main
window as context when subscribing to the notifications. Qt
automatically unsubscribes to notifications if the sender OR
context is destroyed.

Github-Pull: bitcoin-core/gui#680
Rebased-From: 8a5014c
@hebasto
Copy link
Member Author

hebasto commented Nov 21, 2022

@fanquake

Is there a reason this doesn't include bitcoin-core/gui#631, or is that no-longer being backported to 22.x? If so, can you remove the label.

Thank you for a reminder! Updated.

Copy link
Member

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 272fa25

Performed my own backport of the two pr's and confirmed that backporting each commit has no conflicts and that I have a zero-diff with this PR. Tested the functionality of 7b7bbc1, but only a code-review ack for 272fa25 as I do not have an intel mac to test on right now.

@fanquake fanquake merged commit c192b86 into bitcoin:22.x Nov 22, 2022
@hebasto hebasto deleted the 221117-22.1-gui-bp branch November 22, 2022 09:32
@bitcoin bitcoin locked and limited conversation to collaborators Nov 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants