fix: show connection request with unavailable name [WPB-6247] (#2716)

wireapp · Feb 16, 2024 · 1a2034e · 1a2034e
1 parent c27c5cf
commit 1a2034e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationListViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationListViewModel.kt
@@ -604,7 +604,8 @@ private fun ConversationDetails.toConversationItem(
             ),
             conversationInfo = ConversationInfo(
                 name = otherUser?.name.orEmpty(),
-                membership = userTypeMapper.toMembership(userType)
+                membership = userTypeMapper.toMembership(userType),
+                isSenderUnavailable = otherUser?.isUnavailableUser ?: true
             ),
             lastMessageContent = UILastMessageContent.Connection(
                 connection.status,

diff --git a/.../main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationItemFactory.kt b/.../main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationItemFactory.kt
@@ -372,6 +372,25 @@ fun PreviewConnectionConversationItemWithSentConnectRequestBadge() {
     )
 }
 
+@Preview
+@Composable
+fun PreviewConnectionConversationItemWithSentConnectRequestBadgeWithUnknownSender() {
+    ConversationItemFactory(
+        conversation = ConversationItem.ConnectionConversation(
+            userAvatarData = UserAvatarData(),
+            conversationId = QualifiedID("value", "domain"),
+            mutedStatus = MutedConversationStatus.OnlyMentionsAndRepliesAllowed,
+            lastMessageContent = null,
+            badgeEventType = BadgeEventType.SentConnectRequest,
+            conversationInfo = ConversationInfo("", isSenderUnavailable = true)
+        ),
+        searchQuery = "",
+        isSelectableItem = false,
+        isChecked = false,
+        {}, {}, {}, {}, {}, {}
+    )
+}
+
 @Preview
 @Composable
 fun PreviewPrivateConversationItemWithBlockedBadge() {

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/model/ConversationItem.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/model/ConversationItem.kt
@@ -126,5 +126,6 @@ fun ConversationItem.ConnectionConversation.toUserInfoLabel() =
     UserInfoLabel(
         labelName = conversationInfo.name,
         isLegalHold = isLegalHold,
-        membership = conversationInfo.membership
+        membership = conversationInfo.membership,
+        unavailable = conversationInfo.isSenderUnavailable
     )
diff --git a/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt
@@ -341,7 +341,7 @@ class DeviceDetailsViewModelTest {
             MockKAnnotations.init(this, relaxUnitFun = true)
             withFingerprintSuccess()
             coEvery { observeUserInfo(any()) } returns flowOf(GetUserInfoResult.Success(TestUser.OTHER_USER, null))
-            coEvery { getE2eiCertificate(any()) } returns GetE2EICertificateUseCaseResult.Failure.NotActivated
+            coEvery { getE2eiCertificate(any()) } returns GetE2EICertificateUseCaseResult.NotActivated
             coEvery { isE2EIEnabledUseCase() } returns true
         }
 

diff --git a/kalium b/kalium