diff --git a/.changeset/dirty-berries-try.md b/.changeset/dirty-berries-try.md
new file mode 100644
index 000000000..a73ff3d63
--- /dev/null
+++ b/.changeset/dirty-berries-try.md
@@ -0,0 +1,5 @@
+---
+"@mochi-ui/pagination": minor
+---
+
+Add custom items per page & hide on single page
diff --git a/.changeset/twelve-dolphins-add.md b/.changeset/twelve-dolphins-add.md
new file mode 100644
index 000000000..8cf4e9357
--- /dev/null
+++ b/.changeset/twelve-dolphins-add.md
@@ -0,0 +1,5 @@
+---
+"@mochi-ui/pagination": minor
+---
+
+Add custom page input
diff --git a/apps/mochi-web/components/Profile/RecapSection.tsx b/apps/mochi-web/components/Profile/RecapSection.tsx
index 4ad2a4290..d089a1d6c 100644
--- a/apps/mochi-web/components/Profile/RecapSection.tsx
+++ b/apps/mochi-web/components/Profile/RecapSection.tsx
@@ -256,7 +256,7 @@ export const RecapSection = () => {
total_spending = 0,
total_volume = 0,
} = exchange || {}
- const totalExchange = total_spending + total_receive + total_volume
+ const totalExchange = total_spending + total_receive + mochiBalance
const receive_pnl = getPnl(exchange?.receive_pnl)
const spending_pnl = getPnl(exchange?.spending_pnl)
@@ -309,7 +309,7 @@ export const RecapSection = () => {
-
Mochi Exchange Flow
+
Exchange Flow Recap
{
: 0,
}}
/>
-
+
{[
{
- label: 'Received',
+ label: 'Income',
value: total_receive,
pnl: receive_pnl,
icon: (
@@ -368,13 +368,20 @@ export const RecapSection = () => {
),
},
{
- label: 'Sent',
+ label: 'Expense',
value: total_spending,
pnl: spending_pnl,
icon: (
),
},
+ {
+ label: 'Current balance',
+ value: mochiBalance,
+ icon: (
+
+ ),
+ },
].map((item) => (
@@ -383,34 +390,30 @@ export const RecapSection = () => {
{item.label}
- {`$${mochiUtils.formatDigit({
- value: item.value || 0,
- fractionDigits: 2,
- })}`}
+ {`${mochiUtils.formatUsdDigit(item.value || 0)}`}
-
- Compare with last period
-
-
- {mochiUtils.formatPercentDigit(
- Number.isNaN(Number(item.pnl)) || item.pnl === ''
- ? 0
- : Math.abs(Number(item.pnl)),
- )}
-
-
+ {!!item.pnl && (
+
+ Compare with last period
+
+
+ {mochiUtils.formatPercentDigit(
+ Number.isNaN(Number(item.pnl)) || item.pnl === ''
+ ? 0
+ : Math.abs(Number(item.pnl)),
+ )}
+
+
+ )}
))}
Net Worth
-
- {`$${mochiUtils.formatDigit({
- value: total_volume || 0,
- fractionDigits: 2,
- })}`}
-
+
+ {`${mochiUtils.formatUsdDigit(total_volume || 0)}`}
+
diff --git a/apps/mochi-web/components/Profile/TransactionSection.tsx b/apps/mochi-web/components/Profile/TransactionSection.tsx
index 1f50b1dc8..ad12414a9 100644
--- a/apps/mochi-web/components/Profile/TransactionSection.tsx
+++ b/apps/mochi-web/components/Profile/TransactionSection.tsx
@@ -95,6 +95,7 @@ export const TransactionOverviewSection = () => {
onItemPerPageChange: setSize,
onPageChange: setPage,
className: 'px-4',
+ allowCustomPage: true,
},
}}
onRow={(tx) => {
diff --git a/apps/mochi-web/components/ProfileDropdown.tsx b/apps/mochi-web/components/ProfileDropdown.tsx
index c83e5e346..4fab1ac62 100644
--- a/apps/mochi-web/components/ProfileDropdown.tsx
+++ b/apps/mochi-web/components/ProfileDropdown.tsx
@@ -101,7 +101,7 @@ export default function ProfileDropdown({
rightExtra={