diff --git a/new-lamassu-admin/src/pages/Wizard/Wizard.js b/new-lamassu-admin/src/pages/Wizard/Wizard.js index 68545b57..5e6a660f 100644 --- a/new-lamassu-admin/src/pages/Wizard/Wizard.js +++ b/new-lamassu-admin/src/pages/Wizard/Wizard.js @@ -100,7 +100,9 @@ const validateSteps = ({ config, accounts }) => { compliance options > ), - isComplete: twilio.validationSchema.isValidSync(accounts?.twilio) || R.isEmpty(accounts?.twilio) + isComplete: + twilio.validationSchema.isValidSync(accounts?.twilio) || + R.isEmpty(accounts?.twilio) }, { namespace: namespaces.COMMISSIONS, diff --git a/new-lamassu-admin/src/pages/Wizard/components/Commissions.js b/new-lamassu-admin/src/pages/Wizard/components/Commissions.js index 422f85d3..43e7b4f5 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Commissions.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Commissions.js @@ -15,7 +15,7 @@ const useStyles = makeStyles(styles) const GET_DATA = gql` query getData { - config, + config accounts } ` diff --git a/new-lamassu-admin/src/pages/Wizard/components/Footer.js b/new-lamassu-admin/src/pages/Wizard/components/Footer.js index 0b5ad681..a0d04234 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Footer.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Footer.js @@ -1,5 +1,3 @@ -import Modal from 'src/components/Modal' - import { makeStyles, Drawer, Grid } from '@material-ui/core' import ClickAwayListener from '@material-ui/core/ClickAwayListener' import classnames from 'classnames' @@ -7,11 +5,11 @@ import * as R from 'ramda' import React, { useState } from 'react' import { useHistory } from 'react-router-dom' +import Modal from 'src/components/Modal' import Stepper from 'src/components/Stepper' import { Button, Link } from 'src/components/buttons' import { P, H2, Info2 } from 'src/components/typography' import { spacer } from 'src/styling/variables' -import { URI } from 'src/utils/apollo' const getStepperProps = (current, steps) => ({ steps: R.length(steps), @@ -35,7 +33,7 @@ const useStyles = makeStyles(() => ({ height: 84 }, title: { - margin: [[0, spacer * 4, 0, 0]], + margin: [[0, spacer * 4, 0, 0]] }, subtitle: { marginTop: spacer, @@ -45,8 +43,8 @@ const useStyles = makeStyles(() => ({ }, modal: { background: 'none', - boxShadow: 'none', - }, + boxShadow: 'none' + } })) function Footer({ next, current, steps: collection, path, tag, p }) { @@ -82,7 +80,7 @@ function Footer({ next, current, steps: collection, path, tag, p }) { item xs={5} container - direction={open ? "column" : "row"} + direction={open ? 'column' : 'row'} justify="flex-start" alignItems="baseline">
+
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Twilio.js b/new-lamassu-admin/src/pages/Wizard/components/Twilio.js
index 3f5d6f12..b8f53767 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Twilio.js
+++ b/new-lamassu-admin/src/pages/Wizard/components/Twilio.js
@@ -4,6 +4,9 @@ import classnames from 'classnames'
import gql from 'graphql-tag'
import React, { useEffect, useState } from 'react'
+import Tooltip from 'src/components/Tooltip'
+import { IconButton } from 'src/components/buttons'
+import { RadioGroup } from 'src/components/inputs'
import { H1, Label1, H4, P } from 'src/components/typography'
import addMachineStyles from 'src/pages/AddMachine/styles'
import {
@@ -12,12 +15,9 @@ import {
} from 'src/pages/OperatorInfo/OperatorInfo.styles'
import FormRenderer from 'src/pages/Services/FormRenderer'
import twilio from 'src/pages/Services/schemas/twilio'
-import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/comet.svg'
-import { RadioGroup } from 'src/components/inputs'
import styles from 'src/pages/Wizard/Radio.styles'
-import Tooltip from 'src/components/Tooltip'
-import { IconButton } from 'src/components/buttons'
import { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg'
+import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/comet.svg'
const GET_CONFIG = gql`
{
@@ -54,7 +54,7 @@ const options = [
},
{
code: 'disable',
- display: "No, not for now"
+ display: 'No, not for now'
}
]
@@ -62,7 +62,6 @@ function Twilio({ dispatch, namespace }) {
const { data, refetch } = useQuery(GET_CONFIG)
const [saveAccounts] = useMutation(SAVE_ACCOUNTS)
const accounts = data?.accounts ?? []
- const config = data?.config ?? []
const [enable, setEnable] = useState('disable')
@@ -100,13 +99,18 @@ function Twilio({ dispatch, namespace }) {
- Two-way machines allow your customers not only to buy (cash-in) but also sell cryptocurrencies (cash-out).
+ Two-way machines allow your customers not only to buy (cash-in) + but also sell cryptocurrencies (cash-out). +- To get your admin up and running, you’ll only need an SMS service for cash-out transactions. If you’re using one-way machines, select “No” to skip this step for now. You can later set it up within the Lamassu Admin.
+ To get your admin up and running, you’ll only need an SMS service + for cash-out transactions. If you’re using one-way machines, + select “No” to skip this step for now. You can later set it up + within the Lamassu Admin. +