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

fix adding coins to coincontrol from address list (fixes #8155) #8156

Merged
merged 1 commit into from
Jan 18, 2023
Merged

fix adding coins to coincontrol from address list (fixes #8155) #8156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion electrum/gui/qt/address_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,10 @@ def create_menu(self, position):

coins = self.wallet.get_spendable_coins(addrs)
if coins:
menu.addAction(_("Spend from"), lambda: self.parent.utxo_list.set_spend_list(coins))
if self.parent.utxo_list.are_in_coincontrol(coins):
menu.addAction(_("Remove from coin control"), lambda: self.parent.utxo_list.remove_from_coincontrol(coins))
else:
menu.addAction(_("Add to coin control"), lambda: self.parent.utxo_list.add_to_coincontrol(coins))

run_hook('receive_menu', menu, addrs, self.wallet)
menu.exec_(self.viewport().mapToGlobal(position))
Expand Down
5 changes: 4 additions & 1 deletion electrum/gui/qt/utxo_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ def _filter_frozen_coins(self, coins: List[PartialTxInput]) -> List[PartialTxInp
not self.wallet.is_frozen_coin(utxo))]
return coins

def are_in_coincontrol(self, coins: List[PartialTxInput]) -> bool:
return all([utxo.prevout.to_str() in self._spend_set for utxo in coins])

def add_to_coincontrol(self, coins: List[PartialTxInput]):
coins = self._filter_frozen_coins(coins)
for utxo in coins:
Expand Down Expand Up @@ -192,7 +195,7 @@ def create_menu(self, position):
coins = [self._utxo_dict[name] for name in selected]
# coin control
if coins:
if all([utxo.prevout.to_str() in self._spend_set for utxo in coins]):
if self.are_in_coincontrol(coins):
menu.addAction(_("Remove from coin control"), lambda: self.remove_from_coincontrol(coins))
else:
menu.addAction(_("Add to coin control"), lambda: self.add_to_coincontrol(coins))
Expand Down