From 6ae9e465b2497dd380b009976035f96767cd82d1 Mon Sep 17 00:00:00 2001 From: meriadec Date: Tue, 24 Apr 2018 17:57:39 +0200 Subject: [PATCH 1/3] Start PlugYourDevice component --- src/components/ManagerPage/PlugYourDevice.js | 33 +++++++++++++++++++ .../stories/PlugYourDevice.stories.js | 18 ++++++++++ static/i18n/en/manager.yml | 4 +++ 3 files changed, 55 insertions(+) create mode 100644 src/components/ManagerPage/PlugYourDevice.js create mode 100644 src/components/ManagerPage/stories/PlugYourDevice.stories.js diff --git a/src/components/ManagerPage/PlugYourDevice.js b/src/components/ManagerPage/PlugYourDevice.js new file mode 100644 index 00000000..cae605be --- /dev/null +++ b/src/components/ManagerPage/PlugYourDevice.js @@ -0,0 +1,33 @@ +// @flow + +import React from 'react' +import { translate } from 'react-i18next' + +import type { T } from 'types/common' + +import Box, { Card } from 'components/base/Box' +import Button from 'components/base/Button' + +type Props = { + t: T, +} + +function PlugYourDevice(props: Props) { + const { t } = props + return ( + + + hey + + {t('manager:plugYourDevice.title')} + + + {t('manager:plugYourDevice.desc')} + + + + + ) +} + +export default translate()(PlugYourDevice) diff --git a/src/components/ManagerPage/stories/PlugYourDevice.stories.js b/src/components/ManagerPage/stories/PlugYourDevice.stories.js new file mode 100644 index 00000000..cc389e29 --- /dev/null +++ b/src/components/ManagerPage/stories/PlugYourDevice.stories.js @@ -0,0 +1,18 @@ +// @flow + +import React from 'react' + +import { storiesOf } from '@storybook/react' +import { text, select } from '@storybook/addon-knobs' +import { action } from '@storybook/addon-actions' + +import Box from 'components/base/Box' +import PlugYourDevice from '../PlugYourDevice' + +const stories = storiesOf('Components', module) + +stories.add('PlugYourDevice', () => ( + + + +)) diff --git a/static/i18n/en/manager.yml b/static/i18n/en/manager.yml index 49396b36..a01c4a6f 100644 --- a/static/i18n/en/manager.yml +++ b/static/i18n/en/manager.yml @@ -3,3 +3,7 @@ tabs: device: My device install: Install allApps: All apps +plugYourDevice: + title: Plug your device + desc: Lorem Ipsum is simply dummy text of the printing and typesetting industry’s standard dummy text + cta: Plug my device From 990676d76bb271b7136f6ea63e85b7fcba25a7dd Mon Sep 17 00:00:00 2001 From: meriadec Date: Wed, 25 Apr 2018 09:56:09 +0200 Subject: [PATCH 2/3] Ledger Wallet Desktop -> Ledger Live --- electron-builder.yml | 4 ++-- package.json | 8 ++++---- scripts/publish-storybook.sh | 2 +- src/components/ThrowBlock.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/electron-builder.yml b/electron-builder.yml index 6c182462..39cfac08 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,9 +1,9 @@ -appId: com.ledger.desktop +appId: com.ledger.live buildDependenciesFromSource: true protocols: - name: Ledger Wallet Desktop + name: Ledger Live schemes: - ledgerhq diff --git a/package.json b/package.json index dc0051a9..11a990f7 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "ledger-wallet-desktop", - "productName": "Ledger Wallet Desktop", - "description": "Ledger Wallet Desktop", - "repository": "https://github.com/LedgerHQ/ledger-wallet-desktop", + "name": "ledger-live-desktop", + "productName": "Ledger Live", + "description": "Ledger Live - Desktop", + "repository": "https://github.com/LedgerHQ/ledger-live-desktop", "version": "0.1.0", "author": "Ledger", "license": "MIT", diff --git a/scripts/publish-storybook.sh b/scripts/publish-storybook.sh index 33e39b1c..2155b071 100755 --- a/scripts/publish-storybook.sh +++ b/scripts/publish-storybook.sh @@ -11,7 +11,7 @@ cp -R static/fonts/rubik storybook-static/static/fonts cd storybook-static git init -git remote add origin git@github.com:LedgerHQ/ledger-wallet-desktop.git +git remote add origin git@github.com:LedgerHQ/ledger-live-desktop.git git add . git commit -m 'deploy storybook' git push -f origin master:gh-pages diff --git a/src/components/ThrowBlock.js b/src/components/ThrowBlock.js index 0e98a92d..85a3f386 100644 --- a/src/components/ThrowBlock.js +++ b/src/components/ThrowBlock.js @@ -60,7 +60,7 @@ ${error.stack} \`\`\` `, }) - shell.openExternal(`https://github.com/LedgerHQ/ledger-wallet-desktop/issues/new?${q}`) + shell.openExternal(`https://github.com/LedgerHQ/ledger-live-desktop/issues/new?${q}`) } handleRestart = () => { From 9be6fa82828b9b0b49080b7b37cab6ecdcde75ce Mon Sep 17 00:00:00 2001 From: meriadec Date: Wed, 25 Apr 2018 10:17:37 +0200 Subject: [PATCH 3/3] Fix lint --- .../__snapshots__/CounterValue.test.js.snap | 12 ++++++------ .../ManagerPage/stories/PlugYourDevice.stories.js | 2 -- .../__snapshots__/FormattedVal.test.js.snap | 12 ++++++------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/components/CounterValue/__tests__/__snapshots__/CounterValue.test.js.snap b/src/components/CounterValue/__tests__/__snapshots__/CounterValue.test.js.snap index cba5af6d..aec99b44 100644 --- a/src/components/CounterValue/__tests__/__snapshots__/CounterValue.test.js.snap +++ b/src/components/CounterValue/__tests__/__snapshots__/CounterValue.test.js.snap @@ -2,7 +2,7 @@ exports[`components CounterValue basic 1`] = `
+ USD 10.00 @@ -11,7 +11,7 @@ exports[`components CounterValue basic 1`] = ` exports[`components CounterValue specifying ticker different from default 1`] = `
+ USD 5.00 @@ -20,7 +20,7 @@ exports[`components CounterValue specifying ticker different from default 1`] = exports[`components CounterValue using countervalue different from default 1`] = `
+ EUR 0.42 @@ -29,7 +29,7 @@ exports[`components CounterValue using countervalue different from default 1`] = exports[`components CounterValue with time travel whith date in countervalues 1`] = `
+ USD 20.00 @@ -38,7 +38,7 @@ exports[`components CounterValue with time travel whith date in countervalues 1` exports[`components CounterValue with time travel whith date not in countervalues 1`] = `
+ USD 0.00 @@ -47,7 +47,7 @@ exports[`components CounterValue with time travel whith date not in countervalue exports[`components CounterValue without countervalues populated 1`] = `
+ USD 0.00 diff --git a/src/components/ManagerPage/stories/PlugYourDevice.stories.js b/src/components/ManagerPage/stories/PlugYourDevice.stories.js index cc389e29..57daf1ff 100644 --- a/src/components/ManagerPage/stories/PlugYourDevice.stories.js +++ b/src/components/ManagerPage/stories/PlugYourDevice.stories.js @@ -3,8 +3,6 @@ import React from 'react' import { storiesOf } from '@storybook/react' -import { text, select } from '@storybook/addon-knobs' -import { action } from '@storybook/addon-actions' import Box from 'components/base/Box' import PlugYourDevice from '../PlugYourDevice' diff --git a/src/components/base/FormattedVal/__tests__/__snapshots__/FormattedVal.test.js.snap b/src/components/base/FormattedVal/__tests__/__snapshots__/FormattedVal.test.js.snap index 6fc26571..b95bf036 100644 --- a/src/components/base/FormattedVal/__tests__/__snapshots__/FormattedVal.test.js.snap +++ b/src/components/base/FormattedVal/__tests__/__snapshots__/FormattedVal.test.js.snap @@ -2,7 +2,7 @@ exports[`components FormattedVal renders a fiat 1`] = `
20.00 @@ -11,7 +11,7 @@ exports[`components FormattedVal renders a fiat 1`] = ` exports[`components FormattedVal renders a formatted val 1`] = `
4 @@ -20,7 +20,7 @@ exports[`components FormattedVal renders a formatted val 1`] = ` exports[`components FormattedVal renders a percent 1`] = `
30 % @@ -29,7 +29,7 @@ exports[`components FormattedVal renders a percent 1`] = ` exports[`components FormattedVal shows code 1`] = `
BTC 4 @@ -38,7 +38,7 @@ exports[`components FormattedVal shows code 1`] = ` exports[`components FormattedVal shows sign 1`] = `
+ 4 @@ -47,7 +47,7 @@ exports[`components FormattedVal shows sign 1`] = ` exports[`components FormattedVal shows sign 2`] = `
- 4