From 57e0d17cbc3d3cbfcbdeff9ef11a363a5511b3bc Mon Sep 17 00:00:00 2001
From: Abhinav Adduri <abhinadduri@gmail.com>
Date: Tue, 25 Jul 2017 10:58:18 -0700
Subject: [PATCH 1/2] if the download card is pressed, the expired card shows
 up properly

---
 frontend/src/download.js     | 15 +++++++++------
 frontend/src/fileReceiver.js |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/src/download.js b/frontend/src/download.js
index b0e05fe9..b86f6ff1 100644
--- a/frontend/src/download.js
+++ b/frontend/src/download.js
@@ -144,12 +144,15 @@ $(document).ready(function() {
           cd6: err
         });
 
-        document.l10n.formatValue('expiredPageHeader').then(translated => {
-          $('.title').text(translated);
-        });
-        $('#download-btn').attr('hidden', true);
-        $('#expired-img').removeAttr('hidden');
-        console.log('The file has expired, or has already been deleted.');
+        if (err.message === 'notfound') {
+          location.reload();
+        } else {
+          document.l10n.formatValue('expiredPageHeader').then(translated => {
+            $('.title').text(translated);
+          });
+          $('#download-btn').attr('hidden', true);
+          $('#expired-img').removeAttr('hidden');
+        }
         return;
       })
       .then(([decrypted, fname]) => {
diff --git a/frontend/src/fileReceiver.js b/frontend/src/fileReceiver.js
index 882dcb2b..d0854e1c 100644
--- a/frontend/src/fileReceiver.js
+++ b/frontend/src/fileReceiver.js
@@ -20,7 +20,7 @@ class FileReceiver extends EventEmitter {
         xhr.onload = function(event) {
           if (xhr.status === 404) {
             reject(
-              new Error('The file has expired, or has already been deleted.')
+              new Error('notfound')
             );
             return;
           }

From 8f66db229507a95009e6efcfdc0d89d49d5eca9c Mon Sep 17 00:00:00 2001
From: Abhinav Adduri <abhinadduri@gmail.com>
Date: Tue, 25 Jul 2017 11:28:33 -0700
Subject: [PATCH 2/2] changed from expired to errored

---
 frontend/src/download.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/download.js b/frontend/src/download.js
index b86f6ff1..0a90f3dc 100644
--- a/frontend/src/download.js
+++ b/frontend/src/download.js
@@ -147,7 +147,7 @@ $(document).ready(function() {
         if (err.message === 'notfound') {
           location.reload();
         } else {
-          document.l10n.formatValue('expiredPageHeader').then(translated => {
+          document.l10n.formatValue('errorPageHeader').then(translated => {
             $('.title').text(translated);
           });
           $('#download-btn').attr('hidden', true);