sigit/sigit.io
6
2
Fork 0
Code Issues 41 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: sigit:a1bf88d243c4fd2695022f99dff260980a5148b1
Branches Tags
sigit:staging
sigit:hotfix-nostr-discovery-error-9-20
sigit:201-toolbox-update
sigit:main
sigit:issue-171
sigit:issue-168
sigit:signing-page-design
sigit:issue-99
sigit:issue-99-signing-page-refactor
sigit:relay-management-fixed
sigit:relays-management
sigit:issue-38
..
compare: sigit:f81f2b05230cb9038d24a1303edccda84b74b533
Branches Tags
sigit:hotfix-nostr-discovery-error-9-20
sigit:201-toolbox-update
sigit:staging
sigit:main
sigit:issue-171
sigit:issue-168
sigit:signing-page-design
sigit:issue-99
sigit:issue-99-signing-page-refactor
sigit:relay-management-fixed
sigit:relays-management
sigit:issue-38

No commits in common. "a1bf88d243c4fd2695022f99dff260980a5148b1" and "f81f2b05230cb9038d24a1303edccda84b74b533" have entirely different histories.
a1bf88d243 ... f81f2b0523

1 changed files with 57 additions and 61 deletions
Show Stats Expand all files Collapse all files

118
src/components/DrawPDFFields/index.tsx
View File

@ -37,9 +37,6 @@ interface Props {
export const DrawPDFFields = (props: Props) => { export const DrawPDFFields = (props: Props) => {
const { selectedFiles, selectedTool, onDrawFieldsChange, users } = props const { selectedFiles, selectedTool, onDrawFieldsChange, users } = props
const signers = users.filter((u) => u.role === UserRole.signer)
const defaultSignerNpub = signers.length ? hexToNpub(signers[0].pubkey) : ''
const [lastSigner, setLastSigner] = useState(defaultSignerNpub)
const { to, from } = useScale() const { to, from } = useScale()
const [sigitFiles, setSigitFiles] = useState<SigitFile[]>([]) const [sigitFiles, setSigitFiles] = useState<SigitFile[]>([])
@ -118,7 +115,7 @@ export const DrawPDFFields = (props: Props) => {
top: to(page.width, y), top: to(page.width, y),
width: event.pointerType === 'mouse' ? 0 : DEFAULT_START_SIZE.width, width: event.pointerType === 'mouse' ? 0 : DEFAULT_START_SIZE.width,
height: event.pointerType === 'mouse' ? 0 : DEFAULT_START_SIZE.height, height: event.pointerType === 'mouse' ? 0 : DEFAULT_START_SIZE.height,
counterpart: lastSigner, counterpart: '',
type: selectedTool.identifier type: selectedTool.identifier
} }
@ -456,15 +453,9 @@ export const DrawPDFFields = (props: Props) => {
<FormControl fullWidth size="small"> <FormControl fullWidth size="small">
<InputLabel id="counterparts">Counterpart</InputLabel> <InputLabel id="counterparts">Counterpart</InputLabel>
<Select <Select
value={ value={drawnField.counterpart}
drawnField.counterpart ||
lastSigner ||
defaultSignerNpub ||
''
}
onChange={(event) => { onChange={(event) => {
drawnField.counterpart = event.target.value drawnField.counterpart = event.target.value
setLastSigner(event.target.value)
refreshPdfFiles() refreshPdfFiles()
}} }}
labelId="counterparts" labelId="counterparts"
@ -474,47 +465,52 @@ export const DrawPDFFields = (props: Props) => {
}} }}
renderValue={(value) => renderCounterpartValue(value)} renderValue={(value) => renderCounterpartValue(value)}
> >
{signers.map((signer, index) => { {users
const npub = hexToNpub(signer.pubkey) .filter((u) => u.role === UserRole.signer)
let displayValue = truncate(npub, { .map((user, index) => {
length: 16 const npub = hexToNpub(user.pubkey)
}) let displayValue = truncate(npub, {
length: 16
})
const metadata = props.metadata[signer.pubkey] const metadata = props.metadata[user.pubkey]
if (metadata) { if (metadata) {
displayValue = truncate( displayValue = truncate(
metadata.name || metadata.name ||
metadata.display_name || metadata.display_name ||
metadata.username || metadata.username ||
npub, npub,
{ {
length: 16 length: 16
} }
)
}
return (
<MenuItem
key={index}
value={hexToNpub(user.pubkey)}
>
<ListItemIcon>
<AvatarIconButton
src={metadata?.picture}
hexKey={user.pubkey}
aria-label={`account of user ${displayValue}`}
color="inherit"
sx={{
padding: 0,
'> img': {
width: '30px',
height: '30px'
}
}}
/>
</ListItemIcon>
<ListItemText>{displayValue}</ListItemText>
</MenuItem>
) )
} })}
return (
<MenuItem key={index} value={npub}>
<ListItemIcon>
<AvatarIconButton
src={metadata?.picture}
hexKey={signer.pubkey}
aria-label={`account of user ${displayValue}`}
color="inherit"
sx={{
padding: 0,
'> img': {
width: '30px',
height: '30px'
}
}}
/>
</ListItemIcon>
<ListItemText>{displayValue}</ListItemText>
</MenuItem>
)
})}
</Select> </Select>
</FormControl> </FormControl>
</div> </div>
@ -528,28 +524,28 @@ export const DrawPDFFields = (props: Props) => {
) )
} }
const renderCounterpartValue = (npub: string) => { const renderCounterpartValue = (value: string) => {
let displayValue = truncate(npub, { const user = users.find((u) => u.pubkey === npubToHex(value))
length: 16 if (user) {
}) let displayValue = truncate(value, {
length: 16
})
const metadata = props.metadata[user.pubkey]
const signer = signers.find((u) => u.pubkey === npubToHex(npub))
if (signer) {
const metadata = props.metadata[signer.pubkey]
if (metadata) { if (metadata) {
displayValue = truncate( displayValue = truncate(
metadata.display_name || metadata.name || npub, metadata.name || metadata.display_name || metadata.username || value,
{ {
length: 16 length: 16
} }
) )
} }
return ( return (
<> <>
<AvatarIconButton <AvatarIconButton
src={props.metadata[signer.pubkey]?.picture} src={props.metadata[user.pubkey]?.picture}
hexKey={signer.pubkey || undefined} hexKey={npubToHex(user.pubkey) || undefined}
sx={{ sx={{
padding: 0, padding: 0,
marginRight: '6px', marginRight: '6px',
@ -564,7 +560,7 @@ export const DrawPDFFields = (props: Props) => {
) )
} }
return displayValue return value
} }
if (parsingPdf) { if (parsingPdf) {