minor fixes
This commit is contained in:
parent
8960b16e09
commit
508b5373ac
|
@ -685,7 +685,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
return
|
return
|
||||||
addr = str(item.text(2))
|
addr = str(item.text(2))
|
||||||
req = self.wallet.receive_requests[addr]
|
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']
|
amount = req['amount']
|
||||||
message = self.wallet.labels.get(addr, '')
|
message = self.wallet.labels.get(addr, '')
|
||||||
self.receive_address_e.setText(addr)
|
self.receive_address_e.setText(addr)
|
||||||
|
|
|
@ -291,7 +291,7 @@ def make_unsigned_request(req):
|
||||||
from transaction import Transaction
|
from transaction import Transaction
|
||||||
addr = req['address']
|
addr = req['address']
|
||||||
time = req.get('time', 0)
|
time = req.get('time', 0)
|
||||||
expires = req.get('exp', 0)
|
exp = req.get('exp', 0)
|
||||||
if time and type(time) != int:
|
if time and type(time) != int:
|
||||||
time = 0
|
time = 0
|
||||||
if exp and type(exp) != int:
|
if exp and type(exp) != int:
|
||||||
|
@ -306,7 +306,7 @@ def make_unsigned_request(req):
|
||||||
for script, amount in outputs:
|
for script, amount in outputs:
|
||||||
pd.outputs.add(amount=amount, script=script)
|
pd.outputs.add(amount=amount, script=script)
|
||||||
pd.time = time
|
pd.time = time
|
||||||
pd.expires = time + expires if expires else 0
|
pd.expires = time + exp if exp else 0
|
||||||
pd.memo = memo
|
pd.memo = memo
|
||||||
pr = pb2.PaymentRequest()
|
pr = pb2.PaymentRequest()
|
||||||
pr.serialized_payment_details = pd.SerializeToString()
|
pr.serialized_payment_details = pd.SerializeToString()
|
||||||
|
|
Loading…
Reference in New Issue