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

Fixed Multisend dialog to show settings properly #580

Merged
merged 2 commits into from May 10, 2018

Conversation

Projects
None yet
4 participants
@SHTDJ
Copy link

SHTDJ commented Apr 22, 2018

Multisend will display a message if it has only been enabled for masternodes and if its enabled for both (Displaying this didnt work if multisend was only enabled for masternodes)

SHTDJ added some commits Apr 22, 2018

Fixed Multisend dialog to show settings properly
Multisend will display a message if it has only been enabled for masternodes and if its enabled for both (Displaying this didnt work if multisend was only enabled for masternodes)
@Warrows
Copy link
Collaborator

Warrows left a comment

utACK

else if (pwalletMain->fMultiSendStake)
strMultiSendPrint += "MultiSend Active for Stakes\n";
else if (pwalletMain->fMultiSendMasternodeReward)
strMultiSendPrint += "MultiSend Active for Masternode Rewards\n";

This comment has been minimized.

Copy link
@Warrows

Warrows Apr 23, 2018

Collaborator

nit: I think I would go for
if (a) print a
if (b) print b
instead of
if (a&b) print a & b
elif ...

@Fuzzbawls

This comment has been minimized.

Copy link
Collaborator

Fuzzbawls commented Apr 24, 2018

Concept ACK, but will need to hold off until after 3.1 to do further review/merging.

@Mrs-X

Mrs-X approved these changes May 10, 2018

Copy link
Collaborator

Mrs-X left a comment

I think the else if makes it easier readable because we don't have to concatenate the results.
Additionally it fixes a bug because in the original code fMultiSendStake was checked for masternodes.
Will test it soon...

...ACK and merging...

@Mrs-X Mrs-X merged commit 8dca829 into PIVX-Project:master May 10, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

Mrs-X added a commit that referenced this pull request May 10, 2018

Merge #580: Fixed Multisend dialog to show settings properly
8dca829 Update multisenddialog.cpp (SHTDJ)
40baa7d Fixed Multisend dialog to show settings properly (SHTDJ)

Tree-SHA512: df6ea6b3ece4f1417758d97d70d84047abf5cfa854068c97b9e463087fd80afcc08188ff4e33b88cb6c38db75efc993b383b3db74beb4655e2cb10cf08d05505

Fuzzbawls added a commit to Fuzzbawls/PIVX that referenced this pull request Jul 6, 2018

Fixed Multisend dialog to show settings properly
Multisend will display a message if it has only been enabled for masternodes and if its enabled for both (Displaying this didnt work if multisend was only enabled for masternodes)
Github-Pull: PIVX-Project#580
Rebased-From: 40baa7d

Fuzzbawls added a commit to Fuzzbawls/PIVX that referenced this pull request Jul 6, 2018

Update multisenddialog.cpp
Github-Pull: PIVX-Project#580
Rebased-From: 8dca829

Fuzzbawls added a commit that referenced this pull request Jul 10, 2018

Merge #650: 3.1.1 backports
d33cc11 Check whether tx is in chain in ContextualCheckZerocoinMint(). (presstab)
992a40e [Doc] Change aarch assert sign output folder Github-Pull: #585 Rebased-From: a810714 (Warrows)
f10439c [Crypto] Add ctx initialisation for bip38 (warrows)
21234db [Crypto] Bring back function CKey.SetPrivKey for zPIV (warrows)
65e009a [Tests] Add new auto generated script tests (warrows)
6839f3b [Crypto] Switch from openssl to secp256k1 for consensus (warrows)
8a901f9 Squashed 'src/secp256k1/' content from commit 452d8e4d2 (warrows)
d98a584 [Refactor] Delete secp256k1 folder for subtreefication (warrows)
b2fdbbf [Wallet] Write new transactions to wtxOrdered properly (Fuzzbawls)
5d73f63 [Build] Bump master to 3.1.99 (Fuzzbawls)
1c7f8d8 add gpdionisio gpg key for gitian (gpdionisio)
3a6b152 [Tests] Fix chain ordering in budget tests (Fuzzbawls)
bb94e0c Update protocol to 70914. (presstab)
68cea3e Add unit test for budget value. (presstab)
788f6cd [Budget] Fix wrong budget amount (Mrs-X)
06bae22 [Docs] Update historic release notes (Fuzzbawls)
f636f76 [Bug] Fix Windows icon files (Fuzzbawls)
3a34bf3 use c++11 for instead of boost for mnconf count (Fuzzbawls)
9837f53 [Bug] Fix CMasternodeConfig::read (Fuzzbawls)
a810714 [Doc] Change aarch assert sign output folder (Warrows)
e46e49b Update to zPIV staking and Thank you's (Sieres)
071f5d6 [Utils] Add copyright header to logprint-scanner.py (Fuzzbawls)
6e3a9ce [Depends] Update Qt download url (fanquake)
355fbae [Net] Update hard-coded fallback seeds (Fuzzbawls)
d13d574 [Qt] Periodic translation update (Fuzzbawls)
9e3b599 Remove unnecessary whitespaces (Fuzzbawls)
c833a14 [Main] Write to the zerocoinDB in batches (Fuzzbawls)
c20f604 [Travis] Add separate job to check doc/logprint/subtree (Fuzzbawls)
f3c8c6a Move ReindexAccumulators() call to be inside parent conditional (Fuzzbawls)
d2ad6f2 Guard against division by zero for reindex zerocoin/accumulators (Fuzzbawls)
bd64efc [Qt] Show progress percent for zpiv reindex operations (Fuzzbawls)
7e40737 [Wallet] Add some LOCK to avoid crash (warrows)
3a39f1e [UI] Remove useless help button from QT dialogs (warrows)
f9e18aa [Qt] Add Tor service icon to status bar (Fuzzbawls)
fc9ec37 Lower stake hashdrift to 30 seconds. (presstab)
9700322 Update zPIV stake set more frequently. (presstab)
3447c2b [Build] Make sure Boost headers are included for libzerocoin (Fuzzbawls)
617c987 [Core] Missing seesaw value for block 325000 (warrows)
f0c26a5 [Output] Properly log reason(s) for increasing a peer's DoS score. (Fuzzbawls)
a558084 Remove zPIV code from main.cpp (presstab)
32284ca [Budget] Make sorting of finalized budgets deterministic (Mrs-X)
263b382 [Build] Remove unnecessary BOOST dependency (Mrs-X)
c0891c3 Update multisenddialog.cpp Github-Pull: #580 Rebased-From: 8dca829 (SHTDJ)
4a9bc7f Fixed Multisend dialog to show settings properly (SHTDJ)
9b07d8e [GUI] Fix wrongly displayed balance on Overview tab (Mrs-X)
7a168df Remove log spam and ensure proper zpiv version is used. (presstab)
e5c7ffe Add getaccumulatorvalues RPC. (presstab)
71c47f8 Fix spending for v1 zPIV created before block 1050020. (presstab)
bd153af Only enable/disable PrivacyDialog zPIV elements if needed. (presstab)
acef27e [Tests] Fix chain ordering in budget tests (Fuzzbawls)

Tree-SHA512: 12e9cbd1bf3aa1e43b32f60003077bd20e7574f80d99acadc6f2a98ef02e1d80199244d9a2b1e1562ebc6afbc539eb52ef3963f08569a3471794f611cf1dd92b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.