ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-29 04:04:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6131 from urbit/philip/grid-copy

Browse Source 
grid: improve copy and fix system update dismissal
This commit is contained in:
Zach Alberico 2022-12-05 15:16:57 -08:00 committed by GitHub
commit 785d581df0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/garden/desk.docket-0
View File

@ -1,7 +1,7 @@
:~ title+'System'
info+'An app launcher for Urbit.'
color+0xee.5432
glob-http+['https://bootstrap.urbit.org/glob-0v5.hca6f.1lng5.nkp81.skbo5.0brki.glob' 0v5.hca6f.1lng5.nkp81.skbo5.0brki]
glob-http+['https://bootstrap.urbit.org/glob-0v7.oqalc.b9vf3.5ft2u.2f86m.7oa8v.glob' 0v7.oqalc.b9vf3.5ft2u.2f86m.7oa8v]
::glob-ames+~zod^0v0
base+'grid'
version+[1 1 6]

32
pkg/grid/src/nav/notifications/SystemNotification.tsx
View File

@ -58,15 +58,7 @@ export const BaseBlockedNotification = ({ bin, lid }: { bin: HarkBin, lid: HarkL
const count = blockedCharges.length;
const handlePauseOTAs = useCallback(async () => {
const otaSponsor = basePike?.sync?.ship;
if (!otaSponsor) {
return;
}
await toggleInstall('base', otaSponsor);
await useHarkStore.getState().archiveNote(bin, lid);
push('/leap/upgrading');
}, []);
const handleArchiveApps = useCallback(async () => {
@ -94,12 +86,12 @@ export const BaseBlockedNotification = ({ bin, lid }: { bin: HarkBin, lid: HarkL
<AppList apps={blockedCharges} labelledBy="blocked-apps" size="xs" className="font-medium" />
<div className="space-y-6">
<p>
In order to proceed with the System Update, you’ll need to temporarily archive these apps,
which will render them unusable, but with data intact.
In order to proceed with the System Update, you’ll need to temporarily suspend these apps.
This will render them unusable, but with data intact.
</p>
<p>
Archived apps will automatically un-archive and resume operation when their developer
provides an app update.
Suspended apps will automatically resume operation when their developer
provides an update.
</p>
</div>
<div className="space-x-2">
@ -110,30 +102,24 @@ export const BaseBlockedNotification = ({ bin, lid }: { bin: HarkBin, lid: HarkL
className="space-y-6 text-base tracking-tight"
containerClass="w-full max-w-md"
>
<h2 className="h4">Skip System Update</h2>
<h2 className="h4">Delay System Update</h2>
<p>
Skipping the application for an incoming System Update will grant you the ability to
continue using incompatible apps at the cost of an urbit that&apos;s not up to date.
</p>
<p>
You can choose to apply System Updates from System Preferences any time.{' '}
<a href="https://tlon.io" target="_blank" rel="noreferrer">
Learn More
</a>
Are you sure you want to remain on an old version of Urbit
until these apps have been updated?
</p>
<div className="flex space-x-6">
<DialogClose as={Button} variant="secondary">
Cancel
</DialogClose>
<DialogClose as={Button} variant="caution" onClick={handlePauseOTAs}>
Pause OTAs
Remain on Old Version
</DialogClose>
</div>
</DialogContent>
</Dialog>
<Dialog>
<DialogTrigger as={NotificationButton}>
Archive ({count}) apps and Apply System Update
Suspend ({count}) Apps and Apply Update
</DialogTrigger>
<DialogContent
showClose={false}