Replace card row and add interaction state

src/view/com/util/AccountDropdownBtn.tsx

@@ -31,7 +31,7 @@ export function AccountDropdownBtn({account}: {account: SessionAccount}) {
                 size="xsmall"
                 shape="round"
                 color="secondary"
-                variant="solid">
+                variant="ghost">
                 <ButtonIcon icon={Ellipsis} size="sm" />
               </Button>
             )

src/view/screens/Settings/index.tsx

@@ -55,8 +55,11 @@ import {UserAvatar} from 'view/com/util/UserAvatar'
 import {ScrollView} from 'view/com/util/Views'
 import {DeactivateAccountDialog} from '#/screens/Settings/components/DeactivateAccountDialog'
 import {atoms as a, useTheme} from '#/alf'
+import {Button, ButtonContext} from '#/components/Button'
 import {useDialogControl} from '#/components/Dialog'
 import {BirthDateSettingsDialog} from '#/components/dialogs/BirthDateSettings'
+import {Link as NewLink} from '#/components/Link'
+import {Text as NewText} from '#/components/Typography'
 import {Email2FAToggle} from './Email2FAToggle'
 import {ExportCarDialog} from './ExportCarDialog'
 
@@ -72,62 +75,69 @@ function SettingsAccountCard({
     logContext: 'Settings',
   ) => void
 }) {
-  const pal = usePalette('default')
   const {_} = useLingui()
   const t = useTheme()
   const {currentAccount} = useSession()
   const {data: profile} = useProfileQuery({did: account.did})
   const isCurrentAccount = account.did === currentAccount?.did
 
-  const contents = (
+  const contents = (ctx: ButtonContext) => (
     <View
       style={[
-        pal.view,
+        a.w_full,
-        styles.linkCard,
+        a.flex_row,
-        account.did === pendingDid && t.atoms.bg_contrast_25,
+        a.align_center,
+        a.gap_md,
+        a.py_md,
+        t.atoms.bg,
+        {
+          paddingHorizontal: 18,
+          marginBottom: 1,
+        },
+        account.did === pendingDid && [t.atoms.bg_contrast_25],
+        (ctx.hovered || ctx.pressed) && [t.atoms.bg_contrast_25],
       ]}>
-      <View style={styles.avi}>
       <UserAvatar
         size={40}
         avatar={profile?.avatar}
         type={profile?.associated?.labeler ? 'labeler' : 'user'}
       />
-      </View>
+      <View style={[a.flex_1]}>
-      <View style={[s.flex1]}>
+        <NewText
-        <Text type="md-bold" style={[pal.text, a.self_start]} numberOfLines={1}>
+          style={[a.text_md, a.font_bold, a.leading_tight]}
+          numberOfLines={1}>
           {profile?.displayName || account.handle}
-        </Text>
+        </NewText>
-        <Text type="sm" style={pal.textLight} numberOfLines={1}>
+        <NewText
-          {account.handle}
+          style={[t.atoms.text_contrast_medium, a.leading_tight]}
-        </Text>
+          numberOfLines={1}>
+          @{account.handle}
+        </NewText>
       </View>
       <AccountDropdownBtn account={account} />
     </View>
   )
 
   return isCurrentAccount ? (
-    <Link
+    <NewLink
-      href={makeProfileLink({
+      to={makeProfileLink({
         did: currentAccount?.did,
         handle: currentAccount?.handle,
       })}
-      title={_(msg`Your profile`)}
+      label={_(msg`Your profile`)}
-      noFeedback>
+      style={[a.w_full]}>
       {contents}
-    </Link>
+    </NewLink>
   ) : (
-    <TouchableOpacity
+    <Button
       testID={`switchToAccountBtn-${account.handle}`}
-      key={account.did}
       onPress={
         pendingDid ? undefined : () => onPressSwitchAccount(account, 'Settings')
       }
-      accessibilityRole="button"
+      label={_(msg`Switch to ${account.handle}`)}
-      accessibilityLabel={_(msg`Switch to ${account.handle}`)}
+      style={[a.w_full]}>
-      accessibilityHint={_(msg`Switches the account you are logged in to`)}
-      activeOpacity={0.8}>
       {contents}
-    </TouchableOpacity>
+    </Button>
   )
 }