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

fix(keycard): unable to re-run keycard flow on windows 

The issue re-running keycard flows on Windows is fixed in this commit,
cause a different signal was emitted on windows in case of missing Keycard.
This commit is contained in:
Sale Djenic 2024-01-22 10:29:11 +01:00 committed by saledjenic
parent 7e3ae8dd7a
commit bd3e9cb67c
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/modules/shared_modules/keycard_popup/internal/state_factory_state_implementation.nim
View File

@ -21,7 +21,8 @@ proc ensureReaderAndCardPresence*(state: State, keycardFlowType: string, keycard
state.flowType == FlowType.MigrateFromAppToKeycard:
if keycardFlowType == ResponseTypeValueKeycardFlowResult and
keycardEvent.error.len > 0 and
keycardEvent.error == ErrorNoReader:
(keycardEvent.error == ErrorNoReader or
keycardEvent.error == ErrorReaderList):
controller.reRunCurrentFlowLater()
if state.stateType == StateType.PluginReader:
return nil
@ -41,8 +42,9 @@ proc ensureReaderAndCardPresence*(state: State, keycardFlowType: string, keycard
if state.flowType == FlowType.SetupNewKeycard:
if keycardFlowType == ResponseTypeValueKeycardFlowResult and
keycardEvent.error.len > 0 and
keycardEvent.error == ErrorConnection or
keycardEvent.error == ErrorNoReader:
(keycardEvent.error == ErrorConnection or
keycardEvent.error == ErrorNoReader or
keycardEvent.error == ErrorReaderList):
controller.reRunCurrentFlowLater()
if state.stateType == StateType.PluginReader:
return nil

11
src/app/modules/startup/internal/state_factory_login_implementation.nim
View File

@ -3,11 +3,12 @@ proc ensureReaderAndCardPresenceLogin*(state: State, keycardFlowType: string, ke
keycardEvent.error.len > 0:
if keycardEvent.error == ErrorPCSC:
return createState(StateType.LoginNoPCSCService, state.flowType, nil)
if keycardEvent.error == ErrorNoReader:
controller.reRunCurrentFlowLater()
if state.stateType == StateType.LoginPlugin:
return nil
return createState(StateType.LoginPlugin, state.flowType, nil)
if keycardEvent.error == ErrorNoReader or
keycardEvent.error == ErrorReaderList:
controller.reRunCurrentFlowLater()
if state.stateType == StateType.LoginPlugin:
return nil
return createState(StateType.LoginPlugin, state.flowType, nil)
if keycardFlowType == ResponseTypeValueInsertCard and
keycardEvent.error.len > 0 and
keycardEvent.error == ErrorConnection:

11
src/app/modules/startup/internal/state_factory_onboarding_implementation.nim
View File

@ -4,11 +4,12 @@ proc ensureReaderAndCardPresenceOnboarding*(state: State, keycardFlowType: strin
keycardEvent.error.len > 0:
if keycardEvent.error == ErrorPCSC:
return createState(StateType.KeycardNoPCSCService, state.flowType, backState)
if keycardEvent.error == ErrorNoReader:
controller.reRunCurrentFlowLater()
if state.stateType == StateType.KeycardPluginReader:
return nil
return createState(StateType.KeycardPluginReader, state.flowType, backState)
if keycardEvent.error == ErrorNoReader or
keycardEvent.error == ErrorReaderList:
controller.reRunCurrentFlowLater()
if state.stateType == StateType.KeycardPluginReader:
return nil
return createState(StateType.KeycardPluginReader, state.flowType, backState)
if keycardFlowType == ResponseTypeValueInsertCard and
keycardEvent.error.len > 0 and
keycardEvent.error == ErrorConnection: