diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nwc/NwcScreen.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nwc/NwcScreen.kt
index 6b9de88..349fc9c 100644
--- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nwc/NwcScreen.kt
+++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nwc/NwcScreen.kt
@@ -740,44 +740,4 @@ fun NwcConnectionRow(
             )
         }
     }
-}
-
-// ── Empty / Error states ──────────────────────────────────────────────────────
-
-@Composable
-private fun NwcEmptyContent(onAddNew: () -> Unit, modifier: Modifier = Modifier) {
-    Column(
-        modifier            = modifier.padding(32.dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-    ) {
-        Text("No connections yet", style = MaterialTheme.typography.titleMedium)
-        Spacer(Modifier.height(8.dp))
-        Text(
-            "Tap + to connect an app via Nostr Wallet Connect.",
-            style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        Spacer(Modifier.height(24.dp))
-        Button(onClick = onAddNew) {
-            Icon(Icons.Default.Add, contentDescription = null)
-            Spacer(Modifier.width(8.dp))
-            Text("Add connection")
-        }
-    }
-}
-
-@Composable
-private fun NwcErrorContent(message: String, onRetry: () -> Unit, modifier: Modifier = Modifier) {
-    Column(
-        modifier            = modifier.padding(32.dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-    ) {
-        Text("Something went wrong", style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.error)
-        Spacer(Modifier.height(8.dp))
-        Text(message, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-        Spacer(Modifier.height(24.dp))
-        OutlinedButton(onClick = onRetry) { Text("Retry") }
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nwc/NwcStates.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nwc/NwcStates.kt
new file mode 100644
index 0000000..3b6a5ab
--- /dev/null
+++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nwc/NwcStates.kt
@@ -0,0 +1,67 @@
+package com.bitcointxoko.gudariwallet.ui.nwc
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+// ── Empty state ──────────────────────────────────────────────────────
+
+@Composable
+internal fun NwcEmptyContent(
+    onAddNew : () -> Unit,
+    modifier : Modifier = Modifier
+) {
+    Column(
+        modifier            = modifier.padding(32.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        Text("No connections yet", style = MaterialTheme.typography.titleMedium)
+        Spacer(Modifier.height(8.dp))
+        Text(
+            "Tap + to connect an app via Nostr Wallet Connect.",
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+        Spacer(Modifier.height(24.dp))
+        Button(onClick = onAddNew) {
+            Icon(Icons.Default.Add, contentDescription = null)
+            Spacer(Modifier.width(8.dp))
+            Text("Add connection")
+        }
+    }
+}
+
+// ── Error state ──────────────────────────────────────────────────────
+
+@Composable
+internal fun NwcErrorContent(
+    message  : String,
+    onRetry  : () -> Unit,
+    modifier : Modifier = Modifier
+) {
+    Column(
+        modifier            = modifier.padding(32.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        Text(
+            "Something went wrong",
+            style = MaterialTheme.typography.titleMedium,
+            color = MaterialTheme.colorScheme.error
+        )
+        Spacer(Modifier.height(8.dp))
+        Text(
+            message,
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+        Spacer(Modifier.height(24.dp))
+        OutlinedButton(onClick = onRetry) { Text("Retry") }
+    }
+}