From 3e392d1f343f2212f67ca5280a4807864ff20204 Mon Sep 17 00:00:00 2001
From: SvenVw <37927107+SvenVw@users.noreply.github.com>
Date: Tue, 21 Apr 2026 15:15:05 +0200
Subject: [PATCH 1/3] feat: Importing fields from RVO with the eHerkenning sign
 in is now available for all users

---
 .changeset/good-peaches-wave.md               |  5 +++
 .../routes/farm.$b_id_farm.$calendar.rvo.tsx  | 38 +------------------
 fdm-app/app/routes/farm.$b_id_farm._index.tsx |  8 +---
 ...arm.create.$b_id_farm.$calendar._index.tsx |  4 +-
 .../farm.create.$b_id_farm.$calendar.rvo.tsx  | 32 +---------------
 fdm-app/app/routes/signin._index.tsx          | 13 +++----
 6 files changed, 15 insertions(+), 85 deletions(-)
 create mode 100644 .changeset/good-peaches-wave.md

diff --git a/.changeset/good-peaches-wave.md b/.changeset/good-peaches-wave.md
new file mode 100644
index 000000000..e75cd6a85
--- /dev/null
+++ b/.changeset/good-peaches-wave.md
@@ -0,0 +1,5 @@
+---
+"@nmi-agro/fdm-app": minor
+---
+
+Importing fields from RVO with the eHerkenning sign in is now available for all users
diff --git a/fdm-app/app/routes/farm.$b_id_farm.$calendar.rvo.tsx b/fdm-app/app/routes/farm.$b_id_farm.$calendar.rvo.tsx
index b904ba0c2..69342d1d0 100644
--- a/fdm-app/app/routes/farm.$b_id_farm.$calendar.rvo.tsx
+++ b/fdm-app/app/routes/farm.$b_id_farm.$calendar.rvo.tsx
@@ -14,8 +14,7 @@ import {
     type UserChoiceMap,
 } from "@nmi-agro/fdm-rvo/types"
 import { getItemId } from "@nmi-agro/fdm-rvo/utils"
-import { AlertTriangle, CloudDownload, Loader2 } from "lucide-react"
-import { useFeatureFlagEnabled } from "posthog-js/react"
+import { AlertTriangle, Loader2 } from "lucide-react"
 import { useEffect, useState } from "react"
 import {
     type ActionFunctionArgs,
@@ -225,8 +224,6 @@ export default function RvoImportReviewPage() {
     const navigation = useNavigation()
     const location = useLocation()
 
-    const isRvoEnabled = useFeatureFlagEnabled("rvo")
-
     const isImporting =
         navigation.state === "submitting" &&
         navigation.formData?.get("intent") === "start_import"
@@ -298,39 +295,6 @@ export default function RvoImportReviewPage() {
     )
     const hasChanges = Object.values(changes).some((count) => count > 0)
 
-    if (isRvoEnabled === false) {
-        return (
-            <SidebarInset>
-                <Header
-                    action={{
-                        to: `/farm/${b_id_farm}`,
-                        label: "Terug naar bedrijf",
-                        disabled: false,
-                    }}
-                >
-                    <HeaderFarm b_id_farm={b_id_farm} farmOptions={farms} />
-                </Header>
-                <FarmContent>
-                    <div className="max-w-2xl mx-auto mt-20 text-center space-y-6">
-                        <div className="bg-primary/10 border border-primary/20 p-8 rounded-xl">
-                            <CloudDownload className="w-12 h-12 text-primary mx-auto mb-4" />
-                            <h2 className="text-2xl font-bold text-foreground mb-2">
-                                Percelen ophalen bij RVO is nog niet beschikbaar
-                                voor je.
-                            </h2>
-                            <p className="text-muted-foreground mb-6">
-                                Deze functionaliteit is momenteel in
-                                ontwikkeling en is nog niet voor iedereen
-                                beschikbaar. Neem contact op met Ondersteuning
-                                als je hier vragen over hebt.
-                            </p>
-                        </div>
-                    </div>
-                </FarmContent>
-            </SidebarInset>
-        )
-    }
-
     if (error) {
         return (
             <SidebarInset>
diff --git a/fdm-app/app/routes/farm.$b_id_farm._index.tsx b/fdm-app/app/routes/farm.$b_id_farm._index.tsx
index 7a784bb25..eec997ce0 100644
--- a/fdm-app/app/routes/farm.$b_id_farm._index.tsx
+++ b/fdm-app/app/routes/farm.$b_id_farm._index.tsx
@@ -25,7 +25,6 @@ import {
     Trash2,
     UserRoundCheck,
 } from "lucide-react"
-import { useFeatureFlagEnabled } from "posthog-js/react"
 import { useState } from "react"
 import {
     data,
@@ -156,7 +155,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
 
 export default function FarmDashboardIndex() {
     const loaderData = useLoaderData<typeof loader>()
-    const isRvoEnabled = useFeatureFlagEnabled("rvo")
 
     const calendar = useCalendarStore((state) => state.calendar)
     const setCalendar = useCalendarStore((state) => state.setCalendar)
@@ -451,10 +449,8 @@ export default function FarmDashboardIndex() {
                                             </CardHeader>
                                         </Card>
                                     </NavLink>
-                                    {loaderData.isRvoConfigured &&
-                                        isRvoEnabled !== false && (
-                                            <NavLink
-                                                to={`${calendar}/rvo`}
+                                    {loaderData.isRvoConfigured && (
+                                            <NavLink                                                to={`${calendar}/rvo`}
                                                 className={cn(
                                                     !loaderData.farmWritePermission &&
                                                         "pointer-events-none opacity-50",
diff --git a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar._index.tsx b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar._index.tsx
index 5723853b3..bcdf80dd2 100644
--- a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar._index.tsx
+++ b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar._index.tsx
@@ -1,6 +1,5 @@
 import { getFarm } from "@nmi-agro/fdm-core"
 import { DownloadCloud, Map as MapIcon, UploadCloud } from "lucide-react"
-import { useFeatureFlagEnabled } from "posthog-js/react"
 import type { LoaderFunctionArgs, MetaFunction } from "react-router"
 import { data, NavLink, useLoaderData } from "react-router"
 import { Header } from "~/components/blocks/header/base"
@@ -64,8 +63,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
 
 export default function ChooseFieldImportMethod() {
     const { farm, isRvoConfigured } = useLoaderData<typeof loader>()
-    const isRvoEnabled = useFeatureFlagEnabled("rvo")
-    const showRvoOption = isRvoConfigured && isRvoEnabled !== false
+    const showRvoOption = isRvoConfigured
 
     return (
         <SidebarInset>
diff --git a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.rvo.tsx b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.rvo.tsx
index e8ea535b8..705adb023 100644
--- a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.rvo.tsx
+++ b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.rvo.tsx
@@ -12,8 +12,7 @@ import type {
     UserChoiceMap,
 } from "@nmi-agro/fdm-rvo/types"
 import { getItemId } from "@nmi-agro/fdm-rvo/utils"
-import { AlertTriangle, CloudDownload, Loader2 } from "lucide-react"
-import { useFeatureFlagEnabled } from "posthog-js/react"
+import { AlertTriangle, Loader2 } from "lucide-react"
 import { useEffect, useState } from "react"
 import {
     type ActionFunctionArgs,
@@ -198,8 +197,6 @@ export default function RvoImportCreatePage() {
     const navigation = useNavigation()
     const location = useLocation()
 
-    const isRvoEnabled = useFeatureFlagEnabled("rvo")
-
     const isImporting =
         navigation.state === "submitting" &&
         navigation.formData?.get("intent") === "start_import"
@@ -249,33 +246,6 @@ export default function RvoImportCreatePage() {
         setUserChoices((prev: UserChoiceMap) => ({ ...prev, [id]: action }))
     }
 
-    if (isRvoEnabled === false) {
-        return (
-            <SidebarInset>
-                <Header action={undefined}>
-                    <HeaderFarmCreate b_name_farm={b_name_farm} />
-                </Header>
-                <FarmContent>
-                    <div className="max-w-2xl mx-auto mt-20 text-center space-y-6">
-                        <div className="bg-primary/10 border border-primary/20 p-8 rounded-xl">
-                            <CloudDownload className="w-12 h-12 text-primary mx-auto mb-4" />
-                            <h2 className="text-2xl font-bold text-foreground mb-2">
-                                Percelen ophalen bij RVO is nog niet beschikbaar
-                                voor je.
-                            </h2>
-                            <p className="text-muted-foreground mb-6">
-                                Deze functionaliteit is momenteel in
-                                ontwikkeling en is nog niet voor iedereen
-                                beschikbaar. Neem contact op met Ondersteuning
-                                als je hier vragen over hebt.
-                            </p>
-                        </div>
-                    </div>
-                </FarmContent>
-            </SidebarInset>
-        )
-    }
-
     if (error) {
         return (
             <SidebarInset>
diff --git a/fdm-app/app/routes/signin._index.tsx b/fdm-app/app/routes/signin._index.tsx
index 8b17cfb7a..07e83979e 100644
--- a/fdm-app/app/routes/signin._index.tsx
+++ b/fdm-app/app/routes/signin._index.tsx
@@ -1296,14 +1296,11 @@ export default function SignIn() {
                                 </h3>
                                 <p className="text-muted-foreground">
                                     Start direct door uw percelen in te lezen
-                                    via een RVO shapefile. Uw percelen staan
-                                    binnen enkele seconden correct op de kaart,
-                                    inclusief het gewas.
-                                </p>
-                                <p className="text-muted-foreground text-sm">
-                                    Binnenkort heeft u ook de mogelijkheid
-                                    direct vanuit RVO percelen te importeren met
-                                    behulp van eHerkenning.
+                                    via een RVO shapefile of direct te
+                                    importeren vanuit RVO met behulp van
+                                    eHerkenning. Uw percelen staan daarmee
+                                    direct goed in de applicatie, inclusief het
+                                    gewas.
                                 </p>
                             </div>
 

From 2fa8a3a1ce221eaebb6239015dcdc51fe1bbfe44 Mon Sep 17 00:00:00 2001
From: SvenVw <37927107+SvenVw@users.noreply.github.com>
Date: Tue, 21 Apr 2026 15:15:58 +0200
Subject: [PATCH 2/3] fix: typo

---
 fdm-app/app/routes/farm.create.$b_id_farm.$calendar.rvo.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.rvo.tsx b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.rvo.tsx
index 705adb023..497c8aeca 100644
--- a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.rvo.tsx
+++ b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.rvo.tsx
@@ -320,7 +320,7 @@ export default function RvoImportCreatePage() {
                             <AlertDescription>
                                 De RVO koppeling is nog niet ingesteld op deze
                                 server. Neem contact op met de beheerder om de
-                                RVO toeggangegevens toe te voegen.
+                                RVO toegangsgegevens toe te voegen.
                             </AlertDescription>
                         </Alert>
                     </div>

From 7a4d7b2df2f1ea685e4708f24c2621496b71e535 Mon Sep 17 00:00:00 2001
From: Sven Verweij <37927107+SvenVw@users.noreply.github.com>
Date: Tue, 21 Apr 2026 16:06:31 +0200
Subject: [PATCH 3/3] Update .changeset/good-peaches-wave.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Signed-off-by: Sven Verweij <37927107+SvenVw@users.noreply.github.com>
---
 .changeset/good-peaches-wave.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/good-peaches-wave.md b/.changeset/good-peaches-wave.md
index e75cd6a85..0c0c9a3bf 100644
--- a/.changeset/good-peaches-wave.md
+++ b/.changeset/good-peaches-wave.md
@@ -2,4 +2,4 @@
 "@nmi-agro/fdm-app": minor
 ---
 
-Importing fields from RVO with the eHerkenning sign in is now available for all users
+Importing fields from RVO with eHerkenning sign-in is now available to all users