Merge branch 'staging'

tloncorp · Mar 6, 2024 · 7b650eb · 7b650eb
2 parents a63cda4 + 5652590
commit 7b650eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git 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/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,
-      initialData: 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) {

diff --git a/desk/desk.docket-0 b/desk/desk.docket-0
@@ -2,9 +2,9 @@
     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-0v3.8jng7.14b0h.etnt3.0r6vk.vr4sh.glob' 0v3.8jng7.14b0h.etnt3.0r6vk.vr4sh]
     base+'groups'
-    version+[5 5 1]
+    version+[5 7 0]
     website+'https://tlon.io'
     license+'MIT'
 ==