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.

Sign up for GitHub

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

Jump to bottom

fix v4 proj sepolia payouts, add footer to proj page #4466

Merged
merged 1 commit into from
Sep 26, 2024
Merged

fix v4 proj sepolia payouts, add footer to proj page #4466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Project/ProjectTabs/utils/pairToDatum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { ConfigurationPanelDatum } from 'components/Project/ProjectTabs/CyclesPa

export const pairToDatum = (
name: string,
current: string | undefined,
upcoming: string | undefined | null,
current: string | JSX.Element | undefined,
upcoming: string | JSX.Element | undefined | null,
link?: string,
easyCopy?: boolean,
): ConfigurationPanelDatum => {
Expand Down
93 changes: 0 additions & 93 deletions ...roject/ProjectDashboard/components/CyclesPayoutsPanel/components/HistorySubPanel.test.tsx
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion src/packages/v4/views/V4ProjectDashboard/V4ProjectDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Footer } from 'components/Footer/Footer'
import { CoverPhoto } from 'components/Project/ProjectHeader/CoverPhoto'
import { SuccessPayView } from 'packages/v4/components/ProjectDashboard/components/SuccessPayView/SuccessPayView'
import { useProjectDispatch } from 'packages/v4/components/ProjectDashboard/redux/hooks'
Expand Down Expand Up @@ -27,7 +28,7 @@ export function V4ProjectDashboard() {
<div className="relative w-full">
<CoverPhoto />
</div>
<div className="flex w-full justify-center md:px-6">
<div className="flex w-full justify-center md:px-6 pb-48">
<div className="flex w-full max-w-6xl flex-col">
<V4ProjectHeader className="mt-12 px-4 md:mt-4 md:px-0" />
<div
Expand All @@ -51,6 +52,7 @@ export function V4ProjectDashboard() {
</div>
</div>
</div>
<Footer />
</>
)
}
Expand Down
3 changes: 2 additions & 1 deletion ...s/useV4FormatConfigurationCycleSection.ts → .../useV4FormatConfigurationCycleSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { t } from '@lingui/macro'
import { ConfigurationPanelDatum } from 'components/Project/ProjectTabs/CyclesPayoutsTab/ConfigurationPanel'
import { pairToDatum } from 'components/Project/ProjectTabs/utils/pairToDatum'
import { JBRulesetData } from 'juice-sdk-core'
import { NativeTokenValue } from 'juice-sdk-react'
import { V4CurrencyOption } from 'packages/v4/models/v4CurrencyOption'
import { getApprovalStrategyByAddress } from 'packages/v4/utils/approvalHooks'
import { formatCurrencyAmount } from 'packages/v4/utils/formatCurrencyAmount'
Expand Down Expand Up @@ -83,7 +84,7 @@ export const useV4FormatConfigurationCycleSection = ({

const payoutsDatum: ConfigurationPanelDatum = useMemo(() => {
const { amount, currency } = payoutLimitAmountCurrency ?? {}
const currentPayout = formatPayoutAmount(amount, currency)
const currentPayout = <NativeTokenValue wei={amount ?? 0n} />

if (
upcomingPayoutLimitAmountCurrency === null ||
Expand Down
Loading