From 55392273570cebcac86366dafe9fd05b247a1b1b Mon Sep 17 00:00:00 2001
From: Antoine Sein <antoine.sein@mailgun.com>
Date: Fri, 12 Apr 2024 09:56:08 +0200
Subject: [PATCH] Update merged code with new package exports

---
 packages/conversation/src/rest/v1/messages/messages-api.ts     | 3 ++-
 .../conversation/tests/rest/v1/messages/messages-api.test.ts   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/conversation/src/rest/v1/messages/messages-api.ts b/packages/conversation/src/rest/v1/messages/messages-api.ts
index 044bf1b0..ec19b487 100644
--- a/packages/conversation/src/rest/v1/messages/messages-api.ts
+++ b/packages/conversation/src/rest/v1/messages/messages-api.ts
@@ -20,6 +20,7 @@ import {
   SendListMessageRequestData,
   SendLocationMessageRequestData,
   SendMediaMessageRequestData,
+  SendMessageRequest,
   SendMessageRequestData,
   SendMessageResponse,
   SendTemplateMessageRequestData,
@@ -294,7 +295,7 @@ export class MessagesApi extends ConversationDomainApi {
   }
 
   performSendMessageRequestBodyTransformation(
-    body: SendMessageRequest<Recipient>
+    body: SendMessageRequest<Recipient>,
   ): SendMessageRequest<Recipient> {
     const requestDataBody = { ...body };
     // 'ttl' field can be a number or a string and needs to be formatted as for instance "10s" to be accepted by the server
diff --git a/packages/conversation/tests/rest/v1/messages/messages-api.test.ts b/packages/conversation/tests/rest/v1/messages/messages-api.test.ts
index 608fa947..baa0f2c0 100644
--- a/packages/conversation/tests/rest/v1/messages/messages-api.test.ts
+++ b/packages/conversation/tests/rest/v1/messages/messages-api.test.ts
@@ -198,7 +198,7 @@ describe('MessagesApi', () => {
       });
 
     it('should format the ttl field', () => {
-      const requestBody: SendMessageRequest<Recipient> = {
+      const requestBody: Conversation.SendMessageRequest<Conversation.Recipient> = {
         ...sendMessageRequest,
         ...recipientContactId,
       };