Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

fix payout manage button, selectedPayoutIds

Steven Tey0a6a17eaf785
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx
index 464b368011..67dac2c7e7 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx
@@ -510,20 +510,15 @@ function PayoutConfirmButton() {
const permissionsError =
typeof _permissionsError === "string" ? _permissionsError : null;
- useKeyboardShortcut(
- "c",
- () =>
- router.push(
- `/${slug}/program/payouts?confirmPayouts=true&selectedPayoutId=${payout?.id}`,
- ),
- {
- enabled:
- !hasHold &&
- !!payout?.id &&
- !!payout.partner.payoutsEnabledAt &&
- !permissionsError,
- },
- );
+ const url = `/${slug}/program/payouts?status=pending&confirmPayouts=true&selectedPayoutIds=${payout?.id}`;
+
+ useKeyboardShortcut("c", () => router.push(url), {
+ enabled:
+ !hasHold &&
+ !!payout?.id &&
+ !!payout.partner.payoutsEnabledAt &&
+ !permissionsError,
+ });
if (payout?.status !== "pending") {
return null;
@@ -531,23 +526,20 @@ function PayoutConfirmButton() {
return (
<div className="flex items-center gap-2">
- <Button
- text="Confirm payout"
- className="h-8 px-3 sm:h-9"
- shortcut="C"
- disabledTooltip={
- hasHold
- ? `This partner's payouts are on hold due to [unresolved risk events](${APP_DOMAIN}/${slug}/program/risks?partnerId=${payout.partner.id}). They cannot be paid out until resolved.`
- : !payout.partner.payoutsEnabledAt
- ? "This partner has not [connected a bank account](https://dub.co/help/article/receiving-payouts) to receive payouts yet, which means they won't be able to receive payouts from your program."
- : permissionsError || undefined
- }
- onClick={() => {
- router.push(
- `/${slug}/program/payouts?confirmPayouts=true&selectedPayoutId=${payout.id}`,
- );
- }}
- />
+ <Link href={url}>
+ <Button
+ text="Confirm payout"
+ className="h-8 px-3 sm:h-9"
+ shortcut="C"
+ disabledTooltip={
+ hasHold
+ ? `This partner's payouts are on hold due to [unresolved risk events](${APP_DOMAIN}/${slug}/program/risks?partnerId=${payout.partner.id}). They cannot be paid out until resolved.`
+ : !payout.partner.payoutsEnabledAt
+ ? "This partner has not [connected a bank account](https://dub.co/help/article/receiving-payouts) to receive payouts yet, which means they won't be able to receive payouts from your program."
+ : permissionsError || undefined
+ }
+ />
+ </Link>
</div>
);
}
diff --git a/apps/web/lib/payouts/mark-payouts-as-processed.ts b/apps/web/lib/payouts/mark-payouts-as-processed.ts
index 721cf15cb8..6293362d00 100644
--- a/apps/web/lib/payouts/mark-payouts-as-processed.ts
+++ b/apps/web/lib/payouts/mark-payouts-as-processed.ts
@@ -6,7 +6,7 @@ export const markPayoutsAsProcessed = async (payouts: Pick<Payout, "id">[]) => {
return;
}
- await prisma.payout.updateMany({
+ const { count } = await prisma.payout.updateMany({
where: {
id: {
in: payouts.map((p) => p.id),
@@ -17,4 +17,6 @@ export const markPayoutsAsProcessed = async (payouts: Pick<Payout, "id">[]) => {
paidAt: new Date(),
},
});
+
+ console.log(`Marked ${count} payouts as processed`);
};
diff --git a/apps/web/ui/partners/payouts/payout-method-dropdown.tsx b/apps/web/ui/partners/payouts/payout-method-dropdown.tsx
index 04d5c1d1b6..eb5805f1ee 100644
--- a/apps/web/ui/partners/payouts/payout-method-dropdown.tsx
+++ b/apps/web/ui/partners/payouts/payout-method-dropdown.tsx
@@ -61,7 +61,6 @@ export function PayoutMethodDropdown() {
const handleAction = useCallback(
(type: PartnerPayoutMethod, isManage: boolean) => {
- setOpenPopover(false);
connect(type, { isManage });
},
[connect],
@@ -151,9 +150,7 @@ function PayoutMethodItem({
isActionPending: boolean;
pendingDefaultType: PartnerPayoutMethod | null;
}) {
- const { partner } = usePartnerProfile();
const { Icon, wrapperClass } = getPayoutMethodIconConfig(method.type);
- const payoutsDisabled = !partner?.payoutsEnabledAt;
return (
<div className="flex w-full cursor-default items-center justify-between gap-4 rounded-md px-2 py-1.5 transition-colors duration-75 hover:bg-neutral-50">
@@ -176,7 +173,6 @@ function PayoutMethodItem({
method={method}
onSetDefault={onSetDefault}
pendingDefaultType={pendingDefaultType}
- payoutsDisabled={payoutsDisabled}
/>
</div>
<span className="mt-0.5 block truncate text-xs text-neutral-500">
@@ -189,7 +185,6 @@ function PayoutMethodItem({
text={method.connected ? "Manage" : "Connect"}
onClick={() => onAction(method.type, method.connected)}
loading={isActionPending}
- disabled={payoutsDisabled}
className="h-7 w-fit shrink-0 cursor-pointer text-xs"
/>
</div>
@@ -200,12 +195,10 @@ function PayoutMethodStatusBadge({
method,
onSetDefault,
pendingDefaultType,
- payoutsDisabled,
}: {
method: PartnerPayoutMethodSetting;
onSetDefault: (type: PartnerPayoutMethod) => void;
pendingDefaultType: PartnerPayoutMethod | null;
- payoutsDisabled: boolean;
}) {
const isSettingDefault = pendingDefaultType === method.type;
const { partner } = usePartnerProfile();
@@ -226,7 +219,7 @@ function PayoutMethodStatusBadge({
);
}
- if (method.connected && !payoutsDisabled) {
+ if (method.connected) {
return (
<button
type="button"