From baeeb135b9a5e4a409aacc8b90d182e4a32ee285 Mon Sep 17 00:00:00 2001 From: tbenr Date: Mon, 6 Jan 2020 11:34:37 +0100 Subject: [PATCH] fixes #9592 Signed-off-by: Andrey Shovkoplyas --- .../ui/screens/contacts_list/views.cljs | 17 +++++++++-------- src/status_im/ui/screens/home/filter/views.cljs | 8 ++------ test/cljs/status_im/test/i18n.cljs | 1 - translations/ar.json | 1 - translations/en.json | 1 - translations/fr.json | 1 - translations/it.json | 1 - translations/ja.json | 1 - translations/ko.json | 1 - translations/ru.json | 1 - translations/zh.json | 1 - translations/zh_Hans_CN.json | 1 - translations/zh_hans.json | 1 - 13 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/status_im/ui/screens/contacts_list/views.cljs b/src/status_im/ui/screens/contacts_list/views.cljs index 3c9863492d..bf4f5151eb 100644 --- a/src/status_im/ui/screens/contacts_list/views.cljs +++ b/src/status_im/ui/screens/contacts_list/views.cljs @@ -21,14 +21,15 @@ [react/view {:flex 1} [topbar/topbar {:title :t/contacts}] [react/scroll-view {:flex 1} - [list.views/big-list-item - {:style {:margin-vertical 16} - :text (i18n/label :t/blocked-users) - :icon :main-icons/cancel - :icon-color colors/red - :accessibility-label :blocked-users-list-button - :accessory-value blocked-contacts-count - :action-fn #(re-frame/dispatch [:navigate-to :blocked-users-list])}] + (when (pos? blocked-contacts-count) + [list.views/big-list-item + {:style {:margin-vertical 16} + :text (i18n/label :t/blocked-users) + :icon :main-icons/cancel + :icon-color colors/red + :accessibility-label :blocked-users-list-button + :accessory-value blocked-contacts-count + :action-fn #(re-frame/dispatch [:navigate-to :blocked-users-list])}]) [list.views/flat-list {:data contacts :key-fn :address diff --git a/src/status_im/ui/screens/home/filter/views.cljs b/src/status_im/ui/screens/home/filter/views.cljs index d3ee9207d6..ff1e01ff71 100644 --- a/src/status_im/ui/screens/home/filter/views.cljs +++ b/src/status_im/ui/screens/home/filter/views.cljs @@ -114,9 +114,7 @@ [list/section-list {:style {:margin-bottom -35} :sections [{:title :t/chats - :data chats} - {:title :t/messages - :data []}] + :data chats}] :key-fn first ;; true by default on iOS :stickySectionHeadersEnabled false @@ -129,9 +127,7 @@ (fn [{:keys [title data]}] (when (empty? data) [list/big-list-item - {:text (i18n/label (if (= title "messages") - :t/messages-search-coming-soon - :t/no-result)) + {:text (i18n/label :t/no-result) :text-color colors/gray :hide-chevron? true :action-fn #() diff --git a/test/cljs/status_im/test/i18n.cljs b/test/cljs/status_im/test/i18n.cljs index fb2fa99848..c0bfd07ea6 100644 --- a/test/cljs/status_im/test/i18n.cljs +++ b/test/cljs/status_im/test/i18n.cljs @@ -651,7 +651,6 @@ :message-reply :message-syncing :messages - :messages-search-coming-soon :might-break :migrations-erase-multiaccounts-data-button :migrations-failed-content diff --git a/translations/ar.json b/translations/ar.json index a9bf20c004..6a33bb2314 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -698,7 +698,6 @@ "message-reply": "الرد", "message-syncing": "لم يتم إرسال الرسالة", "messages": "رسائل", - "messages-search-coming-soon": "البحث في سجل الرسائل قريبًا", "might-break": "قد كسر بعض ÐApps", "migrations-erase-multiaccounts-data-button": "مسح db متعدد الحسابات", "migrations-failed-content": "{{message}} \n إصدار المخطط: الأولي {{initial-version}} ، الحالي {{current-version}} ، {{last-version}} \n\n يرجى إعلامنا بهذه المشكلة على الدردشة العامة #status. إذا قمت بالضغط على زر \"إلغاء\" ، فلن يحدث شيء. إذا قمت بالضغط على زر \" {{erase-multiaccounts-data-button-text}} \" ، فستتم إزالة db multiaccount وستكون قادرًا على إلغاء قفل الحساب المتعدد. سيتم فقد جميع بيانات الحساب المتعدد.", diff --git a/translations/en.json b/translations/en.json index 2c9d84e990..e3f3a4f2a9 100644 --- a/translations/en.json +++ b/translations/en.json @@ -660,7 +660,6 @@ "message-reply": "Reply", "message-syncing": "Message syncing", "messages": "Messages", - "messages-search-coming-soon": "Searching message history coming soon", "might-break": "Might break some ÐApps", "migrations-erase-multiaccounts-data-button": "Erase multiaccount's db", "migrations-failed-content": "{{message}}\nschema version: initial {{initial-version}}, current {{current-version}}, last {{last-version}}\n\nPlease let us know about this problem at #status public chat. If you press \"Cancel\" button, nothing will happen. If you press \"{{erase-multiaccounts-data-button-text}}\" button, multiaccount's db will be removed and you will be able to unlock multiaccount. All multiaccount's data will be lost.", diff --git a/translations/fr.json b/translations/fr.json index e85cdd55db..9569469e02 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -666,7 +666,6 @@ "message-reply": "Répondre", "message-syncing": "Synchronisation des messages", "messages": "Messages", - "messages-search-coming-soon": "Recherche de l'historique des messages à venir", "might-break": "Peut casser quelques ÐApps", "migrations-erase-multiaccounts-data-button": "Effacer la base de données du multicompte", "migrations-failed-content": "{{message}} \n version du schéma: initial {{initial-version}} , actuel {{current-version}} , dernier {{last-version}} \n\n Veuillez nous informer de ce problème sur le chat public #status. Si vous appuyez sur le bouton \"Annuler\", rien ne se passera. Si vous appuyez sur le bouton \" {{erase-multiaccounts-data-button-text}} \", la base de données multi-comptes sera supprimée et vous pourrez déverrouiller plusieurs comptes. Toutes les données multi-comptes seront perdues.", diff --git a/translations/it.json b/translations/it.json index 7724bc3d83..5a15e0dfa1 100644 --- a/translations/it.json +++ b/translations/it.json @@ -666,7 +666,6 @@ "message-reply": "Rispondere", "message-syncing": "Sincronizzazione dei messaggi", "messages": "Messaggi", - "messages-search-coming-soon": "Ricerca nella cronologia dei messaggi in arrivo", "might-break": "Potrebbe rompere alcune ÐApps", "migrations-erase-multiaccounts-data-button": "Cancella tutti i tuoi Multi-Account", "migrations-failed-content": "{{message}} \n versione dello schema: iniziale {{initial-version}} , attuale {{current-version}} , ultima {{last-version}} \n\n Fateci sapere questo problema nella chat pubblica di #status. Se si preme il pulsante \"Annulla\", non accadrà nulla. Se premi il pulsante \" {{erase-multiaccounts-data-button-text}} \", il db del Multi-Account verrà rimosso e sarai in grado di sbloccare il Multi-Account. Tutti i dati del Multi-Account andranno persi.", diff --git a/translations/ja.json b/translations/ja.json index 8fa3f6b2da..79994bf625 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -620,7 +620,6 @@ "message-options-cancel": "キャンセル", "message-reply": "返信", "messages": "メッセージ", - "messages-search-coming-soon": "メッセージ履歴の検索は近日公開予定です", "might-break": "いくつかのÐAppsが壊れるかもしれません", "migrations-erase-multiaccounts-data-button": "マルチアカウントのデータベースを消去", "migrations-failed-content": "{{message}}\nスキーマバージョン：初期 {{initial-version}}、現在 {{current-version}}、最終 {{last-version}}\nStatusのパブリックチャットで発生した問題について教えてください。キャンセルを押せば何も発生せず終了します。{{erase-multiaccounts-data-button-text}}ボタンを押すと、マルチアカウントのデータベースが削除され、マルチアカウントをアンロックできます。この場合、全てのマルチアカウントのデータは消失します。", diff --git a/translations/ko.json b/translations/ko.json index fd5da8cc26..18a97b3dd1 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -658,7 +658,6 @@ "message-reply": "답변하기", "message-syncing": "메시지 동기화", "messages": "메시지", - "messages-search-coming-soon": "메시지 기록 검색 기능 개발 중", "might-break": "일부 디앱에 오류를 일으킬 수 있습니다", "migrations-erase-multiaccounts-data-button": "계정 DB 삭제", "migrations-failed-content": "{{message}} \n스키마 버전: 초기 {{initial-version}} , 현재 {{current-version}} , 마지막 {{last-version}} \n\n #status public chat 에서 이 문제에 대해 알려 주시기 바랍니다. \"취소\"버튼을 누르면 원래 상태로 돌아갑니다. \"{{erase-multiaccounts-data-button-text}}\" 버튼을 누르면 계정의 모든 DB가 제거되고 계정을 잠금해제 할 수 있습니다. 이 경우 계정의 모든 데이터가 손실됩니다.", diff --git a/translations/ru.json b/translations/ru.json index 036987557b..117e67ca88 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -658,7 +658,6 @@ "message-reply": "Ответить", "message-syncing": "Синхронизация сообщений", "messages": "Сообщения", - "messages-search-coming-soon": "Поиск истории сообщений будет в ближайшее время", "might-break": "Может сломать некоторые ÐApp", "migrations-erase-multiaccounts-data-button": "Стереть базу данных мультиаккаунта", "migrations-failed-content": "{{message}} \n версия схемы: начальная {{initial-version}}, текущая {{current-version}}, последняя {{last-version}} \n\nПожалуйста, сообщите нам об этой проблеме в #status публичном чате. Если вы нажмете кнопку «Отмена», ничего не произойдет. Если вы нажмете кнопку «{{erase-multiaccounts-data-button-text}}», база данных мультиаккаунта будет удалена, и вы сможете разблокировать мультиаккаунт. Все данные мультиаккаунта будут потеряны.", diff --git a/translations/zh.json b/translations/zh.json index dea47ed762..267e273ecc 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -658,7 +658,6 @@ "message-reply": "回复", "message-syncing": "消息同步", "messages": "消息", - "messages-search-coming-soon": "搜索消息历史记录", "might-break": "可能会破坏一些ÐApp", "migrations-erase-multiaccounts-data-button": "删除多帐户数据", "migrations-failed-content": "{{message}} \n架构版本：初始{{initial-version}} ，当前{{current-version}} ，最后{{last-version}} \n\n请在#status公共聊天频道中告诉我们此问题。如果按“取消”按钮，则不会产生任何后果。如果按“ {{erase-multiaccounts-data-button-text}} ”按钮，多帐户的数据库将被删除，您将能够解锁帐户。所有多帐户的数据都将丢失。", diff --git a/translations/zh_Hans_CN.json b/translations/zh_Hans_CN.json index 11e209f2bd..58c9cb0157 100644 --- a/translations/zh_Hans_CN.json +++ b/translations/zh_Hans_CN.json @@ -634,7 +634,6 @@ "message-reply": "回复", "message-syncing": "消息同步", "messages": "消息", - "messages-search-coming-soon": "搜索消息历史记录", "might-break": "可能会破坏一些ÐApp", "migrations-erase-multiaccounts-data-button": "删除帐户数据", "migrations-failed-content": "{{message}} \n架构版本：初始{{initial-version}} ，当前{{current-version}} ，最后{{last-version}} \n\n请在#status公共聊天中告诉我们此问题。如果按“取消”按钮，则不会产生任何后果。如果按“ {{erase-multiaccounts-data-button-text}} ”按钮，帐户的数据库将被删除，您将能够解锁帐户。所有帐户的数据都将丢失。", diff --git a/translations/zh_hans.json b/translations/zh_hans.json index f34e3ceec8..dc057e04fc 100644 --- a/translations/zh_hans.json +++ b/translations/zh_hans.json @@ -589,7 +589,6 @@ "message-options-cancel": "取消", "message-reply": "回复", "messages": "消息", - "messages-search-coming-soon": "搜索消息历史记录", "might-break": "可能会破坏一些ÐApp", "migrations-erase-multiaccounts-data-button": "删除帐户数据", "migrations-failed-content": "{{message}} \n架构版本：初始{{initial-version}} ，当前{{current-version}} ，最后{{last-version}} \n\n请在#status公共聊天中告诉我们此问题。如果按“取消”按钮，则不会产生任何后果。如果按“ {{erase-accounts-data-button-text}} ”按钮，帐户的数据库将被删除，您将能够解锁帐户。所有帐户的数据都将丢失。",