Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/components/atoms/AdditionalInfoActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,7 @@ export default function AdditionalInfoActions({
disabled={disabled || busy !== null}
onClick={provideExtrasSameDevice}
>
{busy === 'provide'
? 'Starting…'
: 'Provide additional qualifications (Same Device)'}
{busy === 'provide' ? 'Starting…' : 'Provide additional qualifications'}
</Button>
)}
{/* Only show QR Code button on desktop */}
Expand Down
2 changes: 1 addition & 1 deletion src/components/atoms/ApplyCrossDeviceButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function ApplyCrossDeviceButton({ jobId }: { jobId: string }) {
color="primary"
startIcon={!pending ? <QrCode2OutlinedIcon /> : undefined}
>
{pending ? <CircularProgress size={20} /> : 'Apply (cross device)'}
{pending ? <CircularProgress size={20} /> : 'Apply'}
</Button>
);
}
2 changes: 1 addition & 1 deletion src/components/atoms/ApplySameDeviceButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function ApplySameDeviceButton({ jobId }: { jobId: string }) {
color="secondary" // your yellow/orange
startIcon={!pending ? <AccountBalanceWalletOutlinedIcon /> : undefined}
>
{pending ? <CircularProgress size={20} /> : 'Apply (same device)'}
{pending ? <CircularProgress size={20} /> : 'Apply'}
</Button>
);
}
2 changes: 1 addition & 1 deletion src/components/atoms/EmployeeIssuanceActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export default function EmployeeIssuanceActions({ applicationId }: { application
disabled={busy}
onClick={() => issueEmployeeCredential('same-device')}
>
{busy ? 'Issuing…' : 'Issue Employee ID (Same Device)'}
{busy ? 'Issuing…' : 'Issue Employee ID'}
</Button>
)}
{/* Only show QR Code button on desktop */}
Expand Down
18 changes: 9 additions & 9 deletions src/components/atoms/LogoBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@ export default function LogoBox() {
mb: 2,
bgcolor: 'white',
p: 2,
pb: '25px',
border: 1,
borderColor: 'divider',
display: 'flex',
flexDirection: 'row',
gap: 3,
gap: 2,
alignItems: 'center',
justifyContent: 'center',
overflow: 'hidden',
}}
>
<Image
src="/logo-european-commission.svg"
alt="European Commission"
width={180}
height={80}
width={160}
height={70}
priority
style={{ objectFit: 'contain', marginLeft: '-16px' }}
style={{ objectFit: 'contain' }}
/>
<Box sx={{ width: '2px', height: '26px', bgcolor: 'primary.main', marginTop: '20px' }} />
<Box sx={{ width: '2px', height: '40px', bgcolor: 'primary.main' }} />
<Image
src="/eudi-wallet-official.svg"
alt="EU Digital Identity Wallet"
width={140}
height={50}
width={130}
height={45}
priority
style={{ objectFit: 'contain', marginTop: '33px' }}
style={{ objectFit: 'contain' }}
/>
</Box>
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/atoms/SigningActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export default function SigningActions({
disabled={busy}
onClick={startCrossDevice}
>
Sign contract (Cross Device)
Sign contract
</Button>
)}
{/* Only show Same Device button on mobile */}
Expand All @@ -160,7 +160,7 @@ export default function SigningActions({
disabled={busy}
onClick={startSameDevice}
>
{busy ? 'Starting…' : 'Sign contract (Same Device)'}
{busy ? 'Starting…' : 'Sign contract'}
</Button>
)}
</Stack>
Expand Down
2 changes: 1 addition & 1 deletion src/components/atoms/TaxResidencyActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export default function TaxResidencyActions({ applicationId }: { applicationId:
disabled={busy !== null}
onClick={provideTaxResidencySameDevice}
>
{busy === 'same' ? 'Starting…' : 'Provide Tax Residency (Same Device)'}
{busy === 'same' ? 'Starting…' : 'Provide Tax Residency'}
</Button>
)}
{/* Only show QR Code button on desktop */}
Expand Down
14 changes: 12 additions & 2 deletions src/components/organisms/VacancyApplicationSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import AccountBalanceWalletIcon from '@mui/icons-material/AccountBalanceWallet';
import { Box, Chip, Stack, Typography } from '@mui/material';
import { useState, useEffect } from 'react';
import { isMobile } from 'react-device-detect';

import ApplyCrossDeviceButton from '@/components/atoms/ApplyCrossDeviceButton';
import ApplySameDeviceButton from '@/components/atoms/ApplySameDeviceButton';
Expand All @@ -20,6 +22,12 @@ export default function VacancyApplicationSection({
vacancyId,
requiredCredentials,
}: VacancyApplicationSectionProps) {
const [mounted, setMounted] = useState(false);

useEffect(() => {
setMounted(true);
}, []);

// Filter out basic credentials (NONE, PID)
const optionalCredentials = requiredCredentials.filter(
(cred) => cred !== 'NONE' && cred !== 'PID',
Expand Down Expand Up @@ -64,8 +72,10 @@ export default function VacancyApplicationSection({
)}

<Stack spacing={2}>
<ApplySameDeviceButton jobId={vacancyId} />
<ApplyCrossDeviceButton jobId={vacancyId} />
{/* Only show Same Device button on mobile */}
{mounted && isMobile && <ApplySameDeviceButton jobId={vacancyId} />}
{/* Only show Cross Device button on desktop */}
{mounted && !isMobile && <ApplyCrossDeviceButton jobId={vacancyId} />}
</Stack>
</Box>
);
Expand Down
5 changes: 5 additions & 0 deletions src/core/infrastructure/adapters/http/EudiVerifierAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ export class EudiVerifierAdapter implements IVerifierPort {
});

this.logger.info('Payload for verifier', { payload: JSON.stringify(payload, null, 2) });
console.log('=== REDIRECT URI TEMPLATE DEBUG ===');
console.log('Template:', payload.wallet_response_redirect_uri_template);
console.log('Same device:', sameDeviceFlow);
console.log('Full payload:', JSON.stringify(payload, null, 2));
console.log('===================================');
const verifierUrl = `${env.VERIFIER_API_URL}/ui/presentations`;
this.logger.info('Making request to verifier URL', { verifierUrl });

Expand Down