Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dApp: Update copies #834

Merged
merged 4 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
11 changes: 4 additions & 7 deletions dapp/src/components/MezoBeehiveModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function MezoBeehiveModalBase() {
</HStack>
)}
<TextLg>
Acre users participate in Mezo points program automatically as a
Acre users are automatically part of the Mezo Points program as a
group.
</TextLg>
</VStack>
Expand Down Expand Up @@ -84,16 +84,13 @@ function MezoBeehiveModalBase() {
>
<CardHeader p={0} as={HStack}>
<Icon as={IconChartPieFilled} color="brand.400" boxSize={5} />
<TextMd lineHeight={5} fontWeight="bold">
Your share
</TextMd>
</CardHeader>

<CardBody p={0}>
<TextMd lineHeight={5}>
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.
nkuba marked this conversation as resolved.
Show resolved Hide resolved
</TextMd>
</CardBody>
</Card>
Expand Down
2 changes: 1 addition & 1 deletion dapp/src/components/shared/Pagination/PaginationStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function PaginationStatus(props: PaginationStatusProps) {

return (
<TextSm {...restProps}>
Showing {rangeStart}-{rangeEnd} out of {totalSize} {dataLabel}
{rangeStart}-{rangeEnd} out of {totalSize} {dataLabel}
</TextSm>
)
}
Expand Down
2 changes: 1 addition & 1 deletion dapp/src/pages/DashboardPage/AcrePointsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default function AcrePointsCard(props: CardProps) {
>
<CardHeader p={0} mb={2} as={HStack} justify="space-between">
<TextMd fontWeight="bold" color="grey.700">
Your Acre points balance
Total Acre points
</TextMd>

{isConnected && (
Expand Down
7 changes: 3 additions & 4 deletions dapp/src/pages/DashboardPage/BeehiveCard.tsx
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -41,7 +41,7 @@ export default function BeehiveCard(props: CardProps) {
gap={2}
>
<TextMd fontWeight="bold" color="grey.700">
L2 Rewards
Additional rewards
</TextMd>
<InfoTooltip
label="Acre Beehive automatically collects rewards from our partner projects. Rewards are dropped daily, and your share is calculated based on your deposit amount and how long you HODL."
Expand Down Expand Up @@ -91,7 +91,7 @@ export default function BeehiveCard(props: CardProps) {
query="Mezo"
styles={{ fontWeight: "bold", color: "grey.700" }}
>
Collecting mats from Mezo
Total collected mats from Mezo
</Highlight>
</TextMd>

Expand All @@ -114,7 +114,6 @@ export default function BeehiveCard(props: CardProps) {
<H6 fontWeight="bold">
{numberToLocaleString(data.totalMats)}
</H6>
<TextLg fontWeight="bold">MATS</TextLg>
</HStack>
)}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export default function TransactionTable() {
<PaginationButton mode="next" />
</HStack>

<PaginationStatus dataLabel="transactions" color="grey.500" />
<PaginationStatus dataLabel="entries" color="grey.500" />
</PaginationFooter>
</Pagination>
)
Expand Down
Loading