Skip to content

Render markdown in the login disclaimer #2053

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

Open
mvanhorn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Render markdown in the login disclaimer #2053

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
17 changes: 16 additions & 1 deletion Shared/Views/UserSignInView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,21 @@ struct UserSignInView: View {
return evaluatedPolicy
}

private func disclaimerText(_ disclaimer: String) -> Text {

@LePips LePips Jun 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some cleanup that can happen, or inline this if let to the section.

@ViewBuilder
private func disclaimerText(_ disclaimer: String) -> some View {
    if let attributedString = try? AttributedString(
        markdown: disclaimer,
        options: .init(interpretedSyntax: .inlineOnlyPreservingWhitespace)
    ) {
        Text(attributedString)
    } else {
        Text(disclaimer)
    }
}

let options = AttributedString.MarkdownParsingOptions(
interpretedSyntax: .inlineOnlyPreservingWhitespace
)

if let attributedString = try? AttributedString(
markdown: disclaimer,
options: options
) {
return Text(attributedString)
} else {
return Text(disclaimer)
}
}

// MARK: - Sign In Section

@ViewBuilder
Expand Down Expand Up @@ -184,7 +199,7 @@ struct UserSignInView: View {

if let disclaimer = viewModel.serverDisclaimer {
Section(L10n.disclaimer) {
Text(disclaimer)
disclaimerText(disclaimer)
.font(.callout)
}
}
Expand Down
Loading