finish upgrade fixes

JClackett · JClackett · commit 51ac53971daa · 2024-01-22T15:10:46.000+01:00
diff --git a/apps/app/src/app/(home)/(timeline)/[id]/delete.tsx b/apps/app/src/app/(home)/(timeline)/[id]/delete.tsx
@@ -16,12 +16,12 @@ export default function DeleteTask() {
 
   const onSuccess = () => {
     void utils.task.timeline.refetch({ daysBack, daysForward })
-    router.push("/")
+    router.back()
   }
   const deleteTask = api.task.delete.useMutation({ onSuccess })
   const deleteFutureTasks = api.task.delete.useMutation({ onSuccess })
   const handleDelete = (shouldDeleteFuture: boolean) => {
-    if (!id) return router.push("/")
+    if (!id) return router.back()
     if (!shouldDeleteFuture) return deleteTask.mutate({ id: id as string })
     return deleteFutureTasks.mutate({ id: id as string, shouldDeleteFuture })
   }
diff --git a/apps/app/src/app/(home)/(timeline)/[id]/index.tsx b/apps/app/src/app/(home)/(timeline)/[id]/index.tsx
@@ -57,14 +57,14 @@ function EditTaskForm({ task }: { task: Task }) {
 
   const update = api.task.update.useMutation({
     onSuccess: (updatedTask) => {
-      utils.task.timeline.setData({ daysBack, daysForward }, (old) => {
-        if (!old) return old
-        return old.map((t) =>
-          t.id === task.id
-            ? { ...t, ...updatedTask, date: dayjs(updatedTask.date!).startOf("day").add(12, "hours").format("YYYY-MM-DD") }
-            : t,
-        )
-      })
+      const date = updatedTask.date
+      if (date) {
+        utils.task.timeline.setData({ daysBack, daysForward }, (old) => {
+          if (!old) return old
+          // gota keep the old order as thats never manually updated
+          return old.map((t) => (t.id === task.id ? { ...t, ...updatedTask, order: t.order, date } : t))
+        })
+      }
       utils.task.byId.setData({ id: task.id }, updatedTask)
       router.back()
     },
diff --git a/apps/app/src/app/(home)/(timeline)/backlog.tsx b/apps/app/src/app/(home)/(timeline)/backlog.tsx
@@ -100,7 +100,7 @@ function TaskItem({ task }: { task: RouterOutputs["task"]["backlog"][number] })
       <View className="flex flex-1 flex-row space-x-2 p-3">
         <TouchableOpacity
           onLongPress={handleOpenMenu}
-          onPress={() => router.push({ pathname: "index", params: { id: task.id } })}
+          onPress={() => router.navigate({ pathname: "/[id]", params: { id: task.id } })}
           className="flex-1 flex-row justify-between"
         >
           <Text
diff --git a/apps/app/src/app/(home)/(timeline)/elements/[elementId]/_layout.tsx b/apps/app/src/app/(home)/(timeline)/elements/[elementId]/_layout.tsx
@@ -5,10 +5,12 @@ import { useBackgroundColor } from "~/lib/tailwind"
 export default function ElementsLayout() {
   const backgroundColor = useBackgroundColor()
   return (
-    <Stack initialRouteName="index" screenOptions={{ contentStyle: { backgroundColor }, headerShown: false }}>
+    <Stack
+      initialRouteName="index"
+      screenOptions={{ contentStyle: { backgroundColor }, headerShown: false, presentation: "modal" }}
+    >
       <Stack.Screen name="index" />
-
-      <Stack.Screen name="move" options={{ presentation: "modal" }} />
+      <Stack.Screen name="move" />
     </Stack>
   )
 }
diff --git a/apps/app/src/app/(home)/(timeline)/elements/[elementId]/index.tsx b/apps/app/src/app/(home)/(timeline)/elements/[elementId]/index.tsx
@@ -25,7 +25,7 @@ export default function ElementDetail() {
       if (router.canGoBack()) {
         router.back()
       } else {
-        router.replace("/")
+        router.navigate("/")
       }
     },
   })
diff --git a/apps/app/src/app/(home)/(timeline)/elements/[elementId]/move.tsx b/apps/app/src/app/(home)/(timeline)/elements/[elementId]/move.tsx
@@ -18,7 +18,7 @@ export default function ElementsDetailMove() {
     onSuccess: () => {
       void utils.element.grouped.refetch()
       if (router.canGoBack()) return router.back()
-      void router.replace("/elements")
+      void router.navigate("/elements")
     },
   })
   return (
diff --git a/apps/app/src/app/(home)/(timeline)/elements/create.tsx b/apps/app/src/app/(home)/(timeline)/elements/create.tsx
@@ -1,5 +1,5 @@
 import { ScrollView } from "react-native"
-import { AllRoutes, Href, useGlobalSearchParams, useRouter } from "expo-router"
+import { type AllRoutes, useGlobalSearchParams, useRouter } from "expo-router"
 
 import { ElementForm } from "~/components/ElementForm"
 import { ModalView } from "~/components/ModalView"
@@ -15,8 +15,8 @@ export default function CreateElement() {
     onSuccess: async (data) => {
       void utils.element.grouped.refetch()
       await utils.element.all.refetch()
-      // if (!redirect) return router.back()
-      router.replace({ pathname: redirect as Href<AllRoutes>, params: { ...params, elementId: data.id } })
+      if (!redirect) return router.back()
+      router.navigate({ pathname: redirect as AllRoutes, params: { ...params, elementId: data.id } })
     },
   })
 
diff --git a/apps/app/src/app/(home)/(timeline)/elements/index.tsx b/apps/app/src/app/(home)/(timeline)/elements/index.tsx
@@ -55,11 +55,6 @@ function ElementItem({ element }: { element: RouterOutputs["element"]["grouped"]
       void utils.element.all.refetch()
       void utils.element.grouped.refetch()
       void utils.task.timeline.refetch({ daysBack, daysForward })
-      if (router.canGoBack()) {
-        router.back()
-      } else {
-        router.replace("/")
-      }
     },
   })
   const { showActionSheetWithOptions } = useActionSheet()
@@ -77,7 +72,7 @@ function ElementItem({ element }: { element: RouterOutputs["element"]["grouped"]
           break
         case 1:
           // Edit
-          router.push({ pathname: `/(home)/(timeline)/elements/[elementId]/`, params: { elementId: element.id } })
+          router.push(`/elements/${element.id}/`)
           break
         case 2:
           // Move
@@ -93,7 +88,7 @@ function ElementItem({ element }: { element: RouterOutputs["element"]["grouped"]
   return (
     <View>
       <TouchableOpacity
-        onPress={() => router.push({ pathname: `/(home)/(timeline)/elements/[elementId]/`, params: { elementId: element.id } })}
+        onPress={() => router.push(`/elements/${element.id}/`)}
         onLongPress={handleOpenMenu}
         activeOpacity={0.7}
         className="flex flex-row items-center space-x-2 py-1"
diff --git a/apps/app/src/app/(home)/(timeline)/elements/select.tsx b/apps/app/src/app/(home)/(timeline)/elements/select.tsx
@@ -1,7 +1,7 @@
 import * as React from "react"
 import { ActivityIndicator, Pressable, ScrollView, View } from "react-native"
 import dayjs from "dayjs"
-import { useGlobalSearchParams, useRouter } from "expo-router"
+import { type AllRoutes, useGlobalSearchParams, useRouter } from "expo-router"
 import { matchSorter } from "match-sorter"
 
 import { join } from "@element/shared"
@@ -29,7 +29,7 @@ export default function SelectElement() {
   const router = useRouter()
   const onSelect = (element: { id: string; color: string; name: string }) => {
     if (!redirect) return router.back()
-    router.push({ pathname: redirect as string, params: { ...params, elementId: element.id } })
+    router.navigate({ pathname: redirect as AllRoutes, params: { ...params, elementId: element.id } })
   }
   return (
     <ModalView title="Select element">
diff --git a/apps/app/src/app/(home)/(timeline)/repeat-select.tsx b/apps/app/src/app/(home)/(timeline)/repeat-select.tsx
@@ -1,5 +1,5 @@
 import { ScrollView, TouchableOpacity } from "react-native"
-import { useGlobalSearchParams, useRouter } from "expo-router"
+import { type AllRoutes, useGlobalSearchParams, useRouter } from "expo-router"
 
 import { type TaskRepeat } from "@element/database/types"
 import { join } from "@element/shared"
@@ -14,7 +14,7 @@ export default function RepeatSelect() {
 
   const handleTo = (repeat: TaskRepeat) => {
     if (!redirect) return router.back()
-    router.push({ params: { ...params, repeat }, pathname: redirect as string })
+    router.navigate({ params: { ...params, repeat }, pathname: redirect as AllRoutes })
   }
 
   return (
diff --git a/apps/app/src/app/(home)/habits/index.tsx b/apps/app/src/app/(home)/habits/index.tsx
@@ -288,6 +288,7 @@ function HabitItem({ habit, isComplete, positions }: { positions: SharedValue<Po
 
   const handleUpdateOrder = () => {
     if (!positions.value) return
+    if (positions.value[habit.id]?.order === habit.order) return
     const data = Object.values(positions.value).map((habit) => ({ id: habit.id, order: habit.order }))
     mutate(data)
   }
@@ -367,7 +368,7 @@ function HabitItem({ habit, isComplete, positions }: { positions: SharedValue<Po
   return (
     <Animated.View style={styles}>
       <GestureDetector gesture={gesture}>
-        <View style={{ height: HABIT_HEIGHT }} className="w-full px-4 py-1">
+        <TouchableOpacity activeOpacity={0.7} style={{ height: HABIT_HEIGHT }} className="w-full px-4 py-1">
           <View className="flex h-full w-full flex-row items-center justify-between rounded border border-gray-100 bg-white p-3 px-4 dark:border-gray-700 dark:bg-black">
             <Text className="text-lg">{habit.name}</Text>
 
@@ -394,7 +395,7 @@ function HabitItem({ habit, isComplete, positions }: { positions: SharedValue<Po
               </View>
             </View>
           </View>
-        </View>
+        </TouchableOpacity>
       </GestureDetector>
     </Animated.View>
   )
diff --git a/apps/app/src/app/(home)/profile/features.tsx b/apps/app/src/app/(home)/profile/features.tsx
@@ -5,8 +5,8 @@ import colors from "@element/tailwind-config/src/colors"
 import { ScreenView } from "~/components/ScreenView"
 import { Text } from "~/components/Text"
 import { useFeatures } from "~/lib/hooks/useFeatures"
-import { api } from "~/lib/utils/api"
 import { useMe } from "~/lib/hooks/useMe"
+import { api } from "~/lib/utils/api"
 
 export default function Features() {
   const { features, toggle } = useFeatures()
diff --git a/apps/app/src/app/(home)/profile/index.tsx b/apps/app/src/app/(home)/profile/index.tsx
@@ -2,7 +2,7 @@ import { ScrollView, TouchableOpacity, View } from "react-native"
 import { SafeAreaView } from "react-native-safe-area-context"
 import AsyncStorage from "@react-native-async-storage/async-storage"
 import { useQueryClient } from "@tanstack/react-query"
-import { Link, Href, AllRoutes } from "expo-router"
+import { type AllRoutes, type Href, Link } from "expo-router"
 import { ChevronRight } from "lucide-react-native"
 
 import { createImageUrl, join } from "@element/shared"
diff --git a/apps/app/src/app/(home)/profile/plan.tsx b/apps/app/src/app/(home)/profile/plan.tsx
@@ -8,7 +8,7 @@ import { Text } from "~/components/Text"
 import { api } from "~/lib/utils/api"
 
 export default function Plan() {
-  const { data, isLoading } = api.user.myPlan.useQuery()
+  const { data, isLoading } = api.user.myPlan.useQuery(undefined, { cacheTime: 30000 })
   const discountedPlanAmount = data?.subscription?.discountPercent ? 4 - (4 * 100) / data.subscription.discountPercent : null
   return (
     <ScreenView title="Plan">
diff --git a/apps/app/src/app/_layout.tsx b/apps/app/src/app/_layout.tsx
@@ -4,13 +4,13 @@ import { GestureHandlerRootView } from "react-native-gesture-handler"
 import { SafeAreaProvider } from "react-native-safe-area-context"
 import { ActionSheetProvider } from "@expo/react-native-action-sheet"
 import { Poppins_400Regular, Poppins_600SemiBold, Poppins_700Bold, Poppins_900Black, useFonts } from "@expo-google-fonts/poppins"
+import * as Sentry from "@sentry/react-native"
 import dayjs from "dayjs"
 import { Stack } from "expo-router"
 import * as SplashScreen from "expo-splash-screen"
 import { StatusBar } from "expo-status-bar"
 import { useColorScheme as useNWColorScheme } from "nativewind"
 import { PostHogProvider, usePostHog } from "posthog-react-native"
-import * as Sentry from "@sentry/react-native"
 
 import { Toast } from "../components/Toast"
 import { IS_PRODUCTION } from "../lib/config"
diff --git a/apps/app/src/components/ModalView.tsx b/apps/app/src/components/ModalView.tsx
@@ -29,7 +29,7 @@ export function ModalView(props: Props) {
           {props.title ? <Heading className="text-2xl">{props.title}</Heading> : <Text />}
 
           <TouchableOpacity
-            onPress={props.onBack ? props.onBack : canGoBack ? router.back : () => router.replace("/")}
+            onPress={props.onBack ? props.onBack : canGoBack ? router.back : () => router.navigate("/")}
             className="p-2"
           >
             <Icon icon={X} size={24} />
diff --git a/apps/app/src/components/ScreenView.tsx b/apps/app/src/components/ScreenView.tsx
@@ -18,11 +18,7 @@ export function ScreenView(props: Props) {
   return (
     <SafeAreaView className="flex-1 px-4 pt-2">
       <View className="flex flex-row items-center">
-        <TouchableOpacity
-          activeOpacity={0.7}
-          onPress={canGoBack ? () => router.push("../") : () => router.replace("/")}
-          className="p-2"
-        >
+        <TouchableOpacity activeOpacity={0.7} onPress={canGoBack ? router.back : () => router.navigate("/")} className="p-2">
           <Icon icon={ChevronLeft} size={24} />
         </TouchableOpacity>
 
diff --git a/apps/app/src/components/TaskForm.tsx b/apps/app/src/components/TaskForm.tsx
diff --git a/apps/app/src/lib/hooks/useCheckExpoUpdates.tsx b/apps/app/src/lib/hooks/useCheckExpoUpdates.tsx

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ export default function DeleteTask() {`
`16`	`16`
`17`	`17`	`const onSuccess = () => {`
`18`	`18`	`void utils.task.timeline.refetch({ daysBack, daysForward })`
`19`		`- router.push("/")`
	`19`	`+ router.back()`
`20`	`20`	`}`
`21`	`21`	`const deleteTask = api.task.delete.useMutation({ onSuccess })`
`22`	`22`	`const deleteFutureTasks = api.task.delete.useMutation({ onSuccess })`
`23`	`23`	`const handleDelete = (shouldDeleteFuture: boolean) => {`
`24`		`- if (!id) return router.push("/")`
	`24`	`+ if (!id) return router.back()`
`25`	`25`	`if (!shouldDeleteFuture) return deleteTask.mutate({ id: id as string })`
`26`	`26`	`return deleteFutureTasks.mutate({ id: id as string, shouldDeleteFuture })`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ function TaskItem({ task }: { task: RouterOutputs["task"]["backlog"][number] })`
`100`	`100`	`<View className="flex flex-1 flex-row space-x-2 p-3">`
`101`	`101`	`<TouchableOpacity`
`102`	`102`	`onLongPress={handleOpenMenu}`
`103`		`- onPress={() => router.push({ pathname: "index", params: { id: task.id } })}`
	`103`	`+ onPress={() => router.navigate({ pathname: "/[id]", params: { id: task.id } })}`
`104`	`104`	`className="flex-1 flex-row justify-between"`
`105`	`105`	`>`
`106`	`106`	`<Text`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export default function ElementDetail() {`
`25`	`25`	`if (router.canGoBack()) {`
`26`	`26`	`router.back()`
`27`	`27`	`} else {`
`28`		`- router.replace("/")`
	`28`	`+ router.navigate("/")`
`29`	`29`	`}`
`30`	`30`	`},`
`31`	`31`	`})`