Skip to content

Commit

Permalink
fix: payouts modal cleanup, fix reserved alloc readonly state (#4187)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomquirk authored Dec 27, 2023
1 parent ae1e4ad commit a881376
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 29 deletions.
10 changes: 4 additions & 6 deletions src/components/strings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,10 @@ export const PREVENT_OVERSPENDING_EXPLANATION = (

export const FEES_EXPLANATION = (
<Trans>
Payouts to other Juicebox projects don't incur fees. A 2.5% fee is taken out
of all other payouts. You will receive the{' '}
<Link href={v2v3ProjectRoute({ projectId: 1 })}>
JuiceboxDAO governance token
</Link>{' '}
when you pay fees.{' '}
Payouts to other Juicebox projects don't incur fees. A 2.5% fee is taken
from all other payouts. This project's owner will receive{' '}
<Link href={v2v3ProjectRoute({ projectId: 1 })}>JBX</Link> in exchange for
fees paid.{' '}
<ExternalLink href={helpPagePath(`/dao/reference/jbx/`)}>
Learn more
</ExternalLink>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,11 @@ export default function DistributePayoutsModal({
>
<div className="flex flex-col gap-6">
<Form layout="vertical">
<Form.Item className="mb-0" label={<Trans>Amount to pay out</Trans>}>
<Form.Item
className="mb-0"
label={<Trans>Amount to pay out</Trans>}
extra={<Trans>Recipients will recieve payouts in ETH</Trans>}
>
<FormattedNumberInput
placeholder="0"
value={distributionAmount}
Expand All @@ -145,9 +149,9 @@ export default function DistributePayoutsModal({
</Form.Item>
</Form>
<div>
<h4>
<div className="text-md mb-2 font-medium">
<Trans>Payout recipients</Trans>
</h4>
</div>

{payoutSplits?.length === 0 ? (
<Callout.Info className="mb-4">
Expand All @@ -168,14 +172,8 @@ export default function DistributePayoutsModal({
/>
</div>
</div>
<Callout.Info>
<>
<p>
<Trans>Recipients will receive payouts in ETH.</Trans>
</p>
{FEES_EXPLANATION}
</>
</Callout.Info>

<Callout.Info>{FEES_EXPLANATION}</Callout.Info>
</div>
</TransactionModal>
)
Expand Down
15 changes: 9 additions & 6 deletions src/components/v2v3/shared/ReservedTokensList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,17 @@ export const ReservedTokensList: React.FC<
title={<AllocationItemTitle allocation={allocation} />}
amount={formatPercent(allocation.percent)}
extra={
<DeleteOutlined
onClick={e => {
e.stopPropagation()
removeAllocation(allocation.id)
}}
/>
isEditable ? (
<DeleteOutlined
onClick={e => {
e.stopPropagation()
removeAllocation(allocation.id)
}}
/>
) : undefined
}
onClick={() => {
if (!isEditable) return
setSelectedAllocation(allocation)
modal.open()
}}
Expand Down
12 changes: 6 additions & 6 deletions src/locales/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2837,6 +2837,9 @@ msgstr ""
msgid "Pause project token transfers"
msgstr ""

msgid "Recipients will recieve payouts in ETH"
msgstr ""

msgid "{0} must be numeric"
msgstr ""

Expand Down Expand Up @@ -3437,9 +3440,6 @@ msgstr ""
msgid "The issuance rate is reduced by this percentage every cycle (every {0}). The higher this rate, the more incentive to pay this project earlier."
msgstr ""

msgid "Recipients will receive payouts in ETH."
msgstr ""

msgid "Supporters won't receive tokens when they pay this project."
msgstr ""

Expand Down Expand Up @@ -3989,9 +3989,6 @@ msgstr ""
msgid "<0>Juicebox is a programmable crypto fundraising platform for web3. It helps people fund, operate, and scale their projects transparently using Ethereum, which is a type of programmable cryptocurrency.</0><1>Juicebox is funded and owned by its community.</1>"
msgstr ""

msgid "Payouts to other Juicebox projects don't incur fees. A 2.5% fee is taken out of all other payouts. You will receive the <0>JuiceboxDAO governance token</0> when you pay fees. <1>Learn more</1>."
msgstr ""

msgid "Juicecrowd soft target"
msgstr ""

Expand Down Expand Up @@ -4436,6 +4433,9 @@ msgstr ""
msgid "Start"
msgstr ""

msgid "Payouts to other Juicebox projects don't incur fees. A 2.5% fee is taken from all other payouts. This project's owner will receive <0>JBX</0> in exchange for fees paid. <1>Learn more</1>."
msgstr ""

msgid "File empty or corrupt. Try again."
msgstr ""

Expand Down

2 comments on commit a881376

@vercel
Copy link

@vercel vercel bot commented on a881376 Dec 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on a881376 Dec 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.