From c7cd147a46fe327cc4ac7545833dfcf89806a0c8 Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Mon, 3 Oct 2022 15:21:39 +0200 Subject: [PATCH 1/3] fix bug --- src/cryptoadvance/specter/managers/service_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cryptoadvance/specter/managers/service_manager.py b/src/cryptoadvance/specter/managers/service_manager.py index 6d2319bfa8..a01a2e6d79 100644 --- a/src/cryptoadvance/specter/managers/service_manager.py +++ b/src/cryptoadvance/specter/managers/service_manager.py @@ -223,8 +223,8 @@ def configure_service_for_module(cls, clazz): if isclass(attribute): clazz = attribute potential_config_classes.append(clazz) - if clazz.__name__.endswith( - main_config_clazz_slug + if ( + clazz.__name__.split(".")[-1] == main_config_clazz_slug ): # e.g. BaseConfig or DevelopmentConfig cls.import_config(clazz) return From 3c6466063e420e124d7c0fc05e4e66d0c1d1901b Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Tue, 4 Oct 2022 12:56:50 +0200 Subject: [PATCH 2/3] fix see https://github.com/cryptoadvance/specter-desktop/pull/1907#issuecomment-1266732943 --- src/cryptoadvance/specter/managers/service_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cryptoadvance/specter/managers/service_manager.py b/src/cryptoadvance/specter/managers/service_manager.py index a01a2e6d79..ac8d43f979 100644 --- a/src/cryptoadvance/specter/managers/service_manager.py +++ b/src/cryptoadvance/specter/managers/service_manager.py @@ -235,7 +235,7 @@ def configure_service_for_module(cls, clazz): config_candidate_class = config_clazz.__bases__[0] while config_candidate_class != object: for clazz in potential_config_classes: - if clazz.__name__.endswith(config_candidate_class.__name__): + if clazz.__name__.split(".")[-1] == config_candidate_class.__name__: cls.import_config(clazz) return config_candidate_class = config_candidate_class.__bases__[0] From f6cca2f2889dee1c4691c040de51b68f088b582d Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Tue, 4 Oct 2022 13:22:59 +0200 Subject: [PATCH 3/3] trying to fix flaky cpyress --- cypress/integration/spec_wallet_utxo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/spec_wallet_utxo.js b/cypress/integration/spec_wallet_utxo.js index a295ec2012..f72666197f 100644 --- a/cypress/integration/spec_wallet_utxo.js +++ b/cypress/integration/spec_wallet_utxo.js @@ -105,7 +105,7 @@ describe('Test the actions in UTXO list', () => { cy.log("Check the labeling of the unsigned UTXO") cy.get('#btn_transactions').click() cy.wait(1000) - cy.get('tx-table').find('.utxo-view-btn').click() + cy.get('tx-table').find('.utxo-view-btn').click({ force: true }) cy.get('tx-table').find('tx-row').eq(2).find('#column-category').should('contain', 'Unsigned') cy.get('tx-table').find('tx-row').eq(3).find('#column-category').should('contain', 'Unsigned') // Check that only the two checkboxes of the unsigned UTXO are visible