Skip to content

Commit 3933416

Browse files
committed
fixup! chore(core/eckhart): Update ETH approve flow
1 parent 5e5d00d commit 3933416

File tree

3 files changed

+27
-22
lines changed

3 files changed

+27
-22
lines changed

core/embed/rust/src/ui/layout_eckhart/flow/confirm_summary.rs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use crate::{
2020
use super::super::{
2121
component::Button,
2222
firmware::{
23-
ActionBar, Header, Hint, ShortMenuVec, TextScreen, TextScreenMsg, VerticalMenu,
23+
ActionBar, Header, ShortMenuVec, TextScreen, TextScreenMsg, VerticalMenu,
2424
VerticalMenuScreen, VerticalMenuScreenMsg,
2525
},
2626
theme,
@@ -117,15 +117,9 @@ pub fn new_confirm_summary(
117117
.with_placement(LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING)),
118118
)
119119
.with_header(Header::new(title).with_menu_button())
120-
.with_action_bar(ActionBar::new_single(
121-
Button::with_text(TR::instructions__hold_to_sign.into())
122-
.with_long_press(theme::CONFIRM_HOLD_DURATION)
123-
.styled(theme::button_confirm()),
124-
))
125-
.with_hint(Hint::new_instruction(
126-
TR::send__send_in_the_app,
127-
Some(theme::ICON_INFO),
128-
))
120+
.with_action_bar(ActionBar::new_single(Button::with_text(
121+
TR::buttons__continue.into(),
122+
)))
129123
.map(|msg| match msg {
130124
TextScreenMsg::Confirmed => Some(FlowMsg::Confirmed),
131125
TextScreenMsg::Cancelled => Some(FlowMsg::Cancelled),

core/embed/rust/src/ui/layout_eckhart/ui_firmware.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ impl FirmwareUI for UIEckhart {
351351
let paragraphs = PropsList::new(
352352
items,
353353
&theme::TEXT_SMALL_LIGHT,
354-
&theme::TEXT_MONO_LIGHT,
354+
&theme::TEXT_MONO_MEDIUM_LIGHT,
355355
&theme::TEXT_MONO_LIGHT,
356356
)?;
357357

@@ -361,7 +361,7 @@ impl FirmwareUI for UIEckhart {
361361
paragraphs.into_paragraphs().with_placement(
362362
LinearPlacement::vertical().with_spacing(theme::PARAGRAPHS_SPACING),
363363
),
364-
None,
364+
Some(TR::buttons__continue.into()),
365365
hold,
366366
None,
367367
None,

core/src/trezor/ui/layouts/eckhart/__init__.py

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -871,27 +871,38 @@ async def confirm_ethereum_approve(
871871
fee_info_items: Iterable[tuple[str, str]],
872872
chunkify: bool = False,
873873
) -> None:
874+
875+
title = (
876+
TR.ethereum__approve_intro_title_revoke
877+
if is_revoke
878+
else TR.ethereum__approve_intro_title
879+
)
880+
874881
await confirm_value(
875-
(
876-
TR.ethereum__approve_intro_title_revoke
877-
if is_revoke
878-
else TR.ethereum__approve_intro_title
879-
),
882+
title,
880883
(
881884
TR.ethereum__approve_intro_revoke
882885
if is_revoke
883886
else TR.ethereum__approve_intro
884887
),
885888
"",
889+
verb=TR.buttons__continue,
886890
is_data=False,
887891
br_name="confirm_ethereum_approve",
888892
verb=TR.buttons__continue,
893+
cancel=True,
889894
)
890895

891896
await confirm_value(
892-
TR.ethereum__approve_revoke_from if is_revoke else TR.ethereum__approve_to,
897+
title,
893898
recipient,
894899
"",
900+
verb=TR.buttons__continue,
901+
subtitle=(
902+
TR.ethereum__approve_revoke_from
903+
if is_revoke
904+
else TR.ethereum__approve_to
905+
),
895906
chunkify=chunkify,
896907
br_name="confirm_ethereum_approve",
897908
verb=TR.buttons__continue,
@@ -916,9 +927,9 @@ async def confirm_ethereum_approve(
916927
if is_unknown_network:
917928
assert is_unknown_token
918929
await confirm_value(
919-
TR.ethereum__approve_chain_id,
930+
title,
920931
chain_id,
921-
"",
932+
TR.ethereum__approve_chain_id,
922933
br_name="confirm_ethereum_approve",
923934
)
924935

@@ -936,7 +947,7 @@ async def confirm_ethereum_approve(
936947
properties.append((TR.words__chain, network_name))
937948
await confirm_properties(
938949
"confirm_ethereum_approve",
939-
TR.ethereum__approve_revoke if is_revoke else TR.ethereum__approve,
950+
title,
940951
properties,
941952
None,
942953
False,
@@ -951,7 +962,7 @@ async def confirm_ethereum_approve(
951962
None,
952963
maximum_fee,
953964
TR.send__maximum_fee,
954-
TR.words__title_summary,
965+
title,
955966
account_items,
956967
fee_info_items,
957968
TR.confirm_total__title_fee,

0 commit comments

Comments
 (0)