Skip to content

Commit 3c144d6

Browse files
committed
fixes
1 parent 735891b commit 3c144d6

3 files changed

Lines changed: 3 additions & 16 deletions

File tree

Bitkit/Extensions/LDKNode+AddressType.swift

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,6 @@ extension LDKNode.AddressType {
7979
}
8080
}
8181

82-
/// Short label for compact UI (e.g. "Native").
83-
var shortLabel: String {
84-
switch self {
85-
case .legacy: return "Legacy"
86-
case .nestedSegwit: return "Nested"
87-
case .nativeSegwit: return "Native"
88-
case .taproot: return "Taproot"
89-
}
90-
}
91-
9282
var localizedDescription: String {
9383
switch self {
9484
case .legacy: return "Pay-to-public-key-hash (1x...)"

Bitkit/Services/LightningService.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,8 @@ class LightningService {
8181
)
8282
config.includeUntrustedPendingInSpendable = true
8383

84-
let selectedAddressType = LDKNode.AddressType.fromStorage(UserDefaults.standard.string(forKey: "selectedAddressType"))
84+
let (selectedAddressType, monitoredTypes) = Self.addressTypeStateFromUserDefaults()
8585
config.addressType = selectedAddressType
86-
87-
let monitoredTypesString = UserDefaults.standard.string(forKey: "addressTypesToMonitor") ?? "nativeSegwit"
88-
let monitoredTypes = LDKNode.AddressType.parseCommaSeparated(monitoredTypesString)
8986
config.addressTypesToMonitor = monitoredTypes.filter { $0 != selectedAddressType }
9087

9188
let builder = Builder.fromConfig(config: config)

Bitkit/Views/Settings/Advanced/AddressViewer.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@ struct AddressViewer: View {
133133
.cornerRadius(32)
134134
.padding(.bottom, 16)
135135

136-
// Address script type selector (Legacy, Nested, Native, Taproot)
136+
// Address script type selector
137137
ScrollView(.horizontal, showsIndicators: false) {
138138
HStack(spacing: 8) {
139139
ForEach(scriptTypes, id: \.self) { scriptType in
140140
Button {
141141
selectedScriptType = scriptType
142142
} label: {
143-
Text(scriptType.shortLabel)
143+
Text(scriptType.localizedTitle)
144144
.font(.custom(Fonts.medium, size: 14))
145145
.foregroundColor(selectedScriptType == scriptType ? .white : .white80)
146146
.padding(.horizontal, 12)

0 commit comments

Comments
 (0)