From 83851bfa85ca837a60327939a23142023d7487e4 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Wed, 22 Apr 2015 11:01:22 +0200
Subject: [PATCH] fix: display request that never expires

---
 gui/qt/main_window.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index d9d4671f..11dd1b30 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -658,7 +658,7 @@ class ElectrumWindow(QMainWindow):
             return
         addr = str(item.text(2))
         req = self.receive_requests[addr]
-        expires = req['time'] + req['expiration']
+        expires = _('Never') if req.get('expiration') is None else format_time(req['time'] + req['expiration'])
         amount = req['amount']
         message = self.wallet.labels.get(addr, '')
         self.receive_address_e.setText(addr)
@@ -666,7 +666,7 @@ class ElectrumWindow(QMainWindow):
         self.receive_amount_e.setAmount(amount)
         self.expires_combo.hide()
         self.expires_label.show()
-        self.expires_label.setText(format_time(expires))
+        self.expires_label.setText(expires)
         self.new_request_button.setEnabled(True)
 
     def delete_payment_request(self, item):