fix/navigation (#1211)

Author: dimakorzhovnik

src/components/appMenu/CircularMenu/CircularMenu.tsx

@@ -1,4 +1,4 @@
-import getMenuItems from 'src/utils/appsMenu';
+import getMenuItems from 'src/utils/appsMenu/appsMenu';
 import styles from './CircularMenu.module.scss';
 import _ from 'lodash';
 import CircularMenuItem from './CircularMenuItem';

src/components/appMenu/MobileMenu/MobileMenu.tsx

@@ -1,6 +1,6 @@
 import { useState, useRef } from 'react';
 import { NavLink } from 'react-router-dom';
-import getMenuItems from 'src/utils/appsMenu';
+import getMenuItems from 'src/utils/appsMenu/appsMenu';
 import styles from './MobileMenu.module.scss';
 import cx from 'classnames';
 import useOnClickOutside from 'src/hooks/useOnClickOutside';

src/components/appMenu/SubMenu/SubMenu.module.scss

@@ -1,4 +1,4 @@
-$icon-size: 30px;
+$icon-size: 25px;
 
 .subMenu {
   // position: absolute;
@@ -20,8 +20,8 @@ $icon-size: 30px;
 
 .navLinkItem {
   display: grid;
-  grid-template-columns: 30px 1fr;
-  gap: 10px;
+  grid-template-columns: 25px 1fr;
+  gap: 7px;
   align-items: center;
   padding-left: 20px;
   font-size: 18px;

src/components/appMenu/SubMenu/SubMenu.tsx

@@ -1,4 +1,4 @@
-import { NavLink, useLocation } from 'react-router-dom';
+import { NavLink } from 'react-router-dom';
 import { MenuItem } from 'src/types/menu';
 import cx from 'classnames';
 import { useMemo } from 'react';
@@ -17,6 +17,7 @@ function SubMenu({ selectedApp, closeMenu }: Props) {
             {
               name: 'main',
               to: selectedApp.to,
+              icon: selectedApp.icon,
             },
             ...selectedApp.subItems,
           ]

src/containers/application/Header/CurrentApp/CurrentApp.module.scss

@@ -59,6 +59,7 @@
   width: 60px;
   height: 60px;
   position: relative;
+  object-fit: contain;
 }
 
 .btnContainerText {

src/containers/application/Header/CurrentApp/ui/AppName/AppName.tsx

@@ -2,7 +2,7 @@ import { useLocation } from 'react-router-dom';
 import { CHAIN_ID } from 'src/constants/config';
 import { PATTERN_CYBER } from 'src/constants/patterns';
 import { routes } from 'src/routes';
-import getMenuItems from 'src/utils/appsMenu';
+import getMenuItems from 'src/utils/appsMenu/appsMenu';
 import findApp from 'src/utils/findApp';
 import { Helmet } from 'react-helmet';
 import styles from './AppName.module.scss';

src/containers/application/Header/CurrentApp/utils/findSelectAppByUrl.ts

@@ -11,14 +11,19 @@ const findSelectAppByUrl = (
 ) => {
   let pathname = url;
   const isRobot = url.includes('@') || url.includes('neuron/');
+  const isOracle = url.includes('oracle');
 
-  const getMenuItemsObj = reduceRobotSubItems(passport, address);
+  const itemsMenuObj = reduceRobotSubItems(passport, address);
 
   if (isRobot) {
     pathname = routes.robot.path;
   }
 
-  const value = findApp(getMenuItemsObj, pathname);
+  if (isOracle) {
+    pathname = routes.oracle.path;
+  }
+
+  const value = findApp(itemsMenuObj, pathname);
 
   return value;
 };

src/containers/application/Header/CurrentApp/utils/reduceRobotSubItems.ts

@@ -4,7 +4,7 @@ import { Nullable, Option } from 'src/types';
 import { Citizenship } from 'src/types/citizenship';
 import { MenuItem, MenuItems } from 'src/types/menu';
 import { Networks } from 'src/types/networks';
-import getMenuItems from 'src/utils/appsMenu';
+import getMenuItems from 'src/utils/appsMenu/appsMenu';
 
 const reduceRobotSubItems = (
   passport: Nullable<Citizenship>,

src/containers/mint/Mint.module.scss

@@ -19,6 +19,5 @@
   align-items: center;
   margin: 64px 8px 0 8px;
   grid-gap: 16px;
-  padding-bottom: 150px;
   position: relative;
 }

src/features/TimeHistory/ui/RouteItem/RouteItem.tsx

@@ -1,4 +1,4 @@
-import getMenuItems from 'src/utils/appsMenu';
+import getMenuItems from 'src/utils/appsMenu/appsMenu';
 import DEFAULT_IMG from 'images/large-orange-circle.png';
 import { Link } from 'react-router-dom';
 import findApp from 'src/utils/findApp';