Skip to content

Commit

Permalink
refactor StackModal
Browse files Browse the repository at this point in the history 
- extract StackFrequencyAndDates
- Rename StackOrdersProgress and move related orders componentd there
  • Loading branch information
@Diogomartf
Diogomartf committed Jun 12, 2024
1 parent 19aa80f commit 7d42c83
Show file tree
Hide file tree
Showing 3 changed files with 123 additions and 97 deletions.
54 changes: 54 additions & 0 deletions packages/app/components/stack-modal/StackFrequencyAndDates.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import {
StackOrderProps,
stackIsComplete,
stackIsFinishedWithFunds,
totalOrderSlotsDone,
} from "@/models";
import { BodyText } from "@/ui";
import { formatFrequencyHours, formatTimestampToDateWithTime } from "@/utils";
import { ReactNode } from "react";

const StackDetail = ({
title,
children,
}: {
title: string;
children: ReactNode;
}) => (
<div className="space-y-1">
<BodyText size={1} className="text-em-low">
{title}
</BodyText>
<BodyText size={1}>{children}</BodyText>
</div>
);

export const StackFrequencyAndDates = ({ stackOrder }: StackOrderProps) => {
const orderSlots = stackOrder.orderSlots;
const firstSlot = orderSlots[0];
const lastSlot = orderSlots[orderSlots.length - 1];
const nextSlot = orderSlots[totalOrderSlotsDone(stackOrder)];

return (
<div className="grid grid-cols-2 gap-5 px-4 md:px-6 gap-x-8 md:grid-cols-4">
<StackDetail title="Starts on">
{formatTimestampToDateWithTime(firstSlot)}
</StackDetail>
<StackDetail title="Ends on">
{formatTimestampToDateWithTime(lastSlot)}
</StackDetail>
<StackDetail title="Frequency">
Every {formatFrequencyHours(Number(stackOrder.interval))}
</StackDetail>
<StackDetail title="Next order">
{stackIsComplete(stackOrder)
? "Complete"
: stackIsFinishedWithFunds(stackOrder)
? "Finished with funds"
: stackOrder.cancelledAt
? "Cancelled"
: formatTimestampToDateWithTime(nextSlot)}
</StackDetail>
</div>
);
};
119 changes: 40 additions & 79 deletions packages/app/components/stack-modal/StackModal.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"use client";

import Link from "next/link";
import { ReactNode, useState } from "react";
import { useState } from "react";
import { cx } from "class-variance-authority";

import { orderPairSymbolsText, totalOrderSlotsDone } from "@/models/order";
import { orderPairSymbolsText } from "@/models/order";
import {
Modal,
ModalFooter,
Expand All @@ -13,40 +13,40 @@ import {
ModalContent,
BodyText,
ModalHeader,
TitleText,
ModalBaseProps,
DialogContent,
DialogFooterActions,
Dialog,
} from "@/ui";
import {
formatFrequencyHours,
formatTimestampToDateWithTime,
} from "@/utils/datetime";

import {
StackOrder,
StackOrderProps,
calculateStackAveragePrice,
totalStackOrdersDone,
totalStacked,
totalFundsUsed,
stackIsFinishedWithFunds,
stackIsComplete,
stackRemainingFunds,
} from "@/models/stack-order";
import { formatTokenValue } from "@/utils/token";
import { getDCAOrderContract } from "@stackly/sdk";
import { getExplorerLink } from "@/utils/transaction";
import { useEthersSigner } from "@/utils/ethers";

import {
DialogConfirmTransactionLoading,
FromToStackTokenPair,
TokenLogoPair,
TransactionLink,
} from "@/components";
import { StackProgress } from "@/components/stack-modal/StackProgress";
import { StackOrdersTable } from "@/components/stack-modal/StackOrdersTable";

import { StackOrdersProgress } from "@/components/stack-modal/StackOrdersProgress";
import { StackFrequencyAndDates } from "@/components/stack-modal/StackFrequencyAndDates";

import { formatTokenValue } from "@/utils/token";
import { getDCAOrderContract } from "@stackly/sdk";
import { getExplorerLink } from "@/utils/transaction";
import { useEthersSigner } from "@/utils/ethers";

import { ModalId, useModalContext, useNetworkContext } from "@/contexts";
import { TransactionLink } from "./TransactionLink";

import { Transaction } from "@/models/stack";

interface StackModalProps extends ModalBaseProps {
Expand Down Expand Up @@ -75,11 +75,6 @@ export const StackModal = ({

const [cancellationTx, setCancellationTx] = useState<Transaction>();

const orderSlots = stackOrder.orderSlots;
const firstSlot = orderSlots[0];
const lastSlot = orderSlots[orderSlots.length - 1];
const nextSlot = orderSlots[totalOrderSlotsDone(stackOrder)];

const stackRemainingFundsWithTokenText = `${stackRemainingFunds(
stackOrder
)} ${stackOrder.sellToken.symbol}`;
Expand Down Expand Up @@ -183,43 +178,15 @@ export const StackModal = ({
</div>
</ModalHeader>
<ModalContent className="px-0 space-y-4 md:px-0">
<div className="grid grid-cols-2 gap-5 px-4 md:px-6 gap-x-8 md:grid-cols-4">
<StackDetail title="Starts on">
{formatTimestampToDateWithTime(firstSlot)}
</StackDetail>
<StackDetail title="Ends on">
{formatTimestampToDateWithTime(lastSlot)}
</StackDetail>
<StackDetail title="Frequency">
Every {formatFrequencyHours(Number(stackOrder.interval))}
</StackDetail>
<StackDetail title="Next order">
{stackIsComplete(stackOrder)
? "Complete"
: stackIsFinishedWithFunds(stackOrder)
? "Finished with funds"
: stackOrder.cancelledAt
? "Cancelled"
: formatTimestampToDateWithTime(nextSlot)}
</StackDetail>
</div>
<StackFrequencyAndDates stackOrder={stackOrder} />
<div className="w-full my-4 border-b border-surface-50"></div>
{stackIsFinishedWithFunds(stackOrder) && (
<div className="px-4 md:px-6">
<HasRemainingFundsAlertMessage
remainingFundsWithSymbol={stackRemainingFundsWithTokenText}
/>
</div>
)}
<WarningHasRemainingFunds
stackOrder={stackOrder}
stackRemainingFundsWithTokenText={stackRemainingFundsWithTokenText}
/>
<div className="px-4 space-y-4 md:px-6">
<StackDigest stackOrder={stackOrder} />
<TitleText size={2} weight="bold">
Orders
</TitleText>
<StackProgress stackOrder={stackOrder} />
{totalStackOrdersDone(stackOrder) > 0 && (
<StackOrdersTable stackOrder={stackOrder} />
)}
<StackOrdersProgress stackOrder={stackOrder} />
</div>
</ModalContent>
<ModalFooter
Expand Down Expand Up @@ -307,29 +274,23 @@ const StackDigest = ({ stackOrder }: StackOrderProps) => (
</div>
);

const HasRemainingFundsAlertMessage = ({
remainingFundsWithSymbol,
}: {
remainingFundsWithSymbol: string;
}) => (
<div className="p-3 text-center rounded-lg bg-danger-75">
<BodyText className="text-em-med">
This contract has {remainingFundsWithSymbol} remaining funds.
</BodyText>
</div>
);
interface WarningHasRemainingFundsProps extends StackOrderProps {
stackRemainingFundsWithTokenText: string;
}

const StackDetail = ({
title,
children,
}: {
title: string;
children: ReactNode;
}) => (
<div className="space-y-1">
<BodyText size={1} className="text-em-low">
{title}
</BodyText>
<BodyText size={1}>{children}</BodyText>
</div>
);
const WarningHasRemainingFunds = ({
stackOrder,
stackRemainingFundsWithTokenText,
}: WarningHasRemainingFundsProps) => {
if (!stackIsFinishedWithFunds(stackOrder)) return;

return (
<div className="px-4 md:px-6">
<div className="p-3 text-center rounded-lg bg-danger-75">
<BodyText className="text-em-med">
This contract has {stackRemainingFundsWithTokenText} remaining funds.
</BodyText>
</div>
</div>
);
};
47 changes: 29 additions & 18 deletions .../components/stack-modal/StackProgress.tsx → ...nents/stack-modal/StackOrdersProgress.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
totalOrderSlotsDone,
} from "@/models/order";
import { OrdersProgressBar } from "@/components/OrdersProgressBar";
import { BodyText } from "@/ui";
import { BodyText, TitleText } from "@/ui";
import { TokenIcon } from "@/components/TokenIcon";
import {
StackOrderProps,
Expand All @@ -13,26 +13,37 @@ import {
estimatedTotalStack,
} from "@/models/stack-order";
import { formatTokenValue } from "@/utils/token";
import { StackOrdersTable } from "@/components/stack-modal/StackOrdersTable";

export const StackProgress = ({ stackOrder }: StackOrderProps) => (
<div className="space-y-2">
<div className="flex flex-col justify-between space-y-1 md:space-y-0 md:items-center md:flex-row">
<OrdersExecuted stackOrder={stackOrder} />
<div className="flex items-center space-x-1">
<BodyText size="responsive" className="text-em-low">
Total funds used:{" "}
<span className="text-em-high">
{formatTokenValue(totalFundsUsed(stackOrder), 2)}{" "}
<span className="text-xs">of</span>{" "}
{totalFundsAmountWithTokenText(stackOrder)}
</span>
</BodyText>
<TokenIcon size="xs" token={stackOrder.sellToken} />
export const StackOrdersProgress = ({ stackOrder }: StackOrderProps) => (
<>
<div>
<TitleText size={2} weight="bold" className="mb-2">
Orders
</TitleText>
<div className="space-y-2">
<div className="flex flex-col justify-between space-y-1 md:space-y-0 md:items-center md:flex-row">
<OrdersExecuted stackOrder={stackOrder} />
<div className="flex items-center space-x-1">
<BodyText size="responsive" className="text-em-low">
Total funds used:{" "}
<span className="text-em-high">
{formatTokenValue(totalFundsUsed(stackOrder), 2)}{" "}
<span className="text-xs">of</span>{" "}
{totalFundsAmountWithTokenText(stackOrder)}
</span>
</BodyText>
<TokenIcon size="xs" token={stackOrder.sellToken} />
</div>
</div>
<OrdersProgressBar stackOrder={stackOrder} />
<TotalStackEstimationText stackOrder={stackOrder} />
</div>
</div>
<OrdersProgressBar stackOrder={stackOrder} />
<TotalStackEstimationText stackOrder={stackOrder} />
</div>
{totalStackOrdersDone(stackOrder) > 0 && (
<StackOrdersTable stackOrder={stackOrder} />
)}
</>
);

const TotalStackEstimationText = ({ stackOrder }: StackOrderProps) => {
Expand Down

0 comments on commit 7d42c83

Please sign in to comment.