moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-bunker-load' into 'main' 

Fix infinite loading when signed in with bunker URI

Closes #1767

See merge request soapbox-pub/soapbox!3177
This commit is contained in:
Alex Gleason 2024-10-22 21:10:15 +00:00
parent d6fb1a4c93 db203bcb56
commit eb54495c10
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/init/soapbox-load.tsx
View File

@ -44,7 +44,7 @@ const SoapboxLoad: React.FC<ISoapboxLoad> = ({ children }) => {
const [localeLoading, setLocaleLoading] = useState(true); const [localeLoading, setLocaleLoading] = useState(true);
const [isLoaded, setIsLoaded] = useState(false); const [isLoaded, setIsLoaded] = useState(false);
const { hasNostr, isRelayOpen } = useNostr(); const { hasNostr, isRelayOpen, signer } = useNostr();
const { isSubscribed } = useSignerStream(); const { isSubscribed } = useSignerStream();
/** Whether to display a loading indicator. */ /** Whether to display a loading indicator. */
@ -55,7 +55,7 @@ const SoapboxLoad: React.FC<ISoapboxLoad> = ({ children }) => {
localeLoading, localeLoading,
instance.isLoading, instance.isLoading,
swUpdating, swUpdating,
hasNostr && me && (!isRelayOpen || !isSubscribed), hasNostr && me && signer && (!isRelayOpen || !isSubscribed),
].some(Boolean); ].some(Boolean);
// Load the user's locale // Load the user's locale