Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
aeolianeth committed Aug 29, 2024
2 parents 7cdeb9d + 8eab465 commit e00ea9e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ export default function CycleDeadlineDropdown({
return (
<Form.Item name="approvalHook" required>
<Select className={className}>
{[{ name: '1 day @todo', address: '0x00'}].map((strategy: BallotStrategy) => (
<Select.Option key={strategy.address} value={strategy.address}>
<Trans>{strategy.name}</Trans>
</Select.Option>
))}
{[{ name: '1 day @todo', address: '0x00' }].map(
(strategy: BallotStrategy) => (
<Select.Option key={strategy.address} value={strategy.address}>
<Trans>{strategy.name}</Trans>
</Select.Option>
),
)}
</Select>
</Form.Item>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ export function EditCyclePage() {
</Link>
) : null}
{/* <Tooltip title={error}> */}
<Button
type="primary"
onClick={() => setConfirmModalOpen(true)}
disabled={false}//Boolean(error)}
>
<Trans>Save changes</Trans>
</Button>
<Button
type="primary"
onClick={() => setConfirmModalOpen(true)}
disabled={false} //Boolean(error)}
>
<Trans>Save changes</Trans>
</Button>
{/* </Tooltip> */}
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,13 @@ export function ProjectSettingsContent({
}: {
settingsPageKey: SettingsPageKey
}) {

const ActiveSettingsPage = useMemo(
() => SettingsPageComponents[settingsPageKey],
[settingsPageKey],
)

// const hasExistingNfts = !isZeroAddress(fundingCycleMetadata?.dataSource)
const pageTitle =
V4SettingsPageKeyTitleMap(false)[settingsPageKey]
const pageTitle = V4SettingsPageKeyTitleMap(false)[settingsPageKey]

return (
<ProjectSettingsLayout>
Expand Down

0 comments on commit e00ea9e

Please sign in to comment.