diff --git a/pkg/interface/src/views/apps/notifications/invites.tsx b/pkg/interface/src/views/apps/notifications/invites.tsx index 194e594fe..7b9f04e70 100644 --- a/pkg/interface/src/views/apps/notifications/invites.tsx +++ b/pkg/interface/src/views/apps/notifications/invites.tsx @@ -89,6 +89,7 @@ export function Invites(props: InvitesProps): ReactElement { invite={invite} app={app} uid={uid} + join={join} resource={resource} /> ); diff --git a/pkg/interface/src/views/apps/notifications/notifications.tsx b/pkg/interface/src/views/apps/notifications/notifications.tsx index 8e27240c2..1e801b538 100644 --- a/pkg/interface/src/views/apps/notifications/notifications.tsx +++ b/pkg/interface/src/views/apps/notifications/notifications.tsx @@ -14,6 +14,7 @@ import GroupSearch from '~/views/components/GroupSearch'; import { useTutorialModal } from '~/views/components/useTutorialModal'; import useHarkState from '~/logic/state/hark'; import useMetadataState from '~/logic/state/metadata'; +import useGroupState from '~/logic/state/group'; const baseUrl = '/~notifications'; @@ -41,6 +42,7 @@ export default function NotificationsScreen(props: any): ReactElement { const [filter, setFilter] = useState({ groups: [] }); const associations = useMetadataState(state => state.associations); + const pendingJoin = useGroupState(s => s.pendingJoin); const onSubmit = async ({ groups } : NotificationFilter) => { setFilter({ groups }); }; @@ -128,7 +130,11 @@ export default function NotificationsScreen(props: any): ReactElement { - {!view && } + {!view && } diff --git a/pkg/interface/src/views/components/Invite/index.tsx b/pkg/interface/src/views/components/Invite/index.tsx index a316a3d0b..b89e5e630 100644 --- a/pkg/interface/src/views/components/Invite/index.tsx +++ b/pkg/interface/src/views/components/Invite/index.tsx @@ -108,7 +108,7 @@ export function InviteItem(props: InviteItemProps) { } }, [invite]); - if(status?.hidden) { + if(pendingJoin?.hidden) { return null; } @@ -119,7 +119,7 @@ export function InviteItem(props: InviteItemProps) { api={api} preview={preview} invite={invite} - status={status} + status={pendingJoin.progress} {...handlers} /> );