From a91f96751b8a04a2a8106fa132b1234b5d497a5f Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@gmail.com>
Date: Fri, 12 Feb 2021 22:35:13 -0500
Subject: [PATCH 1/4] invite: prevent interface crash

We're accessing invite.ship when we don't have invite. This stubs that
out.
---
 pkg/interface/src/views/components/Invite/index.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg/interface/src/views/components/Invite/index.tsx b/pkg/interface/src/views/components/Invite/index.tsx
index c39c1d5e8..4bdab74b5 100644
--- a/pkg/interface/src/views/components/Invite/index.tsx
+++ b/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>
     );

From dbafffd7837370d0ada0148b11ea639befd7887a Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam.fitzgerald@tlon.io>
Date: Sat, 13 Feb 2021 14:51:42 +1000
Subject: [PATCH 2/4] contact-store: enforce timestamp ordering on %initial

---
 pkg/arvo/app/contact-store.hoon | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkg/arvo/app/contact-store.hoon b/pkg/arvo/app/contact-store.hoon
index d61f9edbd..738fe698d 100644
--- a/pkg/arvo/app/contact-store.hoon
+++ b/pkg/arvo/app/contact-store.hoon
@@ -104,7 +104,14 @@
       |=  [rolo=rolodex:store is-public=?]
       ^-  (quip card _state)
       =/  our-contact  (~(got by rolodex) our.bowl)
-      =.  rolodex  (~(uni by rolodex) rolo)
+      ::
+      =/  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)
+      =.  rolodex  (~(uni by rolodex) diff-rolo)
       =.  rolodex  (~(put by rolodex) our.bowl our-contact)
       :_  state(rolodex rolodex)
       (send-diff [%initial rolodex is-public] %.n)

From 9e3c0488553978567b6964b6d4d5d38d92d2564f Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam.fitzgerald@tlon.io>
Date: Sat, 13 Feb 2021 15:14:36 +1000
Subject: [PATCH 3/4] contact-store: address L review

---
 pkg/arvo/app/contact-store.hoon | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/arvo/app/contact-store.hoon b/pkg/arvo/app/contact-store.hoon
index 738fe698d..a7c60110d 100644
--- a/pkg/arvo/app/contact-store.hoon
+++ b/pkg/arvo/app/contact-store.hoon
@@ -104,17 +104,18 @@
       |=  [rolo=rolodex:store is-public=?]
       ^-  (quip card _state)
       =/  our-contact  (~(got by rolodex) our.bowl)
-      ::
       =/  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)
-      =.  rolodex  (~(uni by rolodex) diff-rolo)
-      =.  rolodex  (~(put by rolodex) our.bowl our-contact)
-      :_  state(rolodex rolodex)
-      (send-diff [%initial rolodex is-public] %.n)
+      =/  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]

From 79f461f5c9ecfb7bf45ee55061332beec2775f98 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam.fitzgerald@tlon.io>
Date: Sat, 13 Feb 2021 15:24:06 +1000
Subject: [PATCH 4/4] glob: update to 0v7.iotki.j1ptb.mk9vm.borai.jfcr1

---
 bin/solid.pill                    | 4 ++--
 pkg/arvo/app/glob.hoon            | 2 +-
 pkg/arvo/app/landscape/index.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/solid.pill b/bin/solid.pill
index 26974f7ee..c5fdae773 100644
--- a/bin/solid.pill
+++ b/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
diff --git a/pkg/arvo/app/glob.hoon b/pkg/arvo/app/glob.hoon
index 4e712ee9e..1974c3c06 100644
--- a/pkg/arvo/app/glob.hoon
+++ b/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
diff --git a/pkg/arvo/app/landscape/index.html b/pkg/arvo/app/landscape/index.html
index b0f894a36..7871f4ed3 100644
--- a/pkg/arvo/app/landscape/index.html
+++ b/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>