Skip to content

[pull] main from dubinc:main #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
May 8, 2025
Merged

[pull] main from dubinc:main #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e7b120
simplify
steven-tey May 8, 2025
4d193fc
minor UI fixes
steven-tey May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/app/api/embed/referrals/leaderboard/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const GET = withReferralsEmbedToken(async ({ program }) => {
FROM
ProgramEnrollment pe
INNER JOIN
Partner p ON p.id = pe.partnerId AND p.showOnLeaderboard = true
Partner p ON p.id = pe.partnerId
LEFT JOIN (
SELECT
partnerId,
Expand Down
18 changes: 11 additions & 7 deletions apps/web/ui/links/links-toolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ export const LinksToolbar = memo(
)}
>
{bulkActions.map(
({
label,
icon: Icon,
action,
disabledTooltip,
keyboardShortcut,
}) => (
(
{
label,
icon: Icon,
action,
disabledTooltip,
keyboardShortcut,
},
idx,
) => (
<Button
key={idx}
type="button"
variant="secondary"
className="xs:px-2.5 h-7 gap-1.5 px-2 text-xs min-[1120px]:pr-1.5"
Expand Down
1 change: 0 additions & 1 deletion packages/prisma/schema/partner.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ model Partner {
stripeConnectId String? @unique
payoutsEnabledAt DateTime?
connectPayoutsLastRemindedAt DateTime?
showOnLeaderboard Boolean @default(true)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

Expand Down
7 changes: 6 additions & 1 deletion packages/ui/src/sheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ function SheetRoot({
>) {
const RootComponent = nested ? Drawer.NestedRoot : Drawer.Root;
return (
<RootComponent direction="right" handleOnly {...rest}>
<RootComponent
direction="right"
handleOnly
repositionInputs={false}
{...rest}
>
<Drawer.Portal>
<Drawer.Overlay
className="fixed inset-0 bg-black/20"
Expand Down