diff --git a/src/components/NftRewards/AddNftCollectionForm/AddNftCollectionForm.tsx b/src/components/NftRewards/AddNftCollectionForm/AddNftCollectionForm.tsx index 10133ec924..4fe7c335db 100644 --- a/src/components/NftRewards/AddNftCollectionForm/AddNftCollectionForm.tsx +++ b/src/components/NftRewards/AddNftCollectionForm/AddNftCollectionForm.tsx @@ -1,14 +1,14 @@ import { RightOutlined } from '@ant-design/icons' import { Trans, t } from '@lingui/macro' import { Form, FormInstance } from 'antd' -import { useLockPageRulesWrapper } from 'components/Create/hooks/useLockPageRulesWrapper' import ExternalLink from 'components/ExternalLink' import TooltipLabel from 'components/TooltipLabel' import { JuiceInput } from 'components/inputs/JuiceTextInput' import { NftRewardTier } from 'models/nftRewards' +import { CreateCollapse } from 'packages/v2v3/components/Create/components/CreateCollapse/CreateCollapse' +import { OptionalHeader } from 'packages/v2v3/components/Create/components/OptionalHeader' +import { useLockPageRulesWrapper } from 'packages/v2v3/components/Create/hooks/useLockPageRulesWrapper' import { inputMustExistRule } from 'utils/antdRules' -import { CreateCollapse } from '../../Create/components/CreateCollapse/CreateCollapse' -import { OptionalHeader } from '../../Create/components/OptionalHeader' import { RewardsList } from '../RewardsList/RewardsList' import { NftAdvancedFormItems } from './NftAdvancedFormItems' import { NftPaymentSuccessFormItems } from './NftPaymentSuccessFormItems' diff --git a/src/components/NftRewards/RewardsList/AddEditRewardModal.tsx b/src/components/NftRewards/RewardsList/AddEditRewardModal.tsx index 7eb9b34689..48ac10911f 100644 --- a/src/components/NftRewards/RewardsList/AddEditRewardModal.tsx +++ b/src/components/NftRewards/RewardsList/AddEditRewardModal.tsx @@ -14,6 +14,8 @@ import { VIDEO_FILE_TYPES } from 'constants/fileTypes' import { pinFile } from 'lib/api/ipfs' import random from 'lodash/random' import { NftRewardTier } from 'models/nftRewards' +import { CreateCollapse } from 'packages/v2v3/components/Create/components/CreateCollapse/CreateCollapse' +import { OptionalHeader } from 'packages/v2v3/components/Create/components/OptionalHeader' import { DEFAULT_NFT_MAX_SUPPLY } from 'packages/v2v3/constants/nftRewards' import { V2V3_CURRENCY_USD } from 'packages/v2v3/utils/currency' import { UploadRequestOption } from 'rc-upload/lib/interface' @@ -28,8 +30,6 @@ import { } from 'utils/antdRules' import { withHttps } from 'utils/externalLink' import { ipfsGatewayUrl } from 'utils/ipfs' -import { CreateCollapse } from '../../Create/components/CreateCollapse/CreateCollapse' -import { OptionalHeader } from '../../Create/components/OptionalHeader' interface AddEditRewardModalFormProps { fileUrl: string diff --git a/src/components/formItems/ProjectTwitter.tsx b/src/components/formItems/ProjectTwitter.tsx index 5230ee6147..f41e0f37fb 100644 --- a/src/components/formItems/ProjectTwitter.tsx +++ b/src/components/formItems/ProjectTwitter.tsx @@ -1,7 +1,7 @@ import { t } from '@lingui/macro' import { Form } from 'antd' -import { TwitterHandleInputWrapper } from 'components/Create/components/pages/ProjectDetails/ProjectDetailsPage' +import { TwitterHandleInputWrapper } from 'packages/v2v3/components/Create/components/pages/ProjectDetails/ProjectDetailsPage' import { FormItemExt } from './formItemExt' export default function ProjectTwitter({ diff --git a/src/components/Create/Create.tsx b/src/packages/v2v3/components/Create/Create.tsx similarity index 100% rename from src/components/Create/Create.tsx rename to src/packages/v2v3/components/Create/Create.tsx diff --git a/src/components/Create/components/CreateBadge/DefaultBadge.tsx b/src/packages/v2v3/components/Create/components/CreateBadge/DefaultBadge.tsx similarity index 100% rename from src/components/Create/components/CreateBadge/DefaultBadge.tsx rename to src/packages/v2v3/components/Create/components/CreateBadge/DefaultBadge.tsx diff --git a/src/components/Create/components/CreateBadge/OptionalBadge.tsx b/src/packages/v2v3/components/Create/components/CreateBadge/OptionalBadge.tsx similarity index 100% rename from src/components/Create/components/CreateBadge/OptionalBadge.tsx rename to src/packages/v2v3/components/Create/components/CreateBadge/OptionalBadge.tsx diff --git a/src/components/Create/components/CreateBadge/RecommendedBadge.tsx b/src/packages/v2v3/components/Create/components/CreateBadge/RecommendedBadge.tsx similarity index 100% rename from src/components/Create/components/CreateBadge/RecommendedBadge.tsx rename to src/packages/v2v3/components/Create/components/CreateBadge/RecommendedBadge.tsx diff --git a/src/components/Create/components/CreateBadge/SkippedBadge.tsx b/src/packages/v2v3/components/Create/components/CreateBadge/SkippedBadge.tsx similarity index 100% rename from src/components/Create/components/CreateBadge/SkippedBadge.tsx rename to src/packages/v2v3/components/Create/components/CreateBadge/SkippedBadge.tsx diff --git a/src/components/Create/components/CreateBadge/index.ts b/src/packages/v2v3/components/Create/components/CreateBadge/index.ts similarity index 100% rename from src/components/Create/components/CreateBadge/index.ts rename to src/packages/v2v3/components/Create/components/CreateBadge/index.ts diff --git a/src/components/Create/components/CreateCollapse/CreateCollapse.tsx b/src/packages/v2v3/components/Create/components/CreateCollapse/CreateCollapse.tsx similarity index 100% rename from src/components/Create/components/CreateCollapse/CreateCollapse.tsx rename to src/packages/v2v3/components/Create/components/CreateCollapse/CreateCollapse.tsx diff --git a/src/components/Create/components/CreateCollapse/CreateCollapsePanel.tsx b/src/packages/v2v3/components/Create/components/CreateCollapse/CreateCollapsePanel.tsx similarity index 100% rename from src/components/Create/components/CreateCollapse/CreateCollapsePanel.tsx rename to src/packages/v2v3/components/Create/components/CreateCollapse/CreateCollapsePanel.tsx diff --git a/src/components/Create/components/Icons/Infinity.tsx b/src/packages/v2v3/components/Create/components/Icons/Infinity.tsx similarity index 100% rename from src/components/Create/components/Icons/Infinity.tsx rename to src/packages/v2v3/components/Create/components/Icons/Infinity.tsx diff --git a/src/components/Create/components/Icons/ManualSettingsIcon.tsx b/src/packages/v2v3/components/Create/components/Icons/ManualSettingsIcon.tsx similarity index 100% rename from src/components/Create/components/Icons/ManualSettingsIcon.tsx rename to src/packages/v2v3/components/Create/components/Icons/ManualSettingsIcon.tsx diff --git a/src/components/Create/components/Icons/TargetIcon.tsx b/src/packages/v2v3/components/Create/components/Icons/TargetIcon.tsx similarity index 100% rename from src/components/Create/components/Icons/TargetIcon.tsx rename to src/packages/v2v3/components/Create/components/Icons/TargetIcon.tsx diff --git a/src/components/Create/components/Icons/TokensIcon.tsx b/src/packages/v2v3/components/Create/components/Icons/TokensIcon.tsx similarity index 100% rename from src/components/Create/components/Icons/TokensIcon.tsx rename to src/packages/v2v3/components/Create/components/Icons/TokensIcon.tsx diff --git a/src/components/Create/components/Icons/index.ts b/src/packages/v2v3/components/Create/components/Icons/index.ts similarity index 100% rename from src/components/Create/components/Icons/index.ts rename to src/packages/v2v3/components/Create/components/Icons/index.ts diff --git a/src/components/Create/components/OptionalHeader.tsx b/src/packages/v2v3/components/Create/components/OptionalHeader.tsx similarity index 100% rename from src/components/Create/components/OptionalHeader.tsx rename to src/packages/v2v3/components/Create/components/OptionalHeader.tsx diff --git a/src/components/Create/components/Selection/Selection.tsx b/src/packages/v2v3/components/Create/components/Selection/Selection.tsx similarity index 100% rename from src/components/Create/components/Selection/Selection.tsx rename to src/packages/v2v3/components/Create/components/Selection/Selection.tsx diff --git a/src/components/Create/components/Selection/SelectionCard.tsx b/src/packages/v2v3/components/Create/components/Selection/SelectionCard.tsx similarity index 100% rename from src/components/Create/components/Selection/SelectionCard.tsx rename to src/packages/v2v3/components/Create/components/Selection/SelectionCard.tsx diff --git a/src/components/Create/components/Selection/components/CheckedCircle.tsx b/src/packages/v2v3/components/Create/components/Selection/components/CheckedCircle.tsx similarity index 100% rename from src/components/Create/components/Selection/components/CheckedCircle.tsx rename to src/packages/v2v3/components/Create/components/Selection/components/CheckedCircle.tsx diff --git a/src/components/Create/components/Selection/components/RadialBackgroundIcon.tsx b/src/packages/v2v3/components/Create/components/Selection/components/RadialBackgroundIcon.tsx similarity index 100% rename from src/components/Create/components/Selection/components/RadialBackgroundIcon.tsx rename to src/packages/v2v3/components/Create/components/Selection/components/RadialBackgroundIcon.tsx diff --git a/src/components/Create/components/Wizard/Page.tsx b/src/packages/v2v3/components/Create/components/Wizard/Page.tsx similarity index 100% rename from src/components/Create/components/Wizard/Page.tsx rename to src/packages/v2v3/components/Create/components/Wizard/Page.tsx diff --git a/src/components/Create/components/Wizard/PageButtonControl/PageButtonControl.tsx b/src/packages/v2v3/components/Create/components/Wizard/PageButtonControl/PageButtonControl.tsx similarity index 100% rename from src/components/Create/components/Wizard/PageButtonControl/PageButtonControl.tsx rename to src/packages/v2v3/components/Create/components/Wizard/PageButtonControl/PageButtonControl.tsx diff --git a/src/components/Create/components/Wizard/PageButtonControl/components/BackButton.tsx b/src/packages/v2v3/components/Create/components/Wizard/PageButtonControl/components/BackButton.tsx similarity index 100% rename from src/components/Create/components/Wizard/PageButtonControl/components/BackButton.tsx rename to src/packages/v2v3/components/Create/components/Wizard/PageButtonControl/components/BackButton.tsx diff --git a/src/components/Create/components/Wizard/PageButtonControl/components/DoneButton.tsx b/src/packages/v2v3/components/Create/components/Wizard/PageButtonControl/components/DoneButton.tsx similarity index 100% rename from src/components/Create/components/Wizard/PageButtonControl/components/DoneButton.tsx rename to src/packages/v2v3/components/Create/components/Wizard/PageButtonControl/components/DoneButton.tsx diff --git a/src/components/Create/components/Wizard/PageButtonControl/components/NextButton.tsx b/src/packages/v2v3/components/Create/components/Wizard/PageButtonControl/components/NextButton.tsx similarity index 100% rename from src/components/Create/components/Wizard/PageButtonControl/components/NextButton.tsx rename to src/packages/v2v3/components/Create/components/Wizard/PageButtonControl/components/NextButton.tsx diff --git a/src/components/Create/components/Wizard/Steps/MobileProgressModal.tsx b/src/packages/v2v3/components/Create/components/Wizard/Steps/MobileProgressModal.tsx similarity index 100% rename from src/components/Create/components/Wizard/Steps/MobileProgressModal.tsx rename to src/packages/v2v3/components/Create/components/Wizard/Steps/MobileProgressModal.tsx diff --git a/src/components/Create/components/Wizard/Steps/MobileStep.tsx b/src/packages/v2v3/components/Create/components/Wizard/Steps/MobileStep.tsx similarity index 100% rename from src/components/Create/components/Wizard/Steps/MobileStep.tsx rename to src/packages/v2v3/components/Create/components/Wizard/Steps/MobileStep.tsx diff --git a/src/components/Create/components/Wizard/Steps/Steps.tsx b/src/packages/v2v3/components/Create/components/Wizard/Steps/Steps.tsx similarity index 100% rename from src/components/Create/components/Wizard/Steps/Steps.tsx rename to src/packages/v2v3/components/Create/components/Wizard/Steps/Steps.tsx diff --git a/src/components/Create/components/Wizard/Wizard.tsx b/src/packages/v2v3/components/Create/components/Wizard/Wizard.tsx similarity index 100% rename from src/components/Create/components/Wizard/Wizard.tsx rename to src/packages/v2v3/components/Create/components/Wizard/Wizard.tsx diff --git a/src/components/Create/components/Wizard/contexts/PageContext.tsx b/src/packages/v2v3/components/Create/components/Wizard/contexts/PageContext.tsx similarity index 100% rename from src/components/Create/components/Wizard/contexts/PageContext.tsx rename to src/packages/v2v3/components/Create/components/Wizard/contexts/PageContext.tsx diff --git a/src/components/Create/components/Wizard/contexts/WizardContext.tsx b/src/packages/v2v3/components/Create/components/Wizard/contexts/WizardContext.tsx similarity index 100% rename from src/components/Create/components/Wizard/contexts/WizardContext.tsx rename to src/packages/v2v3/components/Create/components/Wizard/contexts/WizardContext.tsx diff --git a/src/components/Create/components/Wizard/hooks/usePage.ts b/src/packages/v2v3/components/Create/components/Wizard/hooks/usePage.ts similarity index 100% rename from src/components/Create/components/Wizard/hooks/usePage.ts rename to src/packages/v2v3/components/Create/components/Wizard/hooks/usePage.ts diff --git a/src/components/Create/components/Wizard/hooks/useSteps.ts b/src/packages/v2v3/components/Create/components/Wizard/hooks/useSteps.ts similarity index 100% rename from src/components/Create/components/Wizard/hooks/useSteps.ts rename to src/packages/v2v3/components/Create/components/Wizard/hooks/useSteps.ts diff --git a/src/components/Create/components/Wizard/hooks/useWizard.ts b/src/packages/v2v3/components/Create/components/Wizard/hooks/useWizard.ts similarity index 100% rename from src/components/Create/components/Wizard/hooks/useWizard.ts rename to src/packages/v2v3/components/Create/components/Wizard/hooks/useWizard.ts diff --git a/src/components/Create/components/pages/FundingCycles/FundingCyclesPage.tsx b/src/packages/v2v3/components/Create/components/pages/FundingCycles/FundingCyclesPage.tsx similarity index 98% rename from src/components/Create/components/pages/FundingCycles/FundingCyclesPage.tsx rename to src/packages/v2v3/components/Create/components/pages/FundingCycles/FundingCyclesPage.tsx index f1ff42e9f8..7caef86242 100644 --- a/src/components/Create/components/pages/FundingCycles/FundingCyclesPage.tsx +++ b/src/packages/v2v3/components/Create/components/pages/FundingCycles/FundingCyclesPage.tsx @@ -7,13 +7,13 @@ import { Trans, t } from '@lingui/macro' import { Form, Tooltip } from 'antd' import { useWatch } from 'antd/lib/form/Form' import { Callout } from 'components/Callout/Callout' -import { useLockPageRulesWrapper } from 'components/Create/hooks/useLockPageRulesWrapper' import { DurationInput } from 'components/inputs/DurationInput' import { JuiceDatePicker } from 'components/inputs/JuiceDatePicker' import { CREATE_FLOW } from 'constants/fathomEvents' import { trackFathomGoal } from 'lib/fathom' import moment from 'moment' import Link from 'next/link' +import { useLockPageRulesWrapper } from 'packages/v2v3/components/Create/hooks/useLockPageRulesWrapper' import { useContext, useEffect } from 'react' import { useSetCreateFurthestPageReached } from 'redux/hooks/useEditingCreateFurthestPageReached' import { durationMustExistRule } from 'utils/antdRules' diff --git a/src/components/Create/components/pages/FundingCycles/hooks/useFundingCyclesForm.ts b/src/packages/v2v3/components/Create/components/pages/FundingCycles/hooks/useFundingCyclesForm.ts similarity index 100% rename from src/components/Create/components/pages/FundingCycles/hooks/useFundingCyclesForm.ts rename to src/packages/v2v3/components/Create/components/pages/FundingCycles/hooks/useFundingCyclesForm.ts diff --git a/src/components/Create/components/pages/NftRewards/NftRewardsPage.tsx b/src/packages/v2v3/components/Create/components/pages/NftRewards/NftRewardsPage.tsx similarity index 100% rename from src/components/Create/components/pages/NftRewards/NftRewardsPage.tsx rename to src/packages/v2v3/components/Create/components/pages/NftRewards/NftRewardsPage.tsx diff --git a/src/components/Create/components/pages/NftRewards/hooks/useCreateFlowNftRewardsForm.ts b/src/packages/v2v3/components/Create/components/pages/NftRewards/hooks/useCreateFlowNftRewardsForm.ts similarity index 100% rename from src/components/Create/components/pages/NftRewards/hooks/useCreateFlowNftRewardsForm.ts rename to src/packages/v2v3/components/Create/components/pages/NftRewards/hooks/useCreateFlowNftRewardsForm.ts diff --git a/src/components/Create/components/pages/PayoutsPage/PayoutsPage.tsx b/src/packages/v2v3/components/Create/components/pages/PayoutsPage/PayoutsPage.tsx similarity index 100% rename from src/components/Create/components/pages/PayoutsPage/PayoutsPage.tsx rename to src/packages/v2v3/components/Create/components/pages/PayoutsPage/PayoutsPage.tsx diff --git a/src/components/Create/components/pages/PayoutsPage/components/CreateFlowPayoutsTable.tsx b/src/packages/v2v3/components/Create/components/pages/PayoutsPage/components/CreateFlowPayoutsTable.tsx similarity index 100% rename from src/components/Create/components/pages/PayoutsPage/components/CreateFlowPayoutsTable.tsx rename to src/packages/v2v3/components/Create/components/pages/PayoutsPage/components/CreateFlowPayoutsTable.tsx diff --git a/src/components/Create/components/pages/PayoutsPage/components/RadioCard.tsx b/src/packages/v2v3/components/Create/components/pages/PayoutsPage/components/RadioCard.tsx similarity index 92% rename from src/components/Create/components/pages/PayoutsPage/components/RadioCard.tsx rename to src/packages/v2v3/components/Create/components/pages/PayoutsPage/components/RadioCard.tsx index 4f7e7965e9..c46dbe67be 100644 --- a/src/components/Create/components/pages/PayoutsPage/components/RadioCard.tsx +++ b/src/packages/v2v3/components/Create/components/pages/PayoutsPage/components/RadioCard.tsx @@ -1,4 +1,4 @@ -import { CheckedCircle } from 'components/Create/components/Selection/components/CheckedCircle' +import { CheckedCircle } from 'packages/v2v3/components/Create/components/Selection/components/CheckedCircle' import { ReactNode } from 'react' import { twMerge } from 'tailwind-merge' diff --git a/src/components/Create/components/pages/PayoutsPage/components/TreasuryOptionsRadio.tsx b/src/packages/v2v3/components/Create/components/pages/PayoutsPage/components/TreasuryOptionsRadio.tsx similarity index 100% rename from src/components/Create/components/pages/PayoutsPage/components/TreasuryOptionsRadio.tsx rename to src/packages/v2v3/components/Create/components/pages/PayoutsPage/components/TreasuryOptionsRadio.tsx diff --git a/src/components/Create/components/pages/PayoutsPage/hooks/useAvailablePayoutsSelections.ts b/src/packages/v2v3/components/Create/components/pages/PayoutsPage/hooks/useAvailablePayoutsSelections.ts similarity index 73% rename from src/components/Create/components/pages/PayoutsPage/hooks/useAvailablePayoutsSelections.ts rename to src/packages/v2v3/components/Create/components/pages/PayoutsPage/hooks/useAvailablePayoutsSelections.ts index 20781491af..993611ee99 100644 --- a/src/components/Create/components/pages/PayoutsPage/hooks/useAvailablePayoutsSelections.ts +++ b/src/packages/v2v3/components/Create/components/pages/PayoutsPage/hooks/useAvailablePayoutsSelections.ts @@ -1,5 +1,5 @@ -import { determineAvailablePayoutsSelections } from 'components/Create/utils/determineAvailablePayoutsSelections' import { PayoutsSelection } from 'models/payoutsSelection' +import { determineAvailablePayoutsSelections } from 'packages/v2v3/components/Create/utils/determineAvailablePayoutsSelections' import { useEditingDistributionLimit } from 'redux/hooks/useEditingDistributionLimit' export const useAvailablePayoutsSelections = (): Set => { diff --git a/src/components/Create/components/pages/PayoutsPage/hooks/usePayoutsForm.ts b/src/packages/v2v3/components/Create/components/pages/PayoutsPage/hooks/usePayoutsForm.ts similarity index 100% rename from src/components/Create/components/pages/PayoutsPage/hooks/usePayoutsForm.ts rename to src/packages/v2v3/components/Create/components/pages/PayoutsPage/hooks/usePayoutsForm.ts diff --git a/src/components/Create/components/pages/ProjectDetails/ProjectDetailsPage.tsx b/src/packages/v2v3/components/Create/components/pages/ProjectDetails/ProjectDetailsPage.tsx similarity index 98% rename from src/components/Create/components/pages/ProjectDetails/ProjectDetailsPage.tsx rename to src/packages/v2v3/components/Create/components/pages/ProjectDetails/ProjectDetailsPage.tsx index 707b5b4ebe..ae8d94bb48 100644 --- a/src/components/Create/components/pages/ProjectDetails/ProjectDetailsPage.tsx +++ b/src/packages/v2v3/components/Create/components/pages/ProjectDetails/ProjectDetailsPage.tsx @@ -2,7 +2,6 @@ import { RightOutlined } from '@ant-design/icons' import { t, Trans } from '@lingui/macro' import { Col, Form, Row } from 'antd' import { Callout } from 'components/Callout/Callout' -import { useLockPageRulesWrapper } from 'components/Create/hooks/useLockPageRulesWrapper' import { FormItems } from 'components/formItems' import { EthAddressInput } from 'components/inputs/EthAddressInput' import FormattedNumberInput from 'components/inputs/FormattedNumberInput' @@ -15,6 +14,7 @@ import { constants } from 'ethers' import { useWallet } from 'hooks/Wallet' import { trackFathomGoal } from 'lib/fathom' import Link from 'next/link' +import { useLockPageRulesWrapper } from 'packages/v2v3/components/Create/hooks/useLockPageRulesWrapper' import { V2V3CurrencyOption } from 'packages/v2v3/models/currencyOption' import { V2V3_CURRENCY_ETH, diff --git a/src/components/Create/components/pages/ProjectDetails/hooks/useProjectDetailsForm.ts b/src/packages/v2v3/components/Create/components/pages/ProjectDetails/hooks/useProjectDetailsForm.ts similarity index 100% rename from src/components/Create/components/pages/ProjectDetails/hooks/useProjectDetailsForm.ts rename to src/packages/v2v3/components/Create/components/pages/ProjectDetails/hooks/useProjectDetailsForm.ts diff --git a/src/components/Create/components/pages/ProjectToken/ProjectTokenPage.tsx b/src/packages/v2v3/components/Create/components/pages/ProjectToken/ProjectTokenPage.tsx similarity index 100% rename from src/components/Create/components/pages/ProjectToken/ProjectTokenPage.tsx rename to src/packages/v2v3/components/Create/components/pages/ProjectToken/ProjectTokenPage.tsx diff --git a/src/components/Create/components/pages/ProjectToken/components/CustomTokenSettings/CustomTokenSettings.tsx b/src/packages/v2v3/components/Create/components/pages/ProjectToken/components/CustomTokenSettings/CustomTokenSettings.tsx similarity index 98% rename from src/components/Create/components/pages/ProjectToken/components/CustomTokenSettings/CustomTokenSettings.tsx rename to src/packages/v2v3/components/Create/components/pages/ProjectToken/components/CustomTokenSettings/CustomTokenSettings.tsx index e922dd5b2f..1a245d56ef 100644 --- a/src/components/Create/components/pages/ProjectToken/components/CustomTokenSettings/CustomTokenSettings.tsx +++ b/src/packages/v2v3/components/Create/components/pages/ProjectToken/components/CustomTokenSettings/CustomTokenSettings.tsx @@ -1,7 +1,6 @@ import { t, Trans } from '@lingui/macro' import { Divider, Form } from 'antd' import { Callout } from 'components/Callout/Callout' -import { formatFundingCycleDuration } from 'components/Create/utils/formatFundingCycleDuration' import FormattedNumberInput from 'components/inputs/FormattedNumberInput' import { JuiceSwitch } from 'components/inputs/JuiceSwitch' import NumberSlider from 'components/inputs/NumberSlider' @@ -14,6 +13,7 @@ import { } from 'components/strings' import { TokenRedemptionRateGraph } from 'components/TokenRedemptionRateGraph/TokenRedemptionRateGraph' import useMobile from 'hooks/useMobile' +import { formatFundingCycleDuration } from 'packages/v2v3/components/Create/utils/formatFundingCycleDuration' import { ReservedTokensList } from 'packages/v2v3/components/shared/ReservedTokensList' import { MAX_DISTRIBUTION_LIMIT, MAX_MINT_RATE } from 'packages/v2v3/utils/math' import { useAppSelector } from 'redux/hooks/useAppSelector' diff --git a/src/components/Create/components/pages/ProjectToken/components/CustomTokenSettings/ReservedTokenRateCallout.tsx b/src/packages/v2v3/components/Create/components/pages/ProjectToken/components/CustomTokenSettings/ReservedTokenRateCallout.tsx similarity index 100% rename from src/components/Create/components/pages/ProjectToken/components/CustomTokenSettings/ReservedTokenRateCallout.tsx rename to src/packages/v2v3/components/Create/components/pages/ProjectToken/components/CustomTokenSettings/ReservedTokenRateCallout.tsx diff --git a/src/components/Create/components/pages/ProjectToken/components/DefaultSettings.tsx b/src/packages/v2v3/components/Create/components/pages/ProjectToken/components/DefaultSettings.tsx similarity index 100% rename from src/components/Create/components/pages/ProjectToken/components/DefaultSettings.tsx rename to src/packages/v2v3/components/Create/components/pages/ProjectToken/components/DefaultSettings.tsx diff --git a/src/components/Create/components/pages/ProjectToken/hooks/useProjectTokenForm.ts b/src/packages/v2v3/components/Create/components/pages/ProjectToken/hooks/useProjectTokenForm.ts similarity index 100% rename from src/components/Create/components/pages/ProjectToken/hooks/useProjectTokenForm.ts rename to src/packages/v2v3/components/Create/components/pages/ProjectToken/hooks/useProjectTokenForm.ts diff --git a/src/components/Create/components/pages/ReconfigurationRules/ReconfigurationRulesPage.tsx b/src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/ReconfigurationRulesPage.tsx similarity index 95% rename from src/components/Create/components/pages/ReconfigurationRules/ReconfigurationRulesPage.tsx rename to src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/ReconfigurationRulesPage.tsx index 7c34ac7671..bf24fbeb3a 100644 --- a/src/components/Create/components/pages/ReconfigurationRules/ReconfigurationRulesPage.tsx +++ b/src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/ReconfigurationRulesPage.tsx @@ -2,8 +2,6 @@ import { t, Trans } from '@lingui/macro' import { Form } from 'antd' import { useWatch } from 'antd/lib/form/Form' import { Callout } from 'components/Callout/Callout' -import { Selection } from 'components/Create/components/Selection/Selection' -import { useAvailableReconfigurationStrategies } from 'components/Create/hooks/useAvailableReconfigurationStrategies' import { JuiceSwitch } from 'components/inputs/JuiceSwitch' import { CONTROLLER_CONFIG_EXPLANATION, @@ -18,6 +16,8 @@ import { CREATE_FLOW } from 'constants/fathomEvents' import { FEATURE_FLAGS } from 'constants/featureFlags' import { readNetwork } from 'constants/networks' import { trackFathomGoal } from 'lib/fathom' +import { Selection } from 'packages/v2v3/components/Create/components/Selection/Selection' +import { useAvailableReconfigurationStrategies } from 'packages/v2v3/components/Create/hooks/useAvailableReconfigurationStrategies' import { useContext } from 'react' import { useSetCreateFurthestPageReached } from 'redux/hooks/useEditingCreateFurthestPageReached' import { featureFlagEnabled } from 'utils/featureFlags' diff --git a/src/components/Create/components/pages/ReconfigurationRules/components/CustomRuleCard.tsx b/src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/components/CustomRuleCard.tsx similarity index 91% rename from src/components/Create/components/pages/ReconfigurationRules/components/CustomRuleCard.tsx rename to src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/components/CustomRuleCard.tsx index bfa7da4dd8..65204798ab 100644 --- a/src/components/Create/components/pages/ReconfigurationRules/components/CustomRuleCard.tsx +++ b/src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/components/CustomRuleCard.tsx @@ -1,7 +1,7 @@ import { t } from '@lingui/macro' import { Form } from 'antd' -import { Selection } from 'components/Create/components/Selection/Selection' import { CustomStrategyInput } from 'components/inputs/ReconfigurationStrategy/CustomStrategyInput' +import { Selection } from 'packages/v2v3/components/Create/components/Selection/Selection' import { inputMustBeEthAddressRule, inputMustExistRule } from 'utils/antdRules' export const CustomRuleCard = () => { diff --git a/src/components/Create/components/pages/ReconfigurationRules/components/RuleCard.tsx b/src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/components/RuleCard.tsx similarity index 74% rename from src/components/Create/components/pages/ReconfigurationRules/components/RuleCard.tsx rename to src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/components/RuleCard.tsx index e2065dfdba..897f28df90 100644 --- a/src/components/Create/components/pages/ReconfigurationRules/components/RuleCard.tsx +++ b/src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/components/RuleCard.tsx @@ -1,7 +1,7 @@ -import { CreateBadge } from 'components/Create/components/CreateBadge' -import { Selection } from 'components/Create/components/Selection/Selection' -import { AvailableReconfigurationStrategy } from 'components/Create/hooks/useAvailableReconfigurationStrategies' import EthereumAddress from 'components/EthereumAddress' +import { CreateBadge } from 'packages/v2v3/components/Create/components/CreateBadge' +import { Selection } from 'packages/v2v3/components/Create/components/Selection/Selection' +import { AvailableReconfigurationStrategy } from 'packages/v2v3/components/Create/hooks/useAvailableReconfigurationStrategies' export const RuleCard = ({ strategy, diff --git a/src/components/Create/components/pages/ReconfigurationRules/hooks/useReconfigurationRulesForm.ts b/src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/hooks/useReconfigurationRulesForm.ts similarity index 97% rename from src/components/Create/components/pages/ReconfigurationRules/hooks/useReconfigurationRulesForm.ts rename to src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/hooks/useReconfigurationRulesForm.ts index bd977da8d8..23434ae661 100644 --- a/src/components/Create/components/pages/ReconfigurationRules/hooks/useReconfigurationRulesForm.ts +++ b/src/packages/v2v3/components/Create/components/pages/ReconfigurationRules/hooks/useReconfigurationRulesForm.ts @@ -1,8 +1,8 @@ import { Form } from 'antd' import { useForm } from 'antd/lib/form/Form' -import { useAvailableReconfigurationStrategies } from 'components/Create/hooks/useAvailableReconfigurationStrategies' import { readNetwork } from 'constants/networks' import { ReconfigurationStrategy } from 'models/reconfigurationStrategy' +import { useAvailableReconfigurationStrategies } from 'packages/v2v3/components/Create/hooks/useAvailableReconfigurationStrategies' import { useEffect, useMemo } from 'react' import { useAppDispatch } from 'redux/hooks/useAppDispatch' import { useAppSelector } from 'redux/hooks/useAppSelector' diff --git a/src/components/Create/components/pages/ReviewDeploy/ReviewDeployPage.tsx b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/ReviewDeployPage.tsx similarity index 98% rename from src/components/Create/components/pages/ReviewDeploy/ReviewDeployPage.tsx rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/ReviewDeployPage.tsx index f4a1e81c33..12b411967e 100644 --- a/src/components/Create/components/pages/ReviewDeploy/ReviewDeployPage.tsx +++ b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/ReviewDeployPage.tsx @@ -2,7 +2,6 @@ import { CheckCircleFilled } from '@ant-design/icons' import { Trans } from '@lingui/macro' import { Checkbox, Form } from 'antd' import { Callout } from 'components/Callout/Callout' -import { useDeployProject } from 'components/Create/hooks/DeployProject/useDeployProject' import ExternalLink from 'components/ExternalLink' import TransactionModal from 'components/modals/TransactionModal' import { TERMS_OF_SERVICE_URL } from 'constants/links' @@ -11,6 +10,7 @@ import { emitConfirmationDeletionModal } from 'hooks/emitConfirmationDeletionMod import useMobile from 'hooks/useMobile' import { useModal } from 'hooks/useModal' import { useRouter } from 'next/router' +import { useDeployProject } from 'packages/v2v3/components/Create/hooks/DeployProject/useDeployProject' import { useCallback, useContext, useEffect, useMemo, useState } from 'react' import { useDispatch } from 'react-redux' import { useAppSelector } from 'redux/hooks/useAppSelector' diff --git a/src/components/Create/components/pages/ReviewDeploy/components/DeploySuccess.tsx b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/DeploySuccess.tsx similarity index 100% rename from src/components/Create/components/pages/ReviewDeploy/components/DeploySuccess.tsx rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/DeploySuccess.tsx diff --git a/src/components/Create/components/pages/ReviewDeploy/components/FundingConfigurationReview/FundingConfigurationReview.tsx b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/FundingConfigurationReview/FundingConfigurationReview.tsx similarity index 100% rename from src/components/Create/components/pages/ReviewDeploy/components/FundingConfigurationReview/FundingConfigurationReview.tsx rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/FundingConfigurationReview/FundingConfigurationReview.tsx diff --git a/src/components/Create/components/pages/ReviewDeploy/components/FundingConfigurationReview/hooks/useFundingConfigurationReview.ts b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/FundingConfigurationReview/hooks/useFundingConfigurationReview.ts similarity index 90% rename from src/components/Create/components/pages/ReviewDeploy/components/FundingConfigurationReview/hooks/useFundingConfigurationReview.ts rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/FundingConfigurationReview/hooks/useFundingConfigurationReview.ts index 99ccac1c6d..83b7f6a8e3 100644 --- a/src/components/Create/components/pages/ReviewDeploy/components/FundingConfigurationReview/hooks/useFundingConfigurationReview.ts +++ b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/FundingConfigurationReview/hooks/useFundingConfigurationReview.ts @@ -1,7 +1,7 @@ import { t } from '@lingui/macro' -import { useAvailablePayoutsSelections } from 'components/Create/components/pages/PayoutsPage/hooks/useAvailablePayoutsSelections' -import { formatFundingCycleDuration } from 'components/Create/utils/formatFundingCycleDuration' import moment from 'moment' +import { useAvailablePayoutsSelections } from 'packages/v2v3/components/Create/components/pages/PayoutsPage/hooks/useAvailablePayoutsSelections' +import { formatFundingCycleDuration } from 'packages/v2v3/components/Create/utils/formatFundingCycleDuration' import { AllocationSplit } from 'packages/v2v3/components/shared/Allocation/Allocation' import { allocationToSplit, splitToAllocation } from 'packages/v2v3/utils/splitToAllocation' import { useCallback, useMemo } from 'react' diff --git a/src/components/Create/components/pages/ReviewDeploy/components/ProjectDetailsReview/ProjectDetailsReview.tsx b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/ProjectDetailsReview/ProjectDetailsReview.tsx similarity index 100% rename from src/components/Create/components/pages/ReviewDeploy/components/ProjectDetailsReview/ProjectDetailsReview.tsx rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/ProjectDetailsReview/ProjectDetailsReview.tsx diff --git a/src/components/Create/components/pages/ReviewDeploy/components/ProjectTokenReview/ProjectTokenReview.tsx b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/ProjectTokenReview/ProjectTokenReview.tsx similarity index 100% rename from src/components/Create/components/pages/ReviewDeploy/components/ProjectTokenReview/ProjectTokenReview.tsx rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/ProjectTokenReview/ProjectTokenReview.tsx diff --git a/src/components/Create/components/pages/ReviewDeploy/components/ProjectTokenReview/hooks/useProjectTokenReview.ts b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/ProjectTokenReview/hooks/useProjectTokenReview.ts similarity index 100% rename from src/components/Create/components/pages/ReviewDeploy/components/ProjectTokenReview/hooks/useProjectTokenReview.ts rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/ProjectTokenReview/hooks/useProjectTokenReview.ts diff --git a/src/components/Create/components/pages/ReviewDeploy/components/ReviewDescription.tsx b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/ReviewDescription.tsx similarity index 100% rename from src/components/Create/components/pages/ReviewDeploy/components/ReviewDescription.tsx rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/ReviewDescription.tsx diff --git a/src/components/Create/components/pages/ReviewDeploy/components/RewardsReview/RewardsReview.tsx b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/RewardsReview/RewardsReview.tsx similarity index 100% rename from src/components/Create/components/pages/ReviewDeploy/components/RewardsReview/RewardsReview.tsx rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/RewardsReview/RewardsReview.tsx diff --git a/src/components/Create/components/pages/ReviewDeploy/components/RulesReview/RulesReview.tsx b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/RulesReview/RulesReview.tsx similarity index 100% rename from src/components/Create/components/pages/ReviewDeploy/components/RulesReview/RulesReview.tsx rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/RulesReview/RulesReview.tsx diff --git a/src/components/Create/components/pages/ReviewDeploy/components/RulesReview/hooks/useRulesReview.ts b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/RulesReview/hooks/useRulesReview.ts similarity index 94% rename from src/components/Create/components/pages/ReviewDeploy/components/RulesReview/hooks/useRulesReview.ts rename to src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/RulesReview/hooks/useRulesReview.ts index 898398e828..d80302184d 100644 --- a/src/components/Create/components/pages/ReviewDeploy/components/RulesReview/hooks/useRulesReview.ts +++ b/src/packages/v2v3/components/Create/components/pages/ReviewDeploy/components/RulesReview/hooks/useRulesReview.ts @@ -1,5 +1,5 @@ -import { useAvailableReconfigurationStrategies } from 'components/Create/hooks/useAvailableReconfigurationStrategies' import { readNetwork } from 'constants/networks' +import { useAvailableReconfigurationStrategies } from 'packages/v2v3/components/Create/hooks/useAvailableReconfigurationStrategies' import { useMemo } from 'react' import { useAppSelector } from 'redux/hooks/useAppSelector' import { diff --git a/src/components/Create/components/pages/hooks/useFormDispatchWatch.ts b/src/packages/v2v3/components/Create/components/pages/hooks/useFormDispatchWatch.ts similarity index 100% rename from src/components/Create/components/pages/hooks/useFormDispatchWatch.ts rename to src/packages/v2v3/components/Create/components/pages/hooks/useFormDispatchWatch.ts diff --git a/src/components/Create/hooks/DeployProject/hooks/NFT/useDeployNftProject.ts b/src/packages/v2v3/components/Create/hooks/DeployProject/hooks/NFT/useDeployNftProject.ts similarity index 100% rename from src/components/Create/hooks/DeployProject/hooks/NFT/useDeployNftProject.ts rename to src/packages/v2v3/components/Create/hooks/DeployProject/hooks/NFT/useDeployNftProject.ts diff --git a/src/components/Create/hooks/DeployProject/hooks/NFT/useIsNftProject.ts b/src/packages/v2v3/components/Create/hooks/DeployProject/hooks/NFT/useIsNftProject.ts similarity index 100% rename from src/components/Create/hooks/DeployProject/hooks/NFT/useIsNftProject.ts rename to src/packages/v2v3/components/Create/hooks/DeployProject/hooks/NFT/useIsNftProject.ts diff --git a/src/components/Create/hooks/DeployProject/hooks/NFT/useUploadNftRewards.ts b/src/packages/v2v3/components/Create/hooks/DeployProject/hooks/NFT/useUploadNftRewards.ts similarity index 100% rename from src/components/Create/hooks/DeployProject/hooks/NFT/useUploadNftRewards.ts rename to src/packages/v2v3/components/Create/hooks/DeployProject/hooks/NFT/useUploadNftRewards.ts diff --git a/src/components/Create/hooks/DeployProject/hooks/useDeployStandardProject.ts b/src/packages/v2v3/components/Create/hooks/DeployProject/hooks/useDeployStandardProject.ts similarity index 100% rename from src/components/Create/hooks/DeployProject/hooks/useDeployStandardProject.ts rename to src/packages/v2v3/components/Create/hooks/DeployProject/hooks/useDeployStandardProject.ts diff --git a/src/components/Create/hooks/DeployProject/useDeployProject.ts b/src/packages/v2v3/components/Create/hooks/DeployProject/useDeployProject.ts similarity index 100% rename from src/components/Create/hooks/DeployProject/useDeployProject.ts rename to src/packages/v2v3/components/Create/hooks/DeployProject/useDeployProject.ts diff --git a/src/components/Create/hooks/useAvailableReconfigurationStrategies.ts b/src/packages/v2v3/components/Create/hooks/useAvailableReconfigurationStrategies.ts similarity index 100% rename from src/components/Create/hooks/useAvailableReconfigurationStrategies.ts rename to src/packages/v2v3/components/Create/hooks/useAvailableReconfigurationStrategies.ts diff --git a/src/components/Create/hooks/useLoadInitialStateFromQuery.ts b/src/packages/v2v3/components/Create/hooks/useLoadInitialStateFromQuery.ts similarity index 100% rename from src/components/Create/hooks/useLoadInitialStateFromQuery.ts rename to src/packages/v2v3/components/Create/hooks/useLoadInitialStateFromQuery.ts diff --git a/src/components/Create/hooks/useLockPageRulesWrapper.ts b/src/packages/v2v3/components/Create/hooks/useLockPageRulesWrapper.ts similarity index 100% rename from src/components/Create/hooks/useLockPageRulesWrapper.ts rename to src/packages/v2v3/components/Create/hooks/useLockPageRulesWrapper.ts diff --git a/src/components/Create/utils/determineAvailablePayoutsSelections.ts b/src/packages/v2v3/components/Create/utils/determineAvailablePayoutsSelections.ts similarity index 100% rename from src/components/Create/utils/determineAvailablePayoutsSelections.ts rename to src/packages/v2v3/components/Create/utils/determineAvailablePayoutsSelections.ts diff --git a/src/components/Create/utils/formatFundingCycleDuration.ts b/src/packages/v2v3/components/Create/utils/formatFundingCycleDuration.ts similarity index 100% rename from src/components/Create/utils/formatFundingCycleDuration.ts rename to src/packages/v2v3/components/Create/utils/formatFundingCycleDuration.ts diff --git a/src/components/Create/utils/projectTokenSettingsToReduxFormat.ts b/src/packages/v2v3/components/Create/utils/projectTokenSettingsToReduxFormat.ts similarity index 100% rename from src/components/Create/utils/projectTokenSettingsToReduxFormat.ts rename to src/packages/v2v3/components/Create/utils/projectTokenSettingsToReduxFormat.ts diff --git a/src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/ReviewConfirmModal/ReviewConfirmModal.tsx b/src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/ReviewConfirmModal/ReviewConfirmModal.tsx index 030aeea4c2..f2b364fa8f 100644 --- a/src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/ReviewConfirmModal/ReviewConfirmModal.tsx +++ b/src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/ReviewConfirmModal/ReviewConfirmModal.tsx @@ -1,9 +1,9 @@ import { Trans, t } from '@lingui/macro' import { Form } from 'antd' import { useWatch } from 'antd/lib/form/Form' -import { CreateCollapse } from 'components/Create/components/CreateCollapse/CreateCollapse' import { JuiceTextArea } from 'components/inputs/JuiceTextArea' import TransactionModal from 'components/modals/TransactionModal' +import { CreateCollapse } from 'packages/v2v3/components/Create/components/CreateCollapse/CreateCollapse' import { useState } from 'react' import { TransactionSuccessModal } from '../../../TransactionSuccessModal' import { useReconfigureFundingCycle } from '../../../hooks/useReconfigureFundingCycle' diff --git a/src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/hooks/useLoadEditCycleData.tsx b/src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/hooks/useLoadEditCycleData.tsx index a6c0a76994..ca0a199152 100644 --- a/src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/hooks/useLoadEditCycleData.tsx +++ b/src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/hooks/useLoadEditCycleData.tsx @@ -1,7 +1,7 @@ import { BigNumber } from '@ethersproject/bignumber' import { Form } from 'antd' -import { DefaultSettings as DefaultTokenSettings } from 'components/Create/components/pages/ProjectToken/hooks/useProjectTokenForm' import isEqual from 'lodash/isEqual' +import { DefaultSettings as DefaultTokenSettings } from 'packages/v2v3/components/Create/components/pages/ProjectToken/hooks/useProjectTokenForm' import { V2V3CurrencyOption } from 'packages/v2v3/models/currencyOption' import { V2V3CurrencyName } from 'packages/v2v3/utils/currency' import { distributionLimitStringtoNumber } from 'packages/v2v3/utils/distributions' diff --git a/src/packages/v4/views/V4ProjectSettings/EditCyclePage/ReviewConfirmModal/ReviewConfirmModal.tsx b/src/packages/v4/views/V4ProjectSettings/EditCyclePage/ReviewConfirmModal/ReviewConfirmModal.tsx index 69f82e0ece..980c8c784b 100644 --- a/src/packages/v4/views/V4ProjectSettings/EditCyclePage/ReviewConfirmModal/ReviewConfirmModal.tsx +++ b/src/packages/v4/views/V4ProjectSettings/EditCyclePage/ReviewConfirmModal/ReviewConfirmModal.tsx @@ -1,9 +1,9 @@ import { Trans, t } from '@lingui/macro' import { Form } from 'antd' import { useWatch } from 'antd/lib/form/Form' -import { CreateCollapse } from 'components/Create/components/CreateCollapse/CreateCollapse' import { JuiceTextArea } from 'components/inputs/JuiceTextArea' import TransactionModal from 'components/modals/TransactionModal' +import { CreateCollapse } from 'packages/v2v3/components/Create/components/CreateCollapse/CreateCollapse' import { useState } from 'react' // import { useReconfigureFundingCycle } from '../../../hooks/useReconfigureFundingCycle' import { useEditCycleFormContext } from '../EditCycleFormContext' diff --git a/src/pages/create/index.tsx b/src/pages/create/index.tsx index 074a0c3dd1..7a29a18eef 100644 --- a/src/pages/create/index.tsx +++ b/src/pages/create/index.tsx @@ -1,9 +1,9 @@ import { AppWrapper } from 'components/common/CoreAppWrapper/CoreAppWrapper' import { Head } from 'components/common/Head/Head' -import { Create } from 'components/Create/Create' import { CV_V3 } from 'constants/cv' import { SiteBaseUrl } from 'constants/url' import { TransactionProvider } from 'contexts/Transaction/TransactionProvider' +import { Create } from 'packages/v2v3/components/Create/Create' import { V2V3ContractsProvider } from 'packages/v2v3/contexts/Contracts/V2V3ContractsProvider' import { V2V3CurrencyProvider } from 'packages/v2v3/contexts/V2V3CurrencyProvider' import { Provider } from 'react-redux' diff --git a/src/redux/slices/editingV2Project/editingV2Project.ts b/src/redux/slices/editingV2Project/editingV2Project.ts index 4cd4d38807..cc0279d0ae 100644 --- a/src/redux/slices/editingV2Project/editingV2Project.ts +++ b/src/redux/slices/editingV2Project/editingV2Project.ts @@ -1,6 +1,4 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { AmountInputValue } from 'components/Create/components/pages/ProjectDetails/ProjectDetailsPage' -import { projectTokenSettingsToReduxFormat } from 'components/Create/utils/projectTokenSettingsToReduxFormat' import { CreatePage } from 'models/createPage' import { JB721GovernanceType, @@ -13,6 +11,8 @@ import { ProjectTagName } from 'models/project-tags' import { ProjectTokensSelection } from 'models/projectTokenSelection' import { ReconfigurationStrategy } from 'models/reconfigurationStrategy' import { TreasurySelection } from 'models/treasurySelection' +import { AmountInputValue } from 'packages/v2v3/components/Create/components/pages/ProjectDetails/ProjectDetailsPage' +import { projectTokenSettingsToReduxFormat } from 'packages/v2v3/components/Create/utils/projectTokenSettingsToReduxFormat' import { AllocationSplit } from 'packages/v2v3/components/shared/Allocation/Allocation' import { Split } from 'packages/v2v3/models/splits' import {