diff --git a/src/features/ui/components/modals/nostr-signin-modal/nostr-signin-modal.tsx b/src/features/ui/components/modals/nostr-signin-modal/nostr-signin-modal.tsx index 69f0852aa..b31ac38b0 100644 --- a/src/features/ui/components/modals/nostr-signin-modal/nostr-signin-modal.tsx +++ b/src/features/ui/components/modals/nostr-signin-modal/nostr-signin-modal.tsx @@ -1,4 +1,3 @@ -import { NostrSigner } from '@soapbox/nspec'; import React, { useState } from 'react'; import AccountStep from './steps/account-step'; @@ -16,8 +15,6 @@ interface INostrSigninModal { const NostrSigninModal: React.FC = ({ onClose }) => { const [step, setStep] = useState(window.nostr ? 'extension' : 'identity'); - - const [, setSigner] = useState(); const [accountId, setAccountId] = useState(); const handleClose = () => onClose('NOSTR_SIGNIN'); @@ -28,11 +25,11 @@ const NostrSigninModal: React.FC = ({ onClose }) => { case 'identity': return ; case 'key': - return ; + return ; case 'key-add': - return ; + return ; case 'keygen': - return ; + return ; case 'account': return ; default: diff --git a/src/features/ui/components/modals/nostr-signin-modal/steps/key-add-step.tsx b/src/features/ui/components/modals/nostr-signin-modal/steps/key-add-step.tsx index d44c7accd..ea3e6e9ba 100644 --- a/src/features/ui/components/modals/nostr-signin-modal/steps/key-add-step.tsx +++ b/src/features/ui/components/modals/nostr-signin-modal/steps/key-add-step.tsx @@ -1,4 +1,3 @@ -import { NostrSigner } from '@soapbox/nspec'; import { getPublicKey, nip19 } from 'nostr-tools'; import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; @@ -12,12 +11,11 @@ import { Step } from '../nostr-signin-modal'; interface IKeyAddStep { setAccountId(accountId: string): void; - setSigner(signer: NostrSigner): void; setStep(step: Step): void; onClose(): void; } -const KeyAddStep: React.FC = ({ setAccountId, setSigner, setStep, onClose }) => { +const KeyAddStep: React.FC = ({ setAccountId, setStep, onClose }) => { const [nsec, setNsec] = useState(''); const [error, setError] = useState(); @@ -32,9 +30,8 @@ const KeyAddStep: React.FC = ({ setAccountId, setSigner, setStep, o if (result.type === 'nsec') { const seckey = result.data; const pubkey = getPublicKey(seckey); - const signer = NKeys.add(seckey); + NKeys.add(seckey); setAccountId(pubkey); - setSigner(signer); setStep('account'); } } catch (e) { diff --git a/src/features/ui/components/modals/nostr-signin-modal/steps/keygen-step.tsx b/src/features/ui/components/modals/nostr-signin-modal/steps/keygen-step.tsx index d8bc2cc2e..506a1313b 100644 --- a/src/features/ui/components/modals/nostr-signin-modal/steps/keygen-step.tsx +++ b/src/features/ui/components/modals/nostr-signin-modal/steps/keygen-step.tsx @@ -1,4 +1,3 @@ -import { NostrSigner } from '@soapbox/nspec'; import { generateSecretKey, getPublicKey, nip19 } from 'nostr-tools'; import React, { useEffect, useMemo, useState } from 'react'; import { FormattedMessage } from 'react-intl'; @@ -16,12 +15,11 @@ import { Step } from '../nostr-signin-modal'; interface IKeygenStep { setAccountId(accountId: string): void; - setSigner(signer: NostrSigner): void; setStep(step: Step): void; onClose(): void; } -const KeygenStep: React.FC = ({ setAccountId, setSigner, setStep, onClose }) => { +const KeygenStep: React.FC = ({ setAccountId, setStep, onClose }) => { const instance = useInstance(); const dispatch = useAppDispatch(); @@ -46,8 +44,7 @@ const KeygenStep: React.FC = ({ setAccountId, setSigner, setStep, o const handleCopy = () => setDownloaded(true); const handleNext = () => { - const signer = NKeys.add(secretKey); - setSigner(signer); + NKeys.add(secretKey); setAccountId(pubkey); // HACK: Ditto uses pubkeys as account IDs. setStep('account'); };