From 56f36470256739b58bed926b8d04fac39f683bec Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Tue, 22 Oct 2019 11:12:25 +1000
Subject: [PATCH] clear mtxActive on nav and if you join game. put shop before
 reshape

---
 client/src/components/header.jsx | 12 ++++++------
 client/src/components/shop.jsx   |  3 ++-
 client/src/events.jsx            |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/src/components/header.jsx b/client/src/components/header.jsx
index 8810ecb3..2ce0368f 100644
--- a/client/src/components/header.jsx
+++ b/client/src/components/header.jsx
@@ -40,7 +40,7 @@ const addState = connect(
             dispatch(actions.setItemEquip(null));
             dispatch(actions.setItemUnequip([]));
             dispatch(actions.setVboxHighlight([]));
-
+            dispatch(actions.setMtxActive(null));
             return dispatch(actions.setNav(place));
         }
 
@@ -83,16 +83,16 @@ function Header(args) {
                     class={`login-btn ${nav === 'play' ? 'highlight' : ''}`}>
                     Play
                 </button>
-                <button
-                    onClick={() => navTo('reshape')}
-                    class={`login-btn ${nav === 'reshape' ? 'highlight' : ''}`}>
-                    Reshape
-                </button>
                 <button
                     onClick={() => navTo('shop')}
                     class={`login-btn ${nav === 'shop' ? 'highlight' : ''}`}>
                     Shop
                 </button>
+                <button
+                    onClick={() => navTo('reshape')}
+                    class={`login-btn ${nav === 'reshape' ? 'highlight' : ''}`}>
+                    Reshape
+                </button>
                 <button
                     onClick={accountClick}
                     class={`login-btn ${nav === 'account' ? 'highlight' : ''}`}>
diff --git a/client/src/components/shop.jsx b/client/src/components/shop.jsx
index 5b36e0c4..16883b22 100644
--- a/client/src/components/shop.jsx
+++ b/client/src/components/shop.jsx
@@ -41,7 +41,8 @@ function Shop(args) {
                     <b>Subscriptions</b> grant extra benefits:
                     <ul>
                         <li>¤150 per month</li>
-                        <li>More community features in the future including account icons and chat wheel</li>
+                        <li>Account icons</li>
+                        <li>Chat wheel</li>
                     </ul>
                 </p>
             </div>
diff --git a/client/src/events.jsx b/client/src/events.jsx
index b89d739f..3db2ce7b 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -180,6 +180,7 @@ function registerEvents(store) {
     }
 
     function setAccountInstances(v) {
+        store.dispatch(actions.setMtxActive(null));
         return store.dispatch(actions.setInstances(v));
     }