From a6e815f243a78c766ef73e3f56494a87d27797ce Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 29 Jul 2022 11:11:01 +0800
Subject: [PATCH] UX: Only set user bookmarks loading state when loading
 (#17728)

Follow-up to 6bb77d30553a346c22bc9efb52a977ce7ae0c33a
---
 .../discourse/app/controllers/user-activity-bookmarks.js        | 2 +-
 .../javascripts/discourse/app/routes/user-activity-bookmarks.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
index 093d4ec3122..a4221a0087e 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
@@ -15,7 +15,7 @@ export default Controller.extend({
 
   application: controller(),
   user: controller(),
-  loading: true,
+  loading: false,
   loadingMore: false,
   permissionDenied: false,
   inSearchMode: notEmpty("q"),
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
index 24d9c851b71..a29d1124f47 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
@@ -25,6 +25,8 @@ export default DiscourseRoute.extend({
       bookmarkListScrollPosition: null,
     });
 
+    controller.set("loading", true);
+
     return this._loadBookmarks(params)
       .then((response) => {
         if (!response.user_bookmark_list) {