refactor

bitcoindevkit · Aug 2, 2023 · 6cfa316 · 6cfa316
1 parent 9f8bc53
commit 6cfa316
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/BDKSwiftExampleWallet/Extensions/Double+Extensions.swift b/BDKSwiftExampleWallet/Extensions/Double+Extensions.swift
@@ -8,16 +8,19 @@
 import Foundation
 
 extension Double {
+
     func formattedPrice(currencyCode: CurrencyCode) -> String {
         let numberFormatter = NumberFormatter()
         numberFormatter.numberStyle = .currency
         numberFormatter.currencyCode = currencyCode.rawValue
 
         return numberFormatter.string(from: NSNumber(value: self)) ?? "\(self)"
     }
+
     func valueInUSD(price: Double) -> String {
-        let bitcoin = self / 100000000.0 // Convert satoshis to bitcoin
+        let bitcoin = self / 100_000_000.0
         let usdValue = bitcoin * price
         return usdValue.formattedPrice(currencyCode: .USD)
     }
+
 }
diff --git a/BDKSwiftExampleWallet/Extensions/Int+Extensions.swift b/BDKSwiftExampleWallet/Extensions/Int+Extensions.swift
@@ -65,6 +65,7 @@ extension UInt64 {
         let date = Date(timeIntervalSince1970: TimeInterval(self))
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+
         return dateFormatter.string(from: date)
     }
 }
@@ -75,6 +76,7 @@ extension Int {
         let formatter = RelativeDateTimeFormatter()
         formatter.unitsStyle = .full
         let relativeDate = formatter.localizedString(for: date, relativeTo: Date.now)
+
         return relativeDate
     }
 }
diff --git a/BDKSwiftExampleWallet/View/WalletView.swift b/BDKSwiftExampleWallet/View/WalletView.swift
@@ -31,7 +31,7 @@ class WalletViewModel: ObservableObject {
         self.priceService = priceService
     }
 
-    func fetchPrice() async {
+    func getPrice() async {
         do {
             let response = try await priceService.hourlyPrice()
             if let latestPrice = response.prices.first?.usd {
@@ -50,18 +50,13 @@ class WalletViewModel: ObservableObject {
     }
 
     private func valueInUSD() {
-        let bitcoin = Double(balanceTotal) / 100000000.0 // Convert satoshis to bitcoin
-        let usdValue = bitcoin * price
-        let sats = usdValue.formattedPrice(currencyCode: .USD)
-
-        self.satsPrice = sats
+        self.satsPrice = Double(balanceTotal).valueInUSD(price: price)
     }
 
     func getBalance() {
         do {
             let balance = try BDKService.shared.getBalance()
             self.balanceTotal = balance.total
-            self.valueInUSD()
         } catch let error as WalletError {
             print("getBalance - Wallet Error: \(error.localizedDescription)")
         } catch {
@@ -90,6 +85,7 @@ class WalletViewModel: ObservableObject {
                     self.lastSyncTime = Date()
                     self.getBalance()
                     self.getTransactions()
+                    self.valueInUSD()
                 }
             } catch {
                 DispatchQueue.main.async {
@@ -277,7 +273,7 @@ struct WalletView: View {
             }
             .task {
                 await viewModel.sync()
-                await viewModel.fetchPrice()
+                await viewModel.getPrice()
             }
 
         }