Merge pull request #5678 from urbit/lf/landscape-floor

groups: assorted bug fixes

pkg/interface/src/views/apps/launch/components/Groups.tsx

@@ -12,7 +12,7 @@ import React from "react";
 import { useHistory } from "react-router-dom";
 import { getNotificationCount } from "~/logic/lib/hark";
 import { alphabeticalOrder } from "~/logic/lib/util";
-import useGroupState from "~/logic/state/group";
+import useGroupState, {useGroup} from "~/logic/state/group";
 import useHarkState, { selHarkGraph } from "~/logic/state/hark";
 import useInviteState from "~/logic/state/invite";
 import useMetadataState, { usePreview } from "~/logic/state/metadata";
@@ -128,6 +128,11 @@ function PendingGroup(props: PendingGroupProps) {
   };
 
   const joining = useGroupState((s) => s.pendingJoin[path]?.progress);
+  const group = useGroup(path);
+
+  if(joining?.progress === 'done' && !group) {
+    return null;
+  }
 
   return (
     <Tile gridColumnStart={first ? 1 : undefined}>

pkg/interface/src/views/components/RemoteContent/embed.tsx

@@ -84,7 +84,8 @@ export function RemoteContentImageEmbed(
         referrerPolicy="no-referrer"
         flexShrink={0}
         src={url}
-        height="100%"
+        height="192px"
+        maxWidth="192px"
         width="100%"
         objectFit="contain"
         borderRadius={2}

pkg/interface/src/views/components/ShipSearch.tsx

@@ -204,7 +204,7 @@ export function ShipSearch<I extends string, V extends Value<I>>(
               onChange={onChange}
               onSelect={onAdd}
             />
-            <Row minHeight="34px" flexWrap="wrap">
+            <Row overflowX="auto" maxHeight="192px" minHeight="34px" flexWrap="wrap">
               {pills.map((s, i) => (
                 <Row
                   fontFamily="mono"

pkg/interface/src/views/landscape/components/GroupsPane.tsx

@@ -213,7 +213,7 @@ export function GroupsPane(props: GroupsPaneProps) {
                 {...props}
                 baseUrl={baseUrl}
               >
-                <Box width="100%">
+                <Box overflow="auto">
                   <Join desc={desc} />
                 </Box>
               </Skeleton>

pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx

@@ -54,7 +54,9 @@ export function SidebarListHeader(props: {
   const feedPath = groupPath ? getFeedPath(associations.groups[groupPath]) : undefined;
 
   const unreadCount = useHarkState(
-    s => s.unreads?.graph?.[feedPath ?? '']?.['/']?.unreads as number ?? 0
+    s => feedPath
+    ? (s.unreads?.[`/graph/${feedPath.slice(6)}` ?? '']?.count as number ?? 0)
+    : 0
   );
 
   return (

pkg/landscape/app/dm-hook.hoon

@@ -203,12 +203,13 @@
     ?>  =(1 ~(wyt by nodes))
     =/  ship-screen  (~(get ju screened) src.bowl)
     =.  ship-screen  (~(uni in ship-screen) (normalize-incoming nodes))
+    =/  should-notify=?     !(~(has by screened) src.bowl)
     =.  screened  (~(put by screened) src.bowl ship-screen)
     :_  state
     =/  =action:hook
       [%pendings ~(key by screened)]
     :-  (fact:io dm-hook-action+!>(action) ~[/updates])
-    ?:  (~(has by screened) src.bowl)  ~
+    ?.  should-notify  ~
     (notify-pending src.bowl)^~
   ::
   ++  dm-exists

pkg/landscape/app/hark-graph-hook.hoon

@@ -542,6 +542,7 @@
       %graph-validator-publish  publish
       %graph-validator-link     link
       %graph-validator-dm       dm
+      %graph-validator-post     post
     ==
     ::
     ++  chat