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.

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

web-wallet: Fix Receive tab content overflows #1902

Merged
merged 1 commit into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions web-wallet/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Update Buttons to match the design system [#1606]

### Fixed

- Fix Receive tab content overflows [#1901]

## [0.5.0] - 2024-03-27

### Added
Expand Down Expand Up @@ -216,6 +220,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#1591]: https://github.com/dusk-network/rusk/issues/1591
[#1598]: https://github.com/dusk-network/rusk/issues/1598
[#1606]: https://github.com/dusk-network/rusk/issues/1606
[#1901]: https://github.com/dusk-network/rusk/issues/1901

<!-- VERSIONS -->

Expand Down
13 changes: 3 additions & 10 deletions web-wallet/src/lib/components/Receive/Receive.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
export let hideBackButton = false;

let offsetHeight = 0;
let receiveAddressHeight = 0;
let buttonHeight = 0;

const COLUMN_COUNT = 2;
Expand All @@ -24,21 +23,14 @@
const dispatch = createEventDispatcher();

$: qrWidth =
offsetHeight -
receiveAddressHeight -
buttonHeight -
COLUMN_COUNT * COLUMN_WIDTH -
BOTTOM_PADDING;
offsetHeight - buttonHeight - COLUMN_COUNT * COLUMN_WIDTH - BOTTOM_PADDING;
</script>

<div class="receive" bind:offsetHeight>
<figure class="receive__address-qr-figure">
<QrCode value={address} className="receive__qr" width={qrWidth} />

<figcaption
class="receive__address"
bind:offsetHeight={receiveAddressHeight}
>
<figcaption class="receive__address">
<samp>{address}</samp>
</figcaption>
</figure>
Expand Down Expand Up @@ -80,6 +72,7 @@
left: 0;
z-index: 3;
height: 100%;
overflow: auto;

&__address-qr-figure {
display: flex;
Expand Down
Loading