release #306

Merged
b merged 25 commits from staging into main 2025-01-23 18:54:21 +00:00
2 changed files with 7 additions and 8 deletions
Showing only changes of commit a4310675c1 - Show all commits

View File

@ -69,7 +69,7 @@ const FileList = ({
color={'var(--mui-palette-primary-main)'}
icon={faLock}
/>
  EXPORT (encrypted)
  ENCRYPTED
</MenuItem>
)}
{typeof handleExport === 'function' && (
@ -83,7 +83,7 @@ const FileList = ({
color={'var(--mui-palette-primary-main)'}
icon={faTriangleExclamation}
/>
&nbsp; EXPORT (unencrypted)
&nbsp; UNENCRYPTED
</MenuItem>
)}
</Menu>

View File

@ -8,7 +8,6 @@ import {
Tooltip
} from '@mui/material'
import type { Identifier, XYCoord } from 'dnd-core'
import saveAs from 'file-saver'
import JSZip from 'jszip'
import { useCallback, useEffect, useRef, useState } from 'react'
import { DndProvider, useDrag, useDrop } from 'react-dnd'
@ -928,7 +927,6 @@ export const CreatePage = () => {
})
const isFirstSigner = signers[0].pubkey === usersPubkey
if (isFirstSigner) {
navigate(appPrivateRoutes.sign, { state: { meta } })
} else {
@ -1001,15 +999,16 @@ export const CreatePage = () => {
return
}
saveAs(finalZipFile, `request-${unixNow()}.sigit.zip`)
// If user is the next signer, we can navigate directly to sign page
if (signers[0].pubkey === usersPubkey) {
const isFirstSigner = signers[0].pubkey === usersPubkey
if (isFirstSigner) {
navigate(appPrivateRoutes.sign, {
state: { arrayBuffer }
})
} else {
navigate(appPrivateRoutes.homePage)
navigate(appPublicRoutes.verify, {
state: { uploadedZip: arrayBuffer }
})
}
} catch (error) {
if (error instanceof Error) {