Remove signer from NostrContext

environments/review-update-vid-g70vyz/deployments/5013
Alex Gleason 2024-10-29 18:04:05 -05:00
rodzic 46687a0a02
commit 0c4851f4cf
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
2 zmienionych plików z 5 dodań i 6 usunięć

Wyświetl plik

@ -1,12 +1,10 @@
import { NRelay1, NostrSigner } from '@nostrify/nostrify'; import { NRelay1 } from '@nostrify/nostrify';
import React, { createContext, useContext, useState, useEffect } from 'react'; import React, { createContext, useContext, useState, useEffect } from 'react';
import { useSigner } from 'soapbox/hooks/nostr/useSigner';
import { useInstance } from 'soapbox/hooks/useInstance'; import { useInstance } from 'soapbox/hooks/useInstance';
interface NostrContextType { interface NostrContextType {
relay?: NRelay1; relay?: NRelay1;
signer?: NostrSigner;
isRelayLoading: boolean; isRelayLoading: boolean;
} }
@ -18,7 +16,6 @@ interface NostrProviderProps {
export const NostrProvider: React.FC<NostrProviderProps> = ({ children }) => { export const NostrProvider: React.FC<NostrProviderProps> = ({ children }) => {
const { instance } = useInstance(); const { instance } = useInstance();
const { signer } = useSigner();
const [relay, setRelay] = useState<NRelay1>(); const [relay, setRelay] = useState<NRelay1>();
const [isRelayLoading, setIsRelayLoading] = useState(true); const [isRelayLoading, setIsRelayLoading] = useState(true);
@ -44,7 +41,7 @@ export const NostrProvider: React.FC<NostrProviderProps> = ({ children }) => {
}, [relayUrl]); }, [relayUrl]);
return ( return (
<NostrContext.Provider value={{ relay, signer, isRelayLoading }}> <NostrContext.Provider value={{ relay, isRelayLoading }}>
{children} {children}
</NostrContext.Provider> </NostrContext.Provider>
); );

Wyświetl plik

@ -5,6 +5,7 @@ import { Button, Column, Form, FormActions, Stack } from 'soapbox/components/ui'
import { useNostr } from 'soapbox/contexts/nostr-context'; import { useNostr } from 'soapbox/contexts/nostr-context';
import { useNostrReq } from 'soapbox/features/nostr/hooks/useNostrReq'; import { useNostrReq } from 'soapbox/features/nostr/hooks/useNostrReq';
import { useOwnAccount } from 'soapbox/hooks'; import { useOwnAccount } from 'soapbox/hooks';
import { useSigner } from 'soapbox/hooks/nostr/useSigner';
import RelayEditor, { RelayData } from './components/relay-editor'; import RelayEditor, { RelayData } from './components/relay-editor';
@ -15,7 +16,8 @@ const messages = defineMessages({
const NostrRelays = () => { const NostrRelays = () => {
const intl = useIntl(); const intl = useIntl();
const { account } = useOwnAccount(); const { account } = useOwnAccount();
const { relay, signer } = useNostr(); const { relay } = useNostr();
const { signer } = useSigner();
const { events } = useNostrReq( const { events } = useNostrReq(
account?.nostr?.pubkey account?.nostr?.pubkey