From a3b6ea7fbe7efd0d0795fed739605947a4fb6827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Wed, 12 May 2021 19:51:44 +0100
Subject: [PATCH] fix: routing after rebase

---
 new-lamassu-admin/src/pazuz/routing/routes.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/new-lamassu-admin/src/pazuz/routing/routes.js b/new-lamassu-admin/src/pazuz/routing/routes.js
index 792f2501..5750cf60 100644
--- a/new-lamassu-admin/src/pazuz/routing/routes.js
+++ b/new-lamassu-admin/src/pazuz/routing/routes.js
@@ -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
       }
     ]