From 4a95ed050c2f1f84f0a19c53548effa0f1a6a041 Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Thu, 3 Nov 2022 19:21:19 +1300 Subject: [PATCH] Fix adding new set on fresh installs --- SetList.tsx | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/SetList.tsx b/SetList.tsx index e2f7216..ee54080 100644 --- a/SetList.tsx +++ b/SetList.tsx @@ -3,7 +3,7 @@ import { useFocusEffect, useNavigation, } from '@react-navigation/native' -import {useCallback, useEffect, useState} from 'react' +import {useCallback, useState} from 'react' import {FlatList} from 'react-native' import {List} from 'react-native-paper' import {Like} from 'typeorm' @@ -34,7 +34,9 @@ export default function SetList() { order: {created: 'DESC'}, }) console.log(`${SetList.name}.refresh:`, {newSets}) - setSet(newSets[0]) + const newSet = newSets[0] + delete newSet.id + setSet(newSet) if (newSets.length === 0) return setSets([]) setSets(newSets) setOffset(0) @@ -80,8 +82,18 @@ export default function SetList() { const onAdd = useCallback(async () => { console.log(`${SetList.name}.onAdd`, {set}) const [{now}] = await getNow() - const newSet: GymSet = set || new GymSet() - delete newSet.id + const newSet: GymSet = set || { + created: now, + hidden: false, + image: '', + minutes: 3, + seconds: 30, + name: '', + reps: 0, + sets: 0, + unit: 'kg', + weight: 0, + } newSet.created = now navigation.navigate('EditSet', {set: newSet}) }, [navigation, set])