Merge pull request #549 from newtonick/remove_skip_ver_direwarning

Remove DireWarning just added in PR #533
SeedSigner · May 1, 2024 · cdf7fc2 · cdf7fc2
2 parents 62807fd + 0dcbd63
commit cdf7fc2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/src/seedsigner/views/psbt_views.py b/src/seedsigner/views/psbt_views.py
@@ -330,11 +330,9 @@ def run(self):
         if is_change_derivation_path:
             title = "Your Change"
             self.VERIFY_MULTISIG = "Verify Multisig Change"
-            unverified_warning_text = "Can't Verify that Change Outputs Belong to your Wallet"
         else:
             title = "Self-Transfer"
             self.VERIFY_MULTISIG = "Verify Multisig Addr"
-            unverified_warning_text = "Can't Verify that Self-Transfer Outputs Belong to your Wallet"
         # if psbt_parser.num_change_outputs > 1:
         #     title += f" (#{self.change_address_num + 1})"
 
@@ -416,17 +414,6 @@ def run(self):
             return Destination(BackStackView)
 
         elif button_data[selected_menu_num] == self.NEXT or button_data[selected_menu_num] == self.SKIP_VERIFICATION:
-            if button_data[selected_menu_num] == self.SKIP_VERIFICATION:
-                selected_menu_num = self.run_screen(
-                    DireWarningScreen,
-                    title="Security Warning",
-                    status_icon_name=SeedSignerIconConstants.WARNING,
-                    status_headline="Potential Loss of Funds",
-                    text=unverified_warning_text,
-                )
-
-                if selected_menu_num == RET_CODE__BACK_BUTTON:
-                    return Destination(BackStackView)
 
             if self.change_address_num < psbt_parser.num_change_outputs - 1:
                 return Destination(PSBTChangeDetailsView, view_args={"change_address_num": self.change_address_num + 1})

diff --git a/tests/test_flows_psbt.py b/tests/test_flows_psbt.py
@@ -73,7 +73,6 @@ def load_seed_into_decoder(view: scan_views.ScanView):
 			FlowStep(psbt_views.PSBTMathView),
 			FlowStep(psbt_views.PSBTAddressDetailsView, button_data_selection=0),
 			FlowStep(psbt_views.PSBTChangeDetailsView, button_data_selection=psbt_views.PSBTChangeDetailsView.SKIP_VERIFICATION),
-			FlowStep(psbt_views.PSBTChangeDetailsView, button_data_selection=0),
 			FlowStep(psbt_views.PSBTFinalizeView, button_data_selection=psbt_views.PSBTFinalizeView.APPROVE_PSBT),
 			FlowStep(psbt_views.PSBTSigningErrorView, button_data_selection=psbt_views.PSBTSigningErrorView.SELECT_DIFF_SEED),
 			FlowStep(psbt_views.PSBTSelectSeedView, button_data_selection=psbt_views.PSBTSelectSeedView.SCAN_SEED),
@@ -86,7 +85,6 @@ def load_seed_into_decoder(view: scan_views.ScanView):
 			FlowStep(psbt_views.PSBTMathView),
 			FlowStep(psbt_views.PSBTAddressDetailsView, button_data_selection=0),
 			FlowStep(psbt_views.PSBTChangeDetailsView, button_data_selection=psbt_views.PSBTChangeDetailsView.SKIP_VERIFICATION),
-			FlowStep(psbt_views.PSBTChangeDetailsView, button_data_selection=0),
 			FlowStep(psbt_views.PSBTFinalizeView, button_data_selection=psbt_views.PSBTFinalizeView.APPROVE_PSBT),
 			FlowStep(psbt_views.PSBTSignedQRDisplayView),
 			FlowStep(MainMenuView),