lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: routing after rebase

Browse source
This commit is contained in:
Sérgio Salgado 2021-05-12 19:51:44 +01:00 • committed by Josh Harvey
parent 78bc997a43
commit a3b6ea7fbe
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
new-lamassu-admin/src/pazuz/routing/routes.js
View file

@ -41,13 +41,10 @@ import Transactions from 'src/pages/Transactions/Transactions'
import Triggers from 'src/pages/Triggers'
import UserManagement from 'src/pages/UserManagement/UserManagement'
import Wizard from 'src/pages/Wizard'
<<<<<<< HEAD
import ATMWallet from 'src/pazuz/pages/ATMWallet/ATMWallet'
import PrivateRoute from 'src/routing/PrivateRoute'
import PublicRoute from 'src/routing/PublicRoute'
import { ROLES } from 'src/routing/utils'
=======
import ATMWallet from 'src/pazuz/pages/ATMWallet/ATMWallet'
>>>>>>> feat: pazuz ATM wallet screen
import { namespaces } from 'src/utils/config'
const useStyles = makeStyles({
@ -264,6 +261,7 @@ const tree = [
key: 'atmwallets',
label: 'ATM Wallets',
route: '/accounting/wallets',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: ATMWallet
}
]