From df8c8bb6f116f5286c01b7f26b605a5c30ed3528 Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Fri, 27 Aug 2021 20:26:12 +1200 Subject: [PATCH] Update settings.js --- app/assets/js/scripts/settings.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js index 8fd6f84d..698913be 100644 --- a/app/assets/js/scripts/settings.js +++ b/app/assets/js/scripts/settings.js @@ -394,16 +394,20 @@ function processLogOut(val, isLastAccount, skip = false) { val, isLastAccount } + + const parent = val.closest('.settingsAuthAccount') + const uuid = parent.getAttribute('uuid') + if (!skip) { - const parent = val.closest('.settingsAuthAccount') - const uuid = parent.getAttribute('uuid') const account = ConfigManager.getAuthAccount(uuid) if (account.type === 'microsoft') { toggleOverlay(true, false, 'msOverlay') ipcRenderer.send('openMSALogoutWindow', 'open') } } + const prevSelAcc = ConfigManager.getSelectedAccount() + AuthManager.removeAccount(uuid).then(() => { if(!isLastAccount && uuid === prevSelAcc.uuid){ const selAcc = ConfigManager.getSelectedAccount() @@ -412,6 +416,7 @@ function processLogOut(val, isLastAccount, skip = false) { validateSelectedAccount() } }) + $(parent).fadeOut(250, () => { parent.remove() }) @@ -1365,4 +1370,4 @@ function prepareSettings(first = false) { } // Prepare the settings UI on startup. -//prepareSettings(true) \ No newline at end of file +//prepareSettings(true)