|
|
|
|
@ -16,7 +16,8 @@ use crate::{
|
|
|
|
|
qstr::Qstr,
|
|
|
|
|
util,
|
|
|
|
|
},
|
|
|
|
|
strutil::StringType,
|
|
|
|
|
strutil::{StringType, TString},
|
|
|
|
|
translations::TR,
|
|
|
|
|
trezorhal::model,
|
|
|
|
|
ui::{
|
|
|
|
|
component::{
|
|
|
|
|
@ -39,7 +40,6 @@ use crate::{
|
|
|
|
|
util::{upy_disable_animation, ConfirmBlob},
|
|
|
|
|
},
|
|
|
|
|
model_tr::component::check_homescreen_format,
|
|
|
|
|
translations::tr,
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
@ -63,10 +63,9 @@ impl From<CancelConfirmMsg> for Obj {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<T, U> ComponentMsgObj for ShowMore<T, U>
|
|
|
|
|
impl<T> ComponentMsgObj for ShowMore<T>
|
|
|
|
|
where
|
|
|
|
|
T: Component,
|
|
|
|
|
U: StringType + Clone,
|
|
|
|
|
{
|
|
|
|
|
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
|
|
|
|
|
match msg {
|
|
|
|
|
@ -86,10 +85,9 @@ where
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<T, U> ComponentMsgObj for ButtonPage<T, U>
|
|
|
|
|
impl<T> ComponentMsgObj for ButtonPage<T>
|
|
|
|
|
where
|
|
|
|
|
T: Component + Paginate,
|
|
|
|
|
U: StringType + Clone,
|
|
|
|
|
{
|
|
|
|
|
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
|
|
|
|
|
match msg {
|
|
|
|
|
@ -141,10 +139,7 @@ where
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<T> ComponentMsgObj for AddressDetails<T>
|
|
|
|
|
where
|
|
|
|
|
T: StringType + Clone,
|
|
|
|
|
{
|
|
|
|
|
impl ComponentMsgObj for AddressDetails {
|
|
|
|
|
fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
|
|
|
|
|
Ok(CANCELLED.as_obj())
|
|
|
|
|
}
|
|
|
|
|
@ -159,19 +154,13 @@ where
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<T> ComponentMsgObj for NumberInput<T>
|
|
|
|
|
where
|
|
|
|
|
T: StringType + Clone,
|
|
|
|
|
{
|
|
|
|
|
impl ComponentMsgObj for NumberInput {
|
|
|
|
|
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
|
|
|
|
|
msg.try_into()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<T> ComponentMsgObj for SimpleChoice<T>
|
|
|
|
|
where
|
|
|
|
|
T: StringType + Clone,
|
|
|
|
|
{
|
|
|
|
|
impl ComponentMsgObj for SimpleChoice {
|
|
|
|
|
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
|
|
|
|
|
if self.return_index {
|
|
|
|
|
msg.try_into()
|
|
|
|
|
@ -182,19 +171,13 @@ where
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<T> ComponentMsgObj for WordlistEntry<T>
|
|
|
|
|
where
|
|
|
|
|
T: StringType + Clone,
|
|
|
|
|
{
|
|
|
|
|
impl ComponentMsgObj for WordlistEntry {
|
|
|
|
|
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
|
|
|
|
|
msg.try_into()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<T> ComponentMsgObj for PassphraseEntry<T>
|
|
|
|
|
where
|
|
|
|
|
T: StringType + Clone,
|
|
|
|
|
{
|
|
|
|
|
impl ComponentMsgObj for PassphraseEntry {
|
|
|
|
|
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
|
|
|
|
|
match msg {
|
|
|
|
|
CancelConfirmMsg::Confirmed => self.passphrase().try_into(),
|
|
|
|
|
@ -263,9 +246,8 @@ where
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<T, U> ComponentMsgObj for super::component::bl_confirm::Confirm<T, U>
|
|
|
|
|
impl<U> ComponentMsgObj for super::component::bl_confirm::Confirm<U>
|
|
|
|
|
where
|
|
|
|
|
T: StringType + Clone,
|
|
|
|
|
U: AsRef<str>,
|
|
|
|
|
{
|
|
|
|
|
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
|
|
|
|
|
@ -283,8 +265,8 @@ where
|
|
|
|
|
fn content_in_button_page<T: Component + Paginate + MaybeTrace + 'static>(
|
|
|
|
|
title: StrBuffer,
|
|
|
|
|
content: T,
|
|
|
|
|
verb: StrBuffer,
|
|
|
|
|
verb_cancel: Option<StrBuffer>,
|
|
|
|
|
verb: TString<'static>,
|
|
|
|
|
verb_cancel: Option<TString<'static>>,
|
|
|
|
|
hold: bool,
|
|
|
|
|
) -> Result<Obj, Error> {
|
|
|
|
|
// Left button - icon, text or nothing.
|
|
|
|
|
@ -320,8 +302,9 @@ extern "C" fn new_confirm_action(n_args: usize, args: *const Obj, kwargs: *mut M
|
|
|
|
|
let action: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_action)?.try_into_option()?;
|
|
|
|
|
let description: Option<StrBuffer> =
|
|
|
|
|
kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?;
|
|
|
|
|
let verb: StrBuffer = kwargs.get_or(Qstr::MP_QSTR_verb, tr("buttons__confirm").into())?;
|
|
|
|
|
let verb_cancel: Option<StrBuffer> = kwargs
|
|
|
|
|
let verb: TString<'static> =
|
|
|
|
|
kwargs.get_or(Qstr::MP_QSTR_verb, TR::buttons__confirm.into())?;
|
|
|
|
|
let verb_cancel: Option<TString<'static>> = kwargs
|
|
|
|
|
.get(Qstr::MP_QSTR_verb_cancel)
|
|
|
|
|
.unwrap_or_else(|_| Obj::const_none())
|
|
|
|
|
.try_into_option()?;
|
|
|
|
|
@ -356,8 +339,9 @@ extern "C" fn new_confirm_blob(n_args: usize, args: *const Obj, kwargs: *mut Map
|
|
|
|
|
let description: Option<StrBuffer> =
|
|
|
|
|
kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?;
|
|
|
|
|
let extra: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_extra)?.try_into_option()?;
|
|
|
|
|
let verb: StrBuffer = kwargs.get_or(Qstr::MP_QSTR_verb, tr("buttons__confirm").into())?;
|
|
|
|
|
let verb_cancel: Option<StrBuffer> = kwargs
|
|
|
|
|
let verb: TString<'static> =
|
|
|
|
|
kwargs.get_or(Qstr::MP_QSTR_verb, TR::buttons__confirm.into())?;
|
|
|
|
|
let verb_cancel: Option<TString<'static>> = kwargs
|
|
|
|
|
.get(Qstr::MP_QSTR_verb_cancel)
|
|
|
|
|
.unwrap_or_else(|_| Obj::const_none())
|
|
|
|
|
.try_into_option()?;
|
|
|
|
|
@ -426,7 +410,7 @@ extern "C" fn new_confirm_properties(n_args: usize, args: *const Obj, kwargs: *m
|
|
|
|
|
content_in_button_page(
|
|
|
|
|
title,
|
|
|
|
|
paragraphs.into_paragraphs(),
|
|
|
|
|
tr("buttons__confirm").into(),
|
|
|
|
|
TR::buttons__confirm.into(),
|
|
|
|
|
None,
|
|
|
|
|
hold,
|
|
|
|
|
)
|
|
|
|
|
@ -455,14 +439,14 @@ extern "C" fn new_confirm_homescreen(n_args: usize, args: *const Obj, kwargs: *m
|
|
|
|
|
extern "C" fn new_confirm_reset_device(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = move |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
|
|
|
|
|
let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let button: TString<'static> = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
let ops = OpTextLayout::<StrBuffer>::new(theme::TEXT_NORMAL)
|
|
|
|
|
.text_normal(tr("reset__by_continuing").into())
|
|
|
|
|
.text_normal(TR::reset__by_continuing.try_into()?)
|
|
|
|
|
.next_page()
|
|
|
|
|
.text_normal(tr("reset__more_info_at").into())
|
|
|
|
|
.text_normal(TR::reset__more_info_at.try_into()?)
|
|
|
|
|
.newline()
|
|
|
|
|
.text_bold(tr("reset__tos_link").into());
|
|
|
|
|
.text_bold(TR::reset__tos_link.try_into()?);
|
|
|
|
|
let formatted = FormattedText::new(ops).vertically_centered();
|
|
|
|
|
|
|
|
|
|
content_in_button_page(title, formatted, button, Some("".into()), false)
|
|
|
|
|
@ -472,26 +456,33 @@ extern "C" fn new_confirm_reset_device(n_args: usize, args: *const Obj, kwargs:
|
|
|
|
|
|
|
|
|
|
extern "C" fn new_confirm_backup(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = move |_args: &[Obj], _kwargs: &Map| {
|
|
|
|
|
// cached allocated translations that get_page can reuse
|
|
|
|
|
let tr_title_success: StrBuffer = TR::words__title_success.try_into()?;
|
|
|
|
|
let tr_new_wallet_created: StrBuffer = TR::backup__new_wallet_created.try_into()?;
|
|
|
|
|
let tr_it_should_be_backed_up_now: StrBuffer =
|
|
|
|
|
TR::backup__it_should_be_backed_up_now.try_into()?;
|
|
|
|
|
let tr_title_backup_wallet: StrBuffer = TR::backup__title_backup_wallet.try_into()?;
|
|
|
|
|
let tr_recover_anytime: StrBuffer = TR::backup__recover_anytime.try_into()?;
|
|
|
|
|
|
|
|
|
|
let get_page = move |page_index| match page_index {
|
|
|
|
|
0 => {
|
|
|
|
|
let btn_layout = ButtonLayout::text_none_arrow_wide(tr("buttons__skip").into());
|
|
|
|
|
let btn_layout = ButtonLayout::text_none_arrow_wide(TR::buttons__skip.into());
|
|
|
|
|
let btn_actions = ButtonActions::cancel_none_next();
|
|
|
|
|
// TODO: add the second newline conditionally when it fits
|
|
|
|
|
let ops = OpTextLayout::new(theme::TEXT_NORMAL)
|
|
|
|
|
.text_normal(tr("backup__new_wallet_created").into())
|
|
|
|
|
.text_normal(tr_new_wallet_created)
|
|
|
|
|
.newline()
|
|
|
|
|
.text_normal(tr("backup__it_should_be_backed_up_now").into());
|
|
|
|
|
.text_normal(tr_it_should_be_backed_up_now);
|
|
|
|
|
let formatted = FormattedText::new(ops).vertically_centered();
|
|
|
|
|
Page::new(btn_layout, btn_actions, formatted)
|
|
|
|
|
.with_title(tr("words__title_success").into())
|
|
|
|
|
Page::new(btn_layout, btn_actions, formatted).with_title(tr_title_success)
|
|
|
|
|
}
|
|
|
|
|
1 => {
|
|
|
|
|
let btn_layout = ButtonLayout::up_arrow_none_text(tr("buttons__back_up").into());
|
|
|
|
|
let btn_layout = ButtonLayout::up_arrow_none_text(TR::buttons__back_up.into());
|
|
|
|
|
let btn_actions = ButtonActions::prev_none_confirm();
|
|
|
|
|
let ops = OpTextLayout::new(theme::TEXT_NORMAL)
|
|
|
|
|
.text_normal(tr("backup__recover_anytime").into());
|
|
|
|
|
let ops = OpTextLayout::new(theme::TEXT_NORMAL).text_normal(tr_recover_anytime);
|
|
|
|
|
let formatted = FormattedText::new(ops).vertically_centered();
|
|
|
|
|
Page::<StrBuffer>::new(btn_layout, btn_actions, formatted)
|
|
|
|
|
.with_title(tr("backup__title_backup_wallet").into())
|
|
|
|
|
.with_title(tr_title_backup_wallet)
|
|
|
|
|
}
|
|
|
|
|
_ => unreachable!(),
|
|
|
|
|
};
|
|
|
|
|
@ -531,7 +522,7 @@ extern "C" fn new_confirm_value(n_args: usize, args: *const Obj, kwargs: *mut Ma
|
|
|
|
|
let description: StrBuffer = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
|
|
|
|
|
let value: StrBuffer = kwargs.get(Qstr::MP_QSTR_value)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
let verb: Option<StrBuffer> = kwargs
|
|
|
|
|
let verb: Option<TString<'static>> = kwargs
|
|
|
|
|
.get(Qstr::MP_QSTR_verb)
|
|
|
|
|
.unwrap_or_else(|_| Obj::const_none())
|
|
|
|
|
.try_into_option()?;
|
|
|
|
|
@ -545,7 +536,7 @@ extern "C" fn new_confirm_value(n_args: usize, args: *const Obj, kwargs: *mut Ma
|
|
|
|
|
content_in_button_page(
|
|
|
|
|
title,
|
|
|
|
|
paragraphs,
|
|
|
|
|
verb.unwrap_or_else(|| tr("buttons__confirm").into()),
|
|
|
|
|
verb.unwrap_or(TR::buttons__confirm.into()),
|
|
|
|
|
Some("".into()),
|
|
|
|
|
hold,
|
|
|
|
|
)
|
|
|
|
|
@ -559,16 +550,22 @@ extern "C" fn new_confirm_joint_total(n_args: usize, args: *const Obj, kwargs: *
|
|
|
|
|
let total_amount: StrBuffer = kwargs.get(Qstr::MP_QSTR_total_amount)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
let paragraphs = Paragraphs::new([
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, tr("joint__you_are_contributing").into()),
|
|
|
|
|
Paragraph::new(
|
|
|
|
|
&theme::TEXT_BOLD,
|
|
|
|
|
TR::joint__you_are_contributing.try_into()?,
|
|
|
|
|
),
|
|
|
|
|
Paragraph::new(&theme::TEXT_MONO, spending_amount),
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, tr("joint__to_the_total_amount").into()),
|
|
|
|
|
Paragraph::new(
|
|
|
|
|
&theme::TEXT_BOLD,
|
|
|
|
|
TR::joint__to_the_total_amount.try_into()?,
|
|
|
|
|
),
|
|
|
|
|
Paragraph::new(&theme::TEXT_MONO, total_amount),
|
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
content_in_button_page(
|
|
|
|
|
tr("joint__title").into(),
|
|
|
|
|
TR::joint__title.try_into()?,
|
|
|
|
|
paragraphs,
|
|
|
|
|
tr("buttons__hold_to_confirm").into(),
|
|
|
|
|
TR::buttons__hold_to_confirm.into(),
|
|
|
|
|
Some("".into()),
|
|
|
|
|
true,
|
|
|
|
|
)
|
|
|
|
|
@ -583,22 +580,22 @@ extern "C" fn new_confirm_modify_output(n_args: usize, args: *const Obj, kwargs:
|
|
|
|
|
let amount_new: StrBuffer = kwargs.get(Qstr::MP_QSTR_amount_new)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
let description = if sign < 0 {
|
|
|
|
|
tr("modify_amount__decrease_amount")
|
|
|
|
|
TR::modify_amount__decrease_amount
|
|
|
|
|
} else {
|
|
|
|
|
tr("modify_amount__increase_amount")
|
|
|
|
|
TR::modify_amount__increase_amount
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let paragraphs = Paragraphs::new([
|
|
|
|
|
Paragraph::new(&theme::TEXT_NORMAL, description.into()),
|
|
|
|
|
Paragraph::new(&theme::TEXT_NORMAL, description.try_into()?),
|
|
|
|
|
Paragraph::new(&theme::TEXT_MONO, amount_change).break_after(),
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, tr("modify_amount__new_amount").into()),
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, TR::modify_amount__new_amount.try_into()?),
|
|
|
|
|
Paragraph::new(&theme::TEXT_MONO, amount_new),
|
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
content_in_button_page(
|
|
|
|
|
tr("modify_amount__title").into(),
|
|
|
|
|
TR::modify_amount__title.try_into()?,
|
|
|
|
|
paragraphs,
|
|
|
|
|
tr("buttons__confirm").into(),
|
|
|
|
|
TR::buttons__confirm.into(),
|
|
|
|
|
Some("".into()),
|
|
|
|
|
false,
|
|
|
|
|
)
|
|
|
|
|
@ -616,7 +613,7 @@ extern "C" fn new_confirm_output_address(n_args: usize, args: *const Obj, kwargs
|
|
|
|
|
let get_page = move |page_index| {
|
|
|
|
|
assert!(page_index == 0);
|
|
|
|
|
// RECIPIENT + address
|
|
|
|
|
let btn_layout = ButtonLayout::cancel_none_text(tr("buttons__continue").into());
|
|
|
|
|
let btn_layout = ButtonLayout::cancel_none_text(TR::buttons__continue.into());
|
|
|
|
|
let btn_actions = ButtonActions::cancel_none_confirm();
|
|
|
|
|
// Not putting hyphens in the address.
|
|
|
|
|
// Potentially adding address label in different font.
|
|
|
|
|
@ -654,7 +651,7 @@ extern "C" fn new_confirm_output_amount(n_args: usize, args: *const Obj, kwargs:
|
|
|
|
|
let get_page = move |page_index| {
|
|
|
|
|
assert!(page_index == 0);
|
|
|
|
|
// AMOUNT + amount
|
|
|
|
|
let btn_layout = ButtonLayout::up_arrow_none_text(tr("buttons__confirm").into());
|
|
|
|
|
let btn_layout = ButtonLayout::up_arrow_none_text(TR::buttons__confirm.into());
|
|
|
|
|
let btn_actions = ButtonActions::cancel_none_confirm();
|
|
|
|
|
let ops = OpTextLayout::new(theme::TEXT_MONO).text_mono(amount.clone());
|
|
|
|
|
let formatted = FormattedText::new(ops).vertically_centered();
|
|
|
|
|
@ -680,11 +677,17 @@ extern "C" fn new_confirm_total(n_args: usize, args: *const Obj, kwargs: *mut Ma
|
|
|
|
|
let total_label: StrBuffer = kwargs.get(Qstr::MP_QSTR_total_label)?.try_into()?;
|
|
|
|
|
let fee_label: StrBuffer = kwargs.get(Qstr::MP_QSTR_fee_label)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
// cached allocated translated strings that get_page can reuse
|
|
|
|
|
let tr_title_fee = TR::confirm_total__title_fee.try_into()?;
|
|
|
|
|
let tr_fee_rate = TR::confirm_total__fee_rate.try_into()?;
|
|
|
|
|
let tr_title_sending_from = TR::confirm_total__title_sending_from.try_into()?;
|
|
|
|
|
let tr_account = TR::words__account_colon.try_into()?;
|
|
|
|
|
|
|
|
|
|
let get_page = move |page_index| {
|
|
|
|
|
match page_index {
|
|
|
|
|
0 => {
|
|
|
|
|
// Total amount + fee
|
|
|
|
|
let btn_layout = ButtonLayout::cancel_armed_info(tr("buttons__confirm").into());
|
|
|
|
|
let btn_layout = ButtonLayout::cancel_armed_info(TR::buttons__confirm.into());
|
|
|
|
|
let btn_actions = ButtonActions::cancel_confirm_next();
|
|
|
|
|
|
|
|
|
|
let ops = OpTextLayout::new(theme::TEXT_MONO)
|
|
|
|
|
@ -708,11 +711,11 @@ extern "C" fn new_confirm_total(n_args: usize, args: *const Obj, kwargs: *mut Ma
|
|
|
|
|
let fee_rate_amount = fee_rate_amount.clone().unwrap_or_default();
|
|
|
|
|
|
|
|
|
|
let ops = OpTextLayout::new(theme::TEXT_MONO)
|
|
|
|
|
.text_bold(tr("confirm_total__title_fee").into())
|
|
|
|
|
.text_bold(tr_title_fee)
|
|
|
|
|
.newline()
|
|
|
|
|
.newline()
|
|
|
|
|
.newline_half()
|
|
|
|
|
.text_bold(tr("confirm_total__fee_rate").into())
|
|
|
|
|
.text_bold(tr_fee_rate)
|
|
|
|
|
.newline()
|
|
|
|
|
.text_mono(fee_rate_amount);
|
|
|
|
|
|
|
|
|
|
@ -729,11 +732,11 @@ extern "C" fn new_confirm_total(n_args: usize, args: *const Obj, kwargs: *mut Ma
|
|
|
|
|
// TODO: include wallet info when available
|
|
|
|
|
|
|
|
|
|
let ops = OpTextLayout::new(theme::TEXT_MONO)
|
|
|
|
|
.text_bold(tr("confirm_total__title_sending_from").into())
|
|
|
|
|
.text_bold(tr_title_sending_from)
|
|
|
|
|
.newline()
|
|
|
|
|
.newline()
|
|
|
|
|
.newline_half()
|
|
|
|
|
.text_bold(tr("words__account_colon").into())
|
|
|
|
|
.text_bold(tr_account)
|
|
|
|
|
.newline()
|
|
|
|
|
.text_mono(account_label);
|
|
|
|
|
|
|
|
|
|
@ -760,14 +763,17 @@ extern "C" fn new_altcoin_tx_summary(n_args: usize, args: *const Obj, kwargs: *m
|
|
|
|
|
let cancel_cross: bool = kwargs.get_or(Qstr::MP_QSTR_cancel_cross, false)?;
|
|
|
|
|
let items: Obj = kwargs.get(Qstr::MP_QSTR_items)?;
|
|
|
|
|
|
|
|
|
|
// cached allocated translated strings that get_page can reuse
|
|
|
|
|
let tr_title_fee = TR::confirm_total__title_fee.try_into()?;
|
|
|
|
|
|
|
|
|
|
let get_page = move |page_index| {
|
|
|
|
|
match page_index {
|
|
|
|
|
0 => {
|
|
|
|
|
// Amount + fee
|
|
|
|
|
let btn_layout = if cancel_cross {
|
|
|
|
|
ButtonLayout::cancel_armed_info(tr("buttons__confirm").into())
|
|
|
|
|
ButtonLayout::cancel_armed_info(TR::buttons__confirm.into())
|
|
|
|
|
} else {
|
|
|
|
|
ButtonLayout::up_arrow_armed_info(tr("buttons__confirm").into())
|
|
|
|
|
ButtonLayout::up_arrow_armed_info(TR::buttons__confirm.into())
|
|
|
|
|
};
|
|
|
|
|
let btn_actions = ButtonActions::cancel_confirm_next();
|
|
|
|
|
|
|
|
|
|
@ -803,7 +809,7 @@ extern "C" fn new_altcoin_tx_summary(n_args: usize, args: *const Obj, kwargs: *m
|
|
|
|
|
|
|
|
|
|
let formatted = FormattedText::new(ops).vertically_centered();
|
|
|
|
|
Page::new(btn_layout, btn_actions, formatted)
|
|
|
|
|
.with_title(tr("confirm_total__title_fee").into())
|
|
|
|
|
.with_title(tr_title_fee)
|
|
|
|
|
.with_slim_arrows()
|
|
|
|
|
}
|
|
|
|
|
_ => unreachable!(),
|
|
|
|
|
@ -821,7 +827,8 @@ extern "C" fn new_confirm_address(n_args: usize, args: *const Obj, kwargs: *mut
|
|
|
|
|
let block = move |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
|
|
|
|
|
let address: StrBuffer = kwargs.get(Qstr::MP_QSTR_data)?.try_into()?;
|
|
|
|
|
let verb: StrBuffer = kwargs.get_or(Qstr::MP_QSTR_verb, tr("buttons__confirm").into())?;
|
|
|
|
|
let verb: TString<'static> =
|
|
|
|
|
kwargs.get_or(Qstr::MP_QSTR_verb, TR::buttons__confirm.into())?;
|
|
|
|
|
let chunkify: bool = kwargs.get_or(Qstr::MP_QSTR_chunkify, false)?;
|
|
|
|
|
|
|
|
|
|
let get_page = move |page_index| {
|
|
|
|
|
@ -850,9 +857,9 @@ extern "C" fn new_confirm_address(n_args: usize, args: *const Obj, kwargs: *mut
|
|
|
|
|
/// General pattern of most tutorial screens.
|
|
|
|
|
/// (title, text, btn_layout, btn_actions, text_y_offset)
|
|
|
|
|
fn tutorial_screen(
|
|
|
|
|
title: &'static str,
|
|
|
|
|
text: &'static str,
|
|
|
|
|
btn_layout: ButtonLayout<StrBuffer>,
|
|
|
|
|
title: StrBuffer,
|
|
|
|
|
text: StrBuffer,
|
|
|
|
|
btn_layout: ButtonLayout,
|
|
|
|
|
btn_actions: ButtonActions,
|
|
|
|
|
) -> Page<StrBuffer> {
|
|
|
|
|
let ops = OpTextLayout::<StrBuffer>::new(theme::TEXT_NORMAL).text_normal(text.into());
|
|
|
|
|
@ -864,7 +871,23 @@ extern "C" fn tutorial(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj
|
|
|
|
|
let block = |_args: &[Obj], _kwargs: &Map| {
|
|
|
|
|
const PAGE_COUNT: usize = 7;
|
|
|
|
|
|
|
|
|
|
let get_page = |page_index| {
|
|
|
|
|
// cached allocated translated strings that get_page can reuse
|
|
|
|
|
let tr_title_hello: StrBuffer = TR::tutorial__title_hello.try_into()?;
|
|
|
|
|
let tr_welcome_press_right: StrBuffer = TR::tutorial__welcome_press_right.try_into()?;
|
|
|
|
|
let tr_use_trezor: StrBuffer = TR::tutorial__use_trezor.try_into()?;
|
|
|
|
|
let tr_hold_to_confirm: StrBuffer = TR::buttons__hold_to_confirm.try_into()?;
|
|
|
|
|
let tr_press_and_hold: StrBuffer = TR::tutorial__press_and_hold.try_into()?;
|
|
|
|
|
let tr_title_screen_scroll: StrBuffer = TR::tutorial__title_screen_scroll.try_into()?;
|
|
|
|
|
let tr_scroll_down: StrBuffer = TR::tutorial__scroll_down.try_into()?;
|
|
|
|
|
let tr_confirm: StrBuffer = TR::buttons__confirm.try_into()?;
|
|
|
|
|
let tr_middle_click: StrBuffer = TR::tutorial__middle_click.try_into()?;
|
|
|
|
|
let tr_title_tutorial_complete: StrBuffer =
|
|
|
|
|
TR::tutorial__title_tutorial_complete.try_into()?;
|
|
|
|
|
let tr_ready_to_use: StrBuffer = TR::tutorial__ready_to_use.try_into()?;
|
|
|
|
|
let tr_title_skip: StrBuffer = TR::tutorial__title_skip.try_into()?;
|
|
|
|
|
let tr_sure_you_want_skip: StrBuffer = TR::tutorial__sure_you_want_skip.try_into()?;
|
|
|
|
|
|
|
|
|
|
let get_page = move |page_index| {
|
|
|
|
|
// Lazy-loaded list of screens to show, with custom content,
|
|
|
|
|
// buttons and actions triggered by these buttons.
|
|
|
|
|
// Cancelling the first screen will point to the last one,
|
|
|
|
|
@ -873,48 +896,48 @@ extern "C" fn tutorial(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj
|
|
|
|
|
match page_index {
|
|
|
|
|
// title, text, btn_layout, btn_actions
|
|
|
|
|
0 => tutorial_screen(
|
|
|
|
|
tr("tutorial__title_hello"),
|
|
|
|
|
tr("tutorial__welcome_press_right"),
|
|
|
|
|
tr_title_hello,
|
|
|
|
|
tr_welcome_press_right,
|
|
|
|
|
ButtonLayout::cancel_none_arrow(),
|
|
|
|
|
ButtonActions::last_none_next(),
|
|
|
|
|
),
|
|
|
|
|
1 => tutorial_screen(
|
|
|
|
|
"",
|
|
|
|
|
tr("tutorial__use_trezor"),
|
|
|
|
|
"".into(),
|
|
|
|
|
tr_use_trezor,
|
|
|
|
|
ButtonLayout::arrow_none_arrow(),
|
|
|
|
|
ButtonActions::prev_none_next(),
|
|
|
|
|
),
|
|
|
|
|
2 => tutorial_screen(
|
|
|
|
|
tr("buttons__hold_to_confirm"),
|
|
|
|
|
tr("tutorial__press_and_hold"),
|
|
|
|
|
ButtonLayout::arrow_none_htc(tr("buttons__hold_to_confirm").into()),
|
|
|
|
|
tr_hold_to_confirm,
|
|
|
|
|
tr_press_and_hold,
|
|
|
|
|
ButtonLayout::arrow_none_htc(TR::buttons__hold_to_confirm.into()),
|
|
|
|
|
ButtonActions::prev_none_next(),
|
|
|
|
|
),
|
|
|
|
|
3 => tutorial_screen(
|
|
|
|
|
tr("tutorial__title_screen_scroll"),
|
|
|
|
|
tr("tutorial__scroll_down"),
|
|
|
|
|
ButtonLayout::arrow_none_text(tr("buttons__continue").into()),
|
|
|
|
|
tr_title_screen_scroll,
|
|
|
|
|
tr_scroll_down,
|
|
|
|
|
ButtonLayout::arrow_none_text(TR::buttons__continue.into()),
|
|
|
|
|
ButtonActions::prev_none_next(),
|
|
|
|
|
),
|
|
|
|
|
4 => tutorial_screen(
|
|
|
|
|
tr("buttons__confirm"),
|
|
|
|
|
tr("tutorial__middle_click"),
|
|
|
|
|
ButtonLayout::none_armed_none(tr("buttons__confirm").into()),
|
|
|
|
|
tr_confirm,
|
|
|
|
|
tr_middle_click,
|
|
|
|
|
ButtonLayout::none_armed_none(TR::buttons__confirm.into()),
|
|
|
|
|
ButtonActions::none_next_none(),
|
|
|
|
|
),
|
|
|
|
|
5 => tutorial_screen(
|
|
|
|
|
tr("tutorial__title_tutorial_complete"),
|
|
|
|
|
tr("tutorial__ready_to_use"),
|
|
|
|
|
tr_title_tutorial_complete,
|
|
|
|
|
tr_ready_to_use,
|
|
|
|
|
ButtonLayout::text_none_text(
|
|
|
|
|
tr("buttons__again").into(),
|
|
|
|
|
tr("buttons__continue").into(),
|
|
|
|
|
TR::buttons__again.into(),
|
|
|
|
|
TR::buttons__continue.into(),
|
|
|
|
|
),
|
|
|
|
|
ButtonActions::beginning_none_confirm(),
|
|
|
|
|
),
|
|
|
|
|
6 => tutorial_screen(
|
|
|
|
|
tr("tutorial__title_skip"),
|
|
|
|
|
tr("tutorial__sure_you_want_skip"),
|
|
|
|
|
ButtonLayout::arrow_none_text(tr("buttons__skip").into()),
|
|
|
|
|
tr_title_skip,
|
|
|
|
|
tr_sure_you_want_skip,
|
|
|
|
|
ButtonLayout::arrow_none_text(TR::buttons__skip.into()),
|
|
|
|
|
ButtonActions::beginning_none_cancel(),
|
|
|
|
|
),
|
|
|
|
|
_ => unreachable!(),
|
|
|
|
|
@ -946,33 +969,37 @@ extern "C" fn new_confirm_modify_fee(n_args: usize, args: *const Obj, kwargs: *m
|
|
|
|
|
.try_into_option()?;
|
|
|
|
|
|
|
|
|
|
let (description, change) = match sign {
|
|
|
|
|
s if s < 0 => (tr("modify_fee__decrease_fee"), user_fee_change),
|
|
|
|
|
s if s > 0 => (tr("modify_fee__increase_fee"), user_fee_change),
|
|
|
|
|
_ => (tr("modify_fee__no_change"), StrBuffer::empty()),
|
|
|
|
|
s if s < 0 => (TR::modify_fee__decrease_fee, user_fee_change),
|
|
|
|
|
s if s > 0 => (TR::modify_fee__increase_fee, user_fee_change),
|
|
|
|
|
_ => (TR::modify_fee__no_change, StrBuffer::empty()),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let mut paragraphs_vec = ParagraphVecShort::new();
|
|
|
|
|
paragraphs_vec
|
|
|
|
|
.add(Paragraph::new(&theme::TEXT_BOLD, description.into()))
|
|
|
|
|
.add(Paragraph::new(&theme::TEXT_BOLD, description.try_into()?))
|
|
|
|
|
.add(Paragraph::new(&theme::TEXT_MONO, change))
|
|
|
|
|
.add(
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, tr("modify_fee__transaction_fee").into())
|
|
|
|
|
.no_break(),
|
|
|
|
|
Paragraph::new(
|
|
|
|
|
&theme::TEXT_BOLD,
|
|
|
|
|
TR::modify_fee__transaction_fee.try_into()?,
|
|
|
|
|
)
|
|
|
|
|
.no_break(),
|
|
|
|
|
)
|
|
|
|
|
.add(Paragraph::new(&theme::TEXT_MONO, total_fee_new));
|
|
|
|
|
|
|
|
|
|
if let Some(fee_rate_amount) = fee_rate_amount {
|
|
|
|
|
paragraphs_vec
|
|
|
|
|
.add(
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, tr("modify_fee__fee_rate").into()).no_break(),
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, TR::modify_fee__fee_rate.try_into()?)
|
|
|
|
|
.no_break(),
|
|
|
|
|
)
|
|
|
|
|
.add(Paragraph::new(&theme::TEXT_MONO, fee_rate_amount));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
content_in_button_page(
|
|
|
|
|
tr("modify_fee__title").into(),
|
|
|
|
|
TR::modify_fee__title.try_into()?,
|
|
|
|
|
paragraphs_vec.into_paragraphs(),
|
|
|
|
|
tr("buttons__confirm").into(),
|
|
|
|
|
TR::buttons__confirm.into(),
|
|
|
|
|
Some("".into()),
|
|
|
|
|
false,
|
|
|
|
|
)
|
|
|
|
|
@ -983,7 +1010,7 @@ extern "C" fn new_confirm_modify_fee(n_args: usize, args: *const Obj, kwargs: *m
|
|
|
|
|
extern "C" fn new_multiple_pages_texts(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = move |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
|
|
|
|
|
let verb: StrBuffer = kwargs.get(Qstr::MP_QSTR_verb)?.try_into()?;
|
|
|
|
|
let verb: TString<'static> = kwargs.get(Qstr::MP_QSTR_verb)?.try_into()?;
|
|
|
|
|
let items: Gc<List> = kwargs.get(Qstr::MP_QSTR_items)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
// Cache the page count so that we can move `items` into the closure.
|
|
|
|
|
@ -1054,25 +1081,25 @@ extern "C" fn new_confirm_fido(n_args: usize, args: *const Obj, kwargs: *mut Map
|
|
|
|
|
let (btn_layout, btn_actions) = if page_count == 1 {
|
|
|
|
|
// There is only one page
|
|
|
|
|
(
|
|
|
|
|
ButtonLayout::cancel_none_text(tr("buttons__confirm").into()),
|
|
|
|
|
ButtonLayout::cancel_none_text(TR::buttons__confirm.into()),
|
|
|
|
|
ButtonActions::cancel_none_confirm(),
|
|
|
|
|
)
|
|
|
|
|
} else if page_index == 0 {
|
|
|
|
|
// First page
|
|
|
|
|
(
|
|
|
|
|
ButtonLayout::cancel_armed_arrow(tr("buttons__select").into()),
|
|
|
|
|
ButtonLayout::cancel_armed_arrow(TR::buttons__select.into()),
|
|
|
|
|
ButtonActions::cancel_confirm_next(),
|
|
|
|
|
)
|
|
|
|
|
} else if page_index == page_count - 1 {
|
|
|
|
|
// Last page
|
|
|
|
|
(
|
|
|
|
|
ButtonLayout::arrow_armed_none(tr("buttons__select").into()),
|
|
|
|
|
ButtonLayout::arrow_armed_none(TR::buttons__select.into()),
|
|
|
|
|
ButtonActions::prev_confirm_none(),
|
|
|
|
|
)
|
|
|
|
|
} else {
|
|
|
|
|
// Page in the middle
|
|
|
|
|
(
|
|
|
|
|
ButtonLayout::arrow_armed_arrow(tr("buttons__select").into()),
|
|
|
|
|
ButtonLayout::arrow_armed_arrow(TR::buttons__select.into()),
|
|
|
|
|
ButtonActions::prev_confirm_next(),
|
|
|
|
|
)
|
|
|
|
|
};
|
|
|
|
|
@ -1101,7 +1128,7 @@ extern "C" fn new_confirm_fido(n_args: usize, args: *const Obj, kwargs: *mut Map
|
|
|
|
|
|
|
|
|
|
extern "C" fn new_show_warning(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = move |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let button: TString<'static> = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let warning: StrBuffer = kwargs.get(Qstr::MP_QSTR_warning)?.try_into()?;
|
|
|
|
|
let description: StrBuffer = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
@ -1156,7 +1183,7 @@ extern "C" fn new_show_info(n_args: usize, args: *const Obj, kwargs: *mut Map) -
|
|
|
|
|
|
|
|
|
|
extern "C" fn new_show_passphrase() -> Obj {
|
|
|
|
|
let block = move || {
|
|
|
|
|
let text: StrBuffer = tr("passphrase__please_enter").into();
|
|
|
|
|
let text: StrBuffer = TR::passphrase__please_enter.try_into()?;
|
|
|
|
|
let paragraph = Paragraph::new(&theme::TEXT_NORMAL, text).centered();
|
|
|
|
|
let content = Paragraphs::new([paragraph]);
|
|
|
|
|
let obj = LayoutObj::new(content)?;
|
|
|
|
|
@ -1168,18 +1195,23 @@ extern "C" fn new_show_passphrase() -> Obj {
|
|
|
|
|
extern "C" fn new_show_mismatch(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = move |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
// cached allocated translated strings that get_page can reuse
|
|
|
|
|
let tr_contact_support_at = TR::addr_mismatch__contact_support_at.try_into()?;
|
|
|
|
|
let tr_support_url = TR::addr_mismatch__support_url.try_into()?;
|
|
|
|
|
|
|
|
|
|
let get_page = move |page_index| {
|
|
|
|
|
assert!(page_index == 0);
|
|
|
|
|
|
|
|
|
|
let btn_layout = ButtonLayout::arrow_none_text(tr("buttons__quit").into());
|
|
|
|
|
let btn_layout = ButtonLayout::arrow_none_text(TR::buttons__quit.into());
|
|
|
|
|
let btn_actions = ButtonActions::cancel_none_confirm();
|
|
|
|
|
let ops = OpTextLayout::<StrBuffer>::new(theme::TEXT_NORMAL)
|
|
|
|
|
.text_bold(title.clone())
|
|
|
|
|
.newline()
|
|
|
|
|
.newline_half()
|
|
|
|
|
.text_normal(tr("addr_mismatch__contact_support_at").into())
|
|
|
|
|
.text_normal(tr_contact_support_at)
|
|
|
|
|
.newline()
|
|
|
|
|
.text_bold(tr("addr_mismatch__support_url").into());
|
|
|
|
|
.text_bold(tr_support_url);
|
|
|
|
|
let formatted = FormattedText::new(ops);
|
|
|
|
|
Page::new(btn_layout, btn_actions, formatted)
|
|
|
|
|
};
|
|
|
|
|
@ -1194,8 +1226,8 @@ extern "C" fn new_show_mismatch(n_args: usize, args: *const Obj, kwargs: *mut Ma
|
|
|
|
|
extern "C" fn new_confirm_with_info(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = move |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
|
|
|
|
|
let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let verb_cancel: Option<StrBuffer> = kwargs
|
|
|
|
|
let button: TString<'static> = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let verb_cancel: Option<TString<'static>> = kwargs
|
|
|
|
|
.get(Qstr::MP_QSTR_verb_cancel)
|
|
|
|
|
.unwrap_or_else(|_| Obj::const_none())
|
|
|
|
|
.try_into_option()?;
|
|
|
|
|
@ -1215,7 +1247,7 @@ extern "C" fn new_confirm_with_info(n_args: usize, args: *const Obj, kwargs: *mu
|
|
|
|
|
|
|
|
|
|
let obj = LayoutObj::new(Frame::new(
|
|
|
|
|
title,
|
|
|
|
|
ShowMore::<Paragraphs<ParagraphVecShort<StrBuffer>>, StrBuffer>::new(
|
|
|
|
|
ShowMore::<Paragraphs<ParagraphVecShort<StrBuffer>>>::new(
|
|
|
|
|
paragraphs.into_paragraphs(),
|
|
|
|
|
verb_cancel,
|
|
|
|
|
button,
|
|
|
|
|
@ -1229,7 +1261,7 @@ extern "C" fn new_confirm_with_info(n_args: usize, args: *const Obj, kwargs: *mu
|
|
|
|
|
extern "C" fn new_confirm_more(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = move |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
|
|
|
|
|
let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let button: TString<'static> = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let items: Obj = kwargs.get(Qstr::MP_QSTR_items)?;
|
|
|
|
|
|
|
|
|
|
let mut paragraphs = ParagraphVecLong::new();
|
|
|
|
|
@ -1259,19 +1291,19 @@ extern "C" fn new_confirm_coinjoin(n_args: usize, args: *const Obj, kwargs: *mut
|
|
|
|
|
|
|
|
|
|
// Decreasing bottom padding between paragraphs to fit one screen
|
|
|
|
|
let paragraphs = Paragraphs::new([
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, tr("coinjoin__max_rounds").into())
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, TR::coinjoin__max_rounds.try_into()?)
|
|
|
|
|
.with_bottom_padding(2),
|
|
|
|
|
Paragraph::new(&theme::TEXT_MONO, max_rounds),
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, tr("coinjoin__max_mining_fee").into())
|
|
|
|
|
Paragraph::new(&theme::TEXT_BOLD, TR::coinjoin__max_mining_fee.try_into()?)
|
|
|
|
|
.with_bottom_padding(2)
|
|
|
|
|
.no_break(),
|
|
|
|
|
Paragraph::new(&theme::TEXT_MONO, max_feerate).with_bottom_padding(2),
|
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
content_in_button_page(
|
|
|
|
|
tr("coinjoin__title").into(),
|
|
|
|
|
TR::coinjoin__title.try_into()?,
|
|
|
|
|
paragraphs,
|
|
|
|
|
tr("buttons__hold_to_confirm").into(),
|
|
|
|
|
TR::buttons__hold_to_confirm.into(),
|
|
|
|
|
None,
|
|
|
|
|
true,
|
|
|
|
|
)
|
|
|
|
|
@ -1295,9 +1327,7 @@ extern "C" fn new_request_passphrase(n_args: usize, args: *const Obj, kwargs: *m
|
|
|
|
|
let block = |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let prompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
let obj = LayoutObj::new(
|
|
|
|
|
Frame::new(prompt, PassphraseEntry::<StrBuffer>::new()).with_title_centered(),
|
|
|
|
|
)?;
|
|
|
|
|
let obj = LayoutObj::new(Frame::new(prompt, PassphraseEntry::new()).with_title_centered())?;
|
|
|
|
|
Ok(obj.into())
|
|
|
|
|
};
|
|
|
|
|
unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
|
|
|
|
|
@ -1308,8 +1338,7 @@ extern "C" fn new_request_bip39(n_args: usize, args: *const Obj, kwargs: *mut Ma
|
|
|
|
|
let prompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
let obj = LayoutObj::new(
|
|
|
|
|
Frame::new(prompt, WordlistEntry::<StrBuffer>::new(WordlistType::Bip39))
|
|
|
|
|
.with_title_centered(),
|
|
|
|
|
Frame::new(prompt, WordlistEntry::new(WordlistType::Bip39)).with_title_centered(),
|
|
|
|
|
)?;
|
|
|
|
|
Ok(obj.into())
|
|
|
|
|
};
|
|
|
|
|
@ -1321,11 +1350,7 @@ extern "C" fn new_request_slip39(n_args: usize, args: *const Obj, kwargs: *mut M
|
|
|
|
|
let prompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
let obj = LayoutObj::new(
|
|
|
|
|
Frame::new(
|
|
|
|
|
prompt,
|
|
|
|
|
WordlistEntry::<StrBuffer>::new(WordlistType::Slip39),
|
|
|
|
|
)
|
|
|
|
|
.with_title_centered(),
|
|
|
|
|
Frame::new(prompt, WordlistEntry::new(WordlistType::Slip39)).with_title_centered(),
|
|
|
|
|
)?;
|
|
|
|
|
Ok(obj.into())
|
|
|
|
|
};
|
|
|
|
|
@ -1338,7 +1363,7 @@ extern "C" fn new_select_word(n_args: usize, args: *const Obj, kwargs: *mut Map)
|
|
|
|
|
let description: StrBuffer = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
|
|
|
|
|
let words_iterable: Obj = kwargs.get(Qstr::MP_QSTR_words)?;
|
|
|
|
|
// There are only 3 words, but SimpleChoice requires 5 elements
|
|
|
|
|
let words: Vec<StrBuffer, 5> = iter_into_vec(words_iterable)?;
|
|
|
|
|
let words: Vec<TString<'static>, 5> = util::iter_into_vec(words_iterable)?;
|
|
|
|
|
|
|
|
|
|
// Returning the index of the selected word, not the word itself
|
|
|
|
|
let obj = LayoutObj::new(
|
|
|
|
|
@ -1358,13 +1383,11 @@ extern "C" fn new_select_word(n_args: usize, args: *const Obj, kwargs: *mut Map)
|
|
|
|
|
extern "C" fn new_show_share_words(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let share_words_obj: Obj = kwargs.get(Qstr::MP_QSTR_share_words)?;
|
|
|
|
|
let share_words: Vec<StrBuffer, 33> = iter_into_vec(share_words_obj)?;
|
|
|
|
|
let share_words: Vec<StrBuffer, 33> = util::iter_into_vec(share_words_obj)?;
|
|
|
|
|
|
|
|
|
|
let cancel_btn = Some(ButtonDetails::up_arrow_icon());
|
|
|
|
|
let confirm_btn = Some(
|
|
|
|
|
ButtonDetails::<StrBuffer>::text(tr("buttons__hold_to_confirm").into())
|
|
|
|
|
.with_default_duration(),
|
|
|
|
|
);
|
|
|
|
|
let confirm_btn =
|
|
|
|
|
Some(ButtonDetails::text(TR::buttons__hold_to_confirm.into()).with_default_duration());
|
|
|
|
|
|
|
|
|
|
let obj = LayoutObj::new(
|
|
|
|
|
ButtonPage::new(ShareWords::new(share_words), theme::BG)
|
|
|
|
|
@ -1384,11 +1407,7 @@ extern "C" fn new_request_number(n_args: usize, args: *const Obj, kwargs: *mut M
|
|
|
|
|
let count: u32 = kwargs.get(Qstr::MP_QSTR_count)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
let obj = LayoutObj::new(
|
|
|
|
|
Frame::new(
|
|
|
|
|
title,
|
|
|
|
|
NumberInput::<StrBuffer>::new(min_count, max_count, count),
|
|
|
|
|
)
|
|
|
|
|
.with_title_centered(),
|
|
|
|
|
Frame::new(title, NumberInput::new(min_count, max_count, count)).with_title_centered(),
|
|
|
|
|
)?;
|
|
|
|
|
Ok(obj.into())
|
|
|
|
|
};
|
|
|
|
|
@ -1397,7 +1416,7 @@ extern "C" fn new_request_number(n_args: usize, args: *const Obj, kwargs: *mut M
|
|
|
|
|
|
|
|
|
|
extern "C" fn new_show_checklist(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = move |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let button: TString<'static> = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let active: usize = kwargs.get(Qstr::MP_QSTR_active)?.try_into()?;
|
|
|
|
|
let items: Obj = kwargs.get(Qstr::MP_QSTR_items)?;
|
|
|
|
|
|
|
|
|
|
@ -1438,7 +1457,7 @@ extern "C" fn new_show_checklist(n_args: usize, args: *const Obj, kwargs: *mut M
|
|
|
|
|
extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = move |_args: &[Obj], kwargs: &Map| {
|
|
|
|
|
let description: StrBuffer = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
|
|
|
|
|
let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let button: TString<'static> = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
|
|
|
|
|
let dry_run: bool = kwargs.get(Qstr::MP_QSTR_dry_run)?.try_into()?;
|
|
|
|
|
let show_info: bool = kwargs.get(Qstr::MP_QSTR_show_info)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
@ -1448,22 +1467,22 @@ extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut
|
|
|
|
|
paragraphs
|
|
|
|
|
.add(Paragraph::new(
|
|
|
|
|
&theme::TEXT_NORMAL,
|
|
|
|
|
tr("recovery__only_first_n_letters").into(),
|
|
|
|
|
TR::recovery__only_first_n_letters.try_into()?,
|
|
|
|
|
))
|
|
|
|
|
.add(Paragraph::new(
|
|
|
|
|
&theme::TEXT_NORMAL,
|
|
|
|
|
tr("recovery__cursor_will_change").into(),
|
|
|
|
|
TR::recovery__cursor_will_change.try_into()?,
|
|
|
|
|
));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let title = if dry_run {
|
|
|
|
|
tr("recovery__title_dry_run")
|
|
|
|
|
TR::recovery__title_dry_run
|
|
|
|
|
} else {
|
|
|
|
|
tr("recovery__title")
|
|
|
|
|
TR::recovery__title
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
content_in_button_page(
|
|
|
|
|
title.into(),
|
|
|
|
|
title.try_into()?,
|
|
|
|
|
paragraphs.into_paragraphs(),
|
|
|
|
|
button,
|
|
|
|
|
Some("".into()),
|
|
|
|
|
@ -1475,9 +1494,9 @@ extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut
|
|
|
|
|
|
|
|
|
|
extern "C" fn new_select_word_count(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
|
|
|
|
|
let block = |_args: &[Obj], _kwargs: &Map| {
|
|
|
|
|
let title: StrBuffer = tr("word_count__title").into();
|
|
|
|
|
let title: StrBuffer = TR::word_count__title.try_into()?;
|
|
|
|
|
|
|
|
|
|
let choices: Vec<StrBuffer, 5> = ["12", "18", "20", "24", "33"]
|
|
|
|
|
let choices: Vec<TString<'static>, 5> = ["12", "18", "20", "24", "33"]
|
|
|
|
|
.map(|num| num.into())
|
|
|
|
|
.into_iter()
|
|
|
|
|
.collect();
|
|
|
|
|
@ -1511,7 +1530,7 @@ extern "C" fn new_show_group_share_success(
|
|
|
|
|
content_in_button_page(
|
|
|
|
|
"".into(),
|
|
|
|
|
paragraphs,
|
|
|
|
|
tr("buttons__continue").into(),
|
|
|
|
|
TR::buttons__continue.into(),
|
|
|
|
|
None,
|
|
|
|
|
false,
|
|
|
|
|
)
|
|
|
|
|
@ -1593,7 +1612,7 @@ extern "C" fn new_show_lockscreen(n_args: usize, args: *const Obj, kwargs: *mut
|
|
|
|
|
let coinjoin_authorized: bool = kwargs.get_or(Qstr::MP_QSTR_coinjoin_authorized, false)?;
|
|
|
|
|
let skip_first_paint: bool = kwargs.get(Qstr::MP_QSTR_skip_first_paint)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
let obj = LayoutObj::new(Lockscreen::new(label, bootscreen, coinjoin_authorized))?;
|
|
|
|
|
let obj = LayoutObj::new(Lockscreen::new(label, bootscreen, coinjoin_authorized)?)?;
|
|
|
|
|
if skip_first_paint {
|
|
|
|
|
obj.skip_first_paint();
|
|
|
|
|
}
|
|
|
|
|
@ -1612,7 +1631,7 @@ extern "C" fn new_confirm_firmware_update(
|
|
|
|
|
let description: StrBuffer = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
|
|
|
|
|
let fingerprint: StrBuffer = kwargs.get(Qstr::MP_QSTR_fingerprint)?.try_into()?;
|
|
|
|
|
|
|
|
|
|
let title = tr("firmware_update__title");
|
|
|
|
|
let title = TR::firmware_update__title.try_into()?;
|
|
|
|
|
let message = Label::left_aligned(description, theme::TEXT_NORMAL).vertically_centered();
|
|
|
|
|
let fingerprint = Label::left_aligned(
|
|
|
|
|
fingerprint,
|
|
|
|
|
@ -1621,18 +1640,8 @@ extern "C" fn new_confirm_firmware_update(
|
|
|
|
|
.vertically_centered();
|
|
|
|
|
|
|
|
|
|
let obj = LayoutObj::new(
|
|
|
|
|
Confirm::new(
|
|
|
|
|
theme::BG,
|
|
|
|
|
title,
|
|
|
|
|
message,
|
|
|
|
|
None,
|
|
|
|
|
tr("buttons__install").into(),
|
|
|
|
|
false,
|
|
|
|
|
)
|
|
|
|
|
.with_info_screen(
|
|
|
|
|
StrBuffer::from(tr("firmware_update__title_fingerprint")),
|
|
|
|
|
fingerprint,
|
|
|
|
|
),
|
|
|
|
|
Confirm::new(theme::BG, title, message, None, TR::buttons__install, false)
|
|
|
|
|
.with_info_screen(TR::firmware_update__title_fingerprint, fingerprint),
|
|
|
|
|
)?;
|
|
|
|
|
Ok(obj.into())
|
|
|
|
|
};
|
|
|
|
|
|
matejcik
4 months ago
committed by