Merge pull request #163 from kdmukai/0.5.0-pre2

Bugfix on CompactSeedQR disabled for 12-word seeds
This commit is contained in:
SeedSigner
2022-03-15 19:38:34 -04:00
committed by GitHub
2 changed files with 14 additions and 13 deletions
+2 -2
View File
@@ -144,8 +144,8 @@ class Controller(Singleton):
from .views import Destination, MainMenuView, BackStackView
from .views.screensaver import OpeningSplashView
# opening_splash = OpeningSplashView()
# opening_splash.start()
opening_splash = OpeningSplashView()
opening_splash.start()
# TODO: Remove for v0.5.0 production release
WarningScreen(
+12 -11
View File
@@ -769,17 +769,6 @@ class SeedTranscribeSeedQRFormatView(View):
def run(self):
if self.settings.get_value(SettingsConstants.SETTING__COMPACT_SEEDQR) != SettingsConstants.OPTION__ENABLED:
# Only configured for standard SeedQR
return Destination(
SeedTranscribeSeedQRWarningView,
view_args={
"seed_num": self.seed_num,
"seedqr_format": QRType.SEED__SEEDQR,
},
skip_current_view=True,
)
seed = self.controller.get_seed(self.seed_num)
if len(seed.mnemonic_list) == 12:
STANDARD = "Standard: 25x25"
@@ -792,6 +781,18 @@ class SeedTranscribeSeedQRFormatView(View):
num_modules_standard = 29
num_modules_compact = 25
if self.settings.get_value(SettingsConstants.SETTING__COMPACT_SEEDQR) != SettingsConstants.OPTION__ENABLED:
# Only configured for standard SeedQR
return Destination(
SeedTranscribeSeedQRWarningView,
view_args={
"seed_num": self.seed_num,
"seedqr_format": QRType.SEED__SEEDQR,
"num_modules": num_modules_standard,
},
skip_current_view=True,
)
button_data = [STANDARD, COMPACT]
selected_menu_num = seed_screens.SeedTranscribeSeedQRFormatScreen(