BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor fixes

This commit is contained in:
ThomasV 2015-07-22 15:33:50 +02:00
parent 8960b16e09
commit 508b5373ac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/main_window.py
View File

@ -685,7 +685,7 @@ class ElectrumWindow(QMainWindow):
return
addr = str(item.text(2))
req = self.wallet.receive_requests[addr]
expires = _('Never') if req.get('exp') is None else util.age(req['time'] + req['exp'])
expires = util.age(req['time'] + req['exp']) if req.get('exp') else _('Never')
amount = req['amount']
message = self.wallet.labels.get(addr, '')
self.receive_address_e.setText(addr)

4
lib/paymentrequest.py
View File

@ -291,7 +291,7 @@ def make_unsigned_request(req):
from transaction import Transaction
addr = req['address']
time = req.get('time', 0)
expires = req.get('exp', 0)
exp = req.get('exp', 0)
if time and type(time) != int:
time = 0
if exp and type(exp) != int:
@ -306,7 +306,7 @@ def make_unsigned_request(req):
for script, amount in outputs:
pd.outputs.add(amount=amount, script=script)
pd.time = time
pd.expires = time + expires if expires else 0
pd.expires = time + exp if exp else 0
pd.memo = memo
pr = pb2.PaymentRequest()
pr.serialized_payment_details = pd.SerializeToString()