Skip to content

Fix home page balance after tx swap #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheRustyPickle merged 1 commit into from
Oct 16, 2025
Merged

Fix home page balance after tx swap #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/src/views/tx_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 +518,6 @@ impl TxViewGroup {

tx_2.tx.set_display_order(db_conn)?;

self.0.swap(index_1, index_2);

Ok(true)
}

Expand Down
6 changes: 3 additions & 3 deletions db/src/models/txs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use chrono::{Datelike, Days, Months, NaiveDate, NaiveDateTime, NaiveTime};
use diesel::dsl::{exists, sql};
use diesel::prelude::*;
use diesel::result::Error;
use diesel::sql_types::Bool;
use diesel::sql_types::{Integer, Text};
use rex_shared::models::Cent;
use std::collections::HashMap;

Expand Down Expand Up @@ -442,8 +442,8 @@ impl Tx {

query
.order((
date.asc(),
sql::<Bool>("display_order = 0"),
sql::<Text>("DATE(date) ASC"),
sql::<Integer>("CASE WHEN display_order = 0 THEN 1 ELSE 0 END ASC"),
display_order.asc(),
id.asc(),
))
Expand Down
4 changes: 2 additions & 2 deletions tui/src/key_checker/key_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ impl<'a> InputKeyHandler<'a> {
.swap_tx_position(index, index - 1, self.home_txs)?;

if reload_stuff {
*self.home_table = TableData::new(self.home_txs.tx_array());
self.reload_home_table()?;
self.home_down_till(index - 1);
self.reload_activity_table()?;
}
Expand All @@ -1038,7 +1038,7 @@ impl<'a> InputKeyHandler<'a> {
.swap_tx_position(index, index + 1, self.home_txs)?;

if reload_stuff {
*self.home_table = TableData::new(self.home_txs.tx_array());
self.reload_home_table()?;
self.home_down_till(index + 1);
self.reload_activity_table()?;
}
Expand Down
Loading