diff --git a/frontend/common/stores/account-store.js b/frontend/common/stores/account-store.js index b14197acc99f..23b5c603bfed 100644 --- a/frontend/common/stores/account-store.js +++ b/frontend/common/stores/account-store.js @@ -302,11 +302,13 @@ const controller = { store.model = user if (user && user.organisations) { store.organisation = user.organisations[0] - const cookiedID = API.getCookie('organisation') - const pathID = matchPath(document.location.pathname, { - path: '/organisation/:organisationId', - strict: false, - })?.params?.organisationId + const cookiedID = parseInt(API.getCookie('organisation')) + const pathID = parseInt( + matchPath(document.location.pathname, { + path: '/organisation/:organisationId', + strict: false, + })?.params?.organisationId, + ) const orgId = pathID || cookiedID if (orgId) { const foundOrganisation = user.organisations.find( diff --git a/frontend/web/components/ProjectsPage.tsx b/frontend/web/components/ProjectsPage.tsx index 8bbaeb703a4e..7f36d12613f9 100644 --- a/frontend/web/components/ProjectsPage.tsx +++ b/frontend/web/components/ProjectsPage.tsx @@ -16,7 +16,9 @@ const ProjectsPage: FC = ({ match }) => { {() => { return (
- +
) }}