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.

Show commission description on imported activity events

Kiran Ke6fceb083b5d
diff --git a/apps/web/ui/activity-logs/commission-activity.tsx b/apps/web/ui/activity-logs/commission-activity.tsx
index 12d2b8d88a..1e83f60447 100644
--- a/apps/web/ui/activity-logs/commission-activity.tsx
+++ b/apps/web/ui/activity-logs/commission-activity.tsx
@@ -61,6 +61,31 @@ function parseChangeSet(log: ActivityLog) {
};
}
+function getCommissionNote({
+ description,
+ reward,
+ createdAt,
+}: Pick<CommissionDetail, "description" | "reward" | "createdAt">) {
+ let text = description;
+
+ if (!text && reward) {
+ const amount =
+ reward.type === "percentage"
+ ? `${reward.amountInPercentage ?? 0}%`
+ : currencyFormatter(reward.amountInCents ?? 0, {
+ trailingZeroDisplay: "stripIfInteger",
+ });
+
+ text = `Earn ${amount} per ${reward.event}`;
+ }
+
+ if (!text) {
+ return undefined;
+ }
+
+ return <CommentCardDisplay timestamp={createdAt} text={text} />;
+}
+
export function CommissionActivity({
commission,
slug,
@@ -103,6 +128,7 @@ export function CommissionActivity({
key: "created",
icon: CommissionStatusBadges[commission.status].icon,
timestamp: commission.createdAt,
+ note: getCommissionNote(commission),
children: (
<>
<span className="text-sm text-neutral-700">
@@ -121,32 +147,7 @@ export function CommissionActivity({
key: "created",
icon: CommissionStatusBadges["pending"].icon,
timestamp: commission.createdAt,
- note: (() => {
- const text =
- commission.description ||
- (commission.reward
- ? `Earn ${
- commission.reward.type === "percentage"
- ? `${commission.reward.amountInPercentage ?? 0}%`
- : currencyFormatter(
- commission.reward.amountInCents ?? 0,
- {
- trailingZeroDisplay: "stripIfInteger",
- },
- )
- } per ${commission.reward.event}`
- : null);
-
- if (!text) return undefined;
-
- return (
- <CommentCardDisplay
- timestamp={commission.createdAt}
- text={text}
- />
- );
- })(),
-
+ note: getCommissionNote(commission),
children: (
<>
<span className="text-sm text-neutral-700">Commission</span>