diff --git a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte index 9b17a9969..b39ff02e5 100644 --- a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte +++ b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte @@ -84,13 +84,10 @@ onMount(() => { return () => { disposed = true; cleanup?.(); + cancelScan(); }; }); -onDestroy(async () => { - await cancelScan(); -}); - $effect(() => { console.log( "🔍 DEBUG: selectedBlindVoteOption changed to:", @@ -223,3 +220,9 @@ function handleRevealDrawerOpenChange(value: boolean) { onReveal={handleRevealVote} onOpenChange={handleRevealDrawerOpenChange} /> + + diff --git a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/AuthDrawer.svelte b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/AuthDrawer.svelte index e04f97418..b07a2fc17 100644 --- a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/AuthDrawer.svelte +++ b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/AuthDrawer.svelte @@ -1,5 +1,4 @@ - -
-
+{#if internalOpen} +
- -
+ class="flex flex-col justify-between min-h-full w-full max-w-md mx-auto" + > +
+
+
+
+ +
-

Code scanned!

-

You're trying to access the following site

+

Code scanned!

+

+ Please review the connection details below. +

-
-

Platform Name

-

- {platform ?? "Unable to get name"} -

-
+
+ + + + + -
-

Website URL

-

- {hostname ?? scannedContent} -

-
+ + + + +
+
+ Platform Name +
+
+ {platform ?? "Unable to get name"} +
+
+
+ Website URL +
+
+ {hostname ?? scannedContent} +
+
+
- {#if authError} -
-
-
- - - -
-
-

Error

-
- {authError} +
+
+ + + +
+
+

+ Error +

+
+ {authError} +
+
+
+ {/if} +
+ +
+
+ {#if authError} + + Okay + + {:else} + + Decline + + + {#if authLoading} + Authenticating... + {:else} + Confirm + {/if} + + {/if}
+ + {#if isSigningRequest === false} +
+

+ After confirmation, you may return to {platform} and continue there +

+
+ {/if}
- {/if} - -
- {#if authError} - - Okay - - {:else} - - Decline - - - {#if authLoading} - Authenticating... - {:else} - Confirm - {/if} - - {/if}
- - {#if isSigningRequest === false} -
-

- After confirmation, you may return to {platform} and continue - there -

-
- {/if} - - +{/if} diff --git a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/LoggedInDrawer.svelte b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/LoggedInDrawer.svelte index 25e59e340..bf198e5a8 100644 --- a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/LoggedInDrawer.svelte +++ b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/LoggedInDrawer.svelte @@ -1,5 +1,4 @@ - +{#if internalOpen} - -

You're logged in!

-

You're now connected to {platform}

+ class="flex flex-col justify-between min-h-full w-full max-w-md mx-auto" + > +
+
+
+
+ +
-
- {#if redirect && platform} -
-

- You may return to {platform} and continue there +

+ You're logged in! +

+

+ You're now connected to {platform ?? "the platform"}

+
+ {#if redirect && platform} +
+

+ You may return to {platform} and + continue there +

+
+ {/if} +
- {/if} - - Ok - +
+ + Ok + +
+
- - +{/if} diff --git a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/RevealDrawer.svelte b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/RevealDrawer.svelte index a9010e566..e0c547f82 100644 --- a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/RevealDrawer.svelte +++ b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/RevealDrawer.svelte @@ -1,9 +1,7 @@ - - {#if revealSuccess && revealedVoteData} -
-

- You voted for: {revealedVoteData.chosenOption} -

-

- Poll ID: {revealedVoteData.pollId} -

-
- -
- - Okay - -
- {:else} +{#if internalOpen} +
-
-
- -
+
+
+
+
+ +
-

Reveal Your Blind Vote

-

- You're about to reveal your blind vote for poll: {revealPollId} -

+ {#if revealSuccess && revealedVoteData} +

+ Vote Decrypted +

+

+ Your selection has been successfully retrieved. +

-
-

- Note: Revealing your vote will show your choice locally - in this wallet. This action cannot be undone. -

-
+
+
+

+ Selection +

+

+ {revealedVoteData.chosenOption} +

+
+

+ Poll ID: {revealedVoteData.pollId} +

+
+
+ {:else} +

Reveal Your Blind Vote

+

+ Please review the request details below. +

+ +
+
+ + + + + + +
+
+ Poll ID +
+
+ {revealPollId ?? "Unknown"} +
+
+
+ +
+

+ Note: This action will decrypt your + choice locally. This cannot be undone and will be + visible on this screen. +

+
- {#if revealError} -
-

- {revealError} -

+ {#if revealError} +
+

+ {revealError} +

+
+ {/if} +
+ {/if}
- {/if} -
- - Cancel - - - {#if isRevealingVote} - Revealing... +
+ {#if revealSuccess} + + Okay + {:else} - Reveal Vote +
+ + Cancel + + + {isRevealingVote ? "Revealing..." : "Reveal"} + +
{/if} - +
- {/if} - - +
+{/if} diff --git a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/SigningDrawer.svelte b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/SigningDrawer.svelte index 387364a07..ef632003a 100644 --- a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/SigningDrawer.svelte +++ b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/components/SigningDrawer.svelte @@ -1,9 +1,7 @@ - - {#if showSigningSuccess} -
-
-
- -
- -

- {#if isBlindVotingRequest} - Blind Vote Submitted Successfully! - {:else if signingData?.pollId} - Vote Signed Successfully! - {:else} - Message Signed Successfully! - {/if} -

-

- {#if isBlindVotingRequest} - Your blind vote has been submitted and is now completely hidden using - cryptographic commitments. - {:else if signingData?.pollId} - Your vote has been signed and submitted to the voting system. - {:else} - Your message has been signed and submitted successfully. - {/if} -

- -
- - Okay - -
- {:else} +{#if internalOpen} + +{/if} diff --git a/platforms/group-charter-manager/next-env.d.ts b/platforms/group-charter-manager/next-env.d.ts deleted file mode 100644 index 1b3be0840..000000000 --- a/platforms/group-charter-manager/next-env.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// -/// - -// NOTE: This file should not be edited -// see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/platforms/pictique/src/routes/(protected)/+layout.svelte b/platforms/pictique/src/routes/(protected)/+layout.svelte index 63dd40ce0..2de8e230f 100644 --- a/platforms/pictique/src/routes/(protected)/+layout.svelte +++ b/platforms/pictique/src/routes/(protected)/+layout.svelte @@ -197,8 +197,8 @@ core concepts of the W3DS ecosystem.

- It is not a production-grade platform and may lack full reliability, performance, - and security guarantees. + It is not a production-grade platform and may lack full reliability, performance, and + security guarantees.

We strongly recommend that you avoid sharing sensitive or private content, diff --git a/platforms/pictique/src/routes/(protected)/group/[id]/+page.svelte b/platforms/pictique/src/routes/(protected)/group/[id]/+page.svelte index 3db8438df..76048abff 100644 --- a/platforms/pictique/src/routes/(protected)/group/[id]/+page.svelte +++ b/platforms/pictique/src/routes/(protected)/group/[id]/+page.svelte @@ -156,13 +156,13 @@ {@const nextMessage = index < messages.length - 1 ? messages[index + 1] : null} {@const isHeadNeeded = Boolean( !prevMessage || - prevMessage.isOwn !== msg.isOwn || - (prevMessage.senderId && msg.senderId && prevMessage.senderId !== msg.senderId) + prevMessage.isOwn !== msg.isOwn || + (prevMessage.senderId && msg.senderId && prevMessage.senderId !== msg.senderId) )} {@const isTimestampNeeded = Boolean( !nextMessage || - nextMessage.isOwn !== msg.isOwn || - (nextMessage.senderId && msg.senderId && nextMessage.senderId !== msg.senderId) + nextMessage.isOwn !== msg.isOwn || + (nextMessage.senderId && msg.senderId && nextMessage.senderId !== msg.senderId) )}