From 2ac2a54a535c6f0c262738d47f5e70340440786b Mon Sep 17 00:00:00 2001
From: Dan Janosik <dan@47.io>
Date: Sat, 28 Mar 2020 17:22:39 -0400
Subject: [PATCH] frontend improvements related to error handling

---
 app.js                 |  2 ++
 public/css/styling.css | 12 ++++++++++++
 views/layout.pug       | 14 ++++++++++----
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index c0c3629..b2a79ff 100755
--- a/app.js
+++ b/app.js
@@ -47,6 +47,7 @@ var addressApi = require("./app/api/addressApi.js");
 var electrumAddressApi = require("./app/api/electrumAddressApi.js");
 var coreApi = require("./app/api/coreApi.js");
 var auth = require('./app/auth.js');
+var marked = require("marked");
 
 var package_json = require('./package.json');
 global.appVersion = package_json.version;
@@ -638,6 +639,7 @@ app.use(function(err, req, res, next) {
 app.locals.moment = moment;
 app.locals.Decimal = Decimal;
 app.locals.utils = utils;
+app.locals.marked = marked;
 
 
 
diff --git a/public/css/styling.css b/public/css/styling.css
index 2da8abb..a2e1887 100755
--- a/public/css/styling.css
+++ b/public/css/styling.css
@@ -20,6 +20,14 @@ code, .text-monospace {
 	font-family: "Source Code Pro", monospace !important;
 }
 
+strong {
+	font-weight: 700 !important;
+}
+
+h6, .h6 {
+	margin-bottom: 0 !important;
+}
+
 .text-small {
 	font-size: 80%;
 }
@@ -46,6 +54,10 @@ code, .text-monospace {
 	margin-bottom: 200px;
 }
 
+.user-message-markdown p {
+	margin-bottom: 0 !important;
+}
+
 
 
 .nav-tabs .nav-link.active {
diff --git a/views/layout.pug b/views/layout.pug
index cbdb701..7360f8a 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -141,14 +141,20 @@ html(lang="en")
 				if (pageErrors && pageErrors.length > 0)
 					include includes/page-errors-modal.pug
 
-					div.float-right
-						div.alert.alert-danger.py-1.px-3.mb-n2.mt-n1.font-weight-bold(title=`This page encountered ${pageErrors.length.toLocaleString()} error(s). Click for details.` data-toggle="tooltip")
-							a.text-danger(href="javascript:void(0)" data-toggle="modal" data-target="#pageErrorsModal") Errors
-							span.badge.badge-danger.ml-2 #{pageErrors.length.toLocaleString()}
+					div.alert.alert-danger
+						- var errorText = `This page encountered ${pageErrors.length.toLocaleString()} error${pageErrors.length == 1 ? "" : "s"}:`;
+						span.font-weight-bold #{errorText} 
+						a(href="javascript:void(0)", data-toggle="modal", data-target="#pageErrorsModal") Error details
+
+				if (userMessageMarkdown)
+					div.alert(class=(userMessageType ? `alert-${userMessageType}` : "alert-warning"), role="alert")
+						div.user-message-markdown
+							| !{marked(userMessageMarkdown)}
 
 				if (userMessage)
 					div.alert(class=(userMessageType ? `alert-${userMessageType}` : "alert-warning"), role="alert")
 						span #{userMessage}
+							
 				
 				block content