From da244adee0f2e298321aaa34d2b30a63a5a245e8 Mon Sep 17 00:00:00 2001
From: ilnaz <237x237@gmail.com>
Date: Sun, 24 Nov 2024 22:37:19 +0300
Subject: [PATCH] fix: Update URL references and conditional checks (#36)

---
 bro.config.js                      | 4 ++--
 src/components/Sidebar/Sidebar.tsx | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bro.config.js b/bro.config.js
index 271e8db..f12638a 100644
--- a/bro.config.js
+++ b/bro.config.js
@@ -14,8 +14,8 @@ module.exports = {
     'dry-wash.main': '/dry-wash',
     'dry-wash.create': '/order',
     'dry-wash.view.order': '/order/:orderId',
-    'dry-wash.arm.master': '/master',
-    'dry-wash.arm.order': '/order',
+    'dry-wash.arm.master': 'master',
+    'dry-wash.arm.order': 'order',
     'dry-wash.arm': '/arm/*',
   },
   features: {
diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx
index 1d32063..0e6a068 100644
--- a/src/components/Sidebar/Sidebar.tsx
+++ b/src/components/Sidebar/Sidebar.tsx
@@ -33,8 +33,8 @@ const Sidebar = () => {
             as={Link}
             to={URLs.armOrder.url}
             w='100%'
-            colorScheme={isActive('orders') ? 'green' : 'blue'}
-            variant={isActive('orders') ? 'solid' : 'ghost'}
+            colorScheme={isActive(URLs.armOrder.url) ? 'green' : 'blue'}
+            variant={isActive(URLs.armOrder.url) ? 'solid' : 'ghost'}
           >
             {t('orders')}
           </Button>
@@ -45,8 +45,8 @@ const Sidebar = () => {
             as={Link}
             to={URLs.armMaster.url}
             w='100%'
-            colorScheme={isActive('masters') ? 'green' : 'blue'}
-            variant={isActive('masters') ? 'solid' : 'ghost'}
+            colorScheme={isActive(URLs.armMaster.url) ? 'green' : 'blue'}
+            variant={isActive(URLs.armMaster.url) ? 'solid' : 'ghost'}
           >
             {t('master')}
           </Button>