Merge pull request #4973 from urbit/lf/deploy-omnibus

interface: deploy omnibus

pkg/btc-wallet/src/index.js

@@ -8,7 +8,7 @@ import './css/indigo-static.css';
 import './css/fonts.css';
 import './css/custom.css';
 
-// rebuild x2
+// rebuild x3
 
 window.NETWORK = 'testnet'; // 'bitcoin'
 

pkg/interface/src/views/apps/chat/DmResource.tsx

@@ -2,6 +2,7 @@ import { cite, Content } from '@urbit/api';
 import React, { useCallback, useEffect } from 'react';
 import bigInt from 'big-integer';
 import { Box, Row, Col, Text } from '@tlon/indigo-react';
+import { Link } from 'react-router-dom';
 import { patp2dec } from 'urbit-ob';
 import GlobalApi from '~/logic/api/global';
 import { useContact } from '~/logic/state/contact';
@@ -95,15 +96,29 @@ export function DmResource(props: DmResourceProps) {
         borderBottom="1"
         borderBottomColor="lightGray"
       >
-        <Row gapX="2" alignItems="baseline">
+        <Row alignItems="baseline">
+          <Box
+            borderRight={1}
+            borderRightColor='gray'
+            pr={3}
+            fontSize={1}
+            mr={3}
+            my={1}
+            flexShrink={0}
+            display={['block','none']}
+          >
+            <Link to={'/~landscape/messages'}>
+              <Text>{'<- Back'}</Text>
+            </Link>
+          </Box>
           {showNickname && (
-            <Box>
+            <Box mr="3">
               <Text fontWeight="medium" fontSize={2} mono={!showNickname}>
                 {nickname}
               </Text>
             </Box>
           )}
-          <Box>
+          <Box display={[showNickname ? 'none' : 'block', 'block']}>
             <Text gray={showNickname} mono>
               {cite(ship)}
             </Text>

pkg/interface/src/views/apps/settings/components/lib/DmSettings.tsx

@@ -1,4 +1,5 @@
 import {
+  Text,
   Col,
   Box,
   ManagedToggleSwitchField
@@ -24,9 +25,13 @@ export function DmSettings(props: { api: GlobalApi }) {
   return (
     <Col p="5" gapY="5" width="100%" height="100%">
       <Col gapY="1">
-        <Box color="black" fontSize="2">Privacy</Box>
+        <Box>
+          <Text fontSize="2" >Privacy</Text>
+        </Box>
         <Box fontSize="1" color="gray">
-          Control other people&apos;s ability to message you
+          <Text gray>
+            Control other people&apos;s ability to message you
+          </Text>
         </Box>
       </Col>
       <Col>

pkg/interface/src/views/landscape/components/Home/GroupHome.tsx

@@ -9,6 +9,7 @@ import { EnableGroupFeed } from './EnableGroupFeed';
 import { GroupFeed } from './GroupFeed';
 import { getFeedPath } from '~/logic/lib/util';
 import { GroupFlatFeed } from './GroupFlatFeed';
+import { resourceFromPath } from '@urbit/api';
 
 function GroupHome(props) {
   const {
@@ -19,12 +20,13 @@ function GroupHome(props) {
 
   const associations = useMetadataState(state => state.associations);
   const groups = useGroupState(state => state.groups);
+  const { ship } = resourceFromPath(groupPath);
 
   const association = associations?.groups[groupPath];
 
   const feedPath = getFeedPath(association);
 
-  const askFeedBanner = feedPath === undefined;
+  const askFeedBanner = feedPath === undefined && `~${window.ship}` === ship;
 
   const graphMetadata = associations?.graph[feedPath]?.metadata;
 

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

@@ -38,7 +38,7 @@ function SidebarItemBase(props: {
     isSynced = false,
     mono = false
   } = props;
-  const color = isSynced ? 'black' : 'lightGray';
+  const color = isSynced ? (hasUnread || hasNotification) ? 'black' : 'gray' : 'lightGray';
 
   const fontWeight = hasUnread || hasNotification ? '500' : 'normal';