From 4a38e1cd5aef3edff0c76177b8ef859759d42f75 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Mon, 5 Sep 2022 10:18:33 +0200
Subject: [PATCH] Remove username from HomeFeature
---
.../Sources/HomeFeature/HomeFeature.swift | 9 ------
.../Sources/HomeFeature/HomeView.swift | 10 -------
.../HomeFeatureTests/HomeFeatureTests.swift | 28 -------------------
3 files changed, 47 deletions(-)
diff --git a/Examples/xx-messenger/Sources/HomeFeature/HomeFeature.swift b/Examples/xx-messenger/Sources/HomeFeature/HomeFeature.swift
index 29abfb6b..5c20364d 100644
--- a/Examples/xx-messenger/Sources/HomeFeature/HomeFeature.swift
+++ b/Examples/xx-messenger/Sources/HomeFeature/HomeFeature.swift
@@ -8,16 +8,13 @@ import XXMessengerClient
public struct HomeState: Equatable {
public init(
- username: String? = nil,
failure: String? = nil,
register: RegisterState? = nil
) {
- self.username = username
self.failure = failure
self.register = register
}
- @BindableState public var username: String?
@BindableState public var failure: String?
@BindableState public var register: RegisterState?
}
@@ -76,12 +73,6 @@ public let homeReducer = Reducer<HomeState, HomeAction, HomeEnvironment>
}
try env.messenger.logIn()
}
-
- if let contact = env.messenger.e2e()?.getContact(),
- let facts = try? contact.getFacts(),
- let username = facts.first(where: { $0.type == 0 })?.fact {
- subscriber.send(.set(\.$username, username))
- }
} catch {
subscriber.send(.set(\.$failure, error.localizedDescription))
}
diff --git a/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift b/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift
index e40bb1db..7dd8f668 100644
--- a/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift
+++ b/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift
@@ -11,11 +11,9 @@ public struct HomeView: View {
let store: Store<HomeState, HomeAction>
struct ViewState: Equatable {
- var username: String?
var failure: String?
init(state: HomeState) {
- username = state.username
failure = state.failure
}
}
@@ -24,14 +22,6 @@ public struct HomeView: View {
WithViewStore(store.scope(state: ViewState.init)) { viewStore in
NavigationView {
Form {
- if let username = viewStore.username {
- Section {
- Text(username)
- } header: {
- Text("Username")
- }
- }
-
if let failure = viewStore.failure {
Section {
Text(failure)
diff --git a/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift b/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift
index efdd867f..ddb6b035 100644
--- a/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift
@@ -47,7 +47,6 @@ final class HomeFeatureTests: XCTestCase {
environment: .unimplemented
)
- let username = "test_username"
let bgQueue = DispatchQueue.test
let mainQueue = DispatchQueue.test
var messengerDidStartWithTimeout: [Int] = []
@@ -62,15 +61,6 @@ final class HomeFeatureTests: XCTestCase {
store.environment.messenger.isLoggedIn.run = { false }
store.environment.messenger.isRegistered.run = { true }
store.environment.messenger.logIn.run = { messengerDidLogIn += 1 }
- store.environment.messenger.e2e.get = {
- var e2e = E2E.unimplemented
- e2e.getContact.run = {
- var contact = Contact.unimplemented(Data())
- contact.getFactsFromContact.run = { _ in [Fact(fact: username, type: 0)] }
- return contact
- }
- return e2e
- }
store.send(.start)
@@ -81,10 +71,6 @@ final class HomeFeatureTests: XCTestCase {
XCTAssertNoDifference(messengerDidLogIn, 1)
mainQueue.advance()
-
- store.receive(.set(\.$username, username)) {
- $0.username = username
- }
}
func testRegisterFinished() {
@@ -96,7 +82,6 @@ final class HomeFeatureTests: XCTestCase {
environment: .unimplemented
)
- let username = "test_username"
let bgQueue = DispatchQueue.test
let mainQueue = DispatchQueue.test
var messengerDidStartWithTimeout: [Int] = []
@@ -109,15 +94,6 @@ final class HomeFeatureTests: XCTestCase {
store.environment.messenger.isLoggedIn.run = { false }
store.environment.messenger.isRegistered.run = { true }
store.environment.messenger.logIn.run = { messengerDidLogIn += 1 }
- store.environment.messenger.e2e.get = {
- var e2e = E2E.unimplemented
- e2e.getContact.run = {
- var contact = Contact.unimplemented(Data())
- contact.getFactsFromContact.run = { _ in [Fact(fact: username, type: 0)] }
- return contact
- }
- return e2e
- }
store.send(.register(.finished)) {
$0.register = nil
@@ -131,10 +107,6 @@ final class HomeFeatureTests: XCTestCase {
XCTAssertNoDifference(messengerDidLogIn, 1)
mainQueue.advance()
-
- store.receive(.set(\.$username, username)) {
- $0.username = username
- }
}
func testStartMessengerStartFailure() {
--
GitLab