sigit/sigit.io
7
2
Fork 0
Code Issues 46 Pull Requests 4 Actions Packages Projects 1 Releases Wiki Activity

fix: Opening a sigit asks you to sign when you are not the next signer #285

Merged
b merged 4 commits from issue-281 into staging 2024-12-24 10:02:36 +00:00
Conversation 1 Commits 4 Files Changed 2 +12 -5
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/DisplaySigit/index.tsx
View File

@ -47,12 +47,12 @@ export const DisplaySigit = ({
const { extensions, isSame } = extractFileExtensions(Object.keys(fileHashes)) const { extensions, isSame } = extractFileExtensions(Object.keys(fileHashes))
const currentUserNpub: string = usersPubkey ? hexToNpub(usersPubkey) : '' const currentUserNpub: string = usersPubkey ? hexToNpub(usersPubkey) : ''
const currentUserSigned = const currentUserNextSigner =
signersStatus[currentUserNpub as `npub1${string}`] === SignStatus.Signed signersStatus[currentUserNpub as `npub1${string}`] === SignStatus.Awaiting
return ( return (
<div className={styles.itemWrapper}> <div className={styles.itemWrapper}>
{signedStatus === SigitStatus.Complete || currentUserSigned ? ( {signedStatus === SigitStatus.Complete || !currentUserNextSigner ? (
<Link <Link
to={`${appPublicRoutes.verify}/${sigitCreateId}`} to={`${appPublicRoutes.verify}/${sigitCreateId}`}
className={styles.insetLink} className={styles.insetLink}

9
src/pages/create/index.tsx
View File

@ -25,7 +25,7 @@ import {
NostrController, NostrController,
RelayController RelayController
} from '../../controllers' } from '../../controllers'
import { appPrivateRoutes } from '../../routes' import { appPrivateRoutes, appPublicRoutes } from '../../routes'
import { import {
CreateSignatureEventContent, CreateSignatureEventContent,
KeyboardCode, KeyboardCode,
@ -950,7 +950,14 @@ export const CreatePage = () => {
toast.error('Failed to publish notifications') toast.error('Failed to publish notifications')
}) })
const isFirstSigner = signers[0].pubkey === usersPubkey
if (isFirstSigner) {
navigate(appPrivateRoutes.sign, { state: { meta } }) navigate(appPrivateRoutes.sign, { state: { meta } })
} else {
const createSignatureJson = JSON.parse(createSignature)
navigate(`${appPublicRoutes.verify}/${createSignatureJson.id}`)
}
} else { } else {
const zip = new JSZip() const zip = new JSZip()