tfix #6194 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8cb36cb9692a6e9e42035e8d1c883a96f1b1344f
DIR parent 6058829870fde0ef17b2e08a567110ecc381ab94
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 1 Jun 2020 21:57:46 +0200
fix #6194
Diffstat:
M electrum/gui/kivy/uix/dialogs/requ… | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
---
DIR diff --git a/electrum/gui/kivy/uix/dialogs/request_dialog.py b/electrum/gui/kivy/uix/dialogs/request_dialog.py
t@@ -20,7 +20,8 @@ Builder.load_string('''
amount: 0
title: ''
description:''
- data: ''
+ is_lightning: False
+ key:''
warning: ''
status_str: ''
status_color: 1,1,1,1
t@@ -41,17 +42,14 @@ Builder.load_string('''
touch = args[1]
if self.collide_point(*touch.pos): self.shaded = not self.shaded
TopLabel:
- text: _('Data')+ ':'
- RefLabel:
- data: root.data
- name: _('Request data')
- TopLabel:
- text: _('Description') + ':'
- RefLabel:
- data: root.description or _('No description')
+ text: _('Description') + ': ' + root.description or _('None')
TopLabel:
text: _('Amount') + ': ' + app.format_amount_and_units(root.amount)
TopLabel:
+ text: (_('Address') if not root.is_lightning else _('Payment hash')) + ': '
+ RefLabel:
+ text: root.key
+ TopLabel:
text: _('Status') + ': ' + root.status_str
color: root.status_color
TopLabel:
t@@ -95,7 +93,7 @@ class RequestDialog(Factory.Popup):
r = self.app.wallet.get_request(key)
self.is_lightning = r.is_lightning()
self.data = r.invoice if self.is_lightning else self.app.wallet.get_request_URI(r)
- self.amount = r.amount
+ self.amount = r.amount or 0
self.description = r.message
self.update_status()