Merge commit '2fca47b244eaeb26eacdbfd7bbf5f7aba16d373c' into release/…

…2.11.0
p2p-org · Jan 19, 2024 · b9bad49 · b9bad49
2 parents 2486a4e + 2fca47b
commit b9bad49
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 28 deletions.
diff --git a/Packages/KeyAppKit/Sources/Wormhole/Model/SendFees.swift b/Packages/KeyAppKit/Sources/Wormhole/Model/SendFees.swift
@@ -40,25 +40,3 @@ public struct SendFees: Codable, Hashable, Equatable {
         case bridgeFeeInToken = "bridge_fee_in_token"
     }
 }
-
-public extension SendFees {
-    /// Total amount in fiat.
-    var totalInFiat: CurrencyAmount {
-        CurrencyAmount(usd: 0)
-            + arbiter?.asCurrencyAmount
-            + networkFee?.asCurrencyAmount
-            + messageAccountRent?.asCurrencyAmount
-            + bridgeFee?.asCurrencyAmount
-    }
-
-    /// Total in Crypto
-    var totalInCrypto: CryptoAmount? {
-        guard let arbiter, let networkFeeInToken, let messageAccountRentInToken, let bridgeFeeInToken else {
-            return nil
-        }
-        return arbiter.asCryptoAmount
-            + networkFeeInToken.asCryptoAmount
-            + messageAccountRentInToken.asCryptoAmount
-            + bridgeFeeInToken.asCryptoAmount
-    }
-}
diff --git a/p2p_wallet/Scenes/Main/Wormhole/Send/WormholeSendInputAdapter.swift b/p2p_wallet/Scenes/Main/Wormhole/Send/WormholeSendInputAdapter.swift
@@ -53,10 +53,14 @@ struct WormholeSendInputStateAdapter: Equatable {
     var fees: String {
         switch state {
         case let .ready(_, output, _):
-            return "≈\(currencyFormatter.string(amount: output.fees.totalInFiat))"
+            if let arbiter = output.fees.arbiter?.asCryptoAmount {
+                return "≈\(cryptoFormatter.string(amount: arbiter))"
+            } else {
+                return ""
+            }
         case let .error(_, output, _):
-            if let output {
-                return "≈\(currencyFormatter.string(amount: output.fees.totalInFiat))"
+            if let output, let arbiter = output.fees.arbiter?.asCryptoAmount {
+                return "≈\(cryptoFormatter.string(amount: arbiter))"
             } else {
                 return ""
             }
@@ -140,13 +144,13 @@ struct WormholeSendInputStateAdapter: Equatable {
     }
 
     var disableSwitch: Bool {
-        input?.solanaAccount.price == nil
+        true
     }
 
     var totalCryptoAmount: String {
         if let input {
-            let arbiterFee = output?.fees.arbiter?.asCryptoAmount ?? input.amount.with(amount: 0)
-            return cryptoFormatter.string(amount: input.amount + arbiterFee)
+            let totalAmount = output?.fees.totalAmount?.asCryptoAmount ?? input.amount.with(amount: 0)
+            return cryptoFormatter.string(amount: totalAmount)
         } else {
             return "N/A"
         }