From fdf290ea1a9cf8f712e84c15d03446b56a992f08 Mon Sep 17 00:00:00 2001 From: Mo Date: Thu, 21 Apr 2022 10:33:59 -0500 Subject: [PATCH] feat: error decrypting preferences section (#990) * feat: error decrypting preferences section * chore: upgrade snjs --- .../ChallengeModal/ChallengeModal.tsx | 7 +- .../Panes/Security/ErroredItems.tsx | 130 ++++++++++++++++ .../Preferences/Panes/Security/index.tsx | 6 + .../PreferencesComponents/MenuItem.tsx | 10 +- .../Components/Preferences/PreferencesMenu.ts | 37 +++-- .../Preferences/PreferencesMenuView.tsx | 1 + .../javascripts/Services/ArchiveManager.ts | 12 +- app/assets/stylesheets/_sn.scss | 4 + package.json | 4 +- yarn.lock | 144 +++++++++--------- 10 files changed, 265 insertions(+), 90 deletions(-) create mode 100644 app/assets/javascripts/Components/Preferences/Panes/Security/ErroredItems.tsx diff --git a/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx b/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx index bc71c5dc6..bd1cdb627 100644 --- a/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx +++ b/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx @@ -125,8 +125,9 @@ export const ChallengeModal: FunctionComponent = ({ [values], ) - const closeModal = () => { + const cancelChallenge = () => { if (challenge.cancelable) { + application.cancelChallenge(challenge) onDismiss(challenge).catch(console.error) } } @@ -187,7 +188,7 @@ export const ChallengeModal: FunctionComponent = ({ className={`sn-component ${ challenge.reason === ChallengeReason.ApplicationUnlock ? 'challenge-modal-overlay' : '' }`} - onDismiss={closeModal} + onDismiss={cancelChallenge} dangerouslyBypassFocusLock={bypassModalFocusLock} > = ({ > {challenge.cancelable && (