Progress

delvtech · Feb 20, 2024 · 465172b · 465172b
1 parent ee0c0b4
commit 465172b
Show file tree

Hide file tree

Showing 31 changed files with 416 additions and 307 deletions.
diff --git a/apps/council-ui/pages/proposals/details.tsx b/apps/council-ui/pages/proposals/details.tsx
@@ -47,6 +47,8 @@ export default function ProposalPage(): ReactElement {
   );
   const { gscMembers } = useGscMembers();
 
+  console.log("coreVoting", coreVoting);
+
   // // voting activity filtering
   const [gscOnly, setGscOnly] = useState(false);
   const filteredVotes = useMemo(() => {

diff --git a/apps/council-ui/pages/vaults/details.tsx b/apps/council-ui/pages/vaults/details.tsx
@@ -6,7 +6,8 @@ import { FrozenLockingVaultDetails } from "src/ui/vaults/frozenLockingVault/Froz
 import { GenericVaultDetails } from "src/ui/vaults/genericVault/GenericVaultDetails";
 import { GscVaultDetails } from "src/ui/vaults/gscVault/GSCVaultDetails";
 import { LockingVaultDetails } from "src/ui/vaults/lockingVault/LockingVaultDetails";
-// import { VestingVaultDetails } from "src/ui/vaults/vestingVault/VestingVaultDetails";
+import { VestingVaultDetails } from "src/ui/vaults/vestingVault/VestingVaultDetails";
+// import { VestingVaultDetails } from"src/ui/vaults/vestingVault/VestingVaultDetails";
 
 export default function VaultPage(): ReactElement {
   const { query, replace } = useRouter();
@@ -32,8 +33,7 @@ export default function VaultPage(): ReactElement {
             return <LockingVaultDetails address={address} />;
 
           case "VestingVault":
-            // return <VestingVaultDetails address={address} />;
-            return <p>Vesting Vault</p>;
+            return <VestingVaultDetails address={address} />;
 
           case "GSCVault":
             return <GscVaultDetails address={address} />;

diff --git a/apps/council-ui/src/config/localhost.ts b/apps/council-ui/src/config/localhost.ts
@@ -23,6 +23,12 @@ export const localhostCouncilConfig: CouncilConfig = {
         type: "LockingVault",
         descriptionURL: "https://moreinfo.com",
       },
+      {
+        name: "Vesting Vault",
+        address: "0x59b670e9fa9d0a427751af201d676719a970857b",
+        type: "VestingVault",
+        descriptionURL: "https://moreinfo.com",
+      },
     ],
     proposals: {},
   },

diff --git a/apps/council-ui/src/ui/airdrop/DepositOrClaimStep.tsx b/apps/council-ui/src/ui/airdrop/DepositOrClaimStep.tsx
@@ -1,11 +1,11 @@
 import { BuildingLibraryIcon, WalletIcon } from "@heroicons/react/20/solid";
 import { ReactElement } from "react";
 import Skeleton from "react-loading-skeleton";
+import { useAirdropToken } from "src/ui/airdrop/hooks/useAirdropToken";
+import { useClaimableAirdropAmount } from "src/ui/airdrop/hooks/useClaimableAirdropAmount";
 import { formatBalance } from "src/ui/base/formatting/formatBalance";
 import { AirdropIcon } from "src/ui/base/svg/24/AirdropIcon";
 import { useTokenSymbol } from "src/ui/token/hooks/useTokenSymbol";
-import { useAirdropToken } from "./hooks/useAirdropToken";
-import { useClaimableAirdropAmount } from "./hooks/useClaimableAirdropAmount";
 
 interface DepositOrClaimStepProps {
   onDeposit: (() => void) | undefined;
@@ -54,15 +54,15 @@ export default function DepositOrClaimStep({
             disabled={!onClaim}
             onClick={onClaim}
           >
-            <WalletIcon className="h-5 w-5 fill-current" />
+            <WalletIcon className="size-5 fill-current" />
             Claim
           </button>
           <button
             className="daisy-btn daisy-btn-primary grow gap-2"
             disabled={!onDeposit}
             onClick={onDeposit}
           >
-            <BuildingLibraryIcon className="h-5 w-5 fill-current" />
+            <BuildingLibraryIcon className="size-5 fill-current" />
             Deposit
           </button>
         </div>

diff --git a/apps/council-ui/src/ui/config/hooks/useVaultConfig.ts b/apps/council-ui/src/ui/config/hooks/useVaultConfig.ts
@@ -5,5 +5,10 @@ export function useVaultConfig(
   address: `0x${string}` | undefined,
 ): VaultConfig | undefined {
   const config = useCouncilConfig();
+
+  if (config.gscVoting?.vault?.address === address) {
+    return config.gscVoting?.vault;
+  }
+
   return config.coreVoting.vaults.find((vault) => vault.address === address);
 }
diff --git a/apps/council-ui/src/ui/council/hooks/useReadCoreVoting.ts b/apps/council-ui/src/ui/council/hooks/useReadCoreVoting.ts
@@ -9,8 +9,23 @@ import { useReadCouncil } from "src/ui/council/hooks/useReadCouncil";
 export function useReadCoreVoting(): ReadCoreVoting {
   const council = useReadCouncil();
   const { coreVoting } = useCouncilConfig();
+  // const ref = useRef<string>();
+
+  // useEffect(() => {
+  //   console.log('council changed')
+  // }, [council])
+
+  // useEffect(() => {
+  //   console.log('coreVoting.address changed from', ref.current, 'to', coreVoting.address)
+
+  // }, [coreVoting.address])
+
+  // useEffect(() => {
+  //   console.log('coreVoting.vaults changed')
+  // }, [coreVoting.vaults])
 
   return useMemo(() => {
+    // console.log("Making new coreVoting with vaults:", coreVoting.vaults);
     return council.coreVoting({
       address: coreVoting.address,
       vaults: coreVoting.vaults.map((vault) => {

diff --git a/apps/council-ui/src/ui/council/hooks/useReadCouncil.ts b/apps/council-ui/src/ui/council/hooks/useReadCouncil.ts
@@ -16,10 +16,12 @@ export function useReadCouncil(): ReadCouncil {
       throw new Error("Public client is not available");
     }
 
+    console.log("Making new ReadCouncil");
+
     return new ReadCouncil({
       publicClient,
       cache: sdkCache,
       namespace: "council-viem",
     });
-  }, [publicClient]);
+  }, [chainId]);
 }
diff --git a/apps/council-ui/src/ui/vaults/GenericVaultCard.tsx b/apps/council-ui/src/ui/vaults/GenericVaultCard.tsx
@@ -4,7 +4,7 @@ import Skeleton from "react-loading-skeleton";
 import { makeVaultURL } from "src/routes";
 import { Address } from "src/ui/base/Address";
 import { DefinitionTooltip } from "src/ui/base/Tooltip";
-import { formatUnitsBalance } from "src/ui/base/formatting/formatUnitsBalance";
+import { formatVotingPower } from "src/ui/base/formatting/formatVotingPower";
 import { TVP_TIP } from "src/ui/vaults/tooltips";
 
 interface GenericVaultCardProps {
@@ -44,16 +44,14 @@ export function GenericVaultCard({
                 </DefinitionTooltip>
               </span>
               <span className="font-bold">
-                {tvp ? formatUnitsBalance({ balance: tvp }) : "None"}
+                {tvp ? formatVotingPower(tvp) : "None"}
               </span>
             </div>
 
             <div className="flex w-full justify-between">
               <span>Your voting power:</span>
               <span className="font-bold">
-                {votingPower
-                  ? formatUnitsBalance({ balance: votingPower })
-                  : "None"}
+                {votingPower ? formatVotingPower(votingPower) : "None"}
               </span>
             </div>
           </div>

diff --git a/apps/council-ui/src/ui/vaults/genericVault/GenericVaultStatsRow.tsx b/apps/council-ui/src/ui/vaults/genericVault/GenericVaultStatsRow.tsx
@@ -1,11 +1,11 @@
 import { ReactElement } from "react";
-import { formatBalance } from "src/ui/base/formatting/formatBalance";
+import { formatVotingPower } from "src/ui/base/formatting/formatVotingPower";
 import { Stat } from "src/ui/base/Stat";
 import { DefinitionTooltip } from "src/ui/base/Tooltip";
 import { YOUR_VOTING_POWER_TIP } from "src/ui/vaults/tooltips";
 
 interface GeneircVaultStatsRowProps {
-  accountVotingPower: string;
+  accountVotingPower: bigint;
 }
 
 export function GenericVaultStatsRow({
@@ -19,7 +19,9 @@ export function GenericVaultStatsRow({
             Your voting power
           </DefinitionTooltip>
         }
-        value={+accountVotingPower ? formatBalance(accountVotingPower) : "None"}
+        value={
+          accountVotingPower ? formatVotingPower(accountVotingPower) : "None"
+        }
       />
     </div>
   );

diff --git a/apps/council-ui/src/ui/vaults/gscVault/GscMembersTable.tsx b/apps/council-ui/src/ui/vaults/gscVault/GscMembersTable.tsx
@@ -1,6 +1,6 @@
 import { ReactElement } from "react";
 import { makeVoterURL } from "src/routes";
-import { formatBalance } from "src/ui/base/formatting/formatBalance";
+import { formatVotingPower } from "src/ui/base/formatting/formatVotingPower";
 import { GridTableRowLink } from "src/ui/base/tables/GridTableRowLink";
 import { GscMembersTableHeader } from "src/ui/vaults/gscVault/GscMembersTableHeader";
 import { useKickGscMember } from "src/ui/vaults/gscVault/hooks/useKickGscMember";
@@ -53,7 +53,7 @@ function GSCMembersTableRow({
     <GridTableRowLink href={makeVoterURL(member.address)}>
       <VoterAddress address={member.address} ensName={ensName} />
       <span className="flex items-center">
-        {formatBalance(qualifyingVotingPower)}
+        {formatVotingPower(qualifyingVotingPower)}
       </span>
 
       <span className="flex items-center">

diff --git a/apps/council-ui/src/ui/vaults/gscVault/GscVaultPreviewCard.tsx b/apps/council-ui/src/ui/vaults/gscVault/GscVaultPreviewCard.tsx
@@ -5,7 +5,6 @@ import { ReactElement } from "react";
 import { makeVaultURL } from "src/routes";
 import { Address } from "src/ui/base/Address";
 import { DefinitionTooltip } from "src/ui/base/Tooltip";
-import { formatBalance } from "src/ui/base/formatting/formatBalance";
 import { useCouncilConfig } from "src/ui/config/hooks/useCouncilConfig";
 import { GenericVaultCardSkeleton } from "src/ui/vaults/GenericVaultCard";
 import { useGscStatus } from "src/ui/vaults/gscVault/hooks/useGscStatus";
@@ -66,9 +65,7 @@ export function GSCVaultPreviewCard({
                   <span>GSC members:</span>
                   <span className="text-right font-bold">
                     <DefinitionTooltip content="The number of members currently residing on the Governance Steering Council.">
-                      {gscMembers?.length
-                        ? formatBalance(gscMembers.length)
-                        : "None"}
+                      {gscMembers?.length || "None"}
                     </DefinitionTooltip>
                   </span>
                 </div>

diff --git a/apps/council-ui/src/ui/vaults/gscVault/GscVaultProfileCard.tsx b/apps/council-ui/src/ui/vaults/gscVault/GscVaultProfileCard.tsx
@@ -1,6 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import { ReactElement } from "react";
-import { formatBalance } from "src/ui/base/formatting/formatBalance";
+import { formatVotingPower } from "src/ui/base/formatting/formatVotingPower";
 import { useCouncilConfig } from "src/ui/config/hooks/useCouncilConfig";
 import { useReadCoreVoting } from "src/ui/council/hooks/useReadCoreVoting";
 import { VaultProfileCard } from "src/ui/vaults/VaultProfileCard";
@@ -50,11 +50,11 @@ export function GSCVaultProfileCard({
         },
         {
           label: "Required voting power",
-          value: formatBalance(requiredVotingPower),
+          value: formatVotingPower(requiredVotingPower),
         },
         {
           label: "Qualifying voting power",
-          value: formatBalance(qualifyingVotingPower),
+          value: formatVotingPower(qualifyingVotingPower),
         },
       ]}
       button={{

diff --git a/apps/council-ui/src/ui/vaults/gscVault/GscVaultStatsRow.tsx b/apps/council-ui/src/ui/vaults/gscVault/GscVaultStatsRow.tsx
@@ -1,7 +1,7 @@
 import { ReactElement } from "react";
 import { Stat } from "src/ui/base/Stat";
 import { DefinitionTooltip } from "src/ui/base/Tooltip";
-import { formatBalance } from "src/ui/base/formatting/formatBalance";
+import { formatVotingPower } from "src/ui/base/formatting/formatVotingPower";
 import { GscStatus } from "src/utils/gscVault/types";
 import { GscMembershipStatusStat } from "./GscMembershipStatusStat";
 
@@ -36,7 +36,7 @@ export function GSCVaultsStatsRow({
             Voting Power Required to be a GSC Member
           </DefinitionTooltip>
         }
-        value={formatBalance(requiredVotingPower)}
+        value={formatVotingPower(requiredVotingPower)}
       />
     </div>
   );

diff --git a/apps/council-ui/src/ui/vaults/lockingVault/LockingVaultDetails.tsx b/apps/council-ui/src/ui/vaults/lockingVault/LockingVaultDetails.tsx
@@ -83,7 +83,6 @@ export function LockingVaultDetails({
           participants={data.participants}
           tokenAddress={data.tokenAddress}
           tokenSymbol={data.tokenSymbol}
-          decimals={data.decimals}
         />
       }
       actions={

diff --git a/apps/council-ui/src/ui/vaults/lockingVault/LockingVaultStatsRow.tsx b/apps/council-ui/src/ui/vaults/lockingVault/LockingVaultStatsRow.tsx
@@ -1,7 +1,7 @@
 import { ReactElement } from "react";
 import { Stat } from "src/ui/base/Stat";
 import { DefinitionTooltip } from "src/ui/base/Tooltip";
-import { formatUnitsBalance } from "src/ui/base/formatting/formatUnitsBalance";
+import { formatVotingPower } from "src/ui/base/formatting/formatVotingPower";
 import ExternalLink from "src/ui/base/links/ExternalLink";
 import { useSupportedChainId } from "src/ui/network/hooks/useSupportedChainId";
 import {
@@ -17,7 +17,6 @@ interface LockingVaultStatsRowProps {
   participants: number;
   tokenAddress: `0x${string}`;
   tokenSymbol: string;
-  decimals: number;
 }
 
 export function LockingVaultStatsRow({
@@ -26,13 +25,9 @@ export function LockingVaultStatsRow({
   participants,
   tokenAddress,
   tokenSymbol,
-  decimals,
 }: LockingVaultStatsRowProps): ReactElement {
   const chainId = useSupportedChainId();
-  const votingPowerFormatted = formatUnitsBalance({
-    balance: accountVotingPower,
-    decimals,
-  });
+  const votingPowerFormatted = formatVotingPower(accountVotingPower);
 
   return (
     <div className="flex flex-wrap gap-4">

diff --git a/apps/council-ui/src/ui/vaults/lockingVault/LockingVaultsProfileCard.tsx b/apps/council-ui/src/ui/vaults/lockingVault/LockingVaultsProfileCard.tsx
@@ -7,6 +7,7 @@ import { makeVoterURL } from "src/routes";
 import { Tooltip } from "src/ui/base/Tooltip";
 import { WalletIcon } from "src/ui/base/WalletIcon";
 import { formatUnitsBalance } from "src/ui/base/formatting/formatUnitsBalance";
+import { formatVotingPower } from "src/ui/base/formatting/formatVotingPower";
 import { useDisplayName } from "src/ui/base/formatting/useDisplayName";
 import { useVaultConfig } from "src/ui/config/hooks/useVaultConfig";
 import { useReadCouncil } from "src/ui/council/hooks/useReadCouncil";
@@ -76,9 +77,7 @@ export function LockingVaultProfileCard({
           label: "Voting Power",
           value:
             votingPowerBreakdown && votingPowerBreakdown.votingPower
-              ? formatUnitsBalance({
-                  balance: votingPowerBreakdown.votingPower,
-                })
+              ? formatVotingPower(votingPowerBreakdown.votingPower)
               : "None",
         },
         {