More typos and stuff

4 files changed, 12 insertions, 36 deletions

diff --git a/schist_desktop_gui/src/paths.rs b/schist_desktop_gui/src/paths.rs
index f5cbf33..b098859 100644
--- a/schist_desktop_gui/src/paths.rs
+++ b/schist_desktop_gui/src/paths.rs
@@ -33,7 +33,7 @@ fn get_file_paths_checked() -> anyhow::Result<Vec<PathBuf>> {
 fn is_sqlite_file(entry: &std::fs::DirEntry) -> bool {
     entry
         .file_type()
-        .is_ok_and(|ft| (FileType::is_file(&ft) || FileType::is_symlink(&ft)))
+        .is_ok_and(|ft| FileType::is_file(&ft) || FileType::is_symlink(&ft))
         && entry
             .path()
             .extension()
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_budgets_not_carried_over.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_budgets_not_carried_over.rs
index aba37c2..1bdeaff 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_budgets_not_carried_over.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_budgets_not_carried_over.rs
@@ -3,8 +3,8 @@ use std::collections::HashMap;
 use actualbudget_models::{ActualbudgetDate, ActualbudgetTransaction, ActualbudgetZeroBudget};
 use anyhow::Result;
 use itertools::Itertools;
-use schist_models::bucket_transaction::BucketTransaction;
-use schist_traits::dateable::Dateable;
+use schist_models::BucketTransaction;
+use schist_traits::Dateable;
 
 use crate::transform_state::{transform_date, transform_id};
 
@@ -89,7 +89,7 @@ mod test {
         actualbudget_zero_budget::make_fake_actualbudget_zero_budget_builder,
     };
     use actualbudget_models::ActualbudgetDate;
-    use schist_models::{bucket_transaction::BucketTransaction, date_utc::DateUtc};
+    use schist_models::{BucketTransaction, DateUtc};
 
     use crate::transform_state::{
         transform_bucket_transactions_from_budgets_not_carried_over::transform_bucket_transactions_from_budgets_not_carried_over,
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_category_transfers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_category_transfers.rs
index 88ab416..4dce8fa 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_category_transfers.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_category_transfers.rs
@@ -117,6 +117,7 @@ fn transform_category_transfer_without_context(
                 .clone()
                 .unwrap_or_else(String::new),
             amount: -amount,
+            date,
             bucket_id: withdrawal_bucket_id,
         },
         BucketTransaction {
@@ -134,40 +135,25 @@ fn transform_category_transfer_without_context(
 
 #[cfg(test)]
 mod test {
-<<<<<<< HEAD
     use actualbudget_fakes::actualbudget_transaction::make_fake_actualbudget_transaction_builder;
-    use actualbudget_models::{ActualbudgetTransaction, ActualbudgetTransactionBuilder};
-    use schist_models::BucketTransaction;
-=======
-    use actualbudget_fakes::{
-        actualbudget_account::make_fake_actualbudget_account,
-        actualbudget_transaction::make_fake_actualbudget_transaction_builder,
-    };
     use actualbudget_models::{
         ActualbudgetDate, ActualbudgetTransaction, ActualbudgetTransactionBuilder,
     };
-    use schist_models::{bucket_transaction::BucketTransaction, date_utc::DateUtc};
->>>>>>> 44b35a0 (BucketTransaction has date field)
+    use schist_models::{BucketTransaction, DateUtc};
 
-    use crate::transform_state::transform_id::transform_id;
+    use crate::transform_state::transform_id;
 
     use super::transform_bucket_transactions_from_category_transfers;
 
     #[test]
     fn when_one_category_transfer_then_transforms() {
         let actualbudget_transactions = [
-<<<<<<< HEAD
-            make_fake_parent_transaction("0"),
-            make_fake_child_withdrawal("1", "0"),
-            make_fake_child_deposit("2", "0"),
-=======
             make_fake_parent_transaction_builder("0")
                 .date(ActualbudgetDate::from_ymd(2026, 01, 16))
                 .build()
                 .unwrap(),
-            make_fake_from_child_transaction("1", "0"),
-            make_fake_to_child_transaction("2", "0"),
->>>>>>> 44b35a0 (BucketTransaction has date field)
+            make_fake_child_withdrawal("1", "0"),
+            make_fake_child_deposit("2", "0"),
         ];
 
         let result =
@@ -196,16 +182,11 @@ mod test {
     #[test]
     fn when_many_transactions_then_transforms() {
         let actualbudget_transactions = [
-<<<<<<< HEAD
-            make_fake_parent_transaction("0"),
-            make_fake_child_withdrawal_builder("1", 100, "0")
-=======
             make_fake_parent_transaction_builder("0")
                 .date(ActualbudgetDate::from_ymd(2026, 1, 16))
                 .build()
                 .unwrap(),
-            make_fake_from_child_transaction_builder("1", 100, "0")
->>>>>>> 44b35a0 (BucketTransaction has date field)
+            make_fake_child_withdrawal_builder("1", 100, "0")
                 .category_id(Some(String::from("0")))
                 .build()
                 .unwrap(),
@@ -213,16 +194,11 @@ mod test {
                 .category_id(Some(String::from("1")))
                 .build()
                 .unwrap(),
-<<<<<<< HEAD
-            make_fake_parent_transaction("3"),
-            make_fake_child_withdrawal_builder("4", 200, "3")
-=======
             make_fake_parent_transaction_builder("3")
                 .date(ActualbudgetDate::from_ymd(2026, 1, 21))
                 .build()
                 .unwrap(),
-            make_fake_from_child_transaction_builder("4", 200, "3")
->>>>>>> 44b35a0 (BucketTransaction has date field)
+            make_fake_child_withdrawal_builder("4", 200, "3")
                 .category_id(Some(String::from("1")))
                 .build()
                 .unwrap(),
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_transaction_matchers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_transaction_matchers.rs
index 20b8383..95bb54f 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_transaction_matchers.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_transaction_matchers.rs
@@ -1,5 +1,5 @@
 use schist_models::{Bucket, BucketTransaction};
-use schist_traits::dateable::Dateable;
+use schist_traits::Dateable;
 
 use super::bucket_names::{BUCKET_NAME_GENERAL, BUCKET_NAME_SAVINGS};