Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

chore: move some files #4185

Merged
merged 2 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/Create/Create.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import { PayoutsPage } from './components/pages/PayoutsPage/PayoutsPage'
import { ProjectDetailsPage } from './components/pages/ProjectDetails/ProjectDetailsPage'
import { ProjectTokenPage } from './components/pages/ProjectToken/ProjectTokenPage'
import { ReconfigurationRulesPage } from './components/pages/ReconfigurationRules/ReconfigurationRulesPage'
import { DeploySuccess } from './components/pages/ReviewDeploy/components/DeploySuccess/DeploySuccess'
import { DeploySuccess } from './components/pages/ReviewDeploy/components/DeploySuccess'
import { ReviewDeployPage } from './components/pages/ReviewDeploy/ReviewDeployPage'
import { PayoutsMigrationModal } from './components/PayoutsMigrationModal/PayoutsMigrationModal'
import { PayoutsMigrationModal } from './components/PayoutsMigrationModal'
import { Wizard } from './components/Wizard/Wizard'
import { useLoadingInitialStateFromQuery } from './hooks/useLoadInitialStateFromQuery'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { durationMustExistRule } from 'utils/antdRules'
import { CreateBadge } from '../../CreateBadge'
import { CreateCollapse } from '../../CreateCollapse/CreateCollapse'
import { Icons } from '../../Icons'
import { OptionalHeader } from '../../OptionalHeader/OptionalHeader'
import { OptionalHeader } from '../../OptionalHeader'
import { Selection } from '../../Selection/Selection'
import { Wizard } from '../../Wizard/Wizard'
import { PageContext } from '../../Wizard/contexts/PageContext'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Form } from 'antd'
import PayoutsTable from 'components/v2v3/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/PayoutsSection/PayoutsTable'
import { PayoutsTable } from 'components/v2v3/shared/PayoutsTable/PayoutsTable'
import { CURRENCY_METADATA, CurrencyName } from 'constants/currency'
import { Split } from 'models/splits'
import { ReactNode } from 'react'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { RadioGroup } from '@headlessui/react'
import { t } from '@lingui/macro'
import { Callout } from 'components/Callout/Callout'
import { DeleteConfirmationModal } from 'components/modals/DeleteConfirmationModal'
import { SwitchToUnlimitedModal } from 'components/v2v3/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/PayoutsSection/PayoutsTable/modals/SwitchToUnlimitedModal'
import { usePayoutsTable } from 'components/v2v3/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/PayoutsSection/hooks/usePayoutsTable'
import { usePayoutsTable } from 'components/v2v3/shared/PayoutsTable/hooks/usePayoutsTable'
import { SwitchToUnlimitedModal } from 'components/v2v3/shared/PayoutsTable/modals/SwitchToUnlimitedModal'
import { useModal } from 'hooks/useModal'
import { TreasurySelection } from 'models/treasurySelection'
import { useCallback, useEffect, useMemo, useState } from 'react'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { inputIsLengthRule } from 'utils/antdRules/inputIsLengthRule'
import { featureFlagEnabled } from 'utils/featureFlags'
import { V2V3_CURRENCY_ETH, V2V3_CURRENCY_USD } from 'utils/v2v3/currency'
import { CreateCollapse } from '../../CreateCollapse/CreateCollapse'
import { OptionalHeader } from '../../OptionalHeader/OptionalHeader'
import { OptionalHeader } from '../../OptionalHeader'
import { PageContext } from '../../Wizard/contexts/PageContext'
import { Wizard } from '../../Wizard/Wizard'
import { useProjectDetailsForm } from './hooks/useProjectDetailsForm'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { Selection } from '../../Selection/Selection'
import { PageContext } from '../../Wizard/contexts/PageContext'
import { Wizard } from '../../Wizard/Wizard'
import { CustomTokenSettings } from './components/CustomTokenSettings/CustomTokenSettings'
import { DefaultSettings } from './components/DefaultSettings/DefaultSettings'
import { DefaultSettings } from './components/DefaultSettings'
import { useProjectTokensForm } from './hooks/useProjectTokenForm'

export const ProjectTokenPage: React.FC<
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
REDEMPTION_RATE_EXPLANATION,
} from 'components/strings'
import { TokenRedemptionRateGraph } from 'components/TokenRedemptionRateGraph/TokenRedemptionRateGraph'
import { ReservedTokensList } from 'components/v2v3/shared/ReservedTokensList'
import useMobile from 'hooks/useMobile'
import { useAppSelector } from 'redux/hooks/useAppSelector'
import { useEditingDistributionLimit } from 'redux/hooks/useEditingDistributionLimit'
Expand All @@ -21,8 +22,7 @@ import { formatAmount } from 'utils/format/formatAmount'
import { MAX_DISTRIBUTION_LIMIT, MAX_MINT_RATE } from 'utils/v2v3/math'
import * as ProjectTokenForm from '../../hooks/useProjectTokenForm'
import { ProjectTokensFormProps } from '../../hooks/useProjectTokenForm'
import { ReservedTokenRateCallout } from './components/ReservedTokenRateCallout/ReservedTokenRateCallout'
import { ReservedTokensList } from './components/ReservedTokensList/ReservedTokensList'
import { ReservedTokenRateCallout } from './ReservedTokenRateCallout'

const calculateMintRateAfterDiscount = ({
mintRate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Form } from 'antd'
import { Callout } from 'components/Callout/Callout'
import { useMemo } from 'react'
import { formattedNum } from 'utils/format/formatNumber'
import { ProjectTokensFormProps } from '../../../../hooks/useProjectTokenForm'
import { ProjectTokensFormProps } from '../../hooks/useProjectTokenForm'

export const ReservedTokenRateCallout: React.FC<
React.PropsWithChildren<unknown>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import { ReactNode, useMemo } from 'react'
import { formatAmount } from 'utils/format/formatAmount'
import { formatBoolean } from 'utils/format/formatBoolean'
import * as ProjectTokenForm from '../../hooks/useProjectTokenForm'
import * as ProjectTokenForm from '../hooks/useProjectTokenForm'

export const DefaultSettings: React.FC<
React.PropsWithChildren<unknown>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { t, Trans } from '@lingui/macro'
import { Tooltip } from 'antd'
import { CreateFlowPayoutsTable } from '../../../PayoutsPage/components/CreateFlowPayoutsTable'
import { ReviewDescription } from '../ReviewDescription/ReviewDescription'
import { ReviewDescription } from '../ReviewDescription'
import { useFundingConfigurationReview } from './hooks/useFundingConfigurationReview'

export const FundingConfigurationReview = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { featureFlagEnabled } from 'utils/featureFlags'
import { parseWad } from 'utils/format/formatNumber'
import { ipfsUriToGatewayUrl } from 'utils/ipfs'
import { wrapNonAnchorsInAnchor } from 'utils/wrapNonAnchorsInAnchor'
import { ReviewDescription } from '../ReviewDescription/ReviewDescription'
import { ReviewDescription } from '../ReviewDescription'

export const ProjectDetailsReview = () => {
const { userAddress } = useWallet()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { t } from '@lingui/macro'
import { ReservedTokensList } from 'components/v2v3/shared/ReservedTokensList'
import { formatAmount } from 'utils/format/formatAmount'
import {
formatDiscountRate,
formatIssuanceRate,
formatRedemptionRate,
formatReservedRate,
} from 'utils/v2v3/math'
import { ReservedTokensList } from '../../../ProjectToken/components/CustomTokenSettings/components/ReservedTokensList/ReservedTokensList'
import * as ProjectTokenForm from '../../../ProjectToken/hooks/useProjectTokenForm'
import { ReviewDescription } from '../ReviewDescription/ReviewDescription'
import { ReviewDescription } from '../ReviewDescription'
import { useProjectTokenReview } from './hooks/useProjectTokenReview'

export const ProjectTokenReview = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useAppSelector } from 'redux/hooks/useAppSelector'
import { editingV2ProjectActions } from 'redux/slices/editingV2Project'
import { formatEnabled } from 'utils/format/formatBoolean'
import { v4 } from 'uuid'
import { ReviewDescription } from '../ReviewDescription/ReviewDescription'
import { ReviewDescription } from '../ReviewDescription'

export const RewardsReview = () => {
const {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { t } from '@lingui/macro'
import EthereumAddress from 'components/EthereumAddress'
import { ReviewDescription } from '../ReviewDescription/ReviewDescription'
import { ReviewDescription } from '../ReviewDescription'
import { useRulesReview } from './hooks/useRulesReview'

export const RulesReview = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { inputMustExistRule } from 'utils/antdRules'
import { helpPagePath } from 'utils/routes'
import { CreateBadge } from '../../Create/components/CreateBadge'
import { CreateCollapse } from '../../Create/components/CreateCollapse/CreateCollapse'
import { OptionalHeader } from '../../Create/components/OptionalHeader/OptionalHeader'
import { OptionalHeader } from '../../Create/components/OptionalHeader'
import { RewardsList } from '../RewardsList/RewardsList'
import { NftAdvancedFormItems } from './NftAdvancedFormItems'
import { NftPaymentSuccessFormItems } from './NftPaymentSuccessFormItems'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { withHttps } from 'utils/externalLink'
import { ipfsGatewayUrl } from 'utils/ipfs'
import { V2V3_CURRENCY_USD } from 'utils/v2v3/currency'
import { CreateCollapse } from '../../Create/components/CreateCollapse/CreateCollapse'
import { OptionalHeader } from '../../Create/components/OptionalHeader/OptionalHeader'
import { OptionalHeader } from '../../Create/components/OptionalHeader'

interface AddEditRewardModalFormProps {
fileUrl: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Callout } from 'components/Callout/Callout'
import FormattedNumberInput from 'components/inputs/FormattedNumberInput'
import TransactionModal from 'components/modals/TransactionModal'
import { FEES_EXPLANATION } from 'components/strings'
import { PayoutsTable } from 'components/v2v3/shared/PayoutsTable/PayoutsTable'
import { V2V3ProjectContext } from 'contexts/v2v3/Project/V2V3ProjectContext'
import { BigNumber } from 'ethers'
import { useCurrencyConverter } from 'hooks/useCurrencyConverter'
Expand All @@ -13,7 +14,6 @@ import { V2V3CurrencyOption } from 'models/v2v3/currencyOption'
import { useContext, useEffect, useState } from 'react'
import { fromWad, parseWad } from 'utils/format/formatNumber'
import { V2V3_CURRENCY_USD, V2V3CurrencyName } from 'utils/v2v3/currency'
import PayoutsTable from '../../V2V3ProjectSettings/pages/EditCyclePage/PayoutsSection/PayoutsTable'

export default function DistributePayoutsModal({
open,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { helpPagePath, settingsPagePath } from 'utils/routes'
import { DetailsSection } from './DetailsSection'
import { useEditCycleFormContext } from './EditCycleFormContext'
import EditCycleFormSection from './EditCycleFormSection'
import { PayoutsSection } from './PayoutsSection'
import { PayoutsSection } from './PayoutsSection/PayoutsSection'
import { ReviewConfirmModal } from './ReviewConfirmModal'
import { TokensSection } from './TokensSection'
import { useEditCycleFormHasError } from './hooks/useEditCycleFormHasError'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { Trans } from '@lingui/macro'
import { Form } from 'antd'
import { useWatch } from 'antd/lib/form/Form'
import { JuiceSwitch } from 'components/inputs/JuiceSwitch'
import { PayoutsTable } from 'components/v2v3/shared/PayoutsTable/PayoutsTable'
import { CurrencyName } from 'constants/currency'
import { Split } from 'models/splits'
import { AdvancedDropdown } from '../AdvancedDropdown'
import { useEditCycleFormContext } from '../EditCycleFormContext'
import PayoutsTable from './PayoutsTable'

export function PayoutsSection() {
const { editCycleForm } = useEditCycleFormContext()
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Trans } from '@lingui/macro'
import { Callout } from 'components/Callout/Callout'
import { ReservedTokensList } from 'components/Create/components/pages/ProjectToken/components/CustomTokenSettings/components/ReservedTokensList/ReservedTokensList'
import { CsvUpload } from 'components/inputs/CsvUpload'
import { AllocationSplit } from 'components/v2v3/shared/Allocation/Allocation'
import { ReservedTokensList } from 'components/v2v3/shared/ReservedTokensList'
import { Split } from 'models/splits'
import { useCallback } from 'react'
import { parseV2SplitsCsv } from 'utils/csv'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import { useCurrencyConverter } from 'hooks/useCurrencyConverter'
import round from 'lodash/round'
import { fromWad, parseWad } from 'utils/format/formatNumber'
import { V2V3_CURRENCY_ETH, V2V3_CURRENCY_USD } from 'utils/v2v3/currency'
import { usePayoutsTable } from '../hooks/usePayoutsTable'
import {
payoutsTableMenuItemsIconClass,
payoutsTableMenuItemsLabelClass,
} from './PayoutTableSettings'
import { usePayoutsTableContext } from './context/PayoutsTableContext'
import { usePayoutsTable } from './hooks/usePayoutsTable'

export function CurrencySwitcher() {
const { setCurrency: setCurrencyName } = usePayoutsTableContext()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { PlusOutlined } from '@ant-design/icons'
import { Trans } from '@lingui/macro'

import { Button } from 'antd'
import { ExternalLinkWithIcon } from 'components/v2v3/V2V3Project/ProjectDashboard/components/ui/ExternalLinkWithIcon'
import {
Expand All @@ -9,10 +8,10 @@ import {
} from 'components/v2v3/shared/Allocation/AddEditAllocationModal'
import { useState } from 'react'
import { helpPagePath } from 'utils/routes'
import { usePayoutsTable } from '../hooks/usePayoutsTable'
import { PayoutTableSettings } from './PayoutTableSettings'
import { PayoutsTableCell } from './PayoutsTableCell'
import { usePayoutsTableContext } from './context/PayoutsTableContext'
import { usePayoutsTable } from './hooks/usePayoutsTable'

export function HeaderRows() {
const [addRecipientModalOpen, setAddRecipientModalOpen] = useState<boolean>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import {
import round from 'lodash/round'
import { Split } from 'models/splits'
import { useState } from 'react'
import { usePayoutsTable } from '../hooks/usePayoutsTable'
import { PayoutSplitRowMenu } from './PayoutSplitRowMenu'
import { PayoutTitle } from './PayoutTitle'
import { PayoutsTableCell } from './PayoutsTableCell'
import { PayoutsTableRow } from './PayoutsTableRow'
import { usePayoutsTableContext } from './context/PayoutsTableContext'
import { usePayoutsTable } from './hooks/usePayoutsTable'

const Cell = PayoutsTableCell

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { handleConfirmationDeletion } from 'components/v2v3/V2V3Project/ProjectD
import { useState } from 'react'
import { ReduxDistributionLimit } from 'redux/hooks/useEditingDistributionLimit'
import { fromWad } from 'utils/format/formatNumber'
import { usePayoutsTable } from '../hooks/usePayoutsTable'
import { usePayoutsTable } from './hooks/usePayoutsTable'
import { SwitchToUnlimitedModal } from './modals/SwitchToUnlimitedModal'

export const payoutsTableMenuItemsLabelClass = 'flex gap-2 items-center text-sm'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { Form } from 'antd'
import { Allocation } from 'components/v2v3/shared/Allocation/Allocation'
import { twMerge } from 'tailwind-merge'
import { getV2V3CurrencyOption } from 'utils/v2v3/currency'
import { usePayoutsTable } from '../hooks/usePayoutsTable'
import { CurrencySwitcher } from './CurrencySwitcher'
import { HeaderRows } from './HeaderRows'
import { PayoutSplitRow } from './PayoutSplitRow'
import { PayoutsTableCell } from './PayoutsTableCell'
import { PayoutsTableRow } from './PayoutsTableRow'
import { TotalRows } from './TotalRows'
import { usePayoutsTableContext } from './context/PayoutsTableContext'
import { usePayoutsTable } from './hooks/usePayoutsTable'

const Row = PayoutsTableRow
const Cell = PayoutsTableCell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { Trans, t } from '@lingui/macro'
import { Tooltip } from 'antd'
import TooltipLabel from 'components/TooltipLabel'
import round from 'lodash/round'
import { usePayoutsTable } from '../hooks/usePayoutsTable'
import { PayoutsTableCell } from './PayoutsTableCell'
import { PayoutsTableRow } from './PayoutsTableRow'
import { usePayoutsTable } from './hooks/usePayoutsTable'

const Row = PayoutsTableRow
const Cell = PayoutsTableCell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import {
getNewDistributionLimit,
} from 'utils/v2v3/distributions'
import { MAX_DISTRIBUTION_LIMIT, SPLITS_TOTAL_PERCENT } from 'utils/v2v3/math'
import { useEditCycleFormContext } from '../../EditCycleFormContext'
import { usePayoutsTableContext } from '../PayoutsTable/context/PayoutsTableContext'
import { useEditCycleFormContext } from '../../../V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/EditCycleFormContext'
import { usePayoutsTableContext } from '../context/PayoutsTableContext'

export const usePayoutsTable = () => {
const {
Expand Down
Loading