Merge pull request #4690 from Clockwork-Rat/WV-1050-User_Cannot_Tab_Correctly_on_Ballot_Page

[WV 1050] user cannot tab correctly on ballot page

Author: DaleMcGrew

src/js/components/Navigation/HeaderBar.jsx

@@ -32,7 +32,6 @@ import FriendsTabs from './FriendsTabs';
 import HeaderBarLogo from './HeaderBarLogo';
 import HeaderBarModals from './HeaderBarModals';
 import TabWithPushHistory from './TabWithPushHistory';
-import TabWithoutPushHistory from './TabWithoutPushHistory';
 
 const HeaderNotificationMenu = React.lazy(() => import(/* webpackChunkName: 'HeaderNotificationMenu' */ './HeaderNotificationMenu'));
 const nextReleaseFeaturesEnabled = webAppConfig.ENABLE_NEXT_RELEASE_FEATURES === undefined ? false : webAppConfig.ENABLE_NEXT_RELEASE_FEATURES;
@@ -537,8 +536,9 @@ class HeaderBar extends Component {
                         to="/donate"
                       />
                     )}
-                    <TabWithoutPushHistory
+                    <Tab
                       value={3}
+                      tabIndex={0}
                       classes={isWebApp() ? { root: classes.tabRoot, selected: classes.tabSelected } : { root: classes.tabRootMore, selected: classes.tabSelected }}
                       id="moreTabHeaderBar"
                       label={(