fix: add wallet types only if available

lib/plugins.py

@@ -40,7 +40,7 @@ def hook(func):
 
 
 def run_hook(name, *args):
-    SPECIAL_HOOKS = ['add_wallet_types', 'get_wizard_action']
+    SPECIAL_HOOKS = ['get_wizard_action']
     results = []
     f_list = hooks.get(name,[])
     for p, f in f_list:

lib/wallet.py

@@ -1637,7 +1637,6 @@ class Wallet(object):
                 msg += "\nTo open this wallet, try 'git checkout seed_v%d'"%seed_version
             raise BaseException(msg)
 
-        run_hook('add_wallet_types', wallet_types)
         wallet_type = storage.get('wallet_type')
         if wallet_type:
             for cat, t, name, c in wallet_types:

plugins/btchipwallet.py

@@ -45,9 +45,9 @@ class Plugin(BasePlugin):
     def __init__(self, gui, name):
         BasePlugin.__init__(self, gui, name)
         self._is_available = self._init()
-        self.wallet = None        
-        electrum.wallet.wallet_types.append(('hardware', 'btchip', _("BTChip wallet"), BTChipWallet))
-
+        self.wallet = None
+        if self._is_available:
+            electrum.wallet.wallet_types.append(('hardware', 'btchip', _("BTChip wallet"), BTChipWallet))
 
     def _init(self):
         return BTCHIP

plugins/trezor.py

@@ -49,7 +49,8 @@ class Plugin(BasePlugin):
         self._is_available = self._init()
         self._requires_settings = True
         self.wallet = None
-        electrum.wallet.wallet_types.append(('hardware', 'trezor', _("Trezor wallet"), TrezorWallet))
+        if self._is_available:
+            electrum.wallet.wallet_types.append(('hardware', 'trezor', _("Trezor wallet"), TrezorWallet))
 
     def _init(self):
         return TREZOR