From d9ab7ec6d45562909748af4788cc3cb277087521 Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Mon, 18 Sep 2023 13:18:19 +0400
Subject: [PATCH] views

---
 src/Simplex/Chat/View.hs  |  4 ++--
 tests/ChatTests/Groups.hs | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs
index 51dbfee9e9..b157fd783f 100644
--- a/src/Simplex/Chat/View.hs
+++ b/src/Simplex/Chat/View.hs
@@ -230,11 +230,11 @@ responseToView user_ ChatConfig {logLevel, showReactions, showReceipts, testView
   CRGroupLink u g cReq mRole -> ttyUser u $ groupLink_ "Group link:" g cReq mRole
   CRGroupLinkDeleted u g -> ttyUser u $ viewGroupLinkDeleted g
   CRAcceptingGroupJoinRequest _ g c -> [ttyFullContact c <> ": accepting request to join group " <> ttyGroup' g <> "..."]
-  CRNoMemberContactCreating u g m -> ttyUser u ["member " <> ttyGroup' g <> " " <> ttyMember m <> " does not have associated contact, creating contact"]
+  CRNoMemberContactCreating u g m -> ttyUser u ["member " <> ttyGroup' g <> " " <> ttyMember m <> " does not have direct connection, creating"]
   CRNewMemberContact u _ g m -> ttyUser u ["contact for member " <> ttyGroup' g <> " " <> ttyMember m <> " is created"]
   CRNewMemberContactSentInv u _ct g m -> ttyUser u ["sent invitation to connect directly to member " <> ttyGroup' g <> " " <> ttyMember m]
   CRNewMemberContactReceivedInv u ct g m -> ttyUser u [ttyGroup' g <> " " <> ttyMember m <> " is creating direct contact " <> ttyContact' ct <> " with you"]
-  CRMemberContactConnected u ct g m -> ttyUser u [ttyGroup' g <> " " <> ttyMember m <> " is connected to contact " <> ttyContact' ct]
+  CRMemberContactConnected u ct g m -> ttyUser u ["member " <> ttyGroup' g <> " " <> ttyMember m <> " is merged into " <> ttyContact' ct]
   CRMemberSubError u g m e -> ttyUser u [ttyGroup' g <> " member " <> ttyMember m <> " error: " <> sShow e]
   CRMemberSubSummary u summary -> ttyUser u $ viewErrorsSummary (filter (isJust . memberError) summary) " group member errors"
   CRGroupSubscribed u g -> ttyUser u $ viewGroupSubscribed g
diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs
index 4b234bc3d1..3365d1b7d8 100644
--- a/tests/ChatTests/Groups.hs
+++ b/tests/ChatTests/Groups.hs
@@ -222,7 +222,7 @@ testGroupShared alice bob cath checkMessages = do
   alice `send` "@bob hey"
   alice
     <### [ "@bob hey",
-           "member #team bob does not have associated contact, creating contact",
+           "member #team bob does not have direct connection, creating",
            "peer chat protocol version range incompatible"
          ]
   when checkMessages $ threadDelay 1000000
@@ -639,7 +639,7 @@ testGroupDeleteInvitedContact =
       alice `send` "@bob hey"
       alice
         <### [ WithTime "@bob hey",
-               "member #team bob does not have associated contact, creating contact",
+               "member #team bob does not have direct connection, creating",
                "contact for member #team bob is created",
                "sent invitation to connect directly to member #team bob"
              ]
@@ -2746,13 +2746,13 @@ testConnectMemberToContact =
         [ do
             alice <## "#team: you joined the group"
             alice <## "#team: member cath_1 (Catherine) is connected"
-            alice <## "#team cath_1 is connected to contact cath",
+            alice <## "member #team cath_1 is merged into cath",
           do
             bob <## "#team: alice joined the group",
           do
             cath <## "#team: bob added alice_1 (Alice) to the group (connecting...)"
             cath <## "#team: new member alice_1 is connected"
-            cath <## "#team alice_1 is connected to contact alice"
+            cath <## "member #team alice_1 is is merged into alice"
         ]
       alice <##> cath
       alice #> "#team hello"
@@ -2789,7 +2789,7 @@ testMemberContactMessage =
 
       alice ##> "@#team bob hi"
       alice
-        <### [ "member #team bob does not have associated contact, creating contact",
+        <### [ "member #team bob does not have direct connection, creating",
                "contact for member #team bob is created",
                "sent invitation to connect directly to member #team bob",
                WithTime "@bob hi"
@@ -2808,7 +2808,7 @@ testMemberContactMessage =
       -- bob and cath connect
       bob ##> "@#team cath hi"
       bob
-        <### [ "member #team cath does not have associated contact, creating contact",
+        <### [ "member #team cath does not have direct connection, creating",
                "contact for member #team cath is created",
                "sent invitation to connect directly to member #team cath",
                WithTime "@cath hi"
@@ -2895,7 +2895,7 @@ testMemberContactInvitedConnectionReplaced tmp = do
 
         alice ##> "@#team bob hi"
         alice
-          <### [ "member #team bob does not have associated contact, creating contact",
+          <### [ "member #team bob does not have direct connection, creating",
                  "contact for member #team bob is created",
                  "sent invitation to connect directly to member #team bob",
                  WithTime "@bob hi"
@@ -3003,7 +3003,7 @@ testMemberContactIncognito =
       -- bob creates member contact with cath - both share incognito profile
       bob ##> ("@#team " <> cathIncognito <> " hi")
       bob
-        <### [ ConsoleString ("member #team " <> cathIncognito <> " does not have associated contact, creating contact"),
+        <### [ ConsoleString ("member #team " <> cathIncognito <> " does not have direct connection, creating"),
                ConsoleString ("contact for member #team " <> cathIncognito <> " is created"),
                ConsoleString ("sent invitation to connect directly to member #team " <> cathIncognito),
                WithTime ("i @" <> cathIncognito <> " hi")