From a5b650141151338c825c42b901167ebaef951f64 Mon Sep 17 00:00:00 2001
From: Sahil Garg <me.sahil.gg@gmail.com>
Date: Tue, 30 Jun 2026 10:17:58 +0530
Subject: [PATCH] fix: fixed the old social bindings resurfacing when they have
 already binded.

---
 .../.idea/deploymentTargetSelector.xml        |  2 +-
 .../eid-wallet/src/lib/utils/socialBinding.ts | 93 ++++++++++++++++++-
 .../components/SocialBindingDrawer.svelte     | 16 ++++
 3 files changed, 108 insertions(+), 3 deletions(-)

diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml
index e55b56d0c..872070950 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-06-04T05:12:20.913535Z">
+        <DropdownSelection timestamp="2026-06-24T07:30:56.665180Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=RZCT7030M7Y" />
diff --git a/infrastructure/eid-wallet/src/lib/utils/socialBinding.ts b/infrastructure/eid-wallet/src/lib/utils/socialBinding.ts
index 2a7262e74..1b4ae455e 100644
--- a/infrastructure/eid-wallet/src/lib/utils/socialBinding.ts
+++ b/infrastructure/eid-wallet/src/lib/utils/socialBinding.ts
@@ -442,6 +442,33 @@ export async function deleteSocialBindingDoc(
     );
 }
 
+/**
+ * Signers the caller has ALREADY completed a binding with. A completed binding
+ * is a doc subject=@caller that the caller has counter-signed; its originator is
+ * signatures[0].signer. Once bound, any *other* unsigned envelope from that same
+ * signer is a stale leftover — a repeat scan of the caller's QR (before or after
+ * acceptance) or a duplicate the accept-time prune never reached — and must not
+ * re-surface as a fresh "Social Connection Request".
+ */
+function collectBoundSigners(
+    edges: BindingDocEdge[],
+    normalizedCaller: string,
+): Set<string> {
+    const boundSigners = new Set<string>();
+    for (const edge of edges) {
+        const parsed = edge.node.parsed;
+        if (!parsed || parsed.type !== "social_connection") continue;
+        if (parsed.subject !== normalizedCaller) continue;
+        const sigs = Array.isArray(parsed.signatures) ? parsed.signatures : [];
+        const callerSigned = sigs.some((s) => s.signer === normalizedCaller);
+        const originator = sigs[0]?.signer;
+        if (callerSigned && originator && originator !== normalizedCaller) {
+            boundSigners.add(originator);
+        }
+    }
+    return boundSigners;
+}
+
 /**
  * Poll the caller's own eVault for social_connection binding documents
  * that were created by someone else (i.e. the signer wrote a doc about themselves
@@ -460,7 +487,10 @@ export async function fetchUnsignedSocialDocs(
         bindingDocuments: { edges: BindingDocEdge[] };
     }>(ownGqlUrl, callerEname, SOCIAL_BINDING_DOCS_QUERY);
 
-    const unsigned = (data.bindingDocuments?.edges ?? []).filter((edge) => {
+    const edges = data.bindingDocuments?.edges ?? [];
+    const boundSigners = collectBoundSigners(edges, normalized);
+
+    const unsigned = edges.filter((edge) => {
         const parsed = edge.node.parsed;
         if (!parsed || parsed.type !== "social_connection") return false;
         // The signer writes subject=@requester into the requester's vault,
@@ -471,7 +501,11 @@ export async function fetchUnsignedSocialDocs(
             ? parsed.signatures
             : [];
         const alreadySigned = signatures.some((s) => s.signer === normalized);
-        return !alreadySigned;
+        if (alreadySigned) return false;
+        // Skip leftover envelopes from a signer the caller is already bound to.
+        const originator = signatures[0]?.signer;
+        if (originator && boundSigners.has(originator)) return false;
+        return true;
     });
 
     // Dedupe by signer: each scan of the requester's QR creates a fresh
@@ -548,6 +582,61 @@ export async function pruneDuplicateUnsignedDocs(
     return deleted;
 }
 
+/**
+ * Delete leftover unsigned social_connection envelopes addressed to the caller
+ * from signers the caller is ALREADY bound to. These pile up from repeat scans
+ * of the caller's QR (before or after acceptance) and would otherwise re-surface
+ * as duplicate "Social Connection Request" prompts for a contact already added.
+ *
+ * Safe to delete: a completed (caller-counter-signed) binding with the same
+ * signer already exists, so accepting a leftover would only mint a redundant
+ * second binding to the same person. The fully-signed doc is never touched.
+ *
+ * Intended as a one-time cleanup when the invite drawer opens. Returns the
+ * number of envelopes deleted.
+ */
+export async function pruneBoundSignerDocs(
+    ownGqlUrl: string,
+    callerEname: string,
+): Promise<number> {
+    const normalized = callerEname.startsWith("@")
+        ? callerEname
+        : `@${callerEname}`;
+
+    const data = await vaultGqlRequest<{
+        bindingDocuments: { edges: BindingDocEdge[] };
+    }>(ownGqlUrl, callerEname, SOCIAL_BINDING_DOCS_QUERY);
+
+    const edges = data.bindingDocuments?.edges ?? [];
+    const boundSigners = collectBoundSigners(edges, normalized);
+
+    const stale = edges.filter((edge) => {
+        const parsed = edge.node.parsed;
+        if (!parsed || parsed.type !== "social_connection") return false;
+        if (parsed.subject !== normalized) return false;
+        const sigs = Array.isArray(parsed.signatures) ? parsed.signatures : [];
+        // Keep the completed binding itself — only leftovers are stale.
+        if (sigs.some((s) => s.signer === normalized)) return false;
+        const originator = sigs[0]?.signer;
+        return !!originator && boundSigners.has(originator);
+    });
+
+    let deleted = 0;
+    for (const edge of stale) {
+        try {
+            await deleteSocialBindingDoc(ownGqlUrl, callerEname, edge.node.id);
+            deleted += 1;
+        } catch (err) {
+            console.warn(
+                "[socialBinding] failed to prune bound-signer doc",
+                edge.node.id,
+                err,
+            );
+        }
+    }
+    return deleted;
+}
+
 // ---------------------------------------------------------------------------
 // Listing completed social bindings
 // ---------------------------------------------------------------------------
diff --git a/infrastructure/eid-wallet/src/routes/(app)/main/components/SocialBindingDrawer.svelte b/infrastructure/eid-wallet/src/routes/(app)/main/components/SocialBindingDrawer.svelte
index acfba6a08..f50a7e3a1 100644
--- a/infrastructure/eid-wallet/src/routes/(app)/main/components/SocialBindingDrawer.svelte
+++ b/infrastructure/eid-wallet/src/routes/(app)/main/components/SocialBindingDrawer.svelte
@@ -8,6 +8,7 @@ import {
     fetchNameFromVault,
     fetchUnsignedSocialDocs,
     getCanonicalBindingDocString,
+    pruneBoundSignerDocs,
     pruneDuplicateUnsignedDocs,
     resolveVaultUri,
 } from "$lib/utils";
@@ -228,6 +229,21 @@ async function initFromVault() {
     const ename = vault.ename.startsWith("@") ? vault.ename : `@${vault.ename}`;
     qrValue = `w3ds://social_binding?ename=${encodeURIComponent(ename)}`;
     phase = "qr";
+
+    // One-time cleanup: drop leftover unsigned envelopes from contacts the user
+    // is already bound to, so the poll below never re-prompts for them. Runs
+    // fire-and-forget — the QR shows immediately and the filter in
+    // fetchUnsignedSocialDocs still guards the poll until this lands.
+    if (vault.uri) {
+        const gqlUrl = new URL("/graphql", vault.uri).toString();
+        void pruneBoundSignerDocs(gqlUrl, ename).catch((err) =>
+            console.warn(
+                "[SocialBindingDrawer] bound-signer prune failed:",
+                err,
+            ),
+        );
+    }
+
     startPolling();
 }