- ![]()
+
diff --git a/vue-app/src/views/Profile.vue b/vue-app/src/views/Profile.vue
index b4c6612e9..da632f2d6 100644
--- a/vue-app/src/views/Profile.vue
+++ b/vue-app/src/views/Profile.vue
@@ -69,8 +69,8 @@
{{ $t('profile.h2_3') }}
-
- ![thumbnail]()
+
+
{{ name }}
@@ -103,19 +103,18 @@ import CopyButton from '@/components/CopyButton.vue'
import Loader from '@/components/Loader.vue'
import FundsNeededWarning from '@/components/FundsNeededWarning.vue'
-import { userRegistryType, UserRegistryType, chain, isActiveApp } from '@/api/core'
-import { type Project, getProjects, getProjectsForStaticRound } from '@/api/projects'
+import { userRegistryType, UserRegistryType, chain } from '@/api/core'
+import { type Project, getProjects } from '@/api/projects'
import { isSameAddress } from '@/utils/accounts'
import { getTokenLogo } from '@/utils/tokens'
import { useAppStore, useUserStore, useRecipientStore, useWalletStore } from '@/stores'
import { storeToRefs } from 'pinia'
import { useRouter } from 'vue-router'
-import { getLeaderboardData } from '@/api/leaderboard'
import { formatAmount } from '@/utils/amounts'
import WithdrawalModal from '@/components/WithdrawalModal.vue'
import { useModal } from 'vue-final-modal'
-import { RoundStatus } from '@/api/round'
+import { RoundStatus, getRoundInfo } from '@/api/round'
interface Props {
balance: string
@@ -179,20 +178,17 @@ watch(recipientRegistryAddress, () => loadProjects())
async function loadProjects(): Promise {
isLoading.value = true
- let _projects: Project[] = []
-
- if (isActiveApp) {
- if (!recipientRegistryAddress.value) return
- _projects = await getProjects(
- recipientRegistryAddress.value,
- currentRound.value?.startTime.toSeconds(),
- currentRound.value?.votingDeadline.toSeconds(),
- )
- } else {
- const currentRoundAddress = currentRound.value?.fundingRoundAddress || ''
- const network = currentRound.value?.network || ''
- _projects = await getProjectsForStaticRound(currentRoundAddress, network)
- }
+ let _projects: Project[] | undefined = undefined
+
+ if (!recipientRegistryAddress.value) return
+
+ _projects = await getProjects({
+ registryAddress: recipientRegistryAddress.value,
+ fundingRoundAddress: currentRound.value?.fundingRoundAddress,
+ network: currentRound.value?.network,
+ startTime: currentRound.value?.startTime.toSeconds(),
+ endTime: currentRound.value?.votingDeadline.toSeconds(),
+ })
const userProjects: Project[] = _projects.filter(
({ address, requester }) =>
diff --git a/vue-app/src/views/Project.vue b/vue-app/src/views/Project.vue
index 08ce13444..4eda5cf04 100644
--- a/vue-app/src/views/Project.vue
+++ b/vue-app/src/views/Project.vue
@@ -2,7 +2,7 @@
- ![]()
+
@@ -60,8 +60,14 @@ onMounted(async () => {
roundAddress.value = (route.params.address as string) || currentRoundAddress || ''
+ const recipientId = route.params.id as string
const registryAddress = await getRecipientRegistryAddress(roundAddress.value || null)
- const _project = await getProject(registryAddress, route.params.id as string)
+ const _project = await getProject({
+ registryAddress,
+ fundingRoundAddress: roundAddress.value || undefined,
+ recipientId,
+ filter: false,
+ })
if (_project === null || _project.isHidden) {
// Project not found
router.push({ name: 'projects' })
diff --git a/vue-app/src/views/ProjectList.vue b/vue-app/src/views/ProjectList.vue
index 8bc21b7c5..9b2ef9c96 100644
--- a/vue-app/src/views/ProjectList.vue
+++ b/vue-app/src/views/ProjectList.vue
@@ -60,7 +60,7 @@
import { ref, computed, onMounted } from 'vue'
import { getCurrentRound, getRoundInfo } from '@/api/round'
-import { type Project, getProjects, getRecipientRegistryAddress, getProjectsForStaticRound } from '@/api/projects'
+import { type Project, getProjects, getRecipientRegistryAddress } from '@/api/projects'
import CallToActionCard from '@/components/CallToActionCard.vue'
import ProjectListItem from '@/components/ProjectListItem.vue'
@@ -70,7 +70,6 @@ import { useRoute } from 'vue-router'
import { useAppStore, useUserStore } from '@/stores'
import { storeToRefs } from 'pinia'
import { DateTime } from 'luxon'
-import { isActiveApp } from '@/api/core'
import { getSecondsFromNow } from '@/utils/dates'
type ProjectRoundInfo = {
@@ -124,10 +123,7 @@ onMounted(async () => {
roundAddress.value =
(route.params.address as string) || currentRoundAddress.value || (await getCurrentRound()) || ''
- const round = isActiveApp
- ? await loadProjectRoundInfo(roundAddress.value)
- : await loadStaticRoundInfo(roundAddress.value)
- await loadProjects(round)
+ await loadProjectRoundInfo(roundAddress.value)
} catch (err) {
/* eslint-disable-next-line no-console */
console.error('Error loading projects', err)
@@ -135,11 +131,13 @@ onMounted(async () => {
isLoading.value = false
})
-async function loadProjectRoundInfo(roundAddress: string): Promise {
+async function loadProjectRoundInfo(roundAddress: string) {
// defaults when a round has not been created yet
let recipientRegistryAddress = ''
let startTime = 0
let votingDeadline = DateTime.local().toSeconds()
+ let network = ''
+ let fundingRoundAddress = ''
if (roundAddress) {
const round = await getRoundInfo(roundAddress, currentRound.value)
@@ -147,6 +145,8 @@ async function loadProjectRoundInfo(roundAddress: string): Promise {
- await appStore.loadClrFundInfo()
- const network = currentRound.value?.network || ''
- const recipientRegistryAddress = currentRound.value?.recipientRegistryAddress || ''
- const startTime = getSecondsFromNow(currentRound.value?.startTime || DateTime.now())
- const votingDeadline = getSecondsFromNow(currentRound.value?.votingDeadline || DateTime.now())
- return { recipientRegistryAddress, startTime, votingDeadline, fundingRoundAddress: roundAddress, network }
-}
-
-async function loadProjects(round: ProjectRoundInfo) {
- const _projects = isActiveApp
- ? await getProjects(round.recipientRegistryAddress, round.startTime, round.votingDeadline)
- : await getProjectsForStaticRound(roundAddress.value, round.network)
+ const _projects = await getProjects({
+ registryAddress: recipientRegistryAddress,
+ fundingRoundAddress,
+ network,
+ startTime,
+ endTime: votingDeadline,
+ })
const visibleProjects = _projects.filter(project => {
return !project.isHidden && !project.isLocked
})
diff --git a/vue-app/src/views/RecipientProfile.vue b/vue-app/src/views/RecipientProfile.vue
index cb2c548eb..9e3bfecf9 100644
--- a/vue-app/src/views/RecipientProfile.vue
+++ b/vue-app/src/views/RecipientProfile.vue
@@ -4,7 +4,7 @@
{{ $t('recipientProfile.not_found') }}
- ![]()
+
{{ recipient.name }} @@ -22,15 +22,15 @@
{{ $t('projectProfile.h2_1') }}
-{{ $t('projectProfile.h2_2') }}
-{{ $t('projectProfile.h2_3') }}
-
-
- ![]()
-
+