Merge branch 'main' into experiment/self-sign

apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx

@@ -12,9 +12,10 @@ import { createBillingPortal } from './create-billing-portal.action';
 
 export type BillingPortalButtonProps = {
   buttonProps?: React.ComponentProps<typeof Button>;
+  children?: React.ReactNode;
 };
 
-export const BillingPortalButton = ({ buttonProps }: BillingPortalButtonProps) => {
+export const BillingPortalButton = ({ buttonProps, children }: BillingPortalButtonProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
 
@@ -63,7 +64,7 @@ export const BillingPortalButton = ({ buttonProps }: BillingPortalButtonProps) =
       onClick={async () => handleFetchPortalUrl()}
       loading={isFetchingPortalUrl}
     >
-      <Trans>Manage Subscription</Trans>
+      {children || <Trans>Manage Subscription</Trans>}
     </Button>
   );
 };

apps/web/src/app/(dashboard)/settings/billing/page.tsx

@@ -67,6 +67,8 @@ export default async function BillingSettingsPage() {
     !subscription || subscription.status === SubscriptionStatus.INACTIVE;
 
   return (
+    <div>
+      <div className="flex flex-row items-end justify-between">
         <div>
           <h3 className="text-2xl font-semibold">
             <Trans>Billing</Trans>
@@ -102,12 +104,16 @@ export default async function BillingSettingsPage() {
                         {subscription.cancelAtPeriodEnd ? (
                           <span>
                             end on{' '}
-                        <span className="font-semibold">{i18n.date(subscription.periodEnd)}.</span>
+                            <span className="font-semibold">
+                              {i18n.date(subscription.periodEnd)}.
+                            </span>
                           </span>
                         ) : (
                           <span>
                             automatically renew on{' '}
-                        <span className="font-semibold">{i18n.date(subscription.periodEnd)}.</span>
+                            <span className="font-semibold">
+                              {i18n.date(subscription.periodEnd)}.
+                            </span>
                           </span>
                         )}
                       </span>
@@ -123,6 +129,14 @@ export default async function BillingSettingsPage() {
                 ))
                 .otherwise(() => null)}
           </div>
+        </div>
+
+        {isMissingOrInactiveOrFreePlan && (
+          <BillingPortalButton>
+            <Trans>Manage billing</Trans>
+          </BillingPortalButton>
+        )}
+      </div>
 
       <hr className="my-4" />
 

packages/api/v1/contract.ts

@@ -168,6 +168,9 @@ export const ApiContractV1 = c.router(
         500: ZUnsuccessfulResponseSchema,
       },
       summary: 'Send a document for signing',
+      // I'm aware this should be in the variable itself, which it is, however it's difficult for users to find in our current UI.
+      description:
+        'Notes\n\n`sendEmail` - Whether to send an email to the recipients asking them to action the document. If you disable this, you will need to manually distribute the document to the recipients using the generated signing links. Defaults to true',
     },
 
     resendDocument: {

packages/api/v1/schema.ts

@@ -67,7 +67,10 @@ export type TSuccessfulDocumentResponseSchema = z.infer<typeof ZSuccessfulDocume
 
 export const ZSendDocumentForSigningMutationSchema = z
   .object({
-    sendEmail: z.boolean().optional().default(true),
+    sendEmail: z.boolean().optional().default(true).openapi({
+      description:
+        'Whether to send an email to the recipients asking them to action the document. If you disable this, you will need to manually distribute the document to the recipients using the generated signing links.',
+    }),
   })
   .or(z.literal('').transform(() => ({ sendEmail: true })));