Skip to content

Commit

Permalink
Merge branch 'suite-c4t' into suite
Browse files Browse the repository at this point in the history
  • Loading branch information
mo-c4t authored Aug 30, 2023
2 parents fae13a3 + 00fc732 commit 1ecccd0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
18 changes: 10 additions & 8 deletions src/layout/RoutesSuite.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import React, { useState, useEffect } from 'react'
import { Navigate, Route, Routes, useNavigate } from 'react-router-dom'
import ExplorerApp from '../views/explorer/ExplorerApp'
import Wallet from '../views/wallet/WalletApp'
import LoginPage from '../views/login/LoginPage'
import React, { useEffect, useState } from 'react'

import AccessLayout from '../views/access'
import Create from '../views/create/Create'
import ExplorerApp from '../views/explorer/ExplorerApp'
import LandingPage from '../views/landing/LandingPage'
import Legal from '../views/legal/Legal'
import AccessLayout from '../views/access'
import LoginPage from '../views/login/LoginPage'
import MountAccessComponent from '../views/access/MountAccessComponent'
import LandingPage from '../views/landing/LandingPage'
import { getActiveNetwork } from '../redux/slices/network'
import { useAppSelector } from '../hooks/reduxHooks'
import MultisigWallet from '../views/settings/MultisigWallet'
import Protected from './Protected'
import Settings from '../views/settings/index'
import MultisigWallet from '../views/settings/MultisigWallet'
import SettingsLayout from './SettingsLayout'
import Wallet from '../views/wallet/WalletApp'
import { getActiveNetwork } from '../redux/slices/network'
import { useAppSelector } from '../hooks/reduxHooks'

export default function RoutesSuite() {
const navigate = useNavigate()
Expand Down
8 changes: 5 additions & 3 deletions src/views/settings/Links.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React, { useState, useEffect } from 'react'
import Tabs from '@mui/material/Tabs'
import Tab from '@mui/material/Tab'

import React, { useEffect, useState } from 'react'

import Box from '@mui/material/Box'
import Tab from '@mui/material/Tab'
import Tabs from '@mui/material/Tabs'
import { useNavigate } from 'react-router'

function a11yProps(index: number) {
Expand Down

0 comments on commit 1ecccd0

Please sign in to comment.