From a8395ee18c59afdc594e6257d1635d1465a29e25 Mon Sep 17 00:00:00 2001
From: Bruno Muniz Azevedo Filho <bruno@elixxir.io>
Date: Fri, 9 Sep 2022 17:47:39 -0300
Subject: [PATCH] Continued migration
---
App/client-ios.xcodeproj/project.pbxproj | 8 ++--
Package.swift | 9 ----
Sources/LaunchFeature/LaunchViewModel.swift | 44 +++++++++++++------
Sources/LaunchFeature/Resources/cmix.rip.crt | 21 ---------
Sources/LaunchFeature/Resources/udContact.bin | 1 -
.../OnboardingFeature/Resources/cmix.rip.crt | 21 ---------
.../OnboardingFeature/Resources/udContact.bin | 1 -
.../ViewModels/RequestsFailedViewModel.swift | 28 ++++++++----
.../ViewModels/RequestsSentViewModel.swift | 3 +-
Sources/RestoreFeature/Resources/cmix.rip.crt | 21 ---------
.../RestoreFeature/Resources/udContact.bin | 1 -
.../ViewModels/RestoreViewModel.swift | 37 +++++++++++++---
.../Controllers/ScanContainerController.swift | 13 ------
.../ViewModels/SearchLeftViewModel.swift | 4 +-
.../xcshareddata/swiftpm/Package.resolved | 6 +--
15 files changed, 92 insertions(+), 126 deletions(-)
delete mode 100644 Sources/LaunchFeature/Resources/cmix.rip.crt
delete mode 100644 Sources/LaunchFeature/Resources/udContact.bin
delete mode 100644 Sources/OnboardingFeature/Resources/cmix.rip.crt
delete mode 100644 Sources/OnboardingFeature/Resources/udContact.bin
delete mode 100644 Sources/RestoreFeature/Resources/cmix.rip.crt
delete mode 100644 Sources/RestoreFeature/Resources/udContact.bin
diff --git a/App/client-ios.xcodeproj/project.pbxproj b/App/client-ios.xcodeproj/project.pbxproj
index b1b9f433..285241f5 100644
--- a/App/client-ios.xcodeproj/project.pbxproj
+++ b/App/client-ios.xcodeproj/project.pbxproj
@@ -448,7 +448,7 @@
CODE_SIGN_ENTITLEMENTS = "client-ios/Resources/client-ios.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 233;
+ CURRENT_PROJECT_VERSION = 235;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = S6JDM2WW29;
ENABLE_BITCODE = NO;
@@ -487,7 +487,7 @@
CODE_SIGN_ENTITLEMENTS = "client-ios/Resources/client-ios.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 233;
+ CURRENT_PROJECT_VERSION = 235;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = S6JDM2WW29;
ENABLE_BITCODE = NO;
@@ -522,7 +522,7 @@
CODE_SIGN_ENTITLEMENTS = NotificationExtension/NotificationExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 233;
+ CURRENT_PROJECT_VERSION = 235;
DEVELOPMENT_TEAM = S6JDM2WW29;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -553,7 +553,7 @@
CODE_SIGN_ENTITLEMENTS = NotificationExtension/NotificationExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 233;
+ CURRENT_PROJECT_VERSION = 235;
DEVELOPMENT_TEAM = S6JDM2WW29;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
diff --git a/Package.swift b/Package.swift
index eb25b0ac..5823f35e 100644
--- a/Package.swift
+++ b/Package.swift
@@ -414,9 +414,6 @@ let package = Package(
.target(name: "GoogleDriveFeature"),
.target(name: "DependencyInjection"),
.product(name: "XXClient", package: "elixxir-dapps-sdk-swift"),
- ],
- resources: [
- .process("Resources"),
]
),
.target(
@@ -511,9 +508,6 @@ let package = Package(
.product(name: "XXMessengerClient", package: "elixxir-dapps-sdk-swift"),
.product(name: "CombineSchedulers", package: "combine-schedulers"),
.product(name: "XXLegacyDatabaseMigrator", package: "client-ios-db"),
- ],
- resources: [
- .process("Resources"),
]
),
.target(
@@ -616,9 +610,6 @@ let package = Package(
.target(name: "DependencyInjection"),
.product(name: "CombineSchedulers", package: "combine-schedulers"),
.product(name: "ScrollViewController", package: "ScrollViewController"),
- ],
- resources: [
- .process("Resources"),
]
),
.testTarget(
diff --git a/Sources/LaunchFeature/LaunchViewModel.swift b/Sources/LaunchFeature/LaunchViewModel.swift
index 06e9329d..d2a22b0a 100644
--- a/Sources/LaunchFeature/LaunchViewModel.swift
+++ b/Sources/LaunchFeature/LaunchViewModel.swift
@@ -111,20 +111,35 @@ final class LaunchViewModel {
XXLogger.live().debug($0)
}))
- guard let certPath = Bundle.module.path(forResource: "cmix.rip", ofType: "crt"),
- let contactFilePath = Bundle.module.path(forResource: "udContact", ofType: "bin") else {
- fatalError("Couldn't retrieve alternative UD credentials")
- }
-
- let address = "46.101.98.49:18001"
- let cert = try Data(contentsOf: URL(fileURLWithPath: certPath))
- let contactFile = try Data(contentsOf: URL(fileURLWithPath: contactFilePath))
-
var environment: MessengerEnvironment = .live()
- environment.udCert = cert
- environment.udAddress = address
- environment.udContact = contactFile
environment.ndfEnvironment = .mainnet
+ environment.udAddress = "46.101.98.49:18001"
+ environment.udCert = """
+ -----BEGIN CERTIFICATE-----
+ MIIDbDCCAlSgAwIBAgIJAOUNtZneIYECMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
+ BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQHDAlDbGFyZW1vbnQx
+ GzAZBgNVBAoMElByaXZhdGVncml0eSBDb3JwLjETMBEGA1UEAwwKKi5jbWl4LnJp
+ cDAeFw0xOTAzMDUxODM1NDNaFw0yOTAzMDIxODM1NDNaMGgxCzAJBgNVBAYTAlVT
+ MRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQHDAlDbGFyZW1vbnQxGzAZBgNV
+ BAoMElByaXZhdGVncml0eSBDb3JwLjETMBEGA1UEAwwKKi5jbWl4LnJpcDCCASIw
+ DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPP0WyVkfZA/CEd2DgKpcudn0oDh
+ Dwsjmx8LBDWsUgQzyLrFiVigfUmUefknUH3dTJjmiJtGqLsayCnWdqWLHPJYvFfs
+ WYW0IGF93UG/4N5UAWO4okC3CYgKSi4ekpfw2zgZq0gmbzTnXcHF9gfmQ7jJUKSE
+ tJPSNzXq+PZeJTC9zJAb4Lj8QzH18rDM8DaL2y1ns0Y2Hu0edBFn/OqavBJKb/uA
+ m3AEjqeOhC7EQUjVamWlTBPt40+B/6aFJX5BYm2JFkRsGBIyBVL46MvC02MgzTT9
+ bJIJfwqmBaTruwemNgzGu7Jk03hqqS1TUEvSI6/x8bVoba3orcKkf9HsDjECAwEA
+ AaMZMBcwFQYDVR0RBA4wDIIKKi5jbWl4LnJpcDANBgkqhkiG9w0BAQUFAAOCAQEA
+ neUocN4AbcQAC1+b3To8u5UGdaGxhcGyZBlAoenRVdjXK3lTjsMdMWb4QctgNfIf
+ U/zuUn2mxTmF/ekP0gCCgtleZr9+DYKU5hlXk8K10uKxGD6EvoiXZzlfeUuotgp2
+ qvI3ysOm/hvCfyEkqhfHtbxjV7j7v7eQFPbvNaXbLa0yr4C4vMK/Z09Ui9JrZ/Z4
+ cyIkxfC6/rOqAirSdIp09EGiw7GM8guHyggE4IiZrDslT8V3xIl985cbCxSxeW1R
+ tgH4rdEXuVe9+31oJhmXOE9ux2jCop9tEJMgWg7HStrJ5plPbb+HmjoX3nBO04E5
+ 6m52PyzMNV+2N21IPppKwA==
+ -----END CERTIFICATE-----
+ """.data(using: .utf8)!
+ environment.udContact = """
+ <xxc(2)7mbKFLE201WzH4SGxAOpHjjehwztIV+KGifi5L/PYPcDkAZiB9kZo+Dl3Vc7dD2SdZCFMOJVgwqGzfYRDkjc8RGEllBqNxq2sRRX09iQVef0kJQUgJCHNCOcvm6Ki0JJwvjLceyFh36iwK8oLbhLgqEZY86UScdACTyBCzBIab3ob5mBthYc3mheV88yq5PGF2DQ+dEvueUm+QhOSfwzppAJA/rpW9Wq9xzYcQzaqc3ztAGYfm2BBAHS7HVmkCbvZ/K07Xrl4EBPGHJYq12tWAN/C3mcbbBYUOQXyEzbSl/mO7sL3ORr0B4FMuqCi8EdlD6RO52pVhY+Cg6roRH1t5Ng1JxPt8Mv1yyjbifPhZ5fLKwxBz8UiFORfk0/jnhwgm25LRHqtNRRUlYXLvhv0HhqyYTUt17WNtCLATSVbqLrFGdy2EGadn8mP+kQNHp93f27d/uHgBNNe7LpuYCJMdWpoG6bOqmHEftxt0/MIQA8fTtTm3jJzv+7/QjZJDvQIv0SNdp8HFogpuwde+GuS4BcY7v5xz+ArGWcRR63ct2z83MqQEn9ODr1/gAAAgA7szRpDDQIdFUQo9mkWg8xBA==xxc>
+ """.data(using: .utf8)
let messenger = Messenger.live(environment)
@@ -175,8 +190,7 @@ final class LaunchViewModel {
isUnread: true,
text: payload.text,
replyMessageId: payload.reply?.messageId,
- roundURL: "https://www.google.com.br",
- //roundURL: $0.roundURL,
+ roundURL: $0.roundURL,
fileTransferId: nil
))
@@ -283,6 +297,8 @@ final class LaunchViewModel {
DependencyInjection.Container.shared.register(database)
+ _ = try? database.bulkUpdateContacts(.init(authStatus: [.requesting]), .init(authStatus: .requestFailed))
+ _ = try? database.bulkUpdateContacts(.init(authStatus: [.confirming]), .init(authStatus: .confirmationFailed))
_ = try? database.bulkUpdateContacts(.init(authStatus: [.verificationInProgress]), .init(authStatus: .verificationFailed))
}
diff --git a/Sources/LaunchFeature/Resources/cmix.rip.crt b/Sources/LaunchFeature/Resources/cmix.rip.crt
deleted file mode 100644
index baa29e6a..00000000
--- a/Sources/LaunchFeature/Resources/cmix.rip.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDbDCCAlSgAwIBAgIJAOUNtZneIYECMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQHDAlDbGFyZW1vbnQx
-GzAZBgNVBAoMElByaXZhdGVncml0eSBDb3JwLjETMBEGA1UEAwwKKi5jbWl4LnJp
-cDAeFw0xOTAzMDUxODM1NDNaFw0yOTAzMDIxODM1NDNaMGgxCzAJBgNVBAYTAlVT
-MRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQHDAlDbGFyZW1vbnQxGzAZBgNV
-BAoMElByaXZhdGVncml0eSBDb3JwLjETMBEGA1UEAwwKKi5jbWl4LnJpcDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPP0WyVkfZA/CEd2DgKpcudn0oDh
-Dwsjmx8LBDWsUgQzyLrFiVigfUmUefknUH3dTJjmiJtGqLsayCnWdqWLHPJYvFfs
-WYW0IGF93UG/4N5UAWO4okC3CYgKSi4ekpfw2zgZq0gmbzTnXcHF9gfmQ7jJUKSE
-tJPSNzXq+PZeJTC9zJAb4Lj8QzH18rDM8DaL2y1ns0Y2Hu0edBFn/OqavBJKb/uA
-m3AEjqeOhC7EQUjVamWlTBPt40+B/6aFJX5BYm2JFkRsGBIyBVL46MvC02MgzTT9
-bJIJfwqmBaTruwemNgzGu7Jk03hqqS1TUEvSI6/x8bVoba3orcKkf9HsDjECAwEA
-AaMZMBcwFQYDVR0RBA4wDIIKKi5jbWl4LnJpcDANBgkqhkiG9w0BAQUFAAOCAQEA
-neUocN4AbcQAC1+b3To8u5UGdaGxhcGyZBlAoenRVdjXK3lTjsMdMWb4QctgNfIf
-U/zuUn2mxTmF/ekP0gCCgtleZr9+DYKU5hlXk8K10uKxGD6EvoiXZzlfeUuotgp2
-qvI3ysOm/hvCfyEkqhfHtbxjV7j7v7eQFPbvNaXbLa0yr4C4vMK/Z09Ui9JrZ/Z4
-cyIkxfC6/rOqAirSdIp09EGiw7GM8guHyggE4IiZrDslT8V3xIl985cbCxSxeW1R
-tgH4rdEXuVe9+31oJhmXOE9ux2jCop9tEJMgWg7HStrJ5plPbb+HmjoX3nBO04E5
-6m52PyzMNV+2N21IPppKwA==
------END CERTIFICATE-----
diff --git a/Sources/LaunchFeature/Resources/udContact.bin b/Sources/LaunchFeature/Resources/udContact.bin
deleted file mode 100644
index b2611d41..00000000
--- a/Sources/LaunchFeature/Resources/udContact.bin
+++ /dev/null
@@ -1 +0,0 @@
-<xxc(2)7mbKFLE201WzH4SGxAOpHjjehwztIV+KGifi5L/PYPcDkAZiB9kZo+Dl3Vc7dD2SdZCFMOJVgwqGzfYRDkjc8RGEllBqNxq2sRRX09iQVef0kJQUgJCHNCOcvm6Ki0JJwvjLceyFh36iwK8oLbhLgqEZY86UScdACTyBCzBIab3ob5mBthYc3mheV88yq5PGF2DQ+dEvueUm+QhOSfwzppAJA/rpW9Wq9xzYcQzaqc3ztAGYfm2BBAHS7HVmkCbvZ/K07Xrl4EBPGHJYq12tWAN/C3mcbbBYUOQXyEzbSl/mO7sL3ORr0B4FMuqCi8EdlD6RO52pVhY+Cg6roRH1t5Ng1JxPt8Mv1yyjbifPhZ5fLKwxBz8UiFORfk0/jnhwgm25LRHqtNRRUlYXLvhv0HhqyYTUt17WNtCLATSVbqLrFGdy2EGadn8mP+kQNHp93f27d/uHgBNNe7LpuYCJMdWpoG6bOqmHEftxt0/MIQA8fTtTm3jJzv+7/QjZJDvQIv0SNdp8HFogpuwde+GuS4BcY7v5xz+ArGWcRR63ct2z83MqQEn9ODr1/gAAAgA7szRpDDQIdFUQo9mkWg8xBA==xxc>
\ No newline at end of file
diff --git a/Sources/OnboardingFeature/Resources/cmix.rip.crt b/Sources/OnboardingFeature/Resources/cmix.rip.crt
deleted file mode 100644
index baa29e6a..00000000
--- a/Sources/OnboardingFeature/Resources/cmix.rip.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDbDCCAlSgAwIBAgIJAOUNtZneIYECMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQHDAlDbGFyZW1vbnQx
-GzAZBgNVBAoMElByaXZhdGVncml0eSBDb3JwLjETMBEGA1UEAwwKKi5jbWl4LnJp
-cDAeFw0xOTAzMDUxODM1NDNaFw0yOTAzMDIxODM1NDNaMGgxCzAJBgNVBAYTAlVT
-MRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQHDAlDbGFyZW1vbnQxGzAZBgNV
-BAoMElByaXZhdGVncml0eSBDb3JwLjETMBEGA1UEAwwKKi5jbWl4LnJpcDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPP0WyVkfZA/CEd2DgKpcudn0oDh
-Dwsjmx8LBDWsUgQzyLrFiVigfUmUefknUH3dTJjmiJtGqLsayCnWdqWLHPJYvFfs
-WYW0IGF93UG/4N5UAWO4okC3CYgKSi4ekpfw2zgZq0gmbzTnXcHF9gfmQ7jJUKSE
-tJPSNzXq+PZeJTC9zJAb4Lj8QzH18rDM8DaL2y1ns0Y2Hu0edBFn/OqavBJKb/uA
-m3AEjqeOhC7EQUjVamWlTBPt40+B/6aFJX5BYm2JFkRsGBIyBVL46MvC02MgzTT9
-bJIJfwqmBaTruwemNgzGu7Jk03hqqS1TUEvSI6/x8bVoba3orcKkf9HsDjECAwEA
-AaMZMBcwFQYDVR0RBA4wDIIKKi5jbWl4LnJpcDANBgkqhkiG9w0BAQUFAAOCAQEA
-neUocN4AbcQAC1+b3To8u5UGdaGxhcGyZBlAoenRVdjXK3lTjsMdMWb4QctgNfIf
-U/zuUn2mxTmF/ekP0gCCgtleZr9+DYKU5hlXk8K10uKxGD6EvoiXZzlfeUuotgp2
-qvI3ysOm/hvCfyEkqhfHtbxjV7j7v7eQFPbvNaXbLa0yr4C4vMK/Z09Ui9JrZ/Z4
-cyIkxfC6/rOqAirSdIp09EGiw7GM8guHyggE4IiZrDslT8V3xIl985cbCxSxeW1R
-tgH4rdEXuVe9+31oJhmXOE9ux2jCop9tEJMgWg7HStrJ5plPbb+HmjoX3nBO04E5
-6m52PyzMNV+2N21IPppKwA==
------END CERTIFICATE-----
diff --git a/Sources/OnboardingFeature/Resources/udContact.bin b/Sources/OnboardingFeature/Resources/udContact.bin
deleted file mode 100644
index b2611d41..00000000
--- a/Sources/OnboardingFeature/Resources/udContact.bin
+++ /dev/null
@@ -1 +0,0 @@
-<xxc(2)7mbKFLE201WzH4SGxAOpHjjehwztIV+KGifi5L/PYPcDkAZiB9kZo+Dl3Vc7dD2SdZCFMOJVgwqGzfYRDkjc8RGEllBqNxq2sRRX09iQVef0kJQUgJCHNCOcvm6Ki0JJwvjLceyFh36iwK8oLbhLgqEZY86UScdACTyBCzBIab3ob5mBthYc3mheV88yq5PGF2DQ+dEvueUm+QhOSfwzppAJA/rpW9Wq9xzYcQzaqc3ztAGYfm2BBAHS7HVmkCbvZ/K07Xrl4EBPGHJYq12tWAN/C3mcbbBYUOQXyEzbSl/mO7sL3ORr0B4FMuqCi8EdlD6RO52pVhY+Cg6roRH1t5Ng1JxPt8Mv1yyjbifPhZ5fLKwxBz8UiFORfk0/jnhwgm25LRHqtNRRUlYXLvhv0HhqyYTUt17WNtCLATSVbqLrFGdy2EGadn8mP+kQNHp93f27d/uHgBNNe7LpuYCJMdWpoG6bOqmHEftxt0/MIQA8fTtTm3jJzv+7/QjZJDvQIv0SNdp8HFogpuwde+GuS4BcY7v5xz+ArGWcRR63ct2z83MqQEn9ODr1/gAAAgA7szRpDDQIdFUQo9mkWg8xBA==xxc>
\ No newline at end of file
diff --git a/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift b/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift
index 676fefbf..3e719cfd 100644
--- a/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift
+++ b/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift
@@ -30,7 +30,7 @@ final class RequestsFailedViewModel {
var backgroundScheduler: AnySchedulerOf<DispatchQueue> = DispatchQueue.global().eraseToAnyScheduler()
init() {
- database.fetchContactsPublisher(.init(authStatus: [.requestFailed]))
+ database.fetchContactsPublisher(.init(authStatus: [.requestFailed, .confirmationFailed]))
.assertNoFailure()
.map { data -> NSDiffableDataSourceSnapshot<Section, Request> in
var snapshot = NSDiffableDataSourceSnapshot<Section, Request>()
@@ -42,21 +42,33 @@ final class RequestsFailedViewModel {
}
func didTapStateButtonFor(request: Request) {
- guard case let .contact(contact) = request, request.status == .failedToRequest else { return }
+ guard case var .contact(contact) = request,
+ request.status == .failedToRequest || request.status == .failedToConfirm else { return }
hudSubject.send(.on)
backgroundScheduler.schedule { [weak self] in
guard let self = self else { return }
do {
- var myFacts = try self.messenger.ud.get()!.getFacts()
- myFacts.append(.init(type: .username, value: self.username!))
+ if request.status == .failedToRequest {
+ var myFacts = try self.messenger.ud.get()!.getFacts()
+ myFacts.append(.init(type: .username, value: self.username!))
- let _ = try self.messenger.e2e.get()!.requestAuthenticatedChannel(
- partner: XXClient.Contact.live(contact.marshaled!),
- myFacts: myFacts
- )
+ let _ = try self.messenger.e2e.get()!.requestAuthenticatedChannel(
+ partner: XXClient.Contact.live(contact.marshaled!),
+ myFacts: myFacts
+ )
+ contact.authStatus = .requested
+ } else {
+ let _ = try self.messenger.e2e.get()!.confirmReceivedRequest(
+ partner: XXClient.Contact.live(contact.marshaled!)
+ )
+
+ contact.authStatus = .friend
+ }
+
+ try self.database.saveContact(contact)
self.hudSubject.send(.none)
} catch {
self.hudSubject.send(.error(.init(with: error)))
diff --git a/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift b/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift
index 334a0eb2..269b1996 100644
--- a/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift
+++ b/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift
@@ -102,7 +102,8 @@ final class RequestsSentViewModel {
snapshot.appendItems(allRequests, toSection: .appearing)
self.itemsSubject.send(snapshot)
} catch {
- self.hudSubject.send(.error(.init(with: error)))
+ let xxError = CreateUserFriendlyErrorMessage.live(error.localizedDescription)
+ self.hudSubject.send(.error(.init(content: xxError)))
}
}
}
diff --git a/Sources/RestoreFeature/Resources/cmix.rip.crt b/Sources/RestoreFeature/Resources/cmix.rip.crt
deleted file mode 100644
index baa29e6a..00000000
--- a/Sources/RestoreFeature/Resources/cmix.rip.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDbDCCAlSgAwIBAgIJAOUNtZneIYECMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQHDAlDbGFyZW1vbnQx
-GzAZBgNVBAoMElByaXZhdGVncml0eSBDb3JwLjETMBEGA1UEAwwKKi5jbWl4LnJp
-cDAeFw0xOTAzMDUxODM1NDNaFw0yOTAzMDIxODM1NDNaMGgxCzAJBgNVBAYTAlVT
-MRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQHDAlDbGFyZW1vbnQxGzAZBgNV
-BAoMElByaXZhdGVncml0eSBDb3JwLjETMBEGA1UEAwwKKi5jbWl4LnJpcDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPP0WyVkfZA/CEd2DgKpcudn0oDh
-Dwsjmx8LBDWsUgQzyLrFiVigfUmUefknUH3dTJjmiJtGqLsayCnWdqWLHPJYvFfs
-WYW0IGF93UG/4N5UAWO4okC3CYgKSi4ekpfw2zgZq0gmbzTnXcHF9gfmQ7jJUKSE
-tJPSNzXq+PZeJTC9zJAb4Lj8QzH18rDM8DaL2y1ns0Y2Hu0edBFn/OqavBJKb/uA
-m3AEjqeOhC7EQUjVamWlTBPt40+B/6aFJX5BYm2JFkRsGBIyBVL46MvC02MgzTT9
-bJIJfwqmBaTruwemNgzGu7Jk03hqqS1TUEvSI6/x8bVoba3orcKkf9HsDjECAwEA
-AaMZMBcwFQYDVR0RBA4wDIIKKi5jbWl4LnJpcDANBgkqhkiG9w0BAQUFAAOCAQEA
-neUocN4AbcQAC1+b3To8u5UGdaGxhcGyZBlAoenRVdjXK3lTjsMdMWb4QctgNfIf
-U/zuUn2mxTmF/ekP0gCCgtleZr9+DYKU5hlXk8K10uKxGD6EvoiXZzlfeUuotgp2
-qvI3ysOm/hvCfyEkqhfHtbxjV7j7v7eQFPbvNaXbLa0yr4C4vMK/Z09Ui9JrZ/Z4
-cyIkxfC6/rOqAirSdIp09EGiw7GM8guHyggE4IiZrDslT8V3xIl985cbCxSxeW1R
-tgH4rdEXuVe9+31oJhmXOE9ux2jCop9tEJMgWg7HStrJ5plPbb+HmjoX3nBO04E5
-6m52PyzMNV+2N21IPppKwA==
------END CERTIFICATE-----
diff --git a/Sources/RestoreFeature/Resources/udContact.bin b/Sources/RestoreFeature/Resources/udContact.bin
deleted file mode 100644
index b2611d41..00000000
--- a/Sources/RestoreFeature/Resources/udContact.bin
+++ /dev/null
@@ -1 +0,0 @@
-<xxc(2)7mbKFLE201WzH4SGxAOpHjjehwztIV+KGifi5L/PYPcDkAZiB9kZo+Dl3Vc7dD2SdZCFMOJVgwqGzfYRDkjc8RGEllBqNxq2sRRX09iQVef0kJQUgJCHNCOcvm6Ki0JJwvjLceyFh36iwK8oLbhLgqEZY86UScdACTyBCzBIab3ob5mBthYc3mheV88yq5PGF2DQ+dEvueUm+QhOSfwzppAJA/rpW9Wq9xzYcQzaqc3ztAGYfm2BBAHS7HVmkCbvZ/K07Xrl4EBPGHJYq12tWAN/C3mcbbBYUOQXyEzbSl/mO7sL3ORr0B4FMuqCi8EdlD6RO52pVhY+Cg6roRH1t5Ng1JxPt8Mv1yyjbifPhZ5fLKwxBz8UiFORfk0/jnhwgm25LRHqtNRRUlYXLvhv0HhqyYTUt17WNtCLATSVbqLrFGdy2EGadn8mP+kQNHp93f27d/uHgBNNe7LpuYCJMdWpoG6bOqmHEftxt0/MIQA8fTtTm3jJzv+7/QjZJDvQIv0SNdp8HFogpuwde+GuS4BcY7v5xz+ArGWcRR63ct2z83MqQEn9ODr1/gAAAgA7szRpDDQIdFUQo9mkWg8xBA==xxc>
\ No newline at end of file
diff --git a/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift b/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift
index b3b275d6..bec2e6c6 100644
--- a/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift
+++ b/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift
@@ -224,10 +224,33 @@ final class RestoreViewModel {
identity: try cMix.makeReceptionIdentity()
)
- guard let certPath = Bundle.module.path(forResource: "cmix.rip", ofType: "crt"),
- let contactFilePath = Bundle.module.path(forResource: "udContact", ofType: "bin") else {
- fatalError("Couldn't retrieve alternative UD credentials")
- }
+ let udAddress = "46.101.98.49:18001"
+ let udCert = """
+ -----BEGIN CERTIFICATE-----
+ MIIDbDCCAlSgAwIBAgIJAOUNtZneIYECMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
+ BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQHDAlDbGFyZW1vbnQx
+ GzAZBgNVBAoMElByaXZhdGVncml0eSBDb3JwLjETMBEGA1UEAwwKKi5jbWl4LnJp
+ cDAeFw0xOTAzMDUxODM1NDNaFw0yOTAzMDIxODM1NDNaMGgxCzAJBgNVBAYTAlVT
+ MRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQHDAlDbGFyZW1vbnQxGzAZBgNV
+ BAoMElByaXZhdGVncml0eSBDb3JwLjETMBEGA1UEAwwKKi5jbWl4LnJpcDCCASIw
+ DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPP0WyVkfZA/CEd2DgKpcudn0oDh
+ Dwsjmx8LBDWsUgQzyLrFiVigfUmUefknUH3dTJjmiJtGqLsayCnWdqWLHPJYvFfs
+ WYW0IGF93UG/4N5UAWO4okC3CYgKSi4ekpfw2zgZq0gmbzTnXcHF9gfmQ7jJUKSE
+ tJPSNzXq+PZeJTC9zJAb4Lj8QzH18rDM8DaL2y1ns0Y2Hu0edBFn/OqavBJKb/uA
+ m3AEjqeOhC7EQUjVamWlTBPt40+B/6aFJX5BYm2JFkRsGBIyBVL46MvC02MgzTT9
+ bJIJfwqmBaTruwemNgzGu7Jk03hqqS1TUEvSI6/x8bVoba3orcKkf9HsDjECAwEA
+ AaMZMBcwFQYDVR0RBA4wDIIKKi5jbWl4LnJpcDANBgkqhkiG9w0BAQUFAAOCAQEA
+ neUocN4AbcQAC1+b3To8u5UGdaGxhcGyZBlAoenRVdjXK3lTjsMdMWb4QctgNfIf
+ U/zuUn2mxTmF/ekP0gCCgtleZr9+DYKU5hlXk8K10uKxGD6EvoiXZzlfeUuotgp2
+ qvI3ysOm/hvCfyEkqhfHtbxjV7j7v7eQFPbvNaXbLa0yr4C4vMK/Z09Ui9JrZ/Z4
+ cyIkxfC6/rOqAirSdIp09EGiw7GM8guHyggE4IiZrDslT8V3xIl985cbCxSxeW1R
+ tgH4rdEXuVe9+31oJhmXOE9ux2jCop9tEJMgWg7HStrJ5plPbb+HmjoX3nBO04E5
+ 6m52PyzMNV+2N21IPppKwA==
+ -----END CERTIFICATE-----
+ """.data(using: .utf8)!
+ let udContact = """
+ <xxc(2)7mbKFLE201WzH4SGxAOpHjjehwztIV+KGifi5L/PYPcDkAZiB9kZo+Dl3Vc7dD2SdZCFMOJVgwqGzfYRDkjc8RGEllBqNxq2sRRX09iQVef0kJQUgJCHNCOcvm6Ki0JJwvjLceyFh36iwK8oLbhLgqEZY86UScdACTyBCzBIab3ob5mBthYc3mheV88yq5PGF2DQ+dEvueUm+QhOSfwzppAJA/rpW9Wq9xzYcQzaqc3ztAGYfm2BBAHS7HVmkCbvZ/K07Xrl4EBPGHJYq12tWAN/C3mcbbBYUOQXyEzbSl/mO7sL3ORr0B4FMuqCi8EdlD6RO52pVhY+Cg6roRH1t5Ng1JxPt8Mv1yyjbifPhZ5fLKwxBz8UiFORfk0/jnhwgm25LRHqtNRRUlYXLvhv0HhqyYTUt17WNtCLATSVbqLrFGdy2EGadn8mP+kQNHp93f27d/uHgBNNe7LpuYCJMdWpoG6bOqmHEftxt0/MIQA8fTtTm3jJzv+7/QjZJDvQIv0SNdp8HFogpuwde+GuS4BcY7v5xz+ArGWcRR63ct2z83MqQEn9ODr1/gAAAgA7szRpDDQIdFUQo9mkWg8xBA==xxc>
+ """.data(using: .utf8)
let userDiscovery = try NewUdManagerFromBackup.live(
params: .init(
@@ -235,9 +258,9 @@ final class RestoreViewModel {
username: .init(type: .username, value: facts.username),
email: emailFact,
phone: phoneFact,
- cert: Data(contentsOf: URL(fileURLWithPath: certPath)),
- contact: Data(contentsOf: URL(fileURLWithPath: contactFilePath)),
- address: "46.101.98.49:18001"
+ cert: udCert,
+ contact: udContact!,
+ address: udAddress
),
follower: .init(handle: { cMix.networkFollowerStatus() })
)
diff --git a/Sources/ScanFeature/Controllers/ScanContainerController.swift b/Sources/ScanFeature/Controllers/ScanContainerController.swift
index fb1f9d44..c61a6f59 100644
--- a/Sources/ScanFeature/Controllers/ScanContainerController.swift
+++ b/Sources/ScanFeature/Controllers/ScanContainerController.swift
@@ -11,7 +11,6 @@ public final class ScanContainerController: UIViewController {
lazy private var screenView = ScanContainerView()
- private var previousPoint: CGPoint = .zero
private let scanController = ScanController()
private let displayController = ScanDisplayController()
@@ -48,22 +47,10 @@ public final class ScanContainerController: UIViewController {
screenView.bringSubviewToFront(screenView.segmentedControl)
}
- public override func viewDidLayoutSubviews() {
- super.viewDidLayoutSubviews()
- screenView.scrollView.contentOffset = previousPoint
- }
-
- public override func viewWillDisappear(_ animated: Bool) {
- super.viewWillDisappear(animated)
- previousPoint = screenView.scrollView.contentOffset
- screenView.scrollView.contentOffset = .zero
- }
-
public override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
statusBarController.style.send(.lightContent)
navigationController?.navigationBar.customize(translucent: true)
- screenView.scrollView.contentOffset = .zero
}
public override func viewDidLoad() {
diff --git a/Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift b/Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift
index 2d8b7827..1ff0b691 100644
--- a/Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift
+++ b/Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift
@@ -142,10 +142,12 @@ final class SearchLeftViewModel {
return
}
- var factType: FactType = .email
+ var factType: FactType = .username
if stateSubject.value.item == .phone {
factType = .phone
+ } else if stateSubject.value.item == .email {
+ factType = .email
}
backgroundScheduler.schedule { [weak self] in
diff --git a/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved b/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 23ec4727..d3858a43 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" : "f1ea0689bbd0e2faa978d5b478c9d594a9f96115"
+ "revision" : "5b190dca4d200203cbe371a6f8e179842d459176"
}
},
{
@@ -328,8 +328,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-composable-architecture.git",
"state" : {
- "revision" : "5b78fbcb0583568392762b15a262b3106cfb5185",
- "version" : "0.40.0"
+ "revision" : "cbe013b42b3c368957f8f882c960b93845e1589d",
+ "version" : "0.40.1"
}
},
{
--
GitLab