diff --git a/Cargo.lock b/Cargo.lock index 96b08e9..ead43a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -352,9 +352,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "ledger_device_sdk" -version = "1.19.2" +version = "1.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30342b34b6e011b9fc8dd67bbf29bf321ab47f7f0bd381277ab65445996a9a45" +checksum = "4b814011ef9b769b1baa3ac6e53c0b4b2c6d42312798b5a63aede9de65d8f1e0" dependencies = [ "const-zero", "include_gif", diff --git a/Cargo.toml b/Cargo.toml index f4bdbb7..021139b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ authors = ["dj8yf0μl", "polyprogrammist"] edition = "2021" [dependencies] -ledger_device_sdk = "1.19.2" +ledger_device_sdk = "1.19.3" include_gif = "1.2.0" hex = { version = "0.4.3", default-features = false, features = ["serde"] } bs58 = { version = "0.5.0", default-features = false } diff --git a/src/swap.rs b/src/swap.rs index e2f7147..4bc79dc 100644 --- a/src/swap.rs +++ b/src/swap.rs @@ -1,5 +1,6 @@ use crate::utils::crypto::{PathBip32, PublicKeyBe}; use fmt_buffer::Buffer; +use near_gas::{GasBuffer, NearGas}; use near_token::{NearToken, TokenBuffer}; use ledger_device_sdk::{ @@ -123,9 +124,19 @@ fn check_address(params: &CheckAddressParams) -> Result<(), &'static str> { } fn get_printable_amount(params: &PrintableAmountParams) -> Buffer<30> { - let amount = u128::from_be_bytes(params.amount); - let near_token = NearToken::from_yoctonear(amount); - let mut near_token_buffer = TokenBuffer::new(); - near_token.display_as_buffer(&mut near_token_buffer); - near_token_buffer + match params.is_fee { + true => { + let gas = NearGas::from_gas(450_000_000_000); + let mut near_gas_buffer = GasBuffer::new(); + gas.display_as_buffer(&mut near_gas_buffer); + near_gas_buffer + } + false => { + let amount = u128::from_be_bytes(params.amount); + let near_token = NearToken::from_yoctonear(amount); + let mut near_token_buffer = TokenBuffer::new(); + near_token.display_as_buffer(&mut near_token_buffer); + near_token_buffer + } + } }