fix: missing filter missing in the empty state (#2432)

* feat: add custom modifier for plain text field * refactor * fix: display header with filter button in the empty state * refactor into separate extensions
novasamatech · Feb 20, 2025 · e9224ba · e9224ba
1 parent 90fbea6
commit e9224ba
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 25 deletions.
diff --git a/ios/PolkadotVault/Screens/KeyDetails/Views/KeyDetailsView+EmptyState.swift b/ios/PolkadotVault/Screens/KeyDetails/Views/KeyDetailsView+EmptyState.swift
@@ -9,7 +9,21 @@ import SwiftUI
 
 extension KeyDetailsView {
     @ViewBuilder
-    func emptyState() -> some View {
+    func emptyKeysList() -> some View {
+        VStack(spacing: 0) {
+            // Main key cell
+            rootKeyHeader()
+            // Derived Keys header
+            listHeader()
+            Spacer()
+            // Empty state
+            emptyState()
+            Spacer()
+        }
+    }
+
+    @ViewBuilder
+    private func emptyState() -> some View {
         VStack(spacing: 0) {
             Localizable.KeyDetails.Label.EmptyState.header.text
                 .font(PrimaryFont.titleM.font)

diff --git a/ios/PolkadotVault/Screens/KeyDetails/Views/KeyDetailsView+Header.swift b/ios/PolkadotVault/Screens/KeyDetails/Views/KeyDetailsView+Header.swift
@@ -53,4 +53,24 @@ extension KeyDetailsView {
             EmptyView()
         }
     }
+
+    @ViewBuilder
+    func listHeader() -> some View {
+        HStack {
+            Localizable.KeyDetails.Label.derived.text
+                .font(PrimaryFont.bodyM.font)
+            Spacer().frame(maxWidth: .infinity)
+            Image(.switches)
+                .foregroundColor(
+                    viewModel.isFilteringActive ? .accentPink300 : .textAndIconsTertiary
+                )
+                .frame(width: Heights.actionSheetButton)
+                .onTapGesture {
+                    viewModel.onNetworkSelectionTap()
+                }
+        }
+        .foregroundColor(.textAndIconsTertiary)
+        .padding(.horizontal, Spacing.large)
+        .padding(.top, Spacing.medium)
+    }
 }
diff --git a/ios/PolkadotVault/Screens/KeyDetails/Views/KeyDetailsView+MainList.swift b/ios/PolkadotVault/Screens/KeyDetails/Views/KeyDetailsView+MainList.swift
@@ -11,27 +11,14 @@ extension KeyDetailsView {
     @ViewBuilder
     func derivedKeysList() -> some View {
         ScrollView(showsIndicators: false) {
-            // Main key cell
-            rootKeyHeader()
-            // Derived Keys header
-            HStack {
-                Localizable.KeyDetails.Label.derived.text
-                    .font(PrimaryFont.bodyM.font)
-                Spacer().frame(maxWidth: .infinity)
-                Image(.switches)
-                    .foregroundColor(
-                        viewModel.isFilteringActive ? .accentPink300 : .textAndIconsTertiary
-                    )
-                    .frame(width: Heights.actionSheetButton)
-                    .onTapGesture {
-                        viewModel.onNetworkSelectionTap()
-                    }
+            VStack(spacing: 0) {
+                // Main key cell
+                rootKeyHeader()
+                // Derived Keys header
+                listHeader()
+                // List
+                derivedKeys()
             }
-            .foregroundColor(.textAndIconsTertiary)
-            .padding(.horizontal, Spacing.large)
-            .padding(.top, Spacing.medium)
-            // List
-            derivedKeys()
         }
     }
 

diff --git a/ios/PolkadotVault/Screens/KeyDetails/Views/KeyDetailsView.swift b/ios/PolkadotVault/Screens/KeyDetails/Views/KeyDetailsView.swift
@@ -30,10 +30,7 @@ struct KeyDetailsView: View {
                     case .list:
                         derivedKeysList()
                     case .emptyState:
-                        rootKeyHeader()
-                        Spacer()
-                        emptyState()
-                        Spacer()
+                        emptyKeysList()
                     }
                 }
                 .navigationBarHidden(true)