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

client/src/components/skill.btn.jsx

@@ -40,7 +40,7 @@ function Skill(props) {
     const s = construct.skills[i];
     const ko = construct.green_life.value === 0 ? 'ko' : '';
 
-    if (!s) {
+    if (!s || !game) {
         return (
             <button
                 disabled='true'

client/src/components/targeting.arrows.jsx

@@ -26,6 +26,7 @@ class TargetSvg extends Component {
     render(props, state) {
         const { game, account, animating, animTarget } = props;
         const { width, height } = state;
+        if (!game) return false; // game will be null when battle ends
 
         // resolutions happening
         // just put skill name up

client/src/events.jsx

@@ -9,14 +9,15 @@ function registerEvents(store) {
         store.dispatch(actions.setPing(ping));
     }
 
-    function setTeam(team) {
-        store.dispatch(actions.setTeam(team));
-    }
-
     function setNav(v) {
         store.dispatch(actions.setNav(v));
     }
 
+    function setTeam(team) {
+        store.dispatch(actions.setTeam(team));
+        setNav('list');
+    }
+
     function setConstructList(constructs) {
         store.dispatch(actions.setConstructs(constructs));
     }