Merge pull request #298 from RootstockCollective/chore/DAO_737

chore: change column order on treasury page
RootstockCollective · Oct 29, 2024 · 3c3d51e · 3c3d51e
2 parents d35b3be + 8b228f5
commit 3c3d51e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/app/treasury/TreasuryContext.tsx b/src/app/treasury/TreasuryContext.tsx
@@ -65,6 +65,7 @@ const TreasuryContextProvider = ({ children }: Props) => {
   const bucketTwoBalance = useGetTreasuryBucketBalance(treasuryContracts[1].address)
   const bucketThreeBalance = useGetTreasuryBucketBalance(treasuryContracts[2].address)
   const bucketFourBalance = useGetTreasuryBucketBalance(treasuryContracts[3].address)
+  const bucketFiveBalance = useGetTreasuryBucketBalance(treasuryContracts[4].address)
 
   // Create the buckets array
   const buckets = useMemo(
@@ -73,8 +74,9 @@ const TreasuryContextProvider = ({ children }: Props) => {
       getBucketBalance(bucketTwoBalance, prices),
       getBucketBalance(bucketThreeBalance, prices),
       getBucketBalance(bucketFourBalance, prices),
+      getBucketBalance(bucketFiveBalance, prices),
     ],
-    [bucketOneBalance, bucketTwoBalance, bucketThreeBalance, bucketFourBalance, prices],
+    [bucketOneBalance, bucketTwoBalance, bucketThreeBalance, bucketFourBalance, bucketFiveBalance, prices],
   )
 
   const bucketsTotal = useMemo(() => getAllBucketsHoldings(buckets), [buckets])

diff --git a/src/app/treasury/TreasurySection.tsx b/src/app/treasury/TreasurySection.tsx
@@ -29,7 +29,6 @@ export const TreasurySection = () => {
             title={`${contract.name} RBTC`}
             amount={`${buckets[index]?.RBTC?.amount ? toFixed(buckets[index].RBTC.amount) : 0}`}
             fiatAmount={`= USD ${buckets[index]?.RBTC?.fiatAmount ? buckets[index].RBTC.fiatAmount : 0}`}
-            contractAddress={contract.address}
             data-testid={`${contract.name}-RBTC`}
             borderless
           />

diff --git a/src/lib/contracts.ts b/src/lib/contracts.ts
@@ -33,8 +33,8 @@ const treasuryContracts = [
   { name: 'Grants', address: GRANTS_BUCKET_ADDRESS },
   { name: 'Grants - Active', address: GRANTS_ACTIVE_BUCKET_ADDRESS },
   { name: 'Growth', address: GROWTH_BUCKET_ADDRESS },
-  { name: 'General', address: GENERAL_BUCKET_ADDRESS },
   { name: 'Growth - Rewards', address: SIMPLIFIED_REWARD_DISTRIBUTOR_ADDRESS },
+  { name: 'General', address: GENERAL_BUCKET_ADDRESS },
 ]
 
 const GovernorAddress = GOVERNOR_ADDRESS