Skip to content

Commit a05ee8d

Browse files
authored
[DDW-746] Wallet settings screen - no space at the bottom when scrolled down (#2686)
* [DDW-746] Fixed UI issue caused by the electron upgrade * [DDW-746] Added new entry in CHANGELOG * [DDW-746] Fixed wrong sizing in transactions * [DDW-746] Fixed eslint Issue * [DDW-746] Fixed height issues in pages * [DDW-746] Upgraded version * [DDW-746] Updated CHANGELOG * [DDW-746] Changed layout display to flex * [DDW-746] Fixed layout in UTXO Distribution page * [DDW-746] Fixed preetier * [DDW-746] Added this fix to vNext
1 parent 40aafd9 commit a05ee8d

File tree

15 files changed

+36
-29
lines changed

15 files changed

+36
-29
lines changed

CHANGELOG.md

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

55
### Fixes
66

7+
- Fixed wallet settings screen - no space at the bottom when scrolled down ([PR 2686](https://github.com/input-output-hk/daedalus/pull/2686))
78
- Fixed the missing text for the DAPP static screens ([PR 2693](https://github.com/input-output-hk/daedalus/pull/2693))
89

910
### Chores
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
// @flow
2-
import React, { Component } from 'react';
2+
import React, { memo } from 'react';
33
import type { Node } from 'react';
4-
import { observer } from 'mobx-react';
54
import styles from './VerticalFlexContainer.scss';
65

76
type Props = {
87
children?: ?Node,
98
};
109

11-
@observer
12-
export default class VerticalFlexContainer extends Component<Props> {
13-
render() {
14-
const { children } = this.props;
15-
return <div className={styles.component}>{children}</div>;
16-
}
17-
}
10+
const VerticalFlexContainer = ({ children }: Props) => (
11+
<div className={styles.component}>{children}</div>
12+
);
13+
export default memo<Props>(VerticalFlexContainer);

source/renderer/app/components/wallet/layouts/WalletWithNavigation.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
}
1818

1919
.page {
20-
height: calc(100% - 50px);
20+
flex: 1;
21+
flex-direction: column;
22+
flex-grow: 1;
2123
overflow-x: hidden;
2224
overflow-y: overlay;
23-
position: relative;
2425
}
2526

2627
.settingsTabPage {

source/renderer/app/components/wallet/receive/VirtualAddressesList.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.component {
2-
height: 100%;
3-
width: 100%;
4-
width: -webkit-calc(100% + 20px);
2+
flex: 1;
3+
flex-grow: 1;
54

65
*::-webkit-scrollbar-button {
76
display: none;

source/renderer/app/components/wallet/receive/WalletReceiveSequential.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33

44
.component {
55
color: var(--theme-bordered-box-text-color);
6+
display: flex;
67
flex: 1;
8+
flex-direction: column;
79
font-family: var(--font-regular);
8-
min-height: 500px;
10+
height: 100%;
11+
min-height: 250px;
912
overflow-x: hidden;
1013
overflow-y: overlay;
1114
padding: 20px;
@@ -53,6 +56,7 @@
5356
display: flex;
5457
flex: 1;
5558
flex-direction: column;
59+
flex-grow: 1;
5660
font-family: var(--font-regular);
5761
font-size: 16px;
5862
line-height: 22px;

source/renderer/app/components/wallet/settings/WalletSettings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ export default class WalletSettings extends Component<Props, State> {
304304
: intl.formatMessage(messages.passwordNotSet);
305305

306306
return (
307-
<div className={styles.component}>
307+
<div className={styles.root}>
308308
<BorderedBox>
309309
<InlineEditingInput
310310
className="walletName"

source/renderer/app/components/wallet/settings/WalletSettings.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
@import '../../../themes/mixins/error-message';
22

3-
.component {
3+
.root {
44
background-color: var(--theme-main-body-background-color);
55
display: flex;
66
flex-direction: column;
77
font-family: var(--font-regular);
8-
height: 100%;
9-
padding: 20px;
8+
padding: 20px 20px 0 20px;
109

1110
:global {
1211
.SimpleFormField_label {

source/renderer/app/components/wallet/transactions/WalletTransactions.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import WalletTransactionsList, {
88
import WalletTransactionsHeader from './WalletTransactionsHeader';
99
import FilterResultInfo from './FilterResultInfo';
1010
import WalletNoTransactions from './WalletNoTransactions';
11-
import VerticalFlexContainer from '../../layout/VerticalFlexContainer';
1211
import { formattedWalletAmount } from '../../../utils/formatters';
1312
import { getNumberOfFilterDimensionsApplied } from '../../../utils/transaction';
1413
import { WalletTransaction } from '../../../domains/WalletTransaction';
@@ -165,7 +164,7 @@ export default class WalletTransactions extends Component<Props, State> {
165164
numberFormat: currentNumberFormat,
166165
}}
167166
/>
168-
<VerticalFlexContainer>{walletTransactions}</VerticalFlexContainer>
167+
{walletTransactions}
169168
</div>
170169
</WalletTransactionsListScrollContext.Provider>
171170
);
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
.component {
2+
align-items: center;
3+
display: flex;
4+
flex: 1;
5+
flex-direction: column;
6+
flex-grow: 1;
27
height: 100%;
38
padding-top: 53px;
49
}

source/renderer/app/components/wallet/transactions/WalletTransactionsHeader.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
padding: 0 40px;
1010
position: relative;
1111
transition: box-shadow 0.25s ease-out;
12+
width: 100%;
1213
z-index: 1;
1314
&.isScrolling {
1415
box-shadow: 0 2.5px 10px 0 rgba(0, 0, 0, 0.25);

0 commit comments

Comments
 (0)