nostr/primal-web-app
1
0
Fork 0
mirror of https://github.com/PrimalHQ/primal-web-app.git synced 2024-10-01 17:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix relay connecting

Browse Source
This commit is contained in:
Bojan Mojsilovic 2024-03-12 13:07:58 +01:00
parent a194aaa04f
commit 570bd592e2
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/contexts/AccountContext.tsx
View File

@ -337,7 +337,6 @@ export function AccountProvider(props: { children: JSXElement }) {
const defaultRelays = getPreConfiguredRelays();
return { ...relaySettings, ...defaultRelays };
};
const setConnectToPrimaryRelays = (flag: boolean) => {
@ -505,6 +504,7 @@ export function AccountProvider(props: { children: JSXElement }) {
const relay: NostrRelays = { [url]: { write: true, read: true }};
setRelaySettings(relay);
connectToRelays(relay)
// Remove relay from the list of explicitly closed relays
relaysExplicitlyClosed = relaysExplicitlyClosed.filter(u => u !== url);
@ -1259,7 +1259,18 @@ export function AccountProvider(props: { children: JSXElement }) {
const storage = getStorage(pubkey);
let relaySettings = { ...storage.relaySettings };
updateStore('relaySettings', () => ({ ...storage.relaySettings }));
if (Object.keys(relaySettings).length > 0) {
connectToRelays(relaySettings);
return;
}
if (store.isKeyLookupDone && store.publicKey) {
relaySettings = { ...getStorage(store.publicKey).relaySettings };
connectToRelays(relaySettings);
return;
}
});
createEffect(() => {
@ -1314,21 +1325,6 @@ export function AccountProvider(props: { children: JSXElement }) {
}
});
createEffect(() => {
let relaySettings = { ...store.relaySettings };
if (Object.keys(relaySettings).length > 0) {
connectToRelays(relaySettings);
return;
}
if (store.isKeyLookupDone && store.publicKey) {
relaySettings = { ...getStorage(store.publicKey).relaySettings };
connectToRelays(relaySettings);
return;
}
});
createEffect(() => {
const rels: string[] = import.meta.env.PRIMAL_PRIORITY_RELAYS?.split(',') || [];