minor fixes

ocadotechnology · Aug 15, 2024 · 4034e35 · 4034e35
1 parent d819bbb
commit 4034e35
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/api/fruit.ts b/src/api/fruit.ts
@@ -22,7 +22,7 @@ export type Fruit = Model<
   {
     name: string
     is_citrus: boolean
-    expires_on: Date
+    expires_on: string
   }
 >
 

diff --git a/src/pages/fruitDetail/FruitDetail.tsx b/src/pages/fruitDetail/FruitDetail.tsx
@@ -51,14 +51,16 @@ const FruitDetail: FC<FruitDetailProps> = () => {
                 <forms.SubmitButton>Update fruit</forms.SubmitButton>
               </Stack>
             </forms.Form>
+          </pages.Section>
+          <pages.Section>
             <Link className="back-to" to={paths.fruits._}>
               fruit list
             </Link>
           </pages.Section>
         </pages.Page>
       )),
     onValidationSuccess: params => {
-      retrieveFruit(params.id)
+      retrieveFruit(params.id, true)
     },
     onValidationError: navigate => {
       navigate(paths.fruits._, {

diff --git a/src/pages/fruitList/FruitList.tsx b/src/pages/fruitList/FruitList.tsx
@@ -30,10 +30,10 @@ const FruitList: FC<FruitListProps> = () => {
         <TablePagination useLazyListQuery={useLazyListFruitsQuery}>
           {fruits =>
             fruits.map(fruit => (
-              <Stack direction="row" key={fruit.id}>
+              <Stack direction="row" key={fruit.id} gap={5}>
                 <Typography fontWeight="bold">{fruit.id}</Typography>
                 <Typography>
-                  : {fruit.name} ({fruit.expires_on.toDateString()})
+                  {fruit.name} ({fruit.expires_on})
                 </Typography>
                 <FormControlLabel
                   control={<Checkbox disabled checked={fruit.is_citrus} />}