diff --git a/new-lamassu-admin/src/pages/Triggers/SelectTriggerDirection.js b/new-lamassu-admin/src/pages/Triggers/SelectTriggerDirection.js index 7f1131b7..8156543c 100644 --- a/new-lamassu-admin/src/pages/Triggers/SelectTriggerDirection.js +++ b/new-lamassu-admin/src/pages/Triggers/SelectTriggerDirection.js @@ -1,10 +1,10 @@ -import React, { useState } from 'react' import { makeStyles } from '@material-ui/core' import classnames from 'classnames' +import React, { useState } from 'react' -import { H4, P } from 'src/components/typography' -import { RadioGroup } from 'src/components/inputs' import Popper from 'src/components/Popper' +import { RadioGroup } from 'src/components/inputs' +import { H4, P } from 'src/components/typography' import { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg' import { mainStyles } from './Triggers.styles' @@ -32,9 +32,9 @@ const SelectTriggerDirection = () => { const helpPopperOpen = Boolean(helpPopperAnchorEl) const radioButtonOptions = [ - { label: 'Both', value: 'both' }, - { label: 'Only cash-in', value: 'cash-in' }, - { label: 'Only cash-out', value: 'cash-out' } + { display: 'Both', code: 'both' }, + { display: 'Only cash-in', code: 'cash-in' }, + { display: 'Only cash-out', code: 'cash-out' } ] return ( diff --git a/new-lamassu-admin/src/pages/Triggers/SelectTriggerRequirements.js b/new-lamassu-admin/src/pages/Triggers/SelectTriggerRequirements.js index a0c9cdb3..f9d222b2 100644 --- a/new-lamassu-admin/src/pages/Triggers/SelectTriggerRequirements.js +++ b/new-lamassu-admin/src/pages/Triggers/SelectTriggerRequirements.js @@ -1,10 +1,10 @@ -import React, { useState } from 'react' import { makeStyles } from '@material-ui/core' import classnames from 'classnames' +import React, { useState } from 'react' -import { H4, P } from 'src/components/typography' -import { RadioGroup } from 'src/components/inputs' import Popper from 'src/components/Popper' +import { RadioGroup } from 'src/components/inputs' +import { H4, P } from 'src/components/typography' import { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg' import { mainStyles } from './Triggers.styles' @@ -56,20 +56,20 @@ const SelectTriggerRequirements = () => { const typeHelpPopperOpen = Boolean(typeHelpPopperAnchorEl) const requirementRadioButtonOptions = [ - { label: 'SMS verification', value: 'sms' }, - { label: 'ID card image', value: 'id-card' }, - { label: 'ID data', value: 'id-data' }, - { label: 'Customer camera', value: 'camera' }, - { label: 'Sanctions', value: 'sanctions' }, - { label: 'Super user', value: 'super-user' }, - { label: 'Suspend', value: 'suspend' }, - { label: 'Block', value: 'block' } + { display: 'SMS verification', code: 'sms' }, + { display: 'ID card image', code: 'id-card' }, + { display: 'ID data', code: 'id-data' }, + { display: 'Customer camera', code: 'camera' }, + { display: 'Sanctions', code: 'sanctions' }, + { display: 'Super user', code: 'super-user' }, + { display: 'Suspend', code: 'suspend' }, + { display: 'Block', code: 'block' } ] const typeRadioButtonOptions = [ - { label: 'Fully automatic', value: 'automatic' }, - { label: 'Semi automatic', value: 'semi-automatic' }, - { label: 'Manual', value: 'manual' } + { display: 'Fully automatic', code: 'automatic' }, + { display: 'Semi automatic', code: 'semi-automatic' }, + { display: 'Manual', code: 'manual' } ] return ( diff --git a/new-lamassu-admin/src/pages/Triggers/SelectTriggerType.js b/new-lamassu-admin/src/pages/Triggers/SelectTriggerType.js index c7a7760b..df5e30b4 100644 --- a/new-lamassu-admin/src/pages/Triggers/SelectTriggerType.js +++ b/new-lamassu-admin/src/pages/Triggers/SelectTriggerType.js @@ -1,10 +1,10 @@ -import React, { useState } from 'react' import { makeStyles } from '@material-ui/core' import classnames from 'classnames' +import React, { useState } from 'react' -import { H4, TL1, P } from 'src/components/typography' -import { RadioGroup, TextInput } from 'src/components/inputs' import Popper from 'src/components/Popper' +import { RadioGroup, TextInput } from 'src/components/inputs' +import { H4, TL1, P } from 'src/components/typography' import { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg' import { mainStyles } from './Triggers.styles' @@ -44,10 +44,10 @@ const SelectTriggerType = ({ fiatCurrencyCode }) => { const helpPopperOpen = Boolean(helpPopperAnchorEl) const radioButtonOptions = [ - { label: 'Transaction amount', value: 'amount' }, - { label: 'Transaction velocity', value: 'velocity' }, - { label: 'Transaction volume', value: 'volume' }, - { label: 'Consecutive days', value: 'days' } + { display: 'Transaction amount', code: 'amount' }, + { display: 'Transaction velocity', code: 'velocity' }, + { display: 'Transaction volume', code: 'volume' }, + { display: 'Consecutive days', code: 'days' } ] return ( @@ -92,7 +92,7 @@ const SelectTriggerType = ({ fiatCurrencyCode }) => { validateThresholdInputIsPositiveInteger(event.target.value) } error={thresholdError} - large + size="lg" value={thresholdValue} /> {fiatCurrencyCode} diff --git a/new-lamassu-admin/src/routing/routes.js b/new-lamassu-admin/src/routing/routes.js index 2d1b3f15..6ee06e6d 100644 --- a/new-lamassu-admin/src/routing/routes.js +++ b/new-lamassu-admin/src/routing/routes.js @@ -13,10 +13,9 @@ import OperatorInfo from 'src/pages/OperatorInfo/OperatorInfo' import ServerLogs from 'src/pages/ServerLogs' import Services from 'src/pages/Services/Services' import Transactions from 'src/pages/Transactions/Transactions' +import Triggers from 'src/pages/Triggers' import WalletSettings from 'src/pages/Wallet/Wallet' import MachineStatus from 'src/pages/maintenance/MachineStatus' -import Customers from 'src/pages/Customers' -import Triggers from 'src/pages/Triggers' import { namespaces } from 'src/utils/config' const tree = [ @@ -117,7 +116,8 @@ const tree = [ { key: 'triggers', label: 'Triggers', - route: '/compliance/triggers' + route: '/compliance/triggers', + component: Triggers }, { key: 'customers',