Skip to content

Commit c14e04b

Browse files
Fix order of the checklist checks to make sure that the UI updates properly. (#464)
1 parent 5286ed8 commit c14e04b

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ApplicationIdGuid>c0679a79-bc22-46ad-9c49-93de983e3fa2</ApplicationIdGuid>
1919

2020
<!-- Versions -->
21-
<ApplicationDisplayVersion>1.91</ApplicationDisplayVersion>
21+
<ApplicationDisplayVersion>1.91.14</ApplicationDisplayVersion>
2222
<ApplicationVersion>14</ApplicationVersion>
2323

2424
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.3</SupportedOSPlatformVersion>

src/electionguard-ui/ElectionGuard.UI/Models/TallyCeremonyChecklist.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ public TallyCeremonyChecklist(
5656
_challengesResponded = challengesResponded;
5757
QuorumReached = _guardiansJoined >= _quorum;
5858
State = tally.State;
59-
TallyComplete = State == TallyState.Complete;
59+
SubtaliesCombined = State >= TallyState.PendingGuardianDecryptShares;
60+
AllDecryptionSharesComputed = SubtaliesCombined &&
61+
(State > TallyState.PendingGuardianDecryptShares ||
62+
(State == TallyState.PendingGuardianDecryptShares && _sharesComputed >= _quorum));
6063
ChallengeCreated = AllDecryptionSharesComputed && State >= TallyState.PendingGuardianRespondChallenge;
61-
AllChallengesResponded = ChallengeCreated &&
64+
AllChallengesResponded = ChallengeCreated &&
6265
(State > TallyState.PendingGuardianRespondChallenge ||
6366
(State == TallyState.PendingGuardianRespondChallenge && _challengesResponded == _quorum));
64-
AllDecryptionSharesComputed = SubtaliesCombined &&
65-
(State > TallyState.PendingGuardianDecryptShares ||
66-
(State == TallyState.PendingGuardianDecryptShares && _sharesComputed >= _quorum));
67-
SubtaliesCombined = State >= TallyState.PendingGuardianDecryptShares;
67+
TallyComplete = State == TallyState.Complete;
6868
TallyStarted = State >= TallyState.TallyStarted;
6969
IsAbandoned = State == TallyState.Abandoned;
7070
}

0 commit comments

Comments
 (0)