feat: Clean up the Create Private Message page a bit

src/shared/components/common/icon.tsx

@@ -35,6 +35,7 @@ export class Icon extends Component<IconProps, any> {
 
 interface SpinnerProps {
   large?: boolean;
+  className?: string;
 }
 
 export class Spinner extends Component<SpinnerProps, any> {
@@ -46,7 +47,9 @@ export class Spinner extends Component<SpinnerProps, any> {
     return (
       <Icon
         icon="spinner"
-        classes={`spin ${this.props.large && "spinner-large"}`}
+        classes={classNames("spin", this.props.className, {
+          "spinner-large": this.props.large,
+        })}
       />
     );
   }

src/shared/components/common/markdown-textarea.tsx

@@ -272,19 +272,6 @@ export class MarkdownTextArea extends Component<
             {/* A flex expander */}
             <div className="flex-grow-1"></div>
 
-            {this.props.buttonTitle && (
-              <button
-                type="submit"
-                className="btn btn-sm btn-secondary ms-2"
-                disabled={this.isDisabled}
-              >
-                {this.state.loading ? (
-                  <Spinner />
-                ) : (
-                  <span>{this.props.buttonTitle}</span>
-                )}
-              </button>
-            )}
             {this.props.replyType && (
               <button
                 type="button"
@@ -294,8 +281,9 @@ export class MarkdownTextArea extends Component<
                 {I18NextService.i18n.t("cancel")}
               </button>
             )}
-            {this.state.content && (
             <button
+              type="button"
+              disabled={!this.state.content ? true : false}
               className={`btn btn-sm btn-secondary ms-2 ${
                 this.state.previewMode && "active"
               }`}
@@ -305,6 +293,15 @@ export class MarkdownTextArea extends Component<
                 ? I18NextService.i18n.t("edit")
                 : I18NextService.i18n.t("preview")}
             </button>
+            {this.props.buttonTitle && (
+              <button
+                type="submit"
+                className="btn btn-sm btn-secondary ms-2"
+                disabled={this.isDisabled}
+              >
+                {this.state.loading && <Spinner className="me-1" />}
+                {this.props.buttonTitle}
+              </button>
             )}
           </div>
         </div>

src/shared/components/private_message/create-private-message.tsx

@@ -115,7 +115,9 @@ export class CreatePrivateMessage extends Component<
         return (
           <div className="row">
             <div className="col-12 col-lg-6 offset-lg-3 mb-4">
-              <h5>{I18NextService.i18n.t("create_private_message")}</h5>
+              <h1 className="h4">
+                {I18NextService.i18n.t("create_private_message")}
+              </h1>
               <PrivateMessageForm
                 onCreate={this.handlePrivateMessageCreate}
                 recipient={res.person_view.person}

src/shared/components/private_message/private-message-form.tsx

@@ -11,7 +11,7 @@ import {
 import { relTags } from "../../config";
 import { I18NextService } from "../../services";
 import { setupTippy } from "../../tippy";
-import { Icon, Spinner } from "../common/icon";
+import { Icon } from "../common/icon";
 import { MarkdownTextArea } from "../common/markdown-textarea";
 import NavigationPrompt from "../common/navigation-prompt";
 import { PersonListing } from "../person/person-listing";
@@ -28,7 +28,6 @@ interface PrivateMessageFormState {
   content?: string;
   loading: boolean;
   previewMode: boolean;
-  showDisclaimer: boolean;
   submitted: boolean;
 }
 
@@ -39,7 +38,6 @@ export class PrivateMessageForm extends Component<
   state: PrivateMessageFormState = {
     loading: false,
     previewMode: false,
-    showDisclaimer: false,
     content: this.props.privateMessageView
       ? this.props.privateMessageView.private_message.content
       : undefined,
@@ -71,56 +69,26 @@ export class PrivateMessageForm extends Component<
 
   render() {
     return (
-      <form
+      <form className="private-message-form">
-        className="private-message-form"
-        onSubmit={linkEvent(this, this.handlePrivateMessageSubmit)}
-      >
         <NavigationPrompt
           when={
             !this.state.loading && !!this.state.content && !this.state.submitted
           }
         />
         {!this.props.privateMessageView && (
-          <div className="mb-3 row">
+          <div className="mb-3 row align-items-baseline">
             <label className="col-sm-2 col-form-label">
               {capitalizeFirstLetter(I18NextService.i18n.t("to"))}
             </label>
 
-            <div className="col-sm-10 form-control-plaintext">
+            <div className="col-sm-10">
               <PersonListing person={this.props.recipient} />
             </div>
           </div>
         )}
-        <div className="mb-3 row">
+        <div className="alert alert-warning small">
-          <label className="col-sm-2 col-form-label">
+          <Icon icon="alert-triangle" classes="icon-inline me-1" />
-            {I18NextService.i18n.t("message")}
+          <T parent="span" i18nKey="private_message_disclaimer">
-            <button
-              className="btn btn-link text-warning d-inline-block"
-              onClick={linkEvent(this, this.handleShowDisclaimer)}
-              data-tippy-content={I18NextService.i18n.t(
-                "private_message_disclaimer"
-              )}
-              aria-label={I18NextService.i18n.t("private_message_disclaimer")}
-            >
-              <Icon icon="alert-triangle" classes="icon-inline" />
-            </button>
-          </label>
-          <div className="col-sm-10">
-            <MarkdownTextArea
-              initialContent={this.state.content}
-              onContentChange={this.handleContentChange}
-              allLanguages={[]}
-              siteLanguages={[]}
-              hideNavigationWarnings
-            />
-          </div>
-        </div>
-
-        {this.state.showDisclaimer && (
-          <div className="mb-3 row">
-            <div className="offset-sm-2 col-sm-10">
-              <div className="alert alert-danger" role="alert">
-                <T i18nKey="private_message_disclaimer">
             #
             <a
               className="alert-link"
@@ -131,37 +99,39 @@ export class PrivateMessageForm extends Component<
             </a>
           </T>
         </div>
-            </div>
-          </div>
-        )}
         <div className="mb-3 row">
-          <div className="offset-sm-2 col-sm-10">
+          <label className="col-sm-2 col-form-label">
-            <button
+            {I18NextService.i18n.t("message")}
-              type="submit"
+          </label>
-              className="btn btn-secondary me-2"
+          <div className="col-sm-10">
-              disabled={this.state.loading}
+            <MarkdownTextArea
-            >
+              onSubmit={() => {
-              {this.state.loading ? (
+                this.handlePrivateMessageSubmit(this, event);
-                <Spinner />
+              }}
-              ) : this.props.privateMessageView ? (
+              initialContent={this.state.content}
-                capitalizeFirstLetter(I18NextService.i18n.t("save"))
+              onContentChange={this.handleContentChange}
-              ) : (
+              allLanguages={[]}
-                capitalizeFirstLetter(I18NextService.i18n.t("send_message"))
+              siteLanguages={[]}
-              )}
+              hideNavigationWarnings
-            </button>
+              buttonTitle={
+                this.props.privateMessageView
+                  ? capitalizeFirstLetter(I18NextService.i18n.t("save"))
+                  : capitalizeFirstLetter(I18NextService.i18n.t("send_message"))
+              }
+            />
+          </div>
+        </div>
+
+        <div className="mb-3 d-flex justify-content-end">
           {this.props.privateMessageView && (
             <button
               type="button"
-                className="btn btn-secondary"
+              className="btn btn-secondary w-auto"
               onClick={linkEvent(this, this.handleCancel)}
             >
               {I18NextService.i18n.t("cancel")}
             </button>
           )}
-            <ul className="d-inline-block float-right list-inline mb-1 text-muted font-weight-bold">
-              <li className="list-inline-item"></li>
-            </ul>
-          </div>
         </div>
       </form>
     );
@@ -200,8 +170,4 @@ export class PrivateMessageForm extends Component<
     event.preventDefault();
     i.setState({ previewMode: !i.state.previewMode });
   }
-
-  handleShowDisclaimer(i: PrivateMessageForm) {
-    i.setState({ showDisclaimer: !i.state.showDisclaimer });
-  }
 }