Skip to content

Commit 195712c

Browse files
Merge pull request #21 from HORNET-Storage/ui-fix/send-panel
UI-fix: send panel
2 parents 93a975b + 658fe25 commit 195712c

12 files changed

Lines changed: 320 additions & 180 deletions

File tree

.env.development

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
REACT_APP_BASE_URL=http://localhost:9002
22
# REACT_APP_BASE_URL=https://11561ba2d27f.ngrok.app
33
REACT_APP_ASSETS_BUCKET=http://localhost
4-
REACT_APP_DEMO_MODE=false
4+
REACT_APP_DEMO_MODE=true
55

66
# more info https://create-react-app.dev/docs/advanced-configuration
77
ESLINT_NO_DEV_ERRORS=true

src/components/layouts/main/MainContent/MainContent.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { BaseLayout } from '@app/components/common/BaseLayout/BaseLayout';
44

55
interface HeaderProps {
66
$isTwoColumnsLayout: boolean;
7+
$isDesktop: boolean;
78
}
89

910
export default styled(BaseLayout.Content)<HeaderProps>`
@@ -13,9 +14,14 @@ export default styled(BaseLayout.Content)<HeaderProps>`
1314
flex-direction: column;
1415
justify-content: space-between;
1516
17+
${(props) =>
18+
props?.$isDesktop &&
19+
css`
20+
z-index: 105;
21+
`}
22+
1623
@media only screen and ${media.md} {
17-
padding: ${LAYOUT.desktop.paddingVertical} 1.8rem 0
18-
${LAYOUT.desktop.paddingHorizontal};
24+
padding: ${LAYOUT.desktop.paddingVertical} 1.8rem 0 ${LAYOUT.desktop.paddingHorizontal};
1925
}
2026
2127
@media only screen and ${media.xl} {

src/components/layouts/main/MainLayout/MainLayout.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ const MainLayout: React.FC = () => {
7474
style={isDesktop ? { overflowY: 'hidden' } : { overflowY: 'auto' }}
7575
id="main-content"
7676
$isTwoColumnsLayout={isTwoColumnsLayout}
77+
$isDesktop={isDesktop}
7778
>
7879
<div>
7980
<Outlet />

src/components/nft-dashboard/Balance/Balance.styles.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { BaseTypography } from '@app/components/common/BaseTypography/BaseTypography';
22
import { FONT_FAMILY, FONT_SIZE, FONT_WEIGHT } from '@app/styles/themes/constants';
3-
import { BaseSwitch } from '@app/components/common/BaseSwitch/BaseSwitch';
3+
import { BaseRow } from '@app/components/common/BaseRow/BaseRow';
44
import styled from 'styled-components';
55

66
export const TitleText = styled(BaseTypography.Title)`
@@ -48,3 +48,7 @@ export const LabelSpan = styled.span`
4848
color: #fff; // Adjust color based on your theme
4949
font-size: 1rem; // Adjust size as needed
5050
`;
51+
export const BalanceButtonsContainers = styled(BaseRow)`
52+
width: 100%;
53+
padding: 0 1rem;
54+
`

src/components/nft-dashboard/Balance/Balance.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,14 @@ export const Balance: React.FC = () => {
6666
</BaseCol>
6767
</BaseRow>
6868
</BaseCol>
69-
70-
<BaseCol span={24}>
71-
<TopUpBalanceButton />
72-
</BaseCol>
73-
<BaseCol span={24}>
74-
<SendButton />
75-
</BaseCol>
69+
<S.BalanceButtonsContainers gutter={[0,20]}>
70+
<BaseCol span={24}>
71+
<SendButton />
72+
</BaseCol>
73+
<BaseCol span={24}>
74+
<TopUpBalanceButton />
75+
</BaseCol>
76+
</S.BalanceButtonsContainers>
7677
</BaseRow>
7778
</NFTCard>
7879
</BaseCol>

src/components/nft-dashboard/Balance/components/SendForm/SendForm.styles.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import styled from 'styled-components';
1+
import styled, { css } from 'styled-components';
22
import { BaseCard } from '@app/components/common/BaseCard/BaseCard';
33
import { BaseButton } from '@app/components/common/BaseButton/BaseButton';
44
import { BaseRow } from '@app/components/common/BaseRow/BaseRow';
@@ -13,7 +13,13 @@ export const TextRow = styled.div`
1313
gap: 1rem;
1414
`;
1515

16-
export const SubCard = styled(BaseCard)`
16+
export const SubCard = styled(BaseCard)<{ $isMobile?: boolean }>`
17+
width: 30%;
18+
${(props) =>
19+
props.$isMobile &&
20+
css`
21+
width: 100%;
22+
`}
1723
background-color: var(--additional-background-color);
1824
cursor: pointer;
1925
box-shadow: 0px 0px 10px 0px var(--shadow-color);
@@ -44,13 +50,15 @@ export const SubCardHeader = styled.span`
4450
`;
4551

4652
export const InputHeader = styled.span`
47-
font-size: 1.3rem;
53+
font-size: 1.5rem;
4854
`;
4955

5056
export const SubCardAmount = styled.span`
5157
font-size: 1.5rem;
5258
`;
5359
export const SubCardContent = styled.div`
60+
font-size: 1.3rem;
61+
height: 100%;
5462
display: flex;
5563
justify-content: space-around;
5664
flex-direction: column;
@@ -127,7 +135,6 @@ export const RateValue = styled.span`
127135
color: green;
128136
`;
129137
export const RBFWrapper = styled.div`
130-
131138
display: flex;
132139
flex-direction: row;
133140
gap: 1rem;

0 commit comments

Comments
 (0)