Link fix for #193

Author: klyburke

saas/app/components/common/MenuWithLinks.tsx

@@ -1,7 +1,7 @@
 import Menu from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
 import Link from 'next/link';
-import { NextRouter, withRouter } from 'next/router';
+import Router, { NextRouter, withRouter } from 'next/router';
 import React from 'react';
 
 type Props = {
@@ -66,17 +66,16 @@ class MenuWithLinks extends React.PureComponent<Props, State> {
                 {option.text}
               </MenuItem>
             ) : (
-              <Link key={option.href} href={option.href} as={option.as} passHref>
-                <MenuItem
-                  key={option.href}
-                  style={{
-                    fontWeight: router.asPath.includes(option.highlighterSlug) ? 600 : 300,
-                    fontSize: '14px',
-                  }}
-                >
-                  {option.text}
-                </MenuItem>
-              </Link>
+              <MenuItem
+                key={option.href}
+                style={{
+                  fontWeight: router.asPath.includes(option.highlighterSlug) ? 600 : 300,
+                  fontSize: '14px',
+                }}
+                onClick={() => Router.push(option.href, option.as)}
+              >
+                {option.text}
+              </MenuItem>
             ),
           )}
         </Menu>

saas/app/components/discussions/DiscussionListItem.tsx

@@ -47,15 +47,12 @@ class DiscussionListItem extends React.Component<Props> {
             scroll={false}
             href={`/discussion?teamSlug=${team.slug}&discussionSlug=${discussion.slug}`}
             as={`/teams/${team.slug}/discussions/${discussion.slug}`}
+            style={{ fontWeight: 300, color: isThemeDark ? '#fff' : '#000' }}
+            key={discussion._id}
           >
-            <a
-              style={{ fontWeight: 300, color: isThemeDark ? '#fff' : '#000' }}
-              key={discussion._id}
-            >
-              {discussion.name.length > trimmingLength
-                ? `${discussion.name.substring(0, trimmingLength)}...`
-                : discussion.name}
-            </a>
+            {discussion.name.length > trimmingLength
+              ? `${discussion.name.substring(0, trimmingLength)}...`
+              : discussion.name}
           </Link>
           <div
             style={{