Skip to content
Closed
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: 2 additions & 2 deletions infrastructure/eid-wallet/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eid-wallet",
"version": "0.4.0",
"version": "0.5.0",
"description": "",
"type": "module",
"scripts": {
Expand Down Expand Up @@ -83,4 +83,4 @@
"vite-plugin-node-polyfills": "^0.24.0",
"vitest": "^3.0.9"
}
}
}
10 changes: 6 additions & 4 deletions infrastructure/eid-wallet/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "eID for W3DS",
"version": "0.4.0",
"version": "0.5.0",
"identifier": "foundation.metastate.eid-wallet",
"build": {
"beforeDevCommand": "pnpm dev",
Expand All @@ -18,15 +18,17 @@
}
],
"security": {
"capabilities": ["mobile-capability"],
"capabilities": [
"mobile-capability"
],
"csp": null
}
},
"bundle": {
"active": true,
"targets": "all",
"android": {
"versionCode": 12
"versionCode": 20
},
"icon": [
"icons/32x32.png",
Expand All @@ -36,4 +38,4 @@
"icons/icon.ico"
]
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<script lang="ts">
import * as Button from "$lib/ui/Button";
import { cn } from "$lib/utils";
import { toast } from "$lib/ui/Toast/toast";
import {
CheckmarkBadge02Icon,
Upload03Icon,
Copy01Icon,
ViewIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
Expand All @@ -16,7 +17,6 @@ interface IIdentityCard extends HTMLAttributes<HTMLElement> {
variant?: "eName" | "ePassport" | "eVault";
userId?: string;
viewBtn?: () => void;
shareBtn?: () => void;
userData?: userData;
totalStorage?: number;
usedStorage?: number;
Expand All @@ -26,7 +26,6 @@ const {
variant = "eName",
userId,
viewBtn,
shareBtn,
userData,
totalStorage = 0,
usedStorage = 0,
Expand Down Expand Up @@ -68,24 +67,22 @@ const baseClasses = `relative ${variant === "eName" ? "bg-black-900" : variant =
className="text-secondary"
icon={CheckmarkBadge02Icon}
/>
<div class="flex gap-3 items-center">
{#if shareBtn}
<Button.Icon
icon={Upload03Icon}
icon={Copy01Icon}
iconColor={"white"}
strokeWidth={2}
onclick={shareBtn}
onclick={async () => {
if (userId) {
try {
await navigator.clipboard.writeText(userId);
toast.success("eName copied to clipboard");
} catch (error) {
console.error("Failed to copy:", error);
toast.error("Failed to copy eName");
}
}
}}
/>
{/if}
{#if viewBtn}
<Button.Icon
icon={ViewIcon}
iconColor={"white"}
strokeWidth={2}
onclick={viewBtn}
/>
{/if}
</div>
{:else if variant === "ePassport"}
<p
class="bg-white text-black flex items-center leading-0 justify-center rounded-full h-7 px-5 text-xs font-medium"
Expand Down
31 changes: 19 additions & 12 deletions infrastructure/eid-wallet/src/lib/ui/Drawer/Drawer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ const swipe = swipeResult.swipe as any;
// isPaneOpen = false;
// };

// Initialize pane only once when element is available
// Initialize pane
$effect(() => {
if (!drawerElem) return;

pane = new CupertinoPane(drawerElem, {
fitHeight: true,
backdrop: true,
backdropOpacity: dismissible ? 0.5 : 0.8,
backdropBlur: true,
Expand All @@ -72,17 +72,24 @@ $effect(() => {
initialBreak: "bottom",
});

return () => pane?.destroy();
return () => {
if (pane) {
pane.destroy();
}
};
});

// Handle open/close state separately
$effect(() => {
if (!pane) return;
if (!pane || !drawerElem) return;

if (isPaneOpen) {
pane.present({ animate: true });
} else {
pane.destroy({ animate: true });
// Don't destroy, just hide - this keeps the pane available
if (pane.pane) {
pane.hide();
}
}
});
</script>
Expand All @@ -100,21 +107,21 @@ $effect(() => {

<style>
:global(.pane) {
position: fixed !important;
left: 50% !important;
transform: translateX(-50%) !important;
background-color: var(--color-white) !important;
overflow-y: auto !important;
overflow-x: hidden !important;
-webkit-overflow-scrolling: touch;
width: 95% !important;
max-height: 600px !important;
min-height: 250px !important;
height: auto !important;
position: fixed !important;
bottom: 30px !important;
left: 50% !important;
transform: translateX(-50%) !important;
border-radius: 32px !important;
padding-block-start: 50px !important;
padding-block-end: 20px !important;
background-color: var(--color-white) !important;
overflow-y: auto !important; /* vertical scroll if needed */
overflow-x: hidden !important; /* prevent sideways scroll */
-webkit-overflow-scrolling: touch; /* smooth scrolling on iOS */
}

:global(.move) {
Expand Down
95 changes: 95 additions & 0 deletions infrastructure/eid-wallet/src/lib/ui/Toast/Toast.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<script lang="ts">
import { toastStore } from "./toast";
import { cn } from "$lib/utils";
import { Cancel01Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";

let toasts = $state<
Array<{
id: string;
message: string;
type?: "success" | "error" | "info";
duration?: number;
}>
>([]);

$effect(() => {
const unsubscribe = toastStore.subscribe((value) => {
toasts = value;
});
return unsubscribe;
});

function removeToast(id: string) {
toastStore.remove(id);
}

const getToastClasses = (type?: string) => {
switch (type) {
case "success":
return "bg-green-50 border-green-200 text-green-800";
case "error":
return "bg-red-50 border-red-200 text-red-800";
case "info":
default:
return "bg-blue-50 border-blue-200 text-blue-800";
}
};
</script>

<div
class="fixed left-1/2 -translate-x-1/2 z-[9999] flex flex-col gap-2 pointer-events-none w-full max-w-md px-4"
style="top: calc(env(safe-area-inset-top) + 44px);"
>
{#each toasts as toast (toast.id)}
<div
class={cn(
"pointer-events-auto flex items-center justify-between gap-3 rounded-lg border p-4 shadow-lg animate-in slide-in-from-top-2 fade-in",
getToastClasses(toast.type),
)}
role="alert"
>
<p class="text-sm font-medium flex-1">{toast.message}</p>
<button
onclick={() => removeToast(toast.id)}
class="flex-shrink-0 hover:opacity-70 transition-opacity"
aria-label="Close toast"
>
<HugeiconsIcon
icon={Cancel01Icon}
size={20}
strokeWidth={2}
className="text-current"
/>
</button>
</div>
{/each}
</div>

<style>
@keyframes slide-in-from-top-2 {
from {
transform: translateY(-100%);
opacity: 0;
}
to {
transform: translateY(0);
opacity: 1;
}
}

@keyframes fade-in {
from {
opacity: 0;
}
to {
opacity: 1;
}
}

.animate-in {
animation:
slide-in-from-top-2 0.3s ease-out,
fade-in 0.3s ease-out;
}
</style>
Comment on lines 69 to 95
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion | 🟠 Major

Add exit animations for smoother UX.

The component defines entrance animations (slide-in-from-top-2, fade-in) but no exit animations. When a toast is removed, it disappears abruptly, which creates a jarring user experience.

Consider using Svelte's transition directives for smoother enter/exit animations:

+import { fly, fade } from 'svelte/transition';
+
 {#each toasts as toast (toast.id)}
     <div
+        transition:fly={{ y: -20, duration: 300 }}
         class={cn(
-            "pointer-events-auto flex items-center justify-between gap-3 rounded-lg border p-4 shadow-lg animate-in slide-in-from-top-2 fade-in",
+            "pointer-events-auto flex items-center justify-between gap-3 rounded-lg border p-4 shadow-lg",
             getToastClasses(toast.type),
         )}
         role="alert"
     >

Then you can remove the custom CSS animations and use Svelte's built-in transition system.

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents
in infrastructure/eid-wallet/src/lib/ui/Toast/Toast.svelte around lines 61-85,
the component only defines entrance CSS keyframe animations and lacks exit
animations, causing abrupt removals; replace or augment this with Svelte
transitions by importing a built-in transition (e.g., fly or slide/fade) and
apply a transition directive to the toast element (e.g., use:transitionName or
transition:fade with configured params) so the component animates both in and
out, and remove the custom CSS animations if the Svelte transitions cover both
directions to keep styles consistent.

53 changes: 53 additions & 0 deletions infrastructure/eid-wallet/src/lib/ui/Toast/toast.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { writable } from "svelte/store";

export interface Toast {
id: string;
message: string;
type?: "success" | "error" | "info";
duration?: number;
}

const createToastStore = () => {
const { subscribe, update } = writable<Toast[]>([]);

return {
subscribe,
add: (toast: Omit<Toast, "id">) => {
const id = crypto.randomUUID();
const newToast: Toast = {
id,
duration: 3000,
...toast,
};

update((toasts) => [...toasts, newToast]);

// Auto remove after duration
if (newToast.duration && newToast.duration > 0) {
setTimeout(() => {
remove(id);
}, newToast.duration);
}

return id;
},
remove: (id: string) => {
update((toasts) => toasts.filter((t) => t.id !== id));
},
clear: () => {
update(() => []);
},
};
};

export const toastStore = createToastStore();

export const toast = {
success: (message: string, duration?: number) =>
toastStore.add({ message, type: "success", duration }),
error: (message: string, duration?: number) =>
toastStore.add({ message, type: "error", duration }),
info: (message: string, duration?: number) =>
toastStore.add({ message, type: "info", duration }),
};

Loading
Loading