From 891c2d4db28229048cbae2922b40c2e728452c9d Mon Sep 17 00:00:00 2001
From: Prakash Bhatt <prakash@gobazzing.io>
Date: Thu, 19 Sep 2024 14:06:12 +0530
Subject: [PATCH 1/2] Fix: Create token error popup update

---
 ssr/src/page/token/popups.rs | 40 ++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/ssr/src/page/token/popups.rs b/ssr/src/page/token/popups.rs
index ee1b90c9..171c74ae 100644
--- a/ssr/src/page/token/popups.rs
+++ b/ssr/src/page/token/popups.rs
@@ -96,16 +96,47 @@ fn ErrorPopup<HeadIV: IntoView, Head: Fn() -> HeadIV>(
     }
 }
 
+#[component]
+fn CreateTokenErrorPopupInner<HeadIV: IntoView, Head: Fn() -> HeadIV>(
+    error: String,
+    header: Head,
+    close_popup: WriteSignal<bool>,
+) -> impl IntoView {
+    view! {
+        <div class="flex flex-col items-center w-full h-full gap-6">
+            <div class="flex flex-row items-center justify-center bg-amber-100 text-orange-400 rounded-full p-3 text-2xl md:text-3xl">
+                <Icon icon=icondata::BsExclamationTriangle/>
+            </div>
+            <span class="text-2xl md:text-3xl font-bold text-center">{header()}</span>
+            <textarea
+                prop:value=error
+                disabled
+                rows=3
+                class="bg-black/10 text-xs md:text-sm text-red-500 w-full md:w-2/3 resize-none p-2"
+            ></textarea>
+            <button
+                on:click=move |_| close_popup.set(true)
+                class="py-3 text-lg md:text-xl w-full rounded-full bg-primary-600 text-white text-center"
+            >
+                Retry
+            </button>
+        </div>
+    }
+}
+
 #[component]
 fn CreateTokenErrorPopup(
     error: String,
     token_name: MaybeSignal<String>,
     close_popup: WriteSignal<bool>,
 ) -> impl IntoView {
-    let profile_url = String::from("/your-profile?tab=tokens");
-
+    let error = if error.to_lowercase().contains(&"CanisterError".to_lowercase()) {
+        "Oops! There is some error from ICP's end. Please try again".into()
+    } else {
+        error
+    };
     view! {
-        <ErrorPopup
+        <CreateTokenErrorPopupInner
             error
             header=move || {
                 let token_name = token_name.clone();
@@ -117,9 +148,6 @@ fn CreateTokenErrorPopup(
                     creation failed!
                 }
             }
-
-            previous_link=profile_url
-            previous_text="Back to profile"
             close_popup
         />
     }

From c6ba1b3bb5491224469605b1c567326680854e3c Mon Sep 17 00:00:00 2001
From: Prakash Bhatt <prakash@gobazzing.io>
Date: Thu, 19 Sep 2024 14:07:30 +0530
Subject: [PATCH 2/2] Fix: Create token error popup update

---
 ssr/src/page/token/popups.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ssr/src/page/token/popups.rs b/ssr/src/page/token/popups.rs
index 171c74ae..d8cb664b 100644
--- a/ssr/src/page/token/popups.rs
+++ b/ssr/src/page/token/popups.rs
@@ -130,7 +130,10 @@ fn CreateTokenErrorPopup(
     token_name: MaybeSignal<String>,
     close_popup: WriteSignal<bool>,
 ) -> impl IntoView {
-    let error = if error.to_lowercase().contains(&"CanisterError".to_lowercase()) {
+    let error = if error
+        .to_lowercase()
+        .contains(&"CanisterError".to_lowercase())
+    {
         "Oops! There is some error from ICP's end. Please try again".into()
     } else {
         error