From 99563a973ea200ff2ae2c4e9e06a00771a42a872 Mon Sep 17 00:00:00 2001 From: grdddj Date: Sat, 5 Nov 2022 17:15:34 +0100 Subject: [PATCH] WIP - add prev_page and next_page icon --- core/assets/model_r/next_page.png | Bin 0 -> 123 bytes core/assets/model_r/prev_page.png | Bin 0 -> 124 bytes .../embed/rust/src/ui/model_tr/res/next_page.toif | Bin 0 -> 29 bytes .../embed/rust/src/ui/model_tr/res/prev_page.toif | Bin 0 -> 30 bytes core/embed/rust/src/ui/model_tr/theme.rs | 4 ++++ core/src/apps/bitcoin/sign_tx/layout.py | 2 +- 6 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 core/assets/model_r/next_page.png create mode 100644 core/assets/model_r/prev_page.png create mode 100644 core/embed/rust/src/ui/model_tr/res/next_page.toif create mode 100644 core/embed/rust/src/ui/model_tr/res/prev_page.toif diff --git a/core/assets/model_r/next_page.png b/core/assets/model_r/next_page.png new file mode 100644 index 0000000000000000000000000000000000000000..8ccff1785b6a94e6bce4bb45fd034ea351158dc2 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^AT|dFkYIQ^(J%{0aTa()7Bet#3xhBt!>l{XE z)7O>#88<7xE>q|J_m6-=(w;7kAsp9}f1GdNE9m&+{_J1+5B`M#TNScd8BWaS`o?;r R#vZ7Q!PC{xWt~$(697-JAvOR2 literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_tr/res/next_page.toif b/core/embed/rust/src/ui/model_tr/res/next_page.toif new file mode 100644 index 0000000000000000000000000000000000000000..aa322d632bb419a986e20d5f847612a0c2fa6d14 GIT binary patch literal 29 lcmWIX_jKoC;9wABU|@Ls{Q2|r2F4IE`;I>!7!R>B004dC3A_LR literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_tr/res/prev_page.toif b/core/embed/rust/src/ui/model_tr/res/prev_page.toif new file mode 100644 index 0000000000000000000000000000000000000000..3be189ea61db593bdbb4a3a169ad0fc7a0d6522d GIT binary patch literal 30 lcmWIX_jKoA;9?MBU|@Kh-oQ|2@t4tu@gRGL!Hn|^3;=9J2nqlI literal 0 HcmV?d00001 diff --git a/core/embed/rust/src/ui/model_tr/theme.rs b/core/embed/rust/src/ui/model_tr/theme.rs index 87486ac46d..d967d11bab 100644 --- a/core/embed/rust/src/ui/model_tr/theme.rs +++ b/core/embed/rust/src/ui/model_tr/theme.rs @@ -54,8 +54,12 @@ pub const ICON_DELETE: IconAndName = pub const ICON_EYE: IconAndName = IconAndName::new(include_res!("model_tr/res/eye.toif"), "eye"); // 12*6 pub const ICON_FAIL: IconAndName = IconAndName::new(include_res!("model_tr/res/fail.toif"), "fail"); pub const ICON_LOCK: IconAndName = IconAndName::new(include_res!("model_tr/res/lock.toif"), "lock"); // 10*10 +pub const ICON_NEXT_PAGE: IconAndName = + IconAndName::new(include_res!("model_tr/res/next_page.toif"), "next_page"); // 10*8 pub const ICON_PARAM: IconAndName = IconAndName::new(include_res!("model_tr/res/param.toif"), "param"); // 10*10 +pub const ICON_PREV_PAGE: IconAndName = + IconAndName::new(include_res!("model_tr/res/prev_page.toif"), "prev_page"); // 8*10 pub const ICON_SUCCESS: IconAndName = IconAndName::new(include_res!("model_tr/res/success.toif"), "success"); pub const ICON_TICK: IconAndName = IconAndName::new(include_res!("model_tr/res/tick.toif"), "tick"); // 10*10 diff --git a/core/src/apps/bitcoin/sign_tx/layout.py b/core/src/apps/bitcoin/sign_tx/layout.py index 39ae255aa8..a1d0bb602c 100644 --- a/core/src/apps/bitcoin/sign_tx/layout.py +++ b/core/src/apps/bitcoin/sign_tx/layout.py @@ -227,7 +227,7 @@ async def confirm_feeoverthreshold( ctx, "fee_over_threshold", "High fee", - "The fee of\n{}is unexpectedly high.", + "The fee of\n{}\nis unexpectedly high.", fee_amount, ButtonRequestType.FeeOverThreshold, )