From 8641e74f9be0e5604b392d9187f9266936a4530a Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Sat, 23 Nov 2019 20:24:15 +1000
Subject: [PATCH] fix combo preview

---
 client/assets/styles/vbox.less           | 24 ++++++------------------
 client/src/components/vbox.component.jsx |  8 ++++----
 client/src/components/vbox.info.jsx      |  8 ++++----
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/client/assets/styles/vbox.less b/client/assets/styles/vbox.less
index 859919d8..0e4ca057 100644
--- a/client/assets/styles/vbox.less
+++ b/client/assets/styles/vbox.less
@@ -31,11 +31,10 @@
         border-top: 0.1em solid @gray;
 
         h1 {
-            margin-bottom: 0;
+            margin-bottom: 0.5em;
         }
 
         button {
-            margin: 1em 0 0 0;
             line-height: 1.6;
             letter-spacing: 0.1em;
             background-color: #421010;
@@ -58,32 +57,21 @@
     }
 
     .stash-hdr {
+        grid-area: stash-hdr;
         display: flex;
         flex-flow: column;
-        justify-content: center;
-
-        grid-area: stash-hdr;
+        
         text-align: center;
         border: 0.1em solid @gray;
         border-right: 0;
 
-        h3 {
-            margin-bottom: 2.5em;
+        h2 {
+            margin-bottom: 0.5em;
         }
-    }
-
-    .refund {
-        padding: 0.5em 0.5em 0 0;
 
         button {
-            line-height: 1.4;
+            line-height: 1.6;
             letter-spacing: 0.1em;
-            color: black;
-            background-color: @yellow;
-        }
-
-        .vbox-padding {
-            padding-left: 0;
         }
     }
 
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index 1476ffb7..b4c2f42b 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -169,10 +169,10 @@ class Vbox extends preact.Component {
         function storeHdr() {
             return (
                 <div class="store-hdr">
-                    <h3
+                    <h2
                         onTouchStart={e => e.target.scrollIntoView(true)}
                         onMouseOver={e => vboxHover(e, 'store')}> STORE
-                    </h3>
+                    </h2>
                     <div class={`bits ${vbox.bits < 3 ? 'red' : false}`} onMouseOver={e => vboxHover(e, 'bits')}>
                         <h1> {vbox.bits}b </h1>
                     </div>
@@ -214,9 +214,9 @@ class Vbox extends preact.Component {
 
             return (
                 <div class='stash-hdr'>
-                    <h3 onTouchStart={e => e.target.scrollIntoView(true)}
+                    <h2 onTouchStart={e => e.target.scrollIntoView(true)}
                         onMouseOver={e => vboxHover(e, 'stash')}> STASH
-                    </h3>
+                    </h2>
                     {refundBtn}
                 </div>
             );
diff --git a/client/src/components/vbox.info.jsx b/client/src/components/vbox.info.jsx
index 3a553c0d..b83dfd3c 100644
--- a/client/src/components/vbox.info.jsx
+++ b/client/src/components/vbox.info.jsx
@@ -179,7 +179,8 @@ class InfoComponent extends preact.Component {
                     </div>
                 );
             }
-            if (vboxInfo) return genItemInfo(vboxInfo);
+            const stateFullInfo = comboItem || vboxInfo;
+            if (stateFullInfo) return genItemInfo(stateFullInfo);
             if (!info) return false;
             if (info.includes('constructName')) {
                 return (
@@ -204,9 +205,8 @@ class InfoComponent extends preact.Component {
                     </div>
                 );
             }
-            const stateFullInfo = comboItem || info;
-            if (!stateFullInfo) return false;
-            return genItemInfo(stateFullInfo);
+
+            return genItemInfo(info);
         }
 
         const Combos = () => {