fix: pictique groups

Author: coodos

infrastructure/eid-wallet/src-tauri/gen/android/.idea/gradle.xml

@@ -1,47 +1,100 @@
 <script lang="ts">
-import { goto } from "$app/navigation";
-import { SettingsNavigationBtn } from "$lib/fragments";
-import type { GlobalState } from "$lib/global";
-import { runtime } from "$lib/global/runtime.svelte";
-import { ButtonAction, Drawer } from "$lib/ui";
-import {
-    Key01Icon,
-    LanguageSquareIcon,
-    Link02Icon,
-    PinCodeIcon,
-    Shield01Icon,
-} from "@hugeicons/core-free-icons";
-import { getContext } from "svelte";
-
-const globalState = getContext<() => GlobalState>("globalState")();
-
-let isDeleteConfirmationOpen = $state(false);
-let isFinalConfirmationOpen = $state(false);
-
-function showDeleteConfirmation() {
-    isDeleteConfirmationOpen = true;
-}
-
-function confirmDelete() {
-    isDeleteConfirmationOpen = false;
-    isFinalConfirmationOpen = true;
-}
-
-function nukeWallet() {
-    globalState.userController.user = undefined;
-    globalState.securityController.clearPin();
-    isFinalConfirmationOpen = false;
-    goto("/onboarding");
-}
-
-function cancelDelete() {
-    isDeleteConfirmationOpen = false;
-    isFinalConfirmationOpen = false;
-}
-
-$effect(() => {
-    runtime.header.title = "Settings";
-});
+    import { goto } from "$app/navigation";
+    import { SettingsNavigationBtn } from "$lib/fragments";
+    import type { GlobalState } from "$lib/global";
+    import { runtime } from "$lib/global/runtime.svelte";
+    import { ButtonAction, Drawer } from "$lib/ui";
+    import {
+        Key01Icon,
+        LanguageSquareIcon,
+        Link02Icon,
+        PinCodeIcon,
+        Shield01Icon,
+    } from "@hugeicons/core-free-icons";
+    import { getContext } from "svelte";
+
+    const globalState = getContext<() => GlobalState>("globalState")();
+
+    let isDeleteConfirmationOpen = $state(false);
+    let isFinalConfirmationOpen = $state(false);
+
+    // Hidden eVault profile retry functionality
+    let tapCount = $state(0);
+    let lastTapTime = $state(0);
+    let isRetrying = $state(false);
+    let retryMessage = $state("");
+
+    function showDeleteConfirmation() {
+        isDeleteConfirmationOpen = true;
+    }
+
+    function confirmDelete() {
+        isDeleteConfirmationOpen = false;
+        isFinalConfirmationOpen = true;
+    }
+
+    function nukeWallet() {
+        globalState.userController.user = undefined;
+        globalState.securityController.clearPin();
+        isFinalConfirmationOpen = false;
+        goto("/onboarding");
+    }
+
+    function cancelDelete() {
+        isDeleteConfirmationOpen = false;
+        isFinalConfirmationOpen = false;
+    }
+
+    async function handleVersionTap() {
+        const now = Date.now();
+
+        // Reset counter if more than 3 seconds between taps
+        if (now - lastTapTime > 3000) {
+            tapCount = 0;
+        }
+
+        tapCount++;
+        lastTapTime = now;
+
+        // Show tap count feedback (only visible to user)
+        if (tapCount >= 5) {
+            retryMessage = `Taps: ${tapCount}/10`;
+        }
+
+        // Trigger eVault profile retry after 10 taps
+        if (tapCount === 10) {
+            isRetrying = true;
+            retryMessage = "Retrying eVault profile setup...";
+
+            try {
+                await globalState.vaultController.retryProfileCreation();
+                retryMessage =
+                    "✅ eVault profile setup completed successfully!";
+
+                // Reset after success
+                setTimeout(() => {
+                    tapCount = 0;
+                    retryMessage = "";
+                    isRetrying = false;
+                }, 3000);
+            } catch (error) {
+                console.error("Failed to retry eVault profile setup:", error);
+                retryMessage =
+                    "❌ Failed to setup eVault profile. Check console for details.";
+
+                // Reset after error
+                setTimeout(() => {
+                    tapCount = 0;
+                    retryMessage = "";
+                    isRetrying = false;
+                }, 5000);
+            }
+        }
+    }
+
+    $effect(() => {
+        runtime.header.title = "Settings";
+    });
 </script>
 
 <main>
@@ -66,7 +119,28 @@ $effect(() => {
         >Delete Account</ButtonAction
     >
 
-    <p class="w-full py-10 text-center">Version v0.1.8.1</p>
+    <!-- Hidden eVault profile retry - tap version 10 times -->
+    <div class="w-full py-10 text-center">
+        <button
+            class="text-gray-500 hover:text-gray-700 transition-colors cursor-pointer select-none"
+            on:click={handleVersionTap}
+            disabled={isRetrying}
+        >
+            Version v0.1.8.1
+        </button>
+
+        {#if retryMessage}
+            <div
+                class="mt-2 text-sm {isRetrying
+                    ? 'text-blue-600'
+                    : retryMessage.includes('✅')
+                      ? 'text-green-600'
+                      : 'text-red-600'}"
+            >
+                {retryMessage}
+            </div>
+        {/if}
+    </div>
 </main>
 
 <!-- First Confirmation Drawer -->

infrastructure/eid-wallet/src-tauri/gen/android/app/arm64/release/app-arm64-release.apk

@@ -31,7 +31,7 @@ class EVault {
         this.w3id = process.env.W3ID || null;
         const dbService = new DbService(driver);
         this.logService = new LogService(driver);
-        this.graphqlServer = new GraphQLServer(dbService, this.publicKey, this.w3id);
+        this.graphqlServer = new GraphQLServer(dbService, this.publicKey, this.w3id, this);
         this.server = fastify({
             logger: true,
         });

infrastructure/eid-wallet/src/routes/(app)/settings/+page.svelte

@@ -19,12 +19,14 @@ export class GraphQLServer {
     server?: Server;
     private evaultPublicKey: string | null;
     private evaultW3ID: string | null;
+    private evaultInstance: any; // Reference to the eVault instance
 
-    constructor(db: DbService, evaultPublicKey?: string | null, evaultW3ID?: string | null) {
+    constructor(db: DbService, evaultPublicKey?: string | null, evaultW3ID?: string | null, evaultInstance?: any) {
         this.db = db;
         this.accessGuard = new VaultAccessGuard(db);
         this.evaultPublicKey = evaultPublicKey || process.env.EVAULT_PUBLIC_KEY || null;
         this.evaultW3ID = evaultW3ID || process.env.W3ID || null;
+        this.evaultInstance = evaultInstance;
     }
 
     public getSchema(): GraphQLSchema {
@@ -110,6 +112,17 @@ export class GraphQLServer {
         }
     }
 
+    /**
+     * Gets the current eVault W3ID dynamically from the eVault instance
+     * @returns string | null - The current eVault W3ID
+     */
+    private getCurrentEvaultW3ID(): string | null {
+        if (this.evaultInstance && this.evaultInstance.w3id) {
+            return this.evaultInstance.w3id;
+        }
+        return this.evaultW3ID;
+    }
+
     init() {
         const resolvers = {
             JSON: require("graphql-type-json"),
@@ -170,7 +183,7 @@ export class GraphQLServer {
                             context.tokenPayload?.platform || null;
                         const webhookPayload = {
                             id: result.metaEnvelope.id,
-                            w3id: this.evaultW3ID,
+                            w3id: this.getCurrentEvaultW3ID(),
                             evaultPublicKey: this.evaultPublicKey,
                             data: input.payload,
                             schemaId: input.ontology,
@@ -228,7 +241,7 @@ export class GraphQLServer {
                                 context.tokenPayload?.platform || null;
                             const webhookPayload = {
                                 id: id,
-                                w3id: this.evaultW3ID,
+                                w3id: this.getCurrentEvaultW3ID(),
                                 evaultPublicKey: this.evaultPublicKey,
                                 data: input.payload,
                                 schemaId: input.ontology,

infrastructure/evault-core/src/evault.ts

@@ -247,8 +247,10 @@ export class EVaultClient {
 
     private async resolveEndpoint(w3id: string): Promise<string> {
         try {
+            const enrichedW3id = w3id.startsWith("@") ? w3id : `@${w3id}`
+            console.log("fetching endpoint for :", enrichedW3id)
             const response = await fetch(
-                new URL(`/resolve?w3id=${w3id}`, this.registryUrl).toString(),
+                new URL(`/resolve?w3id=${enrichedW3id}`, this.registryUrl).toString(),
             );
 
             if (!response.ok) {
@@ -280,6 +282,7 @@ export class EVaultClient {
                 },
             });
         }
+        console.log('sending to endpoint', this.endpoint)
         return this.client;
     }
 
@@ -290,6 +293,7 @@ export class EVaultClient {
             });
             if (!client) return v4();
 
+            console.log("sending to eVault: ", envelope.w3id)
             console.log("sending payload", envelope);
 
             const response = await client

infrastructure/evault-core/src/protocol/graphql-server.ts

@@ -43,7 +43,7 @@ type Tweet = {
 
 type Chat = {
     id: string;
-    type: "direct" | "group";
+    type: "direct" | "group";  // Always set by webhook based on participant count
     name?: string;
     participants: string[];
     createdAt: Timestamp;
@@ -269,13 +269,17 @@ export class WebhookController {
     }
 
     private mapChatData(data: any, now: Timestamp): Partial<Chat> {
+        const participants = data.participants.map(
+            (p: string) => p.split("(")[1].split(")")[0],
+        ) || [];
+        
+        // Derive type from participant count
+        const type = participants.length > 2 ? "group" : "direct";
+        
         return {
-            type: data.type || "direct",
+            type,
             name: data.name,
-            participants:
-                data.participants.map(
-                    (p: string) => p.split("(")[1].split(")")[0],
-                ) || [],
+            participants,
             createdAt: data.createdAt
                 ? Timestamp.fromDate(new Date(data.createdAt))
                 : now,

infrastructure/web3-adapter/src/evault/evault.ts

@@ -240,20 +240,17 @@ export function AddMembers({
                     selectedUsers
                 );
 
-                // Determine if this should be a direct or group chat
-                const isGroupChat = selectedUsers.length > 1;
-                const chatType = isGroupChat ? 'group' : 'direct';
-
                 // Get all participant IDs (including current user)
                 const participantIds = [
                     user.id,
                     ...selectedUsers.map((u) => u.id)
                 ];
 
                 console.log('Participant IDs:', participantIds);
-                console.log('Chat type:', chatType);
 
                 let chatName: string | undefined;
+                const isGroupChat = participantIds.length > 2;
+                
                 if (isGroupChat) {
                     // For group chats, use the custom name or create from selected users
                     chatName =
@@ -264,10 +261,10 @@ export function AddMembers({
                 }
 
                 console.log('Chat name:', chatName);
+                console.log('Is group chat:', isGroupChat);
 
                 // Create the new chat
                 const chatId = await createNewChat(
-                    chatType,
                     participantIds,
                     chatName
                 );
@@ -277,7 +274,6 @@ export function AddMembers({
                 // Set the new chat as current
                 setCurrentChat({
                     id: chatId,
-                    type: chatType,
                     participants: participantIds,
                     name: chatName,
                     owner: isGroupChat ? user.id : undefined,

platforms/blabsy-w3ds-auth-api/src/controllers/WebhookController.ts

@@ -8,6 +8,7 @@ import { useChat } from '@lib/context/chat-context';
 import { db } from '@lib/firebase/app';
 import { Loading } from '@components/ui/loading';
 import type { Chat } from '@lib/types/chat';
+import { getChatType } from '@lib/types/chat';
 import type { User } from '@lib/types/user';
 import { AddMembers } from './add-members';
 
@@ -127,7 +128,7 @@ export function ChatList(): JSX.Element {
                             </div>
                             <div className='flex-1 overflow-hidden text-left'>
                                 <p className='truncate font-medium'>
-                                    {chat.type === 'direct'
+                                    {getChatType(chat) === 'direct'
                                         ? participant?.name ||
                                           participant?.username ||
                                           otherParticipant
@@ -185,7 +186,7 @@ function ChatListItem({
             onClick={onClick}
         >
             <div className='flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-gray-200 dark:bg-gray-700'>
-                {chat.type === 'group' ? (
+                {getChatType(chat) === 'group' ? (
                     <svg
                         className='h-6 w-6 text-gray-500'
                         fill='none'