Browse Source

Merge pull request #462 from gre/bump-deps

bump some deps
master
Gaëtan Renaudeau 7 years ago
committed by GitHub
parent
commit
621c11ada6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      .eslintrc
  2. 3
      .flowconfig
  3. 22
      package.json
  4. 2
      src/actions/accounts.js
  5. 7
      src/bridge/LibcoreBridge.js
  6. 2
      src/bridge/RippleJSBridge.js
  7. 4
      src/bridge/types.js
  8. 3
      src/components/SelectAccount/stories.js
  9. 12
      src/components/SelectExchange.js
  10. 2
      src/styles/helpers.js
  11. 1502
      yarn.lock

8
.eslintrc

@ -55,6 +55,14 @@
"react/jsx-no-target-blank": 0,
"react/prefer-stateless-function": 0,
"react/require-default-props": 0,
"react/sort-comp": [1, {
order: [
'static-methods',
'lifecycle',
'everything-else',
'render'
]
}]
},
"settings": {
"import/resolver": {

3
.flowconfig

@ -3,6 +3,9 @@
<PROJECT_ROOT>/node_modules/config-chain/test/broken.json
<PROJECT_ROOT>/node_modules/npm/node_modules/config-chain/test/broken.json
[untyped]
.*/node_modules/react-select
[include]
[libs]

22
package.json

@ -52,9 +52,9 @@
"cross-env": "^5.1.4",
"d3": "^5.1.0",
"debug": "^3.1.0",
"downshift": "^1.31.9",
"downshift": "^1.31.15",
"eip55": "^1.0.3",
"electron-store": "^1.3.0",
"electron-store": "^2.0.0",
"electron-updater": "^2.21.8",
"ethereumjs-tx": "^1.3.4",
"fuse.js": "^3.2.0",
@ -63,7 +63,7 @@
"i18next-node-fs-backend": "^1.0.0",
"invariant": "^2.2.4",
"lodash": "^4.17.5",
"moment": "^2.22.1",
"moment": "^2.22.2",
"qrcode": "^1.2.0",
"qrcode-reader": "^1.0.4",
"qs": "^6.5.1",
@ -71,7 +71,7 @@
"raven-js": "^3.24.2",
"react": "^16.3.2",
"react-dom": "^16.3.2",
"react-i18next": "^7.6.0",
"react-i18next": "^7.7.0",
"react-mortal": "^3.2.0",
"react-motion": "^0.5.2",
"react-redux": "^5.0.7",
@ -80,10 +80,10 @@
"react-router-redux": "5.0.0-alpha.9",
"react-select": "2.0.0-beta.6",
"react-smooth-scrollbar": "^8.0.6",
"react-spring": "^4.2.1",
"react-spring": "^5.3.8",
"redux": "^4.0.0",
"redux-actions": "^2.3.0",
"redux-thunk": "^2.2.0",
"redux-actions": "^2.4.0",
"redux-thunk": "^2.3.0",
"reselect": "^3.0.1",
"ripple-binary-codec": "^0.1.13",
"ripple-bs58check": "^2.0.2",
@ -94,9 +94,9 @@
"secp256k1": "3.3.1",
"semaphore": "^1.1.0",
"smooth-scrollbar": "^8.2.7",
"source-map": "0.7.2",
"source-map": "0.7.3",
"source-map-support": "^0.5.4",
"styled-components": "^3.2.6",
"styled-components": "^3.3.2",
"styled-system": "^2.2.1",
"tippy.js": "^2.5.2",
"uncontrollable": "^6.0.0",
@ -127,7 +127,7 @@
"chance": "^1.0.13",
"concurrently": "^3.5.1",
"dotenv": "^5.0.1",
"electron": "1.8.4",
"electron": "2.0.2",
"electron-builder": "^20.9.0",
"electron-devtools-installer": "^2.2.3",
"electron-rebuild": "^1.7.3",
@ -140,7 +140,7 @@
"eslint-plugin-import": "^2.11.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.7.0",
"flow-bin": "^0.69.0",
"flow-bin": "^0.73.0",
"flow-typed": "^2.4.0",
"hard-source-webpack-plugin": "^0.6.0",
"husky": "^0.14.3",

2
src/actions/accounts.js

@ -42,7 +42,7 @@ export type UpdateAccount = ($Shape<Account>) => *
export const updateAccount: UpdateAccount = payload => ({
type: 'DB:UPDATE_ACCOUNT',
payload: {
updater: account => ({ ...account, ...payload }),
updater: (account: Account) => ({ ...account, ...payload }),
accountId: payload.id,
},
})

7
src/bridge/LibcoreBridge.js

@ -7,7 +7,6 @@ import FeesBitcoinKind from 'components/FeesField/BitcoinKind'
import libcoreScanAccounts from 'commands/libcoreScanAccounts'
import libcoreSyncAccount from 'commands/libcoreSyncAccount'
import libcoreSignAndBroadcast from 'commands/libcoreSignAndBroadcast'
// import AdvancedOptionsBitcoinKind from 'components/AdvancedOptions/BitcoinKind'
import type { WalletBridge, EditProps } from './types'
const notImplemented = new Error('LibcoreBridge: not implemented')
@ -28,8 +27,8 @@ const EditFees = ({ account, onChange, value }: EditProps<Transaction>) => (
/>
)
const EditAdvancedOptions = undefined // Not implemented yet
/*
import AdvancedOptionsBitcoinKind from 'components/AdvancedOptions/BitcoinKind'
const EditAdvancedOptions = ({ onChange, value }: EditProps<Transaction>) => (
<AdvancedOptionsBitcoinKind
isRBF={value.isRBF}
@ -124,11 +123,9 @@ const LibcoreBridge: WalletBridge<Transaction> = {
getTransactionRecipient: (a, t) => t.recipient,
// $FlowFixMe why?
EditFees,
// $FlowFixMe why?
EditAdvancedOptions,
// EditAdvancedOptions,
isValidTransaction: (a, t) => (t.amount > 0 && t.recipient && true) || false,

2
src/bridge/RippleJSBridge.js

@ -377,10 +377,8 @@ const RippleJSBridge: WalletBridge<Transaction> = {
recipient,
}),
// $FlowFixMe
EditFees,
// $FlowFixMe
EditAdvancedOptions,
getTransactionRecipient: (a, t) => t.recipient,

4
src/bridge/types.js

@ -79,10 +79,10 @@ export interface WalletBridge<Transaction> {
isValidTransaction(account: Account, transaction: Transaction): boolean;
// render the whole Fees section of the form
EditFees?: React$ComponentType<EditProps<Transaction>>;
EditFees?: *; // React$ComponentType<EditProps<Transaction>>;
// render the whole advanced part of the form
EditAdvancedOptions?: React$ComponentType<EditProps<Transaction>>;
EditAdvancedOptions?: *; // React$ComponentType<EditProps<Transaction>>;
canBeSpent(account: Account, transaction: Transaction): Promise<boolean>;

3
src/components/SelectAccount/stories.js

@ -1,6 +1,7 @@
// @flow
import React, { Component } from 'react'
import type { Account } from '@ledgerhq/live-common/lib/types'
import { storiesOf } from '@storybook/react'
import { genAccount } from '@ledgerhq/live-common/lib/mock/account'
@ -8,7 +9,7 @@ import { SelectAccount } from 'components/SelectAccount'
const stories = storiesOf('Components', module)
export const accounts = [...Array(20)].map((_, i) => genAccount(i))
export const accounts: Account[] = [...Array(20)].map((_, i) => genAccount(i))
class Wrapper extends Component<any, any> {
state = {

12
src/components/SelectExchange.js

@ -22,6 +22,12 @@ class ExchangeSelect extends Component<
error: ?Error,
},
> {
state = {
prevFromTo: '', // eslint-disable-line
exchanges: null,
error: null,
}
static getDerivedStateFromProps(nextProps: *, prevState: *) {
const fromTo = `${nextProps.from.ticker}/${nextProps.to.ticker}`
if (fromTo !== prevState.prevFromTo) {
@ -33,12 +39,6 @@ class ExchangeSelect extends Component<
return null
}
state = {
prevFromTo: '', // eslint-disable-line
exchanges: null,
error: null,
}
componentDidMount() {
this._load()
}

2
src/styles/helpers.js

@ -55,7 +55,7 @@ export const fontFace = ({
}
`
export const multiline = (str: string) =>
export const multiline = (str: string): React$Node[] =>
str.split('\n').map(line => <p key={uniqueId()}>{line}</p>)
export function getMarketColor({

1502
yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save