Rename support message delivery_status to status and remove agent ava…

android/data/services/remote-gem/src/main/kotlin/com/gemwallet/android/data/services/gemapi/GemDeviceApiClient.kt

@@ -22,7 +22,6 @@ import com.wallet.core.primitives.Rewards
 import com.wallet.core.primitives.ScanTransaction
 import com.wallet.core.primitives.ScanTransactionPayload
 import com.wallet.core.primitives.SupportAction
-import com.wallet.core.primitives.SupportConversation
 import com.wallet.core.primitives.SupportMessage
 import com.wallet.core.primitives.SupportMessageInput
 import com.wallet.core.primitives.Transaction
@@ -118,9 +117,6 @@ interface GemDeviceApiClient {
     @POST("/v2/devices/scan/transaction")
     suspend fun getScanTransaction(@Body payload: ScanTransactionPayload): ScanTransaction
 
-    @GET("/v2/devices/support")
-    suspend fun getSupportConversation(): SupportConversation?
-
     @GET("/v2/devices/support/messages")
     suspend fun getSupportMessages(
         @Query("from_timestamp") fromTimestamp: Long,

android/gemcore/src/main/kotlin/com/wallet/core/primitives/generated/Stream.kt

@@ -68,7 +68,7 @@ sealed class StreamEvent {
 	data class FiatTransaction(val data: StreamWalletUpdate): StreamEvent()
 	@Serializable
 	@SerialName("support")
-	data class Support(val data: SupportStreamEvent): StreamEvent()
+	data class Support(val data: SupportMessage): StreamEvent()
 }
 
 @Serializable

android/gemcore/src/main/kotlin/com/wallet/core/primitives/generated/Support.kt

@@ -9,26 +9,7 @@ import kotlinx.serialization.SerialName
 
 @Serializable
 data class SupportAgent (
-	val name: String,
-	val avatarUrl: String? = null
-)
-
-@Serializable
-enum class SupportConversationStatus(val string: String) {
-	@SerialName("open")
-	Open("open"),
-	@SerialName("resolved")
-	Resolved("resolved"),
-}
-
-@Serializable
-data class SupportConversation (
-	val id: String,
-	val status: SupportConversationStatus,
-	val firstMessage: String? = null,
-	val lastMessage: String? = null,
-	val lastActivityAt: SerializedDate,
-	val unreadCount: Int
+	val name: String
 )
 
 @Serializable
@@ -65,10 +46,9 @@ data class SupportMessageImage (
 @Serializable
 data class SupportMessage (
 	val id: String,
-	val conversationId: String,
 	val content: String,
 	val sender: SupportMessageSender,
-	val deliveryStatus: SupportMessageDeliveryStatus,
+	val status: SupportMessageDeliveryStatus,
 	val createdAt: SerializedDate,
 	val images: List<SupportMessageImage>
 )
@@ -88,16 +68,6 @@ sealed class SupportAction {
 	object LastSeen: SupportAction()
 }
 
-@Serializable
-sealed class SupportStreamEvent {
-	@Serializable
-	@SerialName("message")
-	data class Message(val data: SupportMessage): SupportStreamEvent()
-	@Serializable
-	@SerialName("conversation")
-	data class Conversation(val data: SupportConversation): SupportStreamEvent()
-}
-
 @Serializable
 enum class SupportTypingStatus(val string: String) {
 	@SerialName("on")

core/crates/primitives/src/support.rs

@@ -17,8 +17,6 @@ pub enum SupportMessageDeliveryStatus {
 #[serde(rename_all = "camelCase")]
 pub struct SupportAgent {
     pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub avatar_url: Option<String>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -70,7 +68,7 @@ pub struct SupportMessage {
     pub id: String,
     pub content: String,
     pub sender: SupportMessageSender,
-    pub delivery_status: SupportMessageDeliveryStatus,
+    pub status: SupportMessageDeliveryStatus,
     pub created_at: DateTime<Utc>,
     pub images: Vec<SupportMessageImage>,
 }

core/crates/support/src/chatwoot.rs

@@ -181,7 +181,7 @@ mod tests {
             id: id.to_string(),
             content: id.to_string(),
             sender: SupportMessageSender::User,
-            delivery_status: SupportMessageDeliveryStatus::Sent,
+            status: SupportMessageDeliveryStatus::Sent,
             created_at: chrono::DateTime::from_timestamp(timestamp, 0).unwrap(),
             images: vec![],
         }

core/crates/support/src/model.rs

@@ -109,8 +109,6 @@ pub struct CustomAttributes {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Sender {
     pub name: Option<String>,
-    pub avatar_url: Option<String>,
-    pub thumbnail: Option<String>,
     pub custom_attributes: Option<CustomAttributes>,
 }
 
@@ -205,10 +203,7 @@ impl Attachment {
 impl Sender {
     fn support_agent(&self) -> Option<SupportAgent> {
         let name = self.name.clone()?;
-        Some(SupportAgent {
-            name,
-            avatar_url: self.avatar_url.clone().or_else(|| self.thumbnail.clone()).filter(|value| !value.is_empty()),
-        })
+        Some(SupportAgent { name })
     }
 }
 
@@ -306,7 +301,7 @@ fn support_message(
     content_type: Option<&str>,
     private: Option<bool>,
     sender: SupportMessageSender,
-    delivery_status: SupportMessageDeliveryStatus,
+    status: SupportMessageDeliveryStatus,
     created_at: DateTime<Utc>,
     attachments: &[Attachment],
 ) -> Option<SupportMessage> {
@@ -328,7 +323,7 @@ fn support_message(
         id: id.to_string(),
         content,
         sender,
-        delivery_status,
+        status,
         created_at,
         images,
     })
@@ -380,10 +375,9 @@ mod tests {
             messages[0].sender,
             SupportMessageSender::Agent(SupportAgent {
                 name: "Test Agent".to_string(),
-                avatar_url: None,
             })
         );
-        assert_eq!(messages[0].delivery_status, SupportMessageDeliveryStatus::Sent);
+        assert_eq!(messages[0].status, SupportMessageDeliveryStatus::Sent);
     }
 
     #[test]

core/crates/support/tests/model_tests.rs

@@ -43,10 +43,9 @@ fn test_support_message_mapping() {
         message.sender,
         SupportMessageSender::Agent(SupportAgent {
             name: "Test Agent".to_string(),
-            avatar_url: None,
         })
     );
-    assert_eq!(message.delivery_status, SupportMessageDeliveryStatus::Sent);
+    assert_eq!(message.status, SupportMessageDeliveryStatus::Sent);
 }
 
 #[test]

ios/Packages/GemAPI/Sources/GemAPIService.swift

@@ -87,7 +87,6 @@ public protocol GemAPIScanService: Sendable {
 }
 
 public protocol GemAPISupportService: Sendable {
-    func getSupportConversation() async throws -> SupportConversation?
     func getSupportMessages(fromTimestamp: Int) async throws -> [SupportMessage]
     func sendSupportMessage(input: SupportMessageInput) async throws -> SupportMessage
     func sendSupportImage(image: Data, fileName: String, mimeType: String) async throws -> SupportMessage
@@ -308,11 +307,6 @@ extension GemAPIService: GemAPIScanService {
 }
 
 extension GemAPIService: GemAPISupportService {
-    public func getSupportConversation() async throws -> SupportConversation? {
-        try await requestDevice(.getSupportConversation)
-            .mapResponse(as: SupportConversation?.self)
-    }
-
     public func getSupportMessages(fromTimestamp: Int) async throws -> [SupportMessage] {
         try await requestDevice(.getSupportMessages(fromTimestamp: fromTimestamp))
             .mapResponse(as: [SupportMessage].self)

ios/Packages/GemAPI/Sources/GemDeviceAPI.swift

@@ -29,7 +29,6 @@ public enum GemDeviceAPI: TargetType {
     case scanTransaction(payload: ScanTransactionPayload)
     case getWalletConfiguration(walletId: WalletId)
 
-    case getSupportConversation
     case getSupportMessages(fromTimestamp: Int)
     case sendSupportMessage(input: SupportMessageInput)
     case sendSupportImage(image: Data, fileName: String, mimeType: String)
@@ -83,7 +82,6 @@ public enum GemDeviceAPI: TargetType {
              .getFiatTransactions,
              .getNameRecord,
              .getWalletConfiguration,
-             .getSupportConversation,
              .getSupportMessages:
             .GET
         case .addDevice,
@@ -148,8 +146,6 @@ public enum GemDeviceAPI: TargetType {
             return "/v2/devices/scan/transaction"
         case .getWalletConfiguration:
             return "/v2/devices/wallet_configuration"
-        case .getSupportConversation:
-            return "/v2/devices/support"
         case let .getSupportMessages(fromTimestamp):
             return "/v2/devices/support/messages?from_timestamp=\(fromTimestamp)"
         case .sendSupportMessage:
@@ -237,7 +233,6 @@ public enum GemDeviceAPI: TargetType {
              .getFiatQuoteUrl,
              .getFiatTransactions,
              .getNameRecord,
-             .getSupportConversation,
              .getSupportMessages:
             return .plain
         case let .getPriceAlerts(assetId):

ios/Packages/GemAPI/TestKit/GemAPISupportService+TestKit.swift

@@ -5,25 +5,18 @@ import GemAPI
 import Primitives
 
 public actor GemAPISupportServiceMock: GemAPISupportService {
-    private let conversation: SupportConversation?
     private let messages: [SupportMessage]
 
     public private(set) var sentMessages: [SupportMessageInput] = []
     public private(set) var sentImages: [(image: Data, fileName: String, mimeType: String)] = []
     public private(set) var sentActions: [SupportAction] = []
 
     public init(
-        conversation: SupportConversation? = nil,
         messages: [SupportMessage] = [],
     ) {
-        self.conversation = conversation
         self.messages = messages
     }
 
-    public func getSupportConversation() async throws -> SupportConversation? {
-        conversation
-    }
-
     public func getSupportMessages(fromTimestamp _: Int) async throws -> [SupportMessage] {
         messages
     }
@@ -32,10 +25,9 @@ public actor GemAPISupportServiceMock: GemAPISupportService {
         sentMessages.append(input)
         return SupportMessage(
             id: "",
-            conversationId: "",
             content: input.content,
             sender: .user,
-            deliveryStatus: .sent,
+            status: .sent,
             createdAt: Date(),
             images: [],
         )
@@ -45,10 +37,9 @@ public actor GemAPISupportServiceMock: GemAPISupportService {
         sentImages.append((image, fileName, mimeType))
         return SupportMessage(
             id: "",
-            conversationId: "",
             content: "",
             sender: .user,
-            deliveryStatus: .sent,
+            status: .sent,
             createdAt: Date(),
             images: [],
         )

ios/Packages/Primitives/Sources/Generated/Stream.swift

@@ -67,7 +67,7 @@ public enum StreamEvent: Codable, Sendable {
 	case perpetual(StreamWalletUpdate)
 	case inAppNotification(StreamNotificationUpdate)
 	case fiatTransaction(StreamWalletUpdate)
-	case support(SupportStreamEvent)
+	case support(SupportMessage)
 
 	enum CodingKeys: String, CodingKey, Codable {
 		case prices,
@@ -130,7 +130,7 @@ public enum StreamEvent: Codable, Sendable {
 					return
 				}
 			case .support:
-				if let content = try? container.decode(SupportStreamEvent.self, forKey: .data) {
+				if let content = try? container.decode(SupportMessage.self, forKey: .data) {
 					self = .support(content)
 					return
 				}