Merge branch 'main' into fix/win_icon_title

Author: BrettCleary

package.json

@@ -73,7 +73,7 @@
     "@hyperplay/chains": "^0.5.0",
     "@hyperplay/check-disk-space": "^3.5.2",
     "@hyperplay/quests-ui": "^0.1.23",
-    "@hyperplay/ui": "^1.9.5",
+    "@hyperplay/ui": "^1.9.8",
     "@hyperplay/utils": "^0.3.7",
     "@mantine/carousel": "^7.12.0",
     "@mantine/core": "^7.12.0",

pnpm-lock.yaml

@@ -19,6 +19,8 @@ async function fetchQuests({
 }): Promise<Quest[]> {
   const url = new URL(`${DEV_PORTAL_URL}api/v1/quests`)
   url.searchParams.append('questStatus', status)
+  url.searchParams.append('sortBy', 'start_date')
+  url.searchParams.append('order', 'desc')
   if (projectId) {
     url.searchParams.append('projectId', projectId)
   }

src/backend/ipcHandlers/quests.ts

@@ -10,7 +10,6 @@ import { useMutation } from '@tanstack/react-query'
 import { Runner } from 'common/types'
 import { Quest } from '@hyperplay/utils'
 import { QuestRewardClaimedToast } from 'frontend/components/UI/QuestRewardClaimedToast'
-import { itemType } from '@hyperplay/ui/dist/components/Dropdowns/Dropdown'
 import useGetHyperPlayListings from 'frontend/hooks/useGetHyperPlayListings'
 import useGetQuests from 'frontend/hooks/useGetQuests'
 import {
@@ -41,10 +40,6 @@ export function QuestsPage() {
   const searchParam = searchParams.get('search')
   const [searchText, setSearchText] = useState(searchParam ?? '')
   const [activeFilter, setActiveFilter] = useState<QuestFilter>('all')
-  const [selectedSort, setSelectedSort] = useState<itemType>({
-    text: 'Alphabetically (ASC)',
-    id: 'ALPHA_ASC'
-  })
 
   useEffect(() => {
     window.api.trackScreen('Quests Page')
@@ -123,17 +118,12 @@ export function QuestsPage() {
     }
   })
 
-  const sortedQuests = [...(quests ?? [])].sort((a, b) => {
-    const sortMultiplier = selectedSort.id === 'ALPHA_ASC' ? 1 : -1
-    return a.name.localeCompare(b.name) * sortMultiplier
-  })
-
   const gameTitleMatches = (quest: Quest) => {
     const title = listings ? listings[quest.project_id]?.project_meta?.name : ''
     return title?.toLowerCase().startsWith(searchText.toLowerCase())
   }
 
-  const searchFilteredQuests = sortedQuests?.filter((quest) => {
+  const searchFilteredQuests = quests?.filter((quest) => {
     const questTitleMatch = quest.name
       .toLowerCase()
       .startsWith(searchText.toLowerCase())
@@ -152,11 +142,6 @@ export function QuestsPage() {
   const initialQuestId = searchFilteredQuests?.[0]?.id ?? null
   const visibleQuestId = selectedQuestId ?? initialQuestId
 
-  const achievementsSortOptions = [
-    { text: 'Alphabetically (ASC)', id: 'ALPHA_ASC' },
-    { text: 'Alphabetically (DES)', id: 'ALPHA_DES' }
-  ]
-
   const imagesToPreload: string[] = []
   const gameElements =
     searchFilteredQuests?.map(({ id, project_id, name, ...rest }) => {
@@ -206,11 +191,6 @@ export function QuestsPage() {
         <QuestsSummaryTable
           games={gameElements}
           imagesToPreload={imagesToPreload}
-          sortProps={{
-            options: achievementsSortOptions,
-            selected: selectedSort,
-            onItemChange: setSelectedSort
-          }}
           filterProps={{ activeFilter, setActiveFilter }}
           isFetching={questsResults?.data.isFetching}
           isPageLoading={questsResults?.data.isLoading}