From d6e0b4d2b2b03fb6dcc1edb8a45dbfab52b72826 Mon Sep 17 00:00:00 2001
From: tecnovert <tecnovert@users.noreply.github.com>
Date: Tue, 11 Oct 2022 23:04:25 +0200
Subject: [PATCH] ui: Separate error messages on offer page. (#3)
---
basicswap/ui/page_offers.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/basicswap/ui/page_offers.py b/basicswap/ui/page_offers.py
index 3b5e074..5163289 100644
--- a/basicswap/ui/page_offers.py
+++ b/basicswap/ui/page_offers.py
@@ -410,11 +410,12 @@ def page_offer(self, url_split, post_string):
'nb_validmins': 10,
}
messages = []
+ err_messages = []
if swap_client.debug_ui:
messages.append('Debug mode active.')
sent_bid_id = None
show_bid_form = None
- form_data = self.checkForm(post_string, 'offer', messages)
+ form_data = self.checkForm(post_string, 'offer', err_messages)
ci_from = swap_client.ci(Coins(offer.coin_from))
ci_to = swap_client.ci(Coins(offer.coin_to))
@@ -430,7 +431,7 @@ def page_offer(self, url_split, post_string):
swap_client.revokeOffer(offer_id)
messages.append('Offer revoked')
except Exception as ex:
- messages.append('Revoke offer failed: ' + str(ex))
+ err_messages.append('Revoke offer failed: ' + str(ex))
elif b'repeat_offer' in form_data:
# Can't set the post data here as browsers will always resend the original post data when responding to redirects
self.send_response(302)
@@ -470,7 +471,7 @@ def page_offer(self, url_split, post_string):
except Exception as ex:
if self.server.swap_client.debug is True:
self.server.swap_client.log.error(traceback.format_exc())
- messages.append('Error: Send bid failed: ' + str(ex))
+ err_messages.append('Send bid failed: ' + str(ex))
show_bid_form = True
data = {
@@ -552,6 +553,7 @@ def page_offer(self, url_split, post_string):
'offer_id': offer_id.hex(),
'sent_bid_id': sent_bid_id,
'messages': messages,
+ 'err_messages': err_messages,
'data': data,
'bids': formatted_bids,
'addrs': None if show_bid_form is None else swap_client.listSmsgAddresses('bid'),