Skip to content

feat(frontend): simplify navbar wallet #2459

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

Merged
peterpeterparker merged 7 commits into from
Jan 7, 2026
Merged

feat(frontend): simplify navbar wallet #2459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e446c3a
feat(frontend): simplify navbar wallet
peterpeterparker Jan 4, 2026
de331b5
chore: fmt
peterpeterparker Jan 4, 2026
6fb9989
Merge branch 'main' into feat/simplify-navbar-wallet
peterpeterparker Jan 7, 2026
aa4bef0
feat: redo and label
peterpeterparker Jan 7, 2026
2b0936c
feat: remove ids
peterpeterparker Jan 7, 2026
0dac08e
feat: remove hr
peterpeterparker Jan 7, 2026
fd49bce
feat: spacing
peterpeterparker Jan 7, 2026
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
13 changes: 7 additions & 6 deletions src/frontend/src/lib/components/core/NavbarWallet.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
import { nonNullish } from '@dfinity/utils';
import IconWallet from '$lib/components/icons/IconWallet.svelte';
import ButtonIcon from '$lib/components/ui/ButtonIcon.svelte';
import Hr from '$lib/components/ui/Hr.svelte';

Check warning on line 5 in src/frontend/src/lib/components/core/NavbarWallet.svelte

View workflow job for this annotation

GitHub Actions / lint 

'Hr' is defined but never used. Allowed unused vars must match /^_/u
import Popover from '$lib/components/ui/Popover.svelte';
import WalletActions from '$lib/components/wallet/WalletActions.svelte';
import WalletIds from '$lib/components/wallet/WalletIds.svelte';
import WalletPicker from '$lib/components/wallet/WalletPicker.svelte';
import WalletTokenPicker from '$lib/components/wallet/WalletTokenPicker.svelte';
import WalletBalanceById from '$lib/components/wallet/balance/WalletBalanceById.svelte';
Expand Down Expand Up @@ -51,13 +50,11 @@
<WalletTotal />
</div>

<Hr />

<div class="picker selected-wallet">
<WalletPicker bind:selectedWallet />
</div>

<div class="picker">
<div class="picker token-selector">
<WalletTokenPicker {selectedWallet} bind:selectedToken />
</div>

Expand All @@ -68,8 +65,6 @@
{/if}

{#if nonNullish(selectedWallet)}
<WalletIds {selectedWallet} />

<div class="actions">
<WalletActions onreceive={openReceive} onsend={onclose} {selectedToken} {selectedWallet} />
</div>
Expand Down Expand Up @@ -105,6 +100,12 @@
padding: var(--padding-0_5x) 0 0;
}

.token-selector {
:global(div.picker) {
margin: 0 0 var(--padding-0_5x);
}
}

.picker {
:global(select) {
margin: var(--padding-0_5x) 0;
Expand Down
6 changes: 5 additions & 1 deletion src/frontend/src/lib/components/wallet/balance/WalletTotal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<script lang="ts">
import { nonNullish } from '@dfinity/utils';
import WalletBalanceCycles from '$lib/components/wallet/balance/WalletBalanceCycles.svelte';
import { missionControlId } from '$lib/derived/console/account.mission-control.derived';
import { balance } from '$lib/derived/wallet/balance.derived';
import { i18n } from '$lib/stores/app/i18n.store';

let label = $derived(nonNullish($missionControlId) ? $i18n.wallet.total : undefined);
</script>

<WalletBalanceCycles balance={$balance} label={$i18n.wallet.total} />
<WalletBalanceCycles balance={$balance} {label} />