Skip to content
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

Jump to bottom

Added balance of frozen UTXO #2209

Closed
wants to merge 1 commit into from
Closed

Added balance of frozen UTXO #2209

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
26 changes: 22 additions & 4 deletions src/cryptoadvance/specter/templates/wallet/history/components/total_wallet_balances.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

total_wallet_balances(
_("Some title"),
amount_total,
amount_total,
amount_confirmed,
amount_unconfirmed,
amount_immature,
amount_unconfirmed,
amount_frozen,
amount_immature,
balance, # needs to be passed for liquid
rescan_progress, # Possible values: True, False, 0..1. Disable: False or 0, Enable otherwise.
wallet_alias, # wallet_alias to check the rescan_progress.
wallet_alias, # wallet_alias to check the rescan_progress.
# If the wallet alias exists it shows specter.info["utxorescan"], otherwise rescan_progress is used
specter)

Expand Down Expand Up @@ -112,6 +113,23 @@
</tr>
{% endif %}
{% endif %}
{% if amount_frozen > 0 %}
<tr>
<td>Frozen:</td>
<td id="frozen_amount" class="right-align">{{ amount_frozen | btcunitamount_fixed_decimals | safe }}</td>
<td>
{% if specter.unit == 'sat' %}
sats
{% else %}
{% if specter.is_testnet %}t{%endif%}{% if specter.is_liquid %}L{%endif%}BTC
{% endif %}
{% if specter.price_check %}
<td class="right-align">
<span class="note">({{ amount_frozen | altunit }})</span>
</td>
{% endif %}
</td>
{% endif %}
{% if amount_immature > 0 %}
<tr>
<th style="display: flex;">
Expand Down
14 changes: 8 additions & 6 deletions src/cryptoadvance/specter/templates/wallet/overview/balance_overview.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@
{% set amount_total = specter.wallet_manager.wallets.values() | sum(attribute='amount_total') %}
{% set amount_confirmed = specter.wallet_manager.wallets.values() | sum(attribute='amount_confirmed') %}
{% set amount_unconfirmed = specter.wallet_manager.wallets.values() | sum(attribute='amount_unconfirmed') %}
{% set amount_frozen = specter.wallet_manager.wallets.values() | sum(attribute='amount_frozen') %}
{% set amount_immature = specter.wallet_manager.wallets.values() | sum(attribute='amount_immature') %}
{% set balance = specter.wallet_manager.joined_balance() %}
{% set rescan_progress = specter.wallet_manager.wallets.values() | average_of_attribute(attribute='rescan_progress') %}
{{ total_wallet_balances(
_("Combined Wallet Balances"),
amount_total,
amount_total,
amount_confirmed,
amount_unconfirmed,
amount_immature,
balance,
rescan_progress,
"",
amount_unconfirmed,
amount_frozen,
amount_immature,
balance,
rescan_progress,
"",
specter) }}