Skip to content

M5: Cleanup & Copy Alignment #7415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashleeradka merged 1 commit into from
Feb 24, 2026
Merged

M5: Cleanup & Copy Alignment #7415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clients/ios/Views/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ struct ContentView: View {
.font(VFont.title)
.foregroundColor(VColor.textPrimary)

Text("Unable to reach your Mac's gateway. This could mean your Mac is offline, the tunnel is down, or ingress is disabled.")
Text("Unable to reach your Mac's gateway. This could mean your Mac is offline, the tunnel is down, or the gateway is not active.")
.font(VFont.body)
.foregroundColor(VColor.textSecondary)
.multilineTextAlignment(.center)
Expand Down
2 changes: 1 addition & 1 deletion clients/ios/Views/Settings/ConnectionSettingsSection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ struct DaemonConnectionSection: View {
Image(systemName: "exclamationmark.triangle.fill")
.foregroundColor(VColor.warning)
.font(.system(size: 12))
Text("Local HTTP connections are unencrypted. Only use on trusted networks.")
Text("Debug only. Uses unencrypted HTTP over your local network. Do not use in production.")
.font(VFont.caption)
.foregroundColor(VColor.warning)
}
Expand Down
2 changes: 1 addition & 1 deletion clients/ios/Views/Settings/QRPairingSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ struct QRPairingSheet: View {
.cornerRadius(VRadius.md)
.padding(.horizontal, VSpacing.lg)

Text("Open Vellum on your Mac, go to Settings \u{2192} Connect, and tap Show QR Code. Ingress must be enabled on the Mac for pairing.")
Text("Open Vellum on your Mac, go to Settings \u{2192} Connect, and tap Show QR Code. The gateway must be configured on the Mac for pairing.")
.font(VFont.caption)
.foregroundColor(VColor.textMuted)
.multilineTextAlignment(.center)
Expand Down
8 changes: 4 additions & 4 deletions clients/macos/vellum-assistant/Features/MainWindow/Panels/SettingsPanel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ struct SettingsPanel: View {

// MARK: - Ingress Global Config Card

/// Card showing the resolved gateway URL for public ingress, referencing global Connect config.
/// Card showing the resolved gateway URL, referencing global Connect config.
private var ingressGlobalConfigCard: some View {
VStack(alignment: .leading, spacing: VSpacing.sm) {
Text("Using Global Gateway & Token")
Expand Down Expand Up @@ -1096,11 +1096,11 @@ struct SettingsPanel: View {
)
}

/// Collapsed override section for per-integration ingress gateway URL customization.
/// Collapsed override section for per-integration gateway URL customization.
private var ingressOverrideSection: some View {
DisclosureGroup("Override") {
VStack(alignment: .leading, spacing: VSpacing.sm) {
Toggle("Use custom gateway for ingress", isOn: $ingressUseOverride)
Toggle("Use custom gateway URL", isOn: $ingressUseOverride)
.toggleStyle(.switch)
.font(VFont.body)
.foregroundColor(VColor.textSecondary)
Expand All @@ -1110,7 +1110,7 @@ struct SettingsPanel: View {
Text("Gateway URL Override")
.font(VFont.caption)
.foregroundColor(VColor.textSecondary)
TextField("https://custom-ingress.example.com", text: $ingressGatewayOverride)
TextField("https://custom-gateway.example.com", text: $ingressGatewayOverride)
.textFieldStyle(.plain)
.font(VFont.body)
.foregroundColor(VColor.textPrimary)
Expand Down
4 changes: 2 additions & 2 deletions clients/macos/vellum-assistant/Features/Settings/PairingQRCodeSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import SwiftUI
import VellumAssistantShared

/// Displays a QR code containing the v2 connection payload for iOS pairing.
/// Payload format: `{"type":"vellum-daemon","v":2,"id":"<mac-hash>","g":"<ingress-url>","bt":"<bearer-token>"}`
/// Payload format: `{"type":"vellum-daemon","v":2,"id":"<mac-hash>","g":"<gateway-url>","bt":"<bearer-token>"}`
///
/// Below the QR code, shows the gateway URL and bearer token for manual entry on iOS.
@MainActor
Expand All @@ -25,7 +25,7 @@ struct PairingQRCodeSheet: View {
private var canGenerateQR: Bool {
let hasRequiredFields = !gatewayUrl.isEmpty && !resolvedBearerToken.isEmpty
if isLocalOverride {
// For developer local pairing, ingress is not required
// For developer local pairing, the gateway is not required
Comment thread
ashleeradka marked this conversation as resolved.
// but the URL must be a local/private address
guard let url = URL(string: gatewayUrl), let host = url.host else { return false }
return hasRequiredFields && LocalAddressValidator.isLocalAddress(host)
Expand Down
2 changes: 1 addition & 1 deletion clients/macos/vellum-assistant/Features/Settings/SettingsConnectTab.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,7 @@ struct SettingsConnectTab: View {
Image(systemName: "exclamationmark.triangle.fill")
.foregroundColor(VColor.warning)
.font(.system(size: 14))
Text("Gateway URL is set but ingress is disabled. Enable ingress in Advanced settings to allow pairing.")
Text("Gateway URL is set but the gateway is not active. Check your tunnel or gateway configuration.")
.font(VFont.body)
.foregroundColor(VColor.textSecondary)
}
Expand Down
6 changes: 3 additions & 3 deletions clients/macos/vellum-assistant/Features/Settings/SettingsStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ public final class SettingsStore: ObservableObject {

// MARK: - Connection Health Check

/// Tests reachability of both the local gateway process and the public ingress tunnel.
/// Tests reachability of both the local gateway process and the public tunnel.
/// Updates `gatewayReachable`, `ingressReachable`, and `gatewayLastChecked` with results.
func testGatewayConnection() async {
isCheckingGateway = true
Expand All @@ -1090,7 +1090,7 @@ public final class SettingsStore: ObservableObject {
timeoutSeconds: 3
)

// Test public ingress (only if URL is non-empty)
// Test public tunnel (only if URL is non-empty)
let trimmedUrl = ingressPublicBaseUrl.trimmingCharacters(in: .whitespacesAndNewlines)
if trimmedUrl.isEmpty {
ingressReachable = nil
Expand Down Expand Up @@ -1131,7 +1131,7 @@ public final class SettingsStore: ObservableObject {
PairingConfiguration.resolvedBearerToken(fallback: readHttpToken() ?? "")
}

/// Resolved gateway URL for public ingress — uses per-integration override if enabled, else global.
/// Resolved gateway URL — uses per-integration override if enabled, else global.
var resolvedIngressGatewayUrl: String {
UserDefaults.standard.bool(forKey: "ingressUseOverride")
? (nonEmpty(UserDefaults.standard.string(forKey: "ingressGatewayOverride")) ?? ingressPublicBaseUrl)
Expand Down
Loading