refactor

Author: notTanveer

src/seedsigner/gui/screens/seed_screens.py

@@ -653,7 +653,7 @@ class SeedBIP352GeneratePaymentAddressScreen(ButtonListScreen):
     payment_address: str = None
 
     def __post_init__(self):
-        self.title = _("Payment Address") # Made translatable
+        self.title = _("Payment Address")
         self.is_bottom_list = True
         super().__post_init__()
 
@@ -760,7 +760,7 @@ class SeedExportXpubDetailsScreen(_BaseKeyDetailsScreen):
 
     def __post_init__(self):
         self.title = _("Xpub Details")
-        self.button_data = [ButtonOption(_("Export Xpub"))] # Made translatable
+        self.button_data = [ButtonOption(_("Export Xpub"))]
 
         if self.derivation_path is None:
             self.derivation_path = self.DEFAULT_DERIVATION_PATH

src/seedsigner/models/seed.py

@@ -189,17 +189,14 @@ def derive_bip352_signing_key(self, account: int = 0, network: str = SettingsCon
 
 
     def generate_bip352_silent_payment_address(self, network: str = SettingsConstants.MAINNET):
-        scanning_pk = self.derive_bip352_scanning_key(network=network)
-        signing_pk = self.derive_bip352_signing_key(network=network)
-        scanning_pubkey = scanning_pk.get_public_key()
-        signing_pubkey = signing_pk.get_public_key()
+        scanning_pubkey = self.derive_bip352_scanning_key(network=network).get_public_key()
+        signing_pubkey = self.derive_bip352_signing_key(network=network).get_public_key()
         return embit_utils.encode_silent_payment_address(scanning_pubkey, signing_pubkey, network=SettingsConstants.map_network_to_embit(network))
 
 
     def generate_bip352_silent_payment_labeled_address(self, label: str, network: str = SettingsConstants.MAINNET):
         scanning_pk = self.derive_bip352_scanning_key(network=network)
-        signing_pk = self.derive_bip352_signing_key(network=network)
-        signing_pubkey = signing_pk.get_public_key()
+        signing_pubkey = self.derive_bip352_signing_key(network=network).get_public_key()
         return embit_utils.encode_labeled_silent_payment_address(scanning_pk, signing_pubkey, label, network=SettingsConstants.map_network_to_embit(network))
     # ----------------- BIP-352 Silent Payments support -----------------
 

src/seedsigner/views/seed_views.py

@@ -1263,11 +1263,9 @@ def run(self):
             return Destination(SeedOptionsView, view_args={"seed_num": self.seed_num}, clear_history=True)
 
         elif button_data[selected_menu_num] == self.GENERATE_SP_ADDRESS:
-            # Check if labels are enabled
-            if self.should_show_labels():
+            if self.settings.get_value(SettingsConstants.SETTING__BIP352_SILENT_PAYMENTS) == SettingsConstants.BIP352__ENABLED_WITH_LABELS:
                 return Destination(SeedBIP352LabelPromptView, view_args={"seed_num": self.seed_num})
             else:
-                # Skip label prompt and generate unlabeled address directly
                 return Destination(SeedBIP352GeneratePaymentAddressView, view_args={"seed_num": self.seed_num})
 
         elif button_data[selected_menu_num] == self.EXPORT_SIGNING_PUBKEY:
@@ -1276,10 +1274,6 @@ def run(self):
         elif button_data[selected_menu_num] == self.EXPORT_SCANNING_PRIVKEY:
             return Destination(SeedBIP352ExportScanningPrivkeyDetailsView, view_args={"seed_num": self.seed_num})
 
-    def should_show_labels(self):
-        sp_setting = self.settings.get_value(SettingsConstants.SETTING__BIP352_SILENT_PAYMENTS)
-        return sp_setting == SettingsConstants.BIP352__ENABLED_WITH_LABELS    
-
 
 
 class BaseBIP352QRView(BaseQRDisplayView):
@@ -1345,7 +1339,6 @@ def __init__(self, seed_num: int):
         self.scanning_privkey_str = scanning_key_obj.to_string()
 
     def run(self):
-        # First, show a dire warning screen
         if self.settings.get_value(SettingsConstants.SETTING__DIRE_WARNINGS) != SettingsConstants.OPTION__DISABLED:
             selected_warning_option = self.run_screen(
                 DireWarningScreen,
@@ -1360,7 +1353,6 @@ def run(self):
                  return Destination(BackStackView)
 
 
-        # If user proceeds, show the details screen
         selected_details_option = self.run_screen(
             seed_screens.SeedBIP352ExportScanningPrivkeyDetailsScreen,
             fingerprint=self.master_fingerprint,
@@ -1453,7 +1445,6 @@ def run(self):
             return Destination(SeedBIP352LabelEntryView, view_args={"seed_num": self.seed_num})
 
         elif button_data[selected_menu_num] == self.NO:
-            # Generate unlabeled address
             return Destination(SeedBIP352GeneratePaymentAddressView, view_args={"seed_num": self.seed_num})
 
 
@@ -2045,7 +2036,6 @@ def run(self):
         if self.controller.unverified_address["script_type"] == SettingsConstants.LEGACY_P2PKH:
             # Legacy P2PKH addresses are always singlesig
             sig_type = SettingsConstants.SINGLE_SIG
-           
             destination = Destination(SeedSelectSeedView, view_args=dict(flow=Controller.FLOW__VERIFY_SINGLESIG_ADDR), skip_current_view=True)
 
         if self.controller.unverified_address["script_type"] == SettingsConstants.NESTED_SEGWIT: