From 8ae4d9653ad6dc6af9ce1ea338a88fe50b6bcf75 Mon Sep 17 00:00:00 2001
From: Frank Bell <frank@r0gue.io>
Date: Tue, 2 Jul 2024 10:32:51 +0100
Subject: [PATCH 1/2] refactor: improve ux

Reuse cli functionality to standardise ux.
---
 crates/pop-cli/src/commands/new/parachain.rs | 23 ++++++++------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/crates/pop-cli/src/commands/new/parachain.rs b/crates/pop-cli/src/commands/new/parachain.rs
index 9d3d4694..9d223992 100644
--- a/crates/pop-cli/src/commands/new/parachain.rs
+++ b/crates/pop-cli/src/commands/new/parachain.rs
@@ -1,22 +1,22 @@
 // SPDX-License-Identifier: GPL-3.0
 
-use crate::style::{style, Theme};
+use crate::cli::{traits::Cli as _, Cli};
+use crate::style::style;
 use anyhow::Result;
 use clap::{
 	builder::{PossibleValue, PossibleValuesParser, TypedValueParser},
 	Args,
 };
-use std::{fs, path::Path, str::FromStr};
-
 use cliclack::{
-	clear_screen, confirm, input, intro,
+	clear_screen, confirm, input,
 	log::{self, success, warning},
-	outro, outro_cancel, set_theme,
+	outro, outro_cancel,
 };
 use pop_common::{Git, GitHub, Release};
 use pop_parachains::{
 	instantiate_template_dir, is_initial_endowment_valid, Config, Provider, Template,
 };
+use std::{fs, path::Path, str::FromStr};
 use strum::VariantArray;
 
 const DEFAULT_INITIAL_ENDOWMENT: &str = "1u64 << 60";
@@ -60,9 +60,6 @@ pub struct NewParachainCommand {
 impl NewParachainCommand {
 	/// Executes the command.
 	pub(crate) async fn execute(self) -> Result<Template> {
-		clear_screen()?;
-		set_theme(Theme);
-
 		let parachain_config = if self.name.is_none() {
 			// If user doesn't select the name guide them to generate a parachain.
 			guide_user_to_generate_parachain().await?
@@ -96,7 +93,7 @@ impl NewParachainCommand {
 }
 
 async fn guide_user_to_generate_parachain() -> Result<NewParachainCommand> {
-	intro(format!("{}: Generate a parachain", style(" Pop CLI ").black().on_magenta()))?;
+	Cli.intro("Generate a parachain")?;
 
 	let mut prompt = cliclack::select("Select a template provider: ".to_string());
 	for (i, provider) in Provider::providers().iter().enumerate() {
@@ -153,10 +150,8 @@ fn generate_parachain_from_template(
 	tag_version: Option<String>,
 	config: Config,
 ) -> Result<()> {
-	intro(format!(
-		"{}: Generating \"{}\" using {} from {}!",
-		style(" Pop CLI ").black().on_magenta(),
-		name_template,
+	Cli.intro(format!(
+		"Generating \"{name_template}\" using {} from {}!",
 		template.name(),
 		provider.name()
 	))?;
@@ -356,7 +351,7 @@ fn prompt_customizable_options() -> Result<Config> {
 		.interact()?;
 	if !is_initial_endowment_valid(&initial_endowment) {
 		outro_cancel("⚠️ The specified initial endowment is not valid")?;
-		//Prompt the user if want to use the one by default
+		// Prompt the user if they want to use the one by default
 		if !confirm(format!("📦 Would you like to use the default {}?", DEFAULT_INITIAL_ENDOWMENT))
 			.initial_value(true)
 			.interact()?

From d10efdb25f33783e76e24a6c546c25f2de84919f Mon Sep 17 00:00:00 2001
From: Frank Bell <frank@r0gue.io>
Date: Tue, 2 Jul 2024 10:42:42 +0100
Subject: [PATCH 2/2] refactor: pause with warning before screen cleared

---
 crates/pop-cli/src/commands/new/parachain.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/pop-cli/src/commands/new/parachain.rs b/crates/pop-cli/src/commands/new/parachain.rs
index 9d223992..bfa92afb 100644
--- a/crates/pop-cli/src/commands/new/parachain.rs
+++ b/crates/pop-cli/src/commands/new/parachain.rs
@@ -16,7 +16,7 @@ use pop_common::{Git, GitHub, Release};
 use pop_parachains::{
 	instantiate_template_dir, is_initial_endowment_valid, Config, Provider, Template,
 };
-use std::{fs, path::Path, str::FromStr};
+use std::{fs, path::Path, str::FromStr, thread::sleep, time::Duration};
 use strum::VariantArray;
 
 const DEFAULT_INITIAL_ENDOWMENT: &str = "1u64 << 60";
@@ -87,6 +87,7 @@ impl NewParachainCommand {
 
 		let tag_version = parachain_config.release_tag.clone();
 
+		clear_screen()?;
 		generate_parachain_from_template(name, provider, &template, tag_version, config)?;
 		Ok(template)
 	}
@@ -130,8 +131,6 @@ async fn guide_user_to_generate_parachain() -> Result<NewParachainCommand> {
 		customizable_options = prompt_customizable_options()?;
 	}
 
-	clear_screen()?;
-
 	Ok(NewParachainCommand {
 		name: Some(name),
 		provider: Some(provider.clone()),
@@ -237,6 +236,7 @@ fn get_customization_value(
 		&& (symbol.is_some() || decimals.is_some() || initial_endowment.is_some())
 	{
 		log::warning("Customization options are not available for this template")?;
+		sleep(Duration::from_secs(3))
 	}
 	return Ok(Config {
 		symbol: symbol.clone().expect("default values"),