diff --git a/client/src/components/Header/Header.test.js b/client/src/components/Header/Header.test.js
index 2694aa611c..9b09badd40 100644
--- a/client/src/components/Header/Header.test.js
+++ b/client/src/components/Header/Header.test.js
@@ -23,14 +23,9 @@ describe('', () => {
});
describe('', () => {
- it('shows Curriculum and Sign In buttons on landing page', () => {
+ it('shows Curriculum and Sign In buttons when not signed in', () => {
const landingPageProps = {
- user: {
- username: 'test-user',
- picture: 'https://freecodecamp.org/image.png'
- },
- pending: false,
- pathName: '/'
+ pending: false
};
const shallow = new ShallowRenderer();
shallow.render();
@@ -48,11 +43,9 @@ describe('', () => {
const defaultUserProps = {
user: {
username: 'test-user',
- picture: 'https://freecodecamp.org/image.png',
- isDonating: true
+ picture: 'https://freecodecamp.org/image.png'
},
- pending: false,
- pathName: '/learn'
+ pending: false
};
const shallow = new ShallowRenderer();
shallow.render();
@@ -68,8 +61,7 @@ describe('', () => {
username: 'test-user',
picture: 'https://freecodecamp.org/image.png'
},
- pending: false,
- pathName: '/learn'
+ pending: false
};
const componentTree = renderer
@@ -86,8 +78,7 @@ describe('', () => {
picture: 'https://freecodecamp.org/image.png',
isDonating: true
},
- pending: false,
- pathName: '/learn'
+ pending: false
};
const componentTree = renderer
.create()
@@ -103,8 +94,7 @@ describe('', () => {
picture: 'https://freecodecamp.org/image.png',
yearsTopContributor: [2020]
},
- pending: false,
- pathName: '/learn'
+ pending: false
};
const componentTree = renderer
@@ -121,8 +111,7 @@ describe('', () => {
isDonating: true,
yearsTopContributor: [2020]
},
- pending: false,
- pathName: '/learn'
+ pending: false
};
const componentTree = renderer
.create()
diff --git a/client/src/components/Header/components/NavLinks.js b/client/src/components/Header/components/NavLinks.js
index a190f8bc49..e928b0397c 100644
--- a/client/src/components/Header/components/NavLinks.js
+++ b/client/src/components/Header/components/NavLinks.js
@@ -6,23 +6,22 @@ import Login from '../components/Login';
const propTypes = {
displayMenu: PropTypes.bool,
fetchState: PropTypes.shape({ pending: PropTypes.bool }),
- pathName: PropTypes.string.isRequired,
user: PropTypes.object
};
-export function AuthOrProfile({ user, pathName, pending }) {
+export function AuthOrProfile({ user, pending }) {
const isUserDonating = user && user.isDonating;
const isUserSignedIn = user && user.username;
const isTopContributor =
user && user.yearsTopContributor && user.yearsTopContributor.length > 0;
- if (pending && pathName !== '/') {
+ if (pending) {
return (
);
- } else if (pathName === '/' || !isUserSignedIn) {
+ } else if (!isUserSignedIn) {
return (
<>
@@ -57,12 +56,12 @@ export function AuthOrProfile({ user, pathName, pending }) {
}
}
-export function NavLinks({ displayMenu, pathName, user, fetchState }) {
+export function NavLinks({ displayMenu, user, fetchState }) {
const { pending } = fetchState;
return (
);
diff --git a/client/src/components/Header/components/UniversalNav.js b/client/src/components/Header/components/UniversalNav.js
index a9a77ceada..a39c7f362e 100644
--- a/client/src/components/Header/components/UniversalNav.js
+++ b/client/src/components/Header/components/UniversalNav.js
@@ -13,7 +13,6 @@ export const UniversalNav = ({
toggleDisplayMenu,
menuButtonRef,
searchBarRef,
- pathName,
user,
fetchState
}) => (
@@ -33,12 +32,7 @@ export const UniversalNav = ({
-
+
@@ -65,7 +64,6 @@ export class Header extends React.Component {
displayMenu={displayMenu}
fetchState={fetchState}
menuButtonRef={this.menuButtonRef}
- pathName={pathName}
searchBarRef={this.searchBarRef}
toggleDisplayMenu={this.toggleDisplayMenu}
user={user}
diff --git a/client/src/components/layouts/Default.js b/client/src/components/layouts/Default.js
index c0f4e6f757..8816f40317 100644
--- a/client/src/components/layouts/Default.js
+++ b/client/src/components/layouts/Default.js
@@ -159,8 +159,7 @@ class DefaultLayout extends Component {
showFooter = true,
theme = 'default',
user,
- useTheme = true,
- pathname
+ useTheme = true
} = this.props;
return (
@@ -226,7 +225,7 @@ class DefaultLayout extends Component {
-
+
{hasMessage && flashMessage ? (