Merge branch 'release/v2.6.1'

.env.local.example

@@ -1,5 +1,5 @@
 NEXT_PUBLIC_API_NAME = "Loan Facilities Dashboard"
-NEXT_PUBLIC_API_VERSION = "2.6.0"
+NEXT_PUBLIC_API_VERSION = "2.6.1"
 NEXT_PUBLIC_DEFAULT_LANGUAGE = "fa"
 NEXT_PUBLIC_DEFAULT_DIRECTION = "rtl"
 

public/locales/fa/app.json

@@ -69,6 +69,7 @@
   "secondary": {
     "passenger-boss": "کارگروه",
     "refahi-province-manager": "رفاهی",
+    "loan-followup": "ناوگان",
     "refahi-loan-management": "رفاهی",
     "navgan-loan-management": "ناوگان",
     "navgan-province-manager": "ناوگان",

src/components/dashboard/loan-followup/TableRowActions.jsx

@@ -4,10 +4,14 @@ import ReferPassengerBoss from "@/components/dashboard/loan-followup/Form/ReferP
 const TableRow = ({row, mutate}) => {
     return (
         <Box sx={{display: "flex", flexWrap: "nowrap", gap: "8px"}}>
-            <ReferPassengerBoss
-                rowId={row.getValue("id")}
-                mutate={mutate}
-            />
+            {
+                row.original.state_id === 11 || row.original.state_id === 16 ? (
+                    <ReferPassengerBoss
+                        rowId={row.getValue("id")}
+                        mutate={mutate}
+                    />
+                ) : null
+            }
         </Box>
     );
 };

src/core/data/sidebarMenu.jsx

@@ -46,15 +46,6 @@ const sidebarMenu = [
             selected: false,
             permissions: ["view_navgan_loans", "view_navgan_loans_province"],
         },
-        {
-            key: "sidebar.loan-followup",
-            name: "loan-followup",
-            type: "page",
-            route: "/dashboard/loan-followup",
-            icon: <RepeatIcon sx={{width: 'inherit', height: 'inherit'}}/>,
-            selected: false,
-            permissions: ["manage_vezarat_eghtesad_loans"], //permission should change
-        },
     ], [
         {
             key: "sidebar.reserve-loan",
@@ -107,6 +98,16 @@ const sidebarMenu = [
             selected: false,
             permissions: ["tracking_bank_loans"],
         },
+        {
+            key: "sidebar.loan-followup",
+            secondary: "secondary.loan-followup",
+            name: "loan-followup",
+            type: "page",
+            route: "/dashboard/loan-followup",
+            icon: <RepeatIcon sx={{width: 'inherit', height: 'inherit'}}/>,
+            selected: false,
+            permissions: ["manage_vezarat_eghtesad_loans"], //permission should change
+        },
         {
             key: "sidebar.navgan-loan-management",
             secondary: "secondary.navgan-loan-management",