Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ETH-726] Remove usd switch on wormhole screen and display fees in crypto amount #1630

Merged
merged 3 commits into from
Jan 19, 2024
Merged

[ETH-726] Remove usd switch on wormhole screen and display fees in crypto amount #1630

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f3ab63
[ETH-726] Disable switch for wormhole send
Jan 11, 2024
991c794
[ETH-726] Display crypto fees in wormhole screen
Jan 11, 2024
6b3fbc0
Merge branch 'release/2.11.0' into feature/pwn-726
Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions p2p_wallet/Scenes/Main/Wormhole/Send/WormholeSendInputAdapter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 totalInCrypto = output.fees.totalInCrypto {
return "≈\(cryptoFormatter.string(amount: totalInCrypto))"
} else {
return ""
}
case let .error(_, output, _):
if let output {
return "≈\(currencyFormatter.string(amount: output.fees.totalInFiat))"
if let output, let totalInCrypto = output.fees.totalInCrypto {
return "≈\(cryptoFormatter.string(amount: totalInCrypto))"
} else {
return ""
}
Expand Down Expand Up @@ -140,7 +144,7 @@ struct WormholeSendInputStateAdapter: Equatable {
}

var disableSwitch: Bool {
input?.solanaAccount.price == nil
true
}

var totalCryptoAmount: String {
Expand Down