status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(@desktop/keycard): tertiary action for shared keycard popup module renamed to cancel action 

Since tertiary action for the keycard popup module is always used to cancel/invalidate
the current flow, it's renamed now to cancel action (avoids confusion this way and it
seems more intuitive. It doesn't set any state. It should be defined if it's possible to cancel
the flow from the current state.
This commit is contained in:
Sale Djenic 2022-11-10 10:06:42 +01:00 committed by saledjenic
parent 21eeefa42e
commit 662a11a57b
62 changed files with 94 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/modules/shared_modules/keycard_popup/internal/biometrics_password_failed_state.nim
View File

@ -16,7 +16,7 @@ method getNextSecondaryState*(self: BiometricsPasswordFailedState, controller: C
if self.flowType == FlowType.Authentication:
return createState(StateType.EnterPassword, self.flowType, nil)
method executePreTertiaryStateCommand*(self: BiometricsPasswordFailedState, controller: Controller) =
method executeCancelCommand*(self: BiometricsPasswordFailedState, controller: Controller) =
if self.flowType == FlowType.Authentication:
controller.setPassword("")
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/biometrics_pin_failed_state.nim
View File

@ -20,7 +20,7 @@ method getNextSecondaryState*(self: BiometricsPinFailedState, controller: Contro
if self.flowType == FlowType.Authentication:
return createState(StateType.EnterPin, self.flowType, nil)
method executePreTertiaryStateCommand*(self: BiometricsPinFailedState, controller: Controller) =
method executeCancelCommand*(self: BiometricsPinFailedState, controller: Controller) =
if self.flowType == FlowType.Authentication:
controller.setPassword("")
controller.setPin("")

2
src/app/modules/shared_modules/keycard_popup/internal/biometrics_pin_invalid_state.nim
View File

@ -21,7 +21,7 @@ method getNextSecondaryState*(self: BiometricsPinInvalidState, controller: Contr
if self.flowType == FlowType.Authentication:
return createState(StateType.EnterPin, self.flowType, nil)
method executePreTertiaryStateCommand*(self: BiometricsPinInvalidState, controller: Controller) =
method executeCancelCommand*(self: BiometricsPinInvalidState, controller: Controller) =
if self.flowType == FlowType.Authentication:
controller.setPassword("")
controller.setPin("")

2
src/app/modules/shared_modules/keycard_popup/internal/biometrics_ready_to_sign_state.nim
View File

@ -20,7 +20,7 @@ method getNextSecondaryState*(self: BiometricsReadyToSignState, controller: Cont
if self.flowType == FlowType.Authentication:
return createState(StateType.EnterPin, self.flowType, nil)
method executePreTertiaryStateCommand*(self: BiometricsReadyToSignState, controller: Controller) =
method executeCancelCommand*(self: BiometricsReadyToSignState, controller: Controller) =
if self.flowType == FlowType.Authentication:
controller.setPassword("")
controller.setPin("")

2
src/app/modules/shared_modules/keycard_popup/internal/create_pairing_code_state.nim
View File

@ -14,6 +14,6 @@ method getNextPrimaryState*(self: CreatePairingCodeState, controller: Controller
return createState(StateType.ChangingKeycardPairingCode, self.flowType, nil)
return createState(StateType.ChangingKeycardPairingCodeFailure, self.flowType, nil)
method executePreTertiaryStateCommand*(self: CreatePairingCodeState, controller: Controller) =
method executeCancelCommand*(self: CreatePairingCodeState, controller: Controller) =
if self.flowType == FlowType.ChangePairingCode:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/create_pin_state.nim
View File

@ -15,7 +15,7 @@ method executePreBackStateCommand*(self: CreatePinState, controller: Controller)
if not self.getBackState.isNil and self.getBackState.stateType == StateType.SelectExistingKeyPair:
controller.cancelCurrentFlow()
method executePreTertiaryStateCommand*(self: CreatePinState, controller: Controller) =
method executeCancelCommand*(self: CreatePinState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.UnlockKeycard or
self.flowType == FlowType.ChangeKeycardPin:

2
src/app/modules/shared_modules/keycard_popup/internal/create_puk_state.nim
View File

@ -8,7 +8,7 @@ proc newCreatePukState*(flowType: FlowType, backState: State): CreatePukState =
proc delete*(self: CreatePukState) =
self.State.delete
method executePreTertiaryStateCommand*(self: CreatePukState, controller: Controller) =
method executeCancelCommand*(self: CreatePukState, controller: Controller) =
if self.flowType == FlowType.ChangeKeycardPuk:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/enter_biometrics_password_state.nim
View File

@ -25,7 +25,7 @@ method getNextPrimaryState*(self: EnterBiometricsPasswordState, controller: Cont
if not self.success:
return createState(StateType.WrongBiometricsPassword, self.flowType, nil)
method executePreTertiaryStateCommand*(self: EnterBiometricsPasswordState, controller: Controller) =
method executeCancelCommand*(self: EnterBiometricsPasswordState, controller: Controller) =
if self.flowType == FlowType.Authentication:
controller.setPassword("")
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/enter_keycard_name_state.nim
View File

@ -14,7 +14,7 @@ method getNextPrimaryState*(self: EnterKeycardNameState, controller: Controller)
if self.flowType == FlowType.RenameKeycard:
return createState(StateType.RenamingKeycard, self.flowType, nil)
method executePreTertiaryStateCommand*(self: EnterKeycardNameState, controller: Controller) =
method executeCancelCommand*(self: EnterKeycardNameState, controller: Controller) =
if self.flowType == FlowType.RenameKeycard:
controller.setPassword("")
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/enter_password_state.nim
View File

@ -28,7 +28,7 @@ method executePreSecondaryStateCommand*(self: EnterPasswordState, controller: Co
if self.flowType == FlowType.Authentication:
controller.tryToObtainDataFromKeychain()
method executePreTertiaryStateCommand*(self: EnterPasswordState, controller: Controller) =
method executeCancelCommand*(self: EnterPasswordState, controller: Controller) =
if self.flowType == FlowType.Authentication:
controller.setPassword("")
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/enter_pin_state.nim
View File

@ -30,7 +30,7 @@ method executePreSecondaryStateCommand*(self: EnterPinState, controller: Control
controller.setUsePinFromBiometrics(false)
controller.tryToObtainDataFromKeychain()
method executePreTertiaryStateCommand*(self: EnterPinState, controller: Controller) =
method executeCancelCommand*(self: EnterPinState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.Authentication or

2
src/app/modules/shared_modules/keycard_popup/internal/enter_puk_state.nim
View File

@ -13,7 +13,7 @@ method executePrePrimaryStateCommand*(self: EnterPukState, controller: Controlle
if controller.getPuk().len == PUKLengthForStatusApp:
controller.enterKeycardPuk(controller.getPuk())
method executePreTertiaryStateCommand*(self: EnterPukState, controller: Controller) =
method executeCancelCommand*(self: EnterPukState, controller: Controller) =
if self.flowType == FlowType.UnlockKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/enter_seed_phrase_state.nim
View File

@ -32,7 +32,7 @@ method getNextPrimaryState*(self: EnterSeedPhraseState, controller: Controller):
if not self.verifiedSeedPhrase:
return createState(StateType.WrongSeedPhrase, self.flowType, nil)
method executePreTertiaryStateCommand*(self: EnterSeedPhraseState, controller: Controller) =
method executeCancelCommand*(self: EnterSeedPhraseState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.UnlockKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/factory_reset_confirmation_displayed_metadata_state.nim
View File

@ -15,7 +15,7 @@ method executePrePrimaryStateCommand*(self: FactoryResetConfirmationDisplayMetad
controller.setKeycardData(updatePredefinedKeycardData(controller.getKeycardData(), PredefinedKeycardData.HideKeyPair, add = true))
controller.runGetAppInfoFlow(factoryReset = true)
method executePreTertiaryStateCommand*(self: FactoryResetConfirmationDisplayMetadataState, controller: Controller) =
method executeCancelCommand*(self: FactoryResetConfirmationDisplayMetadataState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/factory_reset_confirmation_state.nim
View File

@ -15,7 +15,7 @@ method executePrePrimaryStateCommand*(self: FactoryResetConfirmationState, contr
controller.setKeycardData(updatePredefinedKeycardData(controller.getKeycardData(), PredefinedKeycardData.HideKeyPair, add = true))
controller.runGetAppInfoFlow(factoryReset = true)
method executePreTertiaryStateCommand*(self: FactoryResetConfirmationState, controller: Controller) =
method executeCancelCommand*(self: FactoryResetConfirmationState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/factory_reset_success_state.nim
View File

@ -14,7 +14,7 @@ method executePrePrimaryStateCommand*(self: FactoryResetSuccessState, controller
elif self.flowType == FlowType.SetupNewKeycard:
controller.runLoadAccountFlow()
method executePreTertiaryStateCommand*(self: FactoryResetSuccessState, controller: Controller) =
method executeCancelCommand*(self: FactoryResetSuccessState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/insert_keycard_state.nim
View File

@ -13,7 +13,7 @@ method executePreBackStateCommand*(self: InsertKeycardState, controller: Control
if not self.getBackState.isNil and self.getBackState.stateType == StateType.SelectExistingKeyPair:
controller.cancelCurrentFlow()
method executePreTertiaryStateCommand*(self: InsertKeycardState, controller: Controller) =
method executeCancelCommand*(self: InsertKeycardState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.Authentication or

2
src/app/modules/shared_modules/keycard_popup/internal/key_pair_migrate_failure_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: KeyPairMigrateFailureState, controll
if self.flowType == FlowType.SetupNewKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: KeyPairMigrateFailureState, controller: Controller) =
method executeCancelCommand*(self: KeyPairMigrateFailureState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_already_unlocked_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: KeycardAlreadyUnlockedState, control
if self.flowType == FlowType.UnlockKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: KeycardAlreadyUnlockedState, controller: Controller) =
method executeCancelCommand*(self: KeycardAlreadyUnlockedState, controller: Controller) =
if self.flowType == FlowType.UnlockKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_change_pairing_code_failure_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: ChangingKeycardPairingCodeFailureSta
if self.flowType == FlowType.ChangePairingCode:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: ChangingKeycardPairingCodeFailureState, controller: Controller) =
method executeCancelCommand*(self: ChangingKeycardPairingCodeFailureState, controller: Controller) =
if self.flowType == FlowType.ChangePairingCode:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_change_pairing_code_success_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: ChangingKeycardPairingCodeSuccessSta
if self.flowType == FlowType.ChangePairingCode:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: ChangingKeycardPairingCodeSuccessState, controller: Controller) =
method executeCancelCommand*(self: ChangingKeycardPairingCodeSuccessState, controller: Controller) =
if self.flowType == FlowType.ChangePairingCode:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_change_pin_failure_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: ChangingKeycardPinFailureState, cont
if self.flowType == FlowType.ChangeKeycardPin:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: ChangingKeycardPinFailureState, controller: Controller) =
method executeCancelCommand*(self: ChangingKeycardPinFailureState, controller: Controller) =
if self.flowType == FlowType.ChangeKeycardPin:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_change_pin_success_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: ChangingKeycardPinSuccessState, cont
if self.flowType == FlowType.ChangeKeycardPin:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: ChangingKeycardPinSuccessState, controller: Controller) =
method executeCancelCommand*(self: ChangingKeycardPinSuccessState, controller: Controller) =
if self.flowType == FlowType.ChangeKeycardPin:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_change_puk_failure_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: ChangingKeycardPukFailureState, cont
if self.flowType == FlowType.ChangeKeycardPuk:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: ChangingKeycardPukFailureState, controller: Controller) =
method executeCancelCommand*(self: ChangingKeycardPukFailureState, controller: Controller) =
if self.flowType == FlowType.ChangeKeycardPuk:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_change_puk_success_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: ChangingKeycardPukSuccessState, cont
if self.flowType == FlowType.ChangeKeycardPuk:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: ChangingKeycardPukSuccessState, controller: Controller) =
method executeCancelCommand*(self: ChangingKeycardPukSuccessState, controller: Controller) =
if self.flowType == FlowType.ChangeKeycardPuk:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_empty_metadata_state.nim
View File

@ -8,7 +8,7 @@ proc newKeycardEmptyMetadataState*(flowType: FlowType, backState: State): Keycar
proc delete*(self: KeycardEmptyMetadataState) =
self.State.delete
method executePreTertiaryStateCommand*(self: KeycardEmptyMetadataState, controller: Controller) =
method executeCancelCommand*(self: KeycardEmptyMetadataState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.DisplayKeycardContent or

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_empty_state.nim
View File

@ -19,7 +19,7 @@ method executePrePrimaryStateCommand*(self: KeycardEmptyState, controller: Contr
self.flowType == FlowType.ChangePairingCode:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)
method executePreTertiaryStateCommand*(self: KeycardEmptyState, controller: Controller) =
method executeCancelCommand*(self: KeycardEmptyState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.Authentication or
self.flowType == FlowType.UnlockKeycard or

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_inserted_state.nim
View File

@ -20,7 +20,7 @@ method getNextSecondaryState*(self: KeycardInsertedState, controller: Controller
return createState(StateType.ReadingKeycard, self.flowType, self.getBackState)
return createState(StateType.ReadingKeycard, self.flowType, nil)
method executePreTertiaryStateCommand*(self: KeycardInsertedState, controller: Controller) =
method executeCancelCommand*(self: KeycardInsertedState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.Authentication or

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_metadata_display_state.nim
View File

@ -17,7 +17,7 @@ method getNextPrimaryState*(self: KeycardMetadataDisplayState, controller: Contr
if self.flowType == FlowType.RenameKeycard:
return createState(StateType.EnterKeycardName, self.flowType, nil)
method executePreTertiaryStateCommand*(self: KeycardMetadataDisplayState, controller: Controller) =
method executeCancelCommand*(self: KeycardMetadataDisplayState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.DisplayKeycardContent or

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_not_empty_state.nim
View File

@ -13,7 +13,7 @@ method executePrePrimaryStateCommand*(self: KeycardNotEmptyState, controller: Co
controller.setKeycardData(updatePredefinedKeycardData(controller.getKeycardData(), PredefinedKeycardData.HideKeyPair, add = true))
controller.runGetMetadataFlow(resolveAddress = true)
method executePreTertiaryStateCommand*(self: KeycardNotEmptyState, controller: Controller) =
method executeCancelCommand*(self: KeycardNotEmptyState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_rename_failure_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: KeycardRenameFailureState, controlle
if self.flowType == FlowType.RenameKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: KeycardRenameFailureState, controller: Controller) =
method executeCancelCommand*(self: KeycardRenameFailureState, controller: Controller) =
if self.flowType == FlowType.RenameKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/keycard_rename_success_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: KeycardRenameSuccessState, controlle
if self.flowType == FlowType.RenameKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: KeycardRenameSuccessState, controller: Controller) =
method executeCancelCommand*(self: KeycardRenameSuccessState, controller: Controller) =
if self.flowType == FlowType.RenameKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/max_pairing_slots_reached_state.nim
View File

@ -21,7 +21,7 @@ method getNextPrimaryState*(self: MaxPairingSlotsReachedState, controller: Contr
controller.runSharedModuleFlow(FlowType.UnlockKeycard)
return nil
method executePreTertiaryStateCommand*(self: MaxPairingSlotsReachedState, controller: Controller) =
method executeCancelCommand*(self: MaxPairingSlotsReachedState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.Authentication or

2
src/app/modules/shared_modules/keycard_popup/internal/max_pin_retries_reached_state.nim
View File

@ -26,7 +26,7 @@ method getNextPrimaryState*(self: MaxPinRetriesReachedState, controller: Control
controller.runSharedModuleFlow(FlowType.UnlockKeycard)
return nil
method executePreTertiaryStateCommand*(self: MaxPinRetriesReachedState, controller: Controller) =
method executeCancelCommand*(self: MaxPinRetriesReachedState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.Authentication or
self.flowType == FlowType.DisplayKeycardContent or

2
src/app/modules/shared_modules/keycard_popup/internal/max_puk_retries_reached_state.nim
View File

@ -22,7 +22,7 @@ method getNextPrimaryState*(self: MaxPukRetriesReachedState, controller: Control
if self.flowType == FlowType.UnlockKeycard:
return createState(StateType.EnterSeedPhrase, self.flowType, self)
method executePreTertiaryStateCommand*(self: MaxPukRetriesReachedState, controller: Controller) =
method executeCancelCommand*(self: MaxPukRetriesReachedState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.Authentication or

2
src/app/modules/shared_modules/keycard_popup/internal/not_keycard_state.nim
View File

@ -8,7 +8,7 @@ proc newNotKeycardState*(flowType: FlowType, backState: State): NotKeycardState
proc delete*(self: NotKeycardState) =
self.State.delete
method executePreTertiaryStateCommand*(self: NotKeycardState, controller: Controller) =
method executeCancelCommand*(self: NotKeycardState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.Authentication or

2
src/app/modules/shared_modules/keycard_popup/internal/pin_set_state.nim
View File

@ -22,6 +22,6 @@ method getNextPrimaryState*(self: PinSetState, controller: Controller): State =
if controller.getCurrentKeycardServiceFlow() == KCSFlowType.StoreMetadata:
return createState(StateType.UnlockKeycardSuccess, self.flowType, nil)
method executePreTertiaryStateCommand*(self: PinSetState, controller: Controller) =
method executeCancelCommand*(self: PinSetState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/pin_verified_state.nim
View File

@ -21,7 +21,7 @@ method getNextPrimaryState*(self: PinVerifiedState, controller: Controller): Sta
if self.flowType == FlowType.ChangePairingCode:
return createState(StateType.CreatePairingCode, self.flowType, nil)
method executePreTertiaryStateCommand*(self: PinVerifiedState, controller: Controller) =
method executeCancelCommand*(self: PinVerifiedState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.DisplayKeycardContent or

2
src/app/modules/shared_modules/keycard_popup/internal/plugin_reader_state.nim
View File

@ -13,7 +13,7 @@ method executePreBackStateCommand*(self: PluginReaderState, controller: Controll
if not self.getBackState.isNil and self.getBackState.stateType == StateType.SelectExistingKeyPair:
controller.cancelCurrentFlow()
method executePreTertiaryStateCommand*(self: PluginReaderState, controller: Controller) =
method executeCancelCommand*(self: PluginReaderState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.Authentication or

2
src/app/modules/shared_modules/keycard_popup/internal/reading_keycard_state.nim
View File

@ -13,7 +13,7 @@ method executePreBackStateCommand*(self: ReadingKeycardState, controller: Contro
if not self.getBackState.isNil and self.getBackState.stateType == StateType.SelectExistingKeyPair:
controller.cancelCurrentFlow()
method executePreTertiaryStateCommand*(self: ReadingKeycardState, controller: Controller) =
method executeCancelCommand*(self: ReadingKeycardState, controller: Controller) =
error "reading state must not be canceled"
method getNextSecondaryState*(self: ReadingKeycardState, controller: Controller): State =

2
src/app/modules/shared_modules/keycard_popup/internal/recognized_keycard_state.nim
View File

@ -30,5 +30,5 @@ method getNextSecondaryState*(self: RecognizedKeycardState, controller: Controll
self.flowType == FlowType.ChangePairingCode:
return createState(StateType.EnterPin, self.flowType, nil)
method executePreTertiaryStateCommand*(self: RecognizedKeycardState, controller: Controller) =
method executeCancelCommand*(self: RecognizedKeycardState, controller: Controller) =
error "recognized state must not be canceled"

2
src/app/modules/shared_modules/keycard_popup/internal/repeat_pin_state.nim
View File

@ -26,7 +26,7 @@ method getNextSecondaryState*(self: RepeatPinState, controller: Controller): Sta
if self.flowType == FlowType.ChangeKeycardPin:
return createState(StateType.ChangingKeycardPin, self.flowType, nil)
method executePreTertiaryStateCommand*(self: RepeatPinState, controller: Controller) =
method executeCancelCommand*(self: RepeatPinState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.UnlockKeycard or
self.flowType == FlowType.ChangeKeycardPin:

2
src/app/modules/shared_modules/keycard_popup/internal/repeat_puk_state.nim
View File

@ -18,6 +18,6 @@ method getNextSecondaryState*(self: RepeatPukState, controller: Controller): Sta
if self.flowType == FlowType.ChangeKeycardPuk:
return createState(StateType.ChangingKeycardPuk, self.flowType, nil)
method executePreTertiaryStateCommand*(self: RepeatPukState, controller: Controller) =
method executeCancelCommand*(self: RepeatPukState, controller: Controller) =
if self.flowType == FlowType.ChangeKeycardPuk:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/seed_phrase_display_state.nim
View File

@ -8,7 +8,7 @@ proc newSeedPhraseDisplayState*(flowType: FlowType, backState: State): SeedPhras
proc delete*(self: SeedPhraseDisplayState) =
self.State.delete
method executePreTertiaryStateCommand*(self: SeedPhraseDisplayState, controller: Controller) =
method executeCancelCommand*(self: SeedPhraseDisplayState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/seed_phrase_enter_words_state.nim
View File

@ -15,7 +15,7 @@ method executePrePrimaryStateCommand*(self: SeedPhraseEnterWordsState, controlle
controller.setSeedPhrase(mnemonic)
controller.storeSeedPhraseToKeycard(mnemonic.split(" ").len, mnemonic)
method executePreTertiaryStateCommand*(self: SeedPhraseEnterWordsState, controller: Controller) =
method executeCancelCommand*(self: SeedPhraseEnterWordsState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/select_existing_key_pair_state.nim
View File

@ -12,7 +12,7 @@ method executePrePrimaryStateCommand*(self: SelectExistingKeyPairState, controll
if self.flowType == FlowType.SetupNewKeycard:
controller.runLoadAccountFlow()
method executePreTertiaryStateCommand*(self: SelectExistingKeyPairState, controller: Controller) =
method executeCancelCommand*(self: SelectExistingKeyPairState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

14
src/app/modules/shared_modules/keycard_popup/internal/state.nim
View File

@ -119,9 +119,9 @@ method getNextPrimaryState*(self: State, controller: Controller): State {.inlin
method getNextSecondaryState*(self: State, controller: Controller): State {.inline base.} =
return nil
## Returns next state instance if "tertiary" action is triggered
method getNextTertiaryState*(self: State, controller: Controller): State {.inline base.} =
return nil
## This method is executed if "cancel" action is triggered (invalidates current flow)
method executeCancelCommand*(self: State, controller: Controller) {.inline base.} =
discard
## This method is executed before back state is set, if "back" action is triggered
method executePreBackStateCommand*(self: State, controller: Controller) {.inline base.} =
@ -147,14 +147,6 @@ method executePreSecondaryStateCommand*(self: State, controller: Controller) {.i
method executePostSecondaryStateCommand*(self: State, controller: Controller) {.inline base.} =
discard
## This method is executed before tertiary state is set, if "tertiary" action is triggered
method executePreTertiaryStateCommand*(self: State, controller: Controller) {.inline base.} =
discard
## This method is executed after tertiary state is set, if "tertiary" action is triggered
method executePostTertiaryStateCommand*(self: State, controller: Controller) {.inline base.} =
discard
## This method is used for handling aync responses for keycard related states
method resolveKeycardNextState*(self: State, keycardFlowType: string, keycardEvent: KeycardEvent,
controller: Controller): State {.inline base.} =

12
src/app/modules/shared_modules/keycard_popup/internal/state_wrapper.nim
View File

@ -46,17 +46,17 @@ QtObject:
notify = stateWrapperChanged
proc backActionClicked*(self: StateWrapper) {.signal.}
proc backAction*(self: StateWrapper) {.slot.} =
proc doBackAction*(self: StateWrapper) {.slot.} =
self.backActionClicked()
proc cancelActionClicked*(self: StateWrapper) {.signal.}
proc doCancelAction*(self: StateWrapper) {.slot.} =
self.cancelActionClicked()
proc primaryActionClicked*(self: StateWrapper) {.signal.}
proc doPrimaryAction*(self: StateWrapper) {.slot.} =
self.primaryActionClicked()
proc secondaryActionClicked*(self: StateWrapper) {.signal.}
proc doSecondaryAction*(self: StateWrapper) {.slot.} =
self.secondaryActionClicked()
proc tertiaryActionClicked*(self: StateWrapper) {.signal.}
proc doTertiaryAction*(self: StateWrapper) {.slot.} =
self.tertiaryActionClicked()
self.secondaryActionClicked()

2
src/app/modules/shared_modules/keycard_popup/internal/unlock_keycard_options_state.nim
View File

@ -16,6 +16,6 @@ method getNextSecondaryState*(self: UnlockKeycardOptionsState, controller: Contr
if self.flowType == FlowType.UnlockKeycard:
return createState(StateType.EnterPuk, self.flowType, self)
method executePreTertiaryStateCommand*(self: UnlockKeycardOptionsState, controller: Controller) =
method executeCancelCommand*(self: UnlockKeycardOptionsState, controller: Controller) =
if self.flowType == FlowType.UnlockKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/unlock_keycard_success_state.nim
View File

@ -12,6 +12,6 @@ method executePrePrimaryStateCommand*(self: UnlockKeycardSuccessState, controlle
if self.flowType == FlowType.UnlockKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: UnlockKeycardSuccessState, controller: Controller) =
method executeCancelCommand*(self: UnlockKeycardSuccessState, controller: Controller) =
if self.flowType == FlowType.UnlockKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)

2
src/app/modules/shared_modules/keycard_popup/internal/wrong_biometrics_password_state.nim
View File

@ -21,7 +21,7 @@ method executePrePrimaryStateCommand*(self: WrongBiometricsPasswordState, contro
else:
controller.setKeycardData(updatePredefinedKeycardData(controller.getKeycardData(), PredefinedKeycardData.WrongPassword, add = true))
method executePreTertiaryStateCommand*(self: WrongBiometricsPasswordState, controller: Controller) =
method executeCancelCommand*(self: WrongBiometricsPasswordState, controller: Controller) =
if self.flowType == FlowType.Authentication:
controller.setPassword("")
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/wrong_keycard_state.nim
View File

@ -16,7 +16,7 @@ method executePrePrimaryStateCommand*(self: WrongKeycardState, controller: Contr
self.flowType == FlowType.ChangePairingCode:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = true)
method executePreTertiaryStateCommand*(self: WrongKeycardState, controller: Controller) =
method executeCancelCommand*(self: WrongKeycardState, controller: Controller) =
if self.flowType == FlowType.Authentication or
self.flowType == FlowType.UnlockKeycard or
self.flowType == FlowType.RenameKeycard or

2
src/app/modules/shared_modules/keycard_popup/internal/wrong_keychain_pin_state.nim
View File

@ -14,7 +14,7 @@ method getNextPrimaryState*(self: WrongKeychainPinState, controller: Controller)
controller.enterKeycardPin(controller.getPin())
return nil
method executePreTertiaryStateCommand*(self: WrongKeychainPinState, controller: Controller) =
method executeCancelCommand*(self: WrongKeychainPinState, controller: Controller) =
if self.flowType == FlowType.Authentication:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/wrong_password_state.nim
View File

@ -24,7 +24,7 @@ method executePreSecondaryStateCommand*(self: WrongPasswordState, controller: Co
if self.flowType == FlowType.Authentication:
controller.tryToObtainDataFromKeychain()
method executePreTertiaryStateCommand*(self: WrongPasswordState, controller: Controller) =
method executeCancelCommand*(self: WrongPasswordState, controller: Controller) =
if self.flowType == FlowType.Authentication:
controller.setPassword("")
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/wrong_pin_state.nim
View File

@ -36,7 +36,7 @@ method executePreSecondaryStateCommand*(self: WrongPinState, controller: Control
controller.setUsePinFromBiometrics(false)
controller.tryToObtainDataFromKeychain()
method executePreTertiaryStateCommand*(self: WrongPinState, controller: Controller) =
method executeCancelCommand*(self: WrongPinState, controller: Controller) =
if self.flowType == FlowType.FactoryReset or
self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.Authentication or

2
src/app/modules/shared_modules/keycard_popup/internal/wrong_puk_state.nim
View File

@ -13,7 +13,7 @@ method executePrePrimaryStateCommand*(self: WrongPukState, controller: Controlle
if controller.getPuk().len == PUKLengthForStatusApp:
controller.enterKeycardPuk(controller.getPuk())
method executePreTertiaryStateCommand*(self: WrongPukState, controller: Controller) =
method executeCancelCommand*(self: WrongPukState, controller: Controller) =
if self.flowType == FlowType.UnlockKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/internal/wrong_seed_phrase_state.nim
View File

@ -32,7 +32,7 @@ method executePrePrimaryStateCommand*(self: WrongSeedPhraseState, controller: Co
else:
controller.setKeycardData(updatePredefinedKeycardData(controller.getKeycardData(), PredefinedKeycardData.WrongSeedPhrase, add = true))
method executePreTertiaryStateCommand*(self: WrongSeedPhraseState, controller: Controller) =
method executeCancelCommand*(self: WrongSeedPhraseState, controller: Controller) =
if self.flowType == FlowType.SetupNewKeycard or
self.flowType == FlowType.UnlockKeycard:
controller.terminateCurrentFlow(lastStepInTheCurrentFlow = false)

2
src/app/modules/shared_modules/keycard_popup/io_interface.nim
View File

@ -90,7 +90,7 @@ method onPrimaryActionClicked*(self: AccessInterface) {.base.} =
method onSecondaryActionClicked*(self: AccessInterface) {.base.} =
raise newException(ValueError, "No implementation available")
method onTertiaryActionClicked*(self: AccessInterface) {.base.} =
method onCancelActionClicked*(self: AccessInterface) {.base.} =
raise newException(ValueError, "No implementation available")
method onKeycardResponse*(self: AccessInterface, keycardFlowType: string, keycardEvent: KeycardEvent) {.base.} =

25
src/app/modules/shared_modules/keycard_popup/module.nim
View File

@ -172,7 +172,15 @@ method onBackActionClicked*[T](self: Module[T]) =
self.view.setCurrentState(backState)
currStateObj.executePostBackStateCommand(self.controller)
debug "sm_back_action - set state", setCurrFlow=backState.flowType(), newCurrState=backState.stateType()
currStateObj.delete()
currStateObj.delete()
method onCancelActionClicked*[T](self: Module[T]) =
let currStateObj = self.view.currentStateObj()
if currStateObj.isNil:
error "sm_cannot resolve current state"
return
debug "sm_cancel_action", currFlow=currStateObj.flowType(), currState=currStateObj.stateType()
currStateObj.executeCancelCommand(self.controller)
method onPrimaryActionClicked*[T](self: Module[T]) =
let currStateObj = self.view.currentStateObj()
@ -204,21 +212,6 @@ method onSecondaryActionClicked*[T](self: Module[T]) =
currStateObj.executePostSecondaryStateCommand(self.controller)
debug "sm_secondary_action - set state", setCurrFlow=nextState.flowType(), setCurrState=nextState.stateType()
method onTertiaryActionClicked*[T](self: Module[T]) =
let currStateObj = self.view.currentStateObj()
if currStateObj.isNil:
error "sm_cannot resolve current state"
return
debug "sm_tertiary_action", currFlow=currStateObj.flowType(), currState=currStateObj.stateType()
currStateObj.executePreTertiaryStateCommand(self.controller)
let nextState = currStateObj.getNextTertiaryState(self.controller)
if nextState.isNil:
return
self.preStateActivities(nextState.flowType(), nextState.stateType())
self.view.setCurrentState(nextState)
currStateObj.executePostTertiaryStateCommand(self.controller)
debug "sm_tertiary_action - set state", setCurrFlow=nextState.flowType(), setCurrState=nextState.stateType()
method onKeycardResponse*[T](self: Module[T], keycardFlowType: string, keycardEvent: KeycardEvent) =
if self.derivingAccountDetails.deriveAddressAfterAuthentication and
self.derivingAccountDetails.addressRequested:

8
src/app/modules/shared_modules/keycard_popup/view.nim
View File

@ -55,9 +55,9 @@ QtObject:
result.currentStateVariant = newQVariant(result.currentState)
signalConnect(result.currentState, "backActionClicked()", result, "onBackActionClicked()", 2)
signalConnect(result.currentState, "cancelActionClicked()", result, "onCancelActionClicked()", 2)
signalConnect(result.currentState, "primaryActionClicked()", result, "onPrimaryActionClicked()", 2)
signalConnect(result.currentState, "secondaryActionClicked()", result, "onSecondaryActionClicked()", 2)
signalConnect(result.currentState, "tertiaryActionClicked()", result, "onTertiaryActionClicked()", 2)
proc currentStateObj*(self: View): State =
return self.currentState.getStateObj()
@ -85,15 +85,15 @@ QtObject:
proc onBackActionClicked*(self: View) {.slot.} =
self.delegate.onBackActionClicked()
proc onCancelActionClicked*(self: View) {.slot.} =
self.delegate.onCancelActionClicked()
proc onPrimaryActionClicked*(self: View) {.slot.} =
self.delegate.onPrimaryActionClicked()
proc onSecondaryActionClicked*(self: View) {.slot.} =
self.delegate.onSecondaryActionClicked()
proc onTertiaryActionClicked*(self: View) {.slot.} =
self.delegate.onTertiaryActionClicked()
proc keyPairModel*(self: View): KeyPairModel =
return self.keyPairModel

2
ui/imports/shared/popups/keycard/KeycardPopup.qml
View File

@ -50,7 +50,7 @@ StatusModal {
}
onClosed: {
root.sharedKeycardModule.currentState.doTertiaryAction()
root.sharedKeycardModule.currentState.doCancelAction()
}
contentItem: StatusScrollView {

30
ui/imports/shared/popups/keycard/KeycardPopupDetails.qml
View File

@ -36,16 +36,17 @@ QtObject {
height: Constants.keycard.general.footerButtonsHeight
width: height
onClicked: {
root.sharedKeycardModule.currentState.backAction()
root.sharedKeycardModule.currentState.doBackAction()
}
}
]
property list<StatusBaseButton> rightButtons: [
StatusButton {
id: tertiaryButton
id: cancelButton
height: Constants.keycard.general.footerButtonsHeight
text: {
text: qsTr("Cancel")
visible: {
switch (root.sharedKeycardModule.currentState.flowType) {
case Constants.keycardSharedFlow.setupNewKeycard:
@ -64,7 +65,7 @@ QtObject {
case Constants.keycardSharedState.factoryResetSuccess:
case Constants.keycardSharedState.pinVerified:
case Constants.keycardSharedState.keycardMetadataDisplay:
return qsTr("Cancel")
return true
}
break
@ -86,7 +87,7 @@ QtObject {
case Constants.keycardSharedState.keycardEmptyMetadata:
case Constants.keycardSharedState.factoryResetConfirmationDisplayMetadata:
case Constants.keycardSharedState.factoryResetConfirmation:
return qsTr("Cancel")
return true
}
break
@ -112,7 +113,7 @@ QtObject {
case Constants.keycardSharedState.enterBiometricsPassword:
case Constants.keycardSharedState.wrongBiometricsPassword:
case Constants.keycardSharedState.enterPin:
return qsTr("Cancel")
return true
}
break
@ -128,7 +129,7 @@ QtObject {
case Constants.keycardSharedState.notKeycard:
case Constants.keycardSharedState.unlockKeycardOptions:
case Constants.keycardSharedState.enterSeedPhrase:
return qsTr("Cancel")
return true
}
break
@ -146,7 +147,7 @@ QtObject {
case Constants.keycardSharedState.maxPinRetriesReached:
case Constants.keycardSharedState.maxPukRetriesReached:
case Constants.keycardSharedState.maxPairingSlotsReached:
return qsTr("Cancel")
return true
}
break
@ -165,7 +166,7 @@ QtObject {
case Constants.keycardSharedState.maxPinRetriesReached:
case Constants.keycardSharedState.maxPukRetriesReached:
case Constants.keycardSharedState.maxPairingSlotsReached:
return qsTr("Cancel")
return true
}
break
@ -185,7 +186,7 @@ QtObject {
case Constants.keycardSharedState.maxPinRetriesReached:
case Constants.keycardSharedState.maxPukRetriesReached:
case Constants.keycardSharedState.maxPairingSlotsReached:
return qsTr("Cancel")
return true
}
break
@ -205,7 +206,7 @@ QtObject {
case Constants.keycardSharedState.maxPinRetriesReached:
case Constants.keycardSharedState.maxPukRetriesReached:
case Constants.keycardSharedState.maxPairingSlotsReached:
return qsTr("Cancel")
return true
}
break
@ -224,14 +225,13 @@ QtObject {
case Constants.keycardSharedState.maxPinRetriesReached:
case Constants.keycardSharedState.maxPukRetriesReached:
case Constants.keycardSharedState.maxPairingSlotsReached:
return qsTr("Cancel")
return true
}
break
}
return ""
return false
}
visible: text !== ""
enabled: {
switch (root.sharedKeycardModule.currentState.stateType) {
@ -250,7 +250,7 @@ QtObject {
}
onClicked: {
root.sharedKeycardModule.currentState.doTertiaryAction()
root.sharedKeycardModule.currentState.doCancelAction()
}
},