From 66d763e8eac599cd5ee3f3bf1a1139821fa01edd Mon Sep 17 00:00:00 2001 From: nahuhh <50635951+nahuhh@users.noreply.github.com> Date: Thu, 24 Apr 2025 03:41:44 +0000 Subject: [PATCH 1/3] bids: fix hidden details column --- basicswap/templates/bids.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicswap/templates/bids.html b/basicswap/templates/bids.html index e2ec345..3cd6ebc 100644 --- a/basicswap/templates/bids.html +++ b/basicswap/templates/bids.html @@ -278,7 +278,7 @@ Date/Time - +
Details
From a87180f2ef7aa971558f6f57cc70dd611301a387 Mon Sep 17 00:00:00 2001 From: nahuhh <50635951+nahuhh@users.noreply.github.com> Date: Thu, 24 Apr 2025 03:44:15 +0000 Subject: [PATCH 2/3] header: bid totals too high --- basicswap/templates/header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basicswap/templates/header.html b/basicswap/templates/header.html index 76197d7..5b811c5 100644 --- a/basicswap/templates/header.html +++ b/basicswap/templates/header.html @@ -452,8 +452,8 @@ From e14b9b7e6e182a552b92748ebc797bb8a9a18b0a Mon Sep 17 00:00:00 2001 From: nahuhh <50635951+nahuhh@users.noreply.github.com> Date: Thu, 24 Apr 2025 03:55:55 +0000 Subject: [PATCH 3/3] bids: adjust / consolidate colors --- basicswap/static/js/bids_sentreceived.js | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/basicswap/static/js/bids_sentreceived.js b/basicswap/static/js/bids_sentreceived.js index 614c837..decbc6f 100644 --- a/basicswap/static/js/bids_sentreceived.js +++ b/basicswap/static/js/bids_sentreceived.js @@ -423,38 +423,34 @@ const getStatusClass = (status) => { switch (status) { case 'Completed': return 'bg-green-300 text-black dark:bg-green-600 dark:text-white'; + case 'Abandoned': case 'Expired': case 'Timed-out': return 'bg-gray-200 text-black dark:bg-gray-400 dark:text-white'; + case 'Failed, refunded': + case 'Failed, swiped': + return 'bg-gray-200 text-black dark:bg-gray-400 dark:text-red-500'; case 'Error': case 'Failed': + case 'Rejected': return 'bg-red-300 text-black dark:bg-red-600 dark:text-white'; - case 'Failed, swiped': - case 'Failed, refunded': - return 'bg-gray-200 text-black dark:bg-gray-400 dark:text-red-500'; + case 'Accepted': + case 'Request accepted': case 'InProgress': case 'Script coin locked': case 'Scriptless coin locked': case 'Script coin lock released': case 'SendingInitialTx': case 'SendingPaymentTx': - return 'bg-blue-300 text-black dark:bg-blue-500 dark:text-white'; case 'Received': case 'Exchanged script lock tx sigs msg': case 'Exchanged script lock spend tx msg': case 'Script tx redeemed': case 'Scriptless tx redeemed': case 'Scriptless tx recovered': - return 'bg-blue-300 text-black dark:bg-blue-500 dark:text-white'; - case 'Accepted': - case 'Request accepted': - return 'bg-green-300 text-black dark:bg-green-600 dark:text-white'; case 'Delaying': case 'Auto accept delay': return 'bg-blue-300 text-black dark:bg-blue-500 dark:text-white'; - case 'Abandoned': - case 'Rejected': - return 'bg-red-300 text-black dark:bg-red-600 dark:text-white'; default: return 'bg-blue-300 text-black dark:bg-blue-500 dark:text-white'; } @@ -1049,8 +1045,8 @@ const createTableRow = async (bid) => { - - + +