From a3866348fd5684c8fd2ce3352ed9d74ffa50df71 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 2 Jun 2025 13:37:29 +0200
Subject: [PATCH 1/2] Aria selected is a better fit here

---
 app/javascript/controllers/navigable_list_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/controllers/navigable_list_controller.js b/app/javascript/controllers/navigable_list_controller.js
index 9b96c1b08..44f3faef6 100644
--- a/app/javascript/controllers/navigable_list_controller.js
+++ b/app/javascript/controllers/navigable_list_controller.js
@@ -3,7 +3,7 @@ import { nextFrame } from "helpers/timing_helpers"
 
 export default class extends Controller {
   static targets = [ "item" ]
-  static values = { selectionAttribute: { type: String, default: "aria-current" } }
+  static values = { selectionAttribute: { type: String, default: "aria-selected" } }
 
   connect() {
     this.selectLast()

From 08c5abfbdb07dfccfe8d645bf31be815ffb89ff6 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 2 Jun 2025 18:03:14 +0200
Subject: [PATCH 2/2] Extract common method to query when entropy is cleaned

We were always quering auto_close_at
https://37s.fizzy.37signals.com/collections/2/cards/743
---
 .../controllers/navigable_list_controller.js   |  2 +-
 app/models/card/entropy.rb                     | 18 +++++++++++++++---
 .../cards/display/preview/_bubble.html.erb     |  2 +-
 test/models/card/entropy_test.rb               | 10 ++++++++++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/javascript/controllers/navigable_list_controller.js b/app/javascript/controllers/navigable_list_controller.js
index 44f3faef6..9b96c1b08 100644
--- a/app/javascript/controllers/navigable_list_controller.js
+++ b/app/javascript/controllers/navigable_list_controller.js
@@ -3,7 +3,7 @@ import { nextFrame } from "helpers/timing_helpers"
 
 export default class extends Controller {
   static targets = [ "item" ]
-  static values = { selectionAttribute: { type: String, default: "aria-selected" } }
+  static values = { selectionAttribute: { type: String, default: "aria-current" } }
 
   connect() {
     this.selectLast()
diff --git a/app/models/card/entropy.rb b/app/models/card/entropy.rb
index b0eded7a3..511832513 100644
--- a/app/models/card/entropy.rb
+++ b/app/models/card/entropy.rb
@@ -26,11 +26,19 @@ module Card::Entropy
   end
 
   def subject_to_entropy?
-    doing? || (auto_closing? && considering?)
+    auto_reconsidering? || auto_closing?
+  end
+
+  def auto_reconsidering?
+    doing? && last_active_at
+  end
+
+  def auto_closing?
+    considering? && collection.auto_closing? && last_active_at
   end
 
   def auto_close_at
-    last_active_at + auto_close_period if auto_closing? && last_active_at
+    last_active_at + auto_close_period if auto_closing?
   end
 
   def days_until_close
@@ -38,10 +46,14 @@ module Card::Entropy
   end
 
   def auto_reconsider_at
-    last_active_at + AUTO_RECONSIDER_PERIOD if last_active_at
+    last_active_at + AUTO_RECONSIDER_PERIOD if auto_reconsidering?
   end
 
   def days_until_reconsider
     (auto_reconsider_at.to_date - Date.current).to_i if auto_reconsider_at
   end
+
+  def entropy_cleaned_at
+    auto_close_at || auto_reconsider_at
+  end
 end
diff --git a/app/views/cards/display/preview/_bubble.html.erb b/app/views/cards/display/preview/_bubble.html.erb
index c05989755..f0e3df352 100644
--- a/app/views/cards/display/preview/_bubble.html.erb
+++ b/app/views/cards/display/preview/_bubble.html.erb
@@ -1,7 +1,7 @@
 <div hidden class="bubble bubble--<%= card.engagement_status %>"
      data-controller="bubble" data-action="turbo:morph-element->bubble#update"
      data-bubble-reminder-before-value="<%= Card::ENTROPY_REMINDER_BEFORE.in_days.to_i %>"
-     data-bubble-closes-at-value="<%= card.auto_close_at.iso8601 %>"
+     data-bubble-closes-at-value="<%= card.entropy_cleaned_at.iso8601 %>"
      data-bubble-entropy-action-value="<%= card_entropy_action(card) %>">
   <svg viewBox="0 0 200 100">
     <path id="top-half" fill="transparent" d="M 20,100 A 80,80 0 0,1 180,100" />
diff --git a/test/models/card/entropy_test.rb b/test/models/card/entropy_test.rb
index 8858052b2..1456cec19 100644
--- a/test/models/card/entropy_test.rb
+++ b/test/models/card/entropy_test.rb
@@ -47,4 +47,14 @@ class Card::EntropyTest < ActiveSupport::TestCase
     assert cards(:logo).reload.considering?
     assert_equal Time.current, cards(:logo).last_active_at
   end
+
+  test "entropy_cleaned_at returns when the entropy will be cleaned" do
+    cards(:logo).reconsider
+    assert_equal cards(:logo).auto_close_at, cards(:logo).entropy_cleaned_at
+    assert_not_nil cards(:logo).entropy_cleaned_at
+
+    cards(:logo).engage
+    assert_equal cards(:logo).auto_reconsider_at, cards(:logo).entropy_cleaned_at
+    assert_not_nil cards(:logo).entropy_cleaned_at
+  end
 end