Skip to content

Commit

Permalink
Move logic from wallet selectors to utils for activities
Browse files Browse the repository at this point in the history
  • Loading branch information
kkosiorowska committed Dec 9, 2024
1 parent 060d11a commit d2128ca
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
10 changes: 5 additions & 5 deletions dapp/src/pages/DashboardPage/PositionDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { featureFlags } from "#/constants"
import { TextMd } from "#/components/shared/Typography"
import { IconClockHour5Filled } from "@tabler/icons-react"
import TooltipIcon from "#/components/shared/TooltipIcon"
import { hasPendingDeposits } from "#/utils"
import AcreTVLMessage from "./AcreTVLMessage"

const isWithdrawalFlowEnabled = featureFlags.WITHDRAWALS_ENABLED
Expand All @@ -39,12 +40,13 @@ const buttonStyles: ButtonProps = {
}

export default function PositionDetails() {
const { data } = useBitcoinPosition()
const bitcoinAmount = data?.estimatedBitcoinBalance ?? 0n
const { data: bitcoinPosition } = useBitcoinPosition()
const bitcoinAmount = bitcoinPosition?.estimatedBitcoinBalance ?? 0n

const openDepositModal = useTransactionModal(ACTION_FLOW_TYPES.STAKE)
const openWithdrawModal = useTransactionModal(ACTION_FLOW_TYPES.UNSTAKE)
const activitiesCount = useActivitiesCount()
const { data: activities } = useActivities()
const isMobileMode = useMobileMode()

const { tvl } = useEnhancedStatistics()
Expand All @@ -54,15 +56,13 @@ export default function PositionDetails() {
const isDisabledForMobileMode =
isMobileMode && !featureFlags.MOBILE_MODE_ENABLED

const { hasPendingActivities } = useActivities()

return (
<Flex w="100%" flexDirection="column" gap={5}>
<VStack alignItems="start" spacing={0}>
{/* TODO: Component should be moved to `CardHeader` */}
<HStack>
<TextMd>Your Acre balance</TextMd>
{hasPendingActivities && (
{hasPendingDeposits(activities ?? []) && (
<TooltipIcon
icon={IconClockHour5Filled}
label="Your balance will update once the pending deposit is finalized."
Expand Down
5 changes: 5 additions & 0 deletions dapp/src/utils/activities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ export const isActivityCompleted = (activity: Activity): boolean =>
export const getActivityTimestamp = (activity: Activity): number =>
activity?.finalizedAt ?? activity.initializedAt

export const hasPendingDeposits = (activities: Activity[]): boolean =>
activities.some(
(activity) => activity.status === "pending" && activity.type === "deposit",
)

export const sortActivitiesByTimestamp = (activities: Activity[]): Activity[] =>
[...activities].sort(
(activity1, activity2) =>
Expand Down

0 comments on commit d2128ca

Please sign in to comment.