From dcb4e91e5bc24ae57efd5de7a5fb566f02efb8f5 Mon Sep 17 00:00:00 2001 From: sylenien Date: Mon, 12 Dec 2022 13:26:37 +0100 Subject: [PATCH] fix(ui): fix render loop crash, fix team list first letter --- .../Client/Users/components/UserListItem/UserListItem.tsx | 2 +- frontend/app/components/hocs/withSiteIdUpdater.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx b/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx index abae1cbe1..72b99929d 100644 --- a/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx +++ b/frontend/app/components/Client/Users/components/UserListItem/UserListItem.tsx @@ -42,7 +42,7 @@ function UserListItem(props: Props) { onClick={editHandler} >
- {user.name} + {user.name} {/* {isEnterprise && } */}
diff --git a/frontend/app/components/hocs/withSiteIdUpdater.js b/frontend/app/components/hocs/withSiteIdUpdater.js index 1c4e038ae..0849bbd84 100644 --- a/frontend/app/components/hocs/withSiteIdUpdater.js +++ b/frontend/app/components/hocs/withSiteIdUpdater.js @@ -19,7 +19,7 @@ export default (BaseComponent) => { } componentDidUpdate(prevProps) { const { urlSiteId, siteId, location: { pathname }, history } = this.props; - const shouldUrlUpdate = urlSiteId && urlSiteId !== siteId; + const shouldUrlUpdate = urlSiteId && parseInt(urlSiteId, 10) !== parseInt(siteId, 10); if (shouldUrlUpdate) { const path = ['', siteId].concat(pathname.split('/').slice(2)).join('/'); history.push(path); @@ -37,4 +37,4 @@ export default (BaseComponent) => { } return WrapperClass -} \ No newline at end of file +}