fix: ensure cells state is synced when disabled or pending - WPB-20736 (#3691)

jullianm · web-flow · commit 3f55f94b425f · 2025-10-07T13:25:42.000Z
diff --git a/WireNetwork/Sources/WireNetwork/APIs/Rest/ConversationsAPI/ConversationsAPIV10.swift b/WireNetwork/Sources/WireNetwork/APIs/Rest/ConversationsAPI/ConversationsAPIV10.swift
@@ -144,6 +144,7 @@ struct ConversationV10: Decodable, ToAPIModelConvertible {
         case type
         case groupType = "group_conv_type"
         case addPermission = "add_permission"
+        case cellsState = "cells_state"
     }
 
     var access: Set<ConversationAccessModeV0>?
@@ -165,6 +166,7 @@ struct ConversationV10: Decodable, ToAPIModelConvertible {
     var type: ConversationTypeV0?
     var groupType: ConversationGroupTypeV8?
     var addPermission: ChannelPermissionV8?
+    var cellsState: CellsStateV8
 
     func toAPIModel() -> Conversation {
         let access = access?.map { $0.toAPIModel() }
@@ -190,7 +192,8 @@ struct ConversationV10: Decodable, ToAPIModelConvertible {
             lastEvent: lastEvent,
             lastEventTime: lastEventTime?.date,
             groupType: groupType?.toAPIModel(),
-            addPermission: addPermission?.toAPIModel()
+            addPermission: addPermission?.toAPIModel(),
+            cellsState: cellsState.toAPIModel()
         )
     }
 }
diff --git a/WireNetwork/Tests/WireNetworkTests/APIs/Rest/ConversationsAPI/Resources/testCreateGroupConversation_givenV10AndSuccessResponse200.json b/WireNetwork/Tests/WireNetworkTests/APIs/Rest/ConversationsAPI/Resources/testCreateGroupConversation_givenV10AndSuccessResponse200.json
@@ -13,6 +13,7 @@
     "group_id": "string",
     "last_event": "string",
     "last_event_time": "2024-06-04T15:03:07.598Z",
+    "cells_state": "disabled",
     "members": {
         "others": [
             {
diff --git a/WireNetwork/Tests/WireNetworkTests/APIs/Rest/ConversationsAPI/Resources/testCreateGroupConversation_givenV10AndSuccessResponse201.json b/WireNetwork/Tests/WireNetworkTests/APIs/Rest/ConversationsAPI/Resources/testCreateGroupConversation_givenV10AndSuccessResponse201.json
@@ -13,6 +13,7 @@
     "group_id": "string",
     "last_event": "string",
     "last_event_time": "2024-06-04T15:03:07.598Z",
+    "cells_state": "disabled",
     "members": {
         "others": [
             {
diff --git a/WireNetwork/Tests/WireNetworkTests/APIs/Rest/ConversationsAPI/Resources/testCreateGroupConversation_givenV10_EmptySelfMember_SuccessResponse201.json b/WireNetwork/Tests/WireNetworkTests/APIs/Rest/ConversationsAPI/Resources/testCreateGroupConversation_givenV10_EmptySelfMember_SuccessResponse201.json
@@ -13,6 +13,7 @@
     "group_id": "string",
     "last_event": "string",
     "last_event_time": "2024-06-04T15:03:07.598Z",
+    "cells_state": "disabled",
     "members": {
         "others": [
             {
diff --git a/WireNetwork/Tests/WireNetworkTests/APIs/Rest/ConversationsAPI/Resources/testCreateGroupConversation_givenV8AndSuccessResponse200.json b/WireNetwork/Tests/WireNetworkTests/APIs/Rest/ConversationsAPI/Resources/testCreateGroupConversation_givenV8AndSuccessResponse200.json
@@ -15,6 +15,7 @@
     "id": "99db9768-04e3-4b5d-9268-831b6a25c4ab",
     "last_event": "string",
     "last_event_time": "2024-06-04T15:03:07.598Z",
+    "cells_state": "disabled",
     "members": {
         "others": [
             {
diff --git a/WireNetwork/Tests/WireNetworkTests/APIs/Rest/ConversationsAPI/Resources/testCreateGroupConversation_givenV8AndSuccessResponse201.json b/WireNetwork/Tests/WireNetworkTests/APIs/Rest/ConversationsAPI/Resources/testCreateGroupConversation_givenV8AndSuccessResponse201.json
@@ -15,6 +15,7 @@
     "id": "99db9768-04e3-4b5d-9268-831b6a25c4ab",
     "last_event": "string",
     "last_event_time": "2024-06-04T15:03:07.598Z",
+    "cells_state": "disabled",
     "members": {
         "others": [
             {
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ViewLifeCycle.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ViewLifeCycle.swift
@@ -40,6 +40,6 @@ extension ConversationViewController {
 
         isAppearing = false
 
-        syncCellsStateIfPending()
+        syncCellsState()
     }
 }
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift
@@ -879,10 +879,10 @@ extension ConversationViewController: ConversationInputBarViewControllerDelegate
         filesView.presentOverAll(animated: true)
     }
 
-    /// If cells state is pending we need to sync it to ensure the value is up to date
-    /// as it might have been updated to a `ready` state.
-    func syncCellsStateIfPending() {
-        guard wireCellsState == .pending else {
+    /// If cells state is different than ready we need to sync it when view appears to ensure the value is up to date
+    /// as it might have been updated to either a `pending` or `ready` state.
+    func syncCellsState() {
+        guard wireCellsState != .ready else {
             return
         }
 
@@ -903,7 +903,7 @@ extension ConversationViewController: ConversationInputBarViewControllerDelegate
                 )
             } catch {
                 WireLogger.conversation
-                    .error("could not sync cells state for conversation")
+                    .error("could not sync cells state for conversation: \(String(describing: error))")
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ struct ConversationV10: Decodable, ToAPIModelConvertible {`
`144`	`144`	`case type`
`145`	`145`	`case groupType = "group_conv_type"`
`146`	`146`	`case addPermission = "add_permission"`
	`147`	`+ case cellsState = "cells_state"`
`147`	`148`	`}`
`148`	`149`
`149`	`150`	`var access: Set<ConversationAccessModeV0>?`
`@@ -165,6 +166,7 @@ struct ConversationV10: Decodable, ToAPIModelConvertible {`
`165`	`166`	`var type: ConversationTypeV0?`
`166`	`167`	`var groupType: ConversationGroupTypeV8?`
`167`	`168`	`var addPermission: ChannelPermissionV8?`
	`169`	`+ var cellsState: CellsStateV8`
`168`	`170`
`169`	`171`	`func toAPIModel() -> Conversation {`
`170`	`172`	`let access = access?.map { $0.toAPIModel() }`
`@@ -190,7 +192,8 @@ struct ConversationV10: Decodable, ToAPIModelConvertible {`
`190`	`192`	`lastEvent: lastEvent,`
`191`	`193`	`lastEventTime: lastEventTime?.date,`
`192`	`194`	`groupType: groupType?.toAPIModel(),`
`193`		`- addPermission: addPermission?.toAPIModel()`
	`195`	`+ addPermission: addPermission?.toAPIModel(),`
	`196`	`+ cellsState: cellsState.toAPIModel()`
`194`	`197`	`)`
`195`	`198`	`}`
`196`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`"group_id": "string",`
`14`	`14`	`"last_event": "string",`
`15`	`15`	`"last_event_time": "2024-06-04T15:03:07.598Z",`
	`16`	`+ "cells_state": "disabled",`
`16`	`17`	`"members": {`
`17`	`18`	`"others": [`
`18`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`"id": "99db9768-04e3-4b5d-9268-831b6a25c4ab",`
`16`	`16`	`"last_event": "string",`
`17`	`17`	`"last_event_time": "2024-06-04T15:03:07.598Z",`
	`18`	`+ "cells_state": "disabled",`
`18`	`19`	`"members": {`
`19`	`20`	`"others": [`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ extension ConversationViewController {`
`40`	`40`
`41`	`41`	`isAppearing = false`
`42`	`42`
`43`		`- syncCellsStateIfPending()`
	`43`	`+ syncCellsState()`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -879,10 +879,10 @@ extension ConversationViewController: ConversationInputBarViewControllerDelegate`
`879`	`879`	`filesView.presentOverAll(animated: true)`
`880`	`880`	`}`
`881`	`881`
`882`		`- /// If cells state is pending we need to sync it to ensure the value is up to date`
`883`		- /// as it might have been updated to a `ready` state.
`884`		`- func syncCellsStateIfPending() {`
`885`		`- guard wireCellsState == .pending else {`
	`882`	`+ /// If cells state is different than ready we need to sync it when view appears to ensure the value is up to date`
	`883`	+ /// as it might have been updated to either a `pending` or `ready` state.
	`884`	`+ func syncCellsState() {`
	`885`	`+ guard wireCellsState != .ready else {`
`886`	`886`	`return`
`887`	`887`	`}`
`888`	`888`
`@@ -903,7 +903,7 @@ extension ConversationViewController: ConversationInputBarViewControllerDelegate`
`903`	`903`	`)`
`904`	`904`	`} catch {`
`905`	`905`	`WireLogger.conversation`
`906`		`- .error("could not sync cells state for conversation")`
	`906`	`+ .error("could not sync cells state for conversation: \(String(describing: error))")`
`907`	`907`	`}`
`908`	`908`	`}`
`909`	`909`