Merge pull request #677 from clrfund/fix/recipient-list

Projects not showing if a round does not exist

vue-app/src/api/factory.ts

@@ -18,12 +18,14 @@ export async function getFactoryInfo() {
   const nativeTokenDecimals = await nativeToken.decimals()
 
   const userRegistryAddress = await factory.userRegistry()
+  const recipientRegistryAddress = await factory.recipientRegistry()
 
   return {
     fundingRoundAddress: factory.address,
     nativeTokenAddress,
     nativeTokenSymbol,
     nativeTokenDecimals,
     userRegistryAddress,
+    recipientRegistryAddress,
   }
 }

vue-app/src/views/ProjectList.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="project-container">
+  <loader v-if="isLoading"></loader>
+  <div v-else class="project-container">
     <div class="projects">
       <div
         :class="{
@@ -60,6 +61,7 @@ import { ref, computed, onMounted } from 'vue'
 
 import { getCurrentRound, getRoundInfo } from '@/api/round'
 import { type Project, getProjects } from '@/api/projects'
+import { getFactoryInfo } from '@/api/factory'
 
 import CallToActionCard from '@/components/CallToActionCard.vue'
 import ProjectListItem from '@/components/ProjectListItem.vue'
@@ -68,6 +70,13 @@ import Links from '@/components/Links.vue'
 import { useRoute } from 'vue-router'
 import { useAppStore, useUserStore } from '@/stores'
 import { storeToRefs } from 'pinia'
+import { DateTime } from 'luxon'
+
+type ProjectRoundInfo = {
+  recipientRegistryAddress: string
+  startTime: number
+  votingDeadline: number
+}
 
 const SHUFFLE_RANDOM_SEED = Math.random()
 
@@ -108,25 +117,44 @@ const projectsByCategoriesSelected = computed<Project[]>(() => {
 })
 
 onMounted(async () => {
-  //TODO: update to take factory address as a parameter, default to env. variable
-  roundAddress.value = (route.params.address as string) || currentRoundAddress.value! || (await getCurrentRound()) || ''
-  if (roundAddress.value) {
-    await loadProjects(roundAddress.value)
+  try {
+    roundAddress.value =
+      (route.params.address as string) || currentRoundAddress.value || (await getCurrentRound()) || ''
+    const round = await loadProjectRoundInfo(roundAddress.value)
+    await loadProjects(round)
+  } catch (err) {
+    /* eslint-disable-next-line no-console */
+    console.error('Error loading projects', err)
   }
   isLoading.value = false
 })
 
-async function loadProjects(roundAddress: string) {
-  const round = await getRoundInfo(roundAddress, currentRound.value)
-  if (!round) {
-    return
+async function loadProjectRoundInfo(roundAddress: string): Promise<ProjectRoundInfo> {
+  // defaults when a round has not been created yet
+  let recipientRegistryAddress = ''
+  let startTime = 0
+  let votingDeadline = DateTime.local().toSeconds()
+
+  if (roundAddress) {
+    const round = await getRoundInfo(roundAddress, currentRound.value)
+    if (round) {
+      recipientRegistryAddress = round.recipientRegistryAddress
+      startTime = round.startTime.toSeconds()
+      votingDeadline = round.votingDeadline.toSeconds()
+    }
   }
 
-  const _projects = await getProjects(
-    round.recipientRegistryAddress,
-    round.startTime.toSeconds(),
-    round.votingDeadline.toSeconds(),
-  )
+  if (!recipientRegistryAddress) {
+    // get recipient registry address from the factory if a round does not exist
+    const factory = await getFactoryInfo()
+    recipientRegistryAddress = factory.recipientRegistryAddress
+  }
+
+  return { recipientRegistryAddress, startTime, votingDeadline }
+}
+
+async function loadProjects(round: ProjectRoundInfo) {
+  const _projects = await getProjects(round.recipientRegistryAddress, round.startTime, round.votingDeadline)
   const visibleProjects = _projects.filter(project => {
     return !project.isHidden && !project.isLocked
   })