From d8aae1358b61cdd043cb0474095b3c879da3888e Mon Sep 17 00:00:00 2001
From: Addison Beck <abeck@bitwarden.com>
Date: Tue, 9 Mar 2021 11:00:45 -0500
Subject: [PATCH] Send Date Fallback QA Fixes (#879)

* added expiration date time autopopulation and new messages

* updated jslib
---
 jslib                                |  2 +-
 src/app/send/add-edit.component.html |  2 +-
 src/locales/en/messages.json         | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/jslib b/jslib
index 125de0dd470..f29afc7cf7b 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 125de0dd4704909f036dbad374a4cd71719de09e
+Subproject commit f29afc7cf7bbd514d07c0354b3c45491dcae3c14
diff --git a/src/app/send/add-edit.component.html b/src/app/send/add-edit.component.html
index 6b927d4c2f2..69e529dca53 100644
--- a/src/app/send/add-edit.component.html
+++ b/src/app/send/add-edit.component.html
@@ -141,7 +141,7 @@
                                 <div class="d-flex justify-content-around" *ngIf="!isDateTimeLocalSupported">
                                     <input id="expirationDateCustomFallback" class="form-control mt-1" type="date"
                                         name="ExpirationDateFallback" [(ngModel)]="expirationDateFallback" [required]="!editMode"
-                                        placeholder="MM/DD/YYYY" [readOnly]="disableSend" data-date-format="mm/dd/yyyy">
+                                        placeholder="MM/DD/YYYY" [readOnly]="disableSend" data-date-format="mm/dd/yyyy" (change)="expirationDateFallbackChanged()">
                                         <select *ngIf="isSafari" id="expirationTimeCustomFallback" class="form-control mt-1 ml-1" [required]="!editMode"
                                             [(ngModel)]="safariExpirationTime" name="SafariExpirationTime">
                                             <option *ngFor="let o of safariExpirationTimeOptions" [ngValue]="o.military">{{o.standard}}</option>
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 27805bd27d3..7f88d2b8e02 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -3747,5 +3747,20 @@
         "example": "An email address"
       }
     }
+  },
+  "expirationDateIsInvalid": {
+    "message": "The expiration date provided is not valid."
+  },
+  "deletionDateIsInvalid": {
+    "message": "The deletion date provided is not valid."
+  },
+  "expirationDateAndTimeRequired": {
+    "message": "An expiration date and time are required."
+  },
+  "deletionDateAndTimeRequired": {
+    "message": "A deletion date and time are required."
+  },
+  "dateParsingError": {
+    "message": "There was an error saving your deletion and expiration dates."
   }
 }