Skip to content

Commit 74bae36

Browse files
authored
Merge pull request #999 from PayButton/feat/show-revenue-selected-time
feat: show revenue selected time
2 parents 755a7a4 + 927de8b commit 74bae36

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

pages/dashboard/index.tsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ export default function Dashboard ({ user }: PaybuttonsProps): React.ReactElemen
128128
<>
129129
<TopBar title="Dashboard" user={user.stUser?.email} />
130130
<div className={style.number_ctn}>
131-
<NumberBlock value={'$'.concat(formatQuoteValue(dashboardData.total.revenue, user.userProfile.preferredCurrencyId)) } text='Revenue (lifetime)' />
132-
<NumberBlock value={formatQuoteValue(dashboardData.total.payments)} text='Payments (lifetime)' />
131+
<NumberBlock value={'$'.concat(formatQuoteValue(activePeriod.totalRevenue, user.userProfile.preferredCurrencyId)) } text='Revenue' />
132+
<NumberBlock value={activePeriod.totalPayments} text='Payments' />
133133
<NumberBlock value={dashboardData.total.buttons} text='Buttons' />
134134
</div>
135135
<div className={style.btn_ctn}>
@@ -141,17 +141,19 @@ export default function Dashboard ({ user }: PaybuttonsProps): React.ReactElemen
141141
<div className={style.chart_outer_ctn}>
142142
<div className={style.chart_inner_ctn}>
143143
<div className={style.chart_title_ctn}>
144-
<h5>Revenue</h5>
145-
<h5>{totalString}: ${formatQuoteValue(activePeriod.totalRevenue, user.userProfile.preferredCurrencyId)}</h5>
144+
<div>
145+
<h5>Revenue</h5>
146+
</div>
146147
</div>
147148
<div className={style.chart_ctn}>
148149
<Chart chartData={activePeriod.revenue} currencyId={user.userProfile.preferredCurrencyId} />
149150
</div>
150151
</div>
151152
<div className={style.chart_inner_ctn}>
152153
<div className={style.chart_title_ctn}>
153-
<h5>Payments</h5>
154-
<h5>{totalString}: {formatQuoteValue(activePeriod.totalPayments)}</h5>
154+
<div>
155+
<h5>Payments</h5>
156+
</div>
155157
</div>
156158
<div className={style.chart_ctn}>
157159
<Chart chartData={activePeriod.payments} />

0 commit comments

Comments
 (0)