aljaz/notedeck
1
0
Fork 0
mirror of https://github.com/aljazceru/notedeck.git synced 2026-01-06 18:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/pr/1023'

Browse Source
This commit is contained in:
William Casarin
2025-07-23 12:31:51 -07:00
parent 5ddd8660a3 e997f1bf68
commit f9f8b3fe1b
10 changed files with 65 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -520,6 +520,7 @@ fn render_nav_body(
unknown_ids: ctx.unknown_ids,
clipboard: ctx.clipboard,
i18n: ctx.i18n,
global_wallet: ctx.global_wallet,
};
match top {
Route::Timeline(kind) => {

1
crates/notedeck_columns/src/ui/note/post.rs
View File

@@ -802,6 +802,7 @@ mod preview {
let mut note_context = NoteContext {
ndb: app.ndb,
accounts: app.accounts,
global_wallet: app.global_wallet,
img_cache: app.img_cache,
note_cache: app.note_cache,
zaps: app.zaps,

6
crates/notedeck_columns/src/ui/wallet.rs
View File

@@ -1,6 +1,6 @@
use egui::{vec2, CornerRadius, Layout};
use notedeck::{
get_current_wallet, tr, Accounts, DefaultZapMsats, GlobalWallet, Localization,
get_current_wallet_mut, tr, Accounts, DefaultZapMsats, GlobalWallet, Localization,
NotedeckTextStyle, PendingDefaultZapState, Wallet, WalletError, WalletUIState, ZapWallet,
};
@@ -103,7 +103,7 @@ impl WalletAction {
}
WalletAction::SetDefaultZapSats(new_default) => 's: {
let sats = {
let Some(wallet) = get_current_wallet(accounts, global_wallet) else {
let Some(wallet) = get_current_wallet_mut(accounts, global_wallet) else {
break 's;
};
@@ -138,7 +138,7 @@ impl WalletAction {
global_wallet.save_wallet();
}
WalletAction::EditDefaultZaps => 's: {
let Some(wallet) = get_current_wallet(accounts, global_wallet) else {
let Some(wallet) = get_current_wallet_mut(accounts, global_wallet) else {
break 's;
};