add back button into installer first step

Author: pythcoiner

gui/Cargo.lock

@@ -39,6 +39,7 @@ pub enum Message {
     WalletRegistered(Result<(Fingerprint, Option<[u8; 32]>), Error>),
     MnemonicWord(usize, String),
     ImportMnemonic(bool),
+    Back(PathBuf),
 }
 
 #[derive(Debug, Clone)]

gui/src/installer/message.rs

@@ -33,6 +33,7 @@ pub struct Installer {
     steps: Vec<Box<dyn Step>>,
     hws: HardwareWallets,
     signer: Arc<Mutex<Signer>>,
+    back_button: bool,
 
     /// Context is data passed through each step.
     context: Context,
@@ -58,14 +59,21 @@ impl Installer {
     pub fn new(
         destination_path: PathBuf,
         network: bitcoin::Network,
+        back_button: bool,
     ) -> (Installer, Command<Message>) {
+        let path = if back_button {
+            Some(destination_path.clone())
+        } else {
+            None
+        };
         (
             Installer {
                 current: 0,
                 hws: HardwareWallets::new(destination_path.clone(), network),
-                steps: vec![Welcome::default().into()],
+                steps: vec![Welcome::new(path).into()],
                 context: Context::new(network, destination_path),
                 signer: Arc::new(Mutex::new(Signer::generate(network).unwrap())),
+                back_button,
             },
             Command::none(),
         )
@@ -134,10 +142,15 @@ impl Installer {
     }
 
     pub fn update(&mut self, message: Message) -> Command<Message> {
+        let path = if self.back_button {
+            Some(self.context.data_dir.clone())
+        } else {
+            None
+        };
         match message {
             Message::CreateWallet => {
                 self.steps = vec![
-                    Welcome::default().into(),
+                    Welcome::new(path).into(),
                     DefineDescriptor::new(self.signer.clone()).into(),
                     BackupMnemonic::new(self.signer.clone()).into(),
                     BackupDescriptor::default().into(),
@@ -151,7 +164,7 @@ impl Installer {
             }
             Message::ParticipateWallet => {
                 self.steps = vec![
-                    Welcome::default().into(),
+                    Welcome::new(path).into(),
                     ParticipateXpub::new(self.signer.clone()).into(),
                     ImportDescriptor::new(false).into(),
                     BackupMnemonic::new(self.signer.clone()).into(),
@@ -166,7 +179,7 @@ impl Installer {
             }
             Message::ImportWallet => {
                 self.steps = vec![
-                    Welcome::default().into(),
+                    Welcome::new(path).into(),
                     ImportDescriptor::new(true).into(),
                     RecoverMnemonic::default().into(),
                     RegisterDescriptor::new_import_wallet().into(),

gui/src/installer/mod.rs

@@ -52,11 +52,19 @@ pub trait Step {
 }
 
 #[derive(Default)]
-pub struct Welcome {}
+pub struct Welcome {
+    path: Option<PathBuf>,
+}
+
+impl Welcome {
+    pub fn new(path: Option<PathBuf>) -> Self {
+        Welcome { path }
+    }
+}
 
 impl Step for Welcome {
     fn view(&self, _hws: &HardwareWallets, _progress: (usize, usize)) -> Element<Message> {
-        view::welcome()
+        view::welcome(&self.path)
     }
 }
 

gui/src/installer/step/mod.rs

@@ -81,7 +81,7 @@ const NETWORKS: [Network; 4] = [
     Network::Regtest,
 ];
 
-pub fn welcome<'a>() -> Element<'a, Message> {
+pub fn welcome<'a>(path: &Option<PathBuf>) -> Element<'a, Message> {
     Container::new(
         Column::new()
             .push(
@@ -90,6 +90,12 @@ pub fn welcome<'a>() -> Element<'a, Message> {
             .push(
                 Container::new(
                     Column::new()
+                        .push_maybe(path.as_ref().map(|p| {
+                            Row::new()
+                                .push(Space::with_width(Length::Fixed(30.0)))
+                                .push(Button::new(" Back ").on_press(Message::Back(p.clone())))
+                                .push(Space::with_width(Length::Fill))
+                        }))
                         .push(
                             Row::new()
                                 .align_items(Alignment::End)

gui/src/installer/view.rs

@@ -137,7 +137,7 @@ impl Application for GUI {
                     datadir_path.clone(),
                     log_level.unwrap_or(LevelFilter::INFO),
                 );
-                let (install, command) = Installer::new(datadir_path, network);
+                let (install, command) = Installer::new(datadir_path, network, false);
                 (
                     Self {
                         state: State::Installer(Box::new(install)),
@@ -196,7 +196,7 @@ impl Application for GUI {
                         self.log_level.unwrap_or(LevelFilter::INFO),
                     );
                     let (install, command) =
-                        Installer::new(datadir_path, bitcoin::Network::Bitcoin);
+                        Installer::new(datadir_path, bitcoin::Network::Bitcoin, true);
                     self.state = State::Installer(Box::new(install));
                     command.map(|msg| Message::Install(Box::new(msg)))
                 }
@@ -213,8 +213,8 @@ impl Application for GUI {
                 }
                 _ => l.update(*msg).map(|msg| Message::Launch(Box::new(msg))),
             },
-            (State::Installer(i), Message::Install(msg)) => {
-                if let installer::Message::Exit(path, internal_bitcoind) = *msg {
+            (State::Installer(i), Message::Install(msg)) => match *msg {
+                installer::Message::Exit(path, internal_bitcoind) => {
                     let cfg = app::Config::from_file(&path).unwrap();
                     let daemon_cfg =
                         DaemonConfig::from_file(cfg.daemon_config_path.clone()).unwrap();
@@ -239,10 +239,13 @@ impl Application for GUI {
                     );
                     self.state = State::Loader(Box::new(loader));
                     command.map(|msg| Message::Load(Box::new(msg)))
-                } else {
-                    i.update(*msg).map(|msg| Message::Install(Box::new(msg)))
                 }
-            }
+                installer::Message::Back(path) => {
+                    self.state = State::Launcher(Box::new(Launcher::new(path)));
+                    Command::none()
+                }
+                _ => i.update(*msg).map(|msg| Message::Install(Box::new(msg))),
+            },
             (State::Loader(loader), Message::Load(msg)) => match *msg {
                 loader::Message::View(loader::ViewMessage::SwitchNetwork) => {
                     self.state =