Skip to content

Commit d7186af

Browse files
committed
Merge branch 'frontend-improve-accountsummary'
2 parents 84c7fc7 + 7a4a4ea commit d7186af

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

frontends/web/src/routes/account/summary/accountssummary.tsx

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import { unsubscribe } from '../../../utils/subscriptions';
2424
import { useMountedRef } from '../../../hooks/mount';
2525
import { useSDCard } from '../../../hooks/sdcard';
2626
import { Status } from '../../../components/status/status';
27-
import { Header } from '../../../components/layout';
27+
import { GuideWrapper, GuidedContent, Header, Main } from '../../../components/layout';
28+
import { View } from '../../../components/view/view';
2829
import { Chart } from './chart';
2930
import { SummaryBalance } from './summarybalance';
3031
import { AddBuyReceiveOnEmptyBalances } from '../info/buyReceiveCTA';
@@ -147,16 +148,16 @@ export function AccountsSummary({
147148
}, [onStatusChanged, getAccountsTotalBalance, accounts]);
148149

149150
return (
150-
<div className="contentWithGuide">
151-
<div className="container">
152-
<div className="innerContainer scrollableContainer">
151+
<GuideWrapper>
152+
<GuidedContent>
153+
<Main>
153154
<Status hidden={!hasCard} type="warning">
154155
{t('warning.sdcard')}
155156
</Status>
156157
<Header title={<h2>{t('accountSummary.title')}</h2>}>
157158
<HideAmountsButton />
158159
</Header>
159-
<div className="content padded">
160+
<View>
160161
<Chart
161162
hideAmounts={hideAmounts}
162163
data={summaryData}
@@ -171,9 +172,9 @@ export function AccountsSummary({
171172
totalBalancePerCoin={totalBalancePerCoin}
172173
balances={balances}
173174
/>
174-
</div>
175-
</div>
176-
</div>
175+
</View>
176+
</Main>
177+
</GuidedContent>
177178
<Guide>
178179
<Entry key="accountSummaryDescription" entry={t('guide.accountSummaryDescription')} />
179180
<Entry key="accountSummaryAmount" entry={{
@@ -186,6 +187,6 @@ export function AccountsSummary({
186187
}} />
187188
<Entry key="trackingModePortfolioChart" entry={t('guide.trackingModePortfolioChart')} />
188189
</Guide>
189-
</div>
190+
</GuideWrapper>
190191
);
191192
}

frontends/web/src/routes/account/summary/chart.module.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@
138138
position: relative;
139139
}
140140

141-
@media (max-width: 640px){
141+
@media (max-width: 640px) {
142142
.chartCanvas {
143-
width: 100vw;
144-
margin-left: calc(var(--space-half) * -1);
145-
}
143+
max-width: 100%;
144+
overflow: hidden;
145+
}
146146
}
147147

148148

0 commit comments

Comments
 (0)