diff --git a/app/src/uiTest/kotlin/ch/protonmail/android/uitest/e2e/composer/chips/ComposerRecipientsCollapsedChipsTests.kt b/app/src/uiTest/kotlin/ch/protonmail/android/uitest/e2e/composer/chips/ComposerRecipientsCollapsedChipsTests.kt index 21d301fb66..23d2bf0f3c 100644 --- a/app/src/uiTest/kotlin/ch/protonmail/android/uitest/e2e/composer/chips/ComposerRecipientsCollapsedChipsTests.kt +++ b/app/src/uiTest/kotlin/ch/protonmail/android/uitest/e2e/composer/chips/ComposerRecipientsCollapsedChipsTests.kt @@ -40,6 +40,7 @@ import dagger.hilt.android.testing.UninstallModules import io.mockk.mockk import me.proton.core.auth.domain.usecase.ValidateServerProof import org.junit.Before +import org.junit.Ignore import org.junit.Test @RegressionTest @@ -85,6 +86,7 @@ internal class ComposerRecipientsCollapsedChipsTests : MockedNetworkTest(), Comp navigator { navigateTo(Destination.Composer) } } + @Ignore("https://jira.protontech.ch/browse/MAILANDR-781") @Test @SmokeTest @TestId("190243") @@ -142,6 +144,7 @@ internal class ComposerRecipientsCollapsedChipsTests : MockedNetworkTest(), Comp } } + @Ignore("https://jira.protontech.ch/browse/MAILANDR-781") @Test @SmokeTest @TestId("190246") diff --git a/mail-composer/presentation/src/main/kotlin/ch/protonmail/android/mailcomposer/presentation/mapper/ParticipantMapper.kt b/mail-composer/presentation/src/main/kotlin/ch/protonmail/android/mailcomposer/presentation/mapper/ParticipantMapper.kt index 62357de20f..8fd9d13690 100644 --- a/mail-composer/presentation/src/main/kotlin/ch/protonmail/android/mailcomposer/presentation/mapper/ParticipantMapper.kt +++ b/mail-composer/presentation/src/main/kotlin/ch/protonmail/android/mailcomposer/presentation/mapper/ParticipantMapper.kt @@ -39,7 +39,7 @@ class ParticipantMapper @Inject constructor() { return Participant( recipient.address, contactEmail?.name?.takeIfNotBlank() ?: recipient.address, - false, // after we bump core, change to: contactEmail?.isProton ?: false + contactEmail?.isProton ?: false, null ) } diff --git a/mail-composer/presentation/src/test/kotlin/ch/protonmail/android/mailcomposer/presentation/mapper/ParticipantMapperTest.kt b/mail-composer/presentation/src/test/kotlin/ch/protonmail/android/mailcomposer/presentation/mapper/ParticipantMapperTest.kt index 14bd2dc6b6..07bdec333f 100644 --- a/mail-composer/presentation/src/test/kotlin/ch/protonmail/android/mailcomposer/presentation/mapper/ParticipantMapperTest.kt +++ b/mail-composer/presentation/src/test/kotlin/ch/protonmail/android/mailcomposer/presentation/mapper/ParticipantMapperTest.kt @@ -48,7 +48,8 @@ class ParticipantMapperTest { 0, ContactIdTestData.contactId1, "test1@protonmail.com", - emptyList() + emptyList(), + true ) ) ), @@ -64,7 +65,8 @@ class ParticipantMapperTest { 0, ContactIdTestData.contactId2, "test2@protonmail.com", - emptyList() + emptyList(), + false ), ContactEmail( UserIdTestData.userId, @@ -75,7 +77,8 @@ class ParticipantMapperTest { 0, ContactIdTestData.contactId1, "test3@protonmail.com", - emptyList() + emptyList(), + false ) ) ) @@ -87,7 +90,7 @@ class ParticipantMapperTest { val expectedResult = Participant( address = "test1@protonmail.com", name = "First name from contact email", - isProton = false + isProton = true ) // When