diff --git a/bin/solid.pill b/bin/solid.pill index a69215428d..a9530ca778 100644 --- a/bin/solid.pill +++ b/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 diff --git a/pkg/arvo/app/glob.hoon b/pkg/arvo/app/glob.hoon index d1598ba823..9b0c3f1eb5 100644 --- a/pkg/arvo/app/glob.hoon +++ b/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 diff --git a/pkg/arvo/app/landscape/index.html b/pkg/arvo/app/landscape/index.html index 38448f93da..3ce429b2ae 100644 --- a/pkg/arvo/app/landscape/index.html +++ b/pkg/arvo/app/landscape/index.html @@ -24,6 +24,6 @@
- + diff --git a/pkg/arvo/lib/metadata-store.hoon b/pkg/arvo/lib/metadata-store.hoon index 82cee9d185..23a6878f97 100644 --- a/pkg/arvo/lib/metadata-store.hoon +++ b/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') == diff --git a/pkg/interface/src/views/apps/chat/components/ChatMessage.tsx b/pkg/interface/src/views/apps/chat/components/ChatMessage.tsx index 75fca57036..e141445312 100644 --- a/pkg/interface/src/views/apps/chat/components/ChatMessage.tsx +++ b/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: diff --git a/pkg/interface/src/views/apps/notifications/invites.tsx b/pkg/interface/src/views/apps/notifications/invites.tsx index 7b9f04e70c..7c97c9a8be 100644 --- a/pkg/interface/src/views/apps/notifications/invites.tsx +++ b/pkg/interface/src/views/apps/notifications/invites.tsx @@ -60,7 +60,7 @@ export function Invites(props: InvitesProps): ReactElement { return ( <> {Object.keys(invitesAndStatus).length > 0 && ( - + Invites diff --git a/pkg/interface/src/views/components/CommentItem.tsx b/pkg/interface/src/views/components/CommentItem.tsx index fd1a4883bb..126b67913f 100644 --- a/pkg/interface/src/views/components/CommentItem.tsx +++ b/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( - + Update @@ -63,7 +63,7 @@ export function CommentItem(props: CommentItemProps): ReactElement { if ((window.ship == post?.author || ourRole == "admin") && !disabled) { adminLinks.push( - + Delete ) diff --git a/pkg/interface/src/views/components/MentionText.tsx b/pkg/interface/src/views/components/MentionText.tsx index 387a6d2b93..56d4d09588 100644 --- a/pkg/interface/src/views/components/MentionText.tsx +++ b/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 ( - toggleOverlay()} - marginLeft={first? 0 : 1} - marginRight={1} - px={1} - bg='washedBlue' - color='blue' - fontSize={showNickname ? 1 : 0} - mono={!showNickname} - > - {name} - - {showOverlay && ( - toggleOverlay()} - history={history} - className='relative' - scrollWindow={scrollWindow} - /> - )} + api={api} + > + toggleOverlay()} + marginLeft={first? 0 : 1} + marginRight={1} + px={1} + bg='washedBlue' + color='blue' + fontSize={showNickname ? 1 : 0} + mono={!showNickname} + > + {name} + + ); } diff --git a/pkg/interface/src/views/components/RichText.js b/pkg/interface/src/views/components/RichText.js index a0bd356b53..11c9fe7921 100644 --- a/pkg/interface/src/views/components/RichText.js +++ b/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 ; + return ; } else if(linkText.startsWith('web+urbitgraph://')) { return (