Skip to content

Release: develop -> main#4243

Merged
TaprootFreak merged 2 commits into
mainfrom
develop
Jul 16, 2026
Merged

Release: develop -> main#4243
TaprootFreak merged 2 commits into
mainfrom
develop

Conversation

@github-actions

Copy link
Copy Markdown

Automatic Release PR

This PR was automatically created after changes were pushed to develop.

Commits: 1 new commit(s)

Checklist

  • Review all changes
  • Verify CI passes
  • Approve and merge when ready for production

…dger and dashboard (#4233)

* fix(bank): account for statement-inline charges across change log, ledger and dashboard

Bank Frick statements carry the charge inline (chargeAmount and currency,
never a CHF conversion, never a dedicated fee row), which none of the
existing surfaces counted:

- getBankTxFee gains a third source: inline charges without a CHF value
  aggregate per currency and convert like the fee-row source, with fee
  rows excluded so nothing double-counts
- the ledger books the bank asset leg gross and adds an explicit
  EXPENSE/bank-fee leg (buy-fiat settlement and the bank-tx debit
  branches), valued through the same ladder as the checkout settlement -
  a booked debit that included a charge reconciles net of it instead of
  drifting against the balance feed or lumping into the fx plug
- the dashboard reconciliation categorizes assets with a bank relation as
  bank before consulting the blockchain lists, matching the ledger's
  custody classification

* fix(bank): bridge inline charges over missing historical marks, object relations form

A charged row whose asset had no mark at the booking date threw before
the mark bridge ever ran, wedging the scan behind it - the charge now
values through the same latest-available-mark bridge as its asset leg
(warn-logged, needsMark kept; unbridgeable suspense counters defer
instead of fixing a phantom plug). Genuinely feedless assets and
mismatched charge currencies still fail loud. Dashboard relations use
the object form.
…#4242)

Bank Frick's rows are receive=true so inbound money on its accounts is
fully processed, but it must never be shown to customers as a deposit
target. Filter it out of getBank so customers are always offered the
incumbent banks (Olkypay/Yapeal); inbound crediting runs via
BankTxFrickService and the outbound payout selector has its own Frick
handling, so only the customer-facing deposit IBAN is affected.
@TaprootFreak
TaprootFreak merged commit d557ce0 into main Jul 16, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant