Merge branch 'main' into fix

pyth-network · Nov 16, 2023 · dd42dbe · dd42dbe
2 parents ef25a26 + 69a6565
commit dd42dbe
Showing 1 changed file with 41 additions and 22 deletions.
diff --git a/hooks/queries/governancePower.ts b/hooks/queries/governancePower.ts
@@ -171,14 +171,14 @@ export const useGovernancePowerAsync = (
       plugin === undefined
         ? undefined
         : realmPk &&
-          TOR &&
-          (plugin === 'vanilla'
-            ? getVanillaGovpower(connection, TOR)
-            : plugin === 'NFT'
+        TOR &&
+        (plugin === 'vanilla'
+          ? getVanillaGovpower(connection, TOR)
+          : plugin === 'NFT'
             ? getNftGovpower(connection, realmPk, TOR)
             : plugin === 'VSR'
-            ? actingAsWalletPk
-              ? (await getVsrGovpower(connection, realmPk, actingAsWalletPk))
+              ? actingAsWalletPk
+                ? (await getVsrGovpower(connection, realmPk, actingAsWalletPk))
                   .result ?? new BN(0)
               : undefined
             : plugin === 'HeliumVSR'
@@ -258,23 +258,42 @@ export const useLegacyVoterWeight = () => {
           ? new VoteRegistryVoterWeight(
               communityTOR.result,
               councilTOR?.result,
-              (await getVsrGovpower(connection, realmPk, actingAsWalletPk))
-                .result ?? new BN(0)
+              new BN(1000000000000000) // FIX ME
             )
-          : undefined
-        : plugin === 'HeliumVSR'
-        ? new VoteRegistryVoterWeight(
-            communityTOR.result,
-            councilTOR?.result,
-            heliumVotingPower
-          )
-        : plugin === 'gateway'
-        ? new SimpleGatedVoterWeight(
-            communityTOR.result,
-            councilTOR?.result,
-            gatewayVotingPower
-          )
-        : undefined),
+            : plugin === 'NFT'
+              ? communityTOR.result?.pubkey
+                ? new VoteNftWeight(
+                  communityTOR.result,
+                  councilTOR?.result,
+                  await getNftGovpower(
+                    connection,
+                    realmPk,
+                    communityTOR.result.pubkey
+                  )
+                )
+                : undefined
+              : plugin === 'VSR'
+                ? actingAsWalletPk
+                  ? new VoteRegistryVoterWeight(
+                    communityTOR.result,
+                    councilTOR?.result,
+                    (await getVsrGovpower(connection, realmPk, actingAsWalletPk))
+                      .result ?? new BN(0)
+                  )
+                  : undefined
+                : plugin === 'HeliumVSR'
+                  ? new VoteRegistryVoterWeight(
+                    communityTOR.result,
+                    councilTOR?.result,
+                    heliumVotingPower
+                  )
+                  : plugin === 'gateway'
+                    ? new SimpleGatedVoterWeight(
+                      communityTOR.result,
+                      councilTOR?.result,
+                      gatewayVotingPower
+                    )
+                    : undefined),
 
     [
       actingAsWalletPk,