diff --git a/src/pages/v0/daos/[address].tsx b/src/pages/v0/daos/[address].tsx
index af42476..73c76f2 100644
--- a/src/pages/v0/daos/[address].tsx
+++ b/src/pages/v0/daos/[address].tsx
@@ -59,7 +59,7 @@ export default function DaoPage() {
@@ -96,66 +96,10 @@ function EthereumAccount() {
)
}
-function PriorityCount({ daoAddress }: any) {
- console.log('PriorityCount')
-
- const { isConnected } = useAccount()
- console.log('isConnected:', isConnected)
-
- const [isPriorityButtonClicked, setPriorityButtonClicked] = useState(false)
- console.log('isPriorityButtonClicked:', isPriorityButtonClicked)
-
- const { data: priorityCount, isError, isLoading } = useContractRead({
- address: daoAddress,
- abi: Sector3DAO.abi,
- functionName: 'getPriorityCount'
- })
- console.log('priorityCount:', priorityCount)
-
- if (!useIsMounted() || (priorityCount == undefined)) {
- return (
-
- )
- } else if (priorityCount == 0) {
- return (
- <>
-
- {/*
*/}
-
- {/* */}
-
-
- {isPriorityButtonClicked && (
-
- )}
-
-
Priorities
-
-
-
- >
- )
- }
- return
-}
-
-function Priorities({ daoAddress, priorityCount }: any) {
+function Priorities({ daoAddress }: any) {
console.log('Priorities')
console.log('daoAddress:', daoAddress)
- console.log('priorityCount:', priorityCount)
const { isConnected } = useAccount()
console.log('isConnected:', isConnected)
@@ -163,23 +107,10 @@ function Priorities({ daoAddress, priorityCount }: any) {
const [isPriorityButtonClicked, setPriorityButtonClicked] = useState(false)
console.log('isPriorityButtonClicked:', isPriorityButtonClicked)
- let contracts: any = [priorityCount]
- for (let i = 0; i < Number(priorityCount); i++) {
- console.log('i:', i)
- const daoContract = {
- address: daoAddress,
- abi: Sector3DAO.abi
- }
- contracts[i] = {
- ...daoContract,
- functionName: 'priorities',
- args: [i]
- }
- }
- console.log('contracts:', contracts)
-
- const { data, isError, isLoading } = useContractReads({
- contracts: contracts
+ const { data, isError, isLoading } = useContractRead({
+ address: daoAddress,
+ abi: Sector3DAO.abi,
+ functionName: 'getPriorities'
})
console.log('data:', data)
diff --git a/src/pages/v0/priorities/[address]/epochs/[epochIndex].tsx b/src/pages/v0/priorities/[address]/epochs/[epochIndex].tsx
index 73638af..de75d19 100644
--- a/src/pages/v0/priorities/[address]/epochs/[epochIndex].tsx
+++ b/src/pages/v0/priorities/[address]/epochs/[epochIndex].tsx
@@ -72,7 +72,7 @@ export default function EpochPage() {
-
+
@@ -209,36 +209,11 @@ function Priority({ address }: any) {
)
}
-function ContributionCount({ priorityAddress, epochIndex }: any) {
- console.log('ContributionCount')
-
- console.log('priorityAddress:', priorityAddress)
- console.log('epochIndex:', epochIndex)
-
- const { data: contributionCount, isError, isLoading } = useContractRead({
- address: priorityAddress,
- abi: Sector3DAOPriority.abi,
- functionName: 'getContributionCount'
- })
- console.log('contributionCount:', contributionCount)
-
- if (!useIsMounted() || (contributionCount == undefined)) {
- return (
-
- )
- }
- return
-}
-
-function Contributions({ priorityAddress, epochIndex, contributionCount }: any) {
+function Contributions({ priorityAddress, epochIndex }: any) {
console.log('Contributions')
console.log('priorityAddress:', priorityAddress)
console.log('epochIndex:', epochIndex)
- console.log('contributionCount:', contributionCount)
const { isConnected } = useAccount()
console.log('isConnected:', isConnected)
@@ -262,49 +237,15 @@ function Contributions({ priorityAddress, epochIndex, contributionCount }: any)
}
console.log('priorityTitle:', priorityTitle)
- let contracts: any = [contributionCount]
- let i = 0
- for (i = 0; i < Number(contributionCount); i++) {
- console.log('i:', i)
- contracts[i] = {
- ...priorityContract,
- functionName: 'getContribution',
- args: [i]
- }
- }
- console.log('contracts:', contracts)
-
- const { data: contributionsData, isError, isLoading } = useContractReads({
- contracts: contracts
+ const { data: contributionsData, isError, isLoading } = useContractRead({
+ ...priorityContract,
+ functionName: 'getContributions'
})
console.log('contributionsData:', contributionsData)
let contributions: any = null
- if (contributionCount == 0) {
- contributions = []
- } else {
- if (contributionsData != undefined) {
- contributions = []
- let contributionIndex = contributionCount - 1
- while (contributionIndex >= 0) {
- console.log('contributionIndex:', contributionIndex)
-
- const contributionData: any = contributionsData[contributionIndex]
- console.log('contributionData:', contributionData)
- if (contributionData.epochIndex == epochIndex) {
- const contribution = {
- contributor: contributionData.contributor,
- description: contributionData.description,
- proofURL: contributionData.proofURL,
- alignment: contributionData.alignment,
- hoursSpent: contributionData.hoursSpent
- }
- contributions[contributions.length] = contribution
- }
-
- contributionIndex--
- }
- }
+ if (contributionsData != undefined) {
+ contributions = contributionsData
}
console.log('contributions:', contributions)
@@ -346,7 +287,7 @@ function Contributions({ priorityAddress, epochIndex, contributionCount }: any)
No data
) : (
- contributions.map((contribution: any, index: number) => (
+ contributions.slice(0).reverse().map((contribution: any, index: number) => (