Merge pull request #299 from privacy-scaling-explorations/fix/loading…

…-states fix: ensure we always update loading state correctly
privacy-scaling-explorations · Sep 4, 2024 · d8ecc7f · d8ecc7f
2 parents 96ace2d + 45b1690
commit d8ecc7f
Show file tree

Hide file tree

Showing 3 changed files with 192 additions and 56 deletions.
diff --git a/packages/coordinator/package.json b/packages/coordinator/package.json
@@ -45,12 +45,12 @@
     "class-validator": "^0.14.1",
     "dotenv": "^16.4.5",
     "ethers": "^6.13.1",
-    "hardhat": "^2.22.6",
+    "hardhat": "^2.22.8",
     "helmet": "^7.1.0",
     "lowdb": "^1.0.0",
     "maci-circuits": "^2.1.0",
     "maci-cli": "^2.1.0",
-    "maci-contracts": "^2.1.0",
+    "maci-contracts": "0.0.0-ci.d683cb3",
     "maci-domainobjs": "^2.0.0",
     "maci-subgraph": "^2.1.0",
     "mustache": "^4.2.0",

diff --git a/packages/interface/src/contexts/Maci.tsx b/packages/interface/src/contexts/Maci.tsx
@@ -109,6 +109,7 @@ export const MaciProvider: React.FC<MaciProviderProps> = ({ children }: MaciProv
     switch (gatekeeperTrait) {
       case GatekeeperTrait.Semaphore:
         if (!signer) {
+          setIsLoading(false);
           return;
         }
         getSemaphoreProof(signer, semaphoreIdentity!)
@@ -126,6 +127,7 @@ export const MaciProvider: React.FC<MaciProviderProps> = ({ children }: MaciProv
         break;
       case GatekeeperTrait.Hats:
         if (!signer) {
+          setIsLoading(false);
           return;
         }
         getHatsSingleGatekeeperData({
@@ -377,6 +379,7 @@ export const MaciProvider: React.FC<MaciProviderProps> = ({ children }: MaciProv
       setIsLoading(false);
     } else {
       if (!window.ethereum) {
+        setIsLoading(false);
         return;
       }