From 4368010c3511f3753dcbceea4977bd70a1b9ee64 Mon Sep 17 00:00:00 2001
From: toyota-corolla0 <toyota_corolla0@proton.me>
Date: Tue, 27 Feb 2024 15:18:16 -0600
Subject: [PATCH] fix: move positioning class outside of alert blocks

---
 src/components/alerts.rs          | 16 ++++++++--------
 src/components/ln_receive_form.rs |  2 +-
 src/components/receive_ln.rs      |  4 ++--
 src/components/send_ecash.rs      |  6 +++---
 src/components/wallet_selector.rs |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/components/alerts.rs b/src/components/alerts.rs
index ecaaa3d..c11d79e 100644
--- a/src/components/alerts.rs
+++ b/src/components/alerts.rs
@@ -1,9 +1,9 @@
 use leptos::*;
 
 #[component]
-pub fn NoteBlock(children: Children) -> impl IntoView {
+pub fn NoteBlock(#[prop(into, optional)] class: String, children: Children) -> impl IntoView {
     view! {
-        <div class="bg-yellow-100 border-l-4 border-yellow-500 text-yellow-700 p-4 mb-8 w-full" role="alert">
+        <div class=format!("bg-yellow-100 border-l-4 border-yellow-500 text-yellow-700 p-4 w-full {}", class) role="alert">
           <p class="font-bold">Note</p>
           <p>{ children() }</p>
         </div>
@@ -11,9 +11,9 @@ pub fn NoteBlock(children: Children) -> impl IntoView {
 }
 
 #[component]
-pub fn SuccessBlock(children: Children) -> impl IntoView {
+pub fn SuccessBlock(#[prop(into, optional)] class: String, children: Children) -> impl IntoView {
     view! {
-        <div class="bg-green-100 border-l-4 border-green-500 text-green-700 p-4 mb-8 w-full" role="alert">
+        <div class=format!("bg-green-100 border-l-4 border-green-500 text-green-700 p-4 w-full {}", class) role="alert">
             <p class="font-bold">Success</p>
             <p>{ children() }</p>
         </div>
@@ -21,9 +21,9 @@ pub fn SuccessBlock(children: Children) -> impl IntoView {
 }
 
 #[component]
-pub fn WarningBlock(children: Children) -> impl IntoView {
+pub fn WarningBlock(#[prop(into, optional)] class: String, children: Children) -> impl IntoView {
     view! {
-        <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4 mb-8 w-full" role="alert">
+        <div class=format!("bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4 w-full {}", class) role="alert">
             <p class="font-bold">Warning</p>
             <p>{ children() }</p>
         </div>
@@ -31,9 +31,9 @@ pub fn WarningBlock(children: Children) -> impl IntoView {
 }
 
 #[component]
-pub fn ErrorBlock(children: Children) -> impl IntoView {
+pub fn ErrorBlock(#[prop(into, optional)] class: String, children: Children) -> impl IntoView {
     view! {
-        <div class="bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4 mb-8 w-full" role="alert">
+        <div class=format!("bg-orange-100 border-l-4 border-orange-500 text-orange-700 p-4 w-full {}", class) role="alert">
             <p class="font-bold">Error</p>
             <p>{ children() }</p>
         </div>
diff --git a/src/components/ln_receive_form.rs b/src/components/ln_receive_form.rs
index fb53667..efb383f 100644
--- a/src/components/ln_receive_form.rs
+++ b/src/components/ln_receive_form.rs
@@ -46,7 +46,7 @@ where
             {move || {
                 if let Some(error) = error.get() {
                     view!{
-                        <ErrorBlock>
+                        <ErrorBlock class="mb-8">
                             { error }
                         </ErrorBlock>
                     }.into_view()
diff --git a/src/components/receive_ln.rs b/src/components/receive_ln.rs
index 75b7846..0295cb6 100644
--- a/src/components/receive_ln.rs
+++ b/src/components/receive_ln.rs
@@ -60,7 +60,7 @@ pub fn ReceiveLn() -> impl IntoView {
 
                                     match paid_resource.get() {
                                         Some(()) => view! {
-                                            <SuccessBlock>
+                                            <SuccessBlock class="mb-8">
                                                 "The invoice has been paid!"
                                             </SuccessBlock>
                                         }.into_view(),
@@ -80,7 +80,7 @@ pub fn ReceiveLn() -> impl IntoView {
                     }
                     Some(Err(e)) => {
                         view!{
-                            <ErrorBlock>
+                            <ErrorBlock class="mb-8">
                                 { e.to_string() }
                             </ErrorBlock>
                         }.into_view()
diff --git a/src/components/send_ecash.rs b/src/components/send_ecash.rs
index 7c4133f..282df8e 100644
--- a/src/components/send_ecash.rs
+++ b/src/components/send_ecash.rs
@@ -58,7 +58,7 @@ pub fn SendEcash() -> impl IntoView {
             {move || {
                 error.get().map(|e| {
                     view! {
-                        <ErrorBlock>
+                        <ErrorBlock class="mb-8">
                             {e}
                         </ErrorBlock>
                     }
@@ -69,7 +69,7 @@ pub fn SendEcash() -> impl IntoView {
                 submit_action.value().get().map(|r| {
                     r.err().map(|err| {
                         view! {
-                            <ErrorBlock>
+                            <ErrorBlock class="mb-8">
                                 {format!("{:?}", err)}
                             </ErrorBlock>
                         }
@@ -83,7 +83,7 @@ pub fn SendEcash() -> impl IntoView {
                         let total = notes.total_amount();
                         let notes_string_signal = Signal::derive(move || notes.to_string());
                         view! {
-                            <SuccessBlock>
+                            <SuccessBlock class="mb-8">
                                 {format!("Notes representing {} shown below.", total)}
                             </SuccessBlock>
                             <CopyableText
diff --git a/src/components/wallet_selector.rs b/src/components/wallet_selector.rs
index f917967..ec35c79 100644
--- a/src/components/wallet_selector.rs
+++ b/src/components/wallet_selector.rs
@@ -35,10 +35,10 @@ where
         .collect::<Vec<_>>();
 
     view! {
-        <NoteBlock>
+        <NoteBlock class="mb-8">
           "To switch wallets after selecting one just reload the web app."
         </NoteBlock>
-        <WarningBlock>
+        <WarningBlock class="mb-8">
           "Webimint is a highly experimental Fedimint wallet, use at your own risk.
           It's currently compatible with the 0.2 release of Fedimint."
         </WarningBlock>