From 7032733f10df685cb50c84aeb929e6d51ddb81aa Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Tue, 16 May 2023 18:48:01 +0900
Subject: [PATCH] FIX: Add new chat threads icon and move thread list button to
 right (#21575)

* DEV: add new thread icon

* FIX: Use new thread icon, fix typo in SVG

UX: move the thread list icon to the right of
the collapse button

---------

Co-authored-by: Martin Brennan <martin@discourse.org>
---
 lib/svg_sprite.rb                             |  1 +
 .../chat-drawer/header/thread-list-button.hbs |  2 +-
 .../components/chat-full-page-header.hbs      | 22 +++++++++----------
 .../assets/svg-icons/discourse-additional.svg |  3 +++
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rb
index 49bcb6939ab..65a15861721 100644
--- a/lib/svg_sprite.rb
+++ b/lib/svg_sprite.rb
@@ -72,6 +72,7 @@ module SvgSprite
         discourse-emojis
         discourse-expand
         discourse-other-tab
+        discourse-threads
         download
         ellipsis-h
         ellipsis-v
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/thread-list-button.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/thread-list-button.hbs
index 9c885d733e3..99d59acadd4 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/thread-list-button.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/thread-list-button.hbs
@@ -5,5 +5,5 @@
   class="open-thread-list-btn btn btn-flat"
   {{on "click" this.stopPropagation}}
 >
-  {{d-icon "comments"}}
+  {{d-icon "discourse-threads"}}
 </LinkTo>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-full-page-header.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-full-page-header.hbs
index 108ddd3b059..5c070e12547 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-full-page-header.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-full-page-header.hbs
@@ -31,17 +31,6 @@
 
       {{#if (or @channel.threadingEnabled this.site.desktopView)}}
         <div class="chat-full-page-header__right-actions">
-          {{#if @channel.threadingEnabled}}
-            <LinkTo
-              @route="chat.channel.threads"
-              @models={{@channel.routeModels}}
-              title={{i18n "chat.threads.list"}}
-              class="open-thread-list-btn btn btn-flat"
-            >
-              {{d-icon "comments"}}
-            </LinkTo>
-          {{/if}}
-
           {{#if this.site.desktopView}}
             <DButton
               @icon="discourse-compress"
@@ -50,6 +39,17 @@
               @action={{@onCloseFullScreen}}
             />
           {{/if}}
+
+          {{#if @channel.threadingEnabled}}
+            <LinkTo
+              @route="chat.channel.threads"
+              @models={{@channel.routeModels}}
+              title={{i18n "chat.threads.list"}}
+              class="open-thread-list-btn btn btn-flat"
+            >
+              {{d-icon "discourse-threads"}}
+            </LinkTo>
+          {{/if}}
         </div>
       {{/if}}
     </div>
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index 38ec0f46099..c05cb52f816 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -53,4 +53,7 @@ Additional SVG icons
       </clipPath>
     </defs>
   </symbol>
+  <symbol id="discourse-threads" viewBox="0 0 16 17">
+    <path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M5 0L4.57143 3H1V4H4.42857L3.57143 10H0V11H3.42857L3 14L3.98995 14.1414L4.43872 11H7V10H4.58158L5.43872 4H11.4286L11 7H12.0102L12.4387 4H16V3H12.5816L12.9899 0.141421L12 0L11.5714 3H5.58158L5.98995 0.141421L5 0ZM8 13.5V9C8 8.44772 8.44771 8 9 8H15C15.5523 8 16 8.44771 16 9V13.5C16 14.0523 15.5523 14.5 15 14.5H12.1194C11.5042 15.2014 10.396 16.3544 10.0417 16C9.97944 15.9223 9.99982 15.0667 10.0206 14.5H9C8.44771 14.5 8 14.0523 8 13.5Z"/>
+  </symbol>
 </svg>