AaronFiore/electrum
1
0
Fork 0
Code Activity

kivy: fix set amount

Browse Source
This commit is contained in:
ThomasV
2015-12-13 17:49:51 +01:00
parent 9b44635e3c
commit 98d4384641
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gui/kivy/uix/screens.py
View File

@@ -201,12 +201,11 @@ class SendScreen(CScreen):
payment_request = None payment_request = None
def set_URI(self, uri): def set_URI(self, uri):
print "set uri", uri
self.screen.address = uri.get('address', '') self.screen.address = uri.get('address', '')
self.screen.message = uri.get('message', '') self.screen.message = uri.get('message', '')
amount = uri.get('amount') amount = uri.get('amount')
if amount: if amount:
self.screen.amount = self.format_amount_and_units(amount) self.screen.amount = self.app.format_amount_and_units(amount)
def update(self): def update(self):
if self.app.current_invoice: if self.app.current_invoice:
@@ -221,7 +220,9 @@ class SendScreen(CScreen):
def set_request(self, pr): def set_request(self, pr):
self.payment_request = pr self.payment_request = pr
self.screen.address = pr.get_requestor() self.screen.address = pr.get_requestor()
self.screen.amount = self.app.format_amount_and_units(pr.get_amount()) amount = pr.get_amount()
if amount:
self.screen.amount = self.app.format_amount_and_units(amount)
self.screen.message = pr.get_memo() self.screen.message = pr.get_memo()
def do_paste(self): def do_paste(self):
@@ -288,8 +289,10 @@ class ReceiveScreen(CScreen):
self.screen.address = addr self.screen.address = addr
req = self.app.wallet.receive_requests.get(addr) req = self.app.wallet.receive_requests.get(addr)
if req: if req:
self.screen.amount = self.app.format_amount_and_units(req.get('amount'))
self.screen.message = unicode(req.get('memo', '')) self.screen.message = unicode(req.get('memo', ''))
amount = req.get('amount')
if amount:
self.screen.amount = self.app.format_amount_and_units(amount)
def amount_callback(self, popup): def amount_callback(self, popup):
amount_label = self.screen.ids.get('amount') amount_label = self.screen.ids.get('amount')