From 5cb9f6ebd0c3c9a8bacb8af9d98b9004059b763a Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Thu, 21 Nov 2019 11:19:33 +1000
Subject: [PATCH] wl remove duplicate vbox hoverFn

---
 WORKLOG.md                               |  9 ++-------
 client/src/components/vbox.component.jsx | 17 ++++-------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index 24084a60..d315df64 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -1,10 +1,10 @@
 # WORK WORK
 ## NOW
 
-* add combine between all of shop and stash, stash size -> 4
-
 *PRODUCTION*
 
+* supporter gold name in instance (anyone whos put any money into game)
+
 * can't reset password without knowing password =\
 
 * Graphics
@@ -17,17 +17,12 @@
       - Speed (e.g. boots)
       - Life (e.g. heart)
 
-* reduce inventory size and consolidate vbox and inventory on left side
-
 * audio
   * background music
   * animation effects
   * vbox combine / buy / equip etc
 
-* reclaim change colour from red (clashes with red items)
-
 * represent construct colours during game phase (coloured border?)
-* supporter gold name in instance (anyone whos put any money into game)
 
 * Give the bots some ai / make stronger so its a challenge for new people to beat
   - train a few games of with some round losses to get them into the game
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index 42cfa679..3433febf 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -241,14 +241,14 @@ class Vbox extends preact.Component {
                     <div class='items'>
                         <h3
                             onTouchStart={e => e.target.scrollIntoView(true)}
-                            onMouseOver={e => hoverInfo(e, 'vbox')}> STORE
+                            onMouseOver={e => vboxHover(e, 'vbox')}> STORE
                         </h3>
-                        <div class={`bits ${vbox.bits < 3 ? 'red' : false}`} onMouseOver={e => hoverInfo(e, 'bits')}>
+                        <div class={`bits ${vbox.bits < 3 ? 'red' : false}`} onMouseOver={e => vboxHover(e, 'bits')}>
                             <h2> {vbox.bits}b </h2>
                         </div>
                         <button
                             class='vbox-btn'
-                            onMouseOver={e => hoverInfo(e, 'refill')}
+                            onMouseOver={e => vboxHover(e, 'refill')}
                             disabled={vbox.bits < 2
                                 || (tutorial && tutorial < 7 && instance.time_control === 'Practice' && instance.rounds.length === 1)
                             }
@@ -410,7 +410,7 @@ class Vbox extends preact.Component {
                     <div class='items'>
                         <h3
                             onTouchStart={e => e.target.scrollIntoView(true)}
-                            onMouseOver={e => hoverInfo(e, 'inventory')}> STASH
+                            onMouseOver={e => vboxHover(e, 'inventory')}> STASH
                         </h3>
                         <button
                             disabled={tutorialDisabled || !refund}
@@ -431,15 +431,6 @@ class Vbox extends preact.Component {
         //
         // EVERYTHING
         //
-        function hoverInfo(e, newInfo) {
-            if (shopSelect.find(c => c[0])) return true;
-            if (stashSelect.length !== 0) {
-                const base = stashSelect.find(c => !['Red', 'Blue', 'Green'].includes(vbox.bound[c]));
-                if (base || base === 0) return true;
-            }
-            return setInfo(newInfo);
-        }
-
         return (
             <div class='vbox'>
                 {vboxHdr()}