Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

client/src/components/instance.constructs.jsx

@@ -179,7 +179,7 @@ function Construct(props) {
     const stats = Object.keys(STATS).map(s => {
         const stat = STATS[s];
 
-        const info = (s === 'Speed' && 'Speed')
+        const info = (s === 'SpeedStat' && 'Speed')
             || (s.includes('Power') && 'Power')
             || (s.includes('Life') && 'Life');
 

client/src/components/instance.ctrl.jsx

@@ -15,9 +15,8 @@ const addState = connect(
         } = state;
 
         function sendReady() {
-            document.activeElement.blur()
+            document.activeElement.blur();
             return ws.sendInstanceReady(instance.id);
-            return false;
         }
 
         function sendAbandon() {
@@ -87,14 +86,14 @@ function Controls(args) {
         ? <button class="ready" onClick={() => sendReady()}>Ready</button>
         : <button class="ready" onClick={leave}>Leave</button>
 
-
+    const abandon = instance.phase !== 'Finished' ? sendAbandon : false;
     return (
         <aside>
             {timer}
             <div class="controls">
                 <PlayerBox player={opponent} />
                 {ready}
-                <PlayerBox player={player} isPlayer={true} abandon={sendAbandon}/>
+                <PlayerBox player={player} isPlayer={true} abandon={abandon}/>
             </div>
         </aside>
     );