Skip to content
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

Jump to bottom

[iOS] - Fix titles of VPN Server Selection & Support Sections (uplift to 1.70.x) #25459

Merged
merged 1 commit into from
Sep 6, 2024
Merged

[iOS] - Fix titles of VPN Server Selection & Support Sections (uplift to 1.70.x) #25459

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
16 changes: 9 additions & 7 deletions ios/brave-ios/Sources/BraveVPN/Components/Settings/BraveVPNSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import GuardianConnect
import Preferences
import Shared
import Static
import SwiftUI
import UIKit
import os.log
import SwiftUI

public class BraveVPNSettingsViewController: TableViewController {

Expand Down Expand Up @@ -209,15 +209,16 @@ public class BraveVPNSettingsViewController: TableViewController {
)

let serverSection = Section(
header: .title(Strings.support.capitalized),
header: .title(Strings.VPN.settingsServerSection),
rows: [
Row(
text: locationCountry,
detailText: locationCity,
selection: { [unowned self] in
self.selectServerTapped()
},
image: BraveVPN.serverLocation.isoCode?.regionFlagImage ?? UIImage(braveSystemNamed: "leo.globe"),
image: BraveVPN.serverLocation.isoCode?.regionFlagImage
?? UIImage(braveSystemNamed: "leo.globe"),
accessory: .disclosureIndicator,
cellClass: MultilineSubtitleCell.self,
uuid: locationCellId
Expand All @@ -244,7 +245,7 @@ public class BraveVPNSettingsViewController: TableViewController {
)

let techSupportSection = Section(
header: .title(Strings.VPN.settingsServerSection),
header: .title(Strings.support.capitalized),
rows: [
Row(
text: Strings.VPN.settingsContactSupport,
Expand All @@ -259,14 +260,15 @@ public class BraveVPNSettingsViewController: TableViewController {
self.openURL?(.brave.braveVPNFaq)
},
cellClass: ButtonCell.self
)
])
),
]
)

dataSource.sections = [
vpnStatusSection,
subscriptionSection,
serverSection,
techSupportSection
techSupportSection,
]
}

Expand Down
Loading