From 3b2ed490acca6658670d60712af615fd721ccdfa Mon Sep 17 00:00:00 2001
From: Bruno Muniz Azevedo Filho <bruno@elixxir.io>
Date: Wed, 10 Aug 2022 18:00:03 -0300
Subject: [PATCH] Fixing search ud
---
.../ViewModels/OnboardingUsernameViewModel.swift | 2 +-
Sources/ProfileFeature/ViewModels/ProfileViewModel.swift | 2 +-
.../ViewModels/RequestsReceivedViewModel.swift | 7 +++++--
Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift | 2 +-
.../xcshareddata/swiftpm/Package.resolved | 2 +-
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift b/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift
index f7a33cd6..3f155291 100644
--- a/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift
+++ b/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift
@@ -57,7 +57,7 @@ final class OnboardingUsernameViewModel {
let cMix = try self.initCMix()
try cMix.startNetworkFollower(timeoutMS: 10_000)
let e2e = try self.initE2E(cMix)
- _ = try self.initUD(alternative: false, e2e: e2e, cMix: cMix)
+ _ = try self.initUD(alternative: true, e2e: e2e, cMix: cMix)
_ = try self.initGroupManager(e2e)
_ = try self.initTransferManager(e2e)
diff --git a/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift b/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift
index 2529a652..143821ec 100644
--- a/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift
+++ b/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift
@@ -92,7 +92,7 @@ final class ProfileViewModel {
do {
try self.userDiscovery.removeFact(
.init(
- fact: isEmail ? self.emailStored! : self.phoneStored!,
+ fact: isEmail ? "E\(self.emailStored!)" : "P\(self.phoneStored!)",
type: isEmail ? FactType.email.rawValue : FactType.phone.rawValue
)
)
diff --git a/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift b/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
index 6fdef1c4..532ceaef 100644
--- a/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
+++ b/Sources/RequestsFeature/ViewModels/RequestsReceivedViewModel.swift
@@ -199,8 +199,11 @@ final class RequestsReceivedViewModel {
guard let self = self else { return }
do {
- fatalError(">>> Missing trackedId on group model")
- try self.groupManager.joinGroup(trackedGroupId: 0)
+ let trackedId = try self.groupManager
+ .getGroup(groupId: group.id)
+ .getTrackedID()
+
+ try self.groupManager.joinGroup(trackedGroupId: trackedId)
var group = group
group.authStatus = .participating
diff --git a/Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift b/Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift
index ce708886..2bd6769c 100644
--- a/Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift
+++ b/Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift
@@ -116,7 +116,7 @@ final class SearchLeftViewModel {
let _ = try SearchUD.live(
e2eId: self.e2e.getId(),
udContact: self.userDiscovery.getContact(),
- facts: [.init(fact: "\(prefix)\(content)", type: self.stateSubject.value.item.rawValue)],
+ facts: [Fact(fact: "\(prefix)\(content)", type: self.stateSubject.value.item.rawValue)],
callback: .init(handle: {
switch $0 {
case .success(let dataArray):
diff --git a/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved b/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 80cc1be6..b3d52689 100644
--- a/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -105,7 +105,7 @@
"location" : "https://git.xx.network/elixxir/elixxir-dapps-sdk-swift",
"state" : {
"branch" : "development",
- "revision" : "433586cd462551d9fc7661c637ff8af45b5c1a61"
+ "revision" : "35f4a7a21236ac861ae2887920ef9a6e6fd5f452"
}
},
{
--
GitLab