Skip to content

Commit

Permalink
Merge branch 'issue/2230-handoff-role-details' of github.com:decentda…
Browse files Browse the repository at this point in the history
…o/fractal-interface into roles-payments-remove-duration
  • Loading branch information
Da-Colon committed Aug 16, 2024
2 parents 49d25be + f07c64c commit 584706f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/components/pages/Roles/RolePaymentDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ export function RolePaymentDetails({ payment, onClick, showWithdraw }: RolePayme
textStyle="display-2xl"
color="white-0"
>
{payment.amount?.bigintValue
{payment.amount.bigintValue
? formatCoin(
payment.amount.bigintValue,
payment.amount?.bigintValue,
false,
payment.asset?.decimals,
payment.asset?.symbol,
Expand Down
4 changes: 2 additions & 2 deletions src/components/pages/Roles/forms/RoleFormPaymentStream.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ function FixedDate({ formIndex }: { formIndex: number }) {
export default function RoleFormPaymentStream({ formIndex }: { formIndex: number }) {
const { t } = useTranslation(['roles']);
const { values, errors, setFieldValue } = useFormikContext<RoleFormValues>();
const { hatsTree, getPayment } = useRolesStore();
const { getPayment } = useRolesStore();
const roleEditingPaymentsErrors = (errors.roleEditing as FormikErrors<RoleValue>)?.payments;
return (
<Box
Expand Down Expand Up @@ -239,7 +239,7 @@ export default function RoleFormPaymentStream({ formIndex }: { formIndex: number
<FixedDate formIndex={formIndex} />
<Flex justifyContent="flex-end">
<Button
isDisabled={!!roleEditingPaymentsErrors || !values?.roleEditing?.payments || !hatsTree}
isDisabled={!!roleEditingPaymentsErrors}
onClick={() => {
setFieldValue('roleEditing.roleEditingPaymentIndex', undefined);
}}
Expand Down

0 comments on commit 584706f

Please sign in to comment.