Merge pull request #72 from 2skydev/dev

v0.0.15

Author: 2skydev

src/main/modules/ps/constants/rank.ts

@@ -1,8 +1,8 @@
 export const RANK_RANGE_IDS = [2, 13, 3, 1] as const
 
 export const RANK_RANGE_ID_TO_LABEL_MAP = {
-  2: '플레티넘+',
+  2: '에메랄드+',
   13: '다이아+',
   3: '마스터+',
-  1: '브실골',
+  1: '브실골플',
 } as const

src/renderer/src/hooks/listener/useChampionSelectSessionListener.ts

@@ -14,6 +14,8 @@ const useChampionSelectSessionListener = () => {
 
   useEffect(() => {
     window.electron.subscribeLeague('champ-select/session', data => {
+      if (!data?.gameId) return
+
       const currentSummonerId = currentSummoner!.id
       const currentSummonerData = data.myTeam.find(
         player => player.summonerId === currentSummonerId,

src/renderer/src/hooks/listener/useCurrentSummonerListener.ts

@@ -1,5 +1,6 @@
 import { useEffect } from 'react'
 
+import deepEqual from 'fast-deep-equal'
 import { useAtom } from 'jotai'
 
 import {
@@ -12,11 +13,15 @@ const useCurrentSummonerListener = () => {
 
   useEffect(() => {
     window.electron.subscribeLeague('summoner/current', async data => {
-      if (data && data.summonerId !== currentSummoner?.id) {
-        const result = await getCurrentSummoner({ preparedData: data })
-        setCurrentSummoner(result)
-      } else if (!data) {
+      if (!data) {
         setCurrentSummoner(null)
+        return
+      }
+
+      const result = await getCurrentSummoner({ preparedData: data })
+
+      if (!deepEqual(result, currentSummoner)) {
+        setCurrentSummoner(result)
       }
     })
   }, [])

…rc/hooks/listener/useAppStateListener.ts …/src/hooks/listener/useLeagueListener.tssrc/renderer/src/hooks/listener/useAppStateListener.ts renamed to src/renderer/src/hooks/listener/useLeagueListener.ts src/renderer/src/hooks/listener/useAppStateListener.ts renamed to src/renderer/src/hooks/listener/useLeagueListener.ts

@@ -35,7 +35,7 @@ const useLeagueListener = () => {
     window.electron.subscribeLeague('in-game', isInGame => {
       setLeague({
         ...league,
-        isReady: isInGame,
+        isInGame,
       })
     })
   }

src/renderer/src/pages/_app.tsx

@@ -6,10 +6,10 @@ import NeedUpdateLaterNotification from '@renderer/features/update/NeedUpdateLat
 import useChampionDetailPageAutoNavigate from '@renderer/hooks/autoNavigate/useChampionDetailPageAutoNavigate'
 import useInGamePageAutoNavigate from '@renderer/hooks/autoNavigate/useInGamePageAutoNavigate'
 import useTierListPageAutoNavigate from '@renderer/hooks/autoNavigate/useTierListPageAutoNavigate'
-import useAppStateListener from '@renderer/hooks/listener/useAppStateListener'
 import useAppUpdateListener from '@renderer/hooks/listener/useAppUpdateListener'
 import useChampionSelectSessionListener from '@renderer/hooks/listener/useChampionSelectSessionListener'
 import useCurrentSummonerListener from '@renderer/hooks/listener/useCurrentSummonerListener'
+import useLeagueListener from '@renderer/hooks/listener/useLeagueListener'
 import { useUpdateContentModal } from '@renderer/hooks/useUpdateContentModal'
 import { InitGlobalStyled } from '@renderer/styles/init'
 
@@ -23,7 +23,7 @@ const App = () => {
   useUpdateContentModal({ autoOpen: !isNoLayout })
 
   // listeners
-  useAppStateListener()
+  useLeagueListener()
   useAppUpdateListener()
   useChampionSelectSessionListener()
   useCurrentSummonerListener()

src/renderer/src/stores/atoms/appUpdate.atom.ts

@@ -1,12 +1,12 @@
 import { atom } from 'jotai'
 
 export const appUpdateAtom = atom(
-  async () => {
+  (async () => {
     return {
       version: await window.electron.getVersion(),
       status: await window.electron.getUpdaterStatus(),
     }
-  },
+  })(),
   (_, set, value) => {
     set(appUpdateAtom, value)
   },

src/renderer/src/stores/atoms/config.atom.ts

@@ -2,6 +2,7 @@ import { atom } from 'jotai'
 
 import { ConfigStoreValues } from '@main/modules/config/stores/config.store'
 
-export const configAtom = atom(window.electron.getConfig, (_, __, update: ConfigStoreValues) => {
+export const configAtom = atom(window.electron.getConfig(), (_, set, update: ConfigStoreValues) => {
   window.electron.setConfig(update)
+  set(configAtom, update)
 })

src/renderer/src/stores/atoms/currentSummoner.atom.ts

@@ -39,7 +39,7 @@ export const getCurrentSummoner = async (
 }
 
 export const currentSummonerAtom = atom(
-  () => getCurrentSummoner({ checkIsReady: true }),
+  getCurrentSummoner({ checkIsReady: true }),
   (_, set, value) => {
     set(currentSummonerAtom, value)
   },