Merge branch 'main' into fix/database-fix

Election-Tech-Initiative · May 8, 2023 · eee8465 · eee8465
2 parents 745f20d + ec84c32
commit eee8465
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/electionguard-ui/ElectionGuard.UI/ViewModels/BallotUploadViewModel.cs b/src/electionguard-ui/ElectionGuard.UI/ViewModels/BallotUploadViewModel.cs
@@ -130,7 +130,7 @@ private async Task Upload()
             {
                 var filename = Path.GetFileName(currentBallot);
                 var ballotData = File.ReadAllText(currentBallot);
-                SubmittedBallot ballot = new(ballotData);
+                CiphertextBallot ballot = new(ballotData);
 
                 if (ballot.ManifestHash != _manifestHash)
                 {

diff --git a/src/electionguard-ui/ElectionGuard.UI/ViewModels/CreateKeyCeremonyAdminViewModel.cs b/src/electionguard-ui/ElectionGuard.UI/ViewModels/CreateKeyCeremonyAdminViewModel.cs
@@ -1,4 +1,4 @@
-using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 using ElectionGuard.UI.Lib.Models;
 
 namespace ElectionGuard.UI.ViewModels;
@@ -40,7 +40,7 @@ public async Task CreateKeyCeremony()
             return;
         }
 
-        var keyCeremony = new KeyCeremonyRecord(KeyCeremonyName, Quorum, NumberOfGuardians, this.UserName!);
+        var keyCeremony = new KeyCeremonyRecord(KeyCeremonyName, NumberOfGuardians, Quorum, this.UserName!);
         var ret = await _keyCeremonyService.SaveAsync(keyCeremony);
         var keyCeremonyId = ret.KeyCeremonyId!;
         await NavigationService.GoToPage(typeof(ViewKeyCeremonyViewModel), new Dictionary<string, object>