Merge branch 'release/next-js' of https://github.com/urbit/urbit into tbcs/typescript-cleanup

pkg/interface/src/views/apps/permalinks/embed.tsx

@@ -125,10 +125,16 @@ function GraphPermalink(
           showOurContact={showOurContact}
         />
       )}
-      {isInSameResource && (
-        <Row height='12px' />
+      {association && !isInSameResource && (
+        <PermalinkDetails
+          known
+          showTransclusion={showTransclusion}
+          icon={getModuleIcon(association.metadata.config.graph)}
+          title={association.metadata.title}
+          permalink={permalink}
+        />
       )}
-      {association && !isInSameResource ? (
+      {association && isInSameResource && transcluded === 2 && (
         <PermalinkDetails
           known
           showTransclusion={showTransclusion}
@@ -136,7 +142,8 @@ function GraphPermalink(
           title={association.metadata.title}
           permalink={permalink}
         />
-      ) : null}
+      )}
+      {isInSameResource && transcluded !== 2 && <Row height="12px" />}
       {!association && (
         <PermalinkDetails
           icon="Groups"

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

@@ -78,7 +78,11 @@ export function GroupLink(
             {preview ?
               <>
                 <Box pr='2' display='flex' alignItems='center'>
-                  <Icon icon='Public' color='gray' mr='1' />
+                  <Icon 
+                    icon={preview.metadata.hidden ? 'Locked' : 'Public'}
+                    color='gray'
+                    mr='1'
+                   />
                   <Text fontSize='0' color='gray'>
                     {preview.metadata.hidden ? 'Private' : 'Public'}
                   </Text>
@@ -86,7 +90,8 @@ export function GroupLink(
                 <Box display='flex' alignItems='center'>
                   <Icon icon='Users' color='gray' mr='1' />
                   <Text fontSize='0'color='gray' >
-                    {preview.members} peers
+                    {preview.members} 
+                    {preview.members > 1 ? 'peers' : 'peer'}
                   </Text>
                 </Box>
               </>

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

@@ -167,10 +167,10 @@ export function NewChannel(props: NewChannelProps): ReactElement {
                 name='moduleType'
               />
               <IconRadio
-                icon='Notebook'
-                label='Notebook'
-                id='publish'
-                name='moduleType'
+                icon="Publish"
+                label="Notebook"
+                id="publish"
+                name="moduleType"
               />
               <IconRadio
                 icon='Collection'