Merge pull request #521 from 0xsend/dev

deploy

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

Tiltfile

@@ -184,11 +184,8 @@ local_resource(
     "caddy:web",
     auto_init = not CI,
     labels = labels,
-    serve_cmd = "caddy run --watch --config Caddyfile.dev",
+    serve_cmd = "caddy run --watch --config dev.Caddyfile",
     trigger_mode = TRIGGER_MODE_MANUAL,
-    deps = [
-        "Caddyfile.dev",
-    ],
 )
 
 # TESTS

packages/app/components/FormFields/BooleanCheckboxField.tsx

@@ -62,25 +62,10 @@ export const BooleanCheckboxField = (
             ref={field.ref}
             id={id}
             borderWidth={0}
-            $theme-dark={{
-              bc: '$green1Dark',
-            }}
-            $theme-light={{
-              bc: '$green1Light',
-            }}
             {...props}
           >
             <Checkbox.Indicator>
-              <Check
-                $theme-dark={{
-                  bc: '$green1Dark',
-                  color: '$green12Dark',
-                }}
-                $theme-light={{
-                  bc: '$green1Light',
-                  color: '$green12Light',
-                }}
-              />
+              <Check />
             </Checkbox.Indicator>
           </Checkbox>
         </XStack>

packages/app/components/FormFields/TextAreaField.tsx

@@ -52,14 +52,10 @@ export const TextAreaField = (
             borderWidth={0}
             borderRadius={'$4'}
             $theme-dark={{
-              bc: '$charcoal',
-              color: '$gray12Dark',
               // placeholderTextColor fails in test env for some reason
               ...(process.env.NODE_ENV !== 'test' ? { placeholderTextColor: '$gray10Dark' } : {}),
             }}
             $theme-light={{
-              bc: '$gray3Light',
-              color: '$gray12Light',
               // placeholderTextColor fails in test env for some reason
               ...(process.env.NODE_ENV !== 'test' ? { placeholderTextColor: '$gray10Light' } : {}),
             }}

packages/app/components/icons/IconInfoCircle.tsx

@@ -0,0 +1,30 @@
+import React, { memo } from 'react'
+import type { IconProps } from '@tamagui/helpers-icon'
+import { Svg, Circle as _Circle, Path } from 'react-native-svg'
+import { themed } from '@tamagui/helpers-icon'
+import type { ColorTokens } from '@my/ui'
+
+const Icon = (props) => {
+  const { color = 'black', size = 24, ...otherProps } = props
+  return (
+    <Svg
+      width={size}
+      height={size}
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke={color as ColorTokens | undefined}
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      {...otherProps}
+    >
+      <_Circle cx="12" cy="12" r="10" stroke={'currentColor'} />
+      <Path d="M12 16v-4" stroke={'currentColor'} />
+      <Path d="M12 8h.01" stroke={'currentColor'} />
+    </Svg>
+  )
+}
+
+Icon.displayName = 'Info'
+
+export const IconInfoCircle = memo<IconProps>(themed(Icon))

packages/app/components/icons/index.tsx

@@ -52,3 +52,4 @@ export { IconInfoGreenCircle } from './IconInfoGreenCircle'
 export { IconDots } from './IconDots'
 export { IconDeviceReset } from './IconDeviceReset'
 export { IconBadgeCheck } from './IconBadgeCheck'
+export { IconInfoCircle } from './IconInfoCircle'

packages/app/components/layout/MainLayout.tsx

@@ -1,4 +1,4 @@
-import { Avatar, Link, ScrollView, Spinner, XStack, YStack } from '@my/ui'
+import { Avatar, Link, ScrollView, Spinner, XStack, YStack, LinkableAvatar } from '@my/ui'
 import { LinearGradient } from '@tamagui/linear-gradient'
 import { IconQr } from 'app/components/icons'
 import { useUser } from 'app/utils/useUser'
@@ -20,15 +20,15 @@ const MainLayout = ({
         <XStack borderColor={separatorColor} borderBottomWidth={1} pt={'$6'}>
           <XStack w={'90%'} ai={'center'} jc={'space-between'} marginHorizontal={'5%'} py={'$6'}>
             <Link href={'/account'}>
-              <Avatar br={'$6'} size={'$4.5'}>
+              <LinkableAvatar br={'$6'} size={'$4.5'} href={`/profile/${profile?.send_id}`}>
                 {avatar_url ? (
                   <Avatar.Image src={avatar_url} width={48} height={48} />
                 ) : (
                   <Avatar.Fallback jc={'center'}>
                     <Spinner size="large" color="$color" />
                   </Avatar.Fallback>
                 )}
-              </Avatar>
+              </LinkableAvatar>
             </Link>
             <IconQr color={iconColor} />
           </XStack>

packages/app/components/sidebar/HomeSideBar.tsx

@@ -10,6 +10,7 @@ import {
   XStack,
   YStack,
   useMedia,
+  LinkableAvatar,
   type YStackProps,
 } from '@my/ui'
 import { baseMainnet } from '@my/wagmi/chains'
@@ -81,12 +82,12 @@ const HomeBottomSheet = () => {
   return (
     <NavSheet navId="home">
       <XStack gap="$4" ai="center">
-        <Avatar size="$4.5" br={'$3'}>
+        <LinkableAvatar size="$4.5" br={'$3'} href={`/profile/${profile?.send_id}`}>
           <Avatar.Image src={avatarUrl ?? ''} />
           <Avatar.Fallback jc={'center'} delayMs={200}>
             <IconAccount size="$4.5" color="$olive" />
           </Avatar.Fallback>
-        </Avatar>
+        </LinkableAvatar>
         <YStack>
           <H4>{profile?.name ?? `#${profile?.send_id}`}</H4>
           <ReferralLink p={0} />