Skip to content

[0.18 backport] Qt fixes post 18 #698

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

Merged
instagibbs merged 2 commits into from
Sep 3, 2019
Merged

[0.18 backport] Qt fixes post 18 #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
523a7e9
Fix QT startup for custom chains
instagibbs Aug 22, 2019
fdc365e
Fix QT transaction blinding details being committed to wallet
instagibbs Aug 22, 2019
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
2 changes: 1 addition & 1 deletion src/interfaces/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ class WalletImpl : public Wallet
}
}
if (!m_wallet->CreateTransaction(*locked_chain, recipients, pending->m_tx, pending->m_keys, fee, change_pos,
fail_reason, coin_control, sign)) {
fail_reason, coin_control, sign, gArgs.GetBoolArg("-blindedaddresses", g_con_elementsmode) ? &pending->m_blind_details : nullptr)) {
return {};
}
out_amounts = pending->m_blind_details.o_amounts;
Expand Down
4 changes: 2 additions & 2 deletions src/qt/networkstyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ const NetworkStyle* NetworkStyle::instantiate(const std::string& networkId)
std::string titleAddText = networkId == "liquidv1" ? "" : strprintf("[%s]", networkId);
for (unsigned x=0; x<network_styles_count; ++x)
{
if (networkId == network_styles[x].networkId)
// If it doesn't match any, use regtest since it's a custom chain
if (networkId == network_styles[x].networkId || x == network_styles_count - 1)
{
return new NetworkStyle(
network_styles[x].appName,
Expand All @@ -92,5 +93,4 @@ const NetworkStyle* NetworkStyle::instantiate(const std::string& networkId)
titleAddText.c_str());
}
}
return nullptr;
}