Allow opening Send module for non-synced state

horizontalsystems · May 6, 2024 · cfd6bce · cfd6bce
1 parent ecc3472
commit cfd6bce
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 35 deletions.
diff --git a/UnstoppableWallet/UnstoppableWallet/Models/AdapterState.swift b/UnstoppableWallet/UnstoppableWallet/Models/AdapterState.swift
@@ -20,14 +20,6 @@ enum AdapterState {
         default: return false
         }
     }
-
-    func spendAllowed(beforeSync: Bool) -> Bool {
-        switch self {
-        case .synced: return true
-        case .syncing, .customSyncing: return beforeSync ? true : false
-        case .stopped, .notSynced: return false
-        }
-    }
 }
 
 extension AdapterState: Equatable {

diff --git a/UnstoppableWallet/UnstoppableWallet/Models/BalanceData.swift b/UnstoppableWallet/UnstoppableWallet/Models/BalanceData.swift
@@ -20,10 +20,6 @@ class BalanceData: Codable, Equatable {
         available
     }
 
-    var sendBeforeSync: Bool {
-        false
-    }
-
     var customStates: [CustomState] {
         []
     }
@@ -124,7 +120,6 @@ class VerifiedBalanceData: BalanceData {
     let fullBalance: Decimal
 
     override var balanceTotal: Decimal { super.balanceTotal }
-    override var sendBeforeSync: Bool { true }
 
     init(fullBalance: Decimal, available: Decimal) {
         self.fullBalance = fullBalance

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/BalanceViewItem.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/BalanceViewItem.swift
@@ -17,7 +17,6 @@ struct BalanceTopViewItem {
     let syncSpinnerProgress: Int?
     let indefiniteSearchCircle: Bool
     let failedImageViewVisible: Bool
-    let sendEnabled: Bool
 
     let primaryValue: (text: String?, dimmed: Bool)?
     let secondaryInfo: BalanceSecondaryInfoViewItem

diff --git a/...dules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceViewItemFactory.swift b/...dules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceViewItemFactory.swift
@@ -17,15 +17,11 @@ class WalletTokenBalanceViewItemFactory {
             if item.watchAccount {
                 buttons[.address] = .enabled
             } else {
-                let sendButtonState: ButtonState = item
-                    .state
-                    .spendAllowed(beforeSync: item.balanceData.sendBeforeSync) ? .enabled : .disabled
-
-                buttons[.send] = sendButtonState
+                buttons[.send] = .enabled
                 buttons[.receive] = .enabled
 
                 if AppConfig.swapEnabled, wallet.token.swappable {
-                    buttons[.swap] = sendButtonState
+                    buttons[.swap] = .enabled
                 }
             }
         case let .cexAsset(cexAsset):

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListDataSource.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListDataSource.swift
@@ -165,7 +165,6 @@ extension WalletTokenListDataSource: ISectionDataSource {
         }
 
         subscribe(disposeBag, viewModel.noConnectionErrorSignal) { HudHelper.instance.show(banner: .noInternet) }
-        subscribe(disposeBag, viewModel.showSyncingSignal) { HudHelper.instance.show(banner: .attention(string: "wait_for_synchronization".localized)) }
         subscribe(disposeBag, viewModel.selectWalletSignal) { [weak self] in self?.onSelect(wallet: $0) }
         subscribe(disposeBag, viewModel.openSyncErrorSignal) { [weak self] in self?.openSyncError(wallet: $0, error: $1) }
 

diff --git a/...bleWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListViewItemFactory.swift b/...bleWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListViewItemFactory.swift
@@ -8,7 +8,6 @@ class WalletTokenListViewItemFactory {
 
     private func topViewItem(item: WalletTokenListService.Item, balancePrimaryValue: BalancePrimaryValue, balanceHidden: Bool) -> BalanceTopViewItem {
         let state = item.state
-        let sendEnabled = state.spendAllowed(beforeSync: item.balanceData.sendBeforeSync)
 
         return BalanceTopViewItem(
             isMainNet: item.isMainNet,
@@ -19,7 +18,6 @@ class WalletTokenListViewItemFactory {
             syncSpinnerProgress: syncSpinnerProgress(state: state),
             indefiniteSearchCircle: indefiniteSearchCircle(state: state),
             failedImageViewVisible: failedImageViewVisible(state: state),
-            sendEnabled: sendEnabled,
             primaryValue: primaryValue(item: item, balancePrimaryValue: balancePrimaryValue, balanceHidden: balanceHidden),
             secondaryInfo: secondaryInfo(item: item, balancePrimaryValue: balancePrimaryValue, balanceHidden: balanceHidden)
         )

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListViewModel.swift
@@ -31,7 +31,6 @@ class WalletTokenListViewModel {
 
     private let showWarningRelay = BehaviorRelay<CancellableTitledCaution?>(value: nil)
     private let noConnectionErrorRelay = PublishRelay<Void>()
-    private let showSyncingRelay = PublishRelay<Void>()
     private let selectWalletRelay = PublishRelay<Wallet>()
     private let openSyncErrorRelay = PublishRelay<(Wallet, Error)>()
 
@@ -132,10 +131,6 @@ extension WalletTokenListViewModel {
         noConnectionErrorRelay.asSignal()
     }
 
-    var showSyncingSignal: Signal<Void> {
-        showSyncingRelay.asSignal()
-    }
-
     var selectWalletSignal: Signal<Wallet> {
         selectWalletRelay.asSignal()
     }
@@ -170,10 +165,6 @@ extension WalletTokenListViewModel {
             onTapFailedIcon(element: item.element)
             return
         }
-        if !item.topViewItem.sendEnabled {
-            showSyncingRelay.accept(())
-            return
-        }
         if let wallet = item.element.wallet {
             selectWalletRelay.accept(wallet)
         }

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletViewItemFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletViewItemFactory.swift
@@ -8,7 +8,6 @@ class WalletViewItemFactory {
 
     private func topViewItem(item: WalletService.Item, balancePrimaryValue: BalancePrimaryValue, balanceHidden: Bool) -> BalanceTopViewItem {
         let state = item.state
-        let sendEnabled = state.spendAllowed(beforeSync: item.balanceData.sendBeforeSync)
 
         return BalanceTopViewItem(
             isMainNet: item.isMainNet,
@@ -19,7 +18,6 @@ class WalletViewItemFactory {
             syncSpinnerProgress: syncSpinnerProgress(state: state),
             indefiniteSearchCircle: indefiniteSearchCircle(state: state),
             failedImageViewVisible: failedImageViewVisible(state: state),
-            sendEnabled: sendEnabled,
             primaryValue: balanceHidden ? nil : primaryValue(item: item, balancePrimaryValue: balancePrimaryValue),
             secondaryInfo: secondaryInfo(item: item, balancePrimaryValue: balancePrimaryValue, balanceHidden: balanceHidden)
         )

diff --git a/UnstoppableWallet/UnstoppableWallet/en.lproj/Localizable.strings b/UnstoppableWallet/UnstoppableWallet/en.lproj/Localizable.strings
@@ -316,7 +316,6 @@
 "balance.downloading_blocks" = "Downloading Blocks";
 "balance.scanning_blocks" = "Scanning Blocks";
 "balance.enhancing_transactions" = "Enhancing Transactions";
-"wait_for_synchronization" = "Wait for synchronization";
 
 "balance.searching.count" = "%@ tx";
 "balance.syncing_percent" = "Syncing... %@";