Merge remote-tracking branches 'github/pr/657' and 'github/pr/658'
This commit is contained in:
@@ -68,6 +68,9 @@ impl eframe::App for Notedeck {
|
||||
#[cfg(feature = "profiling")]
|
||||
puffin::GlobalProfiler::lock().new_frame();
|
||||
|
||||
// handle account updates
|
||||
self.accounts.update(&self.ndb, &mut self.pool, ctx);
|
||||
|
||||
main_panel(&ctx.style(), crate::ui::is_narrow(ctx)).show(ctx, |ui| {
|
||||
// render app
|
||||
if let Some(app) = &self.app {
|
||||
|
||||
@@ -45,3 +45,7 @@ pub use time::time_ago_since;
|
||||
pub use timecache::TimeCached;
|
||||
pub use unknowns::{get_unknown_note_ids, NoteRefsUnkIdAction, SingleUnkIdAction, UnknownIds};
|
||||
pub use user_account::UserAccount;
|
||||
|
||||
// export libs
|
||||
pub use enostr;
|
||||
pub use nostrdb;
|
||||
|
||||
@@ -183,8 +183,6 @@ fn unknown_id_send(unknown_ids: &mut UnknownIds, pool: &mut RelayPool) {
|
||||
}
|
||||
|
||||
fn update_damus(damus: &mut Damus, app_ctx: &mut AppContext<'_>, ctx: &egui::Context) {
|
||||
app_ctx.accounts.update(app_ctx.ndb, app_ctx.pool, ctx); // update user relay and mute lists
|
||||
|
||||
match damus.state {
|
||||
DamusState::Initializing => {
|
||||
damus.state = DamusState::Initialized;
|
||||
|
||||
Reference in New Issue
Block a user