Release 26/08/24 (#4437)

Co-authored-by: aeolian <[email protected]>
Co-authored-by: wraeth-eth <[email protected]>

src/components/AccountSettingsDashboard/components/ProjectUnwatchCell.tsx

@@ -1,9 +1,9 @@
 import { useProjectHandleText } from 'hooks/useProjectHandleText'
 import { useProjectMetadata } from 'hooks/useProjectMetadata'
 import Link from 'next/link'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { useMemo } from 'react'
 import { twMerge } from 'tailwind-merge'
-import { v2v3ProjectRoute } from 'utils/routes'
 import { useProjectUnwatchCellData } from '../hooks/useProjectUnwatchCellData'
 import { UnwatchButton } from './UnwatchButton'
 

src/components/Create/components/pages/ProjectDetails/ProjectDetailsPage.tsx

@@ -9,7 +9,6 @@ import FormattedNumberInput from 'components/inputs/FormattedNumberInput'
 import { FormImageUploader } from 'components/inputs/FormImageUploader'
 import { JuiceTextArea } from 'components/inputs/JuiceTextArea'
 import { JuiceInput } from 'components/inputs/JuiceTextInput'
-import PrefixedInput from 'components/inputs/PrefixedInput'
 import { RichEditor } from 'components/RichEditor'
 import { CREATE_FLOW } from 'constants/fathomEvents'
 import { constants } from 'ethers'
@@ -133,7 +132,7 @@ export const ProjectDetailsPage: React.FC<
               </Col>
               <Col span={12}>
                 <Form.Item name="projectTwitter" label={t`Twitter handle`}>
-                  <PrefixedInput prefix={'@'} />
+                  <TwitterHandleInputWrapper />
                 </Form.Item>
               </Col>
             </Row>
@@ -277,3 +276,39 @@ const AmountInput = ({
     </div>
   )
 }
+
+// Exists just to solve an issue where a user might paste a twitter url instead of just the handle
+export const TwitterHandleInputWrapper = ({
+  value,
+  onChange,
+}: {
+  value?: string
+  onChange?: (val: string) => void
+}) => {
+  const [_value, _setValue] = useState<string>(value ?? '')
+  const setValue = onChange ?? _setValue
+  value = value ?? _value
+
+  const onInputChange = useCallback(
+    (value: string | undefined) => {
+      const httpOrHttpsRegex = /^(http|https):\/\//
+      if (value?.length && value.match(httpOrHttpsRegex)) {
+        const handle = value.split('/').pop()
+        if (handle) {
+          setValue(handle)
+          return
+        }
+      }
+      setValue(value ?? '')
+    },
+    [setValue],
+  )
+
+  return (
+    <JuiceInput
+      value={value}
+      onChange={e => onInputChange(e.target.value)}
+      prefix="@"
+    />
+  )
+}

src/components/Create/components/pages/ReviewDeploy/ReviewDeployPage.tsx

@@ -16,7 +16,7 @@ import { useDispatch } from 'react-redux'
 import { useAppSelector } from 'redux/hooks/useAppSelector'
 import { useSetCreateFurthestPageReached } from 'redux/hooks/useEditingCreateFurthestPageReached'
 import { editingV2ProjectActions } from 'redux/slices/editingV2Project'
-import { helpPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 import { CreateBadge } from '../../CreateBadge'
 import { CreateCollapse } from '../../CreateCollapse/CreateCollapse'
 import { Wizard } from '../../Wizard/Wizard'

src/components/Home/FaqList/QAs.tsx

@@ -2,7 +2,7 @@ import { Trans } from '@lingui/macro'
 import ExternalLink from 'components/ExternalLink'
 import Link from 'next/link'
 import { ReactNode } from 'react'
-import { helpPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 
 const JB_FEE = 2.5
 

src/components/Home/HomepageProjectCard.tsx

@@ -6,7 +6,7 @@ import ETHAmount from 'components/currency/ETHAmount'
 import { PV_V2 } from 'constants/pv'
 import { useProjectMetadata } from 'hooks/useProjectMetadata'
 import { SubgraphQueryProject } from 'models/subgraphProjects'
-import { v2v3ProjectRoute } from 'utils/routes'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 
 function Statistic({
   name,

src/components/Home/JuicyPicksSection/SpotlightProjectCard.tsx

@@ -13,9 +13,9 @@ import { Project } from 'generated/graphql'
 import { useProjectMetadata } from 'hooks/useProjectMetadata'
 import { useProjectTrendingPercentageIncrease } from 'hooks/useProjectTrendingPercentageIncrease'
 import Link from 'next/link'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { twJoin } from 'tailwind-merge'
 import { ipfsUriToGatewayUrl } from 'utils/ipfs'
-import { v2v3ProjectRoute } from 'utils/routes'
 
 function Statistic({
   name,

src/components/PayoutsTable/SwitchToUnlimitedModal.tsx

@@ -1,7 +1,7 @@
 import { Trans } from '@lingui/macro'
 import { Modal } from 'antd'
 import { ExternalLinkWithIcon } from 'components/ExternalLinkWithIcon'
-import { helpPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 
 export function SwitchToUnlimitedModal({
   open,

src/components/Project/ProjectHeader/EditProjectHandleButton.tsx

@@ -4,8 +4,8 @@ import { Button, Tooltip } from 'antd'
 import { ProjectMetadataContext } from 'contexts/ProjectMetadataContext'
 import Link from 'next/link'
 import { V2V3ProjectContext } from 'packages/v2v3/contexts/Project/V2V3ProjectContext'
+import { settingsPagePath } from 'packages/v2v3/utils/routes'
 import { useContext } from 'react'
-import { settingsPagePath } from 'utils/routes'
 
 export function EditProjectHandleButton() {
   const { projectId } = useContext(ProjectMetadataContext)

src/components/ProjectCard.tsx

@@ -6,11 +6,11 @@ import { useProjectHandleText } from 'hooks/useProjectHandleText'
 import Link from 'next/link'
 import { isHardArchived } from 'utils/archived'
 import { formatDate } from 'utils/format/formatDate'
-import { v2v3ProjectRoute } from 'utils/routes'
 
 import { useProjectMetadata } from 'hooks/useProjectMetadata'
 import { useSubtitle } from 'hooks/useSubtitle'
 import { SubgraphQueryProject } from 'models/subgraphProjects'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { ArchivedBadge } from './ArchivedBadge'
 import Loading from './Loading'
 import ProjectLogo from './ProjectLogo'

src/components/Projects/TrendingProjectCard.tsx

@@ -9,7 +9,7 @@ import { useProjectMetadata } from 'hooks/useProjectMetadata'
 import { useProjectTrendingPercentageIncrease } from 'hooks/useProjectTrendingPercentageIncrease'
 import { DBProject } from 'models/dbProject'
 import Link from 'next/link'
-import { v2v3ProjectRoute } from 'utils/routes'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { TRENDING_WINDOW_DAYS } from './RankingExplanation'
 
 export default function TrendingProjectCard({

src/components/QuickProjectSearch/QuickProjectSearchModal.tsx

@@ -16,9 +16,9 @@ import { useDBProjectsQuery } from 'hooks/useDBProjects'
 import { useRouter } from 'next/router'
 import V1ProjectHandle from 'packages/v1/components/shared/V1ProjectHandle'
 import V2V3ProjectHandleLink from 'packages/v2v3/components/shared/V2V3ProjectHandleLink'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import React, { useCallback, useContext, useEffect, useState } from 'react'
 import { twMerge } from 'tailwind-merge'
-import { v2v3ProjectRoute } from 'utils/routes'
 import { QuickProjectSearchContext } from './QuickProjectSearchContext'
 
 const INPUT_ID = 'quickProjectSearch'

src/components/WalletContributionCard.tsx

@@ -4,9 +4,9 @@ import { PV_V2 } from 'constants/pv'
 import { WalletContributionsQuery } from 'generated/graphql'
 import { useProjectMetadata } from 'hooks/useProjectMetadata'
 import Link from 'next/link'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { isHardArchived } from 'utils/archived'
 import { formatDate } from 'utils/format/formatDate'
-import { v2v3ProjectRoute } from 'utils/routes'
 
 import { ArchivedBadge } from './ArchivedBadge'
 import ETHAmount from './currency/ETHAmount'

src/components/buttons/ErrorNotificationButtons.tsx

@@ -2,7 +2,7 @@ import { WarningOutlined } from '@ant-design/icons'
 import { Trans } from '@lingui/macro'
 import { Button } from 'antd'
 import { LanguageProvider } from 'contexts/Language/LanguageProvider'
-import { helpPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 import ExternalLink from '../ExternalLink'
 
 const resetSite = () => {

src/components/formItems/ProjectTwitter.tsx

@@ -1,6 +1,7 @@
 import { t } from '@lingui/macro'
-import { Form, Input } from 'antd'
+import { Form } from 'antd'
 
+import { TwitterHandleInputWrapper } from 'components/Create/components/pages/ProjectDetails/ProjectDetailsPage'
 import { FormItemExt } from './formItemExt'
 
 export default function ProjectTwitter({
@@ -14,12 +15,7 @@ export default function ProjectTwitter({
       label={hideLabel ? undefined : t`Twitter handle`}
       {...formItemProps}
     >
-      <Input
-        prefix="@"
-        placeholder="juiceboxETH"
-        type="string"
-        autoComplete="off"
-      />
+      <TwitterHandleInputWrapper />
     </Form.Item>
   )
 }

src/components/inputs/ReconfigurationStrategy/CustomStrategyInput.tsx

@@ -7,7 +7,7 @@ import { useWallet } from 'hooks/Wallet'
 import { FormItemInput } from 'models/formItemInput'
 import { NetworkName } from 'models/networkName'
 import { MouseEventHandler } from 'react'
-import { helpPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 
 export const CustomStrategyInput: React.FC<
   React.PropsWithChildren<

src/components/modals/LegalNoticeModal.tsx

@@ -1,7 +1,7 @@
 import { t } from '@lingui/macro'
 import { Modal, ModalProps } from 'antd'
 import ExternalLink from 'components/ExternalLink'
-import { helpPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 
 export function LegalNoticeModal(props: ModalProps) {
   return (

src/components/strings.tsx

@@ -44,7 +44,8 @@ export const LOCKED_PAYOUT_EXPLANATION = (
 
 import ExternalLink from 'components/ExternalLink'
 import Link from 'next/link'
-import { helpPagePath, v2v3ProjectRoute } from 'utils/routes'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 
 export const DISTRIBUTION_LIMIT_EXPLANATION = (
   <Trans>

src/packages/v1/components/V1Project/V1ProjectHeader/ProjectHeader.tsx

@@ -10,10 +10,10 @@ import { ProjectTagsList } from 'components/ProjectTags/ProjectTagsList'
 import { ProjectMetadataContext } from 'contexts/ProjectMetadataContext'
 import { useGnosisSafe } from 'hooks/safe/useGnosisSafe'
 import { ContractVersionSelect } from 'packages/v2v3/components/V2V3Project/V2V3ProjectHeaderActions/ContractVersionSelect'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { useContext } from 'react'
 import { twMerge } from 'tailwind-merge'
 import { ipfsUriToGatewayUrl } from 'utils/ipfs'
-import { v2v3ProjectRoute } from 'utils/routes'
 import SocialLinks from './SocialLinks'
 
 function ProjectSubheading({

src/packages/v1/components/shared/forms/BudgetForm.tsx

@@ -19,7 +19,7 @@ import { useAppDispatch } from 'redux/hooks/useAppDispatch'
 import { useEditingV1FundingCycleSelector } from 'redux/hooks/useAppSelector'
 import { editingProjectActions } from 'redux/slices/editingProject'
 import { fromWad } from 'utils/format/formatNumber'
-import { helpPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 
 import {
   CYCLE_EXPLANATION,

src/packages/v2v3/components/V2V3Project/ProjectDashboard/components/PayRedeemCard/PayProjectModal/PayProjectModal.tsx

@@ -5,7 +5,7 @@ import { JuiceModal } from 'components/modals/JuiceModal'
 import { Formik } from 'formik'
 import Image from "next/legacy/image"
 import { twMerge } from 'tailwind-merge'
-import { helpPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 import { MessageSection } from './components/MessageSection'
 import { ReceiveSection } from './components/ReceiveSection'
 import {

src/packages/v2v3/components/V2V3Project/ProjectDashboard/components/SuccessPayView/SuccessPayView.tsx

@@ -4,7 +4,7 @@ import { Button } from 'antd'
 import { SubscribeButton } from 'components/buttons/SubscribeButton/SubscribeButton'
 import dynamic from 'next/dynamic'
 import Link from 'next/link'
-import { v2v3ProjectRoute } from 'utils/routes'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { SuccessNftItem } from './components/SuccessNftItem'
 import { SuccessPayCard } from './components/SuccessPayCard'
 import { SuccessTokensItem } from './components/SuccessTokensItem'

src/packages/v2v3/components/V2V3Project/ProjectDashboard/components/V2V3ProjectHeader.tsx

@@ -18,8 +18,8 @@ import { useV2V3ProjectHeader } from 'packages/v2v3/components/V2V3Project/Proje
 import V2V3ProjectHandleLink from 'packages/v2v3/components/shared/V2V3ProjectHandleLink'
 import { useV2V3WalletHasPermission } from 'packages/v2v3/hooks/contractReader/useV2V3WalletHasPermission'
 import { V2V3OperatorPermission } from 'packages/v2v3/models/v2v3Permissions'
+import { settingsPagePath, v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { twMerge } from 'tailwind-merge'
-import { settingsPagePath, v2v3ProjectRoute } from 'utils/routes'
 import { SocialLink } from '../hooks/useAboutPanel'
 
 export const V2V3ProjectHeader = ({ className }: { className?: string }) => {

src/packages/v2v3/components/V2V3Project/V2V3FundingCycleSection/FundingCycleDetails/DataSourceListItems/index.tsx

@@ -15,7 +15,7 @@ import { JB721DelegateContractsContext } from 'packages/v2v3/contexts/NftRewards
 import { V2V3FundingCycleMetadata } from 'packages/v2v3/models/fundingCycle'
 import { useContext } from 'react'
 import { formatBoolean } from 'utils/format/formatBoolean'
-import { helpPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 import { FundingCycleListItem } from '../FundingCycleListItem'
 
 function DataSourceAddressValue({ address }: { address: string | undefined }) {

src/packages/v2v3/components/V2V3Project/V2V3ProjectContractsDashboard/V2V3ProjectContractsDashboard.tsx

@@ -15,8 +15,8 @@ import {
   SUPPORTED_PAYMENT_TERMINALS,
   V2V3ContractName,
 } from 'packages/v2v3/models/contracts'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { useContext } from 'react'
-import { v2v3ProjectRoute } from 'utils/routes'
 import { V2V3ProjectHeaderActions } from '../V2V3ProjectHeaderActions/V2V3ProjectHeaderActions'
 
 /**

src/packages/v2v3/components/V2V3Project/V2V3ProjectHeaderActions/V2V3ProjectHeaderActions.tsx

@@ -11,8 +11,8 @@ import { V2V3ProjectToolsDrawer } from 'packages/v2v3/components/V2V3Project/V2V
 import { V2V3ProjectContext } from 'packages/v2v3/contexts/Project/V2V3ProjectContext'
 import { useV2V3WalletHasPermission } from 'packages/v2v3/hooks/contractReader/useV2V3WalletHasPermission'
 import { V2V3OperatorPermission } from 'packages/v2v3/models/v2v3Permissions'
+import { settingsPagePath } from 'packages/v2v3/utils/routes'
 import { useContext, useState } from 'react'
-import { settingsPagePath } from 'utils/routes'
 
 export function V2V3ProjectHeaderActions() {
   const wallet = useWallet()

src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/ProjectSettingsLayout.tsx

@@ -3,8 +3,8 @@ import { Trans } from '@lingui/macro'
 import { ProjectMetadataContext } from 'contexts/ProjectMetadataContext'
 import Link from 'next/link'
 import { V2V3ProjectContext } from 'packages/v2v3/contexts/Project/V2V3ProjectContext'
+import { v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { useContext } from 'react'
-import { v2v3ProjectRoute } from 'utils/routes'
 
 export const ProjectSettingsLayout: React.FC<React.PropsWithChildren> = ({
   children,

src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/TransactionSuccessModal.tsx

@@ -4,8 +4,8 @@ import { Button, Modal } from 'antd'
 import { ProjectMetadataContext } from 'contexts/ProjectMetadataContext'
 import Link from 'next/link'
 import { V2V3ProjectContext } from 'packages/v2v3/contexts/Project/V2V3ProjectContext'
+import { settingsPagePath, v2v3ProjectRoute } from 'packages/v2v3/utils/routes'
 import { ReactNode, useContext } from 'react'
-import { settingsPagePath, v2v3ProjectRoute } from 'utils/routes'
 
 export function TransactionSuccessModal({
   open,

src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/hooks/useSettingsPagePath.ts

@@ -1,7 +1,7 @@
 import { ProjectMetadataContext } from 'contexts/ProjectMetadataContext'
 import { V2V3ProjectContext } from 'packages/v2v3/contexts/Project/V2V3ProjectContext'
+import { settingsPagePath } from 'packages/v2v3/utils/routes'
 import { useContext } from 'react'
-import { settingsPagePath } from 'utils/routes'
 import { V2V3SettingsPageKey } from '../ProjectSettingsDashboard'
 
 export function useSettingsPagePath(key?: V2V3SettingsPageKey) {

src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/DetailsSection/DetailsSection.tsx

@@ -1,6 +1,6 @@
 import { Trans } from '@lingui/macro'
+import { EditCycleHeader } from 'components/Project/ProjectSettings/EditCycleHeader'
 import { CYCLE_EXPLANATION } from 'components/strings'
-import { EditCycleHeader } from '../EditCycleHeader'
 import CycleDeadlineDropdown from './CycleDeadlineDropdown'
 import { DetailsSectionAdvanced } from './DetailsSectionAdvanced'
 import { DurationFields } from './DurationFields'

src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/DetailsSection/DetailsSectionAdvanced.tsx

@@ -1,5 +1,6 @@
 import { Trans } from '@lingui/macro'
 import { Form } from 'antd'
+import { AdvancedDropdown } from 'components/Project/ProjectSettings/AdvancedDropdown'
 import TooltipLabel from 'components/TooltipLabel'
 import { JuiceSwitch } from 'components/inputs/JuiceSwitch'
 import {
@@ -8,7 +9,6 @@ import {
   TERMINAL_CONFIG_EXPLANATION,
   TERMINAL_MIGRATION_EXPLANATION,
 } from 'components/strings'
-import { AdvancedDropdown } from '../AdvancedDropdown'
 
 export function DetailsSectionAdvanced() {
   return (

src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/EditCyclePage.tsx

@@ -2,15 +2,16 @@ import { Trans } from '@lingui/macro'
 import { Button, Form, Tooltip } from 'antd'
 import { ExternalLinkWithIcon } from 'components/ExternalLinkWithIcon'
 import Loading from 'components/Loading'
+import EditCycleFormSection from 'components/Project/ProjectSettings/EditCycleFormSection'
 import { ProjectMetadataContext } from 'contexts/ProjectMetadataContext'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
 import { V2V3ProjectContext } from 'packages/v2v3/contexts/Project/V2V3ProjectContext'
+import { settingsPagePath } from 'packages/v2v3/utils/routes'
 import { useContext, useEffect, useRef, useState } from 'react'
-import { helpPagePath, settingsPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 import { DetailsSection } from './DetailsSection'
 import { useEditCycleFormContext } from './EditCycleFormContext'
-import EditCycleFormSection from './EditCycleFormSection'
 import { PayoutsSection } from './PayoutsSection/PayoutsSection'
 import { ReviewConfirmModal } from './ReviewConfirmModal'
 import { TokensSection } from './TokensSection'

src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/PayoutsSection/PayoutsSection.tsx

@@ -2,10 +2,10 @@ import { Trans } from '@lingui/macro'
 import { Form } from 'antd'
 import { useWatch } from 'antd/lib/form/Form'
 import { JuiceSwitch } from 'components/inputs/JuiceSwitch'
+import { AdvancedDropdown } from 'components/Project/ProjectSettings/AdvancedDropdown'
 import { CurrencyName } from 'constants/currency'
 import { PayoutsTable } from 'packages/v2v3/components/shared/PayoutsTable/PayoutsTable'
 import { Split } from 'packages/v2v3/models/splits'
-import { AdvancedDropdown } from '../AdvancedDropdown'
 import { useEditCycleFormContext } from '../EditCycleFormContext'
 
 export function PayoutsSection() {

src/packages/v2v3/components/V2V3Project/V2V3ProjectSettings/pages/EditCyclePage/TokensSection/IssuanceRateReductionField.tsx

@@ -3,7 +3,7 @@ import { ExternalLinkWithIcon } from 'components/ExternalLinkWithIcon'
 import { JuiceSwitch } from 'components/inputs/JuiceSwitch'
 import NumberSlider from 'components/inputs/NumberSlider'
 import { useState } from 'react'
-import { helpPagePath } from 'utils/routes'
+import { helpPagePath } from 'utils/helpPagePath'
 import { useEditCycleFormContext } from '../EditCycleFormContext'
 import { zeroPercentDisabledNoticed } from './RedemptionRateField'