From caedaee8d24bbf183fa222e294aa3dd905f7fdc7 Mon Sep 17 00:00:00 2001
From: Bruno Muniz <bf2002@gmail.com>
Date: Fri, 24 Jun 2022 18:36:51 -0300
Subject: [PATCH] Updated db package 1.0.4 and fixed chat liss
---
Package.swift | 2 +-
.../ChatListFeature/ViewModel/ChatListViewModel.swift | 10 +++++++++-
.../xcshareddata/swiftpm/Package.resolved | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Package.swift b/Package.swift
index e19749c3..8c432a07 100644
--- a/Package.swift
+++ b/Package.swift
@@ -66,7 +66,7 @@ let package = Package(
.package(url: "https://github.com/pointfreeco/combine-schedulers", from: "0.5.0"),
.package(url: "https://github.com/kishikawakatsumi/KeychainAccess", from: "4.2.1"),
.package(url: "https://github.com/google/google-api-objectivec-client-for-rest", from: "1.6.0"),
- .package(url: "https://git.xx.network/elixxir/client-ios-db.git", .upToNextMajor(from: "1.0.3")),
+ .package(url: "https://git.xx.network/elixxir/client-ios-db.git", .upToNextMajor(from: "1.0.4")),
.package(url: "https://github.com/firebase/firebase-ios-sdk.git", .upToNextMajor(from: "8.10.0")),
.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git",.upToNextMajor(from: "0.32.0"))
],
diff --git a/Sources/ChatListFeature/ViewModel/ChatListViewModel.swift b/Sources/ChatListFeature/ViewModel/ChatListViewModel.swift
index b8f1792a..253db4fe 100644
--- a/Sources/ChatListFeature/ViewModel/ChatListViewModel.swift
+++ b/Sources/ChatListFeature/ViewModel/ChatListViewModel.swift
@@ -123,7 +123,15 @@ final class ChatListViewModel {
private let hudSubject = CurrentValueSubject<HUDStatus, Never>(.none)
init() {
- session.dbManager.fetchChatInfosPublisher(.init(userId: session.myId))
+ session.dbManager.fetchChatInfosPublisher(
+ ChatInfo.Query(
+ contactChatInfoQuery: .init(
+ userId: session.myId,
+ authStatus: [.friend]
+ ),
+ groupChatInfoQuery: GroupChatInfo.Query(),
+ groupQuery: Group.Query(withMessages: false)
+ ))
.assertNoFailure()
.sink { [unowned self] in chatsSubject.send($0) }
.store(in: &cancellables)
diff --git a/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved b/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 4164e3b8..c3d515c0 100644
--- a/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -50,8 +50,8 @@
"kind" : "remoteSourceControl",
"location" : "https://git.xx.network/elixxir/client-ios-db.git",
"state" : {
- "revision" : "bd3a8c3340c5164d9c6e8b088f8da21e6fc3bf49",
- "version" : "1.0.3"
+ "revision" : "0c7f8f2219cde03d3fb6b2354da738a4b09234e9",
+ "version" : "1.0.4"
}
},
{
--
GitLab