gui: Generate bech32 addresses by default (take 2, fixup) #16497

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:1907-guiBech32Take2 changing 3 files +14 −3

MarcoFalke commented at 5:56 PM on July 30, 2019: member
This commit was missing from my previous pull request for some reason :thinking: :
- gui: Generate bech32 addresses by default #15711
gui: Generate bech32 addresses by default (take 2, fixup) fa5a4cd813
jonasschnelli commented at 6:30 PM on July 30, 2019: contributor

Thanks! Tested ACK fa5a4cd813c2f0225dcbc05cd16ae2d1c0d13234
DrahtBot added the label GUI on Jul 30, 2019

in src/qt/receivecoinsdialog.cpp:96 in fa5a4cd813

  92 | @@ -92,10 +93,16 @@ void ReceiveCoinsDialog::setModel(WalletModel *_model)
  93 |          // Last 2 columns are set by the columnResizingFixer, when the table geometry is ready.
  94 |          columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(tableView, AMOUNT_MINIMUM_COLUMN_WIDTH, DATE_COLUMN_WIDTH, this);
  95 |  
  96 | -        if (model->wallet().getDefaultAddressType() == OutputType::BECH32) {
  97 | -            ui->useLegacyAddress->setCheckState(Qt::Unchecked);
  98 | +        if (model->node().isAddressTypeSet()) {

promag commented at 12:42 PM on July 31, 2019:

nit, to avoid nesting previous code you could do:

if (!model->node().isAddressTypeSet()) {
    // Always fall back to bech32 in the gui
    ui->useLegacyAddress->setCheckState(Qt::Unchecked);
} else if ...

MarcoFalke commented at 1:03 PM on August 5, 2019:

Good point. I will leave it as is for now, to not invalidate review.

promag commented at 12:49 PM on July 31, 2019: member

ACK fa5a4cd813c2f0225dcbc05cd16ae2d1c0d13234.
fanquake approved
fanquake commented at 1:38 AM on August 6, 2019: member

ACK fa5a4cd813c2f0225dcbc05cd16ae2d1c0d13234
fanquake merged this on Aug 6, 2019
fanquake closed this on Aug 6, 2019
fanquake referenced this in commit 31d98584f3 on Aug 6, 2019
MarcoFalke deleted the branch on Aug 6, 2019
sidhujag referenced this in commit f45db177e1 on Aug 10, 2019
domob1812 referenced this in commit dfe518703a on Aug 12, 2019
domob1812 referenced this in commit e5c2838d65 on Aug 12, 2019
Munkybooty referenced this in commit 57cb13d4e6 on Nov 25, 2021
Munkybooty referenced this in commit 57049ac955 on Nov 25, 2021
DrahtBot locked this on Dec 16, 2021

Contributors

Labels

Linked (view graph)

#15711 gui: Generate bech32 addresses by default