Skip to content

Commit b70341a

Browse files
przemyslaw-wlodekprzemyslaw-wlodek
authored
Merge branch 'develop' into fix/ddw-756-fix-popover-overlap
2 parents 54c4601 + 76cf83d commit b70341a

File tree

12 files changed

+113
-77
lines changed

12 files changed

+113
-77
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
### Fixes
1414

15+
- Fixed margin for dialogs content and token table header ([PR 2944](https://github.com/input-output-hk/daedalus/pull/2944))
1516
- Fixed performance issue on stake pool list view ([PR 2924](https://github.com/input-output-hk/daedalus/pull/2924))
1617
- Fixed catalyst fund name ([PR 2946](https://github.com/input-output-hk/daedalus/pull/2946))
1718
- Fixed position of popup on syncing screen ([PR 2921](https://github.com/input-output-hk/daedalus/pull/2921))

‎source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseWalletDialog.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
.SimpleBubble_bubble {
2727
border-radius: 2px !important;
2828
}
29+
30+
.Dialog_contentWrapper::-webkit-scrollbar-track {
31+
margin-top: -8px;
32+
}
2933
}
3034

3135
.content {

‎source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsConfirmationDialog.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,9 @@
8888
}
8989
}
9090
}
91+
92+
.Dialog_contentWrapper::-webkit-scrollbar-track {
93+
margin-top: -8px;
94+
}
9195
}
9296
}

‎source/renderer/app/components/wallet/WalletRestoreDialog.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137

138138
:global {
139139
.Dialog_contentWrapper::-webkit-scrollbar-track {
140-
margin-bottom: -8px;
141140
margin-top: -8px;
142141
}
143142
.Dialog_subtitle {

‎source/renderer/app/components/wallet/receive/WalletReceiveDialog.scss‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@
136136
line-height: 1.38;
137137
margin: 20px 0 12px;
138138

139+
&:last-child {
140+
margin-bottom: 0;
141+
}
142+
139143
b {
140144
font-family: var(--font-medium);
141145
}
@@ -150,7 +154,10 @@
150154
}
151155

152156
.SimpleRadio_root {
153-
margin-bottom: 20px;
157+
&:not(:last-child),
158+
&.SimpleRadio_selected {
159+
margin-bottom: 20px;
160+
}
154161

155162
.SimpleRadio_label {
156163
line-height: 1.38;

‎source/renderer/app/components/wallet/tokens/wallet-tokens-list/WalletTokensList.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
.columns {
2929
display: flex;
3030
justify-content: space-between;
31-
margin: 0 42px 10px 12px;
31+
margin: 0 42px 5px 12px;
3232
.column {
3333
color: var(--theme-bordered-box-text-color);
3434
font-family: var(--font-semibold);

‎source/renderer/app/components/wallet/wallet-import/WalletImportFileDialog.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@
115115
}
116116

117117
.radioButtons {
118+
margin-bottom: 20px;
119+
118120
:global {
119121
.RadioSet_label {
120122
color: var(--theme-wallet-import-stateFolder-label-color);

‎source/renderer/app/components/wallet/wallet-restore/WalletTypeDialog.tsx‎

Lines changed: 59 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -250,75 +250,67 @@ export default class WalletTypeDialog extends Component<Props, State> {
250250
]}
251251
onClose={onClose}
252252
>
253-
<div>
254-
{this.getWalletKind(
255-
WALLET_KINDS,
256-
messages.labelWalletKind,
257-
walletKind
253+
{this.getWalletKind(WALLET_KINDS, messages.labelWalletKind, walletKind)}
254+
{walletKind === WALLET_KINDS.DAEDALUS &&
255+
this.getWalletKind(
256+
WALLET_DAEDALUS_KINDS,
257+
messages.labelDaedalusWalletKind,
258+
walletKindDaedalus,
259+
WALLET_KINDS.DAEDALUS
258260
)}
259-
</div>
260-
<div>
261-
{walletKind === WALLET_KINDS.DAEDALUS &&
262-
this.getWalletKind(
263-
WALLET_DAEDALUS_KINDS,
264-
messages.labelDaedalusWalletKind,
265-
walletKindDaedalus,
266-
WALLET_KINDS.DAEDALUS
267-
)}
268-
{walletKind === WALLET_KINDS.YOROI &&
269-
this.getWalletKind(
270-
WALLET_YOROI_KINDS,
271-
messages.labelYoroiWalletKind,
272-
walletKindYoroi,
273-
WALLET_KINDS.YOROI
274-
)}
275-
{walletKind === WALLET_KINDS.HARDWARE && (
276-
<Fragment>
277-
{this.getWalletKind(
278-
WALLET_HARDWARE_KINDS,
279-
messages.labelHardwareWalletKind,
280-
walletKindHardware,
281-
WALLET_KINDS.HARDWARE
282-
)}
283-
<p className={styles.hardwareWalletAcceptance}>
284-
{intl.formatMessage(messages.hardwareWalletDisclaimer1)}
285-
</p>
286-
<p className={styles.hardwareWalletAcceptance}>
287-
{intl.formatMessage(messages.hardwareWalletDisclaimer2)}
288-
</p>
289-
<p className={styles.hardwareWalletAcceptance}>
290-
<b>{intl.formatMessage(messages.hardwareWalletDisclaimer3)}</b>
291-
</p>
292-
<Checkbox
293-
className="walletSecurityRisk"
294-
label={intl.formatMessage(messages.hardwareWalletCheckbox3)}
295-
onChange={() =>
296-
this.toggleAcceptance('hardwareWalletAcceptance3')
297-
}
298-
checked={hardwareWalletAcceptance3}
299-
skin={CheckboxSkin}
300-
/>
301-
<Checkbox
302-
className="restoreSecurityNote"
303-
label={intl.formatMessage(messages.hardwareWalletCheckbox1)}
304-
onChange={() =>
305-
this.toggleAcceptance('hardwareWalletAcceptance1')
306-
}
307-
checked={hardwareWalletAcceptance1}
308-
skin={CheckboxSkin}
309-
/>
310-
<Checkbox
311-
className="walletDeleteNote"
312-
label={intl.formatMessage(messages.hardwareWalletCheckbox2)}
313-
onChange={() =>
314-
this.toggleAcceptance('hardwareWalletAcceptance2')
315-
}
316-
checked={hardwareWalletAcceptance2}
317-
skin={CheckboxSkin}
318-
/>
319-
</Fragment>
261+
{walletKind === WALLET_KINDS.YOROI &&
262+
this.getWalletKind(
263+
WALLET_YOROI_KINDS,
264+
messages.labelYoroiWalletKind,
265+
walletKindYoroi,
266+
WALLET_KINDS.YOROI
320267
)}
321-
</div>
268+
{walletKind === WALLET_KINDS.HARDWARE && (
269+
<Fragment>
270+
{this.getWalletKind(
271+
WALLET_HARDWARE_KINDS,
272+
messages.labelHardwareWalletKind,
273+
walletKindHardware,
274+
WALLET_KINDS.HARDWARE
275+
)}
276+
<p className={styles.hardwareWalletAcceptance}>
277+
{intl.formatMessage(messages.hardwareWalletDisclaimer1)}
278+
</p>
279+
<p className={styles.hardwareWalletAcceptance}>
280+
{intl.formatMessage(messages.hardwareWalletDisclaimer2)}
281+
</p>
282+
<p className={styles.hardwareWalletAcceptance}>
283+
<b>{intl.formatMessage(messages.hardwareWalletDisclaimer3)}</b>
284+
</p>
285+
<Checkbox
286+
className="walletSecurityRisk"
287+
label={intl.formatMessage(messages.hardwareWalletCheckbox3)}
288+
onChange={() =>
289+
this.toggleAcceptance('hardwareWalletAcceptance3')
290+
}
291+
checked={hardwareWalletAcceptance3}
292+
skin={CheckboxSkin}
293+
/>
294+
<Checkbox
295+
className="restoreSecurityNote"
296+
label={intl.formatMessage(messages.hardwareWalletCheckbox1)}
297+
onChange={() =>
298+
this.toggleAcceptance('hardwareWalletAcceptance1')
299+
}
300+
checked={hardwareWalletAcceptance1}
301+
skin={CheckboxSkin}
302+
/>
303+
<Checkbox
304+
className="walletDeleteNote"
305+
label={intl.formatMessage(messages.hardwareWalletCheckbox2)}
306+
onChange={() =>
307+
this.toggleAcceptance('hardwareWalletAcceptance2')
308+
}
309+
checked={hardwareWalletAcceptance2}
310+
skin={CheckboxSkin}
311+
/>
312+
</Fragment>
313+
)}
322314
</WalletRestoreDialog>
323315
);
324316
}

‎source/renderer/app/components/widgets/Dialog.scss‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,34 @@
3939
}
4040

4141
&::-webkit-scrollbar-track {
42-
margin-bottom: 12px;
42+
margin-bottom: -8px;
4343
margin-top: 12px;
4444
}
4545

46+
.content {
47+
> *:last-child {
48+
margin-bottom: 0;
49+
}
50+
}
51+
}
52+
53+
& > .contentWithActions {
4654
.content {
4755
margin-bottom: 20px;
4856
}
57+
58+
&::-webkit-scrollbar-track {
59+
margin-bottom: 12px;
60+
}
4961
}
5062

5163
& > .actions {
5264
display: flex;
5365
flex-shrink: 0;
54-
margin-top: 10px;
66+
67+
&:not(:empty) {
68+
margin-top: 10px;
69+
}
5570

5671
&.columnDirection {
5772
align-items: center;

‎source/renderer/app/components/widgets/Dialog.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ export default class Dialog extends Component<Props> {
102102

103103
{children && (
104104
<div
105-
className={styles.contentWrapper}
105+
className={classnames(
106+
styles.contentWrapper,
107+
items.length && styles.contentWithActions
108+
)}
106109
ref={(ref) => {
107110
// @ts-ignore ts-migrate(2339) FIXME: Property 'current' does not exist on type 'unknown... Remove this comment to see the full error message
108111
if (scrollWrapperRef) scrollWrapperRef.current = ref;

0 commit comments

Comments
 (0)