Merge pull request #670 from gre/pixel-push-khalil

Pixel push w khalil

src/components/BalanceSummary/index.js

@@ -56,7 +56,7 @@ const BalanceSummary = ({
               <Chart
                 id={chartId}
                 unit={account ? account.unit : null}
-                color={!isAvailable ? '#eee' : chartColor}
+                color={!isAvailable ? 'rgba(0,0,0,0.04)' : chartColor}
                 data={
                   isAvailable
                     ? balanceHistory

src/components/IsUnlocked.js

@@ -10,7 +10,7 @@ import { translate } from 'react-i18next'
 
 import type { SettingsState as Settings } from 'reducers/settings'
 import type { T } from 'types/common'
-import IconLockScreen from 'icons/LockScreen'
+import { i } from 'helpers/staticPath'
 import IconTriangleWarning from 'icons/TriangleWarning'
 import get from 'lodash/get'
 
@@ -152,7 +152,18 @@ class IsUnlocked extends Component<Props, State> {
         <Box sticky alignItems="center" justifyContent="center">
           <form onSubmit={this.handleSubmit}>
             <Box align="center">
-              <IconLockScreen size={136} />
+              <div
+                style={{
+                  padding: 14,
+                  backgroundColor: 'white',
+                  borderRadius: 80,
+                  fontSize: 0,
+                  marginBottom: 40,
+                  boxShadow: '0 2px 23px 0 rgba(0, 0, 0, 0.08)',
+                }}
+              >
+                <img alt="" src={i('ledgerlive-logo.svg')} width={50} height={50} />
+              </div>
               <PageTitle>{t('app:common.lockScreen.title')}</PageTitle>
               <LockScreenDesc>
                 {t('app:common.lockScreen.subTitle')}

src/components/Onboarding/helperComponents.js

@@ -20,15 +20,16 @@ export const Title = styled(Box).attrs({
 export const StepContainerInner = styled(GrowScroll).attrs({ pb: 6, align: 'center' })``
 
 export const Description = styled(Box).attrs({
-  ff: 'Museo Sans|Light',
+  ff: 'Museo Sans|Regular',
   fontSize: 5,
   lineHeight: 1.5,
   textAlign: 'center',
   color: 'grey',
 })`
   margin: 10px auto 25px;
-  max-width: 570px;
+  max-width: 600px;
 `
+
 export const Inner = styled(Box).attrs({
   horizontal: true,
   grow: true,

src/components/Onboarding/steps/GenuineCheck.js

@@ -353,7 +353,7 @@ export function GenuineCheckFail({
   )
 }
 export const GenuineSuccessText = styled(Box).attrs({
-  ff: 'Open Sans|Regular',
+  ff: 'Open Sans|SemiBold',
   fontSize: 4,
 })``
 

src/components/Onboarding/steps/Init.js

@@ -7,12 +7,12 @@ import { colors } from 'styles/theme'
 import styled from 'styled-components'
 import { flowType } from 'reducers/onboarding'
 import Box from 'components/base/Box'
-import IconUser from 'icons/User'
 import IconPlus from 'icons/Plus'
 import IconRecover from 'icons/Recover'
 import IconCheck from 'icons/Check'
 import IconExternalLink from 'icons/ExternalLink'
 import IconChevronRight from 'icons/ChevronRight'
+import { i } from 'helpers/staticPath'
 import { Title } from '../helperComponents'
 
 import type { StepProps } from '..'
@@ -66,7 +66,7 @@ class Init extends PureComponent<StepProps, *> {
       <Box sticky justifyContent="center">
         <Box align="center">
           <Box color="wallet">
-            <IconUser size={36} />
+            <img alt="" src={i('ledgerlive-logo.svg')} width={50} height={50} />
           </Box>
           <Box m={5} style={{ maxWidth: 480 }}>
             <Title>{t('onboarding:init.title')}</Title>

src/components/SettingsPage/SettingsSection.js

@@ -84,6 +84,7 @@ const SettingsSectionRowContainer = styled(Box).attrs({
   horizontal: true,
   align: 'center',
   relative: true,
+  justifyContent: 'space-between',
 })`
   cursor: ${p => (p.onClick ? 'pointer' : '')};
 `
@@ -101,7 +102,7 @@ export function SettingsSectionRow({
 }) {
   return (
     <SettingsSectionRowContainer onClick={onClick} tabIndex={-1}>
-      <Box grow shrink>
+      <Box grow shrink style={{ marginRight: '20%' }}>
         <Box ff="Open Sans|SemiBold" color="dark" fontSize={4}>
           {title}
         </Box>

src/components/SettingsPage/sections/Display.js

@@ -153,7 +153,7 @@ class TabProfile extends PureComponent<Props, State> {
             title={t('app:settings.display.counterValue')}
             desc={t('app:settings.display.counterValueDesc')}
           >
-            <Box horizontal flow={2}>
+            <Box flow={2}>
               <Select
                 small
                 minWidth={250}

src/components/TranslatedError.js

@@ -19,9 +19,11 @@ class TranslatedError extends PureComponent<Props> {
     const { t, error } = this.props
     if (!error) return null
     if (typeof error === 'string') return error
-    const translation = t(`errors:${error.name}`, error)
+    if (error.name) {
-    if (translation) {
+      const translation = t(`errors:${error.name}`, error)
-      return translation
+      if (translation) {
+        return translation
+      }
     }
     logger.warn(`TranslatedError: no translation for '${error.name}'`, error)
     return error.message || error.name || t('errors:generic')

src/components/base/Input/index.js

@@ -28,6 +28,7 @@ const ErrorDisplay = styled(Box)`
   bottom: -20px;
   left: 0px;
   font-size: 12px;
+  white-space: nowrap;
   color: ${p => p.theme.colors.pearl};
 `
 

src/components/modals/OperationDetails.js

@@ -109,7 +109,7 @@ const OperationDetails = connect(mapStateToProps)((props: Props) => {
     <ModalBody onClose={onClose}>
       <ModalTitle>{t('app:operationDetails.title')}</ModalTitle>
       <ModalContent style={{ height: 500 }} mx={-5} pb={0}>
-        <GrowScroll px={5} pb={8}>
+        <GrowScroll px={5} pt={1} pb={8}>
           <Box flow={3}>
             <Box alignItems="center" mt={1}>
               <ConfirmationCheck

src/components/modals/Send/04-step-confirmation.js

@@ -24,7 +24,7 @@ const Container = styled(Box).attrs({
 const Title = styled(Box).attrs({
   ff: 'Museo Sans',
   fontSize: 5,
-  mt: 4,
+  mt: 2,
 })`
   text-align: center;
 `

static/i18n/en/app.yml

@@ -35,7 +35,7 @@ common:
     title: Welcome back
     subTitle: Ledger Live is locked
     description: Enter your password to continue
-    inputPlaceholder:
+    inputPlaceholder: Type your password
     lostPassword: I lost my password
   sync:
     syncing: Synchronizing...