From 6d25567535cdd25042f75cc07e20e790004f70c8 Mon Sep 17 00:00:00 2001
From: hiba9201 <pelevina.2000@mail.ru>
Date: Mon, 4 Sep 2023 00:55:21 +0500
Subject: [PATCH] a-chabin review

---
 .../StopsList/Item/MapStopsSidebarStopsListItem.tsx      | 9 +++++----
 .../Stops/Sidebar/StopsList/MapStopsSidebarStopsList.tsx | 2 +-
 .../Map/Vehicles/Sidebar/MapVehiclesSidebar.tsx          | 9 +++++----
 common/types/strapi.ts                                   | 4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/client/components/Map/Stops/Sidebar/StopsList/Item/MapStopsSidebarStopsListItem.tsx b/client/components/Map/Stops/Sidebar/StopsList/Item/MapStopsSidebarStopsListItem.tsx
index 6915fa9a..683bee3c 100644
--- a/client/components/Map/Stops/Sidebar/StopsList/Item/MapStopsSidebarStopsListItem.tsx
+++ b/client/components/Map/Stops/Sidebar/StopsList/Item/MapStopsSidebarStopsListItem.tsx
@@ -63,10 +63,11 @@ export function MapStopsSidebarStopsListItem({ vehicle }: MapStopsSidebarStopsLi
                 [styles.MapStopsSidebarVehicle_isSelected]: currentVehicleRoute === vehicle.route,
             })}
             onClick={setSelectedVehicle}
-            style={{
-                // @ts-ignore
-                '--vehicle-color': VEHICLE_TYPE_COLORS[vehicle.type],
-            }}
+            style={
+                {
+                    '--vehicle-color': VEHICLE_TYPE_COLORS[vehicle.type],
+                } as React.CSSProperties
+            }
         >
             <div className={cn(styles.MapStopsSidebarVehicleInfo)}>
                 <div className={cn(styles.MapStopsSidebarVehicleRoute)}>{vehicle.route}</div>
diff --git a/client/components/Map/Stops/Sidebar/StopsList/MapStopsSidebarStopsList.tsx b/client/components/Map/Stops/Sidebar/StopsList/MapStopsSidebarStopsList.tsx
index 5439a65f..e3b28c01 100644
--- a/client/components/Map/Stops/Sidebar/StopsList/MapStopsSidebarStopsList.tsx
+++ b/client/components/Map/Stops/Sidebar/StopsList/MapStopsSidebarStopsList.tsx
@@ -23,7 +23,7 @@ export function MapStopsSidebarStopsList() {
             ))}
             {stopInfo.length === 0 && (
                 <Typography variant="h4">
-                    {t('О нет! В ближайшее время транспорта тут не будет')}
+                    {t('О, нет! В ближайшее время транспорта тут не будет')}
                 </Typography>
             )}
         </MapStopsSidebarRow>
diff --git a/client/components/Map/Vehicles/Sidebar/MapVehiclesSidebar.tsx b/client/components/Map/Vehicles/Sidebar/MapVehiclesSidebar.tsx
index 4ec00abe..d225a794 100644
--- a/client/components/Map/Vehicles/Sidebar/MapVehiclesSidebar.tsx
+++ b/client/components/Map/Vehicles/Sidebar/MapVehiclesSidebar.tsx
@@ -224,10 +224,11 @@ export function MapVehiclesSidebar({
     return (
         <div
             className={cn(styles.MapVehiclesSidebar)}
-            style={{
-                // @ts-ignore
-                '--vehicle-color': VEHICLE_TYPE_COLORS[type],
-            }}
+            style={
+                {
+                    '--vehicle-color': VEHICLE_TYPE_COLORS[type],
+                } as React.CSSProperties
+            }
         >
             <div className={cn(styles.MapVehiclesSidebarWrapper)}>
                 {unitInfo?.image.data && (
diff --git a/common/types/strapi.ts b/common/types/strapi.ts
index 362337f5..a8539a5d 100644
--- a/common/types/strapi.ts
+++ b/common/types/strapi.ts
@@ -6,9 +6,9 @@ export enum StrapiContentTypes {
     UnitInfo = 'unit-info',
 }
 
-export interface StrapiBase<A> {
+export interface StrapiBase<AttributesType> {
     id: number;
-    attributes: A;
+    attributes: AttributesType;
 }
 
 export type StrapiStop = StrapiBase<Stop>;