From dd51119bea37accbb91cc3ad96f18ef64e8b07e8 Mon Sep 17 00:00:00 2001
From: Philip Monk <phil@pcmonk.me>
Date: Tue, 3 Jan 2023 14:59:57 -0700
Subject: [PATCH 1/3] docket: rename to Grid

System was extremely confusing because %base is also referred to as
System.  Also allow it to show up in the app preferences list, so that
you can change its OTA source.
---
 desk/desk.docket-0                       | 2 +-
 ui/src/preferences/SystemPreferences.tsx | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/desk/desk.docket-0 b/desk/desk.docket-0
index 3d921540..7eab4fc7 100644
--- a/desk/desk.docket-0
+++ b/desk/desk.docket-0
@@ -1,4 +1,4 @@
-:~  title+'System'
+:~  title+'Grid'
     info+'An app launcher for Urbit.'
     color+0xee.5432
     glob-http+['https://bootstrap.urbit.org/glob-0v1.tqd6t.ggt8r.roheb.l3bvq.sbm6d.glob' 0v1.tqd6t.ggt8r.roheb.l3bvq.sbm6d]
diff --git a/ui/src/preferences/SystemPreferences.tsx b/ui/src/preferences/SystemPreferences.tsx
index 07491c63..e2f73308 100644
--- a/ui/src/preferences/SystemPreferences.tsx
+++ b/ui/src/preferences/SystemPreferences.tsx
@@ -72,7 +72,6 @@ export const SystemPreferences = (
   const { systemBlocked } = useSystemUpdate();
   const charges = useCharges();
   const filteredCharges = Object.values(charges)
-    .filter((charge) => charge.desk !== window.desk)
     .filter((charge) => charge.desk !== 'landscape');
   const isMobile = useMedia('(max-width: 639px)');
   const settingsPath = isMobile ? `${match.url}/:submenu` : '/';

From 2ea14678c0913f70db0c81ac2acb597b21715e64 Mon Sep 17 00:00:00 2001
From: Philip Monk <phil@pcmonk.me>
Date: Tue, 3 Jan 2023 15:03:29 -0700
Subject: [PATCH 2/3] error: link to correct repo

urbit/landscape doesn't exist.  I think this is the right repo.
---
 ui/src/components/ErrorAlert.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/ErrorAlert.tsx b/ui/src/components/ErrorAlert.tsx
index 93d18bc5..81699711 100644
--- a/ui/src/components/ErrorAlert.tsx
+++ b/ui/src/components/ErrorAlert.tsx
@@ -17,7 +17,7 @@ const SubmitIssue = ({ error }: { error: Error }) => {
     <Button
       as="a"
       variant="caution"
-      href={`https://github.com/urbit/landscape/issues/new?assignees=&labels=bug&title=${title}&body=${body}`}
+      href={`https://github.com/tloncorp/landscape-apps/issues/new?assignees=&labels=bug&title=${title}&body=${body}`}
       target="_blank"
       rel="noreferrer"
     >

From d5504055787fc2ac718df961840a943bfe84aaa4 Mon Sep 17 00:00:00 2001
From: Philip Monk <phil@pcmonk.me>
Date: Tue, 3 Jan 2023 15:04:40 -0700
Subject: [PATCH 3/3] grid: handle system update error cases

Update copy throughout system update page to be more consistent and
clear.

Recognize if a kelvin update failed and present a "retry" button.

Recognize if that failure was due to an out-of-date binary and instruct
the user to update their binary.

Disallow system updates if grid is blocked, and inform the user.
---
 .../preferences/about-system/AboutSystem.tsx  | 104 +++++++++++++-----
 1 file changed, 74 insertions(+), 30 deletions(-)

diff --git a/ui/src/preferences/about-system/AboutSystem.tsx b/ui/src/preferences/about-system/AboutSystem.tsx
index 9c913d39..fc596a86 100644
--- a/ui/src/preferences/about-system/AboutSystem.tsx
+++ b/ui/src/preferences/about-system/AboutSystem.tsx
@@ -6,7 +6,7 @@ import { Dialog, DialogClose, DialogContent, DialogTrigger } from '../../compone
 import { FullTlon16Icon } from '../../components/icons/FullTlon16Icon';
 import { useSystemUpdate } from '../../logic/useSystemUpdate';
 import { useCharge } from '../../state/docket';
-import { usePike } from '../../state/kiln';
+import { usePike, useLag } from '../../state/kiln';
 import { disableDefault, pluralize } from '../../state/util';
 import { UpdatePreferences } from './UpdatePreferences';
 
@@ -20,7 +20,9 @@ export const AboutSystem = () => {
   const gardenPike = usePike(window.desk);
   const { systemBlocked, blockedCharges, blockedCount, freezeApps } =
     useSystemUpdate();
+  const gardenBlocked = null != blockedCharges.find(charge => charge.desk == 'garden');
   const hash = gardenPike && getHash(gardenPike);
+  const lag = useLag();
   
   return (
     <>
@@ -46,41 +48,83 @@ export const AboutSystem = () => {
           </div>
           {systemBlocked ? (
             <>
-              <p className="text-orange-500">Update is currently blocked by the following apps:</p>
+            {lag ? (
+              <>
+              <p className="text-orange-500">
+                System update failed because your runtime was out of date.
+              </p>
+              <p>
+                Update your runtime or contact your hosting provider.
+              </p>
+              <p>
+                Once your runtime is up to date, click retry below.
+              </p>
+              <Button variant="caution" onClick={freezeApps}>
+                Retry System Update
+              </Button>
+              </>
+            ) : (blockedCount == 0) ? (
+              <>
+              <p className="text-orange-500">
+                System update failed.
+              </p>
+              <p>
+                For additional debugging output, open the terminal and click retry below.
+              </p>
+              <Button variant="caution" onClick={freezeApps}>
+                Retry System Update
+              </Button>
+              </>
+            ) : (
+              <>
+              <p className="text-orange-500">
+                Update is currently blocked by the following {pluralize('app', blockedCount)}:
+              </p>
               <AppList
                 apps={blockedCharges}
                 labelledBy="blocked-apps"
                 size="xs"
                 className="font-medium"
               />
-              <Dialog>
-                <DialogTrigger as={Button} variant="caution">
-                  Freeze {blockedCount} {pluralize('app', blockedCount)} and Apply Update
-                </DialogTrigger>
-                <DialogContent
-                  showClose={false}
-                  onOpenAutoFocus={disableDefault}
-                  className="space-y-6 tracking-tight"
-                  containerClass="w-full max-w-md"
-                >
-                  <h2 className="h4">
-                    Freeze {blockedCount} {pluralize('App', blockedCount)} and Apply System Update
-                  </h2>
-                  <p>
-                    The following apps will be archived until their developer provides a compatible
-                    update to your system.
-                  </p>
-                  <AppList apps={blockedCharges} labelledBy="blocked-apps" size="xs" />
-                  <div className="flex space-x-6">
-                    <DialogClose as={Button} variant="secondary">
-                      Cancel
-                    </DialogClose>
-                    <DialogClose as={Button} variant="caution" onClick={freezeApps}>
-                      Freeze Apps
-                    </DialogClose>
-                  </div>
-                </DialogContent>
-              </Dialog>
+              {gardenBlocked ? (
+                <>
+                <p>
+                  Grid is the application launcher and system interface.
+                  It needs an update before you can apply the System Update.
+                </p>
+                </>
+              ) : (
+                <Dialog>
+                  <DialogTrigger as={Button} variant="caution">
+                    Suspend {blockedCount} {pluralize('App', blockedCount)} and Apply Update
+                  </DialogTrigger>
+                  <DialogContent
+                    showClose={false}
+                    onOpenAutoFocus={disableDefault}
+                    className="space-y-6 tracking-tight"
+                    containerClass="w-full max-w-md"
+                  >
+                    <h2 className="h4">
+                      Suspend {blockedCount} {pluralize('App', blockedCount)} and Apply System Update
+                    </h2>
+                    <p>
+                      The following {pluralize('app', blockedCount)} will be suspended until their
+                      developer provides an update.
+                    </p>
+                    <AppList apps={blockedCharges} labelledBy="blocked-apps" size="xs" />
+                    <div className="flex space-x-6">
+                      <DialogClose as={Button} variant="secondary">
+                        Cancel
+                      </DialogClose>
+                      <DialogClose as={Button} variant="caution" onClick={freezeApps}>
+                        Suspend {pluralize('App', blockedCount)} and Update
+                      </DialogClose>
+                    </div>
+                  </DialogContent>
+                </Dialog>
+              )}
+              </>
+            )}
             </>
           ) : (
             <p>Your urbit is up to date.</p>