status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: timezone offset for today was missing

This commit is contained in:
Eric Dvorsak 2017-09-06 02:34:20 +02:00 committed by Roman Volosovskyi
parent 36d1568a76
commit de9905a14e
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/status_im/utils/datetime.cljs
View File

@ -25,16 +25,13 @@
([ms] ([ms]
(to-short-str ms #(unparse (formatters :hour-minute) %))) (to-short-str ms #(unparse (formatters :hour-minute) %)))
([ms today-format-fn] ([ms today-format-fn]
(let [date (from-long ms) (let [date (from-long ms)
local (plus date time-zone-offset) local (plus date time-zone-offset)
today-date (t/today) today (t/today-at-midnight)
today (date-time (t/year today-date) yesterday (plus today (days -1))]
(t/month today-date)
(t/day today-date))
yesterday (plus today (days -1))]
(cond (cond
(before? local yesterday) (unparse (formatter "dd MMM hh:mm") local) (before? date yesterday) (unparse (formatter "dd MMM hh:mm") local)
(before? local today) (label :t/datetime-yesterday) (before? date today) (label :t/datetime-yesterday)
:else (today-format-fn local))))) :else (today-format-fn local)))))
(defn day-relative [ms] (defn day-relative [ms]