Merge #565: Fix showing seed for wallets with mnemonic extension

49ea4e44bf Correct display of wallet mnemonic extension in cli (Kristaps Kaupe)
6f90e30424 Fix "Show seed" in Qt for wallets with mnemonic extension (Kristaps Kaupe)

Pull request description:

  Fixes error:
  ```
  Traceback (most recent call last):
    File "joinmarket-qt.py", line 1725, in showSeedDialog
      self.displayWords(*self.wallet_service.get_mnemonic_words())
    File "joinmarket-qt.py", line 1776, in displayWords
      text += "<br/><br/>Seed extension: <strong>" + mnemonic_extension + "</strong>"
  TypeError: must be str, not bytes
  ```

Top commit has no ACKs.

Tree-SHA512: 0484ce53e746512c159399d191e350bf79168d294e8b614ae9178809976c87e7cc227187fa312fc2ca3c78e4befc04826cd4d82833627dc19f97ea26c0ee7865

jmclient/jmclient/wallet_utils.py

@@ -872,7 +872,7 @@ def wallet_showseed(wallet):
     seed, extension = wallet.get_mnemonic_words()
     text = "Wallet mnemonic recovery phrase:\n\n{}\n".format(seed)
     if extension:
-        text += "\nWallet mnemonic extension: {}\n".format(extension)
+        text += "\nWallet mnemonic extension: {}\n".format(extension.decode('utf-8'))
     return text
 
 

scripts/joinmarket-qt.py

@@ -1773,7 +1773,7 @@ class JMMainWindow(QMainWindow):
         mb.setText("<br/>".join(seed_recovery_warning))
         text = "<strong>" + words + "</strong>"
         if mnemonic_extension:
-            text += "<br/><br/>Seed extension: <strong>" + mnemonic_extension + "</strong>"
+            text += "<br/><br/>Seed extension: <strong>" + mnemonic_extension.decode('utf-8') + "</strong>"
         mb.setInformativeText(text)
         mb.setStandardButtons(QMessageBox.Ok)
         ret = mb.exec_()