formatting

Author: yujonglee

apps/desktop/src/components/onboarding/calendar.tsx

@@ -2,14 +2,10 @@ import { Icon } from "@iconify-icon/react";
 import { platform } from "@tauri-apps/plugin-os";
 
 import { useAuth } from "../../auth";
-import type { OnboardingStepId } from "./config";
+import { getNextAfterConfigureNotice, type StepProps } from "./config";
 import { Divider, IntegrationRow, OnboardingContainer } from "./shared";
 
-export function Calendars({
-  onNavigate,
-}: {
-  onNavigate: (step: OnboardingStepId | "done") => void;
-}) {
+export function Calendars({ onNavigate }: StepProps) {
   const auth = useAuth();
   const currentPlatform = platform();
   const isLoggedIn = !!auth?.session;
@@ -55,9 +51,7 @@ export function Calendars({
       </div>
 
       <button
-        onClick={() =>
-          onNavigate(currentPlatform === "macos" ? "permissions" : "done")
-        }
+        onClick={() => onNavigate(getNextAfterConfigureNotice(currentPlatform))}
         className="mt-4 text-sm text-neutral-400 transition-colors hover:text-neutral-600"
       >
         skip

apps/desktop/src/components/onboarding/config.tsx

@@ -11,11 +11,29 @@ export type OnboardingStepId =
   | "configure-notice"
   | "permissions";
 
+export type StepProps = {
+  onNavigate: (step: OnboardingStepId | "done") => void;
+};
+
+export function getNextAfterLogin(
+  platform: string,
+  isPro: boolean,
+): OnboardingStepId | "done" {
+  if (!isPro) {
+    return "configure-notice";
+  }
+  return platform === "macos" ? "permissions" : "done";
+}
+
+export function getNextAfterConfigureNotice(
+  platform: string,
+): OnboardingStepId | "done" {
+  return platform === "macos" ? "permissions" : "done";
+}
+
 type StepConfig = {
   id: OnboardingStepId;
-  component: ComponentType<{
-    onNavigate: (step: OnboardingStepId | "done") => void;
-  }>;
+  component: ComponentType<StepProps>;
 };
 
 export const STEP_CONFIGS: StepConfig[] = [

apps/desktop/src/components/onboarding/configure-notice.tsx

@@ -1,13 +1,9 @@
 import { platform } from "@tauri-apps/plugin-os";
 
-import type { OnboardingStepId } from "./config";
+import { getNextAfterConfigureNotice, type StepProps } from "./config";
 import { OnboardingContainer } from "./shared";
 
-export function ConfigureNotice({
-  onNavigate,
-}: {
-  onNavigate: (step: OnboardingStepId | "done") => void;
-}) {
+export function ConfigureNotice({ onNavigate }: StepProps) {
   const currentPlatform = platform();
 
   return (
@@ -30,7 +26,7 @@ export function ConfigureNotice({
       <div className="flex flex-col gap-3 mt-4">
         <button
           onClick={() =>
-            onNavigate(currentPlatform === "macos" ? "permissions" : "done")
+            onNavigate(getNextAfterConfigureNotice(currentPlatform))
           }
           className="w-full py-3 rounded-full bg-gradient-to-t from-stone-600 to-stone-500 text-white text-sm font-medium duration-150 hover:scale-[1.01] active:scale-[0.99]"
         >

apps/desktop/src/components/onboarding/login.tsx

@@ -9,14 +9,10 @@ import { useAuth } from "../../auth";
 import { getEntitlementsFromToken } from "../../billing";
 import { env } from "../../env";
 import * as settings from "../../store/tinybase/settings";
-import type { OnboardingStepId } from "./config";
+import { getNextAfterLogin, type StepProps } from "./config";
 import { Divider, OnboardingContainer } from "./shared";
 
-export function Login({
-  onNavigate,
-}: {
-  onNavigate: (step: OnboardingStepId | "done") => void;
-}) {
+export function Login({ onNavigate }: StepProps) {
   const auth = useAuth();
   const currentPlatform = platform();
   const [callbackUrl, setCallbackUrl] = useState("");
@@ -79,10 +75,8 @@ export function Login({
     onSuccess: (isPro) => {
       if (isPro) {
         setTrialDefaults();
-        onNavigate(currentPlatform === "macos" ? "permissions" : "done");
-      } else {
-        onNavigate("configure-notice");
       }
+      onNavigate(getNextAfterLogin(currentPlatform, isPro));
     },
     onError: (e) => {
       console.error(e);

apps/desktop/src/components/onboarding/permissions.tsx

@@ -4,7 +4,7 @@ import { cn } from "@hypr/utils";
 
 import { useAuth } from "../../auth";
 import { usePermissions } from "../../hooks/use-permissions";
-import type { OnboardingStepId } from "./config";
+import type { StepProps } from "./config";
 import { OnboardingContainer } from "./shared";
 
 function PermissionBlock({
@@ -71,11 +71,7 @@ function PermissionBlock({
   );
 }
 
-export function Permissions({
-  onNavigate,
-}: {
-  onNavigate: (step: OnboardingStepId | "done") => void;
-}) {
+export function Permissions({ onNavigate }: StepProps) {
   const auth = useAuth();
   const {
     micPermissionStatus,

apps/desktop/src/components/onboarding/welcome.tsx

@@ -3,13 +3,9 @@ import { arch, platform } from "@tauri-apps/plugin-os";
 
 import { TextAnimate } from "@hypr/ui/components/ui/text-animate";
 
-import type { OnboardingStepId } from "./config";
+import type { StepProps } from "./config";
 
-export function Welcome({
-  onNavigate,
-}: {
-  onNavigate: (step: OnboardingStepId | "done") => void;
-}) {
+export function Welcome({ onNavigate }: StepProps) {
   const currentPlatform = platform();
   const archQuery = useQuery({
     queryKey: ["arch"],