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

fix: rebase fixes

Browse source
This commit is contained in:
Liordino dos Santos Rocha Neto 2020-04-26 17:43:00 -03:00 • committed by Josh Harvey
parent 90177aab55
commit 7885d56211
4 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
new-lamassu-admin/src/pages/Triggers/SelectTriggerDirection.js
View file

@ -1,10 +1,10 @@
import React, { useState } from 'react'
import { makeStyles } from '@material-ui/core' import { makeStyles } from '@material-ui/core'
import classnames from 'classnames' 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 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 { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg'
import { mainStyles } from './Triggers.styles' import { mainStyles } from './Triggers.styles'
@ -32,9 +32,9 @@ const SelectTriggerDirection = () => {
const helpPopperOpen = Boolean(helpPopperAnchorEl) const helpPopperOpen = Boolean(helpPopperAnchorEl)
const radioButtonOptions = [ const radioButtonOptions = [
{ label: 'Both', value: 'both' }, { display: 'Both', code: 'both' },
{ label: 'Only cash-in', value: 'cash-in' }, { display: 'Only cash-in', code: 'cash-in' },
{ label: 'Only cash-out', value: 'cash-out' } { display: 'Only cash-out', code: 'cash-out' }
] ]
return ( return (

28
new-lamassu-admin/src/pages/Triggers/SelectTriggerRequirements.js
View file

@ -1,10 +1,10 @@
import React, { useState } from 'react'
import { makeStyles } from '@material-ui/core' import { makeStyles } from '@material-ui/core'
import classnames from 'classnames' 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 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 { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg'
import { mainStyles } from './Triggers.styles' import { mainStyles } from './Triggers.styles'
@ -56,20 +56,20 @@ const SelectTriggerRequirements = () => {
const typeHelpPopperOpen = Boolean(typeHelpPopperAnchorEl) const typeHelpPopperOpen = Boolean(typeHelpPopperAnchorEl)
const requirementRadioButtonOptions = [ const requirementRadioButtonOptions = [
{ label: 'SMS verification', value: 'sms' }, { display: 'SMS verification', code: 'sms' },
{ label: 'ID card image', value: 'id-card' }, { display: 'ID card image', code: 'id-card' },
{ label: 'ID data', value: 'id-data' }, { display: 'ID data', code: 'id-data' },
{ label: 'Customer camera', value: 'camera' }, { display: 'Customer camera', code: 'camera' },
{ label: 'Sanctions', value: 'sanctions' }, { display: 'Sanctions', code: 'sanctions' },
{ label: 'Super user', value: 'super-user' }, { display: 'Super user', code: 'super-user' },
{ label: 'Suspend', value: 'suspend' }, { display: 'Suspend', code: 'suspend' },
{ label: 'Block', value: 'block' } { display: 'Block', code: 'block' }
] ]
const typeRadioButtonOptions = [ const typeRadioButtonOptions = [
{ label: 'Fully automatic', value: 'automatic' }, { display: 'Fully automatic', code: 'automatic' },
{ label: 'Semi automatic', value: 'semi-automatic' }, { display: 'Semi automatic', code: 'semi-automatic' },
{ label: 'Manual', value: 'manual' } { display: 'Manual', code: 'manual' }
] ]
return ( return (

16
new-lamassu-admin/src/pages/Triggers/SelectTriggerType.js
View file

@ -1,10 +1,10 @@
import React, { useState } from 'react'
import { makeStyles } from '@material-ui/core' import { makeStyles } from '@material-ui/core'
import classnames from 'classnames' 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 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 { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg'
import { mainStyles } from './Triggers.styles' import { mainStyles } from './Triggers.styles'
@ -44,10 +44,10 @@ const SelectTriggerType = ({ fiatCurrencyCode }) => {
const helpPopperOpen = Boolean(helpPopperAnchorEl) const helpPopperOpen = Boolean(helpPopperAnchorEl)
const radioButtonOptions = [ const radioButtonOptions = [
{ label: 'Transaction amount', value: 'amount' }, { display: 'Transaction amount', code: 'amount' },
{ label: 'Transaction velocity', value: 'velocity' }, { display: 'Transaction velocity', code: 'velocity' },
{ label: 'Transaction volume', value: 'volume' }, { display: 'Transaction volume', code: 'volume' },
{ label: 'Consecutive days', value: 'days' } { display: 'Consecutive days', code: 'days' }
] ]
return ( return (
@ -92,7 +92,7 @@ const SelectTriggerType = ({ fiatCurrencyCode }) => {
validateThresholdInputIsPositiveInteger(event.target.value) validateThresholdInputIsPositiveInteger(event.target.value)
} }
error={thresholdError} error={thresholdError}
large size="lg"
value={thresholdValue} value={thresholdValue}
/> />
<TL1>{fiatCurrencyCode}</TL1> <TL1>{fiatCurrencyCode}</TL1>

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

@ -13,10 +13,9 @@ import OperatorInfo from 'src/pages/OperatorInfo/OperatorInfo'
import ServerLogs from 'src/pages/ServerLogs' import ServerLogs from 'src/pages/ServerLogs'
import Services from 'src/pages/Services/Services' import Services from 'src/pages/Services/Services'
import Transactions from 'src/pages/Transactions/Transactions' import Transactions from 'src/pages/Transactions/Transactions'
import Triggers from 'src/pages/Triggers'
import WalletSettings from 'src/pages/Wallet/Wallet' import WalletSettings from 'src/pages/Wallet/Wallet'
import MachineStatus from 'src/pages/maintenance/MachineStatus' 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' import { namespaces } from 'src/utils/config'
const tree = [ const tree = [
@ -117,7 +116,8 @@ const tree = [
{ {
key: 'triggers', key: 'triggers',
label: 'Triggers', label: 'Triggers',
route: '/compliance/triggers' route: '/compliance/triggers',
component: Triggers
}, },
{ {
key: 'customers', key: 'customers',