All comments fixed

Author: olafch

src/components/index.ts

@@ -12,3 +12,10 @@ export * from './LanguagePicker'
 export * from './Modal'
 export * from './StatusBar'
 export * from './Version'
+
+export * from './screens/profile/ProfileControlledInput'
+export * from './screens/profile/ProfileDeleteAccountButton'
+export * from './screens/profile/ProfileDetailsForm'
+export * from './screens/profile/ProfileEditImage'
+export * from './screens/profile/ProfileHeader'
+export * from './screens/profile/ProfilePasswordForm'

src/components/screens/profile/ProfileDeleteAccountButton.tsx

@@ -57,18 +57,16 @@ export const ProfileDeleteAccountButton = () => {
   )
 
   return (
-    <Box>
-      <Box borderColor="border.secondary" borderTopWidth={1} py={6} alignItems="flex-start">
-        <Button
-          leftIconName="delete-bin-line"
-          variant="SecondaryDestructive"
-          borderRadius={8}
-          onPress={presentBottomSheet}
-        >
-          {t('profile_screen.remove_account')}
-        </Button>
-        {bottomSheet}
-      </Box>
+    <Box borderColor="border.secondary" borderTopWidth={1} py={6} alignItems="flex-start">
+      <Button
+        leftIconName="delete-bin-line"
+        variant="SecondaryDestructive"
+        borderRadius={8}
+        onPress={presentBottomSheet}
+      >
+        {t('profile_screen.remove_account')}
+      </Button>
+      {bottomSheet}
     </Box>
   )
 }

src/components/screens/profile/ProfileDetailsForm.tsx

@@ -20,23 +20,20 @@ export const ProfileDetailsForm = () => {
           label={t('form.labels.first_name')}
           name="firstName"
           placeholder={t('form.placeholders.first_name')}
-          control={control}
-          errors={errors}
+          {...{ control, errors }}
           onFocus={focusLastNameInput}
         />
         <ProfileControlledInput
           label={t('form.labels.last_name')}
           name="lastName"
           placeholder={t('form.placeholders.last_name')}
-          control={control}
-          errors={errors}
+          {...{ control, errors }}
         />
         <ProfileControlledInput
           label={t('form.labels.email')}
           name="email"
           placeholder={t('form.placeholders.email')}
-          control={control}
-          errors={errors}
+          {...{ control, errors }}
           isDisabled
           onSubmitEditing={submit}
         />

src/components/screens/profile/ProfileEditImage.tsx

@@ -2,7 +2,7 @@ import { isWeb } from '@baca/constants'
 import { Box, Text, Button, Row, themeColors } from '@baca/design-system'
 import * as ImagePicker from 'expo-image-picker'
 import { t } from 'i18next'
-import React, { useState, useCallback } from 'react'
+import { useState, useCallback } from 'react'
 import { Image, StyleSheet } from 'react-native'
 
 export const ProfileEditImage: React.FC = () => {

src/components/screens/profile/ProfilePasswordForm.tsx

@@ -9,33 +9,31 @@ export const ProfilePasswordForm = () => {
   const { control, errors, submit, isSubmitting } = useUpdatePasswordForm()
 
   return (
-    <Box>
-      <Box borderColor="border.secondary" borderTopWidth={1} py={6}>
-        <ProfileControlledInput
-          label={t('form.labels.old_password')}
-          name="oldPassword"
-          placeholder={t('form.placeholders.old_password')}
-          control={control}
-          errors={errors}
-        />
-        <ProfileControlledInput
-          label={t('form.labels.new_password')}
-          name="password"
-          placeholder={t('form.placeholders.new_password')}
-          control={control}
-          errors={errors}
-        />
-        <Row maxW={800} justifyContent="flex-end">
-          <Button
-            disabled={isSubmitting}
-            loading={isSubmitting}
-            onPress={submit}
-            testID="changePasswordButton"
-          >
-            {t('common.change')}
-          </Button>
-        </Row>
-      </Box>
+    <Box borderColor="border.secondary" borderTopWidth={1} py={6}>
+      <ProfileControlledInput
+        label={t('form.labels.old_password')}
+        name="oldPassword"
+        placeholder={t('form.placeholders.old_password')}
+        control={control}
+        errors={errors}
+      />
+      <ProfileControlledInput
+        label={t('form.labels.new_password')}
+        name="password"
+        placeholder={t('form.placeholders.new_password')}
+        control={control}
+        errors={errors}
+      />
+      <Row maxW={800} justifyContent="flex-end">
+        <Button
+          disabled={isSubmitting}
+          loading={isSubmitting}
+          onPress={submit}
+          testID="changePasswordButton"
+        >
+          {t('common.change')}
+        </Button>
+      </Row>
     </Box>
   )
 }

src/hooks/forms/useUpdatePasswordForm.ts

@@ -1,22 +1,18 @@
 import { useAuthControllerUpdate } from '@baca/api/query/auth/auth'
 import { AuthUpdateDto } from '@baca/api/types'
 import { handleFormError, hapticImpact, showSuccessToast } from '@baca/utils'
-import { useMemo } from 'react'
 import { useForm } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 
+const defaultValues: AuthUpdateDto = {
+  oldPassword: '',
+  password: '',
+}
+
 export const useUpdatePasswordForm = () => {
   const { t } = useTranslation()
   const { mutate: updatePasswordMutation, isLoading } = useAuthControllerUpdate()
 
-  const defaultValues: AuthUpdateDto = useMemo(
-    () => ({
-      oldPassword: '',
-      password: '',
-    }),
-    []
-  )
-
   const {
     control,
     formState: { errors },

src/screens/ProfileScreen.tsx

@@ -1,8 +1,10 @@
-import { ProfileDeleteAccountButton } from '@baca/components/screens/profile/ProfileDeleteAccountButton'
-import { ProfileDetailsForm } from '@baca/components/screens/profile/ProfileDetailsForm'
-import { ProfileEditImage } from '@baca/components/screens/profile/ProfileEditImage'
-import { ProfileHeader } from '@baca/components/screens/profile/ProfileHeader'
-import { ProfilePasswordForm } from '@baca/components/screens/profile/ProfilePasswordForm'
+import {
+  ProfileDeleteAccountButton,
+  ProfileDetailsForm,
+  ProfileEditImage,
+  ProfileHeader,
+  ProfilePasswordForm,
+} from '@baca/components'
 import { Box, ScrollView, Spacer } from '@baca/design-system'
 import { useTranslation, useScreenOptions } from '@baca/hooks'