Merge pull request #13 from waytohealth/HF-7173

[WTH-7173]
waytohealth · Sep 17, 2024 · 064feda · 064feda
2 parents 88eabdb + dbefc9c
commit 064feda
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/MessageView.vue b/src/components/MessageView.vue
@@ -5,7 +5,7 @@
     </div>
     <div v-for="(msgs, date) in messagesByDate" :key="date">
       <div class="date">
-        {{ inboxHelper.formatDate(date) }}
+        {{ inboxHelper.formatDate(date, false) }}
       </div>
 
       <div v-for="msg in msgs" :key="msg.id">

diff --git a/src/helpers/inbox.js b/src/helpers/inbox.js
@@ -54,8 +54,12 @@ let helper = {
     let datetime = msg.sent_at || msg.created_at;
     return dayjs(datetime).tz(this.tz).format('dddd, D MMMM YYYY – h:mm:ss A');
   },
-  formatDate: function(date) {
-    return dayjs(date).tz(this.tz).format('~ dddd, D MMMM YYYY ~');
+  formatDate: function(date, applyTz = true) {
+    if (applyTz) {
+      return dayjs(date).tz(this.tz).format('~ dddd, D MMMM YYYY ~');
+    }
+
+    return dayjs(date).format('~ dddd, D MMMM YYYY ~');
   },
   formatNumber: function(number) {
     // +12345678901 -> 234-567-8901