Merge #1422: gui(installer): apply wording changes to installer templates

9a3bc87a755d8290f2b89847431a0fe2eb889370 gui(installer): update template SVGs (Michael Mallan)
e0434013d36376670fd16db1cc9ef9488f9fea1e gui(installer): update general templates wording (Michael Mallan)
ca276bf563990cfd795f52a66e8021c23bde7279 gui(installer): remove prompts for spending paths (Michael Mallan)
3764c972f2431545a23434bd01003de8678638a2 gui(installer): change button text to Next (Michael Mallan)
4d05e6127e68b5b6000a1f2697ae47bc71bd47c4 gui(installer): remove templates introductory text (Michael Mallan)
8183370f561ee4ad4de6ae733c2eb1f8107b521c gui(installer): update template names & descriptions (Michael Mallan)
97c9affd9cb400fee516dd2d566ce85af96abb6b gui(launcher): refer explicitly to liana wallet (Michael Mallan)

Pull request description:

  This is to resolve #1418.

ACKs for top commit:
  edouardparis:
    ACK 9a3bc87a755d8290f2b89847431a0fe2eb889370

Tree-SHA512: 0f90d405c84f6172f12b309f5f06dc5a09ac18071cbf8d81debdb4dde2740d7120612f1ebe918e87287acc6b58a92bbbcc9c547c9a8e8d86006884a9fa5f1c6c

gui/src/installer/prompt.rs

@@ -1,9 +1,5 @@
 pub const BACKUP_DESCRIPTOR_MESSAGE: &str = "The descriptor is necessary to recover your funds. The backup of your key (via mnemonics, sometimes called 'seed words') is not enough. Please make sure you have backed up both your private key and your descriptor.";
 pub const BACKUP_DESCRIPTOR_HELP: &str = "In Bitcoin, the coins are locked using a Script (related to the 'address'). In order to recover your funds you need to know both the Scripts you have participated in (your 'addresses'), and be able to sign a transaction that spends from those. For the ability to sign, you back up your private key, this is your mnemonic ('seed words'). For finding the coins that belong to you, you back up a template of your Script (your 'addresses'), this is your descriptor. However, note the descriptor need not be stored as securely as the private key. A thief who steals your descriptor but not your private key cannot steal your funds.";
-pub const DEFINE_DESCRIPTOR_PRIMARY_PATH_TOOLTIP: &str =
-    "Set key(s) that can be used to spend coins immediately, with no time restriction.";
-pub const DEFINE_DESCRIPTOR_RECOVERY_PATH_TOOLTIP: &str =
-    "Set key(s) that can be used to spend coins after a defined period of time.\n Different sets of keys can be set to become available at different times.";
 pub const DEFINE_DESCRIPTOR_FINGERPRINT_TOOLTIP: &str =
     "The alias is applied on all the keys derived from the same seed";
 pub const REGISTER_DESCRIPTOR_HELP: &str = "To be used with the wallet, a signing device needs the descriptor. If the descriptor contains one or more keys imported from an external signing device, the descriptor must be registered on it. Registration confirms that the device is able to handle the policy. Registration on a device is not a substitute for backing up the descriptor.";

gui/src/installer/view/editor/template/custom.rs

@@ -12,7 +12,6 @@ use liana_ui::{
 
 use crate::installer::{
     message::{self, Message},
-    prompt,
     step::descriptor::editor::key::Key,
     view::{
         editor::{define_descriptor_advanced_settings, defined_key, path, undefined_key},
@@ -27,25 +26,20 @@ pub fn custom_template_description(progress: (usize, usize)) -> Element<'static,
         "Introduction",
         Column::new()
             .align_items(Alignment::Start)
-            .push(h3("Custom wallet"))
+            .push(h3("Build your own"))
             .max_width(800.0)
             .push(Container::new(
-                p1_regular("Through this setup you can choose how many keys you want to use. For security reasons, we suggest you use Hardware Wallets to store them.")
+                p1_regular("For this setup you will need to define your primary and recovery spending policies. For security reasons, we suggest you use a separate Hardware Wallet for each key belonging to them.")
                 .style(color::GREY_2)
                 .horizontal_alignment(alignment::Horizontal::Left)
             ).align_x(alignment::Horizontal::Left).width(Length::Fill))
             .push(Container::new(
-                p1_regular("For this Custom wallet you will need to define your Primary and Recovery Sets of Keys.")
+                p1_regular("The keys belonging to your primary policy can always spend. Those belonging to the recovery policies will be able to spend only after a defined time of wallet inactivity, allowing for secure recovery and advanced spending policies.")
                 .style(color::GREY_2)
                 .horizontal_alignment(alignment::Horizontal::Left)
             ).align_x(alignment::Horizontal::Left).width(Length::Fill))
             .push(image::custom_template_description().width(Length::Fill))
-            .push(Container::new(
-                p1_regular("The Primary set of Keys will always be able to spend. Your Recovery set(s) of Keys will activate only after a defined time of wallet inactivity, allowing for secure recovery and advanced spending policies. You can define more than one set of Recovery Keys activating at different times.")
-                .style(color::GREY_2)
-                .horizontal_alignment(alignment::Horizontal::Left)
-            ).align_x(alignment::Horizontal::Left).width(Length::Fill))
-            .push(Row::new().push(Space::with_width(Length::Fill)).push(button::primary(None, "Select").width(Length::Fixed(200.0)).on_press(Message::Next)))
+            .push(Row::new().push(Space::with_width(Length::Fill)).push(button::primary(None, "Next").width(Length::Fixed(200.0)).on_press(Message::Next)))
             .push(Space::with_height(50.0))
             .spacing(20),
         true,
@@ -97,7 +91,6 @@ pub fn custom_template<'a>(
                 },
                 move || define_descriptor_advanced_settings(use_taproot),
             ))
-            .push(p1_regular(prompt::DEFINE_DESCRIPTOR_PRIMARY_PATH_TOOLTIP).style(color::GREY_2))
             .push(
                 path(
                     color::GREEN,
@@ -137,7 +130,6 @@ pub fn custom_template<'a>(
                 )
                 .map(|msg| Message::DefineDescriptor(message::DefineDescriptor::Path(0, msg))),
             )
-            .push(p1_regular(prompt::DEFINE_DESCRIPTOR_RECOVERY_PATH_TOOLTIP).style(color::GREY_2))
             .push(recovery_paths.into_iter().enumerate().fold(
                 Column::new().spacing(20),
                 |col, (i, p)| {

gui/src/installer/view/editor/template/inheritance.rs

@@ -27,10 +27,10 @@ pub fn inheritance_template_description(progress: (usize, usize)) -> Element<'st
         "Introduction",
         Column::new()
             .align_items(Alignment::Start)
-            .push(h3("Inheritance wallet"))
+            .push(h3("Simple inheritance wallet"))
             .max_width(800.0)
             .push(Container::new(
-                p1_regular("For this Inheritance wallet you will need 2 Keys: Your Primary Key (for yourself) and an Inheritance Key (for your heir). For security reasons, we suggest you use 2 Hardware Wallets to store them.")
+                p1_regular("For this setup you will need 2 Keys: Your Primary Key (for yourself) and an Inheritance Key (for your heir). For security reasons, we suggest you use a separate Hardware Wallet for each key.")
                 .style(color::GREY_2)
                 .horizontal_alignment(alignment::Horizontal::Left)
             ).align_x(alignment::Horizontal::Left).width(Length::Fill))
@@ -51,12 +51,12 @@ pub fn inheritance_template_description(progress: (usize, usize)) -> Element<'st
             ))
             .push(Container::new(
                 p1_regular("You will always be able to spend using your Primary Key.
-After a period of inactivity (but not before that) your Inheritance Key will become able to recover your funds. Give it to your heir(s) in order to be able to collect their inheritance.")
+After a period of inactivity (but not before that) your Inheritance Key will become able to recover your funds.")
                 .style(color::GREY_2)
                 .horizontal_alignment(alignment::Horizontal::Left)
             ).align_x(alignment::Horizontal::Left).width(Length::Fill))
             .push(image::inheritance_template_description().width(Length::Fill))
-            .push(Row::new().push(Space::with_width(Length::Fill)).push(button::primary(None, "Select").width(Length::Fixed(200.0)).on_press(Message::Next)))
+            .push(Row::new().push(Space::with_width(Length::Fill)).push(button::primary(None, "Next").width(Length::Fixed(200.0)).on_press(Message::Next)))
             .push(Space::with_height(50.0))
             .spacing(20),
         true,

gui/src/installer/view/editor/template/mod.rs

@@ -2,11 +2,11 @@ pub mod custom;
 pub mod inheritance;
 pub mod multisig_security_wallet;
 
-use iced::{alignment, Alignment, Length};
+use iced::{Alignment, Length};
 
 use liana_ui::{
     color,
-    component::text::{h3, p1_regular, p2_regular},
+    component::text::{h3, p2_regular},
     theme,
     widget::*,
 };
@@ -22,11 +22,6 @@ pub fn choose_descriptor_template(progress: (usize, usize)) -> Element<'static,
         Column::new()
             .max_width(800.0)
             .align_items(Alignment::Start)
-            .push(Container::new(
-                p1_regular("What do you want your wallet for? This depends on the amount of funds you have, the more funds, the higher the security should be. Not sure about the wallet type? We can help you.")
-                    .style(color::GREY_2)
-                    .horizontal_alignment(alignment::Horizontal::Left)
-            ).align_x(alignment::Horizontal::Left).width(Length::Fill))
             .push(
                 Button::new(
                     Column::new()
@@ -47,8 +42,8 @@ pub fn choose_descriptor_template(progress: (usize, usize)) -> Element<'static,
                 Button::new(
                     Column::new()
                         .align_items(Alignment::Start)
-                        .push(h3("Multisig security wallet"))
-                        .push(p2_regular("A secure scheme requiring stricter multiparty signature and recovery.").style(color::GREY_2))
+                        .push(h3("Expanding multisig"))
+                        .push(p2_regular("Two keys required to spend, with an extra key as a backup.").style(color::GREY_2))
                         .width(Length::Fill)
                 )
                 .padding(15)
@@ -63,7 +58,7 @@ pub fn choose_descriptor_template(progress: (usize, usize)) -> Element<'static,
                 Button::new(
                     Column::new()
                         .align_items(Alignment::Start)
-                        .push(h3("Custom (choose your own)"))
+                        .push(h3("Build your own"))
                         .push(p2_regular("Create a custom setup that fits all your needs.").style(color::GREY_2))
                         .width(Length::Fill)
                 )

gui/src/installer/view/editor/template/multisig_security_wallet.rs

@@ -32,10 +32,10 @@ pub fn multisig_security_template_description(
         "Introduction",
         Column::new()
             .align_items(Alignment::Start)
-            .push(h3("Multisig security wallet"))
+            .push(h3("Expanding multisig wallet"))
             .max_width(800.0)
             .push(Container::new(
-                p1_regular("For this setup you will need 3 keys: two Primary Keys and a Recovery Key. For security reasons, we suggest you use 3 Hardware Wallets to store them.")
+                p1_regular("For this setup you will need 3 keys: two Primary Keys and a Recovery Key. For security reasons, we suggest you use a separate Hardware Wallet for each key.")
                 .style(color::GREY_2)
                 .horizontal_alignment(alignment::Horizontal::Left)
             ).align_x(alignment::Horizontal::Left).width(Length::Fill))
@@ -61,12 +61,12 @@ pub fn multisig_security_template_description(
                         .push(p1_regular("Recovery key").bold())
             ))
             .push(Container::new(
-                p1_regular("The Primary Keys will compose a 2-of-2 multisig which will be your always-active spending policy. In case one of your keys becomes unavailable, after a period of inactivity you will be able to recover your funds using the Recovery Key together with one of your Primary Keys (2-of-3 multisig):")
+                p1_regular("The Primary Keys will compose a 2-of-2 multisig which will always be able to spend. In case one of your keys becomes unavailable, after a period of inactivity you will be able to recover your funds using the Recovery Key together with one of your Primary Keys (2-of-3 multisig):")
                 .style(color::GREY_2)
                 .horizontal_alignment(alignment::Horizontal::Left)
             ).align_x(alignment::Horizontal::Left).width(Length::Fill))
             .push(image::multisig_security_template_description().width(Length::Fill))
-            .push(Row::new().push(Space::with_width(Length::Fill)).push(button::primary(None, "Select").width(Length::Fixed(200.0)).on_press(Message::Next)))
+            .push(Row::new().push(Space::with_width(Length::Fill)).push(button::primary(None, "Next").width(Length::Fixed(200.0)).on_press(Message::Next)))
             .push(Space::with_height(50.0))
             .spacing(20),
         true,

gui/src/launcher.rs

@@ -259,7 +259,7 @@ impl Launcher {
                                                                 .width(Length::Fixed(100.0)),
                                                         )
                                                         .push(
-                                                            p1_regular("Create a new wallet")
+                                                            p1_regular("Create a new Liana wallet")
                                                                 .style(color::GREY_3),
                                                         )
                                                         .push(
@@ -283,8 +283,10 @@ impl Launcher {
                                                                 .width(Length::Fixed(100.0)),
                                                         )
                                                         .push(
-                                                            p1_regular("Add an existing wallet")
-                                                                .style(color::GREY_3),
+                                                            p1_regular(
+                                                                "Add an existing Liana wallet",
+                                                            )
+                                                            .style(color::GREY_3),
                                                         )
                                                         .push(
                                                             button::secondary(None, "Select")