Merge pull request #4774 from withspectrum/remove-history-usage

Remove usage of browser history on server

Author: brianlovin

src/actions/dashboardFeed.js

@@ -2,15 +2,8 @@
 import qs from 'query-string';
 import { storeItem } from 'src/helpers/localStorage';
 import { LAST_ACTIVE_COMMUNITY_KEY } from 'src/views/dashboard/components/communityList';
-import { history } from 'src/helpers/history';
 
 export const changeActiveThread = (threadId: ?string) => {
-  let search = qs.parse(history.location.search);
-  search.t = threadId;
-  history.push({
-    ...history.location,
-    search: qs.stringify(search),
-  });
   return {
     type: 'SELECT_FEED_THREAD',
     threadId,

src/views/dashboard/components/inboxThread/index.js

@@ -67,14 +67,26 @@ class InboxThread extends React.Component<Props> {
       <ErrorBoundary fallbackComponent={null}>
         <InboxThreadItem data-cy="thread-card" active={active}>
           <InboxLinkWrapper
-            to={{
-              pathname: getThreadLink(thread),
-              state: { modal: !isInbox },
-            }}
+            to={
+              isInbox
+                ? {
+                    pathname: location.pathname,
+                    search: `?t=${thread.id}`,
+                  }
+                : {
+                    pathname: getThreadLink(thread),
+                    state: { modal: true },
+                  }
+            }
             onClick={evt => {
-              const isDesktopInbox = isInbox && window.innerWidth > 768;
-              if (isDesktopInbox) {
+              const isMobile = window.innerWidth < 768;
+              if (isMobile && isInbox) {
                 evt.preventDefault();
+                this.props.history.push({
+                  pathname: getThreadLink(thread),
+                  state: { modal: true },
+                });
+              } else if (!isMobile) {
                 this.props.dispatch(changeActiveThread(thread.id));
               }
             }}