Merge 79f461f5c9 into release/next-js

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b950b3ada948523b275636965bb0ba15653e6ccecb2a4aaa6ced9f92fc70ecb0
-size 9410444
+oid sha256:ec58605002fafbe6f3a5988fe1db4bd31e2fd40370b30e96db64a98c8f7da0ea
+size 9474412

pkg/arvo/app/contact-store.hoon

@@ -104,10 +104,18 @@
       |=  [rolo=rolodex:store is-public=?]
       ^-  (quip card _state)
       =/  our-contact  (~(got by rolodex) our.bowl)
-      =.  rolodex  (~(uni by rolodex) rolo)
-      =.  rolodex  (~(put by rolodex) our.bowl our-contact)
-      :_  state(rolodex rolodex)
-      (send-diff [%initial rolodex is-public] %.n)
+      =/  diff-rolo=rolodex:store
+        %-  ~(gas by *rolodex:store)
+        %+  skim  ~(tap in rolo)
+        |=  [=ship =contact:store]
+        ?~  local-con=(~(get by rolodex) ship)  %.y
+        (gth last-updated.contact last-updated.u.local-con)
+      =/  new-rolo=rolodex:store
+        (~(uni by rolodex) diff-rolo)
+      =.  new-rolo  (~(put by new-rolo) our.bowl our-contact)
+      ?:  =(new-rolo rolodex)  `state
+      :_  state(rolodex new-rolo)
+      (send-diff [%initial new-rolo is-public] %.n)
     ::
     ++  handle-add
       |=  [=ship =contact:store]

pkg/arvo/app/glob.hoon

@@ -5,7 +5,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0v5d3ek.msaj7.n78mj.updun.qc1ea
+++  hash  0v7.iotki.j1ptb.mk9vm.borai.jfcr1
 +$  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.b344efe85da0081af4f5.js"></script>
+    <script src="/~landscape/js/bundle/index.096bb7cb32b754071b13.js"></script>
   </body>
 </html>

pkg/interface/src/views/components/Invite/index.tsx

@@ -124,10 +124,7 @@ export function InviteItem(props: InviteItemProps) {
       <JoinSkeleton status={status} gapY="3">
         <Row py="1" alignItems="center">
           <Icon display="block" color="blue" icon="Bullet" mr="2" />
-          <Text mr="1">You are joining a DM with</Text>
-          <Text mr="1" mono>
-            {cite(`~${invite!.ship}`)}
-          </Text>
+          <Text mr="1">Joining direct message...</Text>
         </Row>
       </JoinSkeleton>
     );