Merge branch 'universal_nav' into develop

Author: jmgasper

src/shared/containers/TopcoderHeader/index.jsx

@@ -30,12 +30,15 @@ const TopcoderHeader = ({ auth }) => {
 
     // if there's a stored nav type in session storage, retrieve it and overwrite type
     const sessionNavType = sessionStorage.getItem('uni-nav[navType]');
-    if (sessionNavType && (sessionNavType === 'tool' || sessionNavType === 'marketing')) {
+    const url = new URL(window.location.href);
+
+    // Only use the set sessionStorage value for navType on the /thrive paths, for now.
+    // Probably will change in the future...
+    if (window.location.href.indexOf('/thrive') > -1 && sessionNavType && (sessionNavType === 'tool' || sessionNavType === 'marketing')) {
       type = sessionNavType;
     }
 
     // If url contains navTool url parameter. Overwrite settings with parameter.
-    const url = new URL(window.location.href);
     const urlParams = new URLSearchParams(url.search);
     if (urlParams.get('navTool')) {
       type = urlParams.get('navTool');