refactor: main actor

bitcoindevkit · Aug 21, 2023 · f5acb81 · f5acb81
1 parent 88e81a9
commit f5acb81
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/BDKSwiftExampleWallet/View Model/ReceiveViewModel.swift b/BDKSwiftExampleWallet/View Model/ReceiveViewModel.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Observation
 
 @Observable
 class ReceiveViewModel {

diff --git a/BDKSwiftExampleWallet/View Model/SendViewModel.swift b/BDKSwiftExampleWallet/View Model/SendViewModel.swift
@@ -7,7 +7,9 @@
 
 import Foundation
 import BitcoinDevKit
+import Observation
 
+@MainActor
 @Observable
 class SendViewModel {
     var balanceTotal: UInt64 = 0

diff --git a/BDKSwiftExampleWallet/View Model/WalletViewModel.swift b/BDKSwiftExampleWallet/View Model/WalletViewModel.swift
@@ -7,7 +7,9 @@
 
 import Foundation
 import BitcoinDevKit
+import Observation
 
+@MainActor
 @Observable
 class WalletViewModel {
     var balanceTotal: UInt64 = 0
@@ -26,10 +28,8 @@ class WalletViewModel {
     func getPrices() async {
         do {
             let price = try await priceService.prices()
-            DispatchQueue.main.async {
                 self.price = price.usd
                 self.time = price.time
-            }
         } catch {
             print("getPrices error: \(error.localizedDescription)")
         }
@@ -60,23 +60,17 @@ class WalletViewModel {
     }
 
     func sync() async {
-        DispatchQueue.main.async {
             self.walletSyncState = .syncing
-        }
         Task {
             do {
                 try await BDKService.shared.sync()
-                DispatchQueue.main.async {
                     self.walletSyncState = .synced
                     self.lastSyncTime = Date()
                     self.getBalance()
                     self.getTransactions()
                     self.valueInUSD()
-                }
             } catch {
-                DispatchQueue.main.async {
                     self.walletSyncState = .error(error)
-                }
             }
         }
     }

diff --git a/BDKSwiftExampleWalletTests/BDKSwiftExampleWalletWalletViewModelTests.swift b/BDKSwiftExampleWalletTests/BDKSwiftExampleWalletWalletViewModelTests.swift
@@ -8,6 +8,7 @@
 import XCTest
 @testable import BDKSwiftExampleWallet
 
+@MainActor
 final class BDKSwiftExampleWalletWalletViewModelTests: XCTestCase {
 
     func testWalletViewModel() async {