[PWN-9256] Update only toAmount if rates are changed

p2p-org · Jul 20, 2023 · d02235a · d02235a
1 parent d298f4a
commit d02235a
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/p2p_wallet/Scenes/Main/BankTransfer/WithdrawCalculator/WithdrawCalculatorViewModel.swift b/p2p_wallet/Scenes/Main/BankTransfer/WithdrawCalculator/WithdrawCalculatorViewModel.swift
@@ -71,7 +71,7 @@ private extension WithdrawCalculatorViewModel {
     func bindProperties() {
         Publishers.CombineLatest(
             $fromAmount.eraseToAnyPublisher(),
-            $exchangeRates.eraseToAnyPublisher()
+            $exchangeRates.eraseToAnyPublisher() // Calculate only toAmount with newRates and not visa versa
         )
         .sink { [weak self] amount, rates in
             guard let self, let rates else { return }
@@ -84,20 +84,17 @@ private extension WithdrawCalculatorViewModel {
         }
         .store(in: &subscriptions)
 
-        Publishers.CombineLatest(
-            $toAmount.eraseToAnyPublisher(),
-            $exchangeRates.eraseToAnyPublisher()
-        )
-        .sink { [weak self] amount, rates in
-            guard let self, let rates else { return }
-            var newFromAmount: Double?
-            if let amount {
-                newFromAmount = amount / Double(rates.sell)
+        $toAmount
+            .sink { [weak self] amount in
+                guard let self, let rates = self.exchangeRates else { return }
+                var newFromAmount: Double?
+                if let amount {
+                    newFromAmount = amount / Double(rates.sell)
+                }
+                guard self.fromAmount != newFromAmount else { return }
+                self.fromAmount = newFromAmount
             }
-            guard self.fromAmount != newFromAmount else { return }
-            self.fromAmount = newFromAmount
-        }
-        .store(in: &subscriptions)
+            .store(in: &subscriptions)
 
         // Validation
         Publishers.CombineLatest3(