Merge in latest from develop

Adamj1232 · Adamj1232 · commit 5bd088b95070 · 2022-06-30T14:31:24.000-06:00
diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts
@@ -51,7 +51,8 @@ const useAppState: {
     return stateKey ? snapshot[stateKey] : snapshot
   }, [stateKey])
 
-  return useSyncExternalStore(subscribe, getSnapshot)
+  const getServerSnapshot = () => get() || getSnapshot;
+  return useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);
 }
 
 export const useConnectWallet = (): [

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ const useAppState: {`
`51`	`51`	`return stateKey ? snapshot[stateKey] : snapshot`
`52`	`52`	`}, [stateKey])`
`53`	`53`
`54`		`- return useSyncExternalStore(subscribe, getSnapshot)`
	`54`	`+ const getServerSnapshot = () => get() \|\| getSnapshot;`
	`55`	`+ return useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`export const useConnectWallet = (): [`