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

fix: staged payment table content position #4181

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: staged payment table content position #4181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
225b330
fix: staged payment table content position
adam-strzelec Jan 24, 2025
0d4551e
fix: improve tables appearance for mobile
adam-strzelec Jan 31, 2025
0f9a228
fix: align payment link and hide footer when only one milestone
adam-strzelec Feb 3, 2025
7613361
fix: rebase fixes
adam-strzelec Feb 11, 2025
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
2 changes: 1 addition & 1 deletion ...rms/PaymentBuilderForm/partials/PaymentBuilderPayoutsTotal/PaymentBuilderPayoutsTotal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const PaymentBuilderTokensTotal: FC<PaymentBuilderPayoutsTotalProps> = ({
)}
>
<Numeral value={payout.amount} decimals={tokenData?.decimals} />
<div className="flex items-center gap-1">
<div className="flex items-center justify-start gap-1">
<TokenAvatar
tokenAddress={tokenData.tokenAddress}
tokenAvatarSrc={tokenData.avatar ?? undefined}
Expand Down
2 changes: 1 addition & 1 deletion ...nSidebar/partials/forms/StagedPaymentForm/partials/StagedPaymentRecipientsField/hooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const useStagedPaymentRecipientsTableColumns = (
}),
columnHelper.display({
id: 'amount',
staticSize: '216px',
staticSize: '210px',
header: () => formatText({ id: 'table.row.amount' }),
cell: ({ row }) => (
<AmountField
Expand Down
114 changes: 83 additions & 31 deletions ...ompletedAction/partials/PaymentBuilder/partials/StagedPaymentTable/StagedPaymentTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { defineMessages } from 'react-intl';

import { ADDRESS_ZERO } from '~constants';
import { useStagedPaymentContext } from '~context/StagedPaymentContext/StagedPaymentContext.ts';
import { useMobile, useTablet } from '~hooks';
import { useTablet } from '~hooks';
import useEnabledExtensions from '~hooks/useEnabledExtensions.ts';
import useWrapWithRef from '~hooks/useWrapWithRef.ts';
import { type Expenditure } from '~types/graphql.ts';
Expand Down Expand Up @@ -54,7 +54,7 @@ const useStagedPaymentTableColumns = ({
useStagedPaymentContext();
const dataRef = useWrapWithRef(data);
const hasMoreThanOneToken = dataRef.current.length > 1;
const isMobile = useMobile();
const isTablet = useTablet();
const { stagedExpenditureAddress } = useEnabledExtensions();
const hasMoreThanOneMilestone =
dataRef.current.filter((item) => !item.isClaimed).length > 1;
Expand All @@ -68,6 +68,17 @@ const useStagedPaymentTableColumns = ({
const columnHelper =
createColumnHelper<StagedPaymentRecipientsFieldModel>();

const releaseTableSpacer = isTablet
? []
: [
columnHelper.display({
id: 'release',
staticSize: '60px',
enableSorting: false,
cell: () => null,
}),
];

return [
columnHelper.accessor('milestone', {
header: () => formatText({ id: 'table.row.milestone' }),
Expand Down Expand Up @@ -101,7 +112,7 @@ const useStagedPaymentTableColumns = ({
: undefined,
}),
columnHelper.accessor('amount', {
staticSize: '180px',
staticSize: '210px',
enableSorting: false,
header: () => formatText({ id: 'table.row.amount' }),
cell: ({ row }) => (
Expand All @@ -112,29 +123,31 @@ const useStagedPaymentTableColumns = ({
isLoading={isLoading}
/>
),
footer: hasMoreThanOneToken
? () => (
<>
<PaymentBuilderPayoutsTotal
data={dataRef.current}
itemClassName="justify-end md:justify-start"
buttonClassName="justify-end md:justify-start"
/>
{isMobile &&
isPaymentStep &&
hasMoreThanOneMilestone &&
isCorrectExtensionInstalled && (
<ReleaseAllButton items={dataRef.current} />
)}
</>
)
: undefined,
...((!isTablet || !isPaymentStep) && {
footer: hasMoreThanOneToken
? () => {
return (
<div
className={clsx({
'w-[calc(200%+35px)] min-w-[120px]': isTablet,
})}
>
<PaymentBuilderPayoutsTotal
data={dataRef.current}
itemClassName={clsx({ 'justify-end': isTablet })}
buttonClassName="justify-end md:justify-start"
/>
</div>
);
}
: undefined,
}),
}),
...(isPaymentStep
? [
columnHelper.display({
id: 'release',
staticSize: '96px',
staticSize: '60px',
enableSorting: false,
cell: ({ row }) => {
const { original } = row;
Expand All @@ -144,7 +157,11 @@ const useStagedPaymentTableColumns = ({
const isClaimed = currentMilestone?.isClaimed;

return isClaimed ? (
<div className="flex items-center justify-end">
<div
className={clsx('flex items-center', {
'justify-end': !isTablet,
})}
>
<PillsBase
className={clsx(
'bg-teams-blue-50 text-sm font-medium text-teams-blue-400',
Expand All @@ -156,7 +173,7 @@ const useStagedPaymentTableColumns = ({
) : (
<>
{isCorrectExtensionInstalled ? (
<div className="flex items-center justify-end gap-3">
<div className="flex items-center gap-3 md:justify-end">
<ReleaseButton
description={MSG.payNow}
items={currentMilestone ? [currentMilestone] : []}
Expand All @@ -171,21 +188,55 @@ const useStagedPaymentTableColumns = ({
</>
);
},
footer:
!isMobile &&
hasMoreThanOneMilestone &&
isCorrectExtensionInstalled
? () => <ReleaseAllButton items={dataRef.current} />
: undefined,
...(hasMoreThanOneToken && {
footer:
hasMoreThanOneMilestone && isCorrectExtensionInstalled
? () => (
<div
className={clsx({
'w-[calc(200%+35px)] min-w-[120px]': isTablet,
})}
>
{isTablet && (
<div className="">
<PaymentBuilderPayoutsTotal
data={dataRef.current}
itemClassName="justify-end md:justify-start"
buttonClassName="justify-end md:justify-start"
/>
</div>
)}

<ReleaseAllButton items={dataRef.current} />
</div>
)
: () =>
isTablet ? (
<div
className={clsx({
'w-[calc(200%+35px)] min-w-[120px]': isTablet,
})}
>
{isTablet && (
<div className="">
<PaymentBuilderPayoutsTotal
data={dataRef.current}
itemClassName="justify-end md:justify-start"
buttonClassName="justify-end md:justify-start"
/>
</div>
)}
</div>
) : undefined,
}),
}),
]
: []),
: releaseTableSpacer),
];
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [
hasMoreThanOneToken,
isPaymentStep,
isMobile,
hasMoreThanOneMilestone,
isCorrectExtensionInstalled,
isLoading,
Expand All @@ -194,6 +245,7 @@ const useStagedPaymentTableColumns = ({
// Even though this is not directly used, it is needed to refresh the ReleaseButton
isPendingStagesRelease,
allMilestonesSlotIdsAwaitingRelease.length,
isTablet,
]);

return columns;
Expand Down