From 11c3a6eb30de08a74bb9c3feeb7763e90c8bdc76 Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Wed, 30 Oct 2024 20:25:40 +0400
Subject: [PATCH] wip

---
 .../NetworkAndServers/NetworkAndServers.swift | 24 ++++++++-----------
 .../NetworkAndServers/OperatorView.swift      | 17 ++-----------
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NetworkAndServers.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NetworkAndServers.swift
index b59e1b44f2..d784e17563 100644
--- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NetworkAndServers.swift
+++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/NetworkAndServers.swift
@@ -27,7 +27,16 @@ struct NetworkAndServers: View {
     var body: some View {
         VStack {
             List {
-                presetServersSection()
+                let smpServers = [ServerCfg.sampleData.preset, ServerCfg.sampleData.preset]
+                let xftpServers = [ServerCfg.sampleData.xftpPreset, ServerCfg.sampleData.xftpPreset]
+                Section {
+                    ForEach($serverOperators) { srvOperator in
+                        serverOperatorView(srvOperator, smpServers, xftpServers)
+                    }
+                } header: {
+                    Text("Preset servers")
+                        .foregroundColor(theme.colors.secondary)
+                }
 
                 Section {
                     NavigationLink {
@@ -79,19 +88,6 @@ struct NetworkAndServers: View {
         }
     }
 
-    @ViewBuilder private func presetServersSection() -> some View {
-        let smpServers = [ServerCfg.sampleData.preset, ServerCfg.sampleData.preset]
-        let xftpServers = [ServerCfg.sampleData.xftpPreset, ServerCfg.sampleData.xftpPreset]
-        Section {
-            ForEach($serverOperators) { srvOperator in
-                serverOperatorView(srvOperator, smpServers, xftpServers)
-            }
-        } header: {
-            Text("Preset servers")
-                .foregroundColor(theme.colors.secondary)
-        }
-    }
-
     @ViewBuilder private func serverOperatorView(
         _ serverOperator: Binding<ServerOperator>,
         _ smpServers: [ServerCfg],
diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift
index 86c1007c8c..dbbd062503 100644
--- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift
+++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift
@@ -32,9 +32,6 @@ struct OperatorView: View {
                 Section {
                     infoViewLink()
                     useOperatorToggle()
-                    if serverOperatorToEdit.enabled || serverOperatorToEdit.conditionsAcceptance.conditionsAccepted {
-                        viewConditionsButton()
-                    }
                 } header: {
                     Text("Operator")
                         .foregroundColor(theme.colors.secondary)
@@ -42,9 +39,11 @@ struct OperatorView: View {
                     switch (serverOperatorToEdit.conditionsAcceptance) {
                     case let .accepted(date):
                         Text("Conditions accepted on: \(conditionsTimestamp(date)).")
+                            .foregroundColor(theme.colors.secondary)
                     case let .reviewAvailable(deadline):
                         if serverOperatorToEdit.enabled {
                             Text("Review conditions until: \(conditionsTimestamp(deadline)).")
+                                .foregroundColor(theme.colors.secondary)
                         }
                     case .reviewRequired:
                         EmptyView()
@@ -142,18 +141,6 @@ struct OperatorView: View {
         }
     }
 
-    private func viewConditionsButton() -> some View {
-        Button {
-            showConditionsSheet = true
-        } label: {
-            if case .accepted = serverOperatorToEdit.conditionsAcceptance {
-                Text("Conditions accepted")
-            } else {
-                Text("Review conditions")
-            }
-        }
-    }
-
     private func usageRolesSection() -> some View {
         Section(header: Text("Use operator").foregroundColor(theme.colors.secondary)) {
             Toggle("For storage", isOn: $serverOperatorToEdit.roles.storage)