From 52c93ae0c586af3afec5576a63be31178ab2f467 Mon Sep 17 00:00:00 2001
From: Jannis Braun <151788261+TheZwiss@users.noreply.github.com>
Date: Tue, 24 Mar 2026 18:42:45 +0100
Subject: [PATCH] =?UTF-8?q?chore:=20clean=20up=20review=20feedback=20?=
 =?UTF-8?q?=E2=80=94=20consolidate=20imports,=20fix=20reconnect=20verb,=20?=
 =?UTF-8?q?DRY=20username?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/web/src/components/chat/FriendsPage.tsx | 8 +++-----
 packages/web/src/hooks/useInstanceConnect.ts     | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/web/src/components/chat/FriendsPage.tsx b/packages/web/src/components/chat/FriendsPage.tsx
index 2df82c32..7b2f45c1 100644
--- a/packages/web/src/components/chat/FriendsPage.tsx
+++ b/packages/web/src/components/chat/FriendsPage.tsx
@@ -88,7 +88,8 @@ export function FriendsPage({ mobile }: FriendsPageProps) {
 
     try {
       await sendFriendRequest(username);
-      setAddStatus({ type: 'success', message: `Connected to ${domain} — friend request sent!` });
+      const verb = result === 'reconnect' ? 'Reconnected to' : 'Connected to';
+      setAddStatus({ type: 'success', message: `${verb} ${domain} — friend request sent!` });
       setAddUsername('');
     } catch (err) {
       addToast((err as Error).message, 'warning');
@@ -583,17 +584,14 @@ function UserDiscoverCard({
   const handleSendRequest = async () => {
     setActionLoading(true);
     setError('');
+    const username = user._instanceOrigin ? baseName + '@' + (originLabel ?? '') : baseName;
     try {
-      // For federated users, use user@host format
-      const username = user._instanceOrigin ? baseName + '@' + (originLabel ?? '') : baseName;
       const requestId = await sendFriendRequest(username);
       updateRelationship(user.id, user._instanceOrigin, 'outbound_pending', requestId);
     } catch (err) {
       if (err instanceof InstanceNotConnectedError) {
-        const username = user._instanceOrigin ? baseName + '@' + (originLabel ?? '') : baseName;
         setConnectModal({ domain: err.domain, isReconnect: false, username });
       } else if (err instanceof InstanceDisconnectedError) {
-        const username = user._instanceOrigin ? baseName + '@' + (originLabel ?? '') : baseName;
         setConnectModal({ domain: err.domain, isReconnect: true, username });
       } else {
         setError(err instanceof Error ? err.message : 'Failed to send request');
diff --git a/packages/web/src/hooks/useInstanceConnect.ts b/packages/web/src/hooks/useInstanceConnect.ts
index 419dfa94..1d34350a 100644
--- a/packages/web/src/hooks/useInstanceConnect.ts
+++ b/packages/web/src/hooks/useInstanceConnect.ts
@@ -1,6 +1,5 @@
 import { useState, useCallback } from 'react';
-import { useInstanceStore } from '../stores/instanceStore';
-import { DifferentPasswordError } from '../stores/instanceStore';
+import { useInstanceStore, DifferentPasswordError } from '../stores/instanceStore';
 
 /**
  * Reusable hook for connecting to a federated instance.