From fc1691e727f15cc1817ae0f80904c82a42748fa6 Mon Sep 17 00:00:00 2001
From: Aaron Fiore <founder@evergreencrypto.co>
Date: Thu, 2 Jan 2025 19:58:39 -0800
Subject: [PATCH 1/3] container: hledger-flow: blockfi: fix fees subaccount
 ordering

Keep consistent with all other rules.
---
 .../src/hledger-flow/accounts/blockfi/blockfi-shared.rules      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container/src/hledger-flow/accounts/blockfi/blockfi-shared.rules b/container/src/hledger-flow/accounts/blockfi/blockfi-shared.rules
index 5a8ac1e..54d411e 100644
--- a/container/src/hledger-flow/accounts/blockfi/blockfi-shared.rules
+++ b/container/src/hledger-flow/accounts/blockfi/blockfi-shared.rules
@@ -74,7 +74,7 @@ if %direction ^OUT$
 
 if %direction ^OUT$
 & %sub_type ^Withdrawal Fee$
-  account2 expenses:blockfi:%subaccount:withdrawals:fees:%currency_one
+  account2 expenses:blockfi:%subaccount:fees:withdrawals:%currency_one
   comment type:%type, sub_type:%sub_type, direction:%direction, taxed_as:SPEND
   comment2 %date +0000,SPEND,blockfi:%subaccount,%currency_one,%currency_one_amount,USD,,FEE
 

From 7b65d5d6e2c677a981aada330f357b760e1c09ea Mon Sep 17 00:00:00 2001
From: Aaron Fiore <founder@evergreencrypto.co>
Date: Thu, 2 Jan 2025 19:59:35 -0800
Subject: [PATCH 2/3] container: hledger-flow: ledger: fix fees subaccount
 ordering

Keep consistent with all other rules.
---
 .../src/hledger-flow/accounts/ledger/ledger-shared.rules    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/container/src/hledger-flow/accounts/ledger/ledger-shared.rules b/container/src/hledger-flow/accounts/ledger/ledger-shared.rules
index 7854d2f..82cc249 100644
--- a/container/src/hledger-flow/accounts/ledger/ledger-shared.rules
+++ b/container/src/hledger-flow/accounts/ledger/ledger-shared.rules
@@ -39,7 +39,7 @@ if %type ^OUT$
 & %fees [1-9]
   account3 assets:ledger:%account_name:%currency_
   amount3 -%fees %currency_
-  account4 expenses:ledger:fees:%account_name:%currency_
+  account4 expenses:ledger:%account_name:fees:%currency_
   amount4 %fees %currency_
   comment type:%type, status:%status_, xpub:%xpub, txid:%txid, direction:%direction, taxed_as:SPEND
   comment2
@@ -82,7 +82,7 @@ if %currency_ ^ADA$
 & %fees [1-9]
   account3 assets:ledger:%account_name:%currency_
   amount3 -%fees %currency_
-  account4 expenses:ledger:fees:%account_name:%currency_
+  account4 expenses:ledger:%account_name:fees:%currency_
   amount4 %fees %currency_
   comment type:%type, status:%status_, xpub:%xpub, txid:%txid, direction:%direction, taxed_as:SPEND
   comment3 %date +0000,SPEND,ledger:%account_name:%currency_,%currency_,%fees,USD,,FEE
@@ -95,7 +95,7 @@ if %currency_ ^ADA$
   account2 equity:ledger:%account_name:withdrawal:stake_key_reg:%currency_
   account3 assets:ledger:%account_name:%currency_
   amount3 -%amount_ %currency_
-  account4 expenses:ledger:fees:%account_name:%currency_
+  account4 expenses:ledger:%account_name:fees:%currency_
   amount4 %amount_ %currency_
   comment type:%type, status:%status_, xpub:%xpub, txid:%txid, direction:%direction, taxed_as:SPEND
   comment2 Stake key registration withdrawal

From da57805c7979672c16d57f46caa12e099ce369e1 Mon Sep 17 00:00:00 2001
From: Aaron Fiore <founder@evergreencrypto.co>
Date: Thu, 2 Jan 2025 20:02:20 -0800
Subject: [PATCH 3/3] container: hledger-flow: trezor: fix fees subaccount
 ordering

Keep consistent with all other rules.
---
 container/src/hledger-flow/accounts/trezor/trezor-shared.rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container/src/hledger-flow/accounts/trezor/trezor-shared.rules b/container/src/hledger-flow/accounts/trezor/trezor-shared.rules
index acd0774..379900a 100644
--- a/container/src/hledger-flow/accounts/trezor/trezor-shared.rules
+++ b/container/src/hledger-flow/accounts/trezor/trezor-shared.rules
@@ -39,7 +39,7 @@ if %direction ^OUT$
 & %fee [1-9]
   account3 assets:trezor:%subaccount:%amount_unit
   amount3 -%fee %amount_unit
-  account4 expenses:trezor:fees:%subaccount:%amount_unit
+  account4 expenses:trezor:%subaccount:fees:%amount_unit
   amount4 %fee %amount_unit
   comment label:%label, type:%type, address:%address, txid:%txid, direction:%direction, taxed_as:SPEND
   comment2