Fix past councils spending amounts (#4554)

* Fix-3225: used BudgetUpdatedEvent instead of BudgetSetEvent

* Fix 3225 : updated test.tsx and mock server.ts

* Fix 4121: migrated proposalExecutedEvent to Proposals

* Fix 4121: updated the totalspent

* Fix 4121 : Removed unnecessary line

* Fix 4121 : Updated test.tsx

* Fix 4121: Updated the code by Thesan's suggestion

* added channelPayerMadeEvent

packages/ui/src/council/hooks/usePastCouncil.ts

@@ -1,22 +1,35 @@
 import { useCouncilBlockRange } from '@/council/hooks/useCouncilBlockRange'
-import { useGetPastCouncilQuery } from '@/council/queries'
+import { useGetPastCouncilQuery, useGetPastCouncilWorkingGroupsQuery } from '@/council/queries'
 import { asPastCouncilWithDetails } from '@/council/types/PastCouncil'
 
 export const usePastCouncil = (id: string) => {
   const { loadingRange, fromBlock, toBlock } = useCouncilBlockRange(id)
 
   const { loading: loadingData, data: councilData } = useGetPastCouncilQuery({ variables: { id, fromBlock, toBlock } })
 
+  const { loading: loadingWorkingGroup, data: workingGroupData } = useGetPastCouncilWorkingGroupsQuery({
+    variables: {
+      fromBlock: fromBlock,
+      toBlock: toBlock,
+    },
+  })
+
   return {
-    isLoading: loadingRange || loadingData,
+    isLoading: loadingRange || loadingData || loadingWorkingGroup,
     council:
       councilData?.electedCouncilByUniqueInput &&
       councilData?.budgetSpendingEvents &&
       councilData?.fundingRequestsApproved &&
+      workingGroupData?.rewardPaidEvents &&
+      workingGroupData?.budgetUpdatedEvents &&
+      workingGroupData?.channelPaymentMadeEvents &&
       asPastCouncilWithDetails(
+        workingGroupData.rewardPaidEvents,
+        workingGroupData.budgetUpdatedEvents,
         councilData.electedCouncilByUniqueInput,
         councilData.budgetSpendingEvents,
-        councilData.fundingRequestsApproved
+        councilData.fundingRequestsApproved,
+        workingGroupData.channelPaymentMadeEvents
       ),
   }
 }

packages/ui/src/council/hooks/usePastCouncilStats.ts

@@ -1,5 +1,6 @@
+import { usePastCouncil } from '@/council/hooks/usePastCouncil'
 import { useGetCouncilBlockRangeQuery, useGetPastCouncilStatsQuery } from '@/council/queries'
-import { getSpentOnProposals, getTotalSpent } from '@/council/types/PastCouncil'
+import { getSpentOnProposals } from '@/council/types/PastCouncil'
 
 export const usePastCouncilStats = (id: string) => {
   const { loading: loadingRange, data: rangeData } = useGetCouncilBlockRangeQuery({
@@ -19,11 +20,13 @@ export const usePastCouncilStats = (id: string) => {
     },
   })
 
+  const { isLoading: loadingCouncil, council: pastCouncil } = usePastCouncil(id)
+
   return {
-    isLoading: loadingRange || loadingData,
+    isLoading: loadingRange || loadingData || loadingCouncil,
     proposalsApproved: data?.proposalsApproved?.totalCount ?? 0,
     proposalsRejected: (data?.proposalsRejected?.totalCount || 0) + (data?.proposalsSlashed?.totalCount || 0),
-    totalSpent: data && getTotalSpent(data.budgetSpendingEvents),
+    totalSpent: data && pastCouncil && pastCouncil.totalSpent,
     spentOnProposals: data && getSpentOnProposals(data.fundingRequestsApproved),
   }
 }