onboarding: PR comments

tloncorp · Nov 12, 2024 · a3113ef · a3113ef
1 parent 8da9d8e
commit a3113ef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 31 deletions.
diff --git a/apps/tlon-mobile/src/screens/Onboarding/SignupScreen.tsx b/apps/tlon-mobile/src/screens/Onboarding/SignupScreen.tsx
@@ -12,13 +12,12 @@ import { HostingError } from '@tloncorp/app/lib/hostingApi';
 import { trackOnboardingAction } from '@tloncorp/app/utils/posthog';
 import { createDevLogger } from '@tloncorp/shared';
 import {
-  Button,
   Field,
   KeyboardAvoidingView,
   OnboardingInviteBlock,
   OnboardingTextBlock,
+  PrimaryButton,
   ScreenHeader,
-  Spinner,
   TextInput,
   TlonText,
   View,
@@ -241,9 +240,9 @@ export const SignupScreen = ({ navigation }: Props) => {
               />
             )}
 
-            <Button
+            <PrimaryButton
               onPress={onSubmit}
-              hero
+              loading={isSubmitting}
               disabled={
                 isSubmitting ||
                 remoteError !== undefined ||
@@ -252,18 +251,10 @@ export const SignupScreen = ({ navigation }: Props) => {
                   : !emailForm.formState.isValid)
               }
             >
-              {isSubmitting ? (
-                <>
-                  <Spinner />
-                  <TlonText.Text>Please wait&hellip;</TlonText.Text>
-                </>
-              ) : (
-                <TlonText.Text color="$background" size="$label/l">
-                  Sign up with{' '}
-                  {otpMethod === 'phone' ? 'phone number' : 'email'}
-                </TlonText.Text>
-              )}
-            </Button>
+              <TlonText.Text color="$background" size="$label/l">
+                Sign up
+              </TlonText.Text>
+            </PrimaryButton>
             <TlonText.Text
               marginTop="$m"
               textAlign="center"

diff --git a/apps/tlon-mobile/src/screens/Onboarding/TlonLogin.tsx b/apps/tlon-mobile/src/screens/Onboarding/TlonLogin.tsx
@@ -8,12 +8,11 @@ import {
 import { HostingError } from '@tloncorp/app/lib/hostingApi';
 import { createDevLogger } from '@tloncorp/shared';
 import {
-  Button,
   Field,
   KeyboardAvoidingView,
   OnboardingTextBlock,
+  PrimaryButton,
   ScreenHeader,
-  Spinner,
   TextInput,
   TlonText,
   View,
@@ -188,9 +187,9 @@ export const TlonLoginScreen = ({ navigation, route }: Props) => {
               />
             )}
 
-            <Button
+            <PrimaryButton
               onPress={onSubmit}
-              hero
+              loading={isSubmitting}
               disabled={
                 isSubmitting ||
                 remoteError !== undefined ||
@@ -199,17 +198,10 @@ export const TlonLoginScreen = ({ navigation, route }: Props) => {
                   : !emailForm.formState.isValid)
               }
             >
-              {isSubmitting ? (
-                <>
-                  <Spinner />
-                  <TlonText.Text>Please wait&hellip;</TlonText.Text>
-                </>
-              ) : (
-                <TlonText.Text color="$background" size="$label/l">
-                  Send code to log in
-                </TlonText.Text>
-              )}
-            </Button>
+              <TlonText.Text color="$background" size="$label/l">
+                Send code to log in
+              </TlonText.Text>
+            </PrimaryButton>
 
             <TlonText.Text
               textAlign="center"