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

Merge remote-tracking branch 'origin/main' into nostr-onboarding

This commit is contained in:
Alex Gleason 2024-08-05 14:46:29 -05:00
parent 93a5eef9c6 82c227c630
commit 1683cdbfb7
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/actions/nostr.ts
View File

@ -32,6 +32,8 @@ function logInNostr(pubkey: string, onboard = false) {
dispatch(startOnboarding());
}
dispatch(setNostrPubkey(undefined));
const { access_token } = dispatch(authLoggedIn(token));
return await dispatch(verifyCredentials(access_token as string));
};
@ -48,7 +50,7 @@ function nostrExtensionLogIn() {
};
}
function setNostrPubkey(pubkey: string) {
function setNostrPubkey(pubkey: string | undefined) {
return {
type: NOSTR_PUBKEY_SET,
pubkey,

2
src/components/status-action-bar.tsx
View File

@ -430,7 +430,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
}
}
if (features.federating && !account.local) {
if (features.federating && (status.ditto?.get('external_url') || !account.local)) {
const externalNostrUrl: string | undefined = status.ditto?.get('external_url');
const { hostname: domain } = new URL(externalNostrUrl || status.uri);

2
src/contexts/nostr-context.tsx
View File

@ -28,7 +28,7 @@ export const NostrProvider: React.FC<NostrProviderProps> = ({ children }) => {
const { account } = useOwnAccount();
const url = instance.nostr?.relay;
const accountPubkey = useAppSelector((state) => account?.nostr.pubkey ?? state.meta.pubkey);
const accountPubkey = useAppSelector((state) => state.meta.pubkey ?? account?.nostr.pubkey);
const signer = useMemo(
() => (accountPubkey ? NKeys.get(accountPubkey) : undefined) ?? window.nostr,