Merge remote-tracking branch 'origin/master' into lf/push-hook-unver

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfebe1a8b00a467aff71e1a3612a2792d59e5f1ace305bcbc9863d1e5edc2bb9
-size 10162859
+oid sha256:abc163491b53cc9d48a70ea378dde8bb455648e3f6e7f57a0c7a8e164d4ca105
+size 10226599

pkg/arvo/app/glob.hoon

@@ -5,7 +5,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0v2.utsjo.ghhil.f0qh8.h5633.ffi8u
+++  hash  0v2i7ds.j99ka.5dpja.pef1e.b04e0
 +$  state-0  [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
 +$  all-states
   $%  state-0

pkg/arvo/app/landscape/index.html

@@ -24,6 +24,6 @@
     <div id="portal-root"></div>
     <script src="/~landscape/js/channel.js"></script>
     <script src="/~landscape/js/session.js"></script>
-    <script src="/~landscape/js/bundle/index.56a06ac35480964ec775.js"></script>
+    <script src="/~landscape/js/bundle/index.3a0ba646997cd338b513.js"></script>
   </body>
 </html>

pkg/arvo/lib/metadata-store.hoon

@@ -197,8 +197,10 @@
       [%graph p.mod]
     =/  jin=json
       (~(got by p.jon) %group)
-    ?>  ?=(%o -.jin)
     :+  %group  ~
+    ?~  jin
+      ~  
+    ?>  ?=(%o -.jin)
     ?.  ?&  (~(has by p.jin) 'app-name')
             (~(has by p.jin) 'resource')
         ==

pkg/interface/src/views/apps/chat/components/ChatMessage.tsx

@@ -610,6 +610,7 @@ export const Message = ({
                   scrollWindow={scrollWindow}
                   ship={content.mention}
                   contact={contacts?.[`~${content.mention}`]}
+                  api={api}
                 />
               );
             default:

pkg/interface/src/views/apps/notifications/invites.tsx

@@ -60,7 +60,7 @@ export function Invites(props: InvitesProps): ReactElement {
   return (
     <>
       {Object.keys(invitesAndStatus).length > 0 && (
-        <Box position="sticky" zIndex={3} top="-1px" bg="white">
+        <Box position="sticky" zIndex={3} top="-1px" bg="white" flexShrink="0">
           <Box p="2" bg="scales.black05">
             <Text>Invites</Text>
           </Box>

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

@@ -54,7 +54,7 @@ export function CommentItem(props: CommentItemProps): ReactElement {
   if (window.ship == post?.author && !disabled) {
     adminLinks.push(
       <Link to={{ pathname: props.baseUrl, search: `?edit=${commentIndex}`}}>
-        <Action>
+        <Action bg="white">
           Update
         </Action>
       </Link>
@@ -63,7 +63,7 @@ export function CommentItem(props: CommentItemProps): ReactElement {
 
   if ((window.ship == post?.author || ourRole == "admin") && !disabled) {
     adminLinks.push(
-      <Action onClick={onDelete} destructive>
+      <Action bg="white" onClick={onDelete} destructive>
         Delete
       </Action>
     )

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

@@ -4,7 +4,7 @@ import { Text, Box } from '@tlon/indigo-react';
 import { Contact, Contacts, Content, Group } from '@urbit/api';
 import RichText from '~/views/components/RichText';
 import { cite, useShowNickname, uxToHex } from '~/logic/lib/util';
-import OverlaySigil from '~/views/components/OverlaySigil';
+import ProfileOverlay from '~/views/components/ProfileOverlay';
 import { useHistory } from 'react-router-dom';
 import useContactState from '~/logic/state/contact';
 import {referenceToPermalink} from '~/logic/lib/permalinks';
@@ -45,8 +45,9 @@ export function Mention(props: {
   scrollWindow?: HTMLElement;
   ship: string;
   first?: Boolean;
+  api: any;
 }) {
-  const { ship, scrollWindow, first, ...rest } = props;
+  const { ship, scrollWindow, first, api, ...rest } = props;
   let { contact } = props;
   const contacts = useContactState(state => state.contacts);
   contact = contact?.color ? contact : contacts?.[`~${ship}`];
@@ -62,30 +63,23 @@ export function Mention(props: {
 
   return (
     <Box position='relative' display='inline-block' cursor='pointer' {...rest}>
-      <Text
-        onClick={() => toggleOverlay()}
-        marginLeft={first? 0 : 1}
-        marginRight={1}
-        px={1}
-        bg='washedBlue'
-        color='blue'
-        fontSize={showNickname ? 1 : 0}
-        mono={!showNickname}
-      >
-        {name}
-      </Text>
-      {showOverlay && (
-        <OverlaySigil
+        <ProfileOverlay
           ship={ship}
-          contact={contact}
-          color={`#${uxToHex(contact?.color ?? '0x0')}`}
-          group={group}
-          onDismiss={() => toggleOverlay()}
-          history={history}
-          className='relative'
-          scrollWindow={scrollWindow}
-        />
-      )}
+          api={api}
+        >
+          <Text
+            onClick={() => toggleOverlay()}
+            marginLeft={first? 0 : 1}
+            marginRight={1}
+            px={1}
+            bg='washedBlue'
+            color='blue'
+            fontSize={showNickname ? 1 : 0}
+            mono={!showNickname}
+          >
+          {name}
+        </Text>
+      </ProfileOverlay>
     </Box>
   );
 }

pkg/interface/src/views/components/RichText.js

@@ -52,7 +52,7 @@ const RichText = React.memo(({ disableRemoteContent, api, ...props }) => (
       linkReference: (linkProps) => {
         const linkText = String(linkProps.children[0].props.children);
         if (isValidPatp(linkText)) {
-          return <Mention contact={props.contact || {}} group={props.group} ship={deSig(linkText)} />;
+          return <Mention contact={props.contact || {}} group={props.group} ship={deSig(linkText)} api={api} />;
         } else if(linkText.startsWith('web+urbitgraph://')) {
           return (
             <PermalinkEmbed

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

@@ -64,6 +64,7 @@ export function SidebarList(props: {
           assoc.group === group &&
           !assoc.metadata.hidden
         ) : (
+          !(assoc.group in associationState.groups) &&
           'graph' in assoc.metadata.config &&
           assoc.metadata.config.graph !== 'chat' &&
           !assoc.metadata.hidden