aljaz/notedeck
1
0
Fork 0
mirror of https://github.com/aljazceru/notedeck.git synced 2025-12-19 01:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

make selected accounts non optional

Browse Source 
Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2025-06-25 22:09:55 -04:00
parent 9cacb6bb69
commit 8e92a97a57
16 changed files with 136 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
crates/notedeck_columns/src/nav.rs
View File

@@ -544,7 +544,7 @@ fn render_nav_body(
response.action.map(Into::into)
}
Route::ComposeNote => {
let kp = ctx.accounts.get_selected_account()?.key.to_full()?;
let kp = ctx.accounts.get_selected_account().key.to_full()?;
let draft = app.drafts.compose_mut();
let txn = Transaction::new(ctx.ndb).expect("txn");
@@ -594,7 +594,7 @@ fn render_nav_body(
app.note_options,
search_buffer,
&mut note_context,
&ctx.accounts.get_selected_account().map(|a| (&a.key).into()),
&(&ctx.accounts.get_selected_account().key).into(),
&mut app.jobs,
)
.show(ui, ctx.clipboard)
@@ -605,19 +605,18 @@ fn render_nav_body(
let new_deck_state = app.view_state.id_to_deck_state.entry(id).or_default();
let mut resp = None;
if let Some(config_resp) = ConfigureDeckView::new(new_deck_state).ui(ui) {
if let Some(cur_acc) = ctx.accounts.selected_account_pubkey() {
app.decks_cache
.add_deck(*cur_acc, Deck::new(config_resp.icon, config_resp.name));
let cur_acc = ctx.accounts.selected_account_pubkey();
app.decks_cache
.add_deck(*cur_acc, Deck::new(config_resp.icon, config_resp.name));
// set new deck as active
let cur_index = get_decks_mut(ctx.accounts, &mut app.decks_cache)
.decks()
.len()
- 1;
resp = Some(RenderNavAction::SwitchingAction(SwitchingAction::Decks(
DecksAction::Switch(cur_index),
)));
}
// set new deck as active
let cur_index = get_decks_mut(ctx.accounts, &mut app.decks_cache)
.decks()
.len()
- 1;
resp = Some(RenderNavAction::SwitchingAction(SwitchingAction::Decks(
DecksAction::Switch(cur_index),
)));
new_deck_state.clear();
get_active_columns_mut(ctx.accounts, &mut app.decks_cache)