rebase with main

Signed-off-by: fc-santos <[email protected]>
openwallet-foundation · Feb 22, 2025 · 810b365 · 810b365
2 parents 63681ac + 92e40d3
commit 810b365
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/legacy/core/App/contexts/tour/tour-provider.tsx b/packages/legacy/core/App/contexts/tour/tour-provider.tsx
@@ -110,7 +110,7 @@ const TourProviderComponent = (props: TourProviderProps, ref: Ref<Tour>) => {
   }, [renderStep, currentStep])
 
   const tourStep = useMemo((): TourStep => {
-    return tours[currentTour]?.[currentStep ?? 0] ?? { Render: () => <></> }
+    return tours?.[currentTour]?.[currentStep ?? 0] ?? { Render: () => <></> }
   }, [currentTour, currentStep, tours])
 
   const tour = useMemo(

diff --git a/packages/legacy/core/App/screens/ContactDetails.tsx b/packages/legacy/core/App/screens/ContactDetails.tsx
@@ -163,9 +163,10 @@ const ContactDetails: React.FC<ContactDetailsProps> = ({ route }) => {
 
       await agent.connections.deleteById(connection.id)
 
-      navigation.navigate(Screens.Contacts)
+      navigation.popToTop()
 
-      // FIXME: This delay is a hack so that the toast doesn't appear until the modal is dismissed
+      // FIXME: This delay is a hack so that the toast doesn't
+      // appear until the modal is dismissed
       await new Promise((resolve) => setTimeout(resolve, 1000))
 
       Toast.show({