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.

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

Qt fixes post 18 #693

Merged
merged 2 commits into from Sep 3, 2019

Conversation

@instagibbs
Copy link
Collaborator

commented Aug 22, 2019

resolves #692

@instagibbs

This comment has been minimized.

Copy link
Collaborator Author

commented Aug 22, 2019

this needs a port to 0.18 branch

@stevenroose
Copy link
Member

left a comment

ACK 0fef2be

@@ -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)

This comment has been minimized.

Copy link
@stevenroose

stevenroose Sep 2, 2019

Member

This assumes at least one network style to not be an infinite loop. I guess that's ok :)

@stevenroose

This comment has been minimized.

Copy link
Member

commented Sep 2, 2019

Restarted Travis, build #8 was failing.

Backported here: #698

instagibbs added a commit that referenced this pull request Sep 3, 2019
Merge #693: Qt fixes post 18
0fef2be Fix QT transaction blinding details being committed to wallet (Gregory Sanders)
172ad71 Fix QT startup for custom chains (Gregory Sanders)

Pull request description:

  resolves #692

Tree-SHA512: bc18ada2350df95ebcd96fbc64be4085ca4f85e272ed89a3052d91bb02d48f6fc3c9cd0451db9741b14f4c416574d7f9db44cdc7a1502026a48729820ffb6aee

@instagibbs instagibbs merged commit 0fef2be into ElementsProject:master Sep 3, 2019

1 check failed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
instagibbs added a commit that referenced this pull request Sep 3, 2019
Merge #698: [0.18 backport] Qt fixes post 18
fdc365e Fix QT transaction blinding details being committed to wallet (Gregory Sanders)
523a7e9 Fix QT startup for custom chains (Gregory Sanders)

Pull request description:

  backport of #693

Tree-SHA512: e2896e557828fa30634a2eb0fe75e90ab1b9d1ca51726fe8199a021a757c49e95fc5b1fb43f5f81162f3698cb759680b613c11b3ec507a37a046ffa2c326a665
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.