From 23679ac5b4852a42175fa772b3134a35c18a4df0 Mon Sep 17 00:00:00 2001 From: yenda Date: Wed, 3 Oct 2018 01:19:23 +0200 Subject: [PATCH] [fix #6087] error on empty messages add a guard so that `right-to-left-text?` function doesn't throw an error on empty content future empty messages aren't going to pass validation Signed-off-by: yenda --- src/status_im/ui/screens/chat/message/message.cljs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/status_im/ui/screens/chat/message/message.cljs b/src/status_im/ui/screens/chat/message/message.cljs index 534c68f2c0..e562922f3b 100644 --- a/src/status_im/ui/screens/chat/message/message.cljs +++ b/src/status_im/ui/screens/chat/message/message.cljs @@ -52,8 +52,9 @@ (def rtl-characters-regex #"[^\u0591-\u06EF\u06FA-\u07FF\u200F\u202B\u202E\uFB1D-\uFDFD\uFE70-\uFEFC]*?[\u0591-\u06EF\u06FA-\u07FF\u200F\u202B\u202E\uFB1D-\uFDFD\uFE70-\uFEFC]") (defn right-to-left-text? [content] - (let [char (first content)] - (re-matches rtl-characters-regex char))) + (when-not (empty? content) + (let [char (first content)] + (re-matches rtl-characters-regex char)))) (defview message-timestamp [t justify-timestamp? outgoing command? content] (when-not command?