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.

code improvements

Pedro Ladeira0cc97ac6385c
diff --git a/apps/web/lib/lemonsqueezy/import-commissions.ts b/apps/web/lib/lemonsqueezy/import-commissions.ts
index 354779facb..29aa8c70f5 100644
--- a/apps/web/lib/lemonsqueezy/import-commissions.ts
+++ b/apps/web/lib/lemonsqueezy/import-commissions.ts
@@ -73,7 +73,7 @@ function resolveAmountUsd({
// Skip billing_reason: initial (no referral) and missing/unknown reasons.
const IMPORTABLE_INVOICE_REASONS = new Set(["renewal", "updated"]);
-const toDubStatus = (status: string): CommissionStatus | null => {
+const toDubStatus = (status: string): CommissionStatus => {
switch (status) {
case "paid":
return "paid";
@@ -183,9 +183,6 @@ export async function importCommissions(payload: LemonSqueezyImportPayload) {
return;
}
- // Imports finished
- await lemonSqueezyImporter.deleteCredentials(program.workspaceId);
-
const workspaceUser = await prisma.projectUsers.findUnique({
where: {
userId_projectId: {
@@ -212,6 +209,8 @@ export async function importCommissions(payload: LemonSqueezyImportPayload) {
}),
});
}
+
+ await lemonSqueezyImporter.deleteCredentials(program.workspaceId);
}
async function listOrderSaleEvents({
@@ -364,7 +363,7 @@ async function processSaleEvents({
const saleChunks = chunk(saleEvents, 10);
for (const saleChunk of saleChunks) {
- await Promise.all(
+ await Promise.allSettled(
saleChunk.map((saleEvent) =>
createCommission({
program,
diff --git a/apps/web/ui/modals/import-lemonsqueezy-modal.tsx b/apps/web/ui/modals/import-lemonsqueezy-modal.tsx
index a24dfa1099..62100b595e 100644
--- a/apps/web/ui/modals/import-lemonsqueezy-modal.tsx
+++ b/apps/web/ui/modals/import-lemonsqueezy-modal.tsx
@@ -145,7 +145,9 @@ function TokenForm({
}
},
onError: ({ error }) => {
- toast.error(error.serverError);
+ toast.error(
+ error.serverError ?? "Failed to fetch Lemon Squeezy stores.",
+ );
},
});
@@ -226,7 +228,9 @@ function SelectStore({
router.push(`/${slug}/program/partners`);
},
onError: ({ error }) => {
- toast.error(error.serverError);
+ toast.error(
+ error.serverError ?? "Failed to start the Lemon Squeezy import.",
+ );
},
});