Skip to content

Commit 776e2c6

Browse files
reezreez
committed
just removing comments, still works
1 parent 2568fa2 commit 776e2c6

File tree

7 files changed

+7
-189
lines changed

7 files changed

+7
-189
lines changed

‎BDKSwiftExampleWallet/View Model/Activity/TransactionDetailViewModel.swift‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,28 +41,16 @@ class TransactionDetailViewModel {
4141
}
4242

4343
func getEsploraUrl() {
44-
// do {
45-
let savedEsploraURL = bdkClient.getEsploraURL() //try keyClient.getEsploraURL()
44+
let savedEsploraURL = bdkClient.getEsploraURL()
4645
if network == "Signet" {
4746
self.esploraURL = "https://mempool.space/signet"
4847
} else {
4948
self.esploraURL = savedEsploraURL
5049
}
51-
// } catch let error as EsploraError {
52-
// DispatchQueue.main.async {
53-
// self.esploraError = error
54-
// }
55-
// } catch {}
5650
}
5751

5852
func getNetwork() {
59-
// do {
60-
self.network = bdkClient.getNetwork().description //try keyClient.getNetwork()
61-
// } catch {
62-
// DispatchQueue.main.async {
63-
// self.transactionDetailsError = .generic(message: error.localizedDescription)
64-
// }
65-
// }
53+
self.network = bdkClient.getNetwork().description
6654
}
6755

6856
func getSentAndReceived(tx: BitcoinDevKit.Transaction) -> SentAndReceivedValues? {

‎BDKSwiftExampleWallet/View Model/Activity/TransactionListViewModel.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ class TransactionListViewModel {
3636
}
3737

3838
func getEsploraURL() -> String? {
39-
let savedEsploraURL = bdkClient.getEsploraURL() //try? keyClient.getEsploraURL()
39+
let savedEsploraURL = bdkClient.getEsploraURL()
4040
return savedEsploraURL
4141
}
4242

4343
func getNetwork() -> String? {
44-
let savedNetwork = bdkClient.getNetwork().description //try? keyClient.getNetwork()
44+
let savedNetwork = bdkClient.getNetwork().description
4545
return savedNetwork
4646
}
4747

‎BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift‎

Lines changed: 0 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,6 @@ class OnboardingViewModel: ObservableObject {
1919
@Published var createWithPersistError: CreateWithPersistError?
2020
@Published var networkColor = Color.gray
2121
@Published var onboardingViewError: AppError?
22-
// @Published var selectedNetwork: Network = .signet {
23-
// didSet {
24-
// do {
25-
// let networkString = selectedNetwork.description
26-
// try keyClient.saveNetwork(networkString)
27-
// selectedURL = availableURLs.first ?? ""
28-
// try keyClient.saveEsploraURL(selectedURL)
29-
// } catch {
30-
// DispatchQueue.main.async {
31-
// self.onboardingViewError = .generic(message: error.localizedDescription)
32-
// }
33-
// }
34-
// }
35-
// }
36-
// @Published var selectedURL: String = "" {
37-
// didSet {
38-
// do {
39-
// try keyClient.saveEsploraURL(selectedURL)
40-
// } catch {
41-
// DispatchQueue.main.async {
42-
// self.onboardingViewError = .generic(message: error.localizedDescription)
43-
// }
44-
// }
45-
// }
46-
// }
4722
@Published var selectedNetwork: Network = .signet {
4823
didSet {
4924
print("OnboardingViewModel: Network changed from \(oldValue) to \(selectedNetwork)")
@@ -76,18 +51,6 @@ class OnboardingViewModel: ObservableObject {
7651
return Constants.Config.EsploraServerURLNetwork.Signet.allValues
7752
}
7853
}
79-
// private func availableURLs(for network: Network) -> [String] {
80-
// switch network {
81-
// case .signet:
82-
// return Constants.Config.EsploraServerURLNetwork.Signet.allValues
83-
// case .testnet:
84-
// return Constants.Config.EsploraServerURLNetwork.Testnet.allValues
85-
// case .bitcoin:
86-
// return Constants.Config.EsploraServerURLNetwork.Bitcoin.allValues
87-
// case .regtest:
88-
// return Constants.Config.EsploraServerURLNetwork.Regtest.allValues
89-
// }
90-
// }
9154
var buttonColor: Color {
9255
switch selectedNetwork {
9356
case .bitcoin:
@@ -101,102 +64,6 @@ class OnboardingViewModel: ObservableObject {
10164
}
10265
}
10366

104-
// init(
105-
// bdkClient: BDKClient = .live,
106-
// keyClient: KeyClient = .live
107-
// ) {
108-
// self.bdkClient = bdkClient
109-
// self.keyClient = keyClient
110-
// print("OnboardingViewModel: Initializing")
111-
//
112-
// let currentNetwork = bdkClient.getNetwork()
113-
// let currentURL = bdkClient.getEsploraURL()
114-
//
115-
// // Set network
116-
// if let storedNetwork = try? keyClient.getNetwork().flatMap({ Network(stringValue: $0) }) {
117-
// self.selectedNetwork = storedNetwork
118-
// if storedNetwork != currentNetwork {
119-
// print("OnboardingViewModel: Network changed from \(currentNetwork) to \(storedNetwork)")
120-
// bdkClient.updateNetwork(storedNetwork)
121-
// } else {
122-
// print("OnboardingViewModel: Network unchanged: \(currentNetwork)")
123-
// }
124-
// } else {
125-
// self.selectedNetwork = currentNetwork
126-
// print("OnboardingViewModel: Using current network: \(currentNetwork)")
127-
// }
128-
//
129-
// // Set Esplora URL
130-
// if let storedURL = try? keyClient.getEsploraURL(), isValidURL(storedURL, for: self.selectedNetwork) {
131-
// self.selectedURL = storedURL
132-
// } else if isValidURL(currentURL, for: self.selectedNetwork) {
133-
// self.selectedURL = currentURL
134-
// } else {
135-
// self.selectedURL = availableURLs(for: self.selectedNetwork).first ?? ""
136-
// }
137-
//
138-
// if self.selectedURL != currentURL {
139-
// print("OnboardingViewModel: Esplora URL changed from \(currentURL) to \(self.selectedURL)")
140-
// bdkClient.updateEsploraURL(self.selectedURL)
141-
// } else {
142-
// print("OnboardingViewModel: Esplora URL unchanged: \(self.selectedURL)")
143-
// }
144-
//
145-
// print("OnboardingViewModel: Initialized with network \(self.selectedNetwork) and URL \(self.selectedURL)")
146-
// }
147-
148-
// init(
149-
// bdkClient: BDKClient = .live,
150-
// keyClient: KeyClient = .live
151-
// ) {
152-
// self.bdkClient = bdkClient
153-
// self.keyClient = keyClient
154-
// print("OnboardingViewModel: Initializing")
155-
//
156-
// let currentNetwork = bdkClient.getNetwork()
157-
// let currentURL = bdkClient.getEsploraURL()
158-
//
159-
// // Set network
160-
// if let storedNetwork = try? keyClient.getNetwork().flatMap({ Network(stringValue: $0) }) {
161-
// self.selectedNetwork = storedNetwork
162-
// if storedNetwork != currentNetwork {
163-
// print(
164-
// "OnboardingViewModel: Network changed from \(currentNetwork) to \(storedNetwork)"
165-
// )
166-
// bdkClient.updateNetwork(storedNetwork)
167-
// } else {
168-
// print("OnboardingViewModel: Network unchanged: \(currentNetwork)")
169-
// }
170-
// } else {
171-
// self.selectedNetwork = currentNetwork
172-
// print("OnboardingViewModel: Using current network: \(currentNetwork)")
173-
// }
174-
//
175-
// // Set Esplora URL
176-
// if let storedURL = try? keyClient.getEsploraURL(),
177-
// isValidURL(storedURL, for: self.selectedNetwork)
178-
// {
179-
// self.selectedURL = storedURL
180-
// } else if isValidURL(currentURL, for: self.selectedNetwork) {
181-
// self.selectedURL = currentURL
182-
// } else {
183-
// self.selectedURL = availableURLs(for: self.selectedNetwork).first ?? ""
184-
// }
185-
//
186-
// if self.selectedURL != currentURL {
187-
// print(
188-
// "OnboardingViewModel: Esplora URL changed from \(currentURL) to \(self.selectedURL)"
189-
// )
190-
// bdkClient.updateEsploraURL(self.selectedURL)
191-
// } else {
192-
// print("OnboardingViewModel: Esplora URL unchanged: \(self.selectedURL)")
193-
// }
194-
//
195-
// print(
196-
// "OnboardingViewModel: Initialized with network \(self.selectedNetwork) and URL \(self.selectedURL)"
197-
// )
198-
// }
199-
20067
init(
20168
bdkClient: BDKClient = .live
20269
) {
@@ -214,19 +81,6 @@ class OnboardingViewModel: ObservableObject {
21481
)
21582
}
21683

217-
// private func isValidURL(_ url: String, for network: Network) -> Bool {
218-
// switch network {
219-
// case .signet:
220-
// return Constants.Config.EsploraServerURLNetwork.Signet.allValues.contains(url)
221-
// case .testnet:
222-
// return Constants.Config.EsploraServerURLNetwork.Testnet.allValues.contains(url)
223-
// case .bitcoin:
224-
// return Constants.Config.EsploraServerURLNetwork.Bitcoin.allValues.contains(url)
225-
// case .regtest:
226-
// return Constants.Config.EsploraServerURLNetwork.Regtest.allValues.contains(url)
227-
// }
228-
// }
229-
23084
func createWallet() {
23185
do {
23286
try bdkClient.createWallet(words)

‎BDKSwiftExampleWallet/View Model/Settings/SettingsViewModel.swift‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -92,27 +92,6 @@ class SettingsViewModel: ObservableObject {
9292
print("SettingsViewModel: Retrieved Esplora URL - \(self.esploraURL ?? "nil")")
9393
}
9494

95-
// func getNetwork() {
96-
// do {
97-
// self.network = try keyClient.getNetwork()
98-
// } catch {
99-
// DispatchQueue.main.async {
100-
// self.settingsError = .generic(message: error.localizedDescription)
101-
// self.showingSettingsViewErrorAlert = true
102-
// }
103-
// }
104-
// }
105-
//
106-
// func getEsploraUrl() {
107-
// do {
108-
// self.esploraURL = try keyClient.getEsploraURL()
109-
// } catch {
110-
// DispatchQueue.main.async {
111-
// self.settingsError = .generic(message: error.localizedDescription)
112-
// }
113-
// }
114-
// }
115-
11695
private func updateProgressFullScan(inspected: UInt64) {
11796
DispatchQueue.main.async {
11897
self.inspectedScripts = inspected

‎BDKSwiftExampleWallet/View/Activity/TransactionDetailView.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,7 @@ struct TransactionDetailView: View {
173173
#Preview {
174174
TransactionDetailView(
175175
viewModel: .init(
176-
bdkClient: .mock //,
177-
// keyClient: .mock
176+
bdkClient: .mock
178177
),
179178
amount: UInt64(1_000_000),
180179
canonicalTx: .mock

‎BDKSwiftExampleWallet/View/Activity/TransactionListView.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ struct TransactionListView: View {
7979
NavigationLink(
8080
destination: TransactionDetailView(
8181
viewModel: .init(
82-
bdkClient: .live //,
83-
// keyClient: .live
82+
bdkClient: .live
8483
),
8584
amount: sentAndReceivedValues.sent.toSat() == 0
8685
? sentAndReceivedValues.received.toSat()

‎BDKSwiftExampleWallet/View/Settings/SettingsView.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ struct SettingsView: View {
146146
#Preview {
147147
SettingsView(
148148
viewModel: .init(
149-
bdkClient: .mock //,
150-
// keyClient: .mock
149+
bdkClient: .mock
151150
)
152151
)
153152
}

0 commit comments

Comments
 (0)