Merge branch 'main' of https://github.com/HyperPlay-Gaming/hyperplay-desktop-client into feat/retry_auto_update

Author: flavioislima

package.json

@@ -3,9 +3,10 @@
   "version": "0.23.2",
   "private": true,
   "main": "build/main/main.js",
+  "productName": "HyperPlay",
   "homepage": "./",
   "license": "GPL-3.0-only",
-  "description": "An Open Source Launcher for Web3, GOG and Epic Games",
+  "description": "HyperPlay",
   "repository": {
     "type": "Github",
     "url": "https://github.com/HyperPlay-Gaming/hyperplay-desktop-client"
@@ -71,8 +72,8 @@
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@hyperplay/chains": "^0.5.0",
     "@hyperplay/check-disk-space": "^3.5.2",
-    "@hyperplay/quests-ui": "^0.1.13",
-    "@hyperplay/ui": "^1.8.18",
+    "@hyperplay/quests-ui": "^0.1.23",
+    "@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)
   }

public/app_icon.icns

@@ -597,9 +597,11 @@ export async function initializeCompatibilityLayer() {
     initializationTasks.push(downloadDefaultWine())
   }
 
-  if (isMac) {
-    initializationTasks.push(checkRosettaInstall())
-    initializationTasks.push(setGPTKDefaultOnMacOS())
+  if (isMac || isLinux) {
+    if (isMac) {
+      initializationTasks.push(checkRosettaInstall())
+    }
+    initializationTasks.push(setDefaultCompatibilityLayer())
   }
 
   try {
@@ -616,21 +618,17 @@ export async function downloadDefaultWine() {
   if (isWindows) return null
 
   try {
-    // Refresh wine list
     await updateWineVersionInfos(true)
 
     // Get list of available wine versions
     const availableWine = wineDownloaderInfoStore.get('wine-releases', [])
 
-    // use Wine-GE type if on Linux and GPTK or Wine-Crossover if on Mac
+    // use Proton-GE type if on Linux and GPTK or Wine-Crossover if on Mac
     const isGPTKCompatible = isMac ? await isMacSonomaOrHigher() : false
     const results = await Promise.all(
       availableWine.map(async (version) => {
         if (isLinux) {
-          return (
-            version.type === 'Wine-GE' &&
-            version.version.includes('Wine-GE-Proton')
-          )
+          return version.type === 'Proton-GE'
         }
 
         if (isMac) {
@@ -705,32 +703,46 @@ export async function downloadDefaultWine() {
   }
 }
 
-export async function setGPTKDefaultOnMacOS() {
-  const isGPTKCompatible = await isMacSonomaOrHigher()
-  if (!isGPTKCompatible) {
+export async function setDefaultCompatibilityLayer() {
+  if (!isMac && !isLinux) {
     return
   }
 
+  // For MacOS, check GPTK compatibility
+  if (isMac) {
+    const isGPTKCompatible = await isMacSonomaOrHigher()
+    if (!isGPTKCompatible) {
+      return
+    }
+  }
+
   const { wineVersion: defaultWine } = GlobalConfig.get().getSettings()
 
-  const ignoreList = ['crossover', 'toolkit']
+  // Get target wine type and prefix name based on platform
+  const targetType = isMac ? 'toolkit' : 'proton'
+  const prefixName = isMac ? 'GPTK' : 'Proton'
 
+  // Early return if already using target type
+  const ignoreList = ['crossover', 'toolkit', 'proton']
   if (
     ignoreList.includes(defaultWine.type.toLowerCase()) ||
     defaultWine.name.includes('Toolkit')
   ) {
     return
   }
 
+  // Find target wine version
   const wineList = await GlobalConfig.get().getAlternativeWine()
-  const gptk = wineList.find((wine) => wine.type === 'toolkit')
+  const targetWine = wineList.find((wine) => wine.type === targetType)
+
+  // Set as default if found and valid
+  if (targetWine && existsSync(targetWine.bin)) {
+    logInfo(`Changing wine version to ${targetWine.name}`)
+    GlobalConfig.get().setSetting('wineVersion', targetWine)
 
-  if (gptk && existsSync(gptk.bin)) {
-    logInfo(`Changing wine version to ${gptk.name}`)
-    GlobalConfig.get().setSetting('wineVersion', gptk)
-    // update prefix to use the new one as well
+    // Update prefix path
     const installPath = GlobalConfig.get().getSettings().defaultInstallPath
-    const newPrefix = join(installPath, 'Prefixes', 'GPTK')
+    const newPrefix = join(installPath, 'Prefixes', prefixName)
     GlobalConfig.get().setSetting('winePrefix', newPrefix)
   }
   return

src/backend/ipcHandlers/quests.ts

@@ -28,7 +28,7 @@ export const wineDownloaderInfoStore = new TypeCheckedStoreBackend(
 
 async function updateWineVersionInfos(
   fetch = false,
-  count = 50
+  count = 15
 ): Promise<WineVersionInfo[]> {
   if (isWindows) {
     return []

src/backend/utils/compatibility_layers.ts

@@ -42,8 +42,16 @@ const ExtensionManager = function () {
     rootRef.current?.close()
   }
 
+  /**
+   * @dev We remove the popup/notification windows from the overlay when it is hidden because
+   * there were performance issues with them running in the background while playing some games like Kokodi.
+   */
   if (isOverlay) {
-    return <ExtensionContents />
+    if (OverlayState.showOverlay) {
+      return <ExtensionContents />
+    } else {
+      return null
+    }
   }
 
   /* eslint-disable react/no-unknown-property */

src/backend/wine/manager/utils.ts

@@ -64,12 +64,14 @@ export default function QuestDetails({
   questId,
   className,
   isQuestsPage,
-  onPlayClick = () => {}
+  onPlayClick = () => {},
+  streakIsProgressing
 }: {
   questId: number | null
   className?: string
   isQuestsPage?: boolean
   onPlayClick?: (quest: Quest) => void
+  streakIsProgressing?: boolean
 }) {
   const { address } = useAccount()
   const { isSignedIn, data } = useAuthSession()
@@ -122,7 +124,8 @@ export default function QuestDetails({
           POINTS: flags.pointsRewardsClaim,
           'EXTERNAL-TASKS': flags.externalTasksRewardsClaim
         },
-        questsOverlayClaimCtaEnabled: flags.questsOverlayClaimCtaEnabled
+        questsOverlayClaimCtaEnabled: flags.questsOverlayClaimCtaEnabled,
+        gameplayWalletSectionVisible: false
       }}
       trackEvent={async (eventPayload) =>
         window.api.trackEvent(eventPayload as PossibleMetricPayloads)
@@ -151,6 +154,14 @@ export default function QuestDetails({
       isSignedIn={isSignedIn}
       isQuestsPage={isQuestsPage}
       key={'questDetailsLoading'}
+      streakIsProgressing={streakIsProgressing}
+      getActiveWallet={async () => 'getActiveWallet'}
+      setActiveWallet={async () => ({ success: true, status: 100 })}
+      getGameplayWallets={async () => []}
+      updateActiveWallet={async () => {
+        console.log('updateActiveWallet')
+      }}
+      getActiveWalletSignature={async () => ({ message: '', signature: '' })}
     />
   )
 }

src/frontend/ExtensionManager/index.tsx

@@ -49,6 +49,7 @@ export function QuestsViewer({ projectId: appName }: QuestsViewerProps) {
         <QuestDetails
           questId={visibleQuestId}
           className={styles.detailsWrapper}
+          streakIsProgressing={true}
         />
       </div>
     </div>

src/frontend/components/UI/QuestDetails/index.tsx

@@ -383,6 +383,13 @@ const GameCard = ({
           actionDisabled={isLaunching}
           alwaysShowInColor={allTilesInColor}
           store={runner}
+          i18n={{
+            logoTextTooltip: {
+              hyperplay: { installed: 'HyperPlay', notInstalled: 'HyperPlay' },
+              epic: { installed: 'Epic', notInstalled: 'Epic' },
+              gog: { installed: 'GOG', notInstalled: 'GOG' }
+            }
+          }}
         />
       </Link>
     </>

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

@@ -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,31 +118,30 @@ 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())
-    return questTitleMatch || gameTitleMatches(quest)
+    const gameTitleMatch = gameTitleMatches(quest)
+    const searchByKeywords = searchText
+      .toLowerCase()
+      .split(' ')
+      .some(
+        (term) =>
+          quest.name?.toLowerCase().includes(term) ||
+          quest.description?.toLowerCase().includes(term)
+      )
+    return questTitleMatch || gameTitleMatch || searchByKeywords
   })
 
   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 }) => {
@@ -197,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}