Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions pages/dashboard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ export default function Dashboard ({ user }: PaybuttonsProps): React.ReactElemen
<>
<TopBar title="Dashboard" user={user.stUser?.email} />
<div className={style.number_ctn}>
<NumberBlock value={'$'.concat(formatQuoteValue(dashboardData.total.revenue, user.userProfile.preferredCurrencyId)) } text='Revenue (lifetime)' />
<NumberBlock value={formatQuoteValue(dashboardData.total.payments)} text='Payments (lifetime)' />
<NumberBlock value={'$'.concat(formatQuoteValue(activePeriod.totalRevenue, user.userProfile.preferredCurrencyId)) } text='Revenue' />
<NumberBlock value={activePeriod.totalPayments} text='Payments' />
<NumberBlock value={dashboardData.total.buttons} text='Buttons' />
</div>
<div className={style.btn_ctn}>
Expand All @@ -141,17 +141,19 @@ export default function Dashboard ({ user }: PaybuttonsProps): React.ReactElemen
<div className={style.chart_outer_ctn}>
<div className={style.chart_inner_ctn}>
<div className={style.chart_title_ctn}>
<h5>Revenue</h5>
<h5>{totalString}: ${formatQuoteValue(activePeriod.totalRevenue, user.userProfile.preferredCurrencyId)}</h5>
<div>
<h5>Revenue</h5>
</div>
</div>
<div className={style.chart_ctn}>
<Chart chartData={activePeriod.revenue} currencyId={user.userProfile.preferredCurrencyId} />
</div>
</div>
<div className={style.chart_inner_ctn}>
<div className={style.chart_title_ctn}>
<h5>Payments</h5>
<h5>{totalString}: {formatQuoteValue(activePeriod.totalPayments)}</h5>
<div>
<h5>Payments</h5>
</div>
</div>
<div className={style.chart_ctn}>
<Chart chartData={activePeriod.payments} />
Expand Down