diff --git a/js/main.js b/js/main.js index b596c99..bdc1bc9 100644 --- a/js/main.js +++ b/js/main.js @@ -121,9 +121,16 @@ function on_timer_timestamps() { } function on_timer_invalidations() { - setTimeout(() => { - if (DAMUS.invalidated.length > 0) - view_timeline_update(DAMUS); + const model = DAMUS; + setTimeout(async () => { + if (model.dms_need_redraw && view_get_timeline_el().dataset.mode == VM_DM) { + // if needs decryption do it + await decrypt_dms(model); + view_dm_update(model); + model.dms_need_redraw = false; + } + if (model.invalidated.length > 0) + view_timeline_update(model); on_timer_invalidations(); }, 50); } @@ -140,12 +147,6 @@ function on_timer_save() { function on_timer_tick() { const model = DAMUS; setTimeout(async () => { - if (model.dms_need_redraw && view_get_timeline_el().dataset.mode == VM_DM) { - // if needs decryption do it - await decrypt_dms(model); - view_dm_update(model); - model.dms_need_redraw = false; - } update_notifications(model); model.relay_que.forEach((que, relay) => { model_fetch_next_profile(model, relay); diff --git a/js/ui/state.js b/js/ui/state.js index bf16b4d..edd76e4 100644 --- a/js/ui/state.js +++ b/js/ui/state.js @@ -117,8 +117,8 @@ function view_timeline_apply_mode(model, mode, opts={}, push_state=true) { el_their_pfp.dataset.pubkey = pubkey; break; case VM_DM: - decrypt_dms(model); - view_dm_update(model); + //decrypt_dms(model); + //view_dm_update(model); break; case VM_SETTINGS: view_show_spinner(false);