From 678cdfa37bd6724a984e9d97655971ec19d95ab2 Mon Sep 17 00:00:00 2001
From: smiurgh9 <simurgh9@pm.me>
Date: Sun, 17 May 2026 23:29:50 -0500
Subject: [PATCH 1/2] formatted the home-server errors to be non-SDK.

---
 Mactrix/Views/WelcomeSheetView.swift | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/Mactrix/Views/WelcomeSheetView.swift b/Mactrix/Views/WelcomeSheetView.swift
index 02d1509..7da8992 100644
--- a/Mactrix/Views/WelcomeSheetView.swift
+++ b/Mactrix/Views/WelcomeSheetView.swift
@@ -114,9 +114,23 @@ struct WelcomeSheetView: View {
             .frame(maxWidth: 300)
 
             if let showError = showError {
-                Text(showError.localizedDescription)
-                    .foregroundStyle(Color.red)
-                    .textSelection(.enabled)
+                let message: String = {
+                    switch showError {
+                    case let MatrixRustSDK.ClientBuildError
+                           .InvalidServerName(message: msg):
+                        return msg
+                    case let MatrixRustSDK.ClientBuildError
+                           .ServerUnreachable(message: msg):
+                        return msg
+                    default:
+                        Logger.matrixClient.error("\(showError.localizedDescription)")
+                        return "Something went wrong!"
+                    }
+                }()
+
+                Text(message)
+                  .foregroundStyle(Color.red)
+                  .textSelection(.enabled)
             }
         }
         .padding()

From e5cd737cfde89aefeca067602c0fad5d2715c135 Mon Sep 17 00:00:00 2001
From: smiurgh9 <simurgh9@pm.me>
Date: Sun, 17 May 2026 23:37:16 -0500
Subject: [PATCH 2/2] implemented the default placeholder as the home-server.

---
 Mactrix/Views/WelcomeSheetView.swift | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Mactrix/Views/WelcomeSheetView.swift b/Mactrix/Views/WelcomeSheetView.swift
index 7da8992..3c98089 100644
--- a/Mactrix/Views/WelcomeSheetView.swift
+++ b/Mactrix/Views/WelcomeSheetView.swift
@@ -1,6 +1,7 @@
 import AuthenticationServices
 import MatrixRustSDK
 import SwiftUI
+import OSLog
 
 struct WelcomeSheetView: View {
     @Environment(AppState.self) private var appState
@@ -17,7 +18,12 @@ struct WelcomeSheetView: View {
     @State private var loading: Bool = false
     @State private var showError: Error? = nil
 
+    private let defaultHomeserver = "matrix.org"
+
     func loadHomeserver() {
+        if homeserverField.isEmpty {
+            homeserverField = defaultHomeserver
+        }
         Task {
             loading = true
             defer { loading = false }
@@ -99,7 +105,8 @@ struct WelcomeSheetView: View {
                 .padding(.bottom)
 
             Form {
-                TextField("Homeserver", text: $homeserverField, prompt: Text("matrix.org"))
+                TextField("Homeserver", text: $homeserverField, prompt:
+                    Text(defaultHomeserver))
                     .disabled(loading)
                     .onSubmit { loadHomeserver() }