Merge pull request #512 from Real-Dev-Squad/develop

Dev to main sync
Real-Dev-Squad · Oct 30, 2023 · 55898fe · 55898fe
2 parents 046c2d1 + 83f4a06
commit 55898fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/components/task/multiple-extension-form.hbs b/app/components/task/multiple-extension-form.hbs
@@ -80,7 +80,10 @@
                   }}approved{{else}}denied{{/if}}
                   by
                   {{extension.reviewedBy}}
-                  {{convertDate (array extension.timestamp) end_date=0}}.
+                  {{#if extension.reviewedAt}}{{convertDate
+                      (array extension.reviewedAt)
+                      end_date=0
+                    }}{{/if}}
                 </p>
               {{/if}}
             {{/each}}

diff --git a/tests/fixtures/extension-requests.js b/tests/fixtures/extension-requests.js
@@ -10,6 +10,7 @@ const extensionRequests = [
     timestamp: 1673784012,
     assignee: 'ivinayakg',
     reviewedBy: 'Joy Gupta',
+    reviewedAt: 1698555808,
   },
   {
     oldEndsOn: 57658796,