From c09c27ccee12bfbc0ce13c8bbc668f52ce2a30c1 Mon Sep 17 00:00:00 2001
From: Overtorment <overtorment@gmail.com>
Date: Tue, 23 Apr 2019 19:49:00 +0100
Subject: [PATCH] FIX: rare crash on app startup

---
 loc/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/loc/index.js b/loc/index.js
index 41577ac8b..69bed65fc 100644
--- a/loc/index.js
+++ b/loc/index.js
@@ -24,6 +24,7 @@ dayjs.extend(relativeTime);
         require('dayjs/locale/it');
         break;
       case 'zh_cn':
+        lang = 'zh-cn';
         require('dayjs/locale/zh-cn');
         break;
       case 'ru':
@@ -118,7 +119,14 @@ strings.transactionTimeToReadable = time => {
   if (time === 0) {
     return strings._.never;
   }
-  return dayjs(time).fromNow();
+  let ret;
+  try {
+    ret = dayjs(time).fromNow();
+  } catch (_) {
+    console.warn('incorrect locale set for dayjs');
+    return time;
+  }
+  return ret;
 };
 
 function removeTrailingZeros(value) {