navigation: updates fields, reorders props

common/navigation-data.js

@@ -52,75 +52,75 @@ const constructSlatesTreeForNavigation = (slates) => {
 export const generate = ({ library = [], slates = [] }) => [
   {
     id: "V1_NAVIGATION_HOME",
+    decorator: "HOME",
     name: "Home",
     pageTitle: "Welcome back!",
-    decorator: "HOME",
     children: null,
   },
   {
     id: "V1_NAVIGATION_DIRECTORY",
+    decorator: "DIRECTORY",
     name: "Directory",
     pageTitle: "Your directory",
-    decorator: "DIRECTORY",
     children: null,
   },
   {
     id: "V1_NAVIGATION_SLATES",
+    decorator: "SLATES",
     name: "Slates",
     pageTitle: "Slates",
-    decorator: "SLATES",
     children: constructSlatesTreeForNavigation(slates),
   },
   constructFilesTreeForNavigation(library),
   {
     id: "V1_NAVIGATION_LOCAL",
+    decorator: "LOCAL_DATA",
     name: "Local",
     pageTitle: "Your local data",
-    decorator: "LOCAL_DATA",
     children: [],
     ignore: false,
   },
   {
     id: "V1_NAVIGATION_WALLET",
+    decorator: "WALLET",
     name: "Wallet",
     pageTitle: "Your wallet and addresses",
-    decorator: "WALLET",
     children: [
       {
         id: "V1_NAVIGATION_DEAL_HISTORY",
+        decorator: "DEALS",
         name: "Deal history",
         pageTitle: "Your deal history",
-        decorator: "DEALS",
       },
     ],
   },
   {
     id: "V1_NAVIGATION_NETWORK",
+    decorator: "NETWORK",
     name: "Network",
     pageTitle: "The Filecoin Network",
-    decorator: "ACTIVITY",
     children: null,
   },
   {
     id: "V1_NAVIGATION_API",
+    decorator: "SETTINGS_DEVELOPER",
     name: "API",
     pageTitle: "Developer API",
-    decorator: "SETTINGS_DEVELOPER",
     children: null,
   },
   {
     id: "V1_NAVIGATION_PROFILE",
+    decorator: "EDIT_ACCOUNT",
     name: "Profile & Account Settings",
     pageTitle: "Your Profile & Account Settings",
-    decorator: "EDIT_ACCOUNT",
     children: null,
     ignore: true,
   },
   {
     id: "V1_NAVIGATION_FILECOIN_SETTINGS",
+    decorator: "SETTINGS",
     name: "Filecoin Settings",
     pageTitle: "Filecoin Settings.",
-    decorator: "SETTINGS",
     children: null,
     ignore: true,
   },

components/core/Application.js

@@ -65,7 +65,7 @@ const SCENES = {
   EDIT_ACCOUNT: <SceneEditAccount />,
   SLATES: <SceneSlates />,
   LOCAL_DATA: <SceneLocalData />,
-  ACTIVITY: <SceneActivity />,
+  NETWORK: <SceneActivity />,
   DIRECTORY: <SceneDirectory />,
 };