Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2024-11-16 15:58:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ui: Separate error messages on offer page.

Browse source
This commit is contained in:
tecnovert 2022-10-11 22:44:57 +02:00
parent 9e042200f3
commit bdcf6ce91b
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
basicswap/ui/page_offers.py
View file

@ -410,11 +410,12 @@ def page_offer(self, url_split, post_string):
'nb_validmins': 10, 'nb_validmins': 10,
} }
messages = [] messages = []
err_messages = []
if swap_client.debug_ui: if swap_client.debug_ui:
messages.append('Debug mode active.') messages.append('Debug mode active.')
sent_bid_id = None sent_bid_id = None
show_bid_form = 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_from = swap_client.ci(Coins(offer.coin_from))
ci_to = swap_client.ci(Coins(offer.coin_to)) 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) swap_client.revokeOffer(offer_id)
messages.append('Offer revoked') messages.append('Offer revoked')
except Exception as ex: 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: 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 # Can't set the post data here as browsers will always resend the original post data when responding to redirects
self.send_response(302) self.send_response(302)
@ -470,7 +471,7 @@ def page_offer(self, url_split, post_string):
except Exception as ex: except Exception as ex:
if self.server.swap_client.debug is True: if self.server.swap_client.debug is True:
self.server.swap_client.log.error(traceback.format_exc()) 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 show_bid_form = True
data = { data = {
@ -552,6 +553,7 @@ def page_offer(self, url_split, post_string):
'offer_id': offer_id.hex(), 'offer_id': offer_id.hex(),
'sent_bid_id': sent_bid_id, 'sent_bid_id': sent_bid_id,
'messages': messages, 'messages': messages,
'err_messages': err_messages,
'data': data, 'data': data,
'bids': formatted_bids, 'bids': formatted_bids,
'addrs': None if show_bid_form is None else swap_client.listSmsgAddresses('bid'), 'addrs': None if show_bid_form is None else swap_client.listSmsgAddresses('bid'),