From 2a2d15e83bc69cd2a3157b25be9f17257a98ed4f Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Thu, 25 Mar 2021 09:23:58 +1000
Subject: [PATCH] Minor UI tweaks

---
 .../organizations/manage/policy-edit.component.html |  2 +-
 src/app/send/access.component.html                  |  2 +-
 src/app/send/add-edit.component.html                |  5 ++++-
 src/locales/en/messages.json                        | 13 ++++++++-----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/app/organizations/manage/policy-edit.component.html b/src/app/organizations/manage/policy-edit.component.html
index 91e5c81d..97a4652b 100644
--- a/src/app/organizations/manage/policy-edit.component.html
+++ b/src/app/organizations/manage/policy-edit.component.html
@@ -153,7 +153,7 @@
                     </app-callout>
                     <div class="form-check">
                         <input class="form-check-input" type="checkbox" id="sendDisableHideEmail" [(ngModel)]="sendDisableHideEmail"
-                            name="SendDisableHideEmail">
+                            name="SendDisableHideEmail" [disabled]="!enabled">
                         <label class="form-check-label" for="sendDisableHideEmail">{{'disableHideEmail' | i18n}}</label>
                     </div>
                 </ng-container>
diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html
index 93006d0a..6e33504a 100644
--- a/src/app/send/access.component.html
+++ b/src/app/send/access.component.html
@@ -6,7 +6,7 @@
         <div class="col-12 text-center" *ngIf="creatorIdentifier != null">
             <p>{{'sendCreatorIdentifier' | i18n: creatorIdentifier }}</p>
         </div>
-        <div class="col-8 text-center" *ngIf="creatorIdentifier == null && !loading && !unavailable">
+        <div class="col-8" *ngIf="creatorIdentifier == null && !loading && !unavailable">
             <app-callout type="warning" title="{{'warning' | i18n}}">
                 {{'viewSendHiddenEmailWarning' | i18n }} <a href="https://bitwarden.com/help/article/receive-send/">{{'learnMore' | i18n}}</a>.
             </app-callout>
diff --git a/src/app/send/add-edit.component.html b/src/app/send/add-edit.component.html
index 1f386087..d479bed2 100644
--- a/src/app/send/add-edit.component.html
+++ b/src/app/send/add-edit.component.html
@@ -13,7 +13,10 @@
                     <span>{{'sendDisabledWarning' | i18n}}</span>
                 </app-callout>
                 <app-callout *ngIf="!disableSend && disableHideEmail">
-                    <span>{{'sendDisableHideEmailWarning' | i18n}}</span>
+                    <span>{{'sendOptionsPolicyInEffect' | i18n}}</span>
+                    <ul class="mb-0">
+                        <li>{{'sendDisableHideEmailInEffect' | i18n}}</li>
+                    </ul>
                 </app-callout>
                 <div class="row">
                     <div class="col-6 form-group">
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index ba0fe327..5bc6f0ac 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -3417,7 +3417,7 @@
     "message": "Are you sure you want to remove the password?"
   },
   "hideEmail": {
-    "message": "Do not show my email address to the recipients of this Send."
+    "message": "Hide my email address from the recipients of this Send."
   },
   "disableThisSend": {
     "message": "Disable this Send so that no one can access it.",
@@ -3638,10 +3638,6 @@
     "message": "Due to an enterprise policy, you are only able to delete an existing Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
-  "sendDisableHideEmailWarning": {
-    "message": "Due to an enterprise policy, you are not allowed to hide your email address in a Send.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendOptions": {
     "message": "Send Options"
   },
@@ -3655,6 +3651,13 @@
     "message": "Do not allow users to hide their email address when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "sendOptionsPolicyInEffect": {
+    "message": "The following organization policies are currently in effect:"
+  },
+  "sendDisableHideEmailInEffect": {
+    "message": "Users are not allowed to hide their email address when creating or editing a Send.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {