From 7dd15740a0bc4986ee0dbcd224d20b978ff5eeca Mon Sep 17 00:00:00 2001 From: Mikhail Mikheev Date: Mon, 17 Jun 2019 14:35:58 +0400 Subject: [PATCH] add active styles for settings menu --- .../components/Settings/Threshold/index.jsx | 9 ++++ src/routes/safe/components/Settings/index.jsx | 45 ++++++++++--------- src/routes/safe/components/Settings/style.js | 7 ++- 3 files changed, 39 insertions(+), 22 deletions(-) create mode 100644 src/routes/safe/components/Settings/Threshold/index.jsx diff --git a/src/routes/safe/components/Settings/Threshold/index.jsx b/src/routes/safe/components/Settings/Threshold/index.jsx new file mode 100644 index 00000000..c354bd56 --- /dev/null +++ b/src/routes/safe/components/Settings/Threshold/index.jsx @@ -0,0 +1,9 @@ +import React from 'react' + +const Threshold = () => { + return
+ This will change the threshold +
+} + +export default Threshold \ No newline at end of file diff --git a/src/routes/safe/components/Settings/index.jsx b/src/routes/safe/components/Settings/index.jsx index 0b1360e8..d89a11a5 100644 --- a/src/routes/safe/components/Settings/index.jsx +++ b/src/routes/safe/components/Settings/index.jsx @@ -1,5 +1,6 @@ // @flow import * as React from 'react' +import cn from 'classnames' import { withStyles } from '@material-ui/core/styles' import Block from '~/components/layout/Block' import Col from '~/components/layout/Col' @@ -7,10 +8,12 @@ import Row from '~/components/layout/Row' import RemoveSafeModal from './RemoveSafeModal' import Paragraph from '~/components/layout/Paragraph' import Hairline from '~/components/layout/Hairline' +import Threshold from './Threshold' import { styles } from './style' type State = { showRemoveSafe: boolean, + menuOptionIndex: number, } type Props = { @@ -44,11 +47,7 @@ class Settings extends React.Component { render() { const { showRemoveSafe, menuOptionIndex } = this.state const { - classes, - granted, - etherScanLink, - safeAddress, - safeName, + classes, granted, etherScanLink, safeAddress, safeName, } = this.props return ( @@ -73,21 +72,33 @@ class Settings extends React.Component { - + Safe name {granted && ( - + Owners - + Required confirmations - + Modules @@ -97,18 +108,10 @@ class Settings extends React.Component { - {menuOptionIndex === 1 && ( -

To be done

- )} - {granted && menuOptionIndex === 2 && ( -

To be done

- )} - {granted && menuOptionIndex === 3 && ( -

To be done

- )} - {granted && menuOptionIndex === 4 && ( -

To be done

- )} + {menuOptionIndex === 1 &&

To be done

} + {granted && menuOptionIndex === 2 &&

To be done

} + {granted && menuOptionIndex === 3 && } + {granted && menuOptionIndex === 4 &&

To be done

}
diff --git a/src/routes/safe/components/Settings/style.js b/src/routes/safe/components/Settings/style.js index 7fb64f13..ce8eac3c 100644 --- a/src/routes/safe/components/Settings/style.js +++ b/src/routes/safe/components/Settings/style.js @@ -1,6 +1,6 @@ // @flow import { - sm, md, lg, border, + sm, md, lg, border, secondary, bolderFont, } from '~/theme/variables' export const styles = (theme: Object) => ({ @@ -22,6 +22,11 @@ export const styles = (theme: Object) => ({ alignItems: 'center', cursor: 'pointer', }, + active: { + backgroundColor: '#f4f4f9', + color: secondary, + fontWeight: bolderFont, + }, container: { padding: lg, },