Merge branch 'main' of https://github.com/xmtp/xmtp-ios into np/conse…

…nt-v3
xmtp · Sep 20, 2024 · d1a5514 · d1a5514
2 parents a1d9bb6 + cbfc025
commit d1a5514
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/Sources/XMTPiOS/Contacts.swift b/Sources/XMTPiOS/Contacts.swift
@@ -73,6 +73,7 @@ public class ConsentList {
 			guard let identifier = identifier else {
 				throw ContactError.invalidIdentifier
 			}
+
 			let newDate = Date()
 
 			let pagination = Pagination(

diff --git a/Tests/XMTPTests/V3ClientTests.swift b/Tests/XMTPTests/V3ClientTests.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  V3ClientTests.swift
 //  
 //
 //  Created by Naomi Plasterer on 9/19/24.

diff --git a/...xample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...xample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -59,8 +59,16 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/xmtp/libxmtp-swift.git",
       "state" : {
+<<<<<<< HEAD
         "revision" : "9398f5516b18044bb94e5d21dabd7a5ddfc25062",
         "version" : "0.5.8-beta6"
+||||||| e16cd8d
+        "revision" : "abd4f896f539e5bb090c85022177d775ad08dcb1",
+        "version" : "0.5.8-beta4"
+=======
+        "revision" : "9d5153926ac1bfcab76802d5a7626c2cf47212a4",
+        "version" : "0.5.8-beta5"
+>>>>>>> cbfc025e7787d7eb22cdb0024004d8386468fb63
       }
     },
     {

diff --git a/XMTPiOSExample/XMTPiOSExample/Views/ConversationListView.swift b/XMTPiOSExample/XMTPiOSExample/Views/ConversationListView.swift
@@ -91,7 +91,7 @@ struct ConversationListView: View {
 		}
 		.task {
 			do {
-				for try await conversation in await client.conversations.stream() {
+				for try await conversation in try await client.conversations.stream() {
 					conversations.insert(.conversation(conversation), at: 0)
 
 					await add(conversations: [.conversation(conversation)])

diff --git a/XMTPiOSExample/XMTPiOSExample/Views/NewConversationView.swift b/XMTPiOSExample/XMTPiOSExample/Views/NewConversationView.swift
@@ -25,7 +25,7 @@ enum ConversationOrGroup: Hashable {
 		case .conversation(let conversation):
 			return conversation.topic
 		case .group(let group):
-			return group.id.toHexString()
+			return group.id.toHexEncodedString()
 		}
 	}