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.

Refactor modal usage in fraud-related components to use memoized components for improved performance and clarity

Kiran K34c61454925c
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-group-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-group-table.tsx
index 2ff9a07caf..010f0e7c65 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-group-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-group-table.tsx
@@ -492,8 +492,8 @@ function RowMenuButton({
return (
<>
- <BanPartnerModal />
- <RejectPartnerApplicationModal />
+ {BanPartnerModal}
+ {RejectPartnerApplicationModal}
<Popover
openPopover={isOpen}
setOpenPopover={setIsOpen}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolve-fraud-group-modal.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolve-fraud-group-modal.tsx
index 28f1f6a7fb..877c89b949 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolve-fraud-group-modal.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolve-fraud-group-modal.tsx
@@ -40,7 +40,6 @@ function ResolveFraudEventsModal({
const { executeAsync, isPending } = useAction(resolveFraudGroupAction, {
onSuccess: async () => {
-
toast.success("Fraud events resolved.");
setShowResolveFraudEventModal(false);
// await onConfirm?.();
@@ -174,27 +173,28 @@ export function useResolveFraudEventsModal({
const [showResolveFraudEventModal, setShowResolveFraudEventModal] =
useState(false);
- const ResolveFraudEventModalCallback = useCallback(() => {
- return (
+ const ResolveFraudEventModalComponent = useMemo(
+ () => (
<ResolveFraudEventsModal
showResolveFraudEventModal={showResolveFraudEventModal}
setShowResolveFraudEventModal={setShowResolveFraudEventModal}
fraudGroup={fraudGroup}
onConfirm={onConfirm}
/>
- );
- }, [
- showResolveFraudEventModal,
- setShowResolveFraudEventModal,
- fraudGroup,
- onConfirm,
- ]);
+ ),
+ [
+ showResolveFraudEventModal,
+ setShowResolveFraudEventModal,
+ fraudGroup,
+ onConfirm,
+ ],
+ );
return useMemo(
() => ({
setShowResolveFraudEventModal,
- ResolveFraudEventModal: ResolveFraudEventModalCallback,
+ ResolveFraudEventModal: ResolveFraudEventModalComponent,
}),
- [setShowResolveFraudEventModal, ResolveFraudEventModalCallback],
+ [setShowResolveFraudEventModal, ResolveFraudEventModalComponent],
);
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
index 16baf01b9d..ff10f4339f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
@@ -512,7 +512,7 @@ function RowMenuButton({
return (
<>
- <RejectPartnerApplicationModal />
+ {RejectPartnerApplicationModal}
<Popover
openPopover={isOpen}
setOpenPopover={setIsOpen}
diff --git a/apps/web/ui/modals/ban-partner-modal.tsx b/apps/web/ui/modals/ban-partner-modal.tsx
index 571753881b..888d0165da 100644
--- a/apps/web/ui/modals/ban-partner-modal.tsx
+++ b/apps/web/ui/modals/ban-partner-modal.tsx
@@ -192,22 +192,23 @@ export function useBanPartnerModal({
}) {
const [showBanPartnerModal, setShowBanPartnerModal] = useState(false);
- const BanPartnerModalCallback = useCallback(() => {
- return (
+ const BanPartnerModalComponent = useMemo(
+ () => (
<BanPartnerModal
showBanPartnerModal={showBanPartnerModal}
setShowBanPartnerModal={setShowBanPartnerModal}
partner={partner}
onConfirm={onConfirm}
/>
- );
- }, [showBanPartnerModal, setShowBanPartnerModal, partner, onConfirm]);
+ ),
+ [showBanPartnerModal, setShowBanPartnerModal, partner, onConfirm],
+ );
return useMemo(
() => ({
setShowBanPartnerModal,
- BanPartnerModal: BanPartnerModalCallback,
+ BanPartnerModal: BanPartnerModalComponent,
}),
- [setShowBanPartnerModal, BanPartnerModalCallback],
+ [setShowBanPartnerModal, BanPartnerModalComponent],
);
}
diff --git a/apps/web/ui/modals/reject-partner-application-modal.tsx b/apps/web/ui/modals/reject-partner-application-modal.tsx
index 8482ae9eb6..5d06854ed4 100644
--- a/apps/web/ui/modals/reject-partner-application-modal.tsx
+++ b/apps/web/ui/modals/reject-partner-application-modal.tsx
@@ -159,8 +159,8 @@ export function useRejectPartnerApplicationModal({
setShowRejectPartnerApplicationModal,
] = useState(false);
- const RejectPartnerApplicationModalCallback = useCallback(() => {
- return (
+ const RejectPartnerApplicationModalComponent = useMemo(
+ () => (
<RejectPartnerApplicationModal
showRejectPartnerApplicationModal={showRejectPartnerApplicationModal}
setShowRejectPartnerApplicationModal={
@@ -170,23 +170,24 @@ export function useRejectPartnerApplicationModal({
partner={partner}
onConfirm={onConfirm}
/>
- );
- }, [
- showRejectPartnerApplicationModal,
- setShowRejectPartnerApplicationModal,
- partner,
- onConfirm,
- confirmShortcutOptions,
- ]);
+ ),
+ [
+ showRejectPartnerApplicationModal,
+ setShowRejectPartnerApplicationModal,
+ partner,
+ onConfirm,
+ confirmShortcutOptions,
+ ],
+ );
return useMemo(
() => ({
setShowRejectPartnerApplicationModal,
- RejectPartnerApplicationModal: RejectPartnerApplicationModalCallback,
+ RejectPartnerApplicationModal: RejectPartnerApplicationModalComponent,
}),
[
setShowRejectPartnerApplicationModal,
- RejectPartnerApplicationModalCallback,
+ RejectPartnerApplicationModalComponent,
],
);
}
diff --git a/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx b/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx
index 925a2e6bd3..83cd84bdb7 100644
--- a/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx
+++ b/apps/web/ui/partners/fraud-risks/fraud-review-sheet.tsx
@@ -78,6 +78,7 @@ function FraudReviewSheetContent({
useKeyboardShortcut("r", () => setShowResolveFraudEventModal(true), {
sheet: true,
});
+
useKeyboardShortcut(
"b",
() => {
@@ -94,9 +95,9 @@ function FraudReviewSheetContent({
return (
<div className="relative h-full">
- <ResolveFraudEventModal />
- <BanPartnerModal />
- <RejectPartnerApplicationModal />
+ {ResolveFraudEventModal}
+ {BanPartnerModal}
+ {RejectPartnerApplicationModal}
<div
className={cn("flex h-full flex-col transition-opacity duration-200")}
>
@@ -323,11 +324,22 @@ export function FraudReviewSheet({
}) {
const { queryParams } = useRouterStuff();
+ const handleOpenChange = (open: boolean) => {
+ // Only update if the value actually changed
+ if (open === isOpen) return;
+
+ rest.setIsOpen(open);
+
+ // Clear the groupId from URL when closing
+ if (!open) {
+ queryParams({ del: "groupId", scroll: false });
+ }
+ };
+
return (
<Sheet
open={isOpen}
- onOpenChange={rest.setIsOpen}
- onClose={() => queryParams({ del: "groupId", scroll: false })}
+ onOpenChange={handleOpenChange}
nested={nested}
contentProps={{
className: "[--sheet-width:940px]",
diff --git a/apps/web/ui/partners/partner-application-sheet.tsx b/apps/web/ui/partners/partner-application-sheet.tsx
index 3fd310004b..95a609da1c 100644
--- a/apps/web/ui/partners/partner-application-sheet.tsx
+++ b/apps/web/ui/partners/partner-application-sheet.tsx
@@ -322,7 +322,7 @@ function PartnerRejectButton({
return (
<>
- <RejectPartnerApplicationModal />
+ {RejectPartnerApplicationModal}
<Button
type="button"
variant="secondary"