From cb482b7118d3d9516edaa751302c820716417325 Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Mon, 26 Feb 2024 16:58:38 -0600 Subject: [PATCH 1/5] messages: missing tlon local channels because of bad initialization --- apps/tlon-web/src/state/groups/groups.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tlon-web/src/state/groups/groups.ts b/apps/tlon-web/src/state/groups/groups.ts index 1b21054a9c..585547a15a 100644 --- a/apps/tlon-web/src/state/groups/groups.ts +++ b/apps/tlon-web/src/state/groups/groups.ts @@ -170,7 +170,7 @@ export function useGroup(flag: string, updating = false): Group | undefined { path: `/groups/${flag}/v1`, options: { enabled: !!flag && flag !== '' && updating && connection, - initialData: group, + placeholderData: group, refetchOnMount: updating, retry: true, // prevents skeleton from flashing on unmount when we have cached data From 96937bc2bcf8a7faaeac9cfb80779af128c08360 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 27 Feb 2024 15:46:31 +0000 Subject: [PATCH 2/5] update glob: [skip actions] --- desk/desk.docket-0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desk/desk.docket-0 b/desk/desk.docket-0 index 5eef8d52a8..ed5ac94e53 100644 --- a/desk/desk.docket-0 +++ b/desk/desk.docket-0 @@ -2,7 +2,7 @@ info+'Start, host, and cultivate communities. Own your communications, organize your resources, and share documents. Tlon is a decentralized platform that offers a full, communal suite of tools for messaging, writing and sharing media with others.' color+0xde.dede image+'https://bootstrap.urbit.org/tlon.svg?v=1' - glob-http+['https://bootstrap.urbit.org/glob-0v1.rg1t1.splal.832pq.9bj2b.qfsh5.glob' 0v1.rg1t1.splal.832pq.9bj2b.qfsh5] + glob-http+['https://bootstrap.urbit.org/glob-0vfhst0.i8lv2.as4pf.709s3.1q1qv.glob' 0vfhst0.i8lv2.as4pf.709s3.1q1qv] base+'groups' version+[5 5 1] website+'https://tlon.io' From 2a4b7f29204ea2b87307fb1b4a786aa248b5f7e2 Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Thu, 29 Feb 2024 18:06:56 -0600 Subject: [PATCH 3/5] groups: better data loading flow --- apps/tlon-web/src/state/groups/groups.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/tlon-web/src/state/groups/groups.ts b/apps/tlon-web/src/state/groups/groups.ts index 585547a15a..1f419026e2 100644 --- a/apps/tlon-web/src/state/groups/groups.ts +++ b/apps/tlon-web/src/state/groups/groups.ts @@ -170,11 +170,8 @@ export function useGroup(flag: string, updating = false): Group | undefined { path: `/groups/${flag}/v1`, options: { enabled: !!flag && flag !== '' && updating && connection, - placeholderData: group, refetchOnMount: updating, retry: true, - // prevents skeleton from flashing on unmount when we have cached data - keepPreviousData: true, }, }); @@ -185,10 +182,10 @@ export function useGroup(flag: string, updating = false): Group | undefined { }, [flag, updating, subscribe]); if (rest.isLoading || rest.isError || data === undefined) { - return undefined; + return group; } - return data; + return data || group; } export function useGroupIsLoading(flag: string) { From b2d72dca8301e2bac25dff1ca80a58c270c9a5ca Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Fri, 1 Mar 2024 16:43:26 -0600 Subject: [PATCH 4/5] ops: correct version --- apps/tlon-web/package.json | 2 +- desk/desk.docket-0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tlon-web/package.json b/apps/tlon-web/package.json index bc05ee808d..a954d117e5 100644 --- a/apps/tlon-web/package.json +++ b/apps/tlon-web/package.json @@ -1,6 +1,6 @@ { "name": "tlon-web", - "version": "5.5.0", + "version": "5.7.0", "private": true, "scripts": { "rube": "tsc ./rube/index.ts --outDir ./rube/dist && node ./rube/dist/index.js", diff --git a/desk/desk.docket-0 b/desk/desk.docket-0 index ed5ac94e53..d18645ecdf 100644 --- a/desk/desk.docket-0 +++ b/desk/desk.docket-0 @@ -4,7 +4,7 @@ image+'https://bootstrap.urbit.org/tlon.svg?v=1' glob-http+['https://bootstrap.urbit.org/glob-0vfhst0.i8lv2.as4pf.709s3.1q1qv.glob' 0vfhst0.i8lv2.as4pf.709s3.1q1qv] base+'groups' - version+[5 5 1] + version+[5 7 0] website+'https://tlon.io' license+'MIT' == From 565259090425938329356d6eed3c05c9776873b2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 1 Mar 2024 23:50:28 +0000 Subject: [PATCH 5/5] update glob: [skip actions] --- desk/desk.docket-0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desk/desk.docket-0 b/desk/desk.docket-0 index d18645ecdf..3b1f6615c8 100644 --- a/desk/desk.docket-0 +++ b/desk/desk.docket-0 @@ -2,7 +2,7 @@ info+'Start, host, and cultivate communities. Own your communications, organize your resources, and share documents. Tlon is a decentralized platform that offers a full, communal suite of tools for messaging, writing and sharing media with others.' color+0xde.dede image+'https://bootstrap.urbit.org/tlon.svg?v=1' - glob-http+['https://bootstrap.urbit.org/glob-0vfhst0.i8lv2.as4pf.709s3.1q1qv.glob' 0vfhst0.i8lv2.as4pf.709s3.1q1qv] + glob-http+['https://bootstrap.urbit.org/glob-0v3.8jng7.14b0h.etnt3.0r6vk.vr4sh.glob' 0v3.8jng7.14b0h.etnt3.0r6vk.vr4sh] base+'groups' version+[5 7 0] website+'https://tlon.io'