Skip to content

Wallet breakdown for multi account #598

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

Open
Duddino wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Wallet breakdown for multi account #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f54641
Port wallet breakdown to vue
Duddino Oct 2, 2025
cdbdb13
Move wallet breakdown to Dashboard
Duddino Oct 6, 2025
b408a12
Merge remote-tracking branch 'origin/master' into wallet_breakdown
Duddino Oct 9, 2025
5387598
Merge remote-tracking branch 'origin/master' into wallet_breakdown
Duddino Oct 28, 2025
cf4d3d9
Improve colors etc
Duddino Oct 28, 2025
2042d5d
Merge branch 'master' into wallet_breakdown
Duddino Oct 30, 2025
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
18 changes: 0 additions & 18 deletions index.template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,24 +122,6 @@ <h5 class="modal-title" id="qrReaderModalLabel">QR Scanner</h5>
</div>
</div>

<!-- // Wallet Breakdown -->
<div class="modal fade" id="walletBreakdownModal" tabindex="-1" aria-labelledby="walletBreakdownModalLabel" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content exportKeysModalColor">
<div class="modal-header" style="display: flex; justify-content: center; padding-bottom: 0px;">
<h5 data-i18n="balanceBreakdown" class="modal-title" id="walletBreakdownModalLabel">Balance Breakdown</h5>
</div>
<div class="modal-body center-text" style="padding-bottom: 0px; padding-top: 0px;">
<canvas id="walletBreakdownCanvas"></canvas>
<div id="walletBreakdownLegend" style="padding-left: 14px; padding-top: 20px;"></div>
</div>
<div class="modal-footer" style="padding-top: 0px; display: flex; justify-content: center;">
<button type="button" class="pivx-button-big-cancel" data-dismiss="modal" aria-label="Close">Close</button>
</div>
</div>
</div>
</div>

<br />
<!-- // CONFIRM MODAL -->
<div class="modal" id="confirmModal" tabindex="-1" style="width: 100%; z-index: 2000; background-color: #201436db;" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
Expand Down
1,641 changes: 933 additions & 708 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"@fontsource/chivo": "^4.5.11",
"@fontsource/montserrat": "^4.5.14",
"@fortawesome/fontawesome-free": "^6.2.1",
"@ledgerhq/hw-app-btc": "^6.7.0",
"@ledgerhq/hw-transport-webusb": "^6.27.9",
"@ledgerhq/hw-app-btc": "^6",
"@ledgerhq/hw-transport-webusb": "^6.29.12",
"@noble/hashes": "^1.1.5",
"@noble/secp256k1": "^1.7.0",
"@popperjs/core": "^2.11.6",
Expand All @@ -88,6 +88,7 @@
"bs58": "^5.0.0",
"buffer": "^6.0.3",
"chart.js": "^4.2.1",
"color": "^5.0.2",
"country-locale-map": "^1.8.15",
"create-xpub": "^2.1.0",
"hdkey": "^2.0.1",
Expand Down
7 changes: 6 additions & 1 deletion scripts/Modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const props = defineProps({
show: Boolean,
modalClass: String,
headerClass: String,
centered: Boolean,
});
</script>
Expand All @@ -22,7 +23,11 @@ const props = defineProps({
class="modal-content exportKeysModalColor"
:class="modalClass"
>
<div class="modal-header" v-if="!!$slots.header">
<div
class="modal-header"
v-if="!!$slots.header"
:class="headerClass"
>
<slot name="header"></slot>
</div>
<div
Expand Down
241 changes: 0 additions & 241 deletions scripts/charting.js
View file
Open in desktop

This file was deleted.

14 changes: 12 additions & 2 deletions scripts/dashboard/Dashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import GenKeyWarning from './GenKeyWarning.vue';
import TransferMenu from './TransferMenu.vue';
import ExportPrivKey from './ExportPrivKey.vue';
import RestoreWallet from './RestoreWallet.vue';
import WalletBreakdown from './WalletBreakdown.vue';
import {
isExchangeAddress,
isShieldAddress,
Expand Down Expand Up @@ -34,7 +35,7 @@ import { LedgerController } from '../ledger';
import { guiAddContactPrompt } from '../contacts-book';
import { scanQRCode } from '../scanner';
import { useWallets } from '../composables/use_wallet.js';
import { setWallet, Wallet } from '../wallet.js';
import { Wallet } from '../wallet.js';
import { useSettings } from '../composables/use_settings.js';
import pLogo from '../../assets/p_logo.svg';
import pShieldLogo from '../../assets/icons/icon_shield_pivx.svg';
Expand Down Expand Up @@ -78,6 +79,7 @@ watch(

const showExportModal = ref(false);
const showEncryptModal = ref(false);
const showWalletBreakdown = ref(false);
const keyToBackup = ref('');
const transferAddress = ref('');
const transferDescription = ref('');
Expand Down Expand Up @@ -1074,10 +1076,14 @@ defineExpose({
:shieldEnabled="hasShield"
@send="showTransferMenu = true"
@exportPrivKeyOpen="showExportModal = true"
@showWalletBreakdown="showWalletBreakdown = true"
:publicMode="activeWallet.publicMode"
class="col-12 p-0 mb-2"
/>
<WalletButtons class="col-12 p-0 md-5" />
<WalletButtons
@showWalletBreakdown="showWalletBreakdown = true"
class="col-12 p-0 md-5"
/>
<Activity
class="col-12 p-0 mb-5"
title="Activity"
Expand Down Expand Up @@ -1107,4 +1113,8 @@ defineExpose({
:wallet="activeWallet"
@close="showRestoreWallet = false"
/>
<WalletBreakdown
v-if="showWalletBreakdown"
@close="showWalletBreakdown = false"
/>
</template>
Loading