diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
index 8b601f45a81..0a2a2dead38 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
@@ -98,7 +98,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
}
get prefixValue() {
- return "hashtag";
+ return "d-chat";
}
get prefixColor() {
@@ -285,7 +285,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
);
assert.strictEqual(
- links[0].children[0].children[0].classList.contains("d-icon-hashtag"),
+ links[0].children[0].children[0].classList.contains("d-icon-d-chat"),
true,
"displays prefix icon"
);
diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index ebfef200260..340c750f388 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -86,7 +86,7 @@ class Wizard
step.add_field(
id: "chat_enabled",
type: "checkbox",
- icon: "comment",
+ icon: "d-chat",
value: SiteSetting.chat_enabled,
)
end
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs
index b25ceb099fd..a3fc5b43b40 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs
@@ -53,7 +53,7 @@
class="chat-channel-title__category-badge"
style={{this.channelColorStyle}}
>
- {{d-icon "hashtag"}}
+ {{d-icon "d-chat"}}
{{#if this.channel.chatable.read_restricted}}
{{d-icon "lock" class="chat-channel-title__restricted-category-icon"}}
{{/if}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-draft-channel-screen.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-draft-channel-screen.hbs
index e64aee7030a..fccac8b872a 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-draft-channel-screen.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-draft-channel-screen.hbs
@@ -8,7 +8,7 @@
@action={{action "onCancelChatDraft"}}
/>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs
index db99a0e053d..36645c2c28b 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs
@@ -3,7 +3,7 @@
tabindex="0"
class={{concat-class "icon btn-flat" (if this.isActive "active")}}
>
- {{d-icon "comment"}}
+ {{d-icon "d-chat"}}
{{#unless this.currentUserInDnD}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/user-card-chat-button.hbs b/plugins/chat/assets/javascripts/discourse/components/user-card-chat-button.hbs
index 2dd02ec8a75..2fdcbb4303c 100644
--- a/plugins/chat/assets/javascripts/discourse/components/user-card-chat-button.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/user-card-chat-button.hbs
@@ -3,6 +3,6 @@
@class="btn-primary user-card-chat-btn"
@action={{action "startChatting"}}
@label="chat.title_capitalized"
- @icon="comment"
+ @icon="d-chat"
/>
{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/user-nav__preferences-chat.hbs b/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/user-nav__preferences-chat.hbs
index 2016996e039..aeeef0a9a5e 100644
--- a/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/user-nav__preferences-chat.hbs
+++ b/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/user-nav__preferences-chat.hbs
@@ -1,6 +1,6 @@
{{#if (or this.model.can_chat this.currentUser.admin)}}
- {{d-icon "comment"}}
+ {{d-icon "d-chat"}}
{{i18n "chat.title_capitalized"}}
{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
index dd3ac70dd3b..da4898ae44b 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
@@ -4,10 +4,13 @@ import { bind } from "discourse-common/utils/decorators";
import { getOwner } from "discourse-common/lib/get-owner";
import { MENTION_KEYWORDS } from "discourse/plugins/chat/discourse/components/chat-message";
import { clearChatComposerButtons } from "discourse/plugins/chat/discourse/lib/chat-composer-buttons";
+import { replaceIcon } from "discourse-common/lib/icon-library";
let _lastForcedRefreshAt;
const MIN_REFRESH_DURATION_MS = 180000; // 3 minutes
+replaceIcon("d-chat", "comment");
+
export default {
name: "chat-setup",
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
index 56fff731a30..54292ef2206 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
@@ -68,7 +68,7 @@ export default {
}
get prefixValue() {
- return "hashtag";
+ return "d-chat";
}
get prefixColor() {
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-user-menu.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-user-menu.js
index ed19441f31f..ca30056fcda 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-user-menu.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-user-menu.js
@@ -69,7 +69,7 @@ export default {
}
get icon() {
- return "comment";
+ return "d-chat";
}
get label() {
@@ -112,7 +112,7 @@ export default {
}
get icon() {
- return "comment";
+ return "d-chat";
}
get count() {
diff --git a/plugins/chat/assets/javascripts/discourse/widgets/chat-mention-notification-item.js b/plugins/chat/assets/javascripts/discourse/widgets/chat-mention-notification-item.js
index 7efebdb2834..beeeb4c34f4 100644
--- a/plugins/chat/assets/javascripts/discourse/widgets/chat-mention-notification-item.js
+++ b/plugins/chat/assets/javascripts/discourse/widgets/chat-mention-notification-item.js
@@ -33,7 +33,7 @@ const chatNotificationItem = {
const title = this.notificationTitle(notificationName, data);
const text = this.text(notificationName, data);
const html = new RawHtml({ html: `${text}
` });
- const contents = [iconNode("comment"), html];
+ const contents = [iconNode("d-chat"), html];
const href = this.url(data);
return h(
diff --git a/plugins/chat/assets/stylesheets/common/chat-drawer.scss b/plugins/chat/assets/stylesheets/common/chat-drawer.scss
index 2ac7495f8f3..8d3abf6d40e 100644
--- a/plugins/chat/assets/stylesheets/common/chat-drawer.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-drawer.scss
@@ -179,7 +179,7 @@ html.rtl {
text-overflow: ellipsis;
}
- .d-icon:not(.d-icon-hashtag) {
+ .d-icon:not(.d-icon-d-chat) {
color: var(--primary-high);
}
.category-hashtag {
diff --git a/plugins/chat/lib/onebox/templates/discourse_chat.mustache b/plugins/chat/lib/onebox/templates/discourse_chat.mustache
index af7955ed903..c0fdf1ff9d4 100644
--- a/plugins/chat/lib/onebox/templates/discourse_chat.mustache
+++ b/plugins/chat/lib/onebox/templates/discourse_chat.mustache
@@ -5,7 +5,7 @@
{{#is_category}}
-
+
{{/is_category}}
{{{channel_name}}}
@@ -42,7 +42,7 @@
{{#is_category}}
-
+
{{/is_category}}
{{#is_topic}}
diff --git a/plugins/chat/plugin.rb b/plugins/chat/plugin.rb
index 1f2f5b81d97..628b05aff98 100644
--- a/plugins/chat/plugin.rb
+++ b/plugins/chat/plugin.rb
@@ -17,7 +17,6 @@ register_asset "stylesheets/mobile/index.scss", :mobile
register_svg_icon "comments"
register_svg_icon "comment-slash"
-register_svg_icon "hashtag"
register_svg_icon "lock"
register_svg_icon "file-audio"
register_svg_icon "file-video"
diff --git a/plugins/chat/spec/plugin_spec.rb b/plugins/chat/spec/plugin_spec.rb
index 9d2a5d82cd0..821ea4385bc 100644
--- a/plugins/chat/spec/plugin_spec.rb
+++ b/plugins/chat/spec/plugin_spec.rb
@@ -178,7 +178,7 @@ describe Chat do
-
+
#{chat_channel.name}
@@ -210,7 +210,7 @@ describe Chat do
-
+
#{chat_channel.name}
diff --git a/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb b/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb
index 90ae2001d79..b13b9b34e01 100644
--- a/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb
+++ b/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
visit("/")
expect(sidebar_page.channels_section).to have_css(
- ".sidebar-section-link-#{channel_1.slug} .sidebar-section-link-prefix svg.prefix-icon.d-icon-hashtag",
+ ".sidebar-section-link-#{channel_1.slug} .sidebar-section-link-prefix svg.prefix-icon.d-icon-d-chat",
)
end