Skip to content

Commit f11c16f

Browse files
Merge #6565: fix(qt): update CoinJoin frame and tx list on client model update
716cb3e fix(qt): update CoinJoin frame and tx list on client model update (UdjinM6) Pull request description: ## Issue being fixed or feature implemented 3f9dca5 (#6541) broke Overview Page. Wallet model is set earlier now (via WalletView ctor and not via `addWallet` 3f9dca5#diff-c0330db51c25c4bb621fca0b908dc6fc597db2077f74855eed1b16e0739748a6L88) but we need Client model too to call `updateAdvancedCJUI()` correctly and it's not yet available. ## What was done? Move `updateAdvancedCJUI()` call to `setClientModel()`. ## How Has This Been Tested? ## Breaking Changes ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK 716cb3e kwvg: ACK 716cb3e Tree-SHA512: 05b4cfaa17c531762122ef8e19470dcc299a57827274687ce5c765f1049b93672029fa170cd8f131c69c9b1f1f3fd542baab4a7ddaaa1405c109cd9b9eeaab6e
2 parents c84f5e1 + 716cb3e commit f11c16f

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/qt/overviewpage.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@ void OverviewPage::setClientModel(ClientModel *model)
299299
// Show warning, for example if this is a prerelease version
300300
connect(model, &ClientModel::alertsChanged, this, &OverviewPage::updateAlerts);
301301
updateAlerts(model->getStatusBarWarnings());
302+
// explicitly update CoinJoin frame and transaction list to reflect actual settings
303+
updateAdvancedCJUI(model->getOptionsModel()->getShowAdvancedCJUI());
302304
}
303305
}
304306

@@ -322,9 +324,6 @@ void OverviewPage::setWalletModel(WalletModel *model)
322324
updateWatchOnlyLabels(showWatchOnly && !walletModel->wallet().privateKeysDisabled());
323325
});
324326

325-
// explicitly update PS frame and transaction list to reflect actual settings
326-
updateAdvancedCJUI(model->getOptionsModel()->getShowAdvancedCJUI());
327-
328327
connect(model->getOptionsModel(), &OptionsModel::coinJoinRoundsChanged, this, &OverviewPage::updateCoinJoinProgress);
329328
connect(model->getOptionsModel(), &OptionsModel::coinJoinAmountChanged, this, &OverviewPage::updateCoinJoinProgress);
330329
connect(model->getOptionsModel(), &OptionsModel::AdvancedCJUIChanged, this, &OverviewPage::updateAdvancedCJUI);

0 commit comments

Comments
 (0)