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(@desktop/keycard): update logic of enabling action buttons during the flow

This commit is contained in:
Sale Djenic 2023-02-14 12:37:59 +01:00 committed by saledjenic
parent 42445d4b73
commit a4bce9e130
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,8 @@ StatusModal {
property var emojiPopup property var emojiPopup
width: Constants.keycard.general.popupWidth width: Constants.keycard.general.popupWidth
closePolicy: d.disablePopupClose? Popup.NoAutoClose : Popup.CloseOnEscape closePolicy: d.disableActionPopupButtons? Popup.NoAutoClose : Popup.CloseOnEscape
hasCloseButton: !d.disableActionPopupButtons
header.title: { header.title: {
switch (root.sharedKeycardModule.currentState.flowType) { switch (root.sharedKeycardModule.currentState.flowType) {
@ -51,10 +52,6 @@ StatusModal {
KeycardPopupDetails { KeycardPopupDetails {
id: d id: d
sharedKeycardModule: root.sharedKeycardModule sharedKeycardModule: root.sharedKeycardModule
onDisablePopupCloseChanged: {
hasCloseButton = !disablePopupClose
}
} }
onClosed: { onClosed: {

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

@ -13,15 +13,14 @@ QtObject {
property bool primaryButtonEnabled: false property bool primaryButtonEnabled: false
// disables action buttons (back, cancel, primary, secondary) and close button (upper right "X" button) as well // disables action buttons (back, cancel, primary, secondary) and close button (upper right "X" button) as well
readonly property bool disableActionPopupButtons: root.sharedKeycardModule.disablePopup readonly property bool disableActionPopupButtons: {
if (root.sharedKeycardModule.disablePopup) {
readonly property bool disablePopupClose: { // disables popup close button (upper right "X" button)
if (root.disableActionPopupButtons) {
return true return true
} }
switch (root.sharedKeycardModule.currentState.stateType) { switch (root.sharedKeycardModule.currentState.stateType) {
case Constants.keycardSharedState.keycardInserted:
case Constants.keycardSharedState.readingKeycard: case Constants.keycardSharedState.readingKeycard:
case Constants.keycardSharedState.recognizedKeycard: case Constants.keycardSharedState.recognizedKeycard:
case Constants.keycardSharedState.renamingKeycard: case Constants.keycardSharedState.renamingKeycard:
@ -464,8 +463,6 @@ QtObject {
switch (root.sharedKeycardModule.currentState.stateType) { switch (root.sharedKeycardModule.currentState.stateType) {
case Constants.keycardSharedState.pluginReader: case Constants.keycardSharedState.pluginReader:
case Constants.keycardSharedState.insertKeycard: case Constants.keycardSharedState.insertKeycard:
case Constants.keycardSharedState.keycardInserted:
case Constants.keycardSharedState.readingKeycard:
case Constants.keycardSharedState.notKeycard: case Constants.keycardSharedState.notKeycard:
case Constants.keycardSharedState.wrongKeycard: case Constants.keycardSharedState.wrongKeycard:
case Constants.keycardSharedState.keycardEmpty: case Constants.keycardSharedState.keycardEmpty:
@ -999,7 +996,6 @@ QtObject {
case Constants.keycardSharedState.pluginReader: case Constants.keycardSharedState.pluginReader:
case Constants.keycardSharedState.insertKeycard: case Constants.keycardSharedState.insertKeycard:
case Constants.keycardSharedState.keycardInserted:
case Constants.keycardSharedState.recognizedKeycard: case Constants.keycardSharedState.recognizedKeycard:
case Constants.keycardSharedState.createPin: case Constants.keycardSharedState.createPin:
case Constants.keycardSharedState.repeatPin: case Constants.keycardSharedState.repeatPin:
@ -1061,9 +1057,7 @@ QtObject {
switch (root.sharedKeycardModule.currentState.stateType) { switch (root.sharedKeycardModule.currentState.stateType) {
case Constants.keycardSharedState.pluginReader: case Constants.keycardSharedState.pluginReader:
case Constants.keycardSharedState.readingKeycard:
case Constants.keycardSharedState.insertKeycard: case Constants.keycardSharedState.insertKeycard:
case Constants.keycardSharedState.keycardInserted:
case Constants.keycardSharedState.wrongPin: case Constants.keycardSharedState.wrongPin:
case Constants.keycardSharedState.wrongKeychainPin: case Constants.keycardSharedState.wrongKeychainPin:
case Constants.keycardSharedState.notKeycard: case Constants.keycardSharedState.notKeycard: