fix: 🐛 fix warnings

App.tsx

@@ -3,17 +3,15 @@
  */
 import React, { ReactElement } from 'react'
 import 'react-native-gesture-handler'
-import {
-  CachedResourcesProvider,
-  GraphQLProvider,
-  EvaProvider,
-  AuthProvider,
-  SearchStateProvider,
-  NotificationStateProvider,
-  UserStateProvider,
-  AddRecipeStateProvider,
-} from '@greeneggs/providers'
 import { Router } from '@greeneggs/navigation'
+import { AddRecipeStateProvider } from '@greeneggs/providers/add-recipe-state-provider'
+import { AuthProvider } from '@greeneggs/providers/auth-provider'
+import { CachedResourcesProvider } from '@greeneggs/providers/cached-resources-provider'
+import { EvaProvider } from '@greeneggs/providers/eva-provider'
+import { GraphQLProvider } from '@greeneggs/providers/graphql-provider'
+import { NotificationStateProvider } from '@greeneggs/providers/notification-state-provider'
+import { SearchStateProvider } from '@greeneggs/providers/search-state-provider'
+import { UserStateProvider } from '@greeneggs/providers/user-state-provider'
 
 export default function App(): ReactElement {
   return (

src/navigation/bottom-tab-bar.tsx

@@ -14,8 +14,9 @@ import {
 } from '@ui-kitten/components'
 import Svg, { Circle } from 'react-native-svg'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { AddRecipeContext, NotificationContext } from '@greeneggs/providers'
 import { HideOnKeyboard } from '@greeneggs/ui'
+import { NotificationContext } from '@greeneggs/providers/notification-state-provider'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 const styles = StyleSheet.create({
   primary: {

src/navigation/utils.ts

@@ -2,9 +2,9 @@
  * Author: Edward Jones
  */
 import { useContext } from 'react'
-import { UserContext } from '@greeneggs/providers'
 import { useNavigation } from '@react-navigation/core'
 import { LoggedInNavigationProp } from './routes/logged-in-routes'
+import { UserContext } from '@greeneggs/providers/user-state-provider'
 
 type NavigateToProfile = (userId: string) => void
 
@@ -18,7 +18,7 @@ export function useNavigateToProfile(): NavigateToProfile {
 
   function navigateToMyProfile() {
     navigation.reset({
-      routes: [{ name: 'Home' }],
+      routes: [{ name: 'Navigation' }],
     })
     navigation.navigate('MyProfile', { index: 4 })
   }

src/screens/add-recipe/add-recipe-allergies/create-allergy.tsx

@@ -13,8 +13,8 @@ import {
   Sort,
 } from '@greeneggs/types/graphql'
 import { Queries } from '@greeneggs/graphql'
-import { AddRecipeContext } from '@greeneggs/providers'
 import { useNavigation } from '@react-navigation/core'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 /**
  * Screen with an infinite scrolling alphabetised list of allergies that

src/screens/add-recipe/add-recipe-allergies/index.tsx

@@ -6,8 +6,8 @@ import { ListItem } from '@ui-kitten/components'
 import { Icons } from '@greeneggs/ui'
 import { AddRecipePartTemplate } from '../add-recipe-part-template'
 import { useNavigation } from '@react-navigation/native'
-import { AddRecipeContext } from '@greeneggs/providers'
 import { LoggedInNavigationProp } from '@greeneggs/navigation/routes/logged-in-routes'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 /**
  * Screen that shows a list of all allergies that will

src/screens/add-recipe/add-recipe-categories/index.tsx

@@ -7,8 +7,8 @@ import { Icons } from '@greeneggs/ui'
 
 import { AddRecipePartTemplate } from '../add-recipe-part-template'
 import { useNavigation } from '@react-navigation/native'
-import { AddRecipeContext } from '@greeneggs/providers'
 import { LoggedInNavigationProp } from '@greeneggs/navigation/routes/logged-in-routes'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 /**
  * Screen that shows a list of all selected categories that will

src/screens/add-recipe/add-recipe-categories/pick-category.tsx

@@ -13,9 +13,9 @@ import {
 } from '@greeneggs/types/graphql'
 import { Button, Divider, ListItem } from '@ui-kitten/components'
 import { Queries } from '@greeneggs/graphql'
-import { AddRecipeContext } from '@greeneggs/providers'
 import { useNavigation } from '@react-navigation/core'
 import { toTitleCase } from '@greeneggs/utils'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 /**
  * Screen with an infinite scrolling alphabetised list of categories that

src/screens/add-recipe/add-recipe-diets/create-diet.tsx

@@ -6,8 +6,8 @@ import { Divider, ListItem } from '@ui-kitten/components'
 import { AlphabetType, Background, Icons, Input, LazyListAlpha, TopNavigation } from '@greeneggs/ui'
 import { DietInput, Diets, DietsVariables, Diets_diets_data, RecipeFilter, Sort } from '@greeneggs/types/graphql'
 import { Queries } from '@greeneggs/graphql'
-import { AddRecipeContext } from '@greeneggs/providers'
 import { useNavigation } from '@react-navigation/core'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 /**
  * Screen that lets a user select a diet from an infinite scrolling alphabetised list

src/screens/add-recipe/add-recipe-diets/index.tsx

@@ -7,8 +7,8 @@ import { Icons } from '@greeneggs/ui'
 
 import { AddRecipePartTemplate } from '../add-recipe-part-template'
 import { useNavigation } from '@react-navigation/native'
-import { AddRecipeContext } from '@greeneggs/providers'
 import { LoggedInNavigationProp } from '@greeneggs/navigation/routes/logged-in-routes'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 /**
  * Screen that shows a list of all selected diets that will

src/screens/add-recipe/add-recipe-directions/create-step.tsx

@@ -8,8 +8,8 @@ import { RecipeStepInput } from '@greeneggs/types/graphql'
 import { useForm } from 'react-hook-form'
 import { addRecipeStyles } from '../add-recipe-styles'
 import { useNavigation } from '@react-navigation/core'
-import { AddRecipeContext } from '@greeneggs/providers'
 import { ScrollView } from 'react-native'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 /**
  * Screen that lets a user create a new step. Includes an image and a description.

src/screens/add-recipe/add-recipe-directions/index.tsx

@@ -10,8 +10,8 @@ import { Icons } from '@greeneggs/ui'
 import { RecipeForm } from '../add-recipe'
 import { AddRecipePartTemplate } from '../add-recipe-part-template'
 import { useNavigation } from '@react-navigation/core'
-import { AddRecipeContext } from '@greeneggs/providers'
 import { LoggedInNavigationProp } from '@greeneggs/navigation/routes/logged-in-routes'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 interface IAddRecipeDirections {
   form: RecipeForm

src/screens/add-recipe/add-recipe-ingredients/add-ingredient-details.tsx

@@ -8,9 +8,9 @@ import { IngredientInput } from '@greeneggs/types/graphql'
 import { useForm } from 'react-hook-form'
 import { View } from 'react-native'
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/core'
-import { AddRecipeContext } from '@greeneggs/providers'
 import { addRecipeStyles } from '../add-recipe-styles'
 import { LoggedInNavigationProp, LoggedInRouteParams } from '@greeneggs/navigation/routes/logged-in-routes'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 /**
  * Screen for adding details to a selected ingredient, including

src/screens/add-recipe/add-recipe-ingredients/index.tsx

@@ -8,7 +8,7 @@ import { useEffect } from 'react'
 import { AddRecipePartTemplate } from '../add-recipe-part-template'
 import { RecipeForm } from '../add-recipe'
 import { useNavigation } from '@react-navigation/native'
-import { AddRecipeContext } from '@greeneggs/providers'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 import { LoggedInNavigationProp } from '@greeneggs/navigation/routes/logged-in-routes'
 
 interface ICreateRecipeIngredients {

src/screens/add-recipe/add-recipe.tsx

@@ -9,10 +9,10 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { Icons, IForm, Background } from '@greeneggs/ui'
 import { Stepper } from './stepper'
 import { addRecipeStyles } from './add-recipe-styles'
-import { AddRecipeContext } from '@greeneggs/providers'
 import { LoadingScreen } from '../loading-screen'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
+import { AddRecipeContext } from '@greeneggs/providers/add-recipe-state-provider'
 
 export type RecipeForm = IForm<RecipeInput, addRecipe, addRecipeVariables>
 

src/screens/auth/login.tsx

@@ -27,19 +27,30 @@ const styles = StyleSheet.create({
  * Screen that enables a user to log into Green Eggs with an email and password.
  */
 export function Login(): ReactElement {
-  const { formResult, handleSubmit, control, submitForm } = useLoginForm()
+  const {
+    formResult,
+    handleSubmit,
+    control,
+    submitForm,
+    formState: { isValid, errors },
+  } = useLoginForm({ reValidateMode: 'onChange' })
   const { setToken } = useContext(AuthContext)
 
-  async function onSubmit() {
+  async function submitLoginForm() {
     const result = await submitForm()
     const token = result.data?.login.data?.token
     const error = result.data?.login.error
-    if (token && !error) {
+    if (error) {
+      throw new Error(error.message)
+    }
+    if (token) {
       void SecureStore.setItemAsync('token', token)
       setToken && setToken(token)
     }
   }
 
+  console.log(errors)
+
   return (
     <AuthPageTemplate
       errorMessage={formResult.data?.login.error?.message}
@@ -69,8 +80,8 @@ export function Login(): ReactElement {
         type={InputType.PASSWORD}
       />
       <Button
-        onPress={() => void handleSubmit(onSubmit)}
-        disabled={formResult.loading}
+        onPress={() => void handleSubmit(submitLoginForm)}
+        disabled={formResult.loading || !isValid}
         accessoryLeft={formResult.loading ? () => <Spinner size='small' /> : undefined}
       >
         LOGIN

src/screens/auth/use-login-form.tsx

@@ -4,9 +4,10 @@
 import { IForm, useForm } from '@greeneggs/ui'
 import { login, loginVariables, LoginInput } from '@greeneggs/types/graphql'
 import { Mutations } from '@greeneggs/graphql'
+import { UseFormProps } from 'react-hook-form'
 
 /**
  * Hook that sets up a login form with our custom useForm hook
  */
-export const useLoginForm = (): IForm<LoginInput, login, loginVariables> =>
-  useForm<LoginInput, login, loginVariables>(Mutations.login, 'loginDetails')
+export const useLoginForm = (args: UseFormProps<LoginInput>): IForm<LoginInput, login, loginVariables> =>
+  useForm<LoginInput, login, loginVariables>(Mutations.login, 'loginDetails', undefined, args)

src/screens/notifications/index.tsx

@@ -19,8 +19,8 @@ import Svg, { Circle } from 'react-native-svg'
 import { GestureResponderEvent, View } from 'react-native'
 import { useNavigation } from '@react-navigation/core'
 import { useMutation } from '@apollo/client'
-import { NotificationContext } from '@greeneggs/providers'
 import { LoggedInNavigationProp } from '@greeneggs/navigation/routes/logged-in-routes'
+import { NotificationContext } from '@greeneggs/providers/notification-state-provider'
 
 type NotificationListItemProps = ListItemProps & notifications_notifications_data
 

src/screens/recipe/recipe-comment.tsx

@@ -13,8 +13,8 @@ import { useNavigation } from '@react-navigation/core'
 import { StackNavigationProp } from '@react-navigation/stack'
 import { useMutation } from '@apollo/client'
 
-import { UserContext } from '@greeneggs/providers'
 import { useNavigateToProfile } from '@greeneggs/navigation'
+import { UserContext } from '@greeneggs/providers/user-state-provider'
 
 const styles = StyleSheet.create({
   avatar: {

src/screens/recipe/recipe.tsx

@@ -16,11 +16,11 @@ import { RecipeDirections } from './recipe-directions'
 import { RecipeCommentList } from './recipe-comment-list'
 import { LoadingScreen } from '../loading-screen'
 import { RecipeAddComment } from './recipe-add-comment'
-import { TopNavigation, Background, ViewMore, SaveRecipeButton, EmptyState, Select } from '@greeneggs/ui'
+import { TopNavigation, Background, SaveRecipeButton, EmptyState, Select } from '@greeneggs/ui'
 import { RecipeMoreButton } from './recipe-more-button'
-import { UserContext } from '@greeneggs/providers'
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native'
 import { LoggedInNavigationProp, LoggedInRouteParams } from '@greeneggs/navigation/routes/logged-in-routes'
+import { UserContext } from '@greeneggs/providers/user-state-provider'
 
 const styles = StyleSheet.create({
   coverPhoto: {

src/screens/search/common/top-bar.tsx

@@ -6,13 +6,13 @@ import { Button, Icon, ThemedComponentProps, TopNavigationAction } from '@ui-kit
 import { Input, Icons } from '@greeneggs/ui'
 import { StyleSheet, View, Image } from 'react-native'
 
-import { SearchContext } from '@greeneggs/providers'
 import { useNavigation } from '@react-navigation/native'
 import { logo } from '@greeneggs/assets'
 
 import { countActiveFilters } from '../recipe-search-filter'
 import { CountCircle } from './count-circle'
 import { LoggedInNavigationProp } from '@greeneggs/navigation/routes/logged-in-routes'
+import { SearchContext } from '@greeneggs/providers/search-state-provider'
 
 const styles = StyleSheet.create({
   topNavigation: {

src/ui/counters/comment-like-counter.tsx

@@ -5,8 +5,8 @@ import React, { useContext } from 'react'
 import { useMutation } from '@apollo/client'
 import { Mutations } from '@greeneggs/graphql'
 import { LikeRecipe, UnlikeRecipe } from '@greeneggs/types/graphql'
-import { UserContext } from '@greeneggs/providers'
 import { LikeCounter } from './like-counter'
+import { UserContext } from '@greeneggs/providers/user-state-provider'
 
 interface CommentLikeCounterProps {
   likeCount: number

src/ui/counters/recipe-like-counter.tsx

@@ -5,8 +5,8 @@ import React, { useContext } from 'react'
 import { useMutation } from '@apollo/client'
 import { Mutations } from '@greeneggs/graphql'
 import { LikeRecipe, UnlikeRecipe } from '@greeneggs/types/graphql'
-import { UserContext } from '@greeneggs/providers'
 import { LikeCounter } from './like-counter'
+import { UserContext } from '@greeneggs/providers/user-state-provider'
 
 interface RecipeLikeCounterProps {
   likeCount: number