fix: get correct champion name.

cangzhang · Apr 16, 2020 · 85ce32b · 85ce32b
1 parent 0cce43a
commit 85ce32b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/app.js b/src/app.js
@@ -2,6 +2,8 @@ import s from './app.module.scss';
 
 import { ipcRenderer } from 'electron';
 import _get from 'lodash/get';
+import _findIdx from 'lodash/findIndex';
+
 import React, { useReducer, useMemo, useRef, useEffect } from 'react';
 import { HashRouter as Router, Switch, Route } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
@@ -50,8 +52,9 @@ const App = () => {
         if (!lcuIns.active)
           return false;
 
-        const { actions } = await lcuIns.getCurrentSession();
-        const championId = _get(actions, `0.0.championId`, 0);
+        const { actions, myTeam = []} = await lcuIns.getCurrentSession();
+        const pickIdx = _findIdx(myTeam, i => i.summonerId > 0);
+        const championId = _get(actions, `0.${pickIdx}.championId`, 0);
 
         if (!championId) {
           ipcRenderer.send(`hide-popup`);

diff --git a/src/modules/popup/style.module.scss b/src/modules/popup/style.module.scss
@@ -1,6 +1,7 @@
 .list {
   display: flex;
   flex-direction: column;
+  background-color: #ffffff;
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
     'Helvetica Neue', sans-serif;
 }