midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-07 11:18:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update dockerfile.

Browse Source
This commit is contained in:
tecnovert
2020-12-01 22:45:03 +02:00
parent 0823e79e4d
commit dca9f08833
9 changed files with 75 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
basicswap/ui.py
View File

@@ -48,7 +48,7 @@ def setCoinFilter(form_data, field_name):
raise ValueError('Unknown Coin Type {}'.format(str(field_name)))
def getTxIdHex(bid, tx_type, prefix):
def getTxIdHex(bid, tx_type, suffix):
if tx_type == TxTypes.ITX:
obj = bid.initiate_tx
elif tx_type == TxTypes.PTX:
@@ -60,7 +60,7 @@ def getTxIdHex(bid, tx_type, prefix):
return 'None'
if not obj.txid:
return 'None'
return obj.txid.hex() + prefix
return obj.txid.hex() + suffix
def getTxSpendHex(bid, tx_type):
@@ -86,13 +86,10 @@ def listBidStates():
def describeBid(swap_client, bid, offer, edit_bid, show_txns):
coin_from = Coins(offer.coin_from)
coin_to = Coins(offer.coin_to)
ci_from = swap_client.ci(coin_from)
ci_to = swap_client.ci(coin_to)
ticker_from = swap_client.getTicker(coin_from)
ticker_to = swap_client.getTicker(coin_to)
ci_from = swap_client.ci(Coins(offer.coin_from))
ci_to = swap_client.ci(Coins(offer.coin_to))
ticker_from = ci_from.ticker()
ticker_to = ci_to.ticker()
if bid.state == BidStates.BID_SENT:
state_description = 'Waiting for seller to accept.'