From 637b1aeb2d1361b93a7c581518f2c1a753d9de5d Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Mon, 12 Oct 2020 12:59:48 +0200 Subject: [PATCH] fix: swap 'Merge Local Data' confirm prompt actions --- .../javascripts/directives/views/accountMenu.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/directives/views/accountMenu.ts b/app/assets/javascripts/directives/views/accountMenu.ts index b5faec9856e..505a68d9319 100644 --- a/app/assets/javascripts/directives/views/accountMenu.ts +++ b/app/assets/javascripts/directives/views/accountMenu.ts @@ -279,14 +279,12 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> { async mergeLocalChanged() { if (!this.getState().formData.mergeLocal) { - if (await confirmDialog({ - text: STRING_ACCOUNT_MENU_UNCHECK_MERGE, - confirmButtonStyle: 'danger' - })) { - this.setFormDataState({ - mergeLocal: true - }); - } + this.setFormDataState({ + mergeLocal: !(await confirmDialog({ + text: STRING_ACCOUNT_MENU_UNCHECK_MERGE, + confirmButtonStyle: 'danger' + })) + }); } }