From b22471fa61a81c0edc19764f6227c521233afae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=ABck=20V=C3=A9zien?= Date: Fri, 2 Mar 2018 14:15:16 +0100 Subject: [PATCH] Fix sync, change Defer on TransactionList, fix Tooltip on Chart --- src/components/TransactionsList/index.js | 31 +-- src/components/base/Chart/index.js | 10 +- .../modals/AddAccount/ImportAccounts.js | 2 +- src/helpers/btc.js | 9 +- src/internals/usb/wallet/accounts.js | 6 +- src/reducers/accounts.js | 9 - src/renderer/events.js | 21 +- yarn.lock | 198 +++++++++--------- 8 files changed, 148 insertions(+), 138 deletions(-) diff --git a/src/components/TransactionsList/index.js b/src/components/TransactionsList/index.js index 1cdf589d..64ec682f 100644 --- a/src/components/TransactionsList/index.js +++ b/src/components/TransactionsList/index.js @@ -206,19 +206,20 @@ class TransactionsList extends Component { this._hashCache = this.getHashCache(transactions) return ( - - - {t('transactionsList:date')} - {withAccounts && ( - {t('transactionsList:account')} - )} - {t('transactionsList:address')} - - {t('transactionsList:amount')} - - - - + + + + {t('transactionsList:date')} + {withAccounts && ( + {t('transactionsList:account')} + )} + {t('transactionsList:address')} + + {t('transactionsList:amount')} + + + + {transactions.map(trans => ( { /> ))} - - + + ) } } diff --git a/src/components/base/Chart/index.js b/src/components/base/Chart/index.js index 85b94102..fe8e99dc 100644 --- a/src/components/base/Chart/index.js +++ b/src/components/base/Chart/index.js @@ -196,7 +196,7 @@ const areaChartTooltip = ({ renderLabels }: { renderLabels: Function }) => ( fill: colors.dark, stroke: null, }} - width={a => space[2] * 2 + renderLabels(a).length * 5.2} // Approximatif size of char for calculate Tooltip witdh + width={a => space[2] * 2 + renderLabels(a).length * 5.2} // Approximatif size of char for calculate Tooltip width /> ) @@ -214,6 +214,10 @@ export class AreaChart extends PureComponent { ...DEFAULT_PROPS, } + _tooltip = areaChartTooltip({ + renderLabels: this.props.renderLabels, + }) + render() { const { color, @@ -290,9 +294,7 @@ export class AreaChart extends PureComponent { data={data} x="name" y="value" - labelComponent={areaChartTooltip({ - renderLabels, - })} + labelComponent={this._tooltip} labels={renderLabels} style={{ data: { diff --git a/src/components/modals/AddAccount/ImportAccounts.js b/src/components/modals/AddAccount/ImportAccounts.js index 706727bb..b4dbbf3d 100644 --- a/src/components/modals/AddAccount/ImportAccounts.js +++ b/src/components/modals/AddAccount/ImportAccounts.js @@ -27,7 +27,7 @@ class ImportAccounts extends PureComponent { accountsSelected: [], accountsName: this.props.accounts.reduce((result, value, index) => { result[value.id] = { - placeholder: this.props.t(`addAccount:placeholder`, { + placeholder: this.props.t(`addAccount:import.placeholder`, { index: index + 1, }), } diff --git a/src/helpers/btc.js b/src/helpers/btc.js index 9df36216..ddc62008 100644 --- a/src/helpers/btc.js +++ b/src/helpers/btc.js @@ -147,9 +147,14 @@ export async function getAccount({ allAddresses = [...new Set([...allAddresses, ...listAddresses])] + let txs = [] + const transactionsOpts = { coin_type: coinType } - let txs = await ledger.getTransactions(listAddresses, transactionsOpts) - txs = txs.filter(t => !allTxsHash.includes(t.hash)).reverse() + + try { + txs = await ledger.getTransactions(listAddresses, transactionsOpts) + txs = txs.filter(t => !allTxsHash.includes(t.hash)).reverse() + } catch (e) {} // eslint-disable-line no-empty const hasTransactions = txs.length > 0 diff --git a/src/internals/usb/wallet/accounts.js b/src/internals/usb/wallet/accounts.js index d2f9359e..038fcc53 100644 --- a/src/internals/usb/wallet/accounts.js +++ b/src/internals/usb/wallet/accounts.js @@ -148,12 +148,12 @@ export default async ({ const hdnode = getHDNode({ xpub58, network }) const account = await getAccount({ - rootPath: path, - hdnode, + asyncDelay: 0, coinType, + hdnode, network, + rootPath: path, segwit, - asyncDelay: 0, onProgress: ({ transactions, ...progress }) => transactions > 0 && onProgress({ account: currentAccount, transactions, ...progress }), }) diff --git a/src/reducers/accounts.js b/src/reducers/accounts.js index 19c103cd..e3aa7206 100644 --- a/src/reducers/accounts.js +++ b/src/reducers/accounts.js @@ -53,18 +53,9 @@ const handlers: Object = { return existingAccount } - const { balance, balanceByDay, transactions } = existingAccount - const updatedAccount = { ...existingAccount, ...account, - balance: balance + account.balance, - balanceByDay: Object.keys(balanceByDay).reduce((result, k) => { - result[k] = balanceByDay[k] + (account.balanceByDay[k] || 0) - return result - }, {}), - index: account.index || get(existingAccount, 'index', 0), - transactions: [...transactions, ...account.transactions], } return orderAccountsTransactions(updatedAccount) diff --git a/src/renderer/events.js b/src/renderer/events.js index 3123b62c..675f19fe 100644 --- a/src/renderer/events.js +++ b/src/renderer/events.js @@ -51,9 +51,10 @@ export function startSyncAccounts(accounts: Accounts) { syncAccounts = true sendEvent('accounts', 'sync.all', { accounts: accounts.map(account => { - const { id, rootPath, addresses, index, transactions } = account + const { id, coinType, rootPath, addresses, index, transactions } = account return { id, + coinType, allAddresses: addresses, currentIndex: index, rootPath, @@ -85,17 +86,27 @@ export default ({ store, locked }: { store: Object, locked: boolean }) => { success: account => { if (syncAccounts) { const state = store.getState() - const currentAccount = getAccountById(state, account.id) + const existingAccount = getAccountById(state, account.id) - if (!currentAccount) { + if (!existingAccount) { return } - const { name } = currentAccount + const { name, balance, balanceByDay, transactions } = existingAccount if (account.transactions.length > 0) { d.sync(`Update account - ${name}`) - store.dispatch(updateAccount(account)) + const updatedAccount = { + ...account, + balance: balance + account.balance, + balanceByDay: Object.keys(balanceByDay).reduce((result, k) => { + result[k] = balanceByDay[k] + (account.balanceByDay[k] || 0) + return result + }, {}), + index: account.index || existingAccount.index, + transactions: [...transactions, ...account.transactions], + } + store.dispatch(updateAccount(updatedAccount)) } } }, diff --git a/yarn.lock b/yarn.lock index 8fe90257..2cd13aa8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -121,20 +121,20 @@ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.3.tgz#8475e0f2d1ad1f858c4ec2e76ed9a2456a09ad83" "@fortawesome/fontawesome-free-brands@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.7.tgz#0fe131da1bfb7f5f49b7b800b9e198e530fab418" + version "5.0.8" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.8.tgz#dd234982bd958b48ab1108570831d2b41bc8f73b" dependencies: "@fortawesome/fontawesome-common-types" "^0.1.3" "@fortawesome/fontawesome-free-regular@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.7.tgz#3a347278e34c58db8c1c7891e9e567d57d1d7db9" + version "5.0.8" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.8.tgz#feaa96ee230e7f0d685ede3ae512aa6a1dca2480" dependencies: "@fortawesome/fontawesome-common-types" "^0.1.3" "@fortawesome/fontawesome-free-solid@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.7.tgz#b7e68876a24b3a0a34c09ee68bd57fe63925a578" + version "5.0.8" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.8.tgz#2890639d57dc16e2a90bb847c41770e38f72e432" dependencies: "@fortawesome/fontawesome-common-types" "^0.1.3" @@ -418,10 +418,10 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" accepts@~1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f" + version "1.3.5" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" dependencies: - mime-types "~2.1.16" + mime-types "~2.1.18" negotiator "0.6.1" acorn-dynamic-import@^2.0.0: @@ -451,8 +451,8 @@ acorn@^4.0.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" acorn@^5.0.0, acorn@^5.3.0, acorn@^5.4.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102" + version "5.5.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.0.tgz#1abb587fbf051f94e3de20e6b26ef910b1828298" airbnb-js-shims@^1.4.0: version "1.4.1" @@ -554,8 +554,8 @@ ansi-styles@^2.2.1: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" ansi-styles@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: color-convert "^1.9.0" @@ -1187,8 +1187,8 @@ babel-plugin-module-resolver@^3.1.0: resolve "^1.4.0" babel-plugin-react-docgen@^1.8.0: - version "1.8.2" - resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-1.8.2.tgz#4615da43588c8cf5bdcae028f217954c70e6770b" + version "1.8.3" + resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-1.8.3.tgz#bdb0fe41f72eaa9444fe7872866d2f372afd72bb" dependencies: babel-types "^6.24.1" lodash "^4.17.0" @@ -2390,22 +2390,7 @@ charenc@~0.0.1: version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" -chokidar@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chokidar@^2.0.0: +chokidar@^2.0.0, chokidar@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7" dependencies: @@ -2667,7 +2652,7 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@1.6.0, concat-stream@^1.5.0, concat-stream@^1.6.0: +concat-stream@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" dependencies: @@ -2675,6 +2660,14 @@ concat-stream@1.6.0, concat-stream@^1.5.0, concat-stream@^1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" +concat-stream@^1.5.0, concat-stream@^1.6.0: + version "1.6.1" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26" + dependencies: + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + concurrently@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.5.1.tgz#ee8b60018bbe86b02df13e5249453c6ececd2521" @@ -2914,10 +2907,11 @@ css-color-names@0.0.4: resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" css-hot-loader@^1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/css-hot-loader/-/css-hot-loader-1.3.7.tgz#e08a2343d3f5e22043da50d86bbb4310f535be0e" + version "1.3.8" + resolved "https://registry.yarnpkg.com/css-hot-loader/-/css-hot-loader-1.3.8.tgz#edc17f9a24c8e2254c1c570e3779257489aa53f6" dependencies: loader-utils "^1.1.0" + lodash "^4.17.5" normalize-url "^1.9.1" css-in-js-utils@^2.0.0: @@ -3410,20 +3404,12 @@ dotenv-expand@^4.0.1: resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" dotenv-webpack@^1.5.4: - version "1.5.4" - resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.5.4.tgz#9c92e46e412a1cfbc60217ed33d69d2bbfddbf9f" + version "1.5.5" + resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.5.5.tgz#3441094f04d304b6119e6b72524e62fb3252f5f2" dependencies: - dotenv "^4.0.0" - -dotenv@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d" + dotenv "^5.0.1" -dotenv@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.0.tgz#0206eb5b336639bf377618a2a304ff00c6a1fddb" - -dotenv@^5.0.1: +dotenv@^5.0.0, dotenv@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef" @@ -3494,7 +3480,7 @@ electron-builder-lib@20.2.0, electron-builder-lib@~20.2.0: semver "^5.5.0" temp-file "^3.1.1" -electron-builder@^20.2.0: +electron-builder@^20.0.4, electron-builder@^20.2.0: version "20.2.0" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.2.0.tgz#aaeaa439cb96c9a3d7ffda25b28130327c982982" dependencies: @@ -3658,7 +3644,7 @@ electron-webpack@1.13.0: webpack-merge "^4.1.1" yargs "^11.0.0" -electron@1.8.2: +electron@1.8.2, electron@^1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.2.tgz#a817cd733c2972b3c7cc4f777caf6e424b88014d" dependencies: @@ -3833,15 +3819,15 @@ escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" escodegen@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852" + version "1.9.1" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2" dependencies: esprima "^3.1.3" estraverse "^4.2.0" esutils "^2.0.2" optionator "^0.8.1" optionalDependencies: - source-map "~0.5.6" + source-map "~0.6.1" escope@^3.6.0: version "3.6.0" @@ -4016,11 +4002,10 @@ esquery@^1.0.0: estraverse "^4.0.0" esrecurse@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163" + version "4.2.1" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" dependencies: estraverse "^4.1.0" - object-assign "^4.0.1" estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" @@ -4325,8 +4310,8 @@ file-entry-cache@^2.0.0: object-assign "^4.0.1" file-loader@^1.1.6, file-loader@^1.1.7: - version "1.1.9" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.9.tgz#cf152aedbcfb3d67038d0845efb7cf11a96e53de" + version "1.1.11" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8" dependencies: loader-utils "^1.0.2" schema-utils "^0.4.5" @@ -6153,8 +6138,8 @@ jsprim@^1.2.2: verror "1.10.0" jsqr@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-1.0.2.tgz#39081e5e7469318284bfe1b00d72db61c87c151b" + version "1.0.3" + resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-1.0.3.tgz#1e4e2f1de50413853855b3389e69a983ff7d067d" jsx-ast-utils@^2.0.0, jsx-ast-utils@^2.0.1: version "2.0.1" @@ -6224,10 +6209,13 @@ lcid@^1.0.0: ledger-test-library@KhalilBellakrid/ledger-test-library-nodejs: version "1.0.0" - resolved "https://codeload.github.com/KhalilBellakrid/ledger-test-library-nodejs/tar.gz/5f09590e0cd3bf91e2514e4715a3181c91a1a1cf" + resolved "https://codeload.github.com/KhalilBellakrid/ledger-test-library-nodejs/tar.gz/7d374820ae44f1b7d2177dfe52deb4702a36cb65" dependencies: axios "^0.17.1" bindings "^1.3.0" + electron "^1.8.2" + electron-builder "^20.0.4" + electron-rebuild "^1.7.3" nan "^2.6.2" prebuild-install "^2.2.2" @@ -6540,8 +6528,8 @@ markdown-loader@^2.0.1: marked "^0.3.9" marked@^0.3.9: - version "0.3.16" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.16.tgz#2f188b7dfcfa6540fe9940adaf0f3b791c9a5cba" + version "0.3.17" + resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.17.tgz#607f06668b3c6b1246b28f13da76116ac1aa2d2b" "match-stream@>= 0.0.2 < 1": version "0.0.2" @@ -6674,7 +6662,7 @@ miller-rabin@^4.0.0: version "1.33.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" -mime-types@^2.1.12, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7: +mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7: version "2.1.18" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" dependencies: @@ -6839,6 +6827,10 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" +neo-async@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f" + no-case@^2.2.0: version "2.3.2" resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" @@ -7916,8 +7908,8 @@ promise@^7.1.1: asap "~2.0.3" prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0: - version "15.6.0" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" + version "15.6.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" dependencies: fbjs "^0.8.16" loose-envify "^1.3.1" @@ -8090,8 +8082,8 @@ range-parser@^1.0.3, range-parser@~1.2.0: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" raven-js@^3.22.4: - version "3.22.4" - resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.22.4.tgz#e5ac2aef7cdbbe639eef0db04703e99b6a0bcb28" + version "3.23.0" + resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.23.0.tgz#4365ae1c09072049a60fab25e19316273e01b383" raven@^2.4.2: version "2.4.2" @@ -8122,8 +8114,8 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1: strip-json-comments "~2.0.1" react-color@^2.11.4: - version "2.13.8" - resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.13.8.tgz#bcc58f79a722b9bfc37c402e68cd18f26970aee4" + version "2.14.0" + resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.14.0.tgz#5828a11c034aa0939befbd888a066ee37d8c3cc2" dependencies: lodash "^4.0.1" material-colors "^1.2.1" @@ -8241,8 +8233,8 @@ react-onclickoutside@^6.5.0: resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.7.1.tgz#6a5b5b8b4eae6b776259712c89c8a2b36b17be93" react-portal@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.1.2.tgz#7f28f3c8c2ed5c541907c0ed0f24e8996acf627f" + version "4.1.3" + resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.1.3.tgz#0cb58333bc02186ccd2f0997790e4573623dce87" dependencies: prop-types "^15.5.8" @@ -8790,8 +8782,8 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: inherits "^2.0.1" rtcpeerconnection-shim@^1.1.13: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.8.tgz#1d579d0f1d7aa8281c78d4ec9251017b04646e3a" + version "1.2.9" + resolved "https://registry.yarnpkg.com/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.9.tgz#612bd7a63f4d9a76d6064e3963028fee62b67378" dependencies: sdp "^2.6.0" @@ -9197,7 +9189,7 @@ source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" -source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6: +source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -9223,19 +9215,27 @@ spawn-rx@^2.0.10: lodash.assign "^4.2.0" rxjs "^5.1.1" -spdx-correct@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" +spdx-correct@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" dependencies: - spdx-license-ids "^1.0.2" + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" -spdx-expression-parse@~1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c" +spdx-exceptions@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9" -spdx-license-ids@^1.0.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" +spdx-expression-parse@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" spdy-transport@^2.0.18: version "2.0.20" @@ -9549,8 +9549,8 @@ supports-color@^4.2.1: has-flag "^2.0.0" supports-color@^5.1.0, supports-color@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a" + version "5.3.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" dependencies: has-flag "^3.0.0" @@ -9776,8 +9776,8 @@ toposort@^1.0.0: resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.6.tgz#c31748e55d210effc00fdcdc7d6e68d7d7bb9cec" tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" + version "2.3.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" dependencies: punycode "^1.4.1" @@ -10090,11 +10090,11 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" validate-npm-package-license@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" + version "3.0.3" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" dependencies: - spdx-correct "~1.0.0" - spdx-expression-parse "~1.0.0" + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" value-equal@^0.4.0: version "0.4.0" @@ -10210,12 +10210,12 @@ watch@~0.18.0: minimist "^1.2.0" watchpack@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac" + version "1.5.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed" dependencies: - async "^2.1.2" - chokidar "^1.7.0" + chokidar "^2.0.2" graceful-fs "^4.1.2" + neo-async "^2.5.0" wbuf@^1.1.0, wbuf@^1.7.2: version "1.7.2" @@ -10245,8 +10245,8 @@ webpack-dev-middleware@1.12.2, webpack-dev-middleware@^1.12.2: time-stamp "^2.0.0" webpack-dev-server@^2.11.1: - version "2.11.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.11.1.tgz#6f9358a002db8403f016e336816f4485384e5ec0" + version "2.11.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz#1f4f4c78bf1895378f376815910812daf79a216f" dependencies: ansi-html "0.0.7" array-includes "^3.0.3" @@ -10277,8 +10277,8 @@ webpack-dev-server@^2.11.1: yargs "6.6.0" webpack-hot-middleware@^2.21.0: - version "2.21.0" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.21.0.tgz#7b3c113a7a4b301c91e0749573c7aab28b414b52" + version "2.21.1" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.21.1.tgz#1b03b20a1a65a2e2ea0ea987476a5d23370ff176" dependencies: ansi-html "0.0.7" html-entities "^1.2.0"