Skip to content

Commit 0f1b4ce

Browse files
Recover send account theme tweaks and cleanup (#496)
2 parents 8e540db + b101dfd commit 0f1b4ce

File tree

4 files changed

+39
-31
lines changed

4 files changed

+39
-31
lines changed

packages/app/features/auth/account-recovery/account-recovery.tsx

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
import { useEffect, useState, useCallback } from 'react'
22
import RecoverWithEOA from 'app/features/auth/account-recovery/eoa/RecoverWithEOA'
3-
import { Stack, XStack, YStack, Text, Button, ButtonText, useToastController } from '@my/ui'
3+
import {
4+
Stack,
5+
XStack,
6+
YStack,
7+
Text,
8+
Button,
9+
ButtonText,
10+
useToastController,
11+
Paragraph,
12+
} from '@my/ui'
413
import type {
514
ChallengeResponse,
615
VerifyChallengeRequest,
@@ -101,37 +110,36 @@ export default function AccountRecovery(props: Props) {
101110
{error ? <IconError size={'$4'} color={'$red9Dark'} /> : <IconRefresh size={'$4'} />}
102111

103112
{/* Heading */}
104-
<Text fontWeight="bold" textAlign="center">
105-
{error ? (
106-
<Text testID="account-recovery-heading-error">Unable to recover account</Text>
107-
) : (
108-
<Text testID="account-recovery-heading">Recover account</Text>
109-
)}
110-
</Text>
113+
{error ? (
114+
<Paragraph testID="account-recovery-heading-error">Unable to recover account</Paragraph>
115+
) : (
116+
<Paragraph testID="account-recovery-heading">Recover account</Paragraph>
117+
)}
111118

112119
{/* Description */}
113-
<Text textAlign="center">
114-
{error?.message ? (
115-
<Text testID="account-recovery-description-error">{error.message}</Text>
116-
) : (
117-
<Text testID="account-recovery-description">
118-
Recover with the {getRecoveryOptionsStr()} linked to your account.
119-
</Text>
120-
)}
121-
</Text>
120+
121+
{error?.message ? (
122+
<Paragraph testID="account-recovery-description-error">{error.message}</Paragraph>
123+
) : (
124+
<Paragraph testID="account-recovery-description">
125+
Recover with the {getRecoveryOptionsStr()} linked to your account.
126+
</Paragraph>
127+
)}
122128
</>
123129
)
124130
}
125131

126132
return (
127133
<YStack mt={'0'} w={'100%'} h={'100%'} jc={'space-between'} maxWidth={600} mx="auto" pb="$6">
128-
<Stack flex={1} jc={'center'} alignItems="center" gap="$2">
134+
<Stack flex={1} jc={'center'} alignItems="center" gap="$4">
129135
{showHeading()}
130136
{!error && challengeData && showRecoveryOptions()}
131137
</Stack>
132138

133-
<Button w={'100%'} theme="green" onPress={props.onClose}>
134-
<ButtonText>RETURN</ButtonText>
139+
<Button w={'100%'} theme="red_active" onPress={props.onClose} br="$4">
140+
<ButtonText textTransform="uppercase" theme="red">
141+
Cancel
142+
</ButtonText>
135143
</Button>
136144
</YStack>
137145
)

packages/app/features/auth/account-recovery/eoa/RecoverWithEOA.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export default function RecoverWithEOA(props: Props) {
5353

5454
return (
5555
<OpenConnectModalWrapper width={'50%'}>
56-
<Button onPress={isConnected ? onPress : null}>
56+
<Button onPress={isConnected ? onPress : null} theme="green" br="$4">
5757
<ButtonText testID="account-recovery-eoa-btn">EOA</ButtonText>
5858
</Button>
5959
</OpenConnectModalWrapper>

packages/app/features/auth/account-recovery/passkey/RecoverWithPasskey.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ export default function RecoverWithPasskey(props: Props) {
3838
}
3939

4040
return (
41-
<Button onPress={onPress} width="50%" testID="account-recovery-passkey-btn">
41+
<Button
42+
onPress={onPress}
43+
width="50%"
44+
theme={'green_ghost'}
45+
boc="$borderColor"
46+
bw={1}
47+
br="$4"
48+
testID="account-recovery-passkey-btn"
49+
>
4250
<ButtonText>PASSKEY</ButtonText>
4351
</Button>
4452
)

packages/app/features/auth/sign-in/sign-in-form.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,7 @@ export const SignInForm = () => {
188188
}
189189

190190
const ForgotPhoneNumberLink = (props: AnchorProps) => (
191-
<Anchor
192-
$theme-dark={{
193-
col: '$background',
194-
}}
195-
$theme-light={{ col: '$black' }}
196-
href=""
197-
fontSize="$3"
198-
{...props}
199-
>
191+
<Anchor href="" fontSize="$3" {...props}>
200192
Forgot your phone number?
201193
</Anchor>
202194
)

0 commit comments

Comments
 (0)