From 92f6fe914fce3838fa9ad12333f72e5db5535518 Mon Sep 17 00:00:00 2001 From: Raicuparta Date: Thu, 29 Jun 2023 04:12:16 +0100 Subject: [PATCH 1/3] Search only communities by default when coming from communities page --- src/shared/components/community/communities.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/community/communities.tsx b/src/shared/components/community/communities.tsx index a84ec05..30a4280 100644 --- a/src/shared/components/community/communities.tsx +++ b/src/shared/components/community/communities.tsx @@ -284,7 +284,7 @@ export class Communities extends Component { handleSearchSubmit(i: Communities, event: any) { event.preventDefault(); const searchParamEncoded = encodeURIComponent(i.state.searchText); - i.context.router.history.push(`/search?q=${searchParamEncoded}`); + i.context.router.history.push(`/search?q=${searchParamEncoded}&type=Communities`); } static async fetchInitialData({ From 75c2e803c9c17fb5b8ae72aea80616c1903cfb89 Mon Sep 17 00:00:00 2001 From: Raicuparta Date: Thu, 29 Jun 2023 13:12:30 +0200 Subject: [PATCH 2/3] fix formatting --- src/shared/components/community/communities.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/components/community/communities.tsx b/src/shared/components/community/communities.tsx index 30a4280..8d86d9d 100644 --- a/src/shared/components/community/communities.tsx +++ b/src/shared/components/community/communities.tsx @@ -284,7 +284,9 @@ export class Communities extends Component { handleSearchSubmit(i: Communities, event: any) { event.preventDefault(); const searchParamEncoded = encodeURIComponent(i.state.searchText); - i.context.router.history.push(`/search?q=${searchParamEncoded}&type=Communities`); + i.context.router.history.push( + `/search?q=${searchParamEncoded}&type=Communities` + ); } static async fetchInitialData({ From ec649d1911c3a5ee147db052468585931e77b865 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 29 Jun 2023 09:04:09 -0400 Subject: [PATCH 3/3] Fixing site setup. Fixes #1694 (#1697) --- src/shared/components/home/setup.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/shared/components/home/setup.tsx b/src/shared/components/home/setup.tsx index bed1262..966e6d4 100644 --- a/src/shared/components/home/setup.tsx +++ b/src/shared/components/home/setup.tsx @@ -205,9 +205,7 @@ export class Setup extends Component { const data = i.state.registerRes.data; UserService.Instance.login(data); - if (UserService.Instance.jwtInfo) { - i.setState({ doneRegisteringUser: true }); - } + i.setState({ doneRegisteringUser: true }); } } }