Merge branch 'main' into fix/vote-button-no-spinners-1761

diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx
index 29075b975a36b35afd624a5d3cffda29c7a928a8..a4ac29268559589b813dcbbef132cc1f19352e2b 100644 (file)
--- a/src/shared/components/common/markdown-textarea.tsx
+++ b/src/shared/components/common/markdown-textarea.tsx
@@ -702,18 +702,20 @@ export class MarkdownTextArea extends Component<
   quoteInsert() {
     const textarea: any = document.getElementById(this.id);
     const selectedText = window.getSelection()?.toString();
-    const { content } = this.state;
+    let { content } = this.state;
     if (selectedText) {
       const quotedText =
         selectedText
           .split("\n")
           .map(t => `> ${t}`)
           .join("\n") + "\n\n";
+
       if (!content) {
-        this.setState({ content: "" });
+        content = "";
       } else {
-        this.setState({ content: `${content}\n` });
+        content = `${content}\n\n`;
       }
+
       this.setState({
         content: `${content}${quotedText}`,
       });

diff --git a/src/shared/components/community/sidebar.tsx b/src/shared/components/community/sidebar.tsx
index fcb0dad7ffb1bcfe27a9450b782413d11bb7448c..0b6f8e1bf22433cc5726b435bbec23ac587b7a4d 100644 (file)
--- a/src/shared/components/community/sidebar.tsx
+++ b/src/shared/components/community/sidebar.tsx
@@ -258,7 +258,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
             <Spinner />
           ) : (
             <>
-              <Icon icon="check" classes="icon-inline text-success me-1" />
+              <Icon icon="check" classes="icon-inline me-1" />
               {I18NextService.i18n.t("joined")}
             </>
           )}