Merge pull request #2424 from SelfKeyFoundation/release

Release 1.7.4
SelfKeyFoundation · Oct 23, 2020 · 0e81edf · 0e81edf
2 parents c94de2b + f397ec4
commit 0e81edf
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 45 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -81,10 +81,10 @@ jobs:
                   path: dist
             - *step_save_cache
     'build-storybook':
-        docker: &DOCKERIMAGE
-            - image: circleci/node:10.13.0-stretch-browsers
+        docker: *DOCKERIMAGE
         environment:
             CACHE_VERSION: *cache_version
+            NODE_OPTIONS: --max_old_space_size=4096
         steps:
             - checkout
             - attach_workspace:

diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
@@ -1,5 +1,6 @@
 const path = require('path');
 const webpack = require('webpack');
+const TerserPlugin = require('terser-webpack-plugin');
 
 module.exports = async ({ config }) => {
 	const maxAssetSize = 1024 * 1024;
@@ -51,6 +52,10 @@ module.exports = async ({ config }) => {
 			maxSize: maxAssetSize
 		}
 	};
+
+	if (process.env.CI) {
+		config.optimization.minimizer = [new TerserPlugin({ parallel: false })];
+	}
 	config.performance = {
 		maxAssetSize: maxAssetSize
 	};

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "selfkey-identity-wallet",
 	"productName": "SelfKey Identity Wallet",
-	"version": "1.7.2",
+	"version": "1.7.4",
 	"description": "The Official SelfKey Identity Wallet for Desktop",
 	"browser": [
 		"chrome"

diff --git a/src/common/config.js b/src/common/config.js
@@ -223,7 +223,7 @@ const prod = {
 		corporate: true,
 		staking: false,
 		certifiers: false,
-		notaries: false,
+		notaries: true,
 		corporateMarketplace: false,
 		kyccUsersEndpoint: false,
 		walletExport: true,

diff --git a/src/renderer/wallet/main/sidebar.jsx b/src/renderer/wallet/main/sidebar.jsx
@@ -41,10 +41,6 @@ const styles = theme => ({
 		overflow: 'auto',
 		width: '100%'
 	},
-	logoSection: {
-		marginBottom: '30px',
-		marginTop: '-30px'
-	},
 	logoText: {
 		fontFamily: 'Orbitron, arial, sans-serif',
 		fontSize: '16px',
@@ -53,12 +49,6 @@ const styles = theme => ({
 		marginLeft: '13px',
 		marginTop: '3px'
 	},
-	closeSection: {
-		width: '100%'
-	},
-	pointer: {
-		cursor: 'pointer'
-	},
 	link: {
 		alignItems: 'center',
 		display: 'flex',
@@ -93,15 +83,6 @@ const styles = theme => ({
 			outline: 0
 		}
 	},
-	secondaryButtons: {
-		alignItems: 'flex-end',
-		display: 'flex',
-		flexGrow: 2,
-		width: 'inherit'
-	},
-	inheritWidth: {
-		width: 'inherit'
-	},
 	inheritHeight: {
 		height: 'inherit'
 	},
@@ -180,6 +161,28 @@ const styles = theme => ({
 	tooltipLink: {
 		color: primary,
 		textDecoration: 'none'
+	},
+	skLogo: {
+		flexGrow: 0,
+		padding: '21px 0 !important'
+	},
+	skLogoContainer: {
+		paddingLeft: '13px'
+	},
+	divider: {
+		backgroundColor: '#475768',
+		flexGrow: 0,
+		width: '100%'
+	},
+	mainMenuItemsWrap: {
+		flexGrow: 1,
+		padding: '50px 0 0 !important'
+	},
+	secondaryMenuItemsWrap: {
+		padding: '50px 0 20px !important'
+	},
+	paddingLeft: {
+		paddingLeft: '10px'
 	}
 });
 
@@ -221,7 +224,7 @@ class Sidebar extends PureComponent {
 	};
 
 	render() {
-		const { classes, onProfileNavigate, isExportableAccount } = this.props;
+		const { classes, onProfileNavigate, isExportableAccount, showStaking } = this.props;
 
 		const sideList = (
 			<Grid
@@ -232,13 +235,13 @@ class Sidebar extends PureComponent {
 				className={`${classes.list} sidebarContainer`}
 				spacing={5}
 			>
-				<Grid item style={{ padding: '21px 0', flexGrow: 0 }}>
+				<Grid item className={classes.skLogo}>
 					<Grid
 						container
 						direction="row"
 						alignItems="center"
 						wrap="nowrap"
-						style={{ paddingLeft: '13px' }}
+						className={classes.skLogoContainer}
 					>
 						<Link to="/main/dashboard" className={classes.link}>
 							<SelfkeyLogo width="30px" height="34px" />
@@ -248,9 +251,9 @@ class Sidebar extends PureComponent {
 						</Link>
 					</Grid>
 				</Grid>
-				<Divider style={{ width: '100%', backgroundColor: '#475768', flexGrow: 0 }} />
-				<Grid item style={{ padding: '50px 0 20px', flexGrow: 1 }}>
-					<List style={{ paddingLeft: '10px' }}>
+				<Divider className={classes.divider} />
+				<Grid item className={classes.mainMenuItemsWrap}>
+					<List className={classes.paddingLeft}>
 						<ListItem
 							className={classes.listItem}
 							component={dashboard}
@@ -264,20 +267,22 @@ class Sidebar extends PureComponent {
 								Dashboard
 							</Typography>
 						</ListItem>
-						<ListItem
-							id="stakingButton"
-							className={classes.listItem}
-							component={staking}
-							key="staking"
-							title="Staking"
-						>
-							<ListItemIcon className={classes.listItemIcon}>
-								<MenuStakingIcon />
-							</ListItemIcon>
-							<Typography variant="body2" color="secondary">
-								Staking
-							</Typography>
-						</ListItem>
+						{showStaking && (
+							<ListItem
+								id="stakingButton"
+								className={classes.listItem}
+								component={staking}
+								key="staking"
+								title="Staking"
+							>
+								<ListItemIcon className={classes.listItemIcon}>
+									<MenuStakingIcon />
+								</ListItemIcon>
+								<Typography variant="body2" color="secondary">
+									Staking
+								</Typography>
+							</ListItem>
+						)}
 						<ListItem
 							id="marketplaceButton"
 							className={classes.listItem}
@@ -345,7 +350,7 @@ class Sidebar extends PureComponent {
 						<Divider className={`divider`} />
 					</List>
 				</Grid>
-				<Grid item style={{ padding: '50px 0 20px' }}>
+				<Grid item className={classes.secondaryMenuItemsWrap}>
 					{/* <Grid item className={classes.network}>
 						<Typography variant="overline" gutterBottom>
 							Network
@@ -396,7 +401,7 @@ class Sidebar extends PureComponent {
 							))}
 						</Select>
 					</Grid> */}
-					<List style={{ paddingLeft: '10px' }}>
+					<List className={classes.paddingLeft}>
 						<ListItem
 							className={classes.listItem}
 							onClick={e => {