From b7a814b9ff877e133e751bff0407258576123ffb Mon Sep 17 00:00:00 2001
From: Tom Kirkpatrick <tkp@kirkdesigns.co.uk>
Date: Mon, 5 Aug 2019 14:44:07 +0100
Subject: [PATCH 1/6] fix(ui): increment satoshi amount using up arrow

fix #2679
---
 renderer/components/UI/CryptoAmountInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/components/UI/CryptoAmountInput.js b/renderer/components/UI/CryptoAmountInput.js
index 9ec972f7704..8c1e0bd065f 100644
--- a/renderer/components/UI/CryptoAmountInput.js
+++ b/renderer/components/UI/CryptoAmountInput.js
@@ -67,7 +67,7 @@ class CryptoAmountInput extends React.Component {
       case 'lits':
         return {
           precision: 0,
-          step: '0.00000001',
+          step: '1',
           placeholder: '00000000',
           pattern: '[0-9]*',
         }

From 5bb02fdc4cb42c1263e50547f73fcd91fcde406b Mon Sep 17 00:00:00 2001
From: Tom Kirkpatrick <tkp@kirkdesigns.co.uk>
Date: Mon, 5 Aug 2019 18:41:40 +0100
Subject: [PATCH 2/6] refactor: define shadows in base theme

---
 renderer/themes/base.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/renderer/themes/base.js b/renderer/themes/base.js
index 8a419dafaea..ef0c04ba53e 100644
--- a/renderer/themes/base.js
+++ b/renderer/themes/base.js
@@ -1,5 +1,12 @@
 export const space = [0, 4, 8, 16, 32, 45, 72, 108]
 
+export const shadows = {
+  xs: '0 2px 4px 0 rgba(0, 0, 0, 0.5)',
+  s: ' 0 3px 4px 0 rgba(0, 0, 0, 0.3)',
+  m: '0 2px 24px 0 rgba(0, 0, 0, 0.5)',
+  l: '0 20px 70px rgba(0, 0, 0, 0.55)',
+}
+
 export const palette = {
   white: '#ffffff',
   black: '#000000',
@@ -85,6 +92,7 @@ export default {
   letterSpacings,
   lineHeights,
   palette,
+  shadows,
   statuses,
   bars,
 }

From 029bcdc763c21e3a09b5cb4911dc4b21a9af5918 Mon Sep 17 00:00:00 2001
From: Tom Kirkpatrick <tkp@kirkdesigns.co.uk>
Date: Mon, 5 Aug 2019 18:42:03 +0100
Subject: [PATCH 3/6] refactor: reference shadows from theme system

---
 renderer/components/UI/Card.js         | 2 +-
 renderer/components/UI/Dialog.js       | 7 +------
 renderer/components/UI/Dropdown.js     | 2 +-
 renderer/components/UI/GlobalStyle.js  | 2 +-
 renderer/components/UI/Notification.js | 2 +-
 renderer/components/UI/Page.js         | 3 ++-
 renderer/components/UI/Select.js       | 3 ++-
 renderer/components/UI/Sidebar.js      | 3 ++-
 renderer/components/UI/Toggle.js       | 3 ++-
 renderer/components/UI/Tooltip.js      | 2 +-
 10 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/renderer/components/UI/Card.js b/renderer/components/UI/Card.js
index 46110b79f0b..0e0933df1ea 100644
--- a/renderer/components/UI/Card.js
+++ b/renderer/components/UI/Card.js
@@ -12,7 +12,7 @@ const Card = React.forwardRef((props, ref) => {
       as="section"
       bg="primaryColor"
       borderRadius={5}
-      boxShadow="0 2px 24px 0 rgba(0, 0, 0, 0.5)"
+      boxShadow="m"
       color="primaryText"
       p={3}
       {...props}
diff --git a/renderer/components/UI/Dialog.js b/renderer/components/UI/Dialog.js
index a23b74cc7c3..32899bad12b 100644
--- a/renderer/components/UI/Dialog.js
+++ b/renderer/components/UI/Dialog.js
@@ -24,12 +24,7 @@ const Dialog = ({ header, onClose, buttons, width, children }) => {
   )
 
   return (
-    <Card
-      bg="primaryColor"
-      borderRadius={5}
-      boxShadow="0 3px 4px 0 rgba(0, 0, 0, 0.5)"
-      width={width}
-    >
+    <Card bg="primaryColor" borderRadius={5} boxShadow="m" width={width}>
       <CloseButton onClick={onClose} size="s" />
       <Flex
         alignItems="center"
diff --git a/renderer/components/UI/Dropdown.js b/renderer/components/UI/Dropdown.js
index 1dd3eb9e4fa..3330f22e527 100644
--- a/renderer/components/UI/Dropdown.js
+++ b/renderer/components/UI/Dropdown.js
@@ -66,7 +66,7 @@ export const Menu = styled(Box)`
   overflow-y: auto;
   list-style-type: none;
   border-radius: 3px;
-  box-shadow: 0 3px 4px 0 rgba(30, 30, 30, 0.5);
+  box-shadow: ${themeGet('shadows.s')};
   right: ${props => (props.justify === 'right' ? 0 : null)};
 `
 
diff --git a/renderer/components/UI/GlobalStyle.js b/renderer/components/UI/GlobalStyle.js
index 2e59064af11..1cb2ff54a8f 100644
--- a/renderer/components/UI/GlobalStyle.js
+++ b/renderer/components/UI/GlobalStyle.js
@@ -117,7 +117,7 @@ const GlobalStyle = createGlobalStyle`
     line-height: 1.4;
     padding: 6px 10px;
     word-wrap: break-word;
-    box-shadow: 0 3px 4px 0 rgba(30, 30, 30, 0.5), 0 2px 4px 0 rgba(0, 0, 0, 0.5);
+    box-shadow: ${themeGet('shadows.s')};
   }
 
   [data-hint]:hover::before,
diff --git a/renderer/components/UI/Notification.js b/renderer/components/UI/Notification.js
index b6820af3366..e6d183e7cb8 100644
--- a/renderer/components/UI/Notification.js
+++ b/renderer/components/UI/Notification.js
@@ -42,7 +42,7 @@ class Notification extends React.Component {
     return (
       <Card
         borderRadius="5px"
-        boxShadow="0 3px 4px 0 rgba(30, 30, 30, 0.5)"
+        boxShadow="s"
         css={`
           cursor: pointer;
         `}
diff --git a/renderer/components/UI/Page.js b/renderer/components/UI/Page.js
index 7bf9a90caf8..185132c823f 100644
--- a/renderer/components/UI/Page.js
+++ b/renderer/components/UI/Page.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import { Flex } from 'rebass'
+import { themeGet } from 'styled-system'
 
 const Page = props => (
   <Flex
@@ -12,7 +13,7 @@ const Page = props => (
       overflow: hidden;
       min-width: 900px;
       min-height: 425px;
-      box-shadow: 0 20px 70px rgba(0, 0, 0, 0.55);
+      box-shadow: ${themeGet('shadows.l')};
     `}
     {...props}
   />
diff --git a/renderer/components/UI/Select.js b/renderer/components/UI/Select.js
index 12b0d40929b..a4169ed0d07 100644
--- a/renderer/components/UI/Select.js
+++ b/renderer/components/UI/Select.js
@@ -4,6 +4,7 @@ import { asField } from 'informed'
 import { compose } from 'redux'
 import { injectIntl, intlShape } from 'react-intl'
 import styled, { withTheme } from 'styled-components'
+import { themeGet } from 'styled-system'
 import Downshift from 'downshift'
 import { Box, Flex } from 'rebass'
 import system from '@rebass/components'
@@ -28,7 +29,7 @@ const SelectOptionList = styled.ul`
   transition: opacity 0.1s ease;
   background-color: ${props => props.theme.colors.secondaryColor};
   border-radius: 5px;
-  box-shadow: 0 3px 4px 0 rgba(30, 30, 30, 0.5);
+  box-shadow: ${themeGet('shadows.s')};
 `
 
 const SelectOptionItem = styled(
diff --git a/renderer/components/UI/Sidebar.js b/renderer/components/UI/Sidebar.js
index 16fe504e680..38e1007f487 100644
--- a/renderer/components/UI/Sidebar.js
+++ b/renderer/components/UI/Sidebar.js
@@ -1,10 +1,11 @@
 import React from 'react'
 import styled from 'styled-components'
+import { themeGet } from 'styled-system'
 import { Flex } from 'rebass'
 
 const SidebarBox = styled(Flex)`
   overflow: hidden;
-  box-shadow: 0 2px 24px 0 rgba(0, 0, 0, 0.5);
+  box-shadow: ${themeGet('shadows.m')};
   z-index: 1;
 `
 
diff --git a/renderer/components/UI/Toggle.js b/renderer/components/UI/Toggle.js
index fd0d4776247..f6c691bbf55 100644
--- a/renderer/components/UI/Toggle.js
+++ b/renderer/components/UI/Toggle.js
@@ -1,6 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
+import { themeGet } from 'styled-system'
 import { Flex } from 'rebass'
 import { BasicCheckbox, asField } from 'informed'
 import Text from './Text'
@@ -43,7 +44,7 @@ const Wrapper = styled.div`
     background-color: white;
     transition: 0.4s;
     border-radius: 50%;
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5);
+    box-shadow: ${themeGet('shadows.xs')};
   }
 
   input:checked + .slider {
diff --git a/renderer/components/UI/Tooltip.js b/renderer/components/UI/Tooltip.js
index 39e6482b845..62d413cf470 100644
--- a/renderer/components/UI/Tooltip.js
+++ b/renderer/components/UI/Tooltip.js
@@ -73,7 +73,7 @@ class Tooltip extends React.Component {
             bg="secondaryColor"
             border="1px solid gray"
             borderRadius={5}
-            boxShadow="0 3px 4px 0 rgba(30, 30, 30, 0.5)"
+            boxShadow="s"
             p={2}
             pl={3}
           >

From 90fcc84bf10611bfdab8c29b4354b5ff072bd03a Mon Sep 17 00:00:00 2001
From: Tom Kirkpatrick <tkp@kirkdesigns.co.uk>
Date: Mon, 5 Aug 2019 19:16:47 +0100
Subject: [PATCH 4/6] fix(ui): lighten shadows in light theme

fix #2680
---
 renderer/themes/base.js           | 6 +++---
 renderer/themes/dark/index.js     | 2 +-
 renderer/themes/light/index.js    | 5 ++++-
 renderer/themes/light/shadows.js  | 3 +++
 renderer/themes/util.js           | 9 +++++++--
 stories/_general/color.stories.js | 3 +--
 6 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 renderer/themes/light/shadows.js

diff --git a/renderer/themes/base.js b/renderer/themes/base.js
index ef0c04ba53e..d24ac9b96fd 100644
--- a/renderer/themes/base.js
+++ b/renderer/themes/base.js
@@ -1,10 +1,10 @@
 export const space = [0, 4, 8, 16, 32, 45, 72, 108]
 
 export const shadows = {
-  xs: '0 2px 4px 0 rgba(0, 0, 0, 0.5)',
-  s: ' 0 3px 4px 0 rgba(0, 0, 0, 0.3)',
+  xs: '0 2px 3px 0 rgba(0, 0, 0, 0.3)',
+  s: '0 2px 4px 0 rgba(0, 0, 0, 0.4)',
   m: '0 2px 24px 0 rgba(0, 0, 0, 0.5)',
-  l: '0 20px 70px rgba(0, 0, 0, 0.55)',
+  l: '0 20px 70px 0 rgba(0, 0, 0, 0.6)',
 }
 
 export const palette = {
diff --git a/renderer/themes/dark/index.js b/renderer/themes/dark/index.js
index a60a6363295..4d62ab7572c 100644
--- a/renderer/themes/dark/index.js
+++ b/renderer/themes/dark/index.js
@@ -1,4 +1,4 @@
 import createThemeVariant from '../util'
 import colors from './colors'
 
-export default createThemeVariant('dark', colors)
+export default createThemeVariant('dark', { colors })
diff --git a/renderer/themes/light/index.js b/renderer/themes/light/index.js
index c2688f6dcfd..a01c912f06d 100644
--- a/renderer/themes/light/index.js
+++ b/renderer/themes/light/index.js
@@ -1,4 +1,7 @@
 import createThemeVariant from '../util'
 import colors from './colors'
+import shadows from './shadows'
 
-export default createThemeVariant('light', colors)
+const theme = createThemeVariant('light', { colors, shadows })
+
+export default theme
diff --git a/renderer/themes/light/shadows.js b/renderer/themes/light/shadows.js
new file mode 100644
index 00000000000..2e9494f99a7
--- /dev/null
+++ b/renderer/themes/light/shadows.js
@@ -0,0 +1,3 @@
+export default {
+  m: '0 2px 12px 0 rgba(0, 0, 0, 0.2)',
+}
diff --git a/renderer/themes/util.js b/renderer/themes/util.js
index c614c35319d..7d090aaf36c 100644
--- a/renderer/themes/util.js
+++ b/renderer/themes/util.js
@@ -1,7 +1,10 @@
 import { tint } from 'polished'
+import merge from 'lodash/merge'
 import base from './base'
 
-const createThemeVariant = (name, colors) => {
+const createThemeVariant = (name, overrides = {}) => {
+  const { colors, ...rest } = overrides
+
   const buttons = {
     normal: {
       backgroundColor: colors.tertiaryColor,
@@ -82,7 +85,7 @@ const createThemeVariant = (name, colors) => {
     },
   }
 
-  return {
+  const theme = {
     name,
     ...base,
     colors,
@@ -90,6 +93,8 @@ const createThemeVariant = (name, colors) => {
     cards,
     messages,
   }
+
+  return merge({}, theme, rest)
 }
 
 export default createThemeVariant
diff --git a/stories/_general/color.stories.js b/stories/_general/color.stories.js
index 724d1921a3d..2bf2bb49085 100644
--- a/stories/_general/color.stories.js
+++ b/stories/_general/color.stories.js
@@ -11,9 +11,8 @@ const Swatch = ({ name, color }) => (
   <Element>
     <Flex mb={2}>
       <Card
-        // bg={color}
         borderRadius={8}
-        boxShadow="0 2px 6px rgba(0, 0, 0, 0.3)"
+        boxShadow="s"
         css={`
           background: ${color};
           height: 50px;

From 28e1d861004233f806a9fb6038e8469fffc58cd8 Mon Sep 17 00:00:00 2001
From: Tom Kirkpatrick <tkp@kirkdesigns.co.uk>
Date: Mon, 5 Aug 2019 21:03:57 +0100
Subject: [PATCH 5/6] test(unit): update test snapshots

---
 test/unit/components/UI/__snapshots__/Card.spec.js.snap       | 2 +-
 test/unit/components/UI/__snapshots__/Dialog.spec.js.snap     | 4 ++--
 test/unit/components/UI/__snapshots__/Modal.spec.js.snap      | 1 -
 .../components/UI/__snapshots__/Notification.spec.js.snap     | 2 +-
 test/unit/components/UI/__snapshots__/Page.spec.js.snap       | 1 -
 test/unit/components/UI/__snapshots__/Sidebar.spec.js.snap    | 1 -
 test/unit/components/UI/__snapshots__/Toggle.spec.js.snap     | 2 +-
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/test/unit/components/UI/__snapshots__/Card.spec.js.snap b/test/unit/components/UI/__snapshots__/Card.spec.js.snap
index a85da7d7d37..bf976acf523 100644
--- a/test/unit/components/UI/__snapshots__/Card.spec.js.snap
+++ b/test/unit/components/UI/__snapshots__/Card.spec.js.snap
@@ -5,7 +5,7 @@ exports[`component.UI.Card should render correctly 1`] = `
   as="section"
   bg="primaryColor"
   borderRadius={5}
-  boxShadow="0 2px 24px 0 rgba(0, 0, 0, 0.5)"
+  boxShadow="m"
   color="primaryText"
   p={3}
 >
diff --git a/test/unit/components/UI/__snapshots__/Dialog.spec.js.snap b/test/unit/components/UI/__snapshots__/Dialog.spec.js.snap
index 4f71252f18c..fabc0b7dc87 100644
--- a/test/unit/components/UI/__snapshots__/Dialog.spec.js.snap
+++ b/test/unit/components/UI/__snapshots__/Dialog.spec.js.snap
@@ -63,7 +63,7 @@ exports[`component.UI.Dialog should render correctly with one button 1`] = `
 <Styled(styled.div)
   bg="primaryColor"
   borderRadius={5}
-  boxShadow="0 3px 4px 0 rgba(0, 0, 0, 0.5)"
+  boxShadow="m"
   width={550}
 >
   <CloseButton
@@ -117,7 +117,7 @@ exports[`component.UI.Dialog should render correctly with two buttons 1`] = `
 <Styled(styled.div)
   bg="primaryColor"
   borderRadius={5}
-  boxShadow="0 3px 4px 0 rgba(0, 0, 0, 0.5)"
+  boxShadow="m"
   width={550}
 >
   <CloseButton
diff --git a/test/unit/components/UI/__snapshots__/Modal.spec.js.snap b/test/unit/components/UI/__snapshots__/Modal.spec.js.snap
index f3efd0bf08e..40086a9fd48 100644
--- a/test/unit/components/UI/__snapshots__/Modal.spec.js.snap
+++ b/test/unit/components/UI/__snapshots__/Modal.spec.js.snap
@@ -34,7 +34,6 @@ exports[`component.UI.Modal should render correctly 1`] = `
   overflow: hidden;
   min-width: 900px;
   min-height: 425px;
-  box-shadow: 0 20px 70px rgba(0,0,0,0.55);
 }
 
 .c1 {
diff --git a/test/unit/components/UI/__snapshots__/Notification.spec.js.snap b/test/unit/components/UI/__snapshots__/Notification.spec.js.snap
index b12eb4a6bd6..1ef91f4630a 100644
--- a/test/unit/components/UI/__snapshots__/Notification.spec.js.snap
+++ b/test/unit/components/UI/__snapshots__/Notification.spec.js.snap
@@ -50,7 +50,7 @@ exports[`component.UI.Notification should render correctly 1`] = `
   padding-right: 16px;
   border-radius: 5px;
   border-radius: 5px;
-  box-shadow: 0 3px 4px 0 rgba(30,30,30,0.5);
+  box-shadow: s;
   cursor: pointer;
 }
 
diff --git a/test/unit/components/UI/__snapshots__/Page.spec.js.snap b/test/unit/components/UI/__snapshots__/Page.spec.js.snap
index 650b4655c69..ae9027617c9 100644
--- a/test/unit/components/UI/__snapshots__/Page.spec.js.snap
+++ b/test/unit/components/UI/__snapshots__/Page.spec.js.snap
@@ -14,7 +14,6 @@ exports[`component.UI.Page should render correctly 1`] = `
   overflow: hidden;
   min-width: 900px;
   min-height: 425px;
-  box-shadow: 0 20px 70px rgba(0,0,0,0.55);
 }
 
 <article
diff --git a/test/unit/components/UI/__snapshots__/Sidebar.spec.js.snap b/test/unit/components/UI/__snapshots__/Sidebar.spec.js.snap
index f86708544ff..696fed98528 100644
--- a/test/unit/components/UI/__snapshots__/Sidebar.spec.js.snap
+++ b/test/unit/components/UI/__snapshots__/Sidebar.spec.js.snap
@@ -14,7 +14,6 @@ exports[`component.UI.Sidebar should render correctly 1`] = `
   -ms-flex-direction: column;
   flex-direction: column;
   overflow: hidden;
-  box-shadow: 0 2px 24px 0 rgba(0,0,0,0.5);
   z-index: 1;
 }
 
diff --git a/test/unit/components/UI/__snapshots__/Toggle.spec.js.snap b/test/unit/components/UI/__snapshots__/Toggle.spec.js.snap
index 34764d54988..3301af48a0c 100644
--- a/test/unit/components/UI/__snapshots__/Toggle.spec.js.snap
+++ b/test/unit/components/UI/__snapshots__/Toggle.spec.js.snap
@@ -50,7 +50,7 @@ exports[`component.UI.Toggle should render correctly 1`] = `
   -webkit-transition: 0.4s;
   transition: 0.4s;
   border-radius: 50%;
-  box-shadow: 0 2px 4px 0 rgba(0,0,0,0.5);
+  box-shadow: 0 2px 3px 0 rgba(0,0,0,0.3);
 }
 
 .c0 input:checked + .slider {

From a6b8d873fa1a96f8a8804886e38623695c6ba601 Mon Sep 17 00:00:00 2001
From: Tom Kirkpatrick <tkp@kirkdesigns.co.uk>
Date: Wed, 7 Aug 2019 13:16:39 +0100
Subject: [PATCH 6/6] chore(deps): update dependency electron to v5.0.9

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4655755b062..2bd1e2eeb96 100644
--- a/package.json
+++ b/package.json
@@ -246,7 +246,7 @@
     "cross-env": "5.2.0",
     "cross-spawn": "6.0.5",
     "csp-html-webpack-plugin": "3.0.2",
-    "electron": "5.0.6",
+    "electron": "5.0.9",
     "electron-builder": "20.41.0",
     "electron-devtools-installer": "2.2.4",
     "electron-updater": "4.0.6",
diff --git a/yarn.lock b/yarn.lock
index 955ea431818..01496871298 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6869,10 +6869,10 @@ electron-updater@4.0.6:
     semver "^5.6.0"
     source-map-support "^0.5.9"
 
-electron@5.0.6:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.6.tgz#e3ca4a58b5716fceef3fb64e1fd2222dd9c51de0"
-  integrity sha512-0L53lv26eDhaaNxL6DqXGQrQOEAYbrQg40stRSb2pzrY06kwPbABzXEiaCvEsBuKUQ+9OQBbVyyvXRbLJlun/A==
+electron@5.0.9:
+  version "5.0.9"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.9.tgz#d7000dcb69b74a85b81cb168e7ffdcac254464e5"
+  integrity sha512-yCt+lnQr47OWB3Oei19odMVB8VKzecTwZLm75PB56f/keeJAM3UqV7+dtjKlPdKt0hJ4sWxe4vjxGPO/oZDv7A==
   dependencies:
     "@types/node" "^10.12.18"
     electron-download "^4.1.0"