diff --git a/new-lamassu-admin/public/fullexample.commissions.png b/new-lamassu-admin/public/fullexample.commissions.png
new file mode 100644
index 00000000..92fbf325
Binary files /dev/null and b/new-lamassu-admin/public/fullexample.commissions.png differ
diff --git a/new-lamassu-admin/public/fullexample.locale.png b/new-lamassu-admin/public/fullexample.locale.png
new file mode 100644
index 00000000..6e76177e
Binary files /dev/null and b/new-lamassu-admin/public/fullexample.locale.png differ
diff --git a/new-lamassu-admin/public/fullexample.twilio.png b/new-lamassu-admin/public/fullexample.twilio.png
new file mode 100644
index 00000000..a8d44125
Binary files /dev/null and b/new-lamassu-admin/public/fullexample.twilio.png differ
diff --git a/new-lamassu-admin/public/wizard-background.svg b/new-lamassu-admin/public/wizard-background.svg
new file mode 100644
index 00000000..a783cf7d
--- /dev/null
+++ b/new-lamassu-admin/public/wizard-background.svg
@@ -0,0 +1,204 @@
+
+
\ No newline at end of file
diff --git a/new-lamassu-admin/src/components/Modal.js b/new-lamassu-admin/src/components/Modal.js
index e38214b3..f190004f 100644
--- a/new-lamassu-admin/src/components/Modal.js
+++ b/new-lamassu-admin/src/components/Modal.js
@@ -43,16 +43,20 @@ const styles = {
flex: 1,
padding: [[0, 24]]
},
- content: ({ small }) => ({
+ content: ({ small, xl }) => ({
width: '100%',
display: 'flex',
flexDirection: 'column',
flex: 1,
- padding: small ? [[0, 16]] : [[0, 32]]
+ padding: xl ? [[0, 60 + 28]] : small ? [[0, 16]] : [[0, 32]]
}),
- button: ({ small }) => ({
- padding: 0,
- margin: small ? [[12, 12, 'auto', 'auto']] : [[16, 16, 'auto', 'auto']]
+ button: ({ small, xl }) => ({
+ padding: [[0, 0, xl ? 26 : 0, 0]],
+ margin: xl
+ ? [[0, 0, 'auto', 'auto']]
+ : small
+ ? [[12, 12, 'auto', 'auto']]
+ : [[16, 16, 'auto', 'auto']]
}),
header: {
display: 'flex'
@@ -70,6 +74,7 @@ const Modal = ({
infoPanelHeight,
title,
small,
+ xl,
infoPanel,
handleClose,
children,
@@ -79,14 +84,9 @@ const Modal = ({
closeOnBackdropClick,
...props
}) => {
- const classes = useStyles({
- width,
- height,
- small,
- infoPanelHeight
- })
+ const classes = useStyles({ width, height, small, infoPanelHeight, xl })
const TitleCase = small ? H4 : H1
- const closeSize = small ? 16 : 20
+ const closeSize = xl ? 28 : small ? 16 : 20
const innerClose = (evt, reason) => {
if (!closeOnBackdropClick && reason === 'backdropClick') return
diff --git a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js
index d6257735..8df0225b 100644
--- a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js
+++ b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js
@@ -25,13 +25,13 @@ const BooleanCell = ({ name }) => {
}
const BooleanPropertiesTable = memo(
- ({ title, disabled, data, elements, save }) => {
+ ({ title, disabled, data, elements, save, forcedEditing = false }) => {
const initialValues = _.fromPairs(elements.map(it => [it.name, '']))
const schemaValidation = _.fromPairs(
elements.map(it => [it.name, Yup.boolean().required()])
)
- const [editing, setEditing] = useState(false)
+ const [editing, setEditing] = useState(forcedEditing)
const classes = useStyles()
diff --git a/new-lamassu-admin/src/components/buttons/Button.styles.js b/new-lamassu-admin/src/components/buttons/Button.styles.js
index ce8c1cf7..064e3409 100644
--- a/new-lamassu-admin/src/components/buttons/Button.styles.js
+++ b/new-lamassu-admin/src/components/buttons/Button.styles.js
@@ -8,10 +8,12 @@ import {
spacer
} from 'src/styling/variables'
-const { h3 } = typographyStyles
+const { h1, h3 } = typographyStyles
const pickSize = size => {
switch (size) {
+ case 'xl':
+ return spacer * 7.625
case 'sm':
return spacer * 4
case 'lg':
@@ -28,10 +30,11 @@ export default {
},
button: ({ size }) => {
const height = pickSize(size)
- const shadowSize = height / 12
+ const shadowSize = size === 'xl' ? 3 : height / 12
+ const padding = size === 'xl' ? 20 : height / 2
return {
- extend: h3,
+ extend: size === 'xl' ? h1 : h3,
border: 'none',
color: white,
cursor: 'pointer',
@@ -51,7 +54,7 @@ export default {
},
shadowSize,
height,
- padding: `0 ${height / 2}px`,
+ padding: `0 ${padding}px`,
borderRadius: height / 4,
boxShadow: `0 ${shadowSize}px ${secondaryColorDark}`,
'&:hover': {
diff --git a/new-lamassu-admin/src/pages/Notifications/Notifications.js b/new-lamassu-admin/src/pages/Notifications/Notifications.js
index 439a179d..29e54893 100644
--- a/new-lamassu-admin/src/pages/Notifications/Notifications.js
+++ b/new-lamassu-admin/src/pages/Notifications/Notifications.js
@@ -38,7 +38,17 @@ const SAVE_CONFIG = gql`
const FIELDS_WIDTH = 130
-const Notifications = ({ name: SCREEN_KEY }) => {
+// TODO: what about 'onlySetup' 'onlyFiat'?
+const Notifications = ({
+ name: SCREEN_KEY,
+ displaySetup = true,
+ displayTransactionAlerts = true,
+ displayFiatAlerts = true,
+ displayCryptoAlerts = true,
+ displayOverrides = true,
+ displayTitle = true,
+ wizard = false
+}) => {
const [section, setSection] = useState(null)
const [error, setError] = useState(null)
const [editingKey, setEditingKey] = useState(null)
@@ -92,27 +102,38 @@ const Notifications = ({ name: SCREEN_KEY }) => {
return (
| Channel | +Channel | {Object.keys(sizes).map(it => ( -+ | {startCase(it)} | ))} diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js index 2b45b452..d7ab6c63 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js @@ -103,10 +103,10 @@ const styles = R.merge(globalStyles, contactInfoStyles) const contactUseStyles = makeStyles(styles) -const ContactInfo = () => { +const ContactInfo = ({ wizard }) => { const classes = contactUseStyles() - const [editing, setEditing] = useState(false) + const [editing, setEditing] = useState(wizard || false) const [error, setError] = useState(null) const [saveConfig] = useMutation(SAVE_CONFIG, { @@ -298,14 +298,16 @@ const ContactInfo = () => { -
|---|