diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs index 8370080c63..5f58943afd 100644 --- a/src/status_im/events.cljs +++ b/src/status_im/events.cljs @@ -248,11 +248,6 @@ (fn [cofx _] (mailserver/check-connection cofx))) -(handlers/register-handler-fx - :mailserver/fetch-history - (fn [cofx [_ chat-id from-timestamp]] - (mailserver/fetch-history cofx chat-id {:from from-timestamp}))) - (handlers/register-handler-fx :mailserver.callback/generate-mailserver-symkey-success (fn [cofx [_ mailserver sym-key-id]] @@ -381,28 +376,6 @@ (re-frame/dispatch [:bottom-sheet/hide]) (re-frame/dispatch [:chat.ui/clear-history chat-id]))}})) -(handlers/register-handler-fx - :chat.ui/fetch-history-pressed - (fn [{:keys [now] :as cofx} [_ chat-id]] - (mailserver/fetch-history cofx chat-id - {:from (- (quot now 1000) mailserver.constants/one-day)}))) - -(handlers/register-handler-fx - :chat.ui/fetch-history-pressed48-60 - (fn [{:keys [now] :as cofx} [_ chat-id]] - (let [now (quot now 1000)] - (mailserver/fetch-history cofx chat-id - {:from (- now (* 2.5 mailserver.constants/one-day)) - :to (- now (* 2 mailserver.constants/one-day))})))) - -(handlers/register-handler-fx - :chat.ui/fetch-history-pressed84-96 - (fn [{:keys [now] :as cofx} [_ chat-id]] - (let [now (quot now 1000)] - (mailserver/fetch-history cofx chat-id - {:from (- now (* 4 mailserver.constants/one-day)) - :to (- now (* 3.5 mailserver.constants/one-day))})))) - (handlers/register-handler-fx :chat.ui/fill-gaps (fn [{:keys [db] :as cofx} [_ gap-ids]] diff --git a/src/status_im/i18n_test.cljs b/src/status_im/i18n_test.cljs index 4d514893f0..c13a40b92f 100644 --- a/src/status_im/i18n_test.cljs +++ b/src/status_im/i18n_test.cljs @@ -429,7 +429,6 @@ :export-account :failed :faq - :fetch-history :fetch-messages :find :finish diff --git a/src/status_im/mailserver/core.cljs b/src/status_im/mailserver/core.cljs index ea875a7027..a5440e4f41 100644 --- a/src/status_im/mailserver/core.cljs +++ b/src/status_im/mailserver/core.cljs @@ -7,7 +7,6 @@ [status-im.ethereum.json-rpc :as json-rpc] [status-im.i18n :as i18n] [status-im.mailserver.constants :as constants] - [status-im.mailserver.topics :as mailserver.topics] [status-im.multiaccounts.model :as multiaccounts.model] [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.native-module.core :as status] @@ -910,26 +909,6 @@ :on-accept #(re-frame/dispatch [:mailserver.ui/retry-request-pressed]) :confirm-button-text (i18n/label :t/mailserver-request-retry)}})) -(fx/defn fetch-history - "Retrive a list of topics given a chat id, set them to the specified - time interval and start a mailserver request" - [{:keys [db] :as cofx} chat-id {:keys [from to]}] - (let [topics (mailserver.topics/topics-for-chat - db - chat-id)] - (log/debug "fetch-history" "chat-id:" chat-id "from-timestamp:" - from "topics:" topics) - (fx/merge cofx - {:db (reduce - (fn [db topic] - (cond-> (assoc-in db [:mailserver/requests-from topic] from) - - to - (assoc-in [:mailserver/requests-to topic] to))) - db - topics)} - (process-next-messages-request)))) - (fx/defn fill-the-gap [{:keys [db] :as cofx} {:keys [gaps topics chat-id]}] (let [mailserver (get-mailserver-when-ready cofx) diff --git a/src/status_im/ui/screens/chat/sheets.cljs b/src/status_im/ui/screens/chat/sheets.cljs index 17122d5cec..55719cdc45 100644 --- a/src/status_im/ui/screens/chat/sheets.cljs +++ b/src/status_im/ui/screens/chat/sheets.cljs @@ -37,12 +37,6 @@ :accessibility-label :clear-history-button :icon :main-icons/close :on-press #(re-frame/dispatch [:chat.ui/clear-history-pressed chat-id])}] - [quo/list-item - {:theme :accent - :title (i18n/label :t/fetch-history) - :accessibility-label :fetch-history-button - :icon :main-icons/arrow-down - :on-press #(hide-sheet-and-dispatch [:chat.ui/fetch-history-pressed chat-id])}] [quo/list-item {:theme :negative :title (i18n/label :t/delete-chat) @@ -77,12 +71,6 @@ :accessibility-label :clear-history-button :icon :main-icons/close :on-press #(re-frame/dispatch [:chat.ui/clear-history-pressed chat-id])}] - [quo/list-item - {:theme :accent - :title (i18n/label :t/fetch-history) - :accessibility-label :fetch-history-button - :icon :main-icons/arrow-down - :on-press #(hide-sheet-and-dispatch [:chat.ui/fetch-history-pressed chat-id])}] [quo/list-item {:theme :negative :title (i18n/label :t/delete-chat) @@ -121,12 +109,6 @@ :accessibility-label :clear-history-button :icon :main-icons/close :on-press #(re-frame/dispatch [:chat.ui/clear-history-pressed chat-id])}] - [quo/list-item - {:theme :accent - :title (i18n/label :t/fetch-history) - :accessibility-label :fetch-history-button - :icon :main-icons/arrow-down - :on-press #(hide-sheet-and-dispatch [:chat.ui/fetch-history-pressed chat-id])}] (when joined? [quo/list-item {:theme :negative diff --git a/translations/ar.json b/translations/ar.json index 8bdfe4a965..0cdab74f1b 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -520,7 +520,6 @@ "faq": "الاسئله المتداولة", "favourites": "المفضلة", "favourites-empty": "ستظهر العناوين التي تمت إضافتها إلى المفضلة هنا", - "fetch-history": "إحضار آخر ٢٤ ساعة", "fetch-messages": "↓ جلب الرسائل", "find": "العثور", "finish": "إنهاء", @@ -1316,4 +1315,4 @@ "your-keys": "مفاتيحك", "your-recovery-phrase": "العبارة الأولية الخاصة بك", "your-recovery-phrase-description": "هذه هي العبارة الأولية الخاصة بك. يمكنك استخدامها لإثبات أن هذه هي محفظتك. يمكنك فقط أن ترى ذلك مرة واحدة! اكتبها على الورق واحتفظ بها في مكان آمن. ستحتاج إليها إذا فقدت أو أعدت تثبيت محفظتك." -} \ No newline at end of file +} diff --git a/translations/de.json b/translations/de.json index c8b5c880ed..98c4e1f471 100644 --- a/translations/de.json +++ b/translations/de.json @@ -495,7 +495,6 @@ "faq": "Häufig gestellte Fragen", "favourites": "Favoriten", "favourites-empty": "Favorisierte Adressen werden hier angezeigt", - "fetch-history": "Letzten 24 Stunden abrufen", "fetch-messages": "↓ Nachrichten abrufen", "find": "Finden", "finish": "Fertig", @@ -1267,4 +1266,4 @@ "your-keys": "Ihre Schlüssel", "your-recovery-phrase": "Ihre Seed-Phrase", "your-recovery-phrase-description": "Dies ist Ihre Seed-Phrase. Sie verwenden sie, um zu beweisen, dass dies Ihre Wallet ist. Man kann sie nur einmal sehen! Schreiben Sie sie auf Papier und bewahren Sie es an einem sicheren Ort auf. Sie benötigen sie, wenn Sie Ihre Wallet verlieren oder neu installieren." -} \ No newline at end of file +} diff --git a/translations/en.json b/translations/en.json index 195f3556c0..579064fae6 100644 --- a/translations/en.json +++ b/translations/en.json @@ -468,7 +468,6 @@ "export-account": "Export account", "failed": "Failed", "faq": "Frequently asked questions", - "fetch-history": "Fetch last 24 hours", "fetch-messages": "↓ Fetch messages", "find": "Find", "finish": "Finish", diff --git a/translations/es.json b/translations/es.json index 7cdea91cc1..3d508c17ed 100644 --- a/translations/es.json +++ b/translations/es.json @@ -496,7 +496,6 @@ "faq": "Preguntas frecuentes", "favourites": "Favoritos", "favourites-empty": "Las direcciones agregadas a favoritos aparecerán aquí", - "fetch-history": "Obtener las últimas 24 horas", "fetch-messages": "↓ Recuperar mensajes", "find": "Encontrar", "finish": "Finalizar", @@ -1280,4 +1279,4 @@ "your-keys": "Tus claves", "your-recovery-phrase": "Tu frase semilla", "your-recovery-phrase-description": "Esta es tu frase semilla. La usas para comprobar que esta es tu billetera. ¡Sólo la verás una vez! Escríbela en un papel y guárdala en un lugar seguro. La necesitarás si pierdes o reinstalas tu billetera." -} \ No newline at end of file +} diff --git a/translations/es_419.json b/translations/es_419.json index 197578d07c..4f0d0bdb75 100644 --- a/translations/es_419.json +++ b/translations/es_419.json @@ -496,7 +496,6 @@ "faq": "Preguntas frecuentes", "favourites": "Favoritos", "favourites-empty": "Las direcciones agregadas a favoritos aparecerán aquí", - "fetch-history": "Obtener las últimas 24 horas", "fetch-messages": "↓ Recuperar mensajes", "find": "Encontrar", "finish": "Finalizar", @@ -1280,4 +1279,4 @@ "your-keys": "Tus claves", "your-recovery-phrase": "Tu frase semilla", "your-recovery-phrase-description": "Esta es tu frase semilla. La usas para comprobar que esta es tu billetera. ¡Sólo la verás una vez! Escríbela en un papel y guárdala en un lugar seguro. La necesitarás si pierdes o reinstalas tu billetera." -} \ No newline at end of file +} diff --git a/translations/fil.json b/translations/fil.json index bbc8eb2242..de2e654088 100644 --- a/translations/fil.json +++ b/translations/fil.json @@ -520,7 +520,6 @@ "faq": "Mga madalas na tinatanong", "favourites": "Mga paborito", "favourites-empty": "Lilitaw dito ang mga address na idinagdag sa mga paborito", - "fetch-history": "Ang Fetch ay tatagal hanggang 24 na oras", "fetch-messages": "↓ Kumuha ng mga mensahe", "find": "Maghanap", "finish": "Tapos na", @@ -1316,4 +1315,4 @@ "your-keys": "Ang iyong susi", "your-recovery-phrase": "Ang iyong seed phrase", "your-recovery-phrase-description": "ito ang iyong seed phrase. Ginagamit mo ito upang patunayan na ito ang iyong pitaka. ikaw lamang makita ito nang isang beses! Isulat ito sa papel at itago ito sa isang ligtas na lugar. Kakailanganin mo ito kung nawala o muling i-install ang iyong pitaka." -} \ No newline at end of file +} diff --git a/translations/fr.json b/translations/fr.json index 1a80b071f3..14fa74017c 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -496,7 +496,6 @@ "faq": "Foire aux questions", "favourites": "Favoris", "favourites-empty": "Les adresses ajoutées aux favoris apparaîtront ici", - "fetch-history": "Récupérer les dernières 24 heures", "fetch-messages": "↓ Récupérer les messages", "find": "Trouver", "finish": "Finir", @@ -1276,4 +1275,4 @@ "your-keys": "Vos clés", "your-recovery-phrase": "Votre phrase de récupération", "your-recovery-phrase-description": "Ceci est votre phrase de récupération. Vous l'utilisez pour prouver qu'il s'agit de votre portefeuille. Vous ne le voyez qu'une fois! Ecrivez-le sur du papier et conservez-le dans un endroit sûr. Vous en aurez besoin si vous perdez ou réinstallez votre portefeuille." -} \ No newline at end of file +} diff --git a/translations/id.json b/translations/id.json index 305ad98726..ba2a2a59b0 100644 --- a/translations/id.json +++ b/translations/id.json @@ -490,7 +490,6 @@ "faq": "Pertanyaan yang sering diajukan", "favourites": "Favorit", "favourites-empty": "Alamat yang ditambahkan ke favorit akan muncul di sini", - "fetch-history": "Ambil 24 jam terakhir", "fetch-messages": "↓ Mengambil pesan", "find": "Temukan", "finish": "Selesai", @@ -1271,4 +1270,4 @@ "your-keys": "Kunci Anda", "your-recovery-phrase": "Frase seed Anda", "your-recovery-phrase-description": "Ini adalah frase awal Anda. Anda menggunakannya untuk membuktikan bahwa ini adalah dompet Anda. Anda hanya bisa melihatnya sekali! Tulis di atas kertas dan simpan di tempat yang aman. Anda akan membutuhkannya jika Anda kehilangan atau menginstal ulang dompet Anda." -} \ No newline at end of file +} diff --git a/translations/it.json b/translations/it.json index edb5819af9..e0764f914f 100644 --- a/translations/it.json +++ b/translations/it.json @@ -496,7 +496,6 @@ "faq": "Domande frequenti", "favourites": "Preferiti", "favourites-empty": "Gli indirizzi aggiunti ai preferiti verranno visualizzati qui", - "fetch-history": "Recupera le ultime 24 ore", "fetch-messages": "↓ Recupera messaggi", "find": "Trova", "finish": "Finito", @@ -1276,4 +1275,4 @@ "your-keys": "Le tue chiavi", "your-recovery-phrase": "La tua frase di recupero", "your-recovery-phrase-description": "Questa è la tua frase di recupero. La usi per dimostrare che questo è il tuo portafoglio. Puoi vederlo solo una volta! Scrivilo su carta e conservalo in un luogo sicuro. Ne avrai bisogno se perdi o reinstalli il tuo portafoglio." -} \ No newline at end of file +} diff --git a/translations/ja.json b/translations/ja.json index 40f738c142..c50828a162 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -382,7 +382,6 @@ "export-account": "アカウントをエクスポート", "failed": "失敗しました", "faq": "よくある質問", - "fetch-history": "過去24時間の取得", "fetch-messages": "↓メッセージを取得する", "find": "見つける", "finish": "完了", diff --git a/translations/ko.json b/translations/ko.json index 1a907e51a3..19f135e2d6 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -490,7 +490,6 @@ "faq": "자주 묻는 질문", "favourites": "즐겨 찾기", "favourites-empty": "즐겨찾기에 추가 된 주소가 여기에 표시됩니다.", - "fetch-history": "지난 24시간 내역 불러오기", "fetch-messages": "↓ 메시지 가져 오기", "find": "찾기", "finish": "완료", @@ -1271,4 +1270,4 @@ "your-keys": "계정 목록", "your-recovery-phrase": "시드 구문", "your-recovery-phrase-description": "위 12단어가 사용자의 시드 구문입니다. 이 구문은 사용자의 지갑을 증명하기 위해 반드시 필요하며, 이번 한번만 확인할 수 있습니다. 지갑을 분실하거나 재설치하는 경우 반드시 필요하므로 안전한 장소에 보관하세요." -} \ No newline at end of file +} diff --git a/translations/pt.json b/translations/pt.json index b55492104b..db6f00f13e 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -496,7 +496,6 @@ "faq": "Perguntas frequentes", "favourites": "Favoritos", "favourites-empty": "Os endereços adicionados aos favoritos aparecerão aqui", - "fetch-history": "Buscar últimas 24 horas", "fetch-messages": "↓ Buscar mensagens", "find": "Encontrar", "finish": "Terminar", @@ -1280,4 +1279,4 @@ "your-keys": "Suas chaves", "your-recovery-phrase": "Sua frase-semente", "your-recovery-phrase-description": "Esta é sua frase-semente. Você o usa para provar que esta é sua carteira. Você só pode vê-lo uma vez! Escreva no papel e mantenha em um lugar seguro. Você vai precisar dele se você perder ou reinstalar sua carteira." -} \ No newline at end of file +} diff --git a/translations/pt_BR.json b/translations/pt_BR.json index b55492104b..db6f00f13e 100644 --- a/translations/pt_BR.json +++ b/translations/pt_BR.json @@ -496,7 +496,6 @@ "faq": "Perguntas frequentes", "favourites": "Favoritos", "favourites-empty": "Os endereços adicionados aos favoritos aparecerão aqui", - "fetch-history": "Buscar últimas 24 horas", "fetch-messages": "↓ Buscar mensagens", "find": "Encontrar", "finish": "Terminar", @@ -1280,4 +1279,4 @@ "your-keys": "Suas chaves", "your-recovery-phrase": "Sua frase-semente", "your-recovery-phrase-description": "Esta é sua frase-semente. Você o usa para provar que esta é sua carteira. Você só pode vê-lo uma vez! Escreva no papel e mantenha em um lugar seguro. Você vai precisar dele se você perder ou reinstalar sua carteira." -} \ No newline at end of file +} diff --git a/translations/ru.json b/translations/ru.json index e241c639c1..43bcf500ee 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -514,7 +514,6 @@ "faq": "Часто задаваемые вопросы", "favourites": "Избранное", "favourites-empty": "Здесь будут отображены адреса, добавленные в избранное.", - "fetch-history": "Получить сообщения за последние 24 часа", "fetch-messages": "↓ Открыть сообщения", "find": "Найти", "finish": "Закончить", @@ -1302,4 +1301,4 @@ "your-keys": "Ваши ключи", "your-recovery-phrase": "Ваша сид-фраза", "your-recovery-phrase-description": "Это ваша сид-фраза. Она используется для доказательства владения кошельком. Вы уведите ее только один раз! Запишите ее на бумаге и храните в надежном месте. Она понадобится вам, если вы потеряете или переустановите кошелек." -} \ No newline at end of file +} diff --git a/translations/tr.json b/translations/tr.json index d459d38bdc..25d1d72281 100644 --- a/translations/tr.json +++ b/translations/tr.json @@ -496,7 +496,6 @@ "faq": "Sıkça Sorulan Sorular", "favourites": "Favoriler", "favourites-empty": "Sık kullanılanlara eklenen adresler burada görünecek", - "fetch-history": "Son 24 saati getir", "fetch-messages": "Mesajları getir", "find": "Bul", "finish": "Bitti", @@ -1280,4 +1279,4 @@ "your-keys": "Senin anahtarların", "your-recovery-phrase": "Kelime imzanız", "your-recovery-phrase-description": "Bu senin kelime imzan. Bunu senin cüzdanın olduğunu kanıtlamak için kullanıyorsun. Sadece bir kez görüyorsunuz! Kağıda yazın ve güvenli bir yerde saklayın. Cüzdanınızı kaybederseniz veya uygulamayı yeniden yüklerseniz ihtiyacınız olacak." -} \ No newline at end of file +} diff --git a/translations/zh.json b/translations/zh.json index 9fddf297b8..0fcfc447af 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -490,7 +490,6 @@ "faq": "常见问题", "favourites": "收藏夹", "favourites-empty": "添加到收藏夹的地址将显示在这里", - "fetch-history": "获取最近24小时的消息", "fetch-messages": "↓获取消息", "find": "查找", "finish": "完成", @@ -1271,4 +1270,4 @@ "your-keys": "您的账户", "your-recovery-phrase": "您的助记词", "your-recovery-phrase-description": "这是您的助记词。您需要用它来证明这个钱包属于您。您只能查看一次!请将其写在纸上并保存在安全的地方。如果丢失或重新安装钱包,您将需要用到这些助记词。" -} \ No newline at end of file +} diff --git a/translations/zh_Hans_CN.json b/translations/zh_Hans_CN.json index 73ab9ee92f..573bbac850 100644 --- a/translations/zh_Hans_CN.json +++ b/translations/zh_Hans_CN.json @@ -392,7 +392,6 @@ "export-account": "导出帐户", "failed": "失败", "faq": "常见问题", - "fetch-history": "获取最近24小时", "fetch-messages": "↓获取消息", "find": "查找", "finish": "完成", diff --git a/translations/zh_TW.json b/translations/zh_TW.json index c6afb67f8c..155f4f95bb 100644 --- a/translations/zh_TW.json +++ b/translations/zh_TW.json @@ -490,7 +490,6 @@ "faq": "常見問題", "favourites": "收藏夾", "favourites-empty": "添加到收藏夾的地址將顯示在此處", - "fetch-history": "過去24小時中", "fetch-messages": "↓取得訊息", "find": "搜尋", "finish": "完成", @@ -1271,4 +1270,4 @@ "your-keys": "您的金鑰", "your-recovery-phrase": "您的種子詞組", "your-recovery-phrase-description": "這是您的種子詞組,能用它來證明這是您的錢包。您只會看到一次!請將其寫在紙上,並存放在安全的地方。如果裝置遺失或想重新安裝錢包,將需要它。" -} \ No newline at end of file +} diff --git a/translations/zh_hans.json b/translations/zh_hans.json index 8e8b27dbfa..300eca770c 100644 --- a/translations/zh_hans.json +++ b/translations/zh_hans.json @@ -367,7 +367,6 @@ "export-account": "导出帐户", "failed": "失败", "faq": "常见问题", - "fetch-history": "获取最近24小时", "fetch-messages": "↓获取消息", "find": "查找", "finishing-card-setup": "卡片设置完成",