Merge branch 'develop' into julioromano/poll_history_entry_point

features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/model/DefaultPollContentStateFactory.kt

@@ -69,12 +69,12 @@ class DefaultPollContentStateFactory @Inject constructor(
 
         return PollContentState(
             eventId = event.eventId,
-            isMine = event.isOwn,
             question = content.question,
             answerItems = answerItems.toImmutableList(),
             pollKind = content.kind,
             isPollEditable = event.isEditable,
             isPollEnded = isPollEnded,
+            isMine = event.isOwn,
         )
     }
 }

features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/pollcontent/PollContentStateFactoryTest.kt

@@ -222,6 +222,7 @@ class PollContentStateFactoryTest {
         answers = persistentListOf(A_POLL_ANSWER_1, A_POLL_ANSWER_2, A_POLL_ANSWER_3, A_POLL_ANSWER_4),
         votes = votes,
         endTime = endTime,
+        isEdited = false,
     )
 
     private fun aPollContentState(
@@ -242,9 +243,9 @@ class PollContentStateFactoryTest {
         question = question,
         answerItems = answerItems.toImmutableList(),
         pollKind = pollKind,
-        isMine = isMine,
-        isPollEnded = isEnded,
         isPollEditable = isEditable,
+        isPollEnded = isEnded,
+        isMine = isMine,
     )
 
     private fun aPollAnswerItem(