Merge branch 'main' into light-mode

# Conflicts:
#	ufund-ui/src/app/app.component.html
#	ufund-ui/src/app/components/funding-basket/funding-basket.component.html
#	ufund-ui/src/app/components/need-list/need-list.component.html
#	ufund-ui/src/app/components/need-page/need-page.component.css

3 files changed, 3 insertions, 4 deletions

diff --git a/ufund-ui/src/app/components/toast/toast.component.css b/ufund-ui/src/app/components/toast/toast.component.css
index 4cd81fe..82e2ff3 100644
--- a/ufund-ui/src/app/components/toast/toast.component.css
+++ b/ufund-ui/src/app/components/toast/toast.component.css
@@ -14,7 +14,7 @@
     animation: slideDown .5s ease-in-out;
     transition: transform .5s;
     align-self: center;
-    z-index: 3;
+    z-index: 4;
     position: absolute;
     top: 15px;
     display: flex;
@@ -39,7 +39,7 @@
     }
 }
 
-.toast.hide {
+.toast.hide:not(:has(:hover)) {
     transform: translateY(-90px);
 }
 
diff --git a/ufund-ui/src/app/components/toast/toast.component.html b/ufund-ui/src/app/components/toast/toast.component.html
index dccf869..dc33ecd 100644
--- a/ufund-ui/src/app/components/toast/toast.component.html
+++ b/ufund-ui/src/app/components/toast/toast.component.html
@@ -1,6 +1,6 @@
 <div class="toast" [ngClass]="ToastType[type].toLowerCase()" #toastDiv>
     <span>{{this.message}}</span>
-    <a *ngIf="this.action" (click)="this.action.onAction()">{{this.action.label}}</a>
+    <a *ngIf="this.action" href="#" (click)="this.action.onAction(); $event.preventDefault(); hide()">{{this.action.label}}</a>
     <button (click)="hide()">
         <span class="icon">close</span>
     </button>
diff --git a/ufund-ui/src/app/components/toast/toast.component.ts b/ufund-ui/src/app/components/toast/toast.component.ts
index 47fd7ff..6bbae34 100644
--- a/ufund-ui/src/app/components/toast/toast.component.ts
+++ b/ufund-ui/src/app/components/toast/toast.component.ts
@@ -21,7 +21,6 @@ export class ToastComponent implements OnInit{
     }
 
     hide() {
-        console.log(this.toastDiv, typeof this.toastDiv)
         this.toastDiv.nativeElement.classList.add('hide')
     }