Merge branch 'main' into feat/claim-quest-page

package.json

@@ -402,7 +402,8 @@
       "classic-level": false,
       "i18next-parser>esbuild": false,
       "wagmi>@wagmi/connectors>@metamask/sdk>@metamask/sdk-communication-layer>utf-8-validate": true,
-      "@hyperplay/providers>@metamask/sdk>@metamask/sdk-communication-layer>utf-8-validate": true
+      "@hyperplay/providers>@metamask/sdk>@metamask/sdk-communication-layer>utf-8-validate": true,
+      "@hyperplay/overlay>electron": false
     }
   }
 }

src/common/types.ts

@@ -12,6 +12,7 @@ import {
 import { Channel, ContractMetadata } from '@valist/sdk/dist/typesApi'
 import { IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { DropdownItemType } from '@hyperplay/ui'
+export type { Quest } from '@hyperplay/utils'
 
 export type {
   Listing as HyperPlayRelease,
@@ -932,30 +933,6 @@ export interface Reward {
   numClaimsLeft: string
 }
 
-export interface Quest {
-  id: number
-  project_id: string
-  name: string
-  type: 'REPUTATIONAL-AIRDROP' | 'PLAYSTREAK'
-  status: string
-  description: string
-  rewards?: Reward[]
-  /* eslint-disable-next-line */
-  deposit_contracts: any[]
-  eligibility?: {
-    completion_threshold?: number
-    steam_games: { id: string }[]
-    play_streak: {
-      required_playstreak_in_days: number
-      minimum_session_time_in_seconds: number
-    }
-  }
-  quest_external_game: null | {
-    runner: Runner
-    store_redirect_url: string
-  }
-}
-
 export interface RewardClaimSignature {
   signature: `0x${string}`
   nonce: string

src/frontend/components/UI/QuestsViewer/components/QuestLogWrapper/index.module.scss

@@ -1,6 +1,6 @@
 .questLog {
   margin: 0 var(--space-sm) 0 0;
-  min-width: 280px;
+  min-width: 320px;
   max-width: 400px;
   width: 100%;
 }

src/frontend/components/UI/QuestsViewer/components/QuestLogWrapper/index.tsx

@@ -7,10 +7,10 @@ import {
 } from '@hyperplay/ui'
 import styles from './index.module.scss'
 import { useTranslation } from 'react-i18next'
-import { Quest } from 'common/types'
 import useGetG7UserCredits from 'frontend/hooks/useGetG7UserCredits'
 import useGetPointsBalancesForProject from 'frontend/hooks/useGetPointsBalances'
 import useGetQuests from 'frontend/hooks/useGetQuests'
+import { useGetQuestStates } from 'frontend/hooks/useGetQuestStates'
 
 export interface QuestLogWrapperProps {
   questsResults: ReturnType<typeof useGetQuests>
@@ -31,6 +31,27 @@ export function QuestLogWrapper({
   const pointsBalancesQuery = useGetPointsBalancesForProject(appName)
   const pointsBalances = pointsBalancesQuery?.data?.data
   const { t } = useTranslation()
+  const { questIdToQuestStateMap, isPending: isGetQuestStatesPending } =
+    useGetQuestStates({
+      quests
+    })
+
+  const questsUi =
+    quests?.map((quest) => {
+      const questUi_i: QuestLogInfo = {
+        questType: quest.type,
+        title: quest.name,
+        state: Object.hasOwn(questIdToQuestStateMap, quest.id)
+          ? questIdToQuestStateMap[quest.id]
+          : 'ACTIVE',
+        onClick: () => {
+          setSelectedQuestId(quest.id)
+        },
+        selected: selectedQuestId === quest.id,
+        id: quest.id
+      }
+      return questUi_i
+    }) ?? []
 
   const i18n: QuestLogTranslations = {
     quests: t('quest.quests', 'Quests'),
@@ -68,38 +89,19 @@ export function QuestLogWrapper({
   }
 
   let questLog = null
-  if (Array.isArray(quests)) {
-    const questsUi = quests.map((val: Quest) => {
-      const questUi_i: QuestLogInfo = {
-        questType: val.type,
-        title: val.name,
-        state: 'ACTIVE',
-        onClick: () => {
-          setSelectedQuestId(val.id)
-        },
-        selected: selectedQuestId === val.id,
-        id: val.id
-      }
-      return questUi_i
-    })
-    questLog = (
-      <QuestLog
-        quests={questsUi}
-        className={styles.questLog}
-        i18n={i18n}
-        pointsProps={pointsBalanceProps}
-      />
-    )
-  } else if (questsResults?.data.isLoading || questsResults?.data.isFetching) {
-    questLog = (
-      <QuestLog
-        quests={[]}
-        className={styles.questLog}
-        loading={true}
-        i18n={i18n}
-      />
-    )
-  }
+  const isLoading =
+    questsResults?.data.isLoading ||
+    questsResults?.data.isFetching ||
+    isGetQuestStatesPending
+  questLog = (
+    <QuestLog
+      quests={questsUi ?? []}
+      className={styles.questLog}
+      i18n={i18n}
+      pointsProps={pointsBalanceProps}
+      loading={isLoading}
+    />
+  )
 
   if (!quests?.length) {
     return null

src/frontend/hooks/useGetQuestStates.ts

@@ -0,0 +1,74 @@
+import {
+  getPlaystreakQuestStatus,
+  getUserPlaystreakQueryOptions,
+  getQuestQueryOptions
+} from '@hyperplay/quests-ui'
+import { QuestLogInfo } from '@hyperplay/ui'
+import { Quest } from '@hyperplay/utils'
+import { useQueries } from '@tanstack/react-query'
+import useAuthSession from './useAuthSession'
+
+export interface UseGetQuestLogInfosProps {
+  quests?: Quest[] | null
+}
+
+type getQuestQueryOptionsType = ReturnType<typeof getQuestQueryOptions>
+type getUserPlaystreakQueryOptionsType = ReturnType<
+  typeof getUserPlaystreakQueryOptions
+>
+export function useGetQuestStates({ quests }: UseGetQuestLogInfosProps) {
+  const { isSignedIn } = useAuthSession()
+  let getQuestQueries: getQuestQueryOptionsType[] = []
+  if (isSignedIn) {
+    getQuestQueries =
+      quests?.map((quest) =>
+        getQuestQueryOptions(quest.id, window.api.getQuest)
+      ) ?? []
+  }
+  const getQuestQuery = useQueries({
+    queries: getQuestQueries
+  })
+
+  let getUserPlaystreakQueries: getUserPlaystreakQueryOptionsType[] = []
+  if (isSignedIn) {
+    getUserPlaystreakQueries =
+      quests?.map((quest) =>
+        getUserPlaystreakQueryOptions(quest.id, window.api.getUserPlayStreak)
+      ) ?? []
+  }
+  const getUserPlaystreakQuery = useQueries({
+    queries: getUserPlaystreakQueries
+  })
+
+  const questMap: Record<number, Quest> = {}
+  getQuestQuery
+    .filter((val) => !!val.data)
+    .forEach((val) => {
+      if (!val.data) {
+        return
+      }
+      questMap[val.data.id] = val.data
+    })
+
+  const questIdToQuestStateMap: Record<number, QuestLogInfo['state']> = {}
+
+  getUserPlaystreakQuery.forEach((val) => {
+    if (!val.data || !Object.hasOwn(questMap, val.data.questId)) {
+      return
+    }
+    const questId = val.data.questId
+    const questData = questMap[questId]
+    return (questIdToQuestStateMap[questId] = getPlaystreakQuestStatus(
+      questData,
+      val.data.userPlayStreak
+    ))
+  })
+
+  const allQueries = [...getQuestQuery, ...getUserPlaystreakQuery]
+
+  return {
+    isPending: allQueries.some((val) => val.status === 'pending'),
+    isLoading: allQueries.some((val) => val.isLoading || val.isFetching),
+    questIdToQuestStateMap
+  }
+}

src/frontend/hooks/useGetRewards.ts

@@ -1,12 +1,12 @@
 import { useQuery, useQueryClient } from '@tanstack/react-query'
-import useGetQuest from './useGetQuest'
 import { getDecimalNumberFromAmount } from '@hyperplay/utils'
 import { getRewardCategory } from 'frontend/helpers/getRewardCategory'
 import { useTranslation } from 'react-i18next'
 import { QuestReward } from '@hyperplay/ui'
+import { useGetQuest } from '@hyperplay/quests-ui'
 
 export function useGetRewards(questId: number | null) {
-  const questResult = useGetQuest(questId)
+  const questResult = useGetQuest(questId, window.api.getQuest)
   const questMeta = questResult.data.data
 
   const queryClient = useQueryClient()