From 4acf3738caf3afdc0c3e35fabbe10ef8b9397d8b Mon Sep 17 00:00:00 2001
From: Martin Filser <github-wekan@linux-email.de>
Date: Thu, 28 Oct 2021 23:33:12 +0200
Subject: [PATCH 1/3] Card color remove closes now the popup

---
 client/components/cards/cardDetails.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index a818b6351..dd64adde8 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -1011,7 +1011,7 @@ BlazeComponent.extendComponent({
         },
         'click .js-remove-color'() {
           this.currentCard.setColor(null);
-          Popup.back();
+          Popup.close();
         },
       },
     ];

From 7f7ef0a91475a6d84a3d21408461232bdb0357f4 Mon Sep 17 00:00:00 2001
From: Martin Filser <github-wekan@linux-email.de>
Date: Fri, 29 Oct 2021 09:02:34 +0200
Subject: [PATCH 2/3] Move card to bottom - close Popup / back to previous
 popup

---
 client/components/cards/cardDetails.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index dd64adde8..e00ffc62e 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -690,6 +690,7 @@ Template.cardDetailsActionsPopup.events({
         .map((c) => c.sort),
     );
     this.move(this.boardId, this.swimlaneId, this.listId, maxOrder + 1);
+    Popup.back();
   },
   'click .js-archive': Popup.afterConfirm('cardArchive', function () {
     Popup.close();

From 67f614ffb0fd8f47bcd9a0805654de1946fa2af0 Mon Sep 17 00:00:00 2001
From: Martin Filser <github-wekan@linux-email.de>
Date: Sat, 30 Oct 2021 01:06:06 +0200
Subject: [PATCH 3/3] Card delete closes now the popup after delete
 confirmation

---
 client/components/cards/cardDetails.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index e00ffc62e..f3693cb5d 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -1114,7 +1114,7 @@ BlazeComponent.extendComponent({
           }
         },
         'click .js-delete': Popup.afterConfirm('cardDelete', function () {
-          Popup.back();
+          Popup.close();
           // verify that there are no linked cards
           if (Cards.find({ linkedId: this._id }).count() === 0) {
             Cards.remove(this._id);