diff --git a/.changeset/silver-emus-applaud.md b/.changeset/silver-emus-applaud.md
new file mode 100644
index 00000000..bacbb302
--- /dev/null
+++ b/.changeset/silver-emus-applaud.md
@@ -0,0 +1,5 @@
+---
+"@exactly/mobile": patch
+---
+
+🚸 set account creation as primary onboarding action
diff --git a/src/components/onboarding/Carousel.tsx b/src/components/onboarding/Carousel.tsx
index 983999f2..fb1495b3 100644
--- a/src/components/onboarding/Carousel.tsx
+++ b/src/components/onboarding/Carousel.tsx
@@ -1,5 +1,5 @@
import { Passkey } from "@exactly/common/validation";
-import { ArrowRight } from "@tamagui/lucide-icons";
+import { Key } from "@tamagui/lucide-icons";
import { useMutation } from "@tanstack/react-query";
import { router } from "expo-router";
import React, { type FC, useCallback, useEffect, useRef, useState } from "react";
@@ -153,7 +153,6 @@ export default function Carousel() {
contentContainerStyle={containerStyle}
/>
-
-
{title}
@@ -186,32 +184,33 @@ export default function Carousel() {
)}
-
{
- recoverAccount();
+ if (isPending || isConnecting) return;
+ router.push("../onboarding/(passkeys)/passkeys");
}}
- iconAfter={}
+ iconAfter={}
>
- Log in
+ Create an account
-
{
- router.push("../onboarding/(passkeys)/passkeys");
+ if (isPending) return;
+ recoverAccount();
}}
>
- New here?
+ Already have an account?
- Create an account
+ Log in
diff --git a/src/components/onboarding/Passkeys.tsx b/src/components/onboarding/Passkeys.tsx
index dd3ec995..932462a3 100644
--- a/src/components/onboarding/Passkeys.tsx
+++ b/src/components/onboarding/Passkeys.tsx
@@ -80,7 +80,6 @@ export default function Passkeys() {
-
A secure and easy way to access your account
@@ -91,7 +90,6 @@ export default function Passkeys() {
-
@@ -101,7 +99,6 @@ export default function Passkeys() {
Terms & Conditions
-
}
+ iconAfter={
+
+ }
disabled={isPending}
onPress={() => {
createAccount();
@@ -119,7 +122,6 @@ export default function Passkeys() {
Set passkey and create account
-
diff --git a/src/components/shared/ActionButton.tsx b/src/components/shared/ActionButton.tsx
index 2e6d06b2..ea3a9e88 100644
--- a/src/components/shared/ActionButton.tsx
+++ b/src/components/shared/ActionButton.tsx
@@ -4,17 +4,24 @@ import { Spinner } from "tamagui";
import Button from "./Button";
export default function ActionButton({
+ disabled = false,
isLoading = false,
loadingContent = "Loading...",
...rest
-}: React.ComponentProps & { isLoading?: boolean; loadingContent?: string }) {
+}: React.ComponentProps & { disabled?: boolean; isLoading?: boolean; loadingContent?: string }) {
return (
: rest.iconAfter}
+ iconAfter={
+ isLoading ? (
+
+ ) : (
+ rest.iconAfter
+ )
+ }
>
{isLoading ? loadingContent : (rest.children ?? rest.content)}