From 382eeaa696687f8efec5d62c0cc7e5534daa3581 Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Tue, 5 Mar 2019 13:17:11 +0100 Subject: [PATCH] Fix datemark calculation not taking into account local time Signed-off-by: Andrea Maria Piana --- src/status_im/utils/datetime.cljs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/status_im/utils/datetime.cljs b/src/status_im/utils/datetime.cljs index 578c8a7e67..55f3844905 100644 --- a/src/status_im/utils/datetime.cljs +++ b/src/status_im/utils/datetime.cljs @@ -1,6 +1,6 @@ (ns status-im.utils.datetime (:require [re-frame.core :as re-frame] - [cljs-time.core :as t :refer [date-time plus days hours before?]] + [cljs-time.core :as t :refer [date-time plus minus days hours before?]] [cljs-time.coerce :refer [from-long to-long from-date]] [cljs-time.format :refer [formatters formatter @@ -80,7 +80,7 @@ (defn- to-str [ms old-fmt-fn yesterday-fmt-fn today-fmt-fn] (let [date (from-long ms) local (plus date time-zone-offset) ; this is wrong, it uses the current timezone offset, regardless of DST - today (t/today-at-midnight) + today (minus (t/today-at-midnight) time-zone-offset) yesterday (plus today (days -1))] (cond (before? date yesterday) (old-fmt-fn local)