adapt trustedcoin to updated passphrase flow in wizard

Author: f321x

electrum/plugins/trustedcoin/qml.py

@@ -69,12 +69,21 @@ def extend_wizard(self, wizard: 'NewWalletWizard'):
             'trustedcoin_create_seed': {
                 'gui': 'WCCreateSeed',
             },
+            'trustedcoin_create_ext': {
+                'gui': 'WCEnterExt',
+            },
             'trustedcoin_confirm_seed': {
                 'gui': 'WCConfirmSeed',
             },
+            'trustedcoin_confirm_ext': {
+                'gui': 'WCConfirmExt',
+            },
             'trustedcoin_have_seed': {
                 'gui': 'WCHaveSeed',
             },
+            'trustedcoin_have_ext': {
+                'gui': 'WCEnterExt',
+            },
             'trustedcoin_keep_disable': {
                 'gui': '../../../../plugins/trustedcoin/qml/KeepDisable',
             },

electrum/plugins/trustedcoin/qt.py

@@ -250,14 +250,26 @@ def extend_wizard(self, wizard: 'QENewWalletWizard'):
                 'gui': WCCreateSeed,
                 'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
             },
+            'trustedcoin_create_ext': {
+                'gui': WCEnterExt,
+                'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
+            },
             'trustedcoin_confirm_seed': {
                 'gui': WCConfirmSeed,
                 'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
             },
+            'trustedcoin_confirm_ext': {
+                'gui': WCConfirmExt,
+                'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
+            },
             'trustedcoin_have_seed': {
                 'gui': WCHaveSeed,
                 'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
             },
+            'trustedcoin_have_ext': {
+                'gui': WCEnterExt,
+                'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
+            },
             'trustedcoin_keep_disable': {
                 'gui': WCKeepDisable,
                 'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
@@ -277,35 +289,6 @@ def extend_wizard(self, wizard: 'QENewWalletWizard'):
         }
         wizard.navmap_merge(views)
 
-        # modify default flow, insert seed extension entry/confirm as separate views
-        ext = {
-            'trustedcoin_create_seed': {
-                'next': lambda d: 'trustedcoin_create_ext' if wizard.wants_ext(d) else 'trustedcoin_confirm_seed'
-            },
-            'trustedcoin_create_ext': {
-                'gui': WCEnterExt,
-                'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
-                'next': 'trustedcoin_confirm_seed',
-            },
-            'trustedcoin_confirm_seed': {
-                'next': lambda d: 'trustedcoin_confirm_ext' if wizard.wants_ext(d) else 'trustedcoin_tos'
-            },
-            'trustedcoin_confirm_ext': {
-                'gui': WCConfirmExt,
-                'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
-                'next': 'trustedcoin_tos',
-            },
-            'trustedcoin_have_seed': {
-                'next': lambda d: 'trustedcoin_have_ext' if wizard.wants_ext(d) else 'trustedcoin_keep_disable'
-            },
-            'trustedcoin_have_ext': {
-                'gui': WCEnterExt,
-                'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
-                'next': 'trustedcoin_keep_disable',
-            },
-        }
-        wizard.navmap_merge(ext)
-
         # insert page offering choice to go online or continue on another system
         ext_online = {
             'trustedcoin_continue_online': {

electrum/plugins/trustedcoin/trustedcoin.py

@@ -586,13 +586,22 @@ def extend_wizard(self, wizard: 'NewWalletWizard'):
                         else 'trustedcoin_have_seed'
             },
             'trustedcoin_create_seed': {
-                'next': 'trustedcoin_confirm_seed'
+                'next': lambda d: 'trustedcoin_create_ext' if wizard.wants_ext(d) else 'trustedcoin_confirm_seed',
+            },
+            'trustedcoin_create_ext': {
+                'next': 'trustedcoin_confirm_seed',
             },
             'trustedcoin_confirm_seed': {
-                'next': 'trustedcoin_tos'
+                'next': lambda d: 'trustedcoin_confirm_ext' if wizard.wants_ext(d) else 'trustedcoin_tos',
+            },
+            'trustedcoin_confirm_ext': {
+                'next': 'trustedcoin_tos',
             },
             'trustedcoin_have_seed': {
-                'next': 'trustedcoin_keep_disable'
+                'next': lambda d: 'trustedcoin_have_ext' if wizard.wants_ext(d) else 'trustedcoin_keep_disable',
+            },
+            'trustedcoin_have_ext': {
+                'next': 'trustedcoin_keep_disable',
             },
             'trustedcoin_keep_disable': {
                 'next': lambda d: 'trustedcoin_tos' if d['trustedcoin_keepordisable'] != 'disable'