From a5c8b45f081f45632311f81c9ca2dc5ad9a0f3a0 Mon Sep 17 00:00:00 2001 From: Kamil Pyszkowski Date: Thu, 7 Nov 2024 13:24:36 +0100 Subject: [PATCH 1/3] Update copies --- dapp/src/components/MezoBeehiveModal.tsx | 11 ++++------- .../components/shared/Pagination/PaginationStatus.tsx | 2 +- dapp/src/pages/DashboardPage/AcrePointsCard.tsx | 2 +- dapp/src/pages/DashboardPage/BeehiveCard.tsx | 7 +++---- .../TransactionHistory/TransactionTable.tsx | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dapp/src/components/MezoBeehiveModal.tsx b/dapp/src/components/MezoBeehiveModal.tsx index 2a3f50834..68f7ce96f 100644 --- a/dapp/src/components/MezoBeehiveModal.tsx +++ b/dapp/src/components/MezoBeehiveModal.tsx @@ -51,7 +51,7 @@ function MezoBeehiveModalBase() { )} - Acre users participate in Mezo points program automatically as a + Acre users are automatically part of the Mezo Points program as a group. @@ -84,16 +84,13 @@ function MezoBeehiveModalBase() { > - - Your share - - In the event of a reward distribution, your share will be - calculated based on your deposit amount and duration. You will - be able to claim your share directly from Acre. + In the event of a reward distribution, your share is calculated + by deposit amount and duration, and you can claim it directly + from ACRE. diff --git a/dapp/src/components/shared/Pagination/PaginationStatus.tsx b/dapp/src/components/shared/Pagination/PaginationStatus.tsx index 2677d5c3c..b08e5d359 100644 --- a/dapp/src/components/shared/Pagination/PaginationStatus.tsx +++ b/dapp/src/components/shared/Pagination/PaginationStatus.tsx @@ -31,7 +31,7 @@ function PaginationStatus(props: PaginationStatusProps) { return ( - Showing {rangeStart}-{rangeEnd} out of {totalSize} {dataLabel} + {rangeStart}-{rangeEnd} out of {totalSize} {dataLabel} ) } diff --git a/dapp/src/pages/DashboardPage/AcrePointsCard.tsx b/dapp/src/pages/DashboardPage/AcrePointsCard.tsx index 1973ad777..1df2bd9f8 100644 --- a/dapp/src/pages/DashboardPage/AcrePointsCard.tsx +++ b/dapp/src/pages/DashboardPage/AcrePointsCard.tsx @@ -54,7 +54,7 @@ export default function AcrePointsCard(props: CardProps) { > - Your Acre points balance + Total Acre points {isConnected && ( diff --git a/dapp/src/pages/DashboardPage/BeehiveCard.tsx b/dapp/src/pages/DashboardPage/BeehiveCard.tsx index cd6ef672d..9847abeaf 100644 --- a/dapp/src/pages/DashboardPage/BeehiveCard.tsx +++ b/dapp/src/pages/DashboardPage/BeehiveCard.tsx @@ -1,5 +1,5 @@ import React from "react" -import { H6, TextLg, TextMd } from "#/components/shared/Typography" +import { H6, TextMd } from "#/components/shared/Typography" import { Button, Card, @@ -41,7 +41,7 @@ export default function BeehiveCard(props: CardProps) { gap={2} > - L2 Rewards + Additional rewards - Collecting mats from Mezo + Total collected mats from Mezo @@ -114,7 +114,6 @@ export default function BeehiveCard(props: CardProps) {
{numberToLocaleString(data.totalMats)}
- MATS )} diff --git a/dapp/src/pages/DashboardPage/TransactionHistory/TransactionTable.tsx b/dapp/src/pages/DashboardPage/TransactionHistory/TransactionTable.tsx index 71a4d1a89..fd4fc94ec 100644 --- a/dapp/src/pages/DashboardPage/TransactionHistory/TransactionTable.tsx +++ b/dapp/src/pages/DashboardPage/TransactionHistory/TransactionTable.tsx @@ -107,7 +107,7 @@ export default function TransactionTable() { - + ) From ac7c5182b16b41250665d18e4a2f52b8cc99106a Mon Sep 17 00:00:00 2001 From: Kamil Pyszkowski Date: Thu, 7 Nov 2024 14:08:28 +0100 Subject: [PATCH 2/3] Update copy --- dapp/src/components/MezoBeehiveModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dapp/src/components/MezoBeehiveModal.tsx b/dapp/src/components/MezoBeehiveModal.tsx index 68f7ce96f..a294e4df1 100644 --- a/dapp/src/components/MezoBeehiveModal.tsx +++ b/dapp/src/components/MezoBeehiveModal.tsx @@ -90,7 +90,7 @@ function MezoBeehiveModalBase() { In the event of a reward distribution, your share is calculated by deposit amount and duration, and you can claim it directly - from ACRE. + from Acre. From d1139d9678e4c2bda657c3788947ec03cc8cb000 Mon Sep 17 00:00:00 2001 From: Kamil Pyszkowski Date: Thu, 7 Nov 2024 15:19:31 +0100 Subject: [PATCH 3/3] Update copy --- dapp/src/pages/DashboardPage/PositionDetails.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dapp/src/pages/DashboardPage/PositionDetails.tsx b/dapp/src/pages/DashboardPage/PositionDetails.tsx index 563bf3822..997ba8f5f 100644 --- a/dapp/src/pages/DashboardPage/PositionDetails.tsx +++ b/dapp/src/pages/DashboardPage/PositionDetails.tsx @@ -38,7 +38,7 @@ export default function PositionDetails() { - Acre balance + Your deposit {/* TODO: Uncomment when position will be implemented */} {/* {positionPercentage && (