From 894d3a7c141b29a06549154ff19111db3bfa0c1b Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Thu, 25 Mar 2021 14:14:28 +1000
Subject: [PATCH 1/4] Add "hide email" option for Sends

---
 src/_locales/en/messages.json               |  6 ++++++
 src/popup/send/send-add-edit.component.html | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 5c18dfebd06..6b5ce0a5f22 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1693,5 +1693,11 @@
   },
   "dateParsingError": {
     "message": "There was an error saving your deletion and expiration dates."
+  },
+  "hideEmail": {
+    "message": "Hide my email address from receipients."
+  },
+  "sendOptionsPolicyInEffect": {
+    "message": "One or more organization policies are affecting your Send options."
   }
 }
diff --git a/src/popup/send/send-add-edit.component.html b/src/popup/send/send-add-edit.component.html
index 3d0a86285de..6eccd3a05c4 100644
--- a/src/popup/send/send-add-edit.component.html
+++ b/src/popup/send/send-add-edit.component.html
@@ -18,6 +18,9 @@
         <app-callout type="warning" title="{{'sendDisabled' | i18n}}" *ngIf="disableSend">
             {{'sendDisabledWarning' | i18n}}
         </app-callout>
+        <app-callout type="info" *ngIf="disableHideEmail && !disableSend">
+            {{'sendOptionsPolicyInEffect' | i18n}}
+        </app-callout>
         <!-- File Warning -->
         <app-callout type="warning" icon="fa fa-external-link fa-rotate-270 fa-fw" [clickable]="true"
             title="{{'sendFileCalloutHeader' | i18n}}"
@@ -289,6 +292,16 @@
                     </div>
                 </div>
             </div>
+            <!-- Hide Email -->
+            <div class="box">
+                <div class="box-content">
+                    <div class="box-content-row box-content-row-checkbox" appBoxRow>
+                        <label for="hideEmail">{{'hideEmail' | i18n}}</label>
+                        <input id="hideEmail" type="checkbox" name="HideEmail" [(ngModel)]="send.hideEmail"
+                            [disabled]="(disableHideEmail && !send.hideEmail) || disableSend">
+                    </div>
+                </div>
+            </div>
         </ng-container>
         <!-- Delete -->
         <div class="box list" *ngIf="editMode">

From 7bc9d1ece7a6ee1d7fde2497db2d0053b7fb74f3 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Thu, 25 Mar 2021 14:34:21 +1000
Subject: [PATCH 2/4] Move "hide email" control

---
 src/popup/send/send-add-edit.component.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/popup/send/send-add-edit.component.html b/src/popup/send/send-add-edit.component.html
index 6eccd3a05c4..2aa1adda5e1 100644
--- a/src/popup/send/send-add-edit.component.html
+++ b/src/popup/send/send-add-edit.component.html
@@ -282,16 +282,6 @@
                     {{'sendNotesDesc' | i18n}}
                 </div>
             </div>
-            <!-- Disable Send -->
-            <div class="box">
-                <div class="box-content">
-                    <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                        <label for="disableSend">{{'sendDisableDesc' | i18n}}</label>
-                        <input id="disableSend" type="checkbox" name="DisableSend" [(ngModel)]="send.disabled"
-                            [disabled]="disableSend">
-                    </div>
-                </div>
-            </div>
             <!-- Hide Email -->
             <div class="box">
                 <div class="box-content">
@@ -302,6 +292,16 @@
                     </div>
                 </div>
             </div>
+            <!-- Disable Send -->
+            <div class="box">
+                <div class="box-content">
+                    <div class="box-content-row box-content-row-checkbox" appBoxRow>
+                        <label for="disableSend">{{'sendDisableDesc' | i18n}}</label>
+                        <input id="disableSend" type="checkbox" name="DisableSend" [(ngModel)]="send.disabled"
+                            [disabled]="disableSend">
+                    </div>
+                </div>
+            </div>
         </ng-container>
         <!-- Delete -->
         <div class="box list" *ngIf="editMode">

From fce6cf0ceb46bb1e02d2ae6e7bc2b245399802a2 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Thu, 25 Mar 2021 14:55:33 +1000
Subject: [PATCH 3/4] Fix typo

---
 src/_locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 6b5ce0a5f22..6d0230f75dc 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1695,7 +1695,7 @@
     "message": "There was an error saving your deletion and expiration dates."
   },
   "hideEmail": {
-    "message": "Hide my email address from receipients."
+    "message": "Hide my email address from recipients."
   },
   "sendOptionsPolicyInEffect": {
     "message": "One or more organization policies are affecting your Send options."

From 1ed113b5e2c38e74cf3516712966a8cae75b22c5 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Fri, 26 Mar 2021 08:29:00 +1000
Subject: [PATCH 4/4] update jslib

---
 jslib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jslib b/jslib
index 7f3bbd6e514..07355694792 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 7f3bbd6e514585750477f6b5f27e3d996c24902e
+Subproject commit 07355694792999042e6373ebd1b3571329a969cc