From 4bac4c4fdf7c208b58941f2b8a56ce4d898c6357 Mon Sep 17 00:00:00 2001 From: Karolina Kosiorowska Date: Fri, 27 Dec 2024 09:21:34 +0100 Subject: [PATCH] Remove `shared` directory The `shared` catalog was confusing, let's move all components a level higher. --- dapp/src/components/AcrePointsClaimModal.tsx | 2 +- dapp/src/components/{shared => }/Alert.tsx | 0 .../{shared => }/AnimatedNumber/AnimatedNumberColumn.tsx | 0 .../{shared => }/AnimatedNumber/AnimatedNumberSeparator.tsx | 0 dapp/src/components/{shared => }/AnimatedNumber/index.tsx | 0 dapp/src/components/ArrivingSoonTooltip.tsx | 2 +- dapp/src/components/{shared => }/BlockExplorerLink.tsx | 0 .../components/ConnectWalletModal/ConnectWalletAlert.tsx | 2 +- .../components/ConnectWalletModal/ConnectWalletButton.tsx | 2 +- .../ConnectWalletModal/ConnectWalletStatusLabel.tsx | 2 +- dapp/src/components/{shared => }/Countdown.tsx | 0 dapp/src/components/{shared => }/CurrencyBalance.tsx | 0 .../{shared => }/CurrencyBalanceWithConversion.tsx | 0 .../{shared => }/FeesDetails/FeesDetailsAmountItem.tsx | 0 dapp/src/components/{shared => }/FeesDetails/index.tsx | 0 dapp/src/components/{shared => }/Form/Form.tsx | 0 dapp/src/components/{shared => }/Form/FormInput.tsx | 0 dapp/src/components/{shared => }/Form/FormSubmitButton.tsx | 0 .../components/{shared => }/Form/FormTokenBalanceInput.tsx | 0 dapp/src/components/{shared => }/Form/HelperErrorText.tsx | 0 dapp/src/components/{shared => }/Form/index.tsx | 0 dapp/src/components/GateModal.tsx | 4 ++-- dapp/src/components/Header/ConnectWallet.tsx | 4 ++-- dapp/src/components/{shared => }/IconWrapper.tsx | 0 dapp/src/components/{shared => }/LiveTag.tsx | 0 dapp/src/components/{shared => }/LoadingButton.tsx | 0 dapp/src/components/MobileModeBanner/index.tsx | 2 +- dapp/src/components/{shared => }/NumberFormatInput.tsx | 0 dapp/src/components/{shared => }/Pagination/Pagination.tsx | 0 .../components/{shared => }/Pagination/PaginationButton.tsx | 0 .../components/{shared => }/Pagination/PaginationFooter.tsx | 0 .../components/{shared => }/Pagination/PaginationPage.tsx | 0 .../components/{shared => }/Pagination/PaginationStatus.tsx | 0 dapp/src/components/{shared => }/Pagination/index.ts | 0 .../{shared => }/PasswordForm/PasswordFormBase.tsx | 0 dapp/src/components/{shared => }/PasswordForm/index.tsx | 0 dapp/src/components/{shared => }/ProgressBar.tsx | 0 dapp/src/components/{shared => }/Skeleton.tsx | 0 dapp/src/components/{shared => }/Spinner.tsx | 0 .../{shared => }/TokenAmountForm/TokenAmountFormBase.tsx | 0 dapp/src/components/{shared => }/TokenAmountForm/index.tsx | 0 dapp/src/components/{shared => }/TokenBalanceInput.tsx | 0 dapp/src/components/{shared => }/Tooltip.tsx | 0 dapp/src/components/{shared => }/TooltipIcon.tsx | 0 .../TransactionDetails/TransactionDetailsAmountItem.tsx | 0 .../components/{shared => }/TransactionDetails/index.tsx | 0 .../TransactionModal/ActionDurationEstimation.tsx | 2 +- dapp/src/components/TransactionModal/ActionFormModal.tsx | 2 +- .../StakeFormModal/AcrePointsRewardEstimation.tsx | 2 +- .../ActiveStakingStep/StakeFormModal/StakeDetails.tsx | 6 +++--- .../ActiveStakingStep/StakeFormModal/index.tsx | 6 +++--- .../ActiveStakingStep/StakingErrorModal/RetryModal.tsx | 4 ++-- .../StakingErrorModal/ServerErrorModal.tsx | 4 ++-- .../ActiveUnstakingStep/BuildTransactionModal.tsx | 2 +- .../ActiveUnstakingStep/NotEnoughFundsModal.tsx | 4 ++-- .../ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx | 6 +++--- .../ActiveUnstakingStep/UnstakeFormModal/index.tsx | 6 +++--- .../TransactionModal/FeesTooltip/FeesTooltipItem.tsx | 2 +- dapp/src/components/TransactionModal/FeesTooltip/index.tsx | 2 +- dapp/src/components/TransactionModal/ResumeModal.tsx | 3 +-- dapp/src/components/TransactionModal/SuccessModal.tsx | 6 +++--- .../components/TransactionModal/WalletInteractionModal.tsx | 2 +- dapp/src/components/{shared => }/UserDataSkeleton.tsx | 0 .../pages/DashboardPage/AcrePointsCard/AcrePointsLabel.tsx | 2 +- .../pages/DashboardPage/AcrePointsCard/UserPointsLabel.tsx | 4 ++-- dapp/src/pages/DashboardPage/AcrePointsCard/index.tsx | 4 ++-- dapp/src/pages/DashboardPage/AcrePointsTemplateCard.tsx | 2 +- dapp/src/pages/DashboardPage/AcreTVLMessage.tsx | 2 +- dapp/src/pages/DashboardPage/AcreTVLProgress.tsx | 4 ++-- dapp/src/pages/DashboardPage/BeehiveCard.tsx | 4 ++-- dapp/src/pages/DashboardPage/PositionDetails.tsx | 6 +++--- .../DashboardPage/TransactionHistory/EstimatedDuration.tsx | 2 +- .../DashboardPage/TransactionHistory/TransactionTable.tsx | 6 +++--- dapp/src/pages/DashboardPage/TransactionHistory/index.tsx | 2 +- 74 files changed, 58 insertions(+), 59 deletions(-) rename dapp/src/components/{shared => }/Alert.tsx (100%) rename dapp/src/components/{shared => }/AnimatedNumber/AnimatedNumberColumn.tsx (100%) rename dapp/src/components/{shared => }/AnimatedNumber/AnimatedNumberSeparator.tsx (100%) rename dapp/src/components/{shared => }/AnimatedNumber/index.tsx (100%) rename dapp/src/components/{shared => }/BlockExplorerLink.tsx (100%) rename dapp/src/components/{shared => }/Countdown.tsx (100%) rename dapp/src/components/{shared => }/CurrencyBalance.tsx (100%) rename dapp/src/components/{shared => }/CurrencyBalanceWithConversion.tsx (100%) rename dapp/src/components/{shared => }/FeesDetails/FeesDetailsAmountItem.tsx (100%) rename dapp/src/components/{shared => }/FeesDetails/index.tsx (100%) rename dapp/src/components/{shared => }/Form/Form.tsx (100%) rename dapp/src/components/{shared => }/Form/FormInput.tsx (100%) rename dapp/src/components/{shared => }/Form/FormSubmitButton.tsx (100%) rename dapp/src/components/{shared => }/Form/FormTokenBalanceInput.tsx (100%) rename dapp/src/components/{shared => }/Form/HelperErrorText.tsx (100%) rename dapp/src/components/{shared => }/Form/index.tsx (100%) rename dapp/src/components/{shared => }/IconWrapper.tsx (100%) rename dapp/src/components/{shared => }/LiveTag.tsx (100%) rename dapp/src/components/{shared => }/LoadingButton.tsx (100%) rename dapp/src/components/{shared => }/NumberFormatInput.tsx (100%) rename dapp/src/components/{shared => }/Pagination/Pagination.tsx (100%) rename dapp/src/components/{shared => }/Pagination/PaginationButton.tsx (100%) rename dapp/src/components/{shared => }/Pagination/PaginationFooter.tsx (100%) rename dapp/src/components/{shared => }/Pagination/PaginationPage.tsx (100%) rename dapp/src/components/{shared => }/Pagination/PaginationStatus.tsx (100%) rename dapp/src/components/{shared => }/Pagination/index.ts (100%) rename dapp/src/components/{shared => }/PasswordForm/PasswordFormBase.tsx (100%) rename dapp/src/components/{shared => }/PasswordForm/index.tsx (100%) rename dapp/src/components/{shared => }/ProgressBar.tsx (100%) rename dapp/src/components/{shared => }/Skeleton.tsx (100%) rename dapp/src/components/{shared => }/Spinner.tsx (100%) rename dapp/src/components/{shared => }/TokenAmountForm/TokenAmountFormBase.tsx (100%) rename dapp/src/components/{shared => }/TokenAmountForm/index.tsx (100%) rename dapp/src/components/{shared => }/TokenBalanceInput.tsx (100%) rename dapp/src/components/{shared => }/Tooltip.tsx (100%) rename dapp/src/components/{shared => }/TooltipIcon.tsx (100%) rename dapp/src/components/{shared => }/TransactionDetails/TransactionDetailsAmountItem.tsx (100%) rename dapp/src/components/{shared => }/TransactionDetails/index.tsx (100%) rename dapp/src/components/{shared => }/UserDataSkeleton.tsx (100%) diff --git a/dapp/src/components/AcrePointsClaimModal.tsx b/dapp/src/components/AcrePointsClaimModal.tsx index baf32284a..d6f7988f9 100644 --- a/dapp/src/components/AcrePointsClaimModal.tsx +++ b/dapp/src/components/AcrePointsClaimModal.tsx @@ -12,7 +12,7 @@ import { time } from "#/constants" import ConfettiExplosion from "react-confetti-explosion" import { BaseModalProps } from "#/types" import withBaseModal from "./ModalRoot/withBaseModal" -import AnimatedNumber from "./shared/AnimatedNumber" +import AnimatedNumber from "./AnimatedNumber" const MotionBox = motion(Box) diff --git a/dapp/src/components/shared/Alert.tsx b/dapp/src/components/Alert.tsx similarity index 100% rename from dapp/src/components/shared/Alert.tsx rename to dapp/src/components/Alert.tsx diff --git a/dapp/src/components/shared/AnimatedNumber/AnimatedNumberColumn.tsx b/dapp/src/components/AnimatedNumber/AnimatedNumberColumn.tsx similarity index 100% rename from dapp/src/components/shared/AnimatedNumber/AnimatedNumberColumn.tsx rename to dapp/src/components/AnimatedNumber/AnimatedNumberColumn.tsx diff --git a/dapp/src/components/shared/AnimatedNumber/AnimatedNumberSeparator.tsx b/dapp/src/components/AnimatedNumber/AnimatedNumberSeparator.tsx similarity index 100% rename from dapp/src/components/shared/AnimatedNumber/AnimatedNumberSeparator.tsx rename to dapp/src/components/AnimatedNumber/AnimatedNumberSeparator.tsx diff --git a/dapp/src/components/shared/AnimatedNumber/index.tsx b/dapp/src/components/AnimatedNumber/index.tsx similarity index 100% rename from dapp/src/components/shared/AnimatedNumber/index.tsx rename to dapp/src/components/AnimatedNumber/index.tsx diff --git a/dapp/src/components/ArrivingSoonTooltip.tsx b/dapp/src/components/ArrivingSoonTooltip.tsx index 24c87ceba..298aa927a 100644 --- a/dapp/src/components/ArrivingSoonTooltip.tsx +++ b/dapp/src/components/ArrivingSoonTooltip.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react" -import Tooltip from "./shared/Tooltip" +import Tooltip from "./Tooltip" export default function ArrivingSoonTooltip({ label, diff --git a/dapp/src/components/shared/BlockExplorerLink.tsx b/dapp/src/components/BlockExplorerLink.tsx similarity index 100% rename from dapp/src/components/shared/BlockExplorerLink.tsx rename to dapp/src/components/BlockExplorerLink.tsx diff --git a/dapp/src/components/ConnectWalletModal/ConnectWalletAlert.tsx b/dapp/src/components/ConnectWalletModal/ConnectWalletAlert.tsx index d91f0201f..efa2568d6 100644 --- a/dapp/src/components/ConnectWalletModal/ConnectWalletAlert.tsx +++ b/dapp/src/components/ConnectWalletModal/ConnectWalletAlert.tsx @@ -8,7 +8,7 @@ import { AlertTitle, AlertIcon, AlertProps, -} from "../shared/Alert" +} from "../Alert" export enum ConnectionAlert { Rejected = "REJECTED", diff --git a/dapp/src/components/ConnectWalletModal/ConnectWalletButton.tsx b/dapp/src/components/ConnectWalletModal/ConnectWalletButton.tsx index e102b384f..9e97ea4d2 100644 --- a/dapp/src/components/ConnectWalletModal/ConnectWalletButton.tsx +++ b/dapp/src/components/ConnectWalletModal/ConnectWalletButton.tsx @@ -28,7 +28,7 @@ import { IconArrowNarrowRight } from "@tabler/icons-react" import { AnimatePresence, Variants, motion } from "framer-motion" import ArrivingSoonTooltip from "../ArrivingSoonTooltip" import ConnectWalletStatusLabel from "./ConnectWalletStatusLabel" -import Spinner from "../shared/Spinner" +import Spinner from "../Spinner" import { ConnectionAlert } from "./ConnectWalletAlert" type ConnectWalletButtonProps = { diff --git a/dapp/src/components/ConnectWalletModal/ConnectWalletStatusLabel.tsx b/dapp/src/components/ConnectWalletModal/ConnectWalletStatusLabel.tsx index 7c1492482..437247b04 100644 --- a/dapp/src/components/ConnectWalletModal/ConnectWalletStatusLabel.tsx +++ b/dapp/src/components/ConnectWalletModal/ConnectWalletStatusLabel.tsx @@ -6,7 +6,7 @@ import { IconCircleX, IconInfoCircle, } from "@tabler/icons-react" -import Spinner from "../shared/Spinner" +import Spinner from "../Spinner" const statusToLabelProps: Record = { idle: { diff --git a/dapp/src/components/shared/Countdown.tsx b/dapp/src/components/Countdown.tsx similarity index 100% rename from dapp/src/components/shared/Countdown.tsx rename to dapp/src/components/Countdown.tsx diff --git a/dapp/src/components/shared/CurrencyBalance.tsx b/dapp/src/components/CurrencyBalance.tsx similarity index 100% rename from dapp/src/components/shared/CurrencyBalance.tsx rename to dapp/src/components/CurrencyBalance.tsx diff --git a/dapp/src/components/shared/CurrencyBalanceWithConversion.tsx b/dapp/src/components/CurrencyBalanceWithConversion.tsx similarity index 100% rename from dapp/src/components/shared/CurrencyBalanceWithConversion.tsx rename to dapp/src/components/CurrencyBalanceWithConversion.tsx diff --git a/dapp/src/components/shared/FeesDetails/FeesDetailsAmountItem.tsx b/dapp/src/components/FeesDetails/FeesDetailsAmountItem.tsx similarity index 100% rename from dapp/src/components/shared/FeesDetails/FeesDetailsAmountItem.tsx rename to dapp/src/components/FeesDetails/FeesDetailsAmountItem.tsx diff --git a/dapp/src/components/shared/FeesDetails/index.tsx b/dapp/src/components/FeesDetails/index.tsx similarity index 100% rename from dapp/src/components/shared/FeesDetails/index.tsx rename to dapp/src/components/FeesDetails/index.tsx diff --git a/dapp/src/components/shared/Form/Form.tsx b/dapp/src/components/Form/Form.tsx similarity index 100% rename from dapp/src/components/shared/Form/Form.tsx rename to dapp/src/components/Form/Form.tsx diff --git a/dapp/src/components/shared/Form/FormInput.tsx b/dapp/src/components/Form/FormInput.tsx similarity index 100% rename from dapp/src/components/shared/Form/FormInput.tsx rename to dapp/src/components/Form/FormInput.tsx diff --git a/dapp/src/components/shared/Form/FormSubmitButton.tsx b/dapp/src/components/Form/FormSubmitButton.tsx similarity index 100% rename from dapp/src/components/shared/Form/FormSubmitButton.tsx rename to dapp/src/components/Form/FormSubmitButton.tsx diff --git a/dapp/src/components/shared/Form/FormTokenBalanceInput.tsx b/dapp/src/components/Form/FormTokenBalanceInput.tsx similarity index 100% rename from dapp/src/components/shared/Form/FormTokenBalanceInput.tsx rename to dapp/src/components/Form/FormTokenBalanceInput.tsx diff --git a/dapp/src/components/shared/Form/HelperErrorText.tsx b/dapp/src/components/Form/HelperErrorText.tsx similarity index 100% rename from dapp/src/components/shared/Form/HelperErrorText.tsx rename to dapp/src/components/Form/HelperErrorText.tsx diff --git a/dapp/src/components/shared/Form/index.tsx b/dapp/src/components/Form/index.tsx similarity index 100% rename from dapp/src/components/shared/Form/index.tsx rename to dapp/src/components/Form/index.tsx diff --git a/dapp/src/components/GateModal.tsx b/dapp/src/components/GateModal.tsx index 7d17e0dd9..42f2f06bb 100644 --- a/dapp/src/components/GateModal.tsx +++ b/dapp/src/components/GateModal.tsx @@ -10,8 +10,8 @@ import { externalHref } from "#/constants" import { BaseModalProps } from "#/types" import { useAccessCode } from "#/hooks" import withBaseModal from "./ModalRoot/withBaseModal" -import PasswordForm from "./shared/PasswordForm" -import { PasswordFormValues } from "./shared/PasswordForm/PasswordFormBase" +import PasswordForm from "./PasswordForm" +import { PasswordFormValues } from "./PasswordForm/PasswordFormBase" export function GateModalBase({ closeModal }: BaseModalProps) { const { saveAccessCode } = useAccessCode() diff --git a/dapp/src/components/Header/ConnectWallet.tsx b/dapp/src/components/Header/ConnectWallet.tsx index a47a922a4..9133481ab 100644 --- a/dapp/src/components/Header/ConnectWallet.tsx +++ b/dapp/src/components/Header/ConnectWallet.tsx @@ -21,7 +21,6 @@ import { usePostHogIdentity, useWallet, } from "#/hooks" -import CurrencyBalance from "#/components/shared/CurrencyBalance" import { BitcoinIcon } from "#/assets/icons" import { referralProgram, addressUtils } from "#/utils" import { motion } from "framer-motion" @@ -35,7 +34,8 @@ import { IconChevronUp, } from "@tabler/icons-react" import { useMatch } from "react-router-dom" -import Tooltip from "../shared/Tooltip" +import Tooltip from "../Tooltip" +import CurrencyBalance from "../CurrencyBalance" function isChangeAccountFeatureSupported(embeddedApp: string | undefined) { return referralProgram.isEmbedApp(embeddedApp) diff --git a/dapp/src/components/shared/IconWrapper.tsx b/dapp/src/components/IconWrapper.tsx similarity index 100% rename from dapp/src/components/shared/IconWrapper.tsx rename to dapp/src/components/IconWrapper.tsx diff --git a/dapp/src/components/shared/LiveTag.tsx b/dapp/src/components/LiveTag.tsx similarity index 100% rename from dapp/src/components/shared/LiveTag.tsx rename to dapp/src/components/LiveTag.tsx diff --git a/dapp/src/components/shared/LoadingButton.tsx b/dapp/src/components/LoadingButton.tsx similarity index 100% rename from dapp/src/components/shared/LoadingButton.tsx rename to dapp/src/components/LoadingButton.tsx diff --git a/dapp/src/components/MobileModeBanner/index.tsx b/dapp/src/components/MobileModeBanner/index.tsx index 85c6b8717..33590fd7f 100644 --- a/dapp/src/components/MobileModeBanner/index.tsx +++ b/dapp/src/components/MobileModeBanner/index.tsx @@ -14,7 +14,7 @@ import { IconChevronDown } from "@tabler/icons-react" import { AnimatePresence, motion } from "framer-motion" import { externalHref } from "#/constants" import AcreAnimatedBadge from "./AcreAnimatedBadge" -import LiveTag from "../shared/LiveTag" +import LiveTag from "../LiveTag" const MotionIcon = motion(Icon) const MotionBox = motion(Box) diff --git a/dapp/src/components/shared/NumberFormatInput.tsx b/dapp/src/components/NumberFormatInput.tsx similarity index 100% rename from dapp/src/components/shared/NumberFormatInput.tsx rename to dapp/src/components/NumberFormatInput.tsx diff --git a/dapp/src/components/shared/Pagination/Pagination.tsx b/dapp/src/components/Pagination/Pagination.tsx similarity index 100% rename from dapp/src/components/shared/Pagination/Pagination.tsx rename to dapp/src/components/Pagination/Pagination.tsx diff --git a/dapp/src/components/shared/Pagination/PaginationButton.tsx b/dapp/src/components/Pagination/PaginationButton.tsx similarity index 100% rename from dapp/src/components/shared/Pagination/PaginationButton.tsx rename to dapp/src/components/Pagination/PaginationButton.tsx diff --git a/dapp/src/components/shared/Pagination/PaginationFooter.tsx b/dapp/src/components/Pagination/PaginationFooter.tsx similarity index 100% rename from dapp/src/components/shared/Pagination/PaginationFooter.tsx rename to dapp/src/components/Pagination/PaginationFooter.tsx diff --git a/dapp/src/components/shared/Pagination/PaginationPage.tsx b/dapp/src/components/Pagination/PaginationPage.tsx similarity index 100% rename from dapp/src/components/shared/Pagination/PaginationPage.tsx rename to dapp/src/components/Pagination/PaginationPage.tsx diff --git a/dapp/src/components/shared/Pagination/PaginationStatus.tsx b/dapp/src/components/Pagination/PaginationStatus.tsx similarity index 100% rename from dapp/src/components/shared/Pagination/PaginationStatus.tsx rename to dapp/src/components/Pagination/PaginationStatus.tsx diff --git a/dapp/src/components/shared/Pagination/index.ts b/dapp/src/components/Pagination/index.ts similarity index 100% rename from dapp/src/components/shared/Pagination/index.ts rename to dapp/src/components/Pagination/index.ts diff --git a/dapp/src/components/shared/PasswordForm/PasswordFormBase.tsx b/dapp/src/components/PasswordForm/PasswordFormBase.tsx similarity index 100% rename from dapp/src/components/shared/PasswordForm/PasswordFormBase.tsx rename to dapp/src/components/PasswordForm/PasswordFormBase.tsx diff --git a/dapp/src/components/shared/PasswordForm/index.tsx b/dapp/src/components/PasswordForm/index.tsx similarity index 100% rename from dapp/src/components/shared/PasswordForm/index.tsx rename to dapp/src/components/PasswordForm/index.tsx diff --git a/dapp/src/components/shared/ProgressBar.tsx b/dapp/src/components/ProgressBar.tsx similarity index 100% rename from dapp/src/components/shared/ProgressBar.tsx rename to dapp/src/components/ProgressBar.tsx diff --git a/dapp/src/components/shared/Skeleton.tsx b/dapp/src/components/Skeleton.tsx similarity index 100% rename from dapp/src/components/shared/Skeleton.tsx rename to dapp/src/components/Skeleton.tsx diff --git a/dapp/src/components/shared/Spinner.tsx b/dapp/src/components/Spinner.tsx similarity index 100% rename from dapp/src/components/shared/Spinner.tsx rename to dapp/src/components/Spinner.tsx diff --git a/dapp/src/components/shared/TokenAmountForm/TokenAmountFormBase.tsx b/dapp/src/components/TokenAmountForm/TokenAmountFormBase.tsx similarity index 100% rename from dapp/src/components/shared/TokenAmountForm/TokenAmountFormBase.tsx rename to dapp/src/components/TokenAmountForm/TokenAmountFormBase.tsx diff --git a/dapp/src/components/shared/TokenAmountForm/index.tsx b/dapp/src/components/TokenAmountForm/index.tsx similarity index 100% rename from dapp/src/components/shared/TokenAmountForm/index.tsx rename to dapp/src/components/TokenAmountForm/index.tsx diff --git a/dapp/src/components/shared/TokenBalanceInput.tsx b/dapp/src/components/TokenBalanceInput.tsx similarity index 100% rename from dapp/src/components/shared/TokenBalanceInput.tsx rename to dapp/src/components/TokenBalanceInput.tsx diff --git a/dapp/src/components/shared/Tooltip.tsx b/dapp/src/components/Tooltip.tsx similarity index 100% rename from dapp/src/components/shared/Tooltip.tsx rename to dapp/src/components/Tooltip.tsx diff --git a/dapp/src/components/shared/TooltipIcon.tsx b/dapp/src/components/TooltipIcon.tsx similarity index 100% rename from dapp/src/components/shared/TooltipIcon.tsx rename to dapp/src/components/TooltipIcon.tsx diff --git a/dapp/src/components/shared/TransactionDetails/TransactionDetailsAmountItem.tsx b/dapp/src/components/TransactionDetails/TransactionDetailsAmountItem.tsx similarity index 100% rename from dapp/src/components/shared/TransactionDetails/TransactionDetailsAmountItem.tsx rename to dapp/src/components/TransactionDetails/TransactionDetailsAmountItem.tsx diff --git a/dapp/src/components/shared/TransactionDetails/index.tsx b/dapp/src/components/TransactionDetails/index.tsx similarity index 100% rename from dapp/src/components/shared/TransactionDetails/index.tsx rename to dapp/src/components/TransactionDetails/index.tsx diff --git a/dapp/src/components/TransactionModal/ActionDurationEstimation.tsx b/dapp/src/components/TransactionModal/ActionDurationEstimation.tsx index babaeac45..75473bcbe 100644 --- a/dapp/src/components/TransactionModal/ActionDurationEstimation.tsx +++ b/dapp/src/components/TransactionModal/ActionDurationEstimation.tsx @@ -3,7 +3,7 @@ import { ActivityType } from "#/types" import { activitiesUtils } from "#/utils" import { useFormField } from "#/hooks" import { Text } from "@chakra-ui/react" -import { TOKEN_AMOUNT_FIELD_NAME } from "../shared/TokenAmountForm/TokenAmountFormBase" +import { TOKEN_AMOUNT_FIELD_NAME } from "../TokenAmountForm/TokenAmountFormBase" export default function ActionDurationEstimation({ type, diff --git a/dapp/src/components/TransactionModal/ActionFormModal.tsx b/dapp/src/components/TransactionModal/ActionFormModal.tsx index 8c50be64e..42724d990 100644 --- a/dapp/src/components/TransactionModal/ActionFormModal.tsx +++ b/dapp/src/components/TransactionModal/ActionFormModal.tsx @@ -13,7 +13,7 @@ import { BaseFormProps, PROCESS_STATUSES, } from "#/types" -import { TokenAmountFormValues } from "#/components/shared/TokenAmountForm/TokenAmountFormBase" +import { TokenAmountFormValues } from "#/components/TokenAmountForm/TokenAmountFormBase" import { logPromiseFailure } from "#/utils" import { setStatus, setTokenAmount } from "#/store/action-flow" import StakeFormModal from "./ActiveStakingStep/StakeFormModal" diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/AcrePointsRewardEstimation.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/AcrePointsRewardEstimation.tsx index 8a34749ca..9e3669295 100644 --- a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/AcrePointsRewardEstimation.tsx +++ b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/AcrePointsRewardEstimation.tsx @@ -12,7 +12,7 @@ import { } from "@chakra-ui/react" import { numbersUtils } from "#/utils" import { IconChevronDown } from "@tabler/icons-react" -import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase" +import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/TokenAmountForm/TokenAmountFormBase" import { useFormField, useMinDepositAmount, diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/StakeDetails.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/StakeDetails.tsx index 631d5c217..c1cdf0529 100644 --- a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/StakeDetails.tsx +++ b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/StakeDetails.tsx @@ -1,8 +1,8 @@ import React from "react" import { List } from "@chakra-ui/react" -import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/TransactionDetailsAmountItem" -import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesDetailsAmountItem" -import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase" +import FeesDetailsAmountItem from "#/components/FeesDetails/FeesDetailsAmountItem" +import TransactionDetailsAmountItem from "#/components/TransactionDetails/TransactionDetailsAmountItem" +import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/TokenAmountForm/TokenAmountFormBase" import { useFormField, useMinDepositAmount, diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/index.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/index.tsx index a8ec51413..61d4a3830 100644 --- a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/index.tsx +++ b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/index.tsx @@ -1,11 +1,11 @@ import React from "react" -import TokenAmountForm from "#/components/shared/TokenAmountForm" -import { TokenAmountFormValues } from "#/components/shared/TokenAmountForm/TokenAmountFormBase" +import TokenAmountForm from "#/components/TokenAmountForm" +import { TokenAmountFormValues } from "#/components/TokenAmountForm/TokenAmountFormBase" import { useMinDepositAmount, useWallet } from "#/hooks" -import { FormSubmitButton } from "#/components/shared/Form" import { ACTION_FLOW_TYPES, BaseFormProps } from "#/types" import { numbersUtils, currencyUtils } from "#/utils" import { featureFlags } from "#/constants" +import { FormSubmitButton } from "#/components/Form" import StakeDetails from "./StakeDetails" import AcrePointsRewardEstimation from "./AcrePointsRewardEstimation" import ActionDurationEstimation from "../../ActionDurationEstimation" diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/RetryModal.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/RetryModal.tsx index f16698d92..5a9528d57 100644 --- a/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/RetryModal.tsx +++ b/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/RetryModal.tsx @@ -11,12 +11,12 @@ import { Text, } from "@chakra-ui/react" import { CableWithPlugIcon } from "#/assets/icons" -import IconWrapper from "#/components/shared/IconWrapper" +import IconWrapper from "#/components/IconWrapper" import { timeUtils, numbersUtils } from "#/utils" import { useCountdown } from "#/hooks" import { time } from "#/constants" import { IconShieldCheckFilled, IconX } from "@tabler/icons-react" -import Skeleton from "#/components/shared/Skeleton" +import Skeleton from "#/components/Skeleton" const getCounterData = (minutes: string, seconds: string) => { const isLessThanMinute = parseInt(minutes, 10) <= 0 diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/ServerErrorModal.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/ServerErrorModal.tsx index 0d3ec6909..b90d5596d 100644 --- a/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/ServerErrorModal.tsx +++ b/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/ServerErrorModal.tsx @@ -13,13 +13,13 @@ import { } from "@chakra-ui/react" import { CableWithPlugIcon } from "#/assets/icons" import { externalHref } from "#/constants" -import IconWrapper from "#/components/shared/IconWrapper" +import IconWrapper from "#/components/IconWrapper" import { IconBrandDiscordFilled, IconReload, IconServerBolt, } from "@tabler/icons-react" -// import TooltipIcon from "#/components/shared/TooltipIcon" +// import TooltipIcon from "#/components/TooltipIcon" export default function ServerErrorModal({ isLoading, diff --git a/dapp/src/components/TransactionModal/ActiveUnstakingStep/BuildTransactionModal.tsx b/dapp/src/components/TransactionModal/ActiveUnstakingStep/BuildTransactionModal.tsx index 1fef616b0..ab6fad402 100644 --- a/dapp/src/components/TransactionModal/ActiveUnstakingStep/BuildTransactionModal.tsx +++ b/dapp/src/components/TransactionModal/ActiveUnstakingStep/BuildTransactionModal.tsx @@ -6,7 +6,7 @@ import { ModalHeader, Text, } from "@chakra-ui/react" -import Spinner from "#/components/shared/Spinner" +import Spinner from "#/components/Spinner" export default function BuildTransactionModal({ onClose, diff --git a/dapp/src/components/TransactionModal/ActiveUnstakingStep/NotEnoughFundsModal.tsx b/dapp/src/components/TransactionModal/ActiveUnstakingStep/NotEnoughFundsModal.tsx index 6db59cbfa..982c7876d 100644 --- a/dapp/src/components/TransactionModal/ActiveUnstakingStep/NotEnoughFundsModal.tsx +++ b/dapp/src/components/TransactionModal/ActiveUnstakingStep/NotEnoughFundsModal.tsx @@ -12,8 +12,8 @@ import { import { setStatus } from "#/store/action-flow" import { PROCESS_STATUSES } from "#/types" import { BitcoinsStackErrorIcon } from "#/assets/icons" -import { Alert, AlertIcon } from "../../shared/Alert" -import CurrencyBalance from "../../shared/CurrencyBalance" +import CurrencyBalance from "#/components/CurrencyBalance" +import { Alert, AlertIcon } from "#/components/Alert" export default function NotEnoughFundsModal() { const dispatch = useAppDispatch() diff --git a/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx b/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx index 9196890c2..d65421699 100644 --- a/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx +++ b/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx @@ -1,6 +1,6 @@ import React from "react" import { List } from "@chakra-ui/react" -import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase" +import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/TokenAmountForm/TokenAmountFormBase" import { useFormField, useMinWithdrawAmount, @@ -8,8 +8,8 @@ import { } from "#/hooks" import { ACTION_FLOW_TYPES, CurrencyType } from "#/types" import { currencies } from "#/constants" -import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesDetailsAmountItem" -import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/TransactionDetailsAmountItem" +import FeesDetailsAmountItem from "#/components/FeesDetails/FeesDetailsAmountItem" +import TransactionDetailsAmountItem from "#/components/TransactionDetails/TransactionDetailsAmountItem" import FeesTooltip from "../../FeesTooltip" function UnstakeDetails({ currency }: { currency: CurrencyType }) { diff --git a/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/index.tsx b/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/index.tsx index 19e0c6636..04e4d76bf 100644 --- a/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/index.tsx +++ b/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/index.tsx @@ -1,7 +1,7 @@ import React from "react" -import TokenAmountForm from "#/components/shared/TokenAmountForm" -import { TokenAmountFormValues } from "#/components/shared/TokenAmountForm/TokenAmountFormBase" -import { FormSubmitButton } from "#/components/shared/Form" +import TokenAmountForm from "#/components/TokenAmountForm" +import { TokenAmountFormValues } from "#/components/TokenAmountForm/TokenAmountFormBase" +import { FormSubmitButton } from "#/components/Form" import { ACTION_FLOW_TYPES, BaseFormProps, PROCESS_STATUSES } from "#/types" import { useActionFlowStatus, diff --git a/dapp/src/components/TransactionModal/FeesTooltip/FeesTooltipItem.tsx b/dapp/src/components/TransactionModal/FeesTooltip/FeesTooltipItem.tsx index b2d13886e..48f5403ff 100644 --- a/dapp/src/components/TransactionModal/FeesTooltip/FeesTooltipItem.tsx +++ b/dapp/src/components/TransactionModal/FeesTooltip/FeesTooltipItem.tsx @@ -2,7 +2,7 @@ import React from "react" import { ListItem, Text } from "@chakra-ui/react" import CurrencyBalance, { CurrencyBalanceProps, -} from "#/components/shared/CurrencyBalance" +} from "#/components/CurrencyBalance" import { currencies } from "#/constants" type FeesItemType = CurrencyBalanceProps & { diff --git a/dapp/src/components/TransactionModal/FeesTooltip/index.tsx b/dapp/src/components/TransactionModal/FeesTooltip/index.tsx index c805d8817..f34345f25 100644 --- a/dapp/src/components/TransactionModal/FeesTooltip/index.tsx +++ b/dapp/src/components/TransactionModal/FeesTooltip/index.tsx @@ -1,6 +1,6 @@ import React from "react" import { List } from "@chakra-ui/react" -import TooltipIcon from "#/components/shared/TooltipIcon" +import TooltipIcon from "#/components/TooltipIcon" import { Fee as AcreFee } from "#/types" import FeesTooltipItem from "./FeesTooltipItem" diff --git a/dapp/src/components/TransactionModal/ResumeModal.tsx b/dapp/src/components/TransactionModal/ResumeModal.tsx index c1e1cc7a7..0c1f3b577 100644 --- a/dapp/src/components/TransactionModal/ResumeModal.tsx +++ b/dapp/src/components/TransactionModal/ResumeModal.tsx @@ -7,11 +7,10 @@ import { HStack, Text, } from "@chakra-ui/react" - -import Spinner from "#/components/shared/Spinner" import { PauseIcon } from "#/assets/icons" import { useActionFlowPause, useActionFlowType } from "#/hooks" import { ACTION_FLOW_TYPES, BaseModalProps } from "#/types" +import Spinner from "../Spinner" export default function ResumeModal({ closeModal }: BaseModalProps) { const { handleResume } = useActionFlowPause() diff --git a/dapp/src/components/TransactionModal/SuccessModal.tsx b/dapp/src/components/TransactionModal/SuccessModal.tsx index fbca0d16a..0f345a16e 100644 --- a/dapp/src/components/TransactionModal/SuccessModal.tsx +++ b/dapp/src/components/TransactionModal/SuccessModal.tsx @@ -11,12 +11,12 @@ import { } from "@chakra-ui/react" import { LoadingSpinnerSuccessIcon } from "#/assets/icons" import { useActionFlowTokenAmount, useActionFlowTxHash } from "#/hooks" -import CurrencyBalanceWithConversion from "#/components/shared/CurrencyBalanceWithConversion" import { ACTION_FLOW_TYPES, ActionFlowType } from "#/types" import { IconArrowUpRight } from "@tabler/icons-react" import { activitiesUtils } from "#/utils" -import { Alert, AlertIcon, AlertDescription } from "#/components/shared/Alert" -import BlockExplorerLink from "../shared/BlockExplorerLink" +import CurrencyBalanceWithConversion from "../CurrencyBalanceWithConversion" +import BlockExplorerLink from "../BlockExplorerLink" +import { Alert, AlertIcon, AlertDescription } from "../Alert" type SuccessModalProps = { type: ActionFlowType diff --git a/dapp/src/components/TransactionModal/WalletInteractionModal.tsx b/dapp/src/components/TransactionModal/WalletInteractionModal.tsx index ba798837e..74d4a6194 100644 --- a/dapp/src/components/TransactionModal/WalletInteractionModal.tsx +++ b/dapp/src/components/TransactionModal/WalletInteractionModal.tsx @@ -13,7 +13,7 @@ import { import { AcreSignIcon } from "#/assets/icons" import { useActionFlowType, useConnector, useIsEmbed } from "#/hooks" import { ACTION_FLOW_TYPES, DappMode } from "#/types" -import { Alert, AlertIcon } from "../shared/Alert" +import { Alert, AlertIcon } from "../Alert" const ICON_STYLES = { boxSize: 14, diff --git a/dapp/src/components/shared/UserDataSkeleton.tsx b/dapp/src/components/UserDataSkeleton.tsx similarity index 100% rename from dapp/src/components/shared/UserDataSkeleton.tsx rename to dapp/src/components/UserDataSkeleton.tsx diff --git a/dapp/src/pages/DashboardPage/AcrePointsCard/AcrePointsLabel.tsx b/dapp/src/pages/DashboardPage/AcrePointsCard/AcrePointsLabel.tsx index a482879ab..a583601de 100644 --- a/dapp/src/pages/DashboardPage/AcrePointsCard/AcrePointsLabel.tsx +++ b/dapp/src/pages/DashboardPage/AcrePointsCard/AcrePointsLabel.tsx @@ -1,6 +1,6 @@ import React from "react" import { HStack, Text } from "@chakra-ui/react" -import Countdown from "#/components/shared/Countdown" +import Countdown from "#/components/Countdown" import { logPromiseFailure } from "#/utils" import { useAcrePointsData, useUserPointsData } from "#/hooks" import LabelWrapper from "./LabelWrapper" diff --git a/dapp/src/pages/DashboardPage/AcrePointsCard/UserPointsLabel.tsx b/dapp/src/pages/DashboardPage/AcrePointsCard/UserPointsLabel.tsx index 1d2a492fc..c8582081f 100644 --- a/dapp/src/pages/DashboardPage/AcrePointsCard/UserPointsLabel.tsx +++ b/dapp/src/pages/DashboardPage/AcrePointsCard/UserPointsLabel.tsx @@ -2,8 +2,8 @@ import React from "react" import { Button, HStack, VStack, Text } from "@chakra-ui/react" import { numbersUtils } from "#/utils" import { useAcrePointsData, useClaimPoints, useUserPointsData } from "#/hooks" -import Spinner from "#/components/shared/Spinner" -import TooltipIcon from "#/components/shared/TooltipIcon" +import Spinner from "#/components/Spinner" +import TooltipIcon from "#/components/TooltipIcon" import useDebounce from "#/hooks/useDebounce" import { time } from "#/constants" import LabelWrapper from "./LabelWrapper" diff --git a/dapp/src/pages/DashboardPage/AcrePointsCard/index.tsx b/dapp/src/pages/DashboardPage/AcrePointsCard/index.tsx index 2b68d4ca9..dff16cc74 100644 --- a/dapp/src/pages/DashboardPage/AcrePointsCard/index.tsx +++ b/dapp/src/pages/DashboardPage/AcrePointsCard/index.tsx @@ -10,8 +10,8 @@ import { } from "@chakra-ui/react" import { numbersUtils } from "#/utils" import { useAcrePointsData, useUserPointsData, useWallet } from "#/hooks" -import UserDataSkeleton from "#/components/shared/UserDataSkeleton" -import TooltipIcon from "#/components/shared/TooltipIcon" +import UserDataSkeleton from "#/components/UserDataSkeleton" +import TooltipIcon from "#/components/TooltipIcon" import acrePointsIllustrationSrc from "#/assets/images/acre-points-illustration.png" import AcrePointsLabel from "./AcrePointsLabel" import UserPointsLabel from "./UserPointsLabel" diff --git a/dapp/src/pages/DashboardPage/AcrePointsTemplateCard.tsx b/dapp/src/pages/DashboardPage/AcrePointsTemplateCard.tsx index 83dde6ddb..c7102dc7d 100644 --- a/dapp/src/pages/DashboardPage/AcrePointsTemplateCard.tsx +++ b/dapp/src/pages/DashboardPage/AcrePointsTemplateCard.tsx @@ -13,7 +13,7 @@ import { Text, } from "@chakra-ui/react" import { acrePointsCardPlaceholder } from "#/assets/images" -import UserDataSkeleton from "#/components/shared/UserDataSkeleton" +import UserDataSkeleton from "#/components/UserDataSkeleton" import { IconArrowUpRight, IconPlayerTrackNextFilled, diff --git a/dapp/src/pages/DashboardPage/AcreTVLMessage.tsx b/dapp/src/pages/DashboardPage/AcreTVLMessage.tsx index 4f828721d..b6fa2b4a3 100644 --- a/dapp/src/pages/DashboardPage/AcreTVLMessage.tsx +++ b/dapp/src/pages/DashboardPage/AcreTVLMessage.tsx @@ -2,7 +2,7 @@ import React from "react" import { Box, HStack, StackProps, VStack, Text } from "@chakra-ui/react" import { useActivitiesCount, useStatistics, useWallet } from "#/hooks" import { IconBolt } from "@tabler/icons-react" -import CurrencyBalance from "#/components/shared/CurrencyBalance" +import CurrencyBalance from "#/components/CurrencyBalance" type AcreTVLMessageProps = Omit diff --git a/dapp/src/pages/DashboardPage/AcreTVLProgress.tsx b/dapp/src/pages/DashboardPage/AcreTVLProgress.tsx index 2ef4d5506..3b0188695 100644 --- a/dapp/src/pages/DashboardPage/AcreTVLProgress.tsx +++ b/dapp/src/pages/DashboardPage/AcreTVLProgress.tsx @@ -10,8 +10,8 @@ import { } from "@chakra-ui/react" import { useStatistics } from "#/hooks" import { BitcoinIcon } from "#/assets/icons" -import CurrencyBalance from "#/components/shared/CurrencyBalance" -import ProgressBar from "#/components/shared/ProgressBar" +import CurrencyBalance from "#/components/CurrencyBalance" +import ProgressBar from "#/components/ProgressBar" type AcreTVLProgressProps = StackProps diff --git a/dapp/src/pages/DashboardPage/BeehiveCard.tsx b/dapp/src/pages/DashboardPage/BeehiveCard.tsx index 604242a0b..e04e29b0f 100644 --- a/dapp/src/pages/DashboardPage/BeehiveCard.tsx +++ b/dapp/src/pages/DashboardPage/BeehiveCard.tsx @@ -1,8 +1,8 @@ import React from "react" import { MezoSignIcon } from "#/assets/icons" import { beehiveIllustration } from "#/assets/images" -import TooltipIcon from "#/components/shared/TooltipIcon" -import UserDataSkeleton from "#/components/shared/UserDataSkeleton" +import TooltipIcon from "#/components/TooltipIcon" +import UserDataSkeleton from "#/components/UserDataSkeleton" import { useMats, useModal } from "#/hooks" import { MODAL_TYPES } from "#/types" import { numbersUtils } from "#/utils" diff --git a/dapp/src/pages/DashboardPage/PositionDetails.tsx b/dapp/src/pages/DashboardPage/PositionDetails.tsx index d3fa12607..e32986395 100644 --- a/dapp/src/pages/DashboardPage/PositionDetails.tsx +++ b/dapp/src/pages/DashboardPage/PositionDetails.tsx @@ -1,5 +1,5 @@ import React from "react" -import CurrencyBalanceWithConversion from "#/components/shared/CurrencyBalanceWithConversion" +import CurrencyBalanceWithConversion from "#/components/CurrencyBalanceWithConversion" import { useActivitiesCount, useBitcoinPosition, @@ -19,10 +19,10 @@ import { Text, } from "@chakra-ui/react" import ArrivingSoonTooltip from "#/components/ArrivingSoonTooltip" -import UserDataSkeleton from "#/components/shared/UserDataSkeleton" +import UserDataSkeleton from "#/components/UserDataSkeleton" import { featureFlags } from "#/constants" import { IconClockHour5Filled } from "@tabler/icons-react" -import TooltipIcon from "#/components/shared/TooltipIcon" +import TooltipIcon from "#/components/TooltipIcon" import { activitiesUtils } from "#/utils" import AcreTVLMessage from "./AcreTVLMessage" diff --git a/dapp/src/pages/DashboardPage/TransactionHistory/EstimatedDuration.tsx b/dapp/src/pages/DashboardPage/TransactionHistory/EstimatedDuration.tsx index 8c2a1bda9..eb571cade 100644 --- a/dapp/src/pages/DashboardPage/TransactionHistory/EstimatedDuration.tsx +++ b/dapp/src/pages/DashboardPage/TransactionHistory/EstimatedDuration.tsx @@ -1,6 +1,6 @@ import React from "react" import { Box, Tag, TagLabel, Flex, TagLeftIcon } from "@chakra-ui/react" -import Spinner from "#/components/shared/Spinner" +import Spinner from "#/components/Spinner" import { activitiesUtils } from "#/utils" import { Activity } from "#/types" diff --git a/dapp/src/pages/DashboardPage/TransactionHistory/TransactionTable.tsx b/dapp/src/pages/DashboardPage/TransactionHistory/TransactionTable.tsx index 76f80c290..370e6e5d4 100644 --- a/dapp/src/pages/DashboardPage/TransactionHistory/TransactionTable.tsx +++ b/dapp/src/pages/DashboardPage/TransactionHistory/TransactionTable.tsx @@ -6,11 +6,11 @@ import { PaginationFooter, PaginationPage, PaginationStatus, -} from "#/components/shared/Pagination" -import CurrencyBalance from "#/components/shared/CurrencyBalance" +} from "#/components/Pagination" +import CurrencyBalance from "#/components/CurrencyBalance" import { timeUtils, activitiesUtils } from "#/utils" import { Activity } from "#/types" -import BlockExplorerLink from "#/components/shared/BlockExplorerLink" +import BlockExplorerLink from "#/components/BlockExplorerLink" import { IconArrowUpRight } from "@tabler/icons-react" import { useActivities, useMobileMode } from "#/hooks" import { semanticTokens } from "#/theme/utils" diff --git a/dapp/src/pages/DashboardPage/TransactionHistory/index.tsx b/dapp/src/pages/DashboardPage/TransactionHistory/index.tsx index e6bd8e532..1d5933481 100644 --- a/dapp/src/pages/DashboardPage/TransactionHistory/index.tsx +++ b/dapp/src/pages/DashboardPage/TransactionHistory/index.tsx @@ -1,7 +1,7 @@ import React from "react" import { StackProps, VStack, Image, Text } from "@chakra-ui/react" import { useActivitiesCount, useIsFetchedWalletData } from "#/hooks" -import UserDataSkeleton from "#/components/shared/UserDataSkeleton" +import UserDataSkeleton from "#/components/UserDataSkeleton" import { emptyState } from "#/assets/images" import TransactionTable from "./TransactionTable"