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.

address coderabbit feedback

Steven Tey94da85c3beb4
diff --git a/apps/web/scripts/migrations/backfill-reward-activity-log.ts b/apps/web/scripts/migrations/backfill-reward-activity-log.ts
index 6ddac84a15..a642d59f8e 100644
--- a/apps/web/scripts/migrations/backfill-reward-activity-log.ts
+++ b/apps/web/scripts/migrations/backfill-reward-activity-log.ts
@@ -45,7 +45,7 @@ async function main() {
workspaceId: reward.program.workspaceId,
programId: reward.program.id,
resourceId: reward.id,
- parentResourceType: "reward",
+ parentResourceType: "group",
parentResourceId:
reward.clickPartnerGroup?.id ??
reward.leadPartnerGroup?.id ??
diff --git a/apps/web/tests/utils/resource.ts b/apps/web/tests/utils/resource.ts
index 8fe497d8d1..94685c462e 100644
--- a/apps/web/tests/utils/resource.ts
+++ b/apps/web/tests/utils/resource.ts
@@ -156,7 +156,6 @@ export const E2E_DISCOUNT = {
couponId: "XZuejd0Q",
couponTestId: "2NMXz81x",
description: null,
- autoProvisionEnabledAt: null,
};
// Program
diff --git a/apps/web/ui/activity-logs/activity-entry-chips.tsx b/apps/web/ui/activity-logs/activity-entry-chips.tsx
index 023bff2a15..4ebc13a43b 100644
--- a/apps/web/ui/activity-logs/activity-entry-chips.tsx
+++ b/apps/web/ui/activity-logs/activity-entry-chips.tsx
@@ -79,10 +79,10 @@ export function UserChip({ user }: UserChipProps) {
<ActivityChip>
<img
src={user.image || `${OG_AVATAR_URL}${user.id}`}
- alt={`${user.name || user.email || "User"}`}
+ alt={`${user.name || user.email || "Deleted user"}`}
className="size-4 shrink-0 rounded-full"
/>
- {user.name || user.email || "Unknown user"}
+ {user.name || user.email || "Deleted user"}
</ActivityChip>
);
}
@@ -148,9 +148,7 @@ export function UserAvatar({ user }: { user: ActivityLog["user"] }) {
alt={name}
className="size-6 shrink-0 rounded-full"
/>
- <p className="text-sm font-medium text-neutral-900">
- {user.name || user.email}
- </p>
+ <p className="text-sm font-medium text-neutral-900">{name}</p>
{user.email && user.name && (
<p className="text-xs text-neutral-500">{user.email}</p>
)}
diff --git a/apps/web/ui/activity-logs/reward-activity-section.tsx b/apps/web/ui/activity-logs/reward-activity-section.tsx
index ba1b4a5246..3911e3d0d6 100644
--- a/apps/web/ui/activity-logs/reward-activity-section.tsx
+++ b/apps/web/ui/activity-logs/reward-activity-section.tsx
@@ -21,7 +21,7 @@ export function RewardActivitySection({
const { activityLogs, loading, error } = useActivityLogs({
query: {
resourceType,
- parentResourceId: group?.id,
+ ...(group ? { parentResourceId: group.id } : {}),
},
enabled: !!reward.id,
});
diff --git a/apps/web/ui/activity-logs/reward-history-sheet.tsx b/apps/web/ui/activity-logs/reward-history-sheet.tsx
index 70d672391b..4dfee8d48e 100644
--- a/apps/web/ui/activity-logs/reward-history-sheet.tsx
+++ b/apps/web/ui/activity-logs/reward-history-sheet.tsx
@@ -69,7 +69,7 @@ export function useRewardHistorySheet({
query: reward
? {
resourceType: REWARD_EVENT_TO_RESOURCE_TYPE[reward.event],
- parentResourceId: group?.id,
+ ...(group ? { parentResourceId: group.id } : {}),
}
: undefined,
enabled: !!reward?.id,