diff --git a/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift b/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift index f7a33cd65e3be8a158a1516663548f00651bffaf..3f155291e565b31e173009b516f814366b75e8f4 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 2529a652935d8139e72c89e4b20624d94be6384c..143821ece93980aa9fd61195608952c7501f7400 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 6fdef1c4a0dbe584d6da212f19a857d41f7d625d..532ceaef3b13ac1057aa63d1da85f1a7fb73b621 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 ce708886adcc833a0c2de91e2e3608e40805ad17..2bd6769ca2accc82c90e2c2c7b2612a72683aa3e 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 80cc1be65b839abe947eb22437e7cd82732256f6..b3d52689c4268b480aabc97e45b2f30efe60a764 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" } }, {