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

feat: quick freeze/unfreeze utxos #591

Merged
merged 24 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5a06392
refactor(UtxoList): prevent re-rendering of list items
theborakompanioni Jan 9, 2023
c2f8cfb
ui(UtxoList): highlight frozen UTXOs
theborakompanioni Jan 9, 2023
952e582
ui(UtxoList): font and bg color for tags
theborakompanioni Jan 9, 2023
57a00e7
ui(UtxoList): remove redundant frozen tag
theborakompanioni Jan 9, 2023
6f87101
feat(UtxoList): sort UTXOs by tags
theborakompanioni Jan 9, 2023
4f1ae52
ui(UtxoList): shorten address on smaller screens
theborakompanioni Jan 9, 2023
68ccf08
ui(UtxoList): shorten fb tag by moving locktime to toolip
theborakompanioni Jan 9, 2023
e78e756
ui(UtxoList): increase font-weight for balance
theborakompanioni Jan 9, 2023
20c3eb9
ui(UtxoDetailsOverlay): fixed min-width for header title
theborakompanioni Jan 9, 2023
3b2bc03
refactor: prevent re-render confirmations node
theborakompanioni Jan 9, 2023
0389092
feat: ability to quickly freeze/unfreeze single UTXO
theborakompanioni Jan 9, 2023
a281d27
ui(UtxoList): display freeze buttons only on UTXO selection
theborakompanioni Jan 10, 2023
3fade90
ui: move quick freeze toggle column to front
theborakompanioni Jan 10, 2023
7ca2795
ui(UtxoList): use sun icon for unfreezing
theborakompanioni Jan 10, 2023
cf6f78c
ui: use header loading indicator when freezing/unfreezing
theborakompanioni Jan 10, 2023
4eb318b
ui(UtxoList): hide hover actions on small screens
theborakompanioni Jan 11, 2023
926fff5
ui(UtxoList): gray-out fidelity bond utxo
theborakompanioni Jan 11, 2023
0291e01
chore: rename UtxoDetailModule -> UtxoDetailModal
theborakompanioni Jan 11, 2023
c2002a4
fix: disable quick actions if maker/taker is running
theborakompanioni Jan 11, 2023
0e9baf4
fix: proper freeze/unfreeze icons
theborakompanioni Jan 11, 2023
27e1b05
fix: gray-out not only locked but all fidelity bond utxos
theborakompanioni Jan 11, 2023
8b01ac7
Merge branch 'master' into feat/quick-freeze-unfreeze-utxos
theborakompanioni Jan 13, 2023
3e75d74
fix: freeze/unfreeze icons from figma
theborakompanioni Jan 13, 2023
727ef98
fix: pass AbortSignal to freeze calls
theborakompanioni Jan 13, 2023
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
8 changes: 8 additions & 0 deletions public/sprite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 31 additions & 23 deletions src/components/jar_details/JarDetailsOverlay.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
margin: 0 1rem;
gap: 0.2rem;
color: var(--bs-gray-800);
min-width: 12ch;
}

:root[data-theme='dark'] .overlayContainer .accountStepperTitle {
Expand Down Expand Up @@ -68,6 +69,10 @@
background-color: var(--bs-gray-100);
}

.overlayContainer .tabContainer .utxoListTitleBar :global .balance-value {
font-weight: 600;
}

@media only screen and (min-width: 992px) {
.overlayContainer .tabContainer .utxoListTitleBar {
padding: 0.8rem 1rem;
Expand All @@ -79,14 +84,14 @@
background-color: var(--bs-gray-800);
}

.overlayContainer .tabContainer .utxoListTitleBar .freezeUnfreezeButtonsContainer {
.utxoListTitleBar .freezeUnfreezeButtonsContainer {
display: flex;
flex-direction: row;
gap: 0.5rem;
}

.overlayContainer .tabContainer .utxoListTitleBar .freezeUnfreezeButtonsContainer > button {
width: 8rem;
.freezeUnfreezeButtonsContainer button {
min-width: 6rem;
font-size: 0.6rem;
padding: 0.3rem 0.5rem;
display: flex;
Expand All @@ -99,33 +104,36 @@
border-radius: 0.35rem;
}

.overlayContainer .tabContainer .utxoListTitleBar .freezeUnfreezeButtonsContainer > button:hover {
background-color: var(--bs-btn-hover-bg);
border-color: var(--bs-btn-hover-border-color);
.freezeBtn {
color: var(--bs-blue) !important;
border-color: var(--bs-blue) !important;
}

@media only screen and (min-width: 768px) {
.overlayContainer .tabContainer .utxoListTitleBar .freezeUnfreezeButtonsContainer > button {
width: 10rem;
font-size: 0.8rem;
}
.freezeBtn:hover {
background-color: rgba(13, 110, 253, 0.07) !important;
}
.unfreezeBtn {
color: var(--bs-red) !important;
border-color: var(--bs-red) !important;
}
.unfreezeBtn:hover {
background-color: rgba(220, 53, 69, 0.07) !important;
}

:root[data-theme='dark'] .overlayContainer .tabContainer .utxoListTitleBar .freezeUnfreezeButtonsContainer > button {
background-color: var(--bs-gray-600) !important;
border-color: var(--bs-gray-600);
:root[data-theme='dark'] .freezeUnfreezeButtonsContainer button {
background-color: var(--bs-gray-800) !important;
}

:root[data-theme='dark']
.overlayContainer
.tabContainer
.utxoListTitleBar
.freezeUnfreezeButtonsContainer
> button:hover {
background-color: var(--bs-gray-700) !important;
border-color: var(--bs-gray-700);
:root[data-theme='dark'] .freezeUnfreezeButtonsContainer button:hover {
background-color: var(--bs-gray-900) !important;
border-color: var(--bs-gray-900) !important;
}

@media only screen and (min-width: 768px) {
.overlayContainer .utxoListTitleBar .freezeUnfreezeButtonsContainer button {
min-width: 8rem;
font-size: 0.8rem;
}
}
.overlayContainer .tabContainer .utxoListTitleBar .refreshButton {
display: flex;
justify-content: center;
Expand Down
Loading