diff --git a/.babelrc b/.babelrc index f48a56bcc09..4d269a7a383 100644 --- a/.babelrc +++ b/.babelrc @@ -1,4 +1,14 @@ { + "env": { + "development": { + "plugins": [ ["transform-remove-console", { "exclude": ["disableYellowBox", "error", "info", "log"] }] ] + }, + "production": { + "plugins": [ + ["transform-remove-console", { "exclude": ["error"] }] + ] + } + }, "plugins": [ "babel-plugin-styled-components", "date-fns", diff --git a/.eslintrc b/.eslintrc index b90107b6aec..429a9cb388f 100644 --- a/.eslintrc +++ b/.eslintrc @@ -2,7 +2,8 @@ "parser": "babel-eslint", "plugins": [ "react", - "react-native" + "react-native", + "react-native-animation-linter" ], "parserOptions": { "ecmaFeatures": { @@ -17,6 +18,7 @@ ], "rules" : { "arrow-body-style": "warn", + "camelcase": ["error", {ignoreDestructuring: true}], "class-methods-use-this": "off", "no-console": "off", "max-len": ["error", {"code": 160, "comments": 500}], @@ -28,9 +30,15 @@ "no-plusplus": ["off"], "no-underscore-dangle": ["off"], "arrow-parens": ["off"], - "no-param-reassign": ["off"] + "no-param-reassign": ["off"], + "react-native-animation-linter/must-tear-down-animations": 2, }, "globals": { "fetch": false + }, + "settings": { + "react": { + "version": "16.5.0" + } } } diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f9874af35e..0ed8e4706d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/) ### Removed +## [0.3.0-4](https://github.com/balance-io/balance-wallet/releases/tag/v0.3.0-4) + +### Added +* Import seed phrase + +### Changed +* Performance improvements +* Splash screen to be removed after successfully loaded wallet data +* Support for separate reducer changes for settings, assets, transactions, prices +* Support for promisified account refresh + ## [0.3.0-3](https://github.com/balance-io/balance-wallet/releases/tag/v0.3.0-3) ### Changed * Fix for toggle seed phrase button diff --git a/ios/BalanceWallet.xcodeproj/project.pbxproj b/ios/BalanceWallet.xcodeproj/project.pbxproj index 83e85a7e011..3c0301d3fb3 100644 --- a/ios/BalanceWallet.xcodeproj/project.pbxproj +++ b/ios/BalanceWallet.xcodeproj/project.pbxproj @@ -2072,7 +2072,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export NODE_BINARY=node\nexport FORCE_BUNDLING=true\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; + shellScript = "export NODE_BINARY='node --max_old_space_size=2048'\nexport FORCE_BUNDLING=true\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; 1DFACE34723C6B8DBBD5F804 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; diff --git a/ios/BalanceWallet.xcodeproj/xcshareddata/xcschemes/BalanceWallet.xcscheme b/ios/BalanceWallet.xcodeproj/xcshareddata/xcschemes/BalanceWallet.xcscheme index 67037efbccc..b6c588bc44f 100644 --- a/ios/BalanceWallet.xcodeproj/xcshareddata/xcschemes/BalanceWallet.xcscheme +++ b/ios/BalanceWallet.xcodeproj/xcshareddata/xcschemes/BalanceWallet.xcscheme @@ -81,8 +81,8 @@ CFBundleSignature ???? CFBundleVersion - 3 + 4 CodePushDeploymentKey $(CODEPUSH_KEY) ITSAppUsesNonExemptEncryption diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 619760327fe..a4f7a69af1b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -25,11 +25,11 @@ PODS: - GoogleToolboxForMac/Logger (~> 2.1) - Protobuf (~> 3.1) - FLAnimatedImage (1.0.12) - - GoogleToolboxForMac/Defines (2.2.0) - - GoogleToolboxForMac/Logger (2.2.0): - - GoogleToolboxForMac/Defines (= 2.2.0) - - "GoogleToolboxForMac/NSData+zlib (2.2.0)": - - GoogleToolboxForMac/Defines (= 2.2.0) + - GoogleToolboxForMac/Defines (2.1.4) + - GoogleToolboxForMac/Logger (2.1.4): + - GoogleToolboxForMac/Defines (= 2.1.4) + - "GoogleToolboxForMac/NSData+zlib (2.1.4)": + - GoogleToolboxForMac/Defines (= 2.1.4) - nanopb (0.3.901): - nanopb/decode (= 0.3.901) - nanopb/encode (= 0.3.901) @@ -52,12 +52,12 @@ PODS: - React/RCTNetwork - React/RCTNetwork (0.57.1): - React/Core - - RNLanguages (3.0.1): + - RNLanguages (3.0.2): - React - - RNReanimated (1.0.0-alpha.10): + - RNReanimated (1.0.0-alpha.11): - React - - SDWebImage/Core (4.4.3) - - SDWebImage/GIF (4.4.3): + - SDWebImage/Core (4.4.2) + - SDWebImage/GIF (4.4.2): - FLAnimatedImage (~> 1.0) - SDWebImage/Core - yoga (0.57.1.React) @@ -112,7 +112,7 @@ SPEC CHECKSUMS: FirebaseInstanceID: 4f7768a98c5c3c5bd9a4c9e431ea98dccc0a51f9 FirebaseMessaging: 94579ae655d817287f029ebfebd5b0811fbb3a51 FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31 - GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d + GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 Protobuf: 6b0fc34ab8f2b7dbad2278a48be08a669427c59f React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11 @@ -120,7 +120,7 @@ SPEC CHECKSUMS: react-native-fast-image: cba3d9bf9c2cf8ddb643d887a686c53a5dd90a2c RNLanguages: e3ae05ef105937645218272429dac0c3f7633451 RNReanimated: 45d9313b7a62318ed00d60a811937321e43e076e - SDWebImage: c5594f1a19c48d526d321e548902b56b479cd508 + SDWebImage: 4170dae6332a915d44c918675d51dc1c4c06b45f yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85 PODFILE CHECKSUM: 49f66978b10019df5c3f0971f9cb6e6bc610c256 diff --git a/package.json b/package.json index 0b8a0713edc..0cbd0faa6d1 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "name": "BalanceWallet", - "version": "0.3.0-3", + "version": "0.3.0-4", "private": true, "scripts": { "start": "node node_modules/react-native/local-cli/cli.js start", "test": "jest", "install-pods": "cd ios && pod install && cd ..", "ios": "react-native run-ios --simulator='iPhone X'", - "lint": "eslint ./src/ --ext .js", + "lint": "eslint './**/*.js'", "nodeify": "./node_modules/.bin/rn-nodeify --install \"crypto\" --hack", "postinstall": "rn-nodeify --install --hack" }, @@ -18,7 +18,7 @@ "@tradle/react-native-http": "^2.0.0", "assert": "^1.4.1", "axios": "^0.18.0", - "balance-common": "^0.6.9", + "balance-common": "^0.6.15", "browserify-zlib": "^0.1.4", "buffer": "^4.9.1", "chroma-js": "^1.3.7", @@ -38,12 +38,14 @@ "inherits": "^2.0.3", "lodash": "^4.17.11", "path-browserify": "0.0.0", + "postcss": "^7.0.13", "process": "^0.11.10", "prop-types": "^15.6.1", "punycode": "^1.4.1", "querystring-es3": "^0.2.1", "react": "^16.5.0", "react-coin-icon": "^0.1.6", + "react-fast-compare": "^2.0.4", "react-native": "0.57.1", "react-native-actionsheet": "^2.4.2", "react-native-blur": "^3.2.2", @@ -56,6 +58,7 @@ "react-native-firebase": "^4.3.8", "react-native-gesture-handler": "^1.0.7", "react-native-haptic-feedback": "^1.2.0", + "react-native-indicators": "^0.13.0", "react-native-iphone-x-helper": "^1.2.0", "react-native-keychain": "^3.0.0", "react-native-languages": "^3.0.0", @@ -90,11 +93,13 @@ "recompose": "^0.30.0", "redux": "^3.7.2", "redux-thunk": "^2.3.0", + "reselect": "^4.0.0", "rn-nodeify": "^10.0.0", "rn-walletconnect-wallet": "^0.7.24", "stream-browserify": "^1.0.0", "string_decoder": "^0.10.31", "styled-components": "4.1.2", + "stylelint": "^9.10.0", "svgs": "^4.0.0", "timers-browserify": "^1.4.2", "tty-browserify": "0.0.0", @@ -103,7 +108,7 @@ "vm-browserify": "0.0.4" }, "devDependencies": { - "@babel/core": "^7.1.2", + "@babel/core": "^7.2.2", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^8.2.2", "babel-jest": "^22.4.3", @@ -111,17 +116,20 @@ "babel-plugin-lodash": "^3.3.4", "babel-plugin-styled-components": "^1.9.2", "babel-plugin-transform-react-remove-prop-types": "^0.4.21", - "eslint": "^4.19.1", - "eslint-config-airbnb-base": "^12.1.0", - "eslint-plugin-import": "^2.9.0", - "eslint-plugin-react": "^7.7.0", - "eslint-plugin-react-native": "^3.2.1", + "babel-plugin-transform-remove-console": "^6.9.4", + "eslint": "^5.11.1", + "eslint-config-airbnb-base": "^13.1.0", + "eslint-plugin-import": "^2.14.0", + "eslint-plugin-react": "^7.12.1", + "eslint-plugin-react-native": "^3.5.0", + "eslint-plugin-react-native-animation-linter": "^0.1.2", "jest": "^22.4.3", "metro-react-native-babel-preset": "^0.50.0", "react-test-renderer": "^16.2.0", "schedule": "0.4.0" }, "resolutions": { + "**/eslint-plugin-import": "2.14.0", "**/resolve": "1.8.1" }, "jest": { diff --git a/src/App.js b/src/App.js index ad6c5ba6249..ce96887ac2c 100644 --- a/src/App.js +++ b/src/App.js @@ -3,7 +3,7 @@ import CodePush from 'react-native-code-push'; import firebase from 'react-native-firebase'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { accountInitializeState, accountUpdateAccountAddress, commonStorage } from 'balance-common'; +import { commonStorage, settingsInitializeState, settingsUpdateAccountAddress } from 'balance-common'; import { AppRegistry, AlertIOS, AppState } from 'react-native'; import { compose, withProps } from 'recompact'; import { connect, Provider } from 'react-redux'; @@ -11,7 +11,11 @@ import { StackActions } from 'react-navigation'; import Piwik from 'react-native-matomo'; import { FlexItem } from './components/layout'; import OfflineBadge from './components/OfflineBadge'; -import { withWalletConnectConnections } from './hoc'; +import { + withAccountRefresh, + withTrackingDate, + withWalletConnectConnections, +} from './hoc'; import { addTransactionToApprove, addTransactionsToApprove, @@ -28,18 +32,24 @@ import { walletInit } from './model/wallet'; import Routes from './screens/Routes'; import Navigation from './navigation'; +if (process.env.NODE_ENV === 'development') { + console.log('process', process); + console.disableYellowBox = true; +} class App extends Component { static propTypes = { - accountInitializeState: PropTypes.func, - accountUpdateAccountAddress: PropTypes.func, addTransactionsToApprove: PropTypes.func, addTransactionToApprove: PropTypes.func, getValidWalletConnectors: PropTypes.func, + refreshAccount: PropTypes.func, + settingsInitializeState: PropTypes.func, + settingsUpdateAccountAddress: PropTypes.func, setWalletConnectors: PropTypes.func, + sortedWalletConnectors: PropTypes.arrayOf(PropTypes.object), + trackingDateInit: PropTypes.func, transactionIfExists: PropTypes.func, transactionsToApproveInit: PropTypes.func, - sortedWalletConnectors: PropTypes.arrayOf(PropTypes.object), } state = { appState: AppState.currentState } @@ -92,38 +102,36 @@ class App extends Component { const { callId, sessionId } = notificationOpen.notification.data; this.onPushNotificationOpened(callId, sessionId, false); }); - - await this.props.accountInitializeState(); - - walletInit() - .then(walletAddress => { - if (!walletAddress) { return; } - console.log('wallet address is', walletAddress); - this.props.accountUpdateAccountAddress(walletAddress, 'BALANCEWALLET'); - this.props.transactionsToApproveInit(); - walletConnectInitAllConnectors() - .then(allConnectors => { - this.props.setWalletConnectors(allConnectors); - firebase - .notifications() - .getInitialNotification() - .then(notificationOpen => { - if (!notificationOpen) { - this.fetchAllRequestsFromWalletConnectSessions(); - } - }); - }) - .catch(error => { - console.log('Unable to init all WalletConnect sessions'); - }); - /* - */ - }) - .catch(error => { - AlertIOS.alert('Error: Failed to initialize wallet.'); - }); } + handleWalletConfig = async (seedPhrase) => { + try { + this.props.trackingDateInit(); + const walletAddress = await walletInit(seedPhrase); + console.log('wallet address is', walletAddress); + this.props.settingsInitializeState(); + this.props.settingsUpdateAccountAddress(walletAddress, 'BALANCEWALLET'); + await this.props.refreshAccount(); + this.props.transactionsToApproveInit(); + try { + const allConnectors = await walletConnectInitAllConnectors(); + if (allConnectors) { + this.props.setWalletConnectors(allConnectors); + } + } catch (error) { + console.log('Unable to init all WalletConnect sessions'); + } + const notificationOpen = await firebase.notifications().getInitialNotification(); + if (!notificationOpen) { + this.fetchAllRequestsFromWalletConnectSessions(); + } + return walletAddress; + } catch (error) { + console.log('WALLET ERROR', error); + return AlertIOS.alert('Error: Failed to initialize wallet.'); + } + }; + handleAppStateChange = async (nextAppState) => { if (this.state.appState.match(/unknown|background/) && nextAppState === 'active') { Piwik.trackEvent('screen', 'view', 'app'); @@ -188,7 +196,10 @@ class App extends Component { - + ) @@ -196,14 +207,16 @@ class App extends Component { const AppWithRedux = compose( withProps({ store }), + withAccountRefresh, + withTrackingDate, withWalletConnectConnections, connect( null, { - addTransactionToApprove, addTransactionsToApprove, - accountInitializeState, - accountUpdateAccountAddress, + addTransactionToApprove, + settingsInitializeState, + settingsUpdateAccountAddress, transactionIfExists, transactionsToApproveInit, }, diff --git a/src/components/ActivityIndicator.js b/src/components/ActivityIndicator.js new file mode 100644 index 00000000000..bbc150788c4 --- /dev/null +++ b/src/components/ActivityIndicator.js @@ -0,0 +1,37 @@ +import PropTypes from 'prop-types'; +import React from 'react'; +import { UIActivityIndicator } from 'react-native-indicators'; +import { View } from 'react-primitives'; +import stylePropType from 'react-style-proptype'; +import { pure } from 'recompact'; +import { colors, position } from '../styles'; + +const ActivityIndicator = ({ + color, + isInteraction, + size, + style, +}) => ( + + + +); + +ActivityIndicator.propTypes = { + color: PropTypes.string, + isInteraction: PropTypes.bool, + size: PropTypes.number, + style: stylePropType, +}; + +ActivityIndicator.defaultProps = { + color: colors.blueGreyDark, + isInteraction: false, + size: 25, +}; + +export default pure(ActivityIndicator); diff --git a/src/components/AddFundsInterstitial.js b/src/components/AddFundsInterstitial.js new file mode 100644 index 00000000000..06f030b8cfc --- /dev/null +++ b/src/components/AddFundsInterstitial.js @@ -0,0 +1,89 @@ +import PropTypes from 'prop-types'; +import React from 'react'; +import { withNavigation } from 'react-navigation'; +import { compose, pure, withHandlers } from 'recompact'; +import styled from 'styled-components/primitives'; +import { colors } from '../styles'; +import { Button } from './buttons'; +import Divider from './Divider'; +import { Centered } from './layout'; +import { Text } from './text'; + +const ButtonContainerHeight = 193; +const ButtonContainerWidth = 225; + +const InterstitialMargin = 18; + +const ButtonContainer = styled(Centered).attrs({ direction: 'column' })` + width: ${ButtonContainerWidth}; +`; + +const DividerContainer = styled(Centered)` + margin-bottom: ${InterstitialMargin}; + margin-top: ${InterstitialMargin}; + width: 93; +`; + +const Container = styled(Centered)` + position: absolute; + left: 50%; + top: 50%; +`; + +const Paragraph = styled(Text).attrs({ + align: 'center', + color: colors.placeholder, + lineHeight: 'loose', + size: 'smedium', +})` + margin-top: ${InterstitialMargin}; +`; + +const buildInterstitialTransform = offsetY => ({ + transform: [ + { translateX: (ButtonContainerWidth / 2) * -1 }, + { translateY: ((ButtonContainerHeight / 2) * -1) + 25 + offsetY }, + ], +}); + +const AddFundsInterstitial = ({ + offsetY, + onPressAddFunds, + onPressImportWallet, +}) => ( + + + + + + + + + Use your 12 or 24 word seed phrase from an existing wallet. + + + +); + +AddFundsInterstitial.propTypes = { + offsetY: PropTypes.number, + onPressAddFunds: PropTypes.func.isRequired, + onPressImportWallet: PropTypes.func.isRequired, +}; + +AddFundsInterstitial.defaultProps = { + offsetY: 0, +}; + +export default compose( + pure, + withNavigation, + withHandlers({ + onPressAddFunds: ({ navigation }) => () => navigation.navigate('ReceiveModal'), + onPressImportWallet: ({ navigation }) => () => navigation.navigate('ImportSeedPhraseSheet'), + }), +)(AddFundsInterstitial); diff --git a/src/components/AppVersionStamp.js b/src/components/AppVersionStamp.js index d200db40667..0819faf4993 100644 --- a/src/components/AppVersionStamp.js +++ b/src/components/AppVersionStamp.js @@ -14,6 +14,6 @@ const Container = styled(Monospace).attrs({ text-align: center; `; -const AppVersionStamp = props => Balance v0.3.0 (3); +const AppVersionStamp = props => Balance v0.3.0 (4); export default AppVersionStamp; diff --git a/src/components/BlurOverlay.js b/src/components/BlurOverlay.js index e3d5f43b35a..b8c48159d4b 100644 --- a/src/components/BlurOverlay.js +++ b/src/components/BlurOverlay.js @@ -23,7 +23,7 @@ const BlurOverlay = ({ blurAmount, blurType, opacity }) => ( BlurOverlay.propTypes = { blurAmount: PropTypes.number, - blurType: PropTypes.oneOf(['dark', 'light']), + blurType: PropTypes.oneOf(['dark', 'light', 'xlight']), opacity: PropTypes.object, }; diff --git a/src/components/ContextMenu.js b/src/components/ContextMenu.js index 51fe05f0bef..4102059b2e4 100644 --- a/src/components/ContextMenu.js +++ b/src/components/ContextMenu.js @@ -3,8 +3,8 @@ import React, { Component, Fragment } from 'react'; import ActionSheet from 'react-native-actionsheet'; import styled from 'styled-components/primitives'; import { padding } from '../styles'; -import { ButtonPressAnimation } from './buttons'; -import Icon from './icons/Icon'; +import { ButtonPressAnimation } from './animations'; +import { Icon } from './icons'; import { Centered } from './layout'; const ContextMenuButton = styled(Centered)` @@ -20,6 +20,7 @@ export default class ContextMenu extends Component { actionSheetRef = null handleActionSheetRef = (ref) => { this.actionSheetRef = ref; } + showActionSheet = () => this.actionSheetRef.show() render = () => ( diff --git a/src/components/Divider.js b/src/components/Divider.js index 372a59ad163..35e33d16942 100644 --- a/src/components/Divider.js +++ b/src/components/Divider.js @@ -1,10 +1,11 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { pure } from 'recompact'; import styled, { css } from 'styled-components/primitives'; import { Row } from './layout'; import { borders, colors, position } from '../styles'; +const DefaultDividerSize = 2; + const horizontalBorderLineStyles = ({ insetLeft, insetRight }) => css` ${insetLeft ? borders.buildRadius('left', 2) : null}; ${insetRight ? borders.buildRadius('right', 2) : null}; @@ -34,12 +35,17 @@ const BorderLine = styled.View` const Container = styled(Row)` background-color: ${colors.white}; flex-shrink: 0; - height: ${({ horizontal }) => (horizontal ? '2' : '100%')}; - width: ${({ horizontal }) => (horizontal ? '100%' : '2')}; + height: ${({ horizontal, size }) => (horizontal ? size : '100%')}; + width: ${({ horizontal, size }) => (horizontal ? '100%' : size)}; `; -const Divider = ({ color, horizontal, ...props }) => ( - +const Divider = ({ + color, + horizontal, + size, + ...props +}) => ( + { - if (isConnected) { - this.animateBadgeOut(); - } else { - this.animateBadgeIn(); - } + handleConnectivityChange = (isConnected) => { + if (isConnected) this.animateBadgeOut(); + else this.animateBadgeIn(); this.setState({ isConnected }); }; animateBadgeIn = () => { Animated.parallel([ Animated.spring(this.state.badgeYPosition, { - toValue: 0, - tension: 90, friction: 11, + tension: 90, + toValue: 0, useNativeDriver: true, }).start(), Animated.spring(this.state.badgeOpacity, { - toValue: 1, - tension: 90, friction: 11, + tension: 90, + toValue: 1, useNativeDriver: true, }).start(), ]); @@ -88,33 +76,33 @@ class OfflineBadge extends PureComponent { animateBadgeOut = () => { Animated.parallel([ Animated.spring(this.state.badgeYPosition, { - toValue: 100, - tension: 90, friction: 11, + tension: 90, + toValue: 100, useNativeDriver: true, }).start(), Animated.spring(this.state.badgeOpacity, { - toValue: 0, - tension: 90, friction: 11, + tension: 90, + toValue: 0, useNativeDriver: true, }).start(), ]); }; - render() { - return ( - - - Offline - - ); - } + render = () => ( + + + Offline + + ) } export default OfflineBadge; diff --git a/src/components/SendFeedback.js b/src/components/SendFeedback.js index 4f0842dfcc4..236d2bd409c 100644 --- a/src/components/SendFeedback.js +++ b/src/components/SendFeedback.js @@ -1,10 +1,10 @@ +import lang from 'i18n-js'; import { debounce } from 'lodash'; import React from 'react'; import { Clipboard } from 'react-native'; import Mailer from 'react-native-mail'; -import lang from 'i18n-js'; -import { Alert } from '../components/alerts'; -import { Button } from '../components/buttons'; +import { Alert } from './alerts'; +import { Button } from './buttons'; const FeedbackEmailAddress = 'contact+alphafeedback@balance.io'; @@ -25,14 +25,14 @@ const handleSendFeedbackError = debounce( 250, ); -const handleSendFeedback = () => - Mailer.mail( - { - recipients: [FeedbackEmailAddress], - subject: lang.t('wallet.feedback.email_subject'), - }, - handleSendFeedbackError, - ); +const handleSendFeedback = () => { + const feedbackEmailOptions = { + recipients: [FeedbackEmailAddress], + subject: lang.t('wallet.feedback.email_subject'), + }; + + return Mailer.mail(feedbackEmailOptions, handleSendFeedbackError); +}; const SendFeedback = () => ( - + )} - - + + ); AssetListSkeleton.propTypes = { isLoading: PropTypes.bool, - onPressAddFunds: PropTypes.func, }; -export default compose( - pure, - withNavigation, - withHandlers({ onPressAddFunds: ({ navigation }) => () => navigation.navigate('SettingsScreen') }), - omitProps('navigation'), -)(AssetListSkeleton); +export default pure(AssetListSkeleton); diff --git a/src/components/buttons/BlockButton.js b/src/components/buttons/BlockButton.js index fb33c8966f6..391a0e61042 100644 --- a/src/components/buttons/BlockButton.js +++ b/src/components/buttons/BlockButton.js @@ -5,10 +5,10 @@ import RadialGradient from 'react-native-radial-gradient'; import styled, { css } from 'styled-components/primitives'; import { componentFromProp } from 'recompact'; import { colors, padding, position, shadow } from '../../styles'; +import ButtonPressAnimation from '../animations'; import { Centered } from '../layout'; import { Text } from '../text'; import { Icon } from '../icons'; -import ButtonPressAnimation from './ButtonPressAnimation'; const BlockButtonBorderRadius = 14; const BlockButtonHeight = 59; diff --git a/src/components/buttons/Button.js b/src/components/buttons/Button.js index 67249f65ffb..dc8b9bc1179 100644 --- a/src/components/buttons/Button.js +++ b/src/components/buttons/Button.js @@ -3,10 +3,10 @@ import PropTypes from 'prop-types'; import React from 'react'; import styled from 'styled-components/primitives'; import { colors, padding } from '../../styles'; +import { ButtonPressAnimation } from '../animations'; import InnerBorder from '../InnerBorder'; import { Centered } from '../layout'; import { Text } from '../text'; -import ButtonPressAnimation from './ButtonPressAnimation'; const ButtonSizeTypes = { small: { @@ -30,7 +30,11 @@ const Container = styled(Centered)` border-radius: ${({ type }) => ((type === 'rounded') ? 14 : 50)}; flex-grow: 0; position: relative; - ${({ containerStyles }) => containerStyles} + ${({ containerStyles }) => containerStyles}; + shadow-color: ${colors.blueGreyLight}; + shadow-offset: 0px 4px; + shadow-opacity: 0.2; + shadow-radius: 6; `; const Button = ({ diff --git a/src/components/buttons/index.js b/src/components/buttons/index.js index 273f33b42fb..896c8b24ce8 100644 --- a/src/components/buttons/index.js +++ b/src/components/buttons/index.js @@ -1,4 +1,3 @@ export { default as BlockButton } from './BlockButton'; export { default as Button } from './Button'; -export { default as ButtonPressAnimation } from './ButtonPressAnimation'; export { default as LongPressButton } from './LongPressButton'; diff --git a/src/components/coin-row/BalanceCoinRow.js b/src/components/coin-row/BalanceCoinRow.js index 0d49f0009f0..f2ee08c4acd 100644 --- a/src/components/coin-row/BalanceCoinRow.js +++ b/src/components/coin-row/BalanceCoinRow.js @@ -6,7 +6,8 @@ import Piwik from 'react-native-matomo'; import { compose, shouldUpdate, withHandlers } from 'recompact'; import { withAccountSettings } from '../../hoc'; import { colors } from '../../styles'; -import { ButtonPressAnimation } from '../buttons'; +import { isNewValueForPath } from '../../utils'; +import { ButtonPressAnimation } from '../animations'; import BalanceText from './BalanceText'; import BottomRowText from './BottomRowText'; import CoinName from './CoinName'; @@ -17,44 +18,58 @@ const formatPercentageString = percentString => ( ? percentString.split('-').join('- ').split('%').join(' %') : '-' ); +const BottomRow = ({ balance, native }) => { + const percentChange = get(native, 'change.display'); + const percentageChangeDisplay = formatPercentageString(percentChange); + const isPositive = (percentChange && (percentageChangeDisplay.charAt(0) !== '-')); + + return ( + + {balance.display} + + {percentageChangeDisplay} + + + ); +}; + +BottomRow.propTypes = { + balance: PropTypes.shape({ display: PropTypes.string }), + native: PropTypes.object, +}; + +const TopRow = ({ name, native, nativeCurrency }) => { + const nativeDisplay = get(native, 'balance.display'); + const currencySymbol = supportedNativeCurrencies[nativeCurrency].symbol; + + return ( + + {name} + + {nativeDisplay || `${currencySymbol}0.00`} + + + ); +}; + +TopRow.propTypes = { + name: PropTypes.string, + native: PropTypes.object, + nativeCurrency: PropTypes.string, +}; const BalanceCoinRow = ({ item, nativeCurrency, onPress, - ...props, + ...props }) => ( { - const percentChange = get(native, 'change.display'); - const percentageChangeDisplay = formatPercentageString(percentChange); - const isPositive = (percentChange && (percentageChangeDisplay.charAt(0) !== '-')); - - return ( - - {balance.display} - - {percentageChangeDisplay} - - - ); - }} - topRowRender={({ name, native }) => { - const nativeDisplay = get(native, 'balance.display'); - const currencySymbol = supportedNativeCurrencies[nativeCurrency].symbol; - - return ( - - {name} - - {nativeDisplay || `${currencySymbol}0.00`} - - - ); - }} + bottomRowRender={BottomRow} + topRowRender={TopRow} /> ); @@ -62,16 +77,15 @@ const BalanceCoinRow = ({ BalanceCoinRow.propTypes = { item: PropTypes.object, nativeCurrency: PropTypes.string.isRequired, + onPress: PropTypes.func, }; -const isNewValueForPath = (a, b, path) => (get(a, path) !== get(b, path)); - export default compose( withAccountSettings, - shouldUpdate((props, nextProps) => { - const isNewNativeCurrency = isNewValueForPath(props, nextProps, 'nativeCurrency'); - const isNewNativePrice = isNewValueForPath(props, nextProps, 'item.native.price.display'); - const isNewTokenBalance = isNewValueForPath(props, nextProps, 'item.balance.amount'); + shouldUpdate((...props) => { + const isNewNativeCurrency = isNewValueForPath(...props, 'nativeCurrency'); + const isNewNativePrice = isNewValueForPath(...props, 'item.native.price.display'); + const isNewTokenBalance = isNewValueForPath(...props, 'item.balance.amount'); return isNewNativeCurrency || isNewNativePrice || isNewTokenBalance; }), diff --git a/src/components/coin-row/CoinRow.js b/src/components/coin-row/CoinRow.js index 7eb01c126e4..f72bd30964a 100644 --- a/src/components/coin-row/CoinRow.js +++ b/src/components/coin-row/CoinRow.js @@ -1,7 +1,8 @@ import PropTypes from 'prop-types'; import React, { createElement } from 'react'; -import { pure } from 'recompact'; +import { compose, pure, setStatic } from 'recompact'; import styled from 'styled-components/primitives'; +import { withAccountSettings } from '../../hoc'; import { colors, padding } from '../../styles'; import { CoinIcon } from '../coin-icon'; import { Column, Row } from '../layout'; @@ -23,7 +24,7 @@ const Content = styled(Column)` ${({ contentStyles }) => contentStyles} `; -const CoinRow = pure(({ +const CoinRow = ({ bottomRowRender, children, coinIconRender, @@ -49,7 +50,7 @@ const CoinRow = pure(({ : children } -)); +); CoinRow.propTypes = { bottomRowRender: PropTypes.func, @@ -66,6 +67,8 @@ CoinRow.defaultProps = { coinIconRender: CoinIcon, }; -CoinRow.height = CoinIcon.size + (CoinRowPaddingVertical * 2); - -export default CoinRow; +export default compose( + pure, + setStatic({ height: CoinIcon.size + (CoinRowPaddingVertical * 2) }), + withAccountSettings, +)(CoinRow); diff --git a/src/components/coin-row/SendCoinRow.js b/src/components/coin-row/SendCoinRow.js index 3f1575ef520..28c6bf69a15 100644 --- a/src/components/coin-row/SendCoinRow.js +++ b/src/components/coin-row/SendCoinRow.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import React, { Fragment } from 'react'; import styled from 'styled-components/primitives'; import { colors } from '../../styles'; -import { ButtonPressAnimation } from '../buttons'; +import { ButtonPressAnimation } from '../animations'; import { Monospace } from '../text'; import CoinName from './CoinName'; import CoinRow from './CoinRow'; diff --git a/src/components/coin-row/TransactionCoinRow.js b/src/components/coin-row/TransactionCoinRow.js index 2392a42bbe0..c3d66fd2595 100644 --- a/src/components/coin-row/TransactionCoinRow.js +++ b/src/components/coin-row/TransactionCoinRow.js @@ -1,20 +1,26 @@ import { get } from 'lodash'; import PropTypes from 'prop-types'; import React, { Fragment } from 'react'; -import { compose, mapProps, onlyUpdateForKeys, withHandlers } from 'recompact'; +import { + compose, + mapProps, + onlyUpdateForKeys, + withHandlers, +} from 'recompact'; import { Linking } from 'react-native'; -import { ButtonPressAnimation } from '../buttons'; -import { TransactionStatusTypes } from '../../helpers/transactions'; +import TransactionStatusTypes from '../../helpers/transactionStatusTypes'; import { colors } from '../../styles'; +import { showActionSheetWithOptions } from '../../utils/actionsheet'; +import { ButtonPressAnimation } from '../animations'; import BalanceText from './BalanceText'; import BottomRowText from './BottomRowText'; import CoinName from './CoinName'; import CoinRow from './CoinRow'; import TransactionStatusBadge from './TransactionStatusBadge'; -import { showActionSheetWithOptions } from '../../utils/actionsheet'; const rowRenderPropTypes = { balance: PropTypes.object, + item: PropTypes.object, name: PropTypes.string, native: PropTypes.object, onPressTransaction: PropTypes.func, @@ -64,8 +70,18 @@ const TransactionCoinRow = ({ item, onPressTransaction, ...props }) => ( ); +TransactionCoinRow.propTypes = rowRenderPropTypes; + export default compose( - mapProps(({ item: { hash, native, pending, ...item }, ...props }) => ({ + mapProps(({ + item: { + hash, + native, + pending, + ...item + }, + ...props + }) => ({ hash, item, native, diff --git a/src/components/coin-row/TransactionStatusBadge.js b/src/components/coin-row/TransactionStatusBadge.js index 8a617e406d6..5ab14d65815 100644 --- a/src/components/coin-row/TransactionStatusBadge.js +++ b/src/components/coin-row/TransactionStatusBadge.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { onlyUpdateForKeys } from 'recompact'; import styled from 'styled-components/primitives'; -import { TransactionStatusTypes } from '../../helpers/transactions'; +import TransactionStatusTypes from '../../helpers/transactionStatusTypes'; import { colors, position } from '../../styles'; import { Row } from '../layout'; import Icon from '../icons/Icon'; diff --git a/src/components/expanded-state/TokenExpandedState.js b/src/components/expanded-state/TokenExpandedState.js index 5af82ff38ae..bcfbc26e42a 100644 --- a/src/components/expanded-state/TokenExpandedState.js +++ b/src/components/expanded-state/TokenExpandedState.js @@ -48,7 +48,7 @@ export default compose( InteractionManager.runAfterInteractions(() => { Piwik.trackEvent('Navigation', 'send-expanded', 'SendTokenExpandedNav'); - navigation.navigate('SendScreen', { asset: symbol }); + navigation.navigate('SendSheet', { asset: symbol }); }); }, }), diff --git a/src/components/fab/FabWrapper.js b/src/components/fab/FabWrapper.js index f1db049b10e..d2997eba85c 100644 --- a/src/components/fab/FabWrapper.js +++ b/src/components/fab/FabWrapper.js @@ -5,7 +5,6 @@ import styled from 'styled-components/primitives'; import { withSafeAreaViewInsetValues } from '../../hoc'; import { FlexItem, Row } from '../layout'; import SendFab from './SendFab'; -import WalletConnectFab from './WalletConnectFab'; const FabWrapperBottomPosition = 21; @@ -15,6 +14,14 @@ const Wrapper = styled(Row)` right: 12; `; +const renderFab = (fab, index) => + createElement(fab, { + key: index, + style: { + marginLeft: (index > 0) ? 12 : 0, + }, + }); + const FabWrapper = ({ children, disabled, @@ -23,17 +30,14 @@ const FabWrapper = ({ }) => ( {children} - - {fabs.map((fab, index) => ( - createElement(fab, { - disabled, - key: index, - style: { - marginLeft: (index > 0) ? 12 : 0, - }, - }) - ))} - + {!disabled && ( + + {fabs.map(renderFab)} + + )} ); diff --git a/src/components/fab/FloatingActionButton.js b/src/components/fab/FloatingActionButton.js index c58eef360e2..5c3af2cc683 100644 --- a/src/components/fab/FloatingActionButton.js +++ b/src/components/fab/FloatingActionButton.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React, { Fragment } from 'react'; import ReactNativeHapticFeedback from 'react-native-haptic-feedback'; +import { withHandlers } from 'recompact'; import styled from 'styled-components/primitives'; -import { ButtonPressAnimation } from '../buttons'; +import { ButtonPressAnimation } from '../animations'; import { Centered } from '../layout'; import { colors, position, shadow } from '../../styles'; import { ShadowStack } from '../shadow-stack'; -import { withHandlers } from 'recompact'; const FloatingActionButtonBorderRadius = 27; diff --git a/src/components/fab/SendFab.js b/src/components/fab/SendFab.js index 8c505121a10..a17193a2e2a 100644 --- a/src/components/fab/SendFab.js +++ b/src/components/fab/SendFab.js @@ -43,7 +43,7 @@ export default compose( withNavigation, withHandlers({ onPress: ({ navigation }) => () => { Piwik.trackEvent('Navigation', 'send-fab', 'SendFabNav'); - navigation.navigate('SendScreen'); + navigation.navigate('SendSheet'); }}), onlyUpdateForKeys(['disabled']), )(SendFab); diff --git a/src/components/fields/AddressField.js b/src/components/fields/AddressField.js index 481e8ec91c8..9978309fcb7 100644 --- a/src/components/fields/AddressField.js +++ b/src/components/fields/AddressField.js @@ -80,6 +80,10 @@ export default class UnderlineField extends Component { } } + componentWillUnmount() { + this.state.underlineAnimation.stopAnimation(); + } + onChange = ({ nativeEvent }) => { const { isValid, onChange } = this.props; const { value } = this.state; diff --git a/src/components/fields/UnderlineField.js b/src/components/fields/UnderlineField.js index 0fe1021df6b..5b2f99179ad 100644 --- a/src/components/fields/UnderlineField.js +++ b/src/components/fields/UnderlineField.js @@ -92,6 +92,10 @@ export default class UnderlineField extends Component { } } + componentWillUnmount() { + this.state.underlineAnimation.stopAnimation(); + } + onBlur = (...props) => { const { onBlur } = this.props; const { underlineAnimation } = this.state; diff --git a/src/components/header/HeaderButton.js b/src/components/header/HeaderButton.js index 7ef7fa290dc..28dff7200bd 100644 --- a/src/components/header/HeaderButton.js +++ b/src/components/header/HeaderButton.js @@ -1,8 +1,9 @@ import PropTypes from 'prop-types'; import React from 'react'; +import { pure } from 'recompact'; import styled from 'styled-components/primitives'; import { padding } from '../../styles'; -import { ButtonPressAnimation } from '../buttons'; +import { ButtonPressAnimation } from '../animations'; import { Flex } from '../layout'; const Container = styled(Flex)` @@ -28,4 +29,4 @@ HeaderButton.propTypes = { onPress: PropTypes.func.isRequired, }; -export default HeaderButton; +export default pure(HeaderButton); diff --git a/src/components/header/ProfileHeaderButton.js b/src/components/header/ProfileHeaderButton.js index ea03f0eb905..d4f22e13606 100644 --- a/src/components/header/ProfileHeaderButton.js +++ b/src/components/header/ProfileHeaderButton.js @@ -1,22 +1,40 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { compose, onlyUpdateForPropTypes, withHandlers } from 'recompact'; +import { + compose, + pickProps, + pure, + withHandlers, +} from 'recompact'; import Avatar from '../Avatar'; import HeaderButton from './HeaderButton'; +import { Badge } from '../badge'; +import { withRequests } from '../../hoc'; +import { Centered } from '../layout'; -const ProfileHeaderButton = ({ onPress }) => ( +const ProfileHeaderButton = ({ onPress, pendingRequestCount, ...props }) => ( - + + + {pendingRequestCount > 0 && ( + + )} + ); ProfileHeaderButton.propTypes = { onPress: PropTypes.func, + pendingRequestCount: PropTypes.number, }; export default compose( - withHandlers({ - onPress: ({ navigation }) => () => navigation.navigate('ProfileScreen'), - }), - onlyUpdateForPropTypes, + pure, + withRequests, + withHandlers({ onPress: ({ navigation }) => () => navigation.navigate('ProfileScreen') }), + pickProps(Object.keys(ProfileHeaderButton.propTypes)), )(ProfileHeaderButton); diff --git a/src/components/icons/Icon.js b/src/components/icons/Icon.js index 13190821eee..f2bfc05fc22 100644 --- a/src/components/icons/Icon.js +++ b/src/components/icons/Icon.js @@ -4,6 +4,7 @@ import Flex from '../layout/Flex'; import ArrowCircledIcon from './svg/ArrowCircledIcon'; import ArrowIcon from './svg/ArrowIcon'; +import AssetListItemSkeletonIcon from './svg/AssetListItemSkeletonIcon'; import AvatarIcon from './svg/AvatarIcon'; import BalanceLogoIcon from './svg/BalanceLogoIcon'; import CameraIcon from './svg/CameraIcon'; @@ -36,6 +37,7 @@ const Icon = ({ name, ...props }) => Icon.IconTypes = { arrow: ArrowIcon, arrowCircled: ArrowCircledIcon, + assetListItemSkeleton: AssetListItemSkeletonIcon, avatar: AvatarIcon, balanceLogo: BalanceLogoIcon, camera: CameraIcon, diff --git a/src/components/icons/svg/ArrowCircledIcon.js b/src/components/icons/svg/ArrowCircledIcon.js index fae98778a2c..cd5fdd313dc 100644 --- a/src/components/icons/svg/ArrowCircledIcon.js +++ b/src/components/icons/svg/ArrowCircledIcon.js @@ -6,7 +6,7 @@ import { colors } from '../../../styles'; import Svg from '../Svg'; const ArrowCircledIcon = ({ color, ...props }) => ( - + ( + + + + + + + + + +); + +AssetListItemSkeletonIcon.propTypes = { + color: PropTypes.string, +}; + +AssetListItemSkeletonIcon.defaultProps = { + color: colors.skeleton, +}; + +export default AssetListItemSkeletonIcon; diff --git a/src/components/inputs/Input.js b/src/components/inputs/Input.js new file mode 100644 index 00000000000..c3cbc7812cb --- /dev/null +++ b/src/components/inputs/Input.js @@ -0,0 +1,42 @@ +import PropTypes from 'prop-types'; +import React from 'react'; +import { TextInput } from 'react-native'; +import styled from 'styled-components'; +import { buildTextStyles, colors } from '../../styles'; + +const StyledInput = styled(TextInput)` + ${buildTextStyles} +`; + +const Input = ({ + autoCapitalize, + autoCorrect, + placeholderTextColor, + spellCheck, + ...props +}) => ( + +); + +Input.propTypes = { + autoCapitalize: PropTypes.string, + autoCorrect: PropTypes.bool, + placeholderTextColor: PropTypes.string, + spellCheck: PropTypes.bool, +}; + +Input.defaultProps = { + autoCapitalize: 'none', + autoCorrect: false, + placeholderTextColor: colors.placeholder, + spellCheck: true, +}; + +export default Input; diff --git a/src/components/inputs/MultiLineInput.js b/src/components/inputs/MultiLineInput.js new file mode 100644 index 00000000000..ffa1fd6ee14 --- /dev/null +++ b/src/components/inputs/MultiLineInput.js @@ -0,0 +1,10 @@ +import { compose, setDisplayName, withProps } from 'recompact'; +import Input from './Input'; + +export default compose( + setDisplayName('MultiLineInput'), + withProps({ + lineHeight: 'loosest', + multiline: true, + }), +)(Input); diff --git a/src/components/inputs/index.js b/src/components/inputs/index.js new file mode 100644 index 00000000000..c96a28a6d85 --- /dev/null +++ b/src/components/inputs/index.js @@ -0,0 +1,2 @@ +export { default as Input } from './Input'; +export { default as MultiLineInput } from './MultiLineInput'; diff --git a/src/components/layout/FlyInView.js b/src/components/layout/FlyInView.js index c1691398916..ee8fb2cea2f 100644 --- a/src/components/layout/FlyInView.js +++ b/src/components/layout/FlyInView.js @@ -1,7 +1,6 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Animated } from 'react-native'; - import Flex from './Flex'; export default class FlyInView extends Component { @@ -24,6 +23,7 @@ export default class FlyInView extends Component { const { animation } = this.state; Animated.timing(animation, { toValue: 0, duration: 300 }).start(); + animation.stopAnimation(); } render() { diff --git a/src/components/list/SectionList.js b/src/components/list/SectionList.js index e7ab4295567..138fdc06a58 100644 --- a/src/components/list/SectionList.js +++ b/src/components/list/SectionList.js @@ -24,6 +24,7 @@ class SectionList extends PureComponent { onRefresh: PropTypes.func, renderItem: PropTypes.func, renderSectionFooter: PropTypes.func, + safeAreaInset: PropTypes.object, showSafeAreaInsetBottom: PropTypes.bool, } diff --git a/src/components/modal/LoadingOverlay.js b/src/components/modal/LoadingOverlay.js new file mode 100644 index 00000000000..e3d0dfc5448 --- /dev/null +++ b/src/components/modal/LoadingOverlay.js @@ -0,0 +1,52 @@ +import PropTypes from 'prop-types'; +import React from 'react'; +import { BlurView } from 'react-native-blur'; +import { pure } from 'recompact'; +import styled from 'styled-components/primitives'; +import { colors, padding } from '../../styles'; +import ActivityIndicator from '../ActivityIndicator'; +import { FadeInAnimation } from '../animations'; +import { Centered } from '../layout'; +import { Text } from '../text'; +import TouchableBackdrop from '../TouchableBackdrop'; + +const Overlay = styled(Centered)` + ${padding(19, 19, 22)} + background-color: ${colors.alpha(colors.blueGreyDark, 0.15)}; + border-radius: 20; +`; + +const Title = styled(Text).attrs({ + color: 'blueGreyDark', + lineHeight: 'none', + size: 'large', + weight: 'semibold', +})` + margin-left: 8; +`; + +const LoadingOverlay = ({ title }) => ( + + + + + {title && ({title})} + + + +); + +LoadingOverlay.propTypes = { + title: PropTypes.string, +}; + +export default pure(LoadingOverlay); diff --git a/src/components/modal/index.js b/src/components/modal/index.js index 0bc81647eae..5651c456add 100644 --- a/src/components/modal/index.js +++ b/src/components/modal/index.js @@ -1,3 +1,4 @@ +export { default as LoadingOverlay } from './LoadingOverlay'; export { default as Modal } from './Modal'; export { default as ModalFooterButton } from './ModalFooterButton'; export { default as ModalFooterButtonsRow } from './ModalFooterButtonsRow'; diff --git a/src/components/pager/AnimatedPager.js b/src/components/pager/AnimatedPager.js index c0e0c9c55a5..9bd98a678f0 100644 --- a/src/components/pager/AnimatedPager.js +++ b/src/components/pager/AnimatedPager.js @@ -9,6 +9,7 @@ import AnimatedPagerItem from './AnimatedPagerItem'; const buildPagerAnimation = toValue => ({ duration: 300, easing: Easing.bezier(0.4, 0, 0.2, 1), + isInteraction: false, toValue, useNativeDriver: true, }); @@ -35,6 +36,11 @@ export default class AnimatedPager extends Component { componentDidUpdate = () => this.onAnimatePages(this.props.isOpen) + componentWillUnmount() { + this.translateValues.page1.stopAnimation(); + this.translateValues.page2.stopAnimation(); + } + onAnimatePages = (isOpen) => { const { width } = this.props; const { page1, page2 } = this.translateValues; diff --git a/src/components/profile/ProfileMasthead.js b/src/components/profile/ProfileMasthead.js index 82dd1e48ad4..b005288caaf 100644 --- a/src/components/profile/ProfileMasthead.js +++ b/src/components/profile/ProfileMasthead.js @@ -29,6 +29,7 @@ const ProfileMasthead = ({ accountAddress, onPressCopy, onPressReceive, + showBottomDivider, }) => ( - + {showBottomDivider && } ); @@ -60,6 +61,11 @@ ProfileMasthead.propTypes = { accountAddress: PropTypes.string, onPressCopy: PropTypes.func, onPressReceive: PropTypes.func, + showBottomDivider: PropTypes.bool, +}; + +ProfileMasthead.defaultProps = { + showBottomDivider: true, }; export default compose( @@ -68,5 +74,5 @@ export default compose( onPressCopy: ({ accountAddress }) => () => Clipboard.setString(accountAddress), onPressReceive: ({ navigation }) => () => navigation.navigate('ReceiveModal'), }), - onlyUpdateForKeys(['accountAddress']), + onlyUpdateForKeys(['accountAddress', 'showBottomDivider']), )(ProfileMasthead); diff --git a/src/components/settings-menu/CurrencySection.js b/src/components/settings-menu/CurrencySection.js index b3fe62b3cf6..3ce2087e565 100644 --- a/src/components/settings-menu/CurrencySection.js +++ b/src/components/settings-menu/CurrencySection.js @@ -60,9 +60,7 @@ CurrencySection.propTypes = { export default compose( withAccountSettings, withHandlers({ - onSelectCurrency: ({ accountChangeNativeCurrency }) => (currency) => - accountChangeNativeCurrency(currency), + onSelectCurrency: ({ settingsChangeNativeCurrency }) => (currency) => settingsChangeNativeCurrency(currency), }), onlyUpdateForKeys(['nativeCurrency']), )(CurrencySection); - diff --git a/src/components/settings-menu/LanguageSection.js b/src/components/settings-menu/LanguageSection.js index 612945a3b48..7c976007c5a 100644 --- a/src/components/settings-menu/LanguageSection.js +++ b/src/components/settings-menu/LanguageSection.js @@ -43,8 +43,8 @@ LanguageSection.propTypes = { export default compose( withAccountSettings, withHandlers({ - onSelectLanguage: ({ accountChangeLanguage }) => (language) => - accountChangeLanguage(language), + onSelectLanguage: ({ settingsChangeLanguage }) => (language) => + settingsChangeLanguage(language), }), onlyUpdateForKeys(['language']), )(LanguageSection); diff --git a/src/components/settings-menu/SettingsSection.js b/src/components/settings-menu/SettingsSection.js index 04434a7bba0..ebb281baff7 100644 --- a/src/components/settings-menu/SettingsSection.js +++ b/src/components/settings-menu/SettingsSection.js @@ -19,7 +19,7 @@ import { Emoji, Text } from '../text'; const SettingsExternalURLs = { about: 'https://balance.io/about', - feedback: 'support@balance.io', + feedback: 'https://support@balance.io', legal: 'https://github.com/balance-io/balance-wallet/blob/master/LICENSE', }; @@ -60,6 +60,7 @@ const SettingsSection = ({ nativeCurrency, onPressBackup, onPressCurrency, + onPressImportSeedPhrase, onPressLanguage, // onPressSecurity, openWebView, @@ -109,6 +110,12 @@ const SettingsSection = ({ + } + label="Import Seed Phrase" + onPress={onPressImportSeedPhrase} + /> + } label="About Balance" @@ -138,6 +145,7 @@ SettingsSection.propTypes = { nativeCurrency: PropTypes.string.isRequired, onPressBackup: PropTypes.func.isRequired, onPressCurrency: PropTypes.func.isRequired, + onPressImportSeedPhrase: PropTypes.func.isRequired, onPressLanguage: PropTypes.func.isRequired, // onPressSecurity: PropTypes.func.isRequired, openWebView: PropTypes.func, diff --git a/src/components/text/Text.js b/src/components/text/Text.js index 0bedfeaa42a..cb83e05302a 100644 --- a/src/components/text/Text.js +++ b/src/components/text/Text.js @@ -1,22 +1,9 @@ import { withProps } from 'recompact'; import styled from 'styled-components/primitives'; -import { colors, fonts } from '../../styles'; +import { buildTextStyles } from '../../styles'; const Text = styled.Text` - ${({ align }) => ( - align - ? `text-align: ${align};` - : '' - )} - ${({ lineHeight }) => ( - lineHeight - ? `line-height: ${fonts.lineHeight[lineHeight]};` - : '' - )} - color: ${({ color }) => (colors.get(color) || colors.dark)} - font-family: ${({ family }) => fonts.family[family || 'SFProText']}; - font-size: ${({ size }) => fonts.size[size || 'medium']}; - font-weight: ${({ weight }) => fonts.weight[weight || 'regular']}; + ${buildTextStyles} `; export default withProps({ allowFontScaling: false })(Text); diff --git a/src/components/unique-token/UniqueTokenAttributes.js b/src/components/unique-token/UniqueTokenAttributes.js index 78e1b8bef00..aeea41e3842 100644 --- a/src/components/unique-token/UniqueTokenAttributes.js +++ b/src/components/unique-token/UniqueTokenAttributes.js @@ -1,3 +1,4 @@ +import { sortList } from 'balance-common'; import PropTypes from 'prop-types'; import styled from 'styled-components/primitives'; import React from 'react'; @@ -10,8 +11,8 @@ import { withProps, withState, } from 'recompact'; -import { colors, margin } from '../../styles'; -import { dimensionsPropType, sortList } from '../../utils'; +import { colors, margin, padding } from '../../styles'; +import { dimensionsPropType } from '../../utils'; import { Centered, FlexItem } from '../layout'; import { PagerControls } from '../pager'; import Tag from '../Tag'; @@ -24,6 +25,7 @@ const AttributeItemTag = styled(Tag)` `; const Wrapper = styled(Centered).attrs({ wrap: true })` + ${padding(0, AttributesPadding * 1.125)} flex-grow: 1; `; @@ -86,7 +88,10 @@ UniqueTokenAttributes.propTypes = { dimensions: dimensionsPropType, onListLayout: PropTypes.func, onScroll: PropTypes.func, - traits: PropTypes.object, + traits: PropTypes.arrayOf(PropTypes.shape({ + trait_type: PropTypes.string.isRequired, + value: PropTypes.node.isRequired, + })), willListOverflow: PropTypes.bool, }; @@ -100,11 +105,10 @@ const enhance = compose( traits: sortList(traits, 'trait_type', 'asc'), })), withHandlers({ - onListLayout: ({ dimensions, setWillListOverflow }) => ({ nativeEvent: { layout } }) => - setWillListOverflow(layout.height > dimensions.height), - onScroll: () => event => { - event.stopPropagation(); + onListLayout: ({ dimensions, setWillListOverflow }) => ({ nativeEvent: { layout } }) => { + setWillListOverflow(layout.height > dimensions.height); }, + onScroll: () => event => event.stopPropagation(), }), ); diff --git a/src/components/unique-token/UniqueTokenCard.js b/src/components/unique-token/UniqueTokenCard.js index 1fb98e6b988..ec9f04c5577 100644 --- a/src/components/unique-token/UniqueTokenCard.js +++ b/src/components/unique-token/UniqueTokenCard.js @@ -4,7 +4,7 @@ import Piwik from 'react-native-matomo'; import { compose, pure, withHandlers } from 'recompact'; import styled from 'styled-components/primitives'; import { colors, position, shadow } from '../../styles'; -import { ButtonPressAnimation } from '../buttons'; +import { ButtonPressAnimation } from '../animations'; import { Centered } from '../layout'; import { ShadowStack } from '../shadow-stack'; import UniqueTokenImage from './UniqueTokenImage'; diff --git a/src/components/unique-token/UniqueTokenRow.js b/src/components/unique-token/UniqueTokenRow.js index 1ce4e2bda53..3f00878a58e 100644 --- a/src/components/unique-token/UniqueTokenRow.js +++ b/src/components/unique-token/UniqueTokenRow.js @@ -1,7 +1,12 @@ import { compact } from 'lodash'; import PropTypes from 'prop-types'; import React from 'react'; -import { compose, mapProps, onlyUpdateForKeys, withProps } from 'recompact'; +import { + compose, + mapProps, + onlyUpdateForKeys, + withProps, +} from 'recompact'; import styled from 'styled-components/primitives'; import { padding } from '../../styles'; import { deviceUtils } from '../../utils'; diff --git a/src/components/walletconnect-list/WalletConnectList.js b/src/components/walletconnect-list/WalletConnectList.js index e5d975d5a82..7228ab7c84f 100644 --- a/src/components/walletconnect-list/WalletConnectList.js +++ b/src/components/walletconnect-list/WalletConnectList.js @@ -53,6 +53,7 @@ const WalletConnectList = ({ ); WalletConnectList.propTypes = { + onHandleDisconnectAlert: PropTypes.func, onLayout: PropTypes.func, safeAreaInset: PropTypes.object, walletConnectorsByDappName: PropTypes.arrayOf(PropTypes.object), @@ -73,12 +74,12 @@ export default compose( const validSessions = getValidWalletConnectors(); const dappSessions = values(pickBy(validSessions, (session) => session.dappName === dappName)); walletConnectDisconnectAll(dappSessions) - .then(() => { - removeWalletConnectorByDapp(dappName); - }); + .then(() => { + removeWalletConnectorByDapp(dappName); + }); } }); - } + }, }), onlyUpdateForPropTypes, )(WalletConnectList); diff --git a/src/components/walletconnect-list/WalletConnectListItem.js b/src/components/walletconnect-list/WalletConnectListItem.js index 6a235ea6ae6..d50a1de967f 100644 --- a/src/components/walletconnect-list/WalletConnectListItem.js +++ b/src/components/walletconnect-list/WalletConnectListItem.js @@ -1,7 +1,12 @@ import { distanceInWordsStrict } from 'date-fns'; import PropTypes from 'prop-types'; import React from 'react'; -import { compose, hoistStatics, onlyUpdateForKeys, withHandlers } from 'recompact'; +import { + compose, + hoistStatics, + onlyUpdateForKeys, + withHandlers, +} from 'recompact'; import styled from 'styled-components/primitives'; import { colors, padding } from '../../styles'; import { Button } from '../buttons'; diff --git a/src/helpers/assets.js b/src/helpers/assets.js index d38e0043f22..ccd4b859ee8 100644 --- a/src/helpers/assets.js +++ b/src/helpers/assets.js @@ -1,25 +1,3 @@ -import { INITIAL_ACCOUNT_STATE } from 'balance-common'; -import { get, groupBy, isEqual, isNull, omit, toNumber } from 'lodash'; -import { sortList } from '../utils'; - -const EMPTY_ARRAY = []; - -const InitialAccountAssetsState = get(INITIAL_ACCOUNT_STATE, 'accountInfo.assets[0]', {}); - -export const areAssetsEqualToInitialAccountAssetsState = (sectionData) => { - const currentBalance = get(sectionData, 'balance.display'); - const initialBalance = get(InitialAccountAssetsState, 'balance.display'); - - if (!isEqual(currentBalance, initialBalance)) { - return false; - } - - const currentState = omit(sectionData, ['balance', 'native']); - const initialState = omit(InitialAccountAssetsState, ['balance', 'native']); - - return isEqual(currentState, initialState); -}; - export const buildUniqueTokenList = (uniqueTokensAssets) => { const list = []; @@ -33,27 +11,3 @@ export const buildUniqueTokenList = (uniqueTokensAssets) => { export const buildUniqueTokenName = ({ asset_contract, id, name }) => ( name || `${asset_contract.name} #${id}` ); - -export const groupAssetsByMarketValue = assets => groupBy(assets, ({ native }) => ( - isNull(native) ? 'noValue' : 'hasValue' -)); - -export const sortAssetsByNativeAmount = (assets) => { - const { - hasValue = EMPTY_ARRAY, - noValue = EMPTY_ARRAY, - } = groupAssetsByMarketValue(assets); - - const sortedAssets = sortList(hasValue, 'native.balance.amount', 'desc', 0, toNumber); - const sortedShitcoins = sortList(noValue, 'name', 'asc'); - const allAssets = sortedAssets.concat(sortedShitcoins); - - return { - allAssets, - allAssetsCount: allAssets.length, - assets: sortedAssets, - assetsCount: sortedAssets.length, - shitcoins: sortedShitcoins, - shitcoinsCount: sortedShitcoins.length, - }; -}; diff --git a/src/helpers/buildWalletSections.js b/src/helpers/buildWalletSections.js index 4ce2d9f7d82..806d88af6c3 100644 --- a/src/helpers/buildWalletSections.js +++ b/src/helpers/buildWalletSections.js @@ -3,21 +3,32 @@ import { get } from 'lodash'; import React from 'react'; import { withNavigation } from 'react-navigation'; import { compose, withHandlers } from 'recompact'; +import { createSelector } from 'reselect'; import { BalanceCoinRow } from '../components/coin-row'; import { UniqueTokenRow } from '../components/unique-token'; -import { - areAssetsEqualToInitialAccountAssetsState, - buildUniqueTokenList, -} from '../helpers/assets'; +import { buildUniqueTokenList } from './assets'; + +const allAssetsSelector = state => state.allAssets; +const allAssetsCountSelector = state => state.allAssetsCount; +const assetsSelector = state => state.assets; +const assetsTotalSelector = state => state.assetsTotal; +const fetchingAssetsSelector = state => state.fetchingAssets; +const fetchingUniqueTokensSelector = state => state.fetchingUniqueTokens; +const onToggleShowShitcoinsSelector = state => state.onToggleShowShitcoins; +const setIsWalletEmptySelector = state => state.setIsWalletEmpty; +const shitcoinsCountSelector = state => state.shitcoinsCount; +const showShitcoinsSelector = state => state.showShitcoins; +const uniqueTokensSelector = state => state.uniqueTokens; const enhanceRenderItem = compose( withNavigation, withHandlers({ - onPress: ({ assetType, navigation }) => (name) => + onPress: ({ assetType, navigation }) => (name) => { navigation.navigate('ExpandedAssetScreen', { name, type: assetType, - }), + }); + }, }), ); @@ -27,23 +38,29 @@ const UniqueTokenItem = enhanceRenderItem(UniqueTokenRow); const balancesRenderItem = item => ; const collectiblesRenderItem = item => ; -export default ({ +const filterWalletSections = sections => Object.values(sections).filter(({ totalItems }) => totalItems); + +const buildWalletSections = ( allAssets, allAssetsCount, assets, - assetsTotalUSD, + assetsTotal, + fetchingAssets, + fetchingUniqueTokens, onToggleShowShitcoins, + setIsWalletEmpty, shitcoinsCount, showShitcoins, uniqueTokens, -}) => { +) => { + console.log('build wallet sections'); const sections = { balances: { data: showShitcoins ? allAssets : assets, renderItem: balancesRenderItem, title: lang.t('account.tab_balances'), - totalItems: get(assetsTotalUSD, 'amount') ? allAssetsCount : 0, - totalValue: get(assetsTotalUSD, 'display', ''), + totalItems: allAssetsCount, + totalValue: get(assetsTotal, 'display', ''), }, collectibles: { data: buildUniqueTokenList(uniqueTokens), @@ -69,16 +86,32 @@ export default ({ }; } - const filteredSections = Object.values(sections).filter(({ totalItems }) => totalItems); + const filteredSections = filterWalletSections(sections); + const isEmpty = !filteredSections.length; - let isEmpty = !filteredSections.length; - if (filteredSections.length === 1) { - isEmpty = areAssetsEqualToInitialAccountAssetsState(filteredSections[0].data[0]); - } + // Save wallet empty status to state + setIsWalletEmpty(isEmpty); return { isEmpty, - isLoading: !filteredSections.length, + isLoading: fetchingAssets || fetchingUniqueTokens, sections: filteredSections, }; }; + +export default createSelector( + [ + allAssetsSelector, + allAssetsCountSelector, + assetsSelector, + assetsTotalSelector, + fetchingAssetsSelector, + fetchingUniqueTokensSelector, + onToggleShowShitcoinsSelector, + setIsWalletEmptySelector, + shitcoinsCountSelector, + showShitcoinsSelector, + uniqueTokensSelector, + ], + buildWalletSections, +); diff --git a/src/helpers/transactionStatusTypes.js b/src/helpers/transactionStatusTypes.js new file mode 100644 index 00000000000..07e5e9db2cf --- /dev/null +++ b/src/helpers/transactionStatusTypes.js @@ -0,0 +1,8 @@ +export default { + failed: 'failed', + received: 'received', + receiving: 'receiving', + self: 'self', + sending: 'sending', + sent: 'sent', +}; diff --git a/src/helpers/transactions.js b/src/helpers/transactions.js index 82ed903692f..06499953a3d 100644 --- a/src/helpers/transactions.js +++ b/src/helpers/transactions.js @@ -6,17 +6,20 @@ import { isToday, isYesterday, } from 'date-fns'; -import { get, groupBy, isEmpty } from 'lodash'; +import { + get, + groupBy, + isEmpty, +} from 'lodash'; import { createElement } from 'react'; +import { createSelector } from 'reselect'; +import { RequestCoinRow, TransactionCoinRow } from '../components/coin-row'; +import TransactionStatusTypes from './transactionStatusTypes'; -export const TransactionStatusTypes = { - failed: 'failed', - received: 'received', - receiving: 'receiving', - self: 'self', - sending: 'sending', - sent: 'sent', -}; +const accountAddressSelector = state => state.accountAddress; +const nativeCurrencySelector = state => state.nativeCurrency; +const requestsSelector = state => state.requests; +const transactionsSelector = state => state.transactions; export const getTransactionStatus = ({ accountAddress, @@ -41,23 +44,18 @@ export const getTransactionStatus = ({ return undefined; }; -const groupTransactionByDate = (transactions) => - groupBy(transactions, ({ pending, timestamp: time }) => { - if (pending) return 'Pending'; +const groupTransactionByDate = ({ pending, timestamp: time }) => { + if (pending) return 'Pending'; - const { ms } = time; - const timestamp = new Date(parseInt(ms, 10)); + const { ms } = time; + const timestamp = new Date(parseInt(ms, 10)); - if (isToday(timestamp)) { - return 'Today'; - } else if (isYesterday(timestamp)) { - return 'Yesterday'; - } else if (isThisMonth(timestamp)) { - return 'This Month'; - } + if (isToday(timestamp)) return 'Today'; + if (isYesterday(timestamp)) return 'Yesterday'; + if (isThisMonth(timestamp)) return 'This Month'; - return format(timestamp, `MMMM${isThisYear(timestamp) ? '' : ' YYYY'}`); - }); + return format(timestamp, `MMMM${isThisYear(timestamp) ? '' : ' YYYY'}`); +}; const normalizeTransactions = ({ accountAddress, nativeCurrency, transactions }) => transactions.map(({ @@ -79,38 +77,54 @@ const normalizeTransactions = ({ accountAddress, nativeCurrency, transactions }) const renderItemElement = renderItem => renderItemProps => createElement(renderItem, renderItemProps); -export const buildTransactionsSections = ({ +const buildTransactionsSections = ( accountAddress, nativeCurrency, - requestRenderItem, requests, - transactionRenderItem, transactions, -}) => { - const normalizedTransactions = normalizeTransactions({ - accountAddress, - nativeCurrency, - transactions, - }); - - const transactionsByDate = groupTransactionByDate(normalizedTransactions); - - const sectionedTransactions = Object.keys(transactionsByDate).map(section => ({ - data: transactionsByDate[section], - renderItem: renderItemElement(transactionRenderItem), - title: section, - })); +) => { + let sectionedTransactions = []; + + if (!isEmpty(transactions)) { + const normalizedTransactions = normalizeTransactions({ + accountAddress, + nativeCurrency, + transactions, + }); + + const transactionsByDate = groupBy(normalizedTransactions, groupTransactionByDate); + + sectionedTransactions = Object.keys(transactionsByDate).map(section => ({ + data: transactionsByDate[section], + renderItem: renderItemElement(TransactionCoinRow), + title: section, + })); + } + + let requestsToApprove = []; if (!isEmpty(requests)) { requestsToApprove = [{ data: requests, - renderItem: renderItemElement(requestRenderItem), + renderItem: renderItemElement(RequestCoinRow), title: 'Requests', }]; } - return [ - ...requestsToApprove, - ...sectionedTransactions, - ]; + return { + sections: [ + ...requestsToApprove, + ...sectionedTransactions, + ], + }; }; + +export const buildTransactionsSectionsSelector = createSelector( + [ + accountAddressSelector, + nativeCurrencySelector, + requestsSelector, + transactionsSelector, + ], + buildTransactionsSections, +); diff --git a/src/hoc/index.js b/src/hoc/index.js index a8bad9d6917..5c40fe11ea8 100644 --- a/src/hoc/index.js +++ b/src/hoc/index.js @@ -1,12 +1,14 @@ export { default as withAccountAddress } from './withAccountAddress'; -export { default as withAccountAssets } from './withAccountAssets'; +export { default as withAccountRefresh } from './withAccountRefresh'; +export { default as withAccountReset } from './withAccountReset'; export { default as withAccountSettings } from './withAccountSettings'; export { default as withAccountTransactions } from './withAccountTransactions'; export { default as withAddWalletConnector } from './withAddWalletConnector'; export { default as withBlurTransitionProps } from './withBlurTransitionProps'; +export { default as withFetchingPrices } from './withFetchingPrices'; export { default as withHideSplashScreen } from './withHideSplashScreen'; -export { default as withHideSplashScreenOnMount } from './withHideSplashScreenOnMount'; export { default as withImageDimensionsCache } from './withImageDimensionsCache'; +export { default as withIsWalletEmpty } from './withIsWalletEmpty'; export { default as withMessageSigningScreen } from './withMessageSigningScreen'; export { default as withRequests } from './withRequests'; export { default as withRequestsInit } from './withRequestsInit'; diff --git a/src/hoc/withAccountAddress.js b/src/hoc/withAccountAddress.js index 696d98c5d12..67e2b368b51 100644 --- a/src/hoc/withAccountAddress.js +++ b/src/hoc/withAccountAddress.js @@ -1,9 +1,18 @@ +import { settingsUpdateAccountAddress } from 'balance-common'; import { connect } from 'react-redux'; import { compose, withProps } from 'recompose'; +import { createSelector } from 'reselect'; -const mapStateToProps = ({ account: { accountAddress } }) => ({ accountAddress }); +const mapStateToProps = ({ settings: { accountAddress } }) => ({ accountAddress }); + +const accountAddressSelector = state => state.accountAddress; + +const lowerAccountAddressSelector = createSelector( + [ accountAddressSelector ], + (accountAddress) => ({ accountAddress: accountAddress.toLowerCase() }), +); export default Component => compose( - connect(mapStateToProps), - withProps(({ accountAddress }) => ({ accountAddress: accountAddress.toLowerCase() })), + connect(mapStateToProps, { settingsUpdateAccountAddress }), + withProps(lowerAccountAddressSelector), )(Component); diff --git a/src/hoc/withAccountAssets.js b/src/hoc/withAccountAssets.js deleted file mode 100644 index ff9775d3669..00000000000 --- a/src/hoc/withAccountAssets.js +++ /dev/null @@ -1,29 +0,0 @@ -import { accountUpdateAccountAddress } from 'balance-common'; -import { connect } from 'react-redux'; -import { compose, withProps } from 'recompact'; -import { sortAssetsByNativeAmount } from '../helpers/assets'; - -const mapStateToProps = ({ - account: { - accountInfo: { - assets, - total, - }, - fetching, - fetchingUniqueTokens, - uniqueTokens, - }, -}) => ({ - assets, - assetsTotalUSD: total, - fetching, - fetchingUniqueTokens, - uniqueTokens, -}); - -const sortAssets = ({ assets }) => sortAssetsByNativeAmount(assets); - -export default Component => compose( - connect(mapStateToProps, { accountUpdateAccountAddress }), - withProps(sortAssets), -)(Component); diff --git a/src/hoc/withAccountRefresh.js b/src/hoc/withAccountRefresh.js new file mode 100644 index 00000000000..f8c9927908e --- /dev/null +++ b/src/hoc/withAccountRefresh.js @@ -0,0 +1,13 @@ +import { assetsRefreshState, transactionsRefreshState } from 'balance-common'; +import { connect } from 'react-redux'; +import { compose, withHandlers } from 'recompact'; + +export default Component => compose( + connect(null, { assetsRefreshState, transactionsRefreshState }), + withHandlers({ + refreshAccount: (ownProps) => async () => { + ownProps.transactionsRefreshState(); + await ownProps.assetsRefreshState(); + }, + }), +)(Component); diff --git a/src/hoc/withAccountReset.js b/src/hoc/withAccountReset.js new file mode 100644 index 00000000000..e3e1ef53ccd --- /dev/null +++ b/src/hoc/withAccountReset.js @@ -0,0 +1,7 @@ +import { accountClearState } from 'balance-common'; +import { connect } from 'react-redux'; +import { compose } from 'recompact'; + +export default Component => compose( + connect(null, { accountClearState }), +)(Component); diff --git a/src/hoc/withAccountSettings.js b/src/hoc/withAccountSettings.js index 6a53877e54e..0d887865877 100644 --- a/src/hoc/withAccountSettings.js +++ b/src/hoc/withAccountSettings.js @@ -1,10 +1,11 @@ import lang from 'i18n-js'; -import { accountChangeLanguage, accountChangeNativeCurrency } from 'balance-common'; +import { settingsChangeLanguage, settingsChangeNativeCurrency } from 'balance-common'; import { connect } from 'react-redux'; import { compose, withProps } from 'recompact'; +import { createSelector } from 'reselect'; const mapStateToProps = ({ - account: { + settings: { language, nativeCurrency, }, @@ -13,16 +14,25 @@ const mapStateToProps = ({ nativeCurrency, }); +const languageSelector = state => state.language; + +const withLanguage = (language) => { + if (language !== lang.locale) { + lang.locale = language; + } + + return { language }; +} + +const withLanguageSelector = createSelector( + [ languageSelector ], + withLanguage, +); + export default Component => compose( connect(mapStateToProps, { - accountChangeLanguage, - accountChangeNativeCurrency, - }), - withProps(({ language }) => { - if (language !== lang.locale) { - lang.locale = language; - } - - return { language }; + settingsChangeLanguage, + settingsChangeNativeCurrency, }), + withProps(withLanguageSelector), )(Component); diff --git a/src/hoc/withAccountTransactions.js b/src/hoc/withAccountTransactions.js index ca884fd7006..0a51ddb74e9 100644 --- a/src/hoc/withAccountTransactions.js +++ b/src/hoc/withAccountTransactions.js @@ -1,27 +1,25 @@ import { connect } from 'react-redux'; import { compose, withProps } from 'recompact'; +import { createSelector } from 'reselect'; -const EMPTY_ARRAY = []; +const transactionsSelector = state => state.transactions; const mapStateToProps = ({ - account: { - fetchingTransactions, + transactions: { hasPendingTransaction, - nativeCurrency, transactions, }, }) => ({ - fetchingTransactions, hasPendingTransaction, - nativeCurrency, transactions, }); -const getTransactionsCount = ({ transactions }) => ({ - transactionsCount: (transactions || EMPTY_ARRAY).length, -}); +const transactionsCountSelector = createSelector( + [ transactionsSelector ], + (transactions) => ({ transactionsCount: transactions.length }), +); export default Component => compose( connect(mapStateToProps), - withProps(getTransactionsCount), + withProps(transactionsCountSelector), )(Component); diff --git a/src/hoc/withFetchingPrices.js b/src/hoc/withFetchingPrices.js new file mode 100644 index 00000000000..dbb221d4ddd --- /dev/null +++ b/src/hoc/withFetchingPrices.js @@ -0,0 +1,5 @@ +import { connect } from 'react-redux'; + +const mapStateToProps = ({ prices: { fetchingPrices } }) => ({ fetchingPrices }); + +export default Component => connect(mapStateToProps)(Component); diff --git a/src/hoc/withHideSplashScreenOnMount.js b/src/hoc/withHideSplashScreenOnMount.js deleted file mode 100644 index 7aacf3c8688..00000000000 --- a/src/hoc/withHideSplashScreenOnMount.js +++ /dev/null @@ -1,11 +0,0 @@ -import { compose, lifecycle } from 'recompact'; -import withHideSplashScreen from './withHideSplashScreen'; - -export default Component => compose( - withHideSplashScreen, - lifecycle({ - componentDidMount() { - this.props.onHideSplashScreen(); - }, - }), -)(Component); diff --git a/src/hoc/withIsWalletEmpty.js b/src/hoc/withIsWalletEmpty.js new file mode 100644 index 00000000000..26e44139e60 --- /dev/null +++ b/src/hoc/withIsWalletEmpty.js @@ -0,0 +1,6 @@ +import { connect } from 'react-redux'; +import { setIsWalletEmpty } from '../redux/isWalletEmpty'; + +const mapStateToProps = ({ isWalletEmpty }) => isWalletEmpty; + +export default Component => connect(mapStateToProps, { setIsWalletEmpty })(Component); diff --git a/src/hoc/withRequests.js b/src/hoc/withRequests.js index 496a476c4b1..d8d1fec7cfb 100644 --- a/src/hoc/withRequests.js +++ b/src/hoc/withRequests.js @@ -1,19 +1,29 @@ import { reverse, sortBy, values } from 'lodash'; import { connect } from 'react-redux'; import { compose, withProps } from 'recompact'; +import { createSelector } from 'reselect'; const mapStateToProps = ({ transactionsToApprove: { transactionsToApprove } }) => ({ requests: transactionsToApprove, }); +const requestsSelector = state => state.requests; + +const withRequests = (requests) => { + const sortedRequests = reverse(sortBy(values(requests), 'transactionPayload.timestamp')); + + return { + pendingRequestCount: sortedRequests.length, + requests: sortedRequests, + }; +} + +const withRequestsSelector = createSelector( + [ requestsSelector ], + withRequests, +); + export default Component => compose( connect(mapStateToProps), - withProps(({ requests }) => { - const sortedRequests = reverse(sortBy(values(requests), 'transactionPayload.timestamp')); - - return { - pendingRequestCount: sortedRequests.length, - requests: sortedRequests, - }; - }), + withProps(withRequestsSelector), )(Component); diff --git a/src/hoc/withRequestsInit.js b/src/hoc/withRequestsInit.js index d80193050ea..2187d06336e 100644 --- a/src/hoc/withRequestsInit.js +++ b/src/hoc/withRequestsInit.js @@ -1,4 +1,4 @@ -import { transactionsToApproveInit } from '../redux/transactionsToApprove'; import { connect } from 'react-redux'; +import { transactionsToApproveInit } from '../redux/transactionsToApprove'; export default Component => connect(null, { transactionsToApproveInit })(Component); diff --git a/src/hoc/withTrackingDate.js b/src/hoc/withTrackingDate.js index caaae989983..ac757fb8f64 100644 --- a/src/hoc/withTrackingDate.js +++ b/src/hoc/withTrackingDate.js @@ -1,11 +1,7 @@ import { connect } from 'react-redux'; import { trackingDateInit, updateTrackingDate } from '../redux/tracking'; -const mapStateToProps = ({ - tracking: { trackingDate }, -}) => ({ - trackingDate, -}); +const mapStateToProps = ({ tracking: { trackingDate } }) => ({ trackingDate }); export default Component => connect(mapStateToProps, { trackingDateInit, diff --git a/src/hoc/withTransactionConfirmationScreen.js b/src/hoc/withTransactionConfirmationScreen.js index 904587c74e1..f00107b6660 100644 --- a/src/hoc/withTransactionConfirmationScreen.js +++ b/src/hoc/withTransactionConfirmationScreen.js @@ -1,4 +1,4 @@ -import { accountUpdateHasPendingTransaction, accountUpdateTransactions } from 'balance-common'; +import { transactionsAddNewTransaction } from 'balance-common'; import { connect } from 'react-redux'; import { removeTransaction } from '../redux/transactionsToApprove'; import { updateTransactionCountNonce } from '../redux/nonce'; @@ -12,8 +12,7 @@ const mapStateToProps = ({ }); export default Component => connect(mapStateToProps, { - accountUpdateHasPendingTransaction, - accountUpdateTransactions, + transactionsAddNewTransaction, removeTransaction, updateTransactionCountNonce, })(Component); diff --git a/src/hoc/withWalletConnectConnections.js b/src/hoc/withWalletConnectConnections.js index 084564a61ff..3c228c3c949 100644 --- a/src/hoc/withWalletConnectConnections.js +++ b/src/hoc/withWalletConnectConnections.js @@ -1,35 +1,50 @@ -import { head, groupBy, mapValues, values } from 'lodash'; -import { compose, withProps } from 'recompact'; +import { sortList } from 'balance-common'; +import { + head, + groupBy, + mapValues, + values, +} from 'lodash'; import { connect } from 'react-redux'; +import { compose, withProps } from 'recompact'; +import { createSelector } from 'reselect'; import { getValidWalletConnectors, removeWalletConnectorByDapp, setWalletConnectors, } from '../redux/walletconnect'; -import { sortList } from '../utils'; const mapStateToProps = ({ walletconnect: { walletConnectors } }) => ({ walletConnectors }); +const walletConnectorsSelector = state => state.walletConnectors; + +const sortWalletConnectors = (walletConnectors) => { + const sortedWalletConnectors = sortList(Object.values(walletConnectors), 'expires'); + const sortedWalletConnectorsByDappName = groupBy(sortedWalletConnectors, 'dappName'); + const dappWalletConnector = mapValues(sortedWalletConnectorsByDappName, (connectors) => { + const firstElement = head(connectors); + return { + dappName: firstElement.dappName, + expires: firstElement.expires, + }; + }); + return { + sortedWalletConnectors, + walletConnectorsByDappName: values(dappWalletConnector), + walletConnectorsCount: sortedWalletConnectors.length, + }; +} + +const walletConnectSelector = createSelector( + [ walletConnectorsSelector ], + sortWalletConnectors, +); + export default Component => compose( connect(mapStateToProps, { getValidWalletConnectors, removeWalletConnectorByDapp, setWalletConnectors, }), - withProps(({ walletConnectors }) => { - const sortedWalletConnectors = sortList(Object.values(walletConnectors), 'expires'); - const sortedWalletConnectorsByDappName = groupBy(sortedWalletConnectors, 'dappName'); - const dappWalletConnector = mapValues(sortedWalletConnectorsByDappName, (connectors) => { - const firstElement = head(connectors); - return { - dappName: firstElement.dappName, - expires: firstElement.expires - }; - }); - return { - sortedWalletConnectors, - walletConnectorsByDappName: values(dappWalletConnector), - walletConnectorsCount: sortedWalletConnectors.length, - }; - }), + withProps(walletConnectSelector), )(Component); diff --git a/src/model/localstorage.js b/src/model/localstorage.js index 62f66443a71..b164133b904 100644 --- a/src/model/localstorage.js +++ b/src/model/localstorage.js @@ -38,59 +38,45 @@ export const getLastTrackingDate = async () => { export const updateLastTrackingDate = async () => { await commonStorage.saveLocal('lastTrackingDate', { data: new Date().toString() }); }; + +const getRequestsKey = (accountAddress, network) => `requests-${accountAddress.toLowerCase()}-${network.toLowerCase()}`; + /** * @desc get account local requests * @param {String} [address] * @return {Object} */ -export const getAccountLocalRequests = async (accountAddress, network) => { - const accountLocal = await commonStorage.getAccountLocal(accountAddress); - const requests = accountLocal && accountLocal[network] ? accountLocal[network].requests : {}; +export const getLocalRequests = async (accountAddress, network) => { + const requestsData = await commonStorage.getLocal(getRequestsKey(accountAddress, network)); + const requests = requestsData ? requestsData.data : {}; const openRequests = pickBy(requests, (request) => (differenceInMinutes(Date.now(), request.transactionDisplayDetails.timestampInMs) < 60)); - await updateLocalRequests(accountAddress, network, openRequests); + await saveLocalRequests(accountAddress, network, openRequests); return openRequests; }; /** - * @desc update local incoming transaction requests + * @desc save local incoming requests * @param {String} [address] * @param {String} [network] * @return {Void} */ -export const updateLocalRequests = async (address, network, requests) => { - if (!address) return; - let accountLocal = await commonStorage.getAccountLocal(address); - if (!accountLocal) { - accountLocal = {}; - } - if (!accountLocal[network]) { - accountLocal[network] = {}; - } - accountLocal[network].requests = { ...requests }; - await commonStorage.saveLocal(address.toLowerCase(), accountLocal); +export const saveLocalRequests = async (accountAddress, network, requests) => { + await commonStorage.saveLocal( + getRequestsKey(accountAddress, network), + { data: requests }, + ); }; /** - * @desc remove transaction request + * @desc remove request * @param {String} [address] * @param {String} [network] * @param {String} [callId] * @return {Void} */ export const removeLocalRequest = async (address, network, callId) => { - if (!address) return; - let accountLocal = await commonStorage.getAccountLocal(address); - if (!accountLocal) { - accountLocal = {}; - } - if (!accountLocal[network]) { - accountLocal[network] = {}; - } - if (!accountLocal[network].requests) { - accountLocal[network].requests = {}; - } - let updatedRequests = accountLocal[network].requests; + const requests = getLocalRequests(address, network); + const updatedRequests = { ...requests }; delete updatedRequests[callId]; - accountLocal[network].requests = { ...updatedRequests }; - await commonStorage.saveLocal(address.toLowerCase(), accountLocal); + saveLocalRequests(address, network, updatedRequests); }; diff --git a/src/model/wallet.js b/src/model/wallet.js index 3802b8d9874..80355486ec1 100644 --- a/src/model/wallet.js +++ b/src/model/wallet.js @@ -8,7 +8,8 @@ import { canImplyAuthentication, } from 'react-native-keychain'; import Piwik from 'react-native-matomo'; -import * as keychain from '../model/keychain'; +import * as keychain from './keychain'; + const seedPhraseKey = 'balanceWalletSeedPhrase'; const privateKeyKey = 'balanceWalletPrivateKey'; const addressKey = 'balanceWalletAddressKey'; @@ -19,10 +20,15 @@ export function generateSeedPhrase() { export const walletInit = async (seedPhrase = null) => { let walletAddress = null; - walletAddress = await loadAddress(); - if (!walletAddress) { + if (seedPhrase) { walletAddress = await createWallet(seedPhrase); } + if (!walletAddress) { + walletAddress = await loadAddress(); + } + if (!walletAddress) { + walletAddress = await createWallet(); + } return walletAddress; }; @@ -38,16 +44,14 @@ export const loadWallet = async () => { return null; }; -export const createTransaction = async (to, data, value, gasLimit, gasPrice, nonce = null) => { - return { - to, - data, - value: ethers.utils.parseEther(value), - gasLimit, - gasPrice, - nonce, - }; -}; +export const createTransaction = async (to, data, value, gasLimit, gasPrice, nonce = null) => ({ + data, + gasLimit, + gasPrice, + nonce, + to, + value: ethers.utils.parseEther(value), +}); export const sendTransaction = async ({ tracking, transaction }) => { try { @@ -104,7 +108,7 @@ const createWallet = async (seedPhrase) => { }; const saveWalletDetails = async (seedPhrase, privateKey, address) => { - const canAuthenticate = await canImplyAuthentication({ authenticationType: AUTHENTICATION_TYPE.DEVICE_PASSCODE_OR_BIOMETRICS}); + const canAuthenticate = await canImplyAuthentication({ authenticationType: AUTHENTICATION_TYPE.DEVICE_PASSCODE_OR_BIOMETRICS }); let accessControlOptions = {}; if (canAuthenticate) { accessControlOptions = { accessControl: ACCESS_CONTROL.USER_PRESENCE, accessible: ACCESSIBLE.WHEN_UNLOCKED }; diff --git a/src/model/walletconnect.js b/src/model/walletconnect.js index 3dca8221e42..4696931b7ea 100644 --- a/src/model/walletconnect.js +++ b/src/model/walletconnect.js @@ -1,6 +1,12 @@ import { commonStorage } from 'balance-common'; import lang from 'i18n-js'; -import { assign, forEach, get, mapValues, values } from 'lodash'; +import { + assign, + forEach, + get, + mapValues, + values, +} from 'lodash'; import { AlertIOS } from 'react-native'; import RNWalletConnect from 'rn-walletconnect-wallet'; diff --git a/src/navigation/index.js b/src/navigation/index.js index 1767eb2f528..bacfb63bc0f 100644 --- a/src/navigation/index.js +++ b/src/navigation/index.js @@ -64,11 +64,12 @@ function getTransitionPosition() { function setTransitionPosition(position) { transitionPosition = position; } + export default { getActiveRouteName, getTransitionPosition, handleAction, pauseNavigationActions, resumeNavigationActions, - setTransitionPosition + setTransitionPosition, }; diff --git a/src/navigation/navigators/createSwipeNavigator.js b/src/navigation/navigators/createSwipeNavigator.js index 1c76aff4dc5..185d153eb7f 100644 --- a/src/navigation/navigators/createSwipeNavigator.js +++ b/src/navigation/navigators/createSwipeNavigator.js @@ -1,4 +1,4 @@ -import { get, map } from 'lodash'; +import { get, isFunction, map } from 'lodash'; import PropTypes from 'prop-types'; import React, { createElement, PureComponent } from 'react'; import { createNavigator, StackRouter } from 'react-navigation'; @@ -79,9 +79,7 @@ export default function createSwipeNavigator(screens, options) { * @param {String} routeName The name of the route to get the index of. * @return {Number} The index of the route which will be zero if the route does not exist. */ - getRouteIndex = (routeName) => { - return (routeOrder || EMPTY_ARRAY).indexOf(routeName); - }; + getRouteIndex = (routeName) => (routeOrder || EMPTY_ARRAY).indexOf(routeName); /** * Get item data based on screen dimensions. @@ -211,8 +209,12 @@ export default function createSwipeNavigator(screens, options) { * @param {Boolean} animated Whether or not to animate to the index. */ scrollToIndex = (index, animated) => { - if (this.flatListRef && typeof this.flatListRef.scrollToIndex === 'function') { - this.flatListRef.scrollToIndex({ animated, index, viewOffset: 0 }); + if (this.flatListRef && isFunction(this.flatListRef.scrollToIndex)) { + this.flatListRef.scrollToIndex({ + animated, + index, + viewOffset: 0, + }); } }; @@ -259,12 +261,14 @@ export default function createSwipeNavigator(screens, options) { ); diff --git a/src/redux/imageDimensionsCache.js b/src/redux/imageDimensionsCache.js index a0aefdead3e..a3d44e3261b 100644 --- a/src/redux/imageDimensionsCache.js +++ b/src/redux/imageDimensionsCache.js @@ -17,9 +17,9 @@ const INITIAL_STATE = {}; export default (state = INITIAL_STATE, action) => produce(state, draft => { switch (action.type) { - case MERGE: - draft[action.id] = action.dimensions; - case PRUNE: - omit(draft, action.idsToPrune); + case MERGE: + draft[action.id] = action.dimensions; + case PRUNE: + omit(draft, action.idsToPrune); } }); diff --git a/src/redux/isWalletEmpty.js b/src/redux/isWalletEmpty.js new file mode 100644 index 00000000000..3ec4e5f8ee0 --- /dev/null +++ b/src/redux/isWalletEmpty.js @@ -0,0 +1,18 @@ +import produce from 'immer'; + +// -- Constants --------------------------------------- // +const SET_IS_WALLET_EMPTY = 'isWalletEmpty/SET_IS_WALLET_EMPTY'; + +export const setIsWalletEmpty = payload => dispatch => dispatch({ + payload, + type: SET_IS_WALLET_EMPTY, +}); + +// -- Reducer ----------------------------------------- // +const INITIAL_STATE = { isWalletEmpty: true }; + +export default (state = INITIAL_STATE, action) => produce(state, draft => { + if (action.type === SET_IS_WALLET_EMPTY) { + draft.isWalletEmpty = action.payload; + } +}); diff --git a/src/redux/nonce.js b/src/redux/nonce.js index 3710ac28af5..c31eb38f120 100644 --- a/src/redux/nonce.js +++ b/src/redux/nonce.js @@ -15,9 +15,9 @@ const INITIAL_STATE = { export default (state = INITIAL_STATE, action) => { switch (action.type) { - case NONCE_UPDATE_TRANSACTION_COUNT_NONCE: - return { ...state, transactionCountNonce: action.payload }; - default: - return state; + case NONCE_UPDATE_TRANSACTION_COUNT_NONCE: + return { ...state, transactionCountNonce: action.payload }; + default: + return state; } }; diff --git a/src/redux/reducers.js b/src/redux/reducers.js index ed731fc807c..a4d73b662af 100644 --- a/src/redux/reducers.js +++ b/src/redux/reducers.js @@ -1,7 +1,14 @@ -import { account, send } from 'balance-common'; +import { + assets, + prices, + send, + settings, + transactions, +} from 'balance-common'; import { combineReducers } from 'redux'; import imageDimensionsCache from './imageDimensionsCache'; +import isWalletEmpty from './isWalletEmpty'; import navigation from './navigation'; import nonce from './nonce'; import tracking from './tracking'; @@ -9,12 +16,16 @@ import transactionsToApprove from './transactionsToApprove'; import walletconnect from './walletconnect'; export default combineReducers({ - account, + assets, imageDimensionsCache, + isWalletEmpty, navigation, nonce, + prices, send, + settings, tracking, + transactions, transactionsToApprove, walletconnect, }); diff --git a/src/redux/tracking.js b/src/redux/tracking.js index 2495a4c2764..54635368c43 100644 --- a/src/redux/tracking.js +++ b/src/redux/tracking.js @@ -22,9 +22,9 @@ const INITIAL_STATE = { export default (state = INITIAL_STATE, action) => { switch (action.type) { - case TRACKING_UPDATE_DATE: - return { ...state, trackingDate: action.payload }; - default: - return state; + case TRACKING_UPDATE_DATE: + return { ...state, trackingDate: action.payload }; + default: + return state; } }; diff --git a/src/redux/transactionsToApprove.js b/src/redux/transactionsToApprove.js index bf40b32ef0d..4f11e74e551 100644 --- a/src/redux/transactionsToApprove.js +++ b/src/redux/transactionsToApprove.js @@ -9,26 +9,26 @@ import { } from 'balance-common'; import { get, mapValues, omit } from 'lodash'; import { - getAccountLocalRequests, + getLocalRequests, removeLocalRequest, - updateLocalRequests, + saveLocalRequests, } from '../model/localstorage'; // -- Constants --------------------------------------- // const WALLETCONNECT_UPDATE_TRANSACTIONS_TO_APPROVE = 'wallet/WALLETCONNECT_UPDATE_TRANSACTIONS_TO_APPROVE'; export const transactionsToApproveInit = () => (dispatch, getState) => { - const { accountAddress, network } = getState().account; - getAccountLocalRequests(accountAddress, network).then((requests) => { + const { accountAddress, network } = getState().settings; + getLocalRequests(accountAddress, network).then((requests) => { const transactionsToApprove = requests || {}; dispatch({ type: WALLETCONNECT_UPDATE_TRANSACTIONS_TO_APPROVE, payload: transactionsToApprove }); - }) + }); }; const getAssetDetails = (contractAddress, assets) => { - for (var item of assets) { + for (var item of assets) { if (item.address === contractAddress) { - return { ...item } + return { ...item }; } } return null; @@ -42,6 +42,7 @@ export const getNativeAmount = (prices, nativeCurrency, assetAmount, symbol) => assetAmount, { symbol }, prices, + nativeCurrency, ); const _nativeAmount = formatInputDecimals(nativeAmount, assetAmount); nativeAmountDisplay = convertAssetAmountToDisplaySpecific(_nativeAmount, nativeCurrency); @@ -58,10 +59,12 @@ const getRequestDisplayDetails = (callData, assets, prices, nativeCurrency) => { if (callData.method === 'eth_sendTransaction') { const transaction = get(callData, 'params[0]', null); return getTransactionDisplayDetails(transaction, assets, prices, nativeCurrency); - } else if (callData.method === 'eth_sign' || callData.method === 'personal_sign') { + } + if (callData.method === 'eth_sign' || callData.method === 'personal_sign') { const message = get(callData, 'params[1]'); return getMessageDisplayDetails(message); - } else if (callData.method === 'eth_signTypedData' || + } + if (callData.method === 'eth_signTypedData' || callData.method === 'eth_signTypedData_v3') { const request = get(callData, 'params[1]', null); const jsonRequest = JSON.stringify(request.message); @@ -114,7 +117,8 @@ const getTransactionDisplayDetails = (transaction, assets, prices, nativeCurrenc timestampInMs, type: 'transaction', }; - } else if (transaction.data.startsWith(tokenTransferHash)) { + } + if (transaction.data.startsWith(tokenTransferHash)) { const contractAddress = transaction.to; const asset = getAssetDetails(contractAddress, assets); const dataPayload = transaction.data.replace(tokenTransferHash, ''); @@ -144,25 +148,35 @@ const getTransactionDisplayDetails = (transaction, assets, prices, nativeCurrenc export const addTransactionToApprove = (sessionId, callId, callData, dappName) => (dispatch, getState) => { const { transactionsToApprove } = getState().transactionsToApprove; - const { accountInfo, accountAddress, network, prices, nativeCurrency } = getState().account; - const transactionDisplayDetails = getRequestDisplayDetails(callData, accountInfo.assets, prices, nativeCurrency); - const transaction = { sessionId, callId, callData, transactionDisplayDetails, dappName }; + const { accountAddress, network, nativeCurrency } = getState().settings; + const { prices } = getState().prices; + const { assets } = getState().assets; + const transactionDisplayDetails = getRequestDisplayDetails(callData, assets, prices, nativeCurrency); + const transaction = { + sessionId, + callId, + callData, + transactionDisplayDetails, + dappName, + }; const updatedTransactions = { ...transactionsToApprove, [callId]: transaction }; dispatch({ type: WALLETCONNECT_UPDATE_TRANSACTIONS_TO_APPROVE, payload: updatedTransactions }); - updateLocalRequests(accountAddress, network, updatedTransactions); + saveLocalRequests(accountAddress, network, updatedTransactions); return transaction; }; export const addTransactionsToApprove = (transactions) => (dispatch, getState) => { const { transactionsToApprove } = getState().transactionsToApprove; - const { accountInfo, accountAddress, network, prices, nativeCurrency } = getState().account; + const { accountAddress, network, nativeCurrency } = getState().settings; + const { prices } = getState().prices; + const { assets } = getState().assets; const transactionsWithDisplayDetails = mapValues(transactions, (transactionDetails) => { - const transactionDisplayDetails = getRequestDisplayDetails(transactionDetails.callData, accountInfo.assets, prices, nativeCurrency); + const transactionDisplayDetails = getRequestDisplayDetails(transactionDetails.callData, assets, prices, nativeCurrency); return { ...transactionDetails, transactionDisplayDetails }; }); const updatedTransactions = { ...transactionsToApprove, ...transactionsWithDisplayDetails }; dispatch({ type: WALLETCONNECT_UPDATE_TRANSACTIONS_TO_APPROVE, payload: updatedTransactions }); - updateLocalRequests(accountAddress, network, updatedTransactions); + saveLocalRequests(accountAddress, network, updatedTransactions); }; export const transactionIfExists = (callId) => (dispatch, getState) => { @@ -171,7 +185,7 @@ export const transactionIfExists = (callId) => (dispatch, getState) => { }; export const removeTransaction = (callId) => (dispatch, getState) => { - const { accountAddress, network } = getState().account; + const { accountAddress, network } = getState().settings; const { transactionsToApprove } = getState().transactionsToApprove; const updatedTransactions = omit(transactionsToApprove, [callId]); removeLocalRequest(accountAddress, network, callId); @@ -186,12 +200,12 @@ const INITIAL_STATE = { export default (state = INITIAL_STATE, action) => { switch (action.type) { - case WALLETCONNECT_UPDATE_TRANSACTIONS_TO_APPROVE: - return { - ...state, - transactionsToApprove: action.payload, - }; - default: - return state; + case WALLETCONNECT_UPDATE_TRANSACTIONS_TO_APPROVE: + return { + ...state, + transactionsToApprove: action.payload, + }; + default: + return state; } }; diff --git a/src/redux/walletconnect.js b/src/redux/walletconnect.js index e0a8c6ad096..23798f24378 100644 --- a/src/redux/walletconnect.js +++ b/src/redux/walletconnect.js @@ -37,9 +37,9 @@ const INITIAL_STATE = { export default (state = INITIAL_STATE, action) => { switch (action.type) { - case WALLETCONNECT_NEW_SESSION: - return { ...state, walletConnectors: action.payload }; - default: - return state; + case WALLETCONNECT_NEW_SESSION: + return { ...state, walletConnectors: action.payload }; + default: + return state; } }; diff --git a/src/screens/ExpandedAssetScreen.js b/src/screens/ExpandedAssetScreen.js index 469049c09be..dbf8df96921 100644 --- a/src/screens/ExpandedAssetScreen.js +++ b/src/screens/ExpandedAssetScreen.js @@ -1,13 +1,18 @@ import { filter } from 'lodash'; import PropTypes from 'prop-types'; +import { withAccountAssets } from 'balance-common'; import React from 'react'; import { StatusBar } from 'react-native'; -import { compose, defaultProps, withHandlers, withProps } from 'recompact'; +import { + compose, + defaultProps, + withHandlers, + withProps, +} from 'recompact'; import styled from 'styled-components/primitives'; import { TokenExpandedState, UniqueTokenExpandedState } from '../components/expanded-state'; import { Centered } from '../components/layout'; import TouchableBackdrop from '../components/TouchableBackdrop'; -import { withAccountAssets } from '../hoc'; import { padding } from '../styles'; import { deviceUtils } from '../utils'; @@ -55,33 +60,32 @@ const ExpandedAssetScreenDefaultProps = { ExpandedAssetScreen.defaultProps = ExpandedAssetScreenDefaultProps; -export default compose( - defaultProps(ExpandedAssetScreenDefaultProps), - withAccountAssets, - withProps(({ - allAssets, - containerPadding, - navigation, - uniqueTokens, - }) => { - const { name, type } = navigation.state.params; +const buildExpandedAsset = ({ + allAssets, + containerPadding, + navigation, + uniqueTokens, +}) => { + const { name, type } = navigation.state.params; - let selectedAsset = {}; + let selectedAsset = {}; - if (type === 'token') { - [selectedAsset] = filter(allAssets, (asset) => asset.symbol === name); - } else if (type === 'unique_token') { - [selectedAsset] = filter(uniqueTokens, (asset) => asset.name === name); - } + if (type === 'token') { + [selectedAsset] = filter(allAssets, (asset) => asset.symbol === name); + } else if (type === 'unique_token') { + [selectedAsset] = filter(uniqueTokens, (asset) => asset.name === name); + } - return { - asset: selectedAsset, - panelWidth: deviceUtils.dimensions.width - (containerPadding * 2), - type, - }; - }), - withHandlers({ - onPressBackground: ({ navigation }) => () => navigation.goBack(), - }), -)(ExpandedAssetScreen); + return { + asset: selectedAsset, + panelWidth: deviceUtils.dimensions.width - (containerPadding * 2), + type, + }; +} +export default compose( + defaultProps(ExpandedAssetScreenDefaultProps), + withAccountAssets, + withProps(buildExpandedAsset), + withHandlers({ onPressBackground: ({ navigation }) => () => navigation.goBack() }), +)(ExpandedAssetScreen); diff --git a/src/screens/ImportSeedPhraseSheet.js b/src/screens/ImportSeedPhraseSheet.js new file mode 100644 index 00000000000..ff8f62f33b2 --- /dev/null +++ b/src/screens/ImportSeedPhraseSheet.js @@ -0,0 +1,149 @@ +import PropTypes from 'prop-types'; +import React from 'react'; +import { KeyboardAvoidingView } from 'react-native'; +import { BorderlessButton } from 'react-native-gesture-handler'; +import { pure, withProps } from 'recompact'; +import styled from 'styled-components/primitives'; +import { Icon } from '../components/icons'; +import { MultiLineInput } from '../components/inputs'; +import { Centered, Column, Row } from '../components/layout'; +import { LoadingOverlay } from '../components/modal'; +import { Text } from '../components/text'; +import { borders, colors, padding } from '../styles'; + +const Container = styled(Column).attrs({ + align: 'center', + flex: 1, +})` + ${borders.buildRadius('top', 12)} + ${padding(16)}; + background: ${colors.white}; + padding-top: 0; +`; + +const Footer = withProps({ + align: 'start', + behavior: 'padding', + component: KeyboardAvoidingView, + justify: 'space-between', + keyboardVerticalOffset: 80, + self: 'stretch', +})(Row); + +const HelpButton = styled(BorderlessButton)` + ${padding(6, 8)} + border: 1px solid #f6f7f7; + border-radius: 15px; +`; + +const HandleIcon = styled(Icon).attrs({ + color: '#C4C6CB', + name: 'handle', +})` + margin-top: 16px; + margin-bottom: 2; +`; + +const ImportButton = styled(Row).attrs({ + align: 'center', + component: BorderlessButton, +})` + ${padding(6, 8)} + background: ${props => (props.disabled ? '#D2D3D7' : colors.appleBlue)}; + border-radius: 15px; + shadow-color: ${colors.dark}; + shadow-offset: 0px 6px; + shadow-opacity: 0.14; + shadow-radius: 10; +`; + +const InputContainer = styled(Centered)` + ${padding(0, 50)} + flex: 1; +`; + +const SeedPhraseInput = styled(MultiLineInput)` + width: 100%; +`; + +const ImportSeedPhraseSheet = ({ + isClipboardContentsValidSeedPhrase, + isImporting, + isSeedPhraseValid, + onImportSeedPhrase, + onInputChange, + onPasteSeedPhrase, + onPressEnterKey, + onPressHelp, + seedPhrase, +}) => ( + + + Import + + + +
+ + + Help + + + + {!!seedPhrase && ( + + )} + + {seedPhrase ? 'Import' : 'Paste'} + + +
+ {isImporting && ( + + )} + +); + +ImportSeedPhraseSheet.propTypes = { + isClipboardContentsValidSeedPhrase: PropTypes.bool, + isImporting: PropTypes.bool, + isSeedPhraseValid: PropTypes.bool, + navigation: PropTypes.object, + onImportSeedPhrase: PropTypes.func, + onInputChange: PropTypes.func, + onPasteSeedPhrase: PropTypes.func, + onPressEnterKey: PropTypes.func, + onPressHelp: PropTypes.func, + screenProps: PropTypes.shape({ handleWalletConfig: PropTypes.func }), + seedPhrase: PropTypes.string, + setSeedPhrase: PropTypes.func, +}; + +export default pure(ImportSeedPhraseSheet); diff --git a/src/screens/ImportSeedPhraseSheetWithData.js b/src/screens/ImportSeedPhraseSheetWithData.js new file mode 100644 index 00000000000..89149d0e836 --- /dev/null +++ b/src/screens/ImportSeedPhraseSheetWithData.js @@ -0,0 +1,115 @@ +import { isValidSeedPhrase as validateSeedPhrase } from 'balance-common'; +import { get } from 'lodash'; +import { Clipboard, InteractionManager, Linking } from 'react-native'; +import { withNavigation } from 'react-navigation'; +import { + compose, + lifecycle, + onlyUpdateForKeys, + withHandlers, + withProps, + withState, +} from 'recompact'; +import { Alert } from '../components/alerts'; +import { withAccountReset } from '../hoc'; +import { deviceUtils } from '../utils'; +import ImportSeedPhraseSheet from './ImportSeedPhraseSheet'; + +const ConfirmImportAlert = onSuccess => ( + Alert({ + buttons: [{ + onPress: onSuccess, + text: 'Import', + }, { + text: 'Cancel', + style: 'cancel', + }], + // eslint-disable-next-line + message: 'Importing this seed phrase will overwrite your existing wallet. Before continuing, please make sure you’ve transferred its contents or backed up its seed phrase.', + title: 'Are you sure you want to import?', + }) +); + +const ImportSeedPhraseSheetWithData = compose( + withAccountReset, + withNavigation, + withState('clipboardContents', 'setClipboardContents', ''), + withState('isImporting', 'setIsImporting', false), + withState('seedPhrase', 'setSeedPhrase', ''), + lifecycle({ + componentDidMount() { + InteractionManager.runAfterInteractions(async () => { + const { setClipboardContents } = this.props; + await Clipboard.getString().then(setClipboardContents); + }); + }, + componentDidUpdate(prevProps) { + const { isImporting, navigation } = this.props; + + if (isImporting !== prevProps.isImporting) { + navigation.setParams({ gesturesEnabled: !isImporting }); + } + }, + }), + withHandlers({ + importSeedPhrase: ({ + accountClearState, + navigation, + screenProps, + seedPhrase, + setIsImporting, + }) => () => { + setIsImporting(true); + accountClearState(); + + return screenProps + .handleWalletConfig(seedPhrase.trim()) + .then((address) => { + if (address) { + navigation.navigate('WalletScreen'); + } + }) + .catch((error) => { + setIsImporting(false); + console.error('error importing seed phrase: ', error); + }); + }, + }), + withHandlers({ + onImportSeedPhrase: ({ importSeedPhrase }) => () => ConfirmImportAlert(importSeedPhrase), + onInputChange: ({ setSeedPhrase }) => ({ nativeEvent }) => setSeedPhrase(nativeEvent.text), + onPasteSeedPhrase: ({ setSeedPhrase }) => () => { + Clipboard.getString() + .then(setSeedPhrase) + .catch(error => console.log(error)); + }, + onPressHelp: () => () => Linking.openURL('https://support.balance.io'), + }), + withHandlers({ + onPressEnterKey: ({ onImportSeedPhrase, seedPhrase }) => ({ nativeEvent: { key } }) => { + if (seedPhrase) { + onImportSeedPhrase(); + } + }, + }), + withProps(({ clipboardContents, seedPhrase }) => ({ + isClipboardContentsValidSeedPhrase: validateSeedPhrase(clipboardContents), + isSeedPhraseValid: validateSeedPhrase(seedPhrase), + })), + onlyUpdateForKeys([ + 'isClipboardContentsValidSeedPhrase', + 'isImporting', + 'isSeedPhraseValid', + 'seedPhrase', + ]), +)(ImportSeedPhraseSheet); + +ImportSeedPhraseSheetWithData.navigationOptions = ({ navigation }) => ({ + effect: 'sheet', + gesturesEnabled: get(navigation, 'state.params.gesturesEnabled', true), + gestureResponseDistance: { + vertical: deviceUtils.dimensions.height / 2, + }, +}); + +export default ImportSeedPhraseSheetWithData; diff --git a/src/screens/IntroScreen.js b/src/screens/IntroScreen.js deleted file mode 100644 index acffcdfa69e..00000000000 --- a/src/screens/IntroScreen.js +++ /dev/null @@ -1,119 +0,0 @@ -import PropTypes from 'prop-types'; -import React from 'react'; -import { StatusBar } from 'react-native'; -import lang from 'i18n-js'; -import { compose, withHandlers } from 'recompact'; -import styled from 'styled-components/primitives'; -import AppVersionStamp from '../components/AppVersionStamp'; -import { ButtonPressAnimation } from '../components/buttons'; -import Icon from '../components/icons/Icon'; -import { Column, Row } from '../components/layout'; -import { Monospace } from '../components/text'; -import { colors, fonts, padding } from '../styles'; -import { withHideSplashScreenOnMount, withSafeAreaViewInsetValues } from '../hoc'; - -const AlphaWarning = styled(Row).attrs({ align: 'center' })` - margin-top: 37; - margin-bottom: 7; -`; - -const AlphaWarningText = styled(Monospace).attrs({ - color: 'orangeLight', - size: 'lmedium', - weight: 'medium', -})` - line-height: ${fonts.lineHeight.looser}; -`; - -const Container = styled(Column).attrs({ align: 'start', justify: 'center' })` - ${padding(0, 30)} - background-color: ${colors.black}; - height: 100%; -`; - -const Content = styled(Column)` - margin-bottom: 10; -`; - -const CreateWalletButton = styled.View` - ${padding(14, 18, 17)} - background-color: ${colors.teal}; - border-radius: 14; - margin-top: 47; -`; - -const CreateWalletButtonText = styled(Monospace).attrs({ - color: 'black', - size: 'h5', - weight: 'semibold', -})` - line-height: 20; -`; - -const InstructionsText = styled(Monospace).attrs({ - color: 'white', - size: 'lmedium', -})` - color: ${colors.alpha(colors.white, 0.46)}; - line-height: ${fonts.lineHeight.looser}; - width: 315; -`; - -const IntroAppVersion = styled(AppVersionStamp)` - bottom: ${({ bottomInset }) => bottomInset}; - left: 0; - position: absolute; - right: 0; -`; - -const WarningIcon = styled(Icon).attrs({ - color: colors.orangeLight, - name: 'warning', -})` - margin-right: ${fonts.size.micro}; -`; - -const IntroScreen = ({ onCreateWallet, safeAreaInset }) => ( - - - - - {lang.t('wallet.intro.welcome')} - - - - {lang.t('wallet.intro.warning')} - - - {lang.t('wallet.intro.instructions')} - - - - - - {lang.t('wallet.intro.create_wallet')} - - - - - - - -); - -IntroScreen.propTypes = { - navigation: PropTypes.object, - onCreateWallet: PropTypes.func, - safeAreaInset: PropTypes.object, -}; - -export default compose( - withHideSplashScreenOnMount, - withSafeAreaViewInsetValues, - withHandlers({ - onCreateWallet: ({ navigation }) => () => navigation.navigate('WalletScreen'), - }), -)(IntroScreen); diff --git a/src/screens/LoadingScreen.js b/src/screens/LoadingScreen.js deleted file mode 100644 index 6f81cdc194e..00000000000 --- a/src/screens/LoadingScreen.js +++ /dev/null @@ -1,79 +0,0 @@ -import { withSafeTimeout } from '@hocs/safe-timers'; -import lang from 'i18n-js'; -import PropTypes from 'prop-types'; -import React, { Component, Fragment } from 'react'; -import { StatusBar } from 'react-native'; -import { compose } from 'recompact'; -import styled from 'styled-components/primitives'; -import Icon from '../components/icons/Icon'; -import { Column } from '../components/layout'; -import { ErrorText, Monospace } from '../components/text'; -import { withAccountAddress, withHideSplashScreenOnMount } from '../hoc'; -import { loadAddress } from '../model/wallet'; -import { colors, fonts, padding, position } from '../styles'; - -const Container = styled(Column).attrs({ justify: 'center' })` - ${padding(0, 0, 60, 0)} - ${position.cover} -`; - -const ErrorContainer = styled(Column)` - ${padding(0, 50, 0, 30)} -`; - -const ErrorMessage = styled(Monospace).attrs({ color: 'red' })` - line-height: ${fonts.lineHeight.looser}; - margin-top: 7; -`; - -const LoadingColor = colors.alpha(colors.grey, 0.5); - -const LoadingText = styled(Monospace)` - line-height: ${fonts.lineHeight.looser}; - margin-top: 10; -`; - -class LoadingScreen extends Component { - static propTypes = { - navigation: PropTypes.object, - setSafeTimeout: PropTypes.func, - } - - state = { isError: false } - - componentDidMount = async () => { - // After 5 seconds, show error message if user has not been redirected - this.props.setSafeTimeout(this.handleError, 5000); - await loadAddress().then(this.handleNavigation); - } - - handleError = () => this.setState({ isError: true }) - - // If this is a brand new instance of the Balance Wallet app show the 'IntroScreen', - // otherwise display the main 'App' route. Afterwards this view will be - // unmounted and thrown away. - handleNavigation = async address => this.props.navigation.navigate(address ? 'App' : 'Intro') - - render = () => ( - - - {this.state.isError ? ( - - - {lang.t('wallet.loading.error')} - - ) : ( - - - {lang.t('wallet.loading.message')} - - )} - - ) -} - -export default compose( - withAccountAddress, - withHideSplashScreenOnMount, - withSafeTimeout, -)(LoadingScreen); diff --git a/src/screens/ProfileScreen.js b/src/screens/ProfileScreen.js index a88af3e8719..fc6c52ab039 100644 --- a/src/screens/ProfileScreen.js +++ b/src/screens/ProfileScreen.js @@ -1,17 +1,19 @@ import PropTypes from 'prop-types'; import React from 'react'; +import { ActivityList } from '../components/activity-list'; +import AddFundsInterstitial from '../components/AddFundsInterstitial'; +import BlurOverlay from '../components/BlurOverlay'; import { BackButton, Header, HeaderButton } from '../components/header'; import { FlexItem, Page } from '../components/layout'; -import Icon from '../components/icons/Icon'; +import { Icon } from '../components/icons'; import { ProfileMasthead } from '../components/profile'; import { position } from '../styles'; -import { ActivityList } from '../components/activity-list'; -import BlurOverlay from '../components/BlurOverlay'; const ProfileScreen = ({ accountAddress, blurOpacity, hasPendingTransaction, + isEmpty, nativeCurrency, navigation, onPressBackButton, @@ -45,6 +47,7 @@ const ProfileScreen = ({ )} nativeCurrency={nativeCurrency} @@ -52,6 +55,7 @@ const ProfileScreen = ({ transactions={transactions} transactionsCount={transactionsCount} /> + {isEmpty && } ); @@ -59,6 +63,7 @@ ProfileScreen.propTypes = { accountAddress: PropTypes.string, blurOpacity: PropTypes.object, hasPendingTransaction: PropTypes.bool, + isEmpty: PropTypes.bool, nativeCurrency: PropTypes.string, navigation: PropTypes.object, onPressBackButton: PropTypes.func, diff --git a/src/screens/ProfileScreenWithData.js b/src/screens/ProfileScreenWithData.js index e50f373aeea..9621faa1fff 100644 --- a/src/screens/ProfileScreenWithData.js +++ b/src/screens/ProfileScreenWithData.js @@ -1,10 +1,17 @@ -import { compose, shouldUpdate, withHandlers } from 'recompact'; +import { + compose, + shouldUpdate, + withHandlers, + withProps +} from 'recompact'; import { setDisplayName } from 'recompose'; import { withAccountAddress, withAccountTransactions, withBlurTransitionProps, + withIsWalletEmpty, withRequests, + withAccountSettings, withTrackingScreen, } from '../hoc'; import ProfileScreen from './ProfileScreen'; @@ -12,22 +19,27 @@ import ProfileScreen from './ProfileScreen'; export default compose( setDisplayName('ProfileScreen'), withAccountAddress, + withAccountSettings, withAccountTransactions, withBlurTransitionProps, + withIsWalletEmpty, withRequests, withHandlers({ onPressBackButton: ({ navigation }) => () => navigation.navigate('WalletScreen'), onPressSettings: ({ navigation }) => () => navigation.navigate('SettingsModal'), }), withTrackingScreen, - /* - shouldUpdate((props, { isScreenActive, ...nextProps }) => { - if (!isScreenActive) return false; - - const finishedLoading = props.fetchingTransactions && !nextProps.fetchingTransactions; - const newTxCount = props.transactionsCount !== nextProps.transactionsCount; - const newNativeCurrency = props.nativeCurrency !== nextProps.nativeCurrency; - return finishedLoading || newTxCount || newNativeCurrency; - }), - */ + withProps(({ isWalletEmpty, transactionsCount }) => ({ + isEmpty: isWalletEmpty && !transactionsCount, + })), )(ProfileScreen); + +/* +shouldUpdate((props, { isScreenActive, ...nextProps }) => { + if (!isScreenActive) return false; + + const newTxCount = props.transactionsCount !== nextProps.transactionsCount; + const newNativeCurrency = props.nativeCurrency !== nextProps.nativeCurrency; + return finishedLoading || newTxCount || newNativeCurrency; +}), +*/ diff --git a/src/screens/QRScannerScreen.js b/src/screens/QRScannerScreen.js index 50bdf4ee32e..b471165a1bd 100644 --- a/src/screens/QRScannerScreen.js +++ b/src/screens/QRScannerScreen.js @@ -1,7 +1,12 @@ import { get } from 'lodash'; import PropTypes from 'prop-types'; import React from 'react'; -import { compose, onlyUpdateForKeys, withHandlers, withState } from 'recompact'; +import { + compose, + onlyUpdateForKeys, + withHandlers, + withState, +} from 'recompact'; import styled from 'styled-components/primitives'; import { BackButton, Header } from '../components/header'; import { Centered } from '../components/layout'; diff --git a/src/screens/QRScannerScreenWithData.js b/src/screens/QRScannerScreenWithData.js index 4b1ccfadb1a..ed4417f77ca 100644 --- a/src/screens/QRScannerScreenWithData.js +++ b/src/screens/QRScannerScreenWithData.js @@ -16,6 +16,7 @@ class QRScannerScreenWithData extends PureComponent { static propTypes = { accountAddress: PropTypes.string, addWalletConnector: PropTypes.func, + isScreenActive: PropTypes.bool, navigation: PropTypes.object, setSafeTimeout: PropTypes.func, } @@ -42,9 +43,7 @@ class QRScannerScreenWithData extends PureComponent { // TODO: try catch around Alert? Alert({ buttons: [{ - onPress: async () => firebase - .messaging() - .requestPermission(), + onPress: async () => firebase.messaging().requestPermission(), text: 'Okay', }, { style: 'cancel', @@ -69,28 +68,28 @@ class QRScannerScreenWithData extends PureComponent { Vibration.vibrate(); const address = getEthereumAddressFromQRCodeData(data); + if (address) { Piwik.trackEvent('QRScanner', 'address', 'QRScannedAddress'); navigation.navigate('WalletScreen'); - navigation.navigate('SendScreen', { address }); - setSafeTimeout(this.handleReenableScanning, 1000); - } else if (data.startsWith('ethereum:wc')) { + navigation.navigate('SendSheet', { address }); + return setSafeTimeout(this.handleReenableScanning, 1000); + } + + if (data.startsWith('ethereum:wc')) { Piwik.trackEvent('QRScanner', 'walletconnect', 'QRScannedWC'); - const walletConnector = await walletConnectInit( - accountAddress, - data - ); + const walletConnector = await walletConnectInit(accountAddress, data); await this.checkPushNotificationPermissions(); addWalletConnector(walletConnector); - setSafeTimeout(this.handleReenableScanning, 1000); - } else { - Piwik.trackEvent('QRScanner', 'unknown', 'QRScannedUnknown'); - Alert({ - message: lang.t('wallet.unrecognized_qrcode'), - title: lang.t('wallet.unrecognized_qrcode_title'), - callback: this.handleReenableScanning, - }); + return setSafeTimeout(this.handleReenableScanning, 1000); } + + Piwik.trackEvent('QRScanner', 'unknown', 'QRScannedUnknown'); + return Alert({ + message: lang.t('wallet.unrecognized_qrcode'), + title: lang.t('wallet.unrecognized_qrcode_title'), + callback: this.handleReenableScanning, + }); } render = () => ( diff --git a/src/screens/ReceiveModal.js b/src/screens/ReceiveModal.js index 150a69591f4..f6fb47d9f95 100644 --- a/src/screens/ReceiveModal.js +++ b/src/screens/ReceiveModal.js @@ -5,9 +5,18 @@ import { compose, onlyUpdateForKeys, withHandlers } from 'recompact'; import styled from 'styled-components/primitives'; import Divider from '../components/Divider'; import { Column } from '../components/layout'; -import { Modal, ModalFooterButton, ModalFooterButtonsRow, ModalHeader } from '../components/modal'; +import { + Modal, + ModalFooterButton, + ModalFooterButtonsRow, + ModalHeader, +} from '../components/modal'; import QRCodeDisplay from '../components/QRCodeDisplay'; -import { Br, Monospace, Text } from '../components/text'; +import { + Br, + Monospace, + Text, +} from '../components/text'; import { withAccountAddress } from '../hoc'; import { colors, padding } from '../styles'; diff --git a/src/screens/Routes.js b/src/screens/Routes.js index 563999d0ffa..50ad181fd60 100644 --- a/src/screens/Routes.js +++ b/src/screens/Routes.js @@ -1,14 +1,13 @@ -import { createSwitchNavigator, createStackNavigator } from 'react-navigation'; +import { createStackNavigator } from 'react-navigation'; import createSwipeNavigator from '../navigation/navigators/createSwipeNavigator'; import { buildTransitions, expanded, sheet } from '../navigation/transitions'; import ExpandedAssetScreen from './ExpandedAssetScreen'; -import IntroScreen from './IntroScreen'; -import LoadingScreen from './LoadingScreen'; +import ImportSeedPhraseSheetWithData from './ImportSeedPhraseSheetWithData'; import ProfileScreenWithData from './ProfileScreenWithData'; import QRScannerScreenWithData from './QRScannerScreenWithData'; import ReceiveModal from './ReceiveModal'; import SendQRScannerScreenWithData from './SendQRScannerScreenWithData'; -import SendScreenWithData from './SendScreenWithData'; +import SendSheetWithData from './SendSheetWithData'; import SettingsModal from './SettingsModal'; import TransactionConfirmationScreenWithData from './TransactionConfirmationScreenWithData'; import WalletScreen from './WalletScreen'; @@ -39,13 +38,15 @@ const SwipeStack = createSwipeNavigator({ }, }, { headerMode: 'none', + mode: 'modal', initialRouteName: 'WalletScreen', onSwipeEnd: onSwipeEndSwipeStack, onSwipeStart: onSwipeStartSwipeStack, }); -const AppStack = createStackNavigator({ +export default createStackNavigator({ ConfirmRequest: TransactionConfirmationScreenWithData, + ImportSeedPhraseSheet: ImportSeedPhraseSheetWithData, ExpandedAssetScreen: { navigationOptions: { effect: 'expanded', @@ -64,7 +65,7 @@ const AppStack = createStackNavigator({ }, screen: ReceiveModal, }, - SendScreen: SendScreenWithData, + SendSheet: SendSheetWithData, SendQRScannerScreen: SendQRScannerScreenWithData, SwipeLayout: SwipeStack, SettingsModal: { @@ -89,24 +90,3 @@ const AppStack = createStackNavigator({ store.dispatch(updateTransitionProps({ isTransitioning: false })); }, }); - -const IntroStack = createStackNavigator({ - IntroScreen, -}, { - headerMode: 'none', - mode: 'card', // Horizontal gestures -}); - -export default createSwitchNavigator( - { - App: AppStack, - Intro: IntroStack, - Loading: LoadingScreen, - }, - { - headerMode: 'none', - initialRouteName: 'Loading', - mode: 'modal', - }, -); - diff --git a/src/screens/SendScreen.js b/src/screens/SendSheet.js similarity index 92% rename from src/screens/SendScreen.js rename to src/screens/SendSheet.js index 8313ba43b98..d6136af4a11 100644 --- a/src/screens/SendScreen.js +++ b/src/screens/SendSheet.js @@ -1,5 +1,4 @@ -import { convertAssetAmountToDisplay } from 'balance-common'; -import { withSafeTimeout } from '@hocs/safe-timers'; +import { convertAssetAmountToDisplay, withAccountAssets } from 'balance-common'; import { get, isEmpty, map } from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; @@ -17,22 +16,31 @@ import { isIphoneX } from 'react-native-iphone-x-helper'; import TouchID from 'react-native-touch-id'; import { compose, withHandlers } from 'recompact'; import styled from 'styled-components/primitives'; -import { AssetList, UniqueTokenRow } from '../components/asset-list'; +import { AssetList } from '../components/asset-list'; +import { UniqueTokenRow } from '../components/unique-token'; import { Button, BlockButton, LongPressButton } from '../components/buttons'; import { SendCoinRow } from '../components/coin-row'; import { AddressField, UnderlineField } from '../components/fields'; import { Icon } from '../components/icons'; import { PillLabel } from '../components/labels'; -import { Column, Flex, FlyInView, Row } from '../components/layout'; +import { + Column, + Flex, + FlyInView, + Row, +} from '../components/layout'; import { ShadowStack } from '../components/shadow-stack'; import { Monospace } from '../components/text'; import { - withAccountAddress, - withAccountAssets, + withAccountRefresh, withAccountSettings, - withRequestsInit } from '../hoc'; -import { colors, fonts, padding, shadow } from '../styles'; +import { + colors, + fonts, + padding, + shadow, +} from '../styles'; import { deviceUtils } from '../utils'; import { showActionSheetWithOptions } from '../utils/actionsheet'; import { removeLeadingZeros, uppercase } from '../utils/formatters'; @@ -145,7 +153,7 @@ const TransactionContainer = styled(View)` background-color: ${colors.lightGrey}; `; -class SendScreen extends Component { +class SendSheet extends Component { static propTypes = { allAssets: PropTypes.array, fetchData: PropTypes.func, @@ -220,8 +228,8 @@ class SendScreen extends Component { Keyboard.dismiss(); } - if (prevProps.isValidAddress !== isValidAddress || - prevProps.selected !== selected) { + if (prevProps.isValidAddress !== isValidAddress + || prevProps.selected !== selected) { let verticalGestureResponseDistance = 0; if (isValidAddress) { @@ -235,9 +243,8 @@ class SendScreen extends Component { } componentWillUnmount() { - const { sendClearFields } = this.props; - - sendClearFields(); + this.props.sendClearFields(); + this.state.sendLongPressProgress.stopAnimation(); } getTransactionSpeedOptions = () => { @@ -492,12 +499,14 @@ class SendScreen extends Component { renderTransaction() { const { + allAssets, assetAmount, nativeAmount, nativeCurrency, selected, sendMaxBalance, } = this.props; + const selectedAsset = allAssets.find(asset => asset.symbol === selected.symbol); return ( @@ -511,7 +520,7 @@ class SendScreen extends Component { shouldRasterizeIOS={true} width={deviceUtils.dimensions.width} > - + @@ -580,23 +589,12 @@ class SendScreen extends Component { } export default compose( - withAccountAddress, withAccountAssets, withAccountSettings, - withRequestsInit, - withSafeTimeout, + withAccountRefresh, withHandlers({ - fetchData: ({ - accountAddress, - accountUpdateAccountAddress, - setSafeTimeout, - transactionsToApproveInit, - }) => () => { - accountUpdateAccountAddress(accountAddress, 'BALANCEWALLET'); - transactionsToApproveInit(); - // hack: use timeout so that it looks like loading is happening - // accountUpdateAccountAddress does not return a promise - return new Promise(resolve => setSafeTimeout(resolve, 2000)); + fetchData: ({ refreshAccount }) => async () => { + await refreshAccount(); }, }), -)(SendScreen); +)(SendSheet); diff --git a/src/screens/SendScreenWithData.js b/src/screens/SendSheetWithData.js similarity index 64% rename from src/screens/SendScreenWithData.js rename to src/screens/SendSheetWithData.js index a022bf1e9d2..5ca310fe9f8 100644 --- a/src/screens/SendScreenWithData.js +++ b/src/screens/SendSheetWithData.js @@ -1,13 +1,13 @@ import { withSendComponentWithData } from 'balance-common'; -import SendScreen from './SendScreen'; +import SendSheet from './SendSheet'; import { sendTransaction } from '../model/wallet'; -const SendScreenWithData = withSendComponentWithData(SendScreen, { +const SendSheetWithData = withSendComponentWithData(SendSheet, { gasFormat: 'short', sendTransactionCallback: sendTransaction, }); -SendScreenWithData.navigationOptions = ({ navigation }) => { +SendSheetWithData.navigationOptions = ({ navigation }) => { const { params } = navigation.state; return { @@ -18,4 +18,4 @@ SendScreenWithData.navigationOptions = ({ navigation }) => { }; }; -export default SendScreenWithData; +export default SendSheetWithData; diff --git a/src/screens/SettingsModal.js b/src/screens/SettingsModal.js index 09815f18bb5..aa80e4b4c38 100644 --- a/src/screens/SettingsModal.js +++ b/src/screens/SettingsModal.js @@ -1,7 +1,13 @@ import { get } from 'lodash'; import PropTypes from 'prop-types'; import React, { createElement } from 'react'; -import { compose, onlyUpdateForKeys, withHandlers, withProps } from 'recompact'; +import { InteractionManager } from 'react-native'; +import { + compose, + onlyUpdateForKeys, + withHandlers, + withProps, +} from 'recompact'; import { Column } from '../components/layout'; import { Modal, ModalHeader } from '../components/modal'; import { AnimatedPager } from '../components/pager'; @@ -36,6 +42,7 @@ const SettingsModal = ({ navigation, onCloseModal, onPressBack, + onPressImportSeedPhrase, onPressSection, }) => { const { component, title } = currentSettingsPage; @@ -57,6 +64,7 @@ const SettingsModal = ({ {component && createElement(component, { navigation })} @@ -71,6 +79,7 @@ SettingsModal.propTypes = { navigation: PropTypes.object, onCloseModal: PropTypes.func, onPressBack: PropTypes.func, + onPressImportSeedPhrase: PropTypes.func, onPressSection: PropTypes.func, }; @@ -81,6 +90,12 @@ export default compose( withHandlers({ onCloseModal: ({ navigation }) => () => navigation.goBack(), onPressBack: ({ navigation }) => () => navigation.setParams({ section: SettingsPages.default }), + onPressImportSeedPhrase: ({ navigation, setSafeTimeout }) => () => { + navigation.goBack(); + InteractionManager.runAfterInteractions(() => { + navigation.navigate('ImportSeedPhraseSheet'); + }); + }, onPressSection: ({ navigation }) => (section) => () => navigation.setParams({ section }), }), onlyUpdateForKeys(['currentSettingsPage']), diff --git a/src/screens/TransactionConfirmationScreen.js b/src/screens/TransactionConfirmationScreen.js index 69f56fe24a2..dd1728e5342 100644 --- a/src/screens/TransactionConfirmationScreen.js +++ b/src/screens/TransactionConfirmationScreen.js @@ -11,7 +11,11 @@ import { Centered, Column } from '../components/layout'; import TransactionConfirmationSection from '../components/TransactionConfirmationSection'; import MessageSigningSection from '../components/MessageSigningSection'; import { Text } from '../components/text'; -import { borders, colors, fonts, padding, position } from '../styles'; +import { + colors, + padding, + position, +} from '../styles'; const SendButton = styled(BlockButton).attrs({ component: LongPressButton })` ${padding(0, 0)} @@ -67,14 +71,10 @@ class TransactionConfirmationScreen extends Component { onConfirm: PropTypes.func, }; - constructor(props) { - super(props); - - this.state = { - biometryType: null, - sendLongPressProgress: new Animated.Value(0), - }; - }; + state = { + biometryType: null, + sendLongPressProgress: new Animated.Value(0), + } componentDidMount() { TouchID.isSupported() @@ -86,6 +86,10 @@ class TransactionConfirmationScreen extends Component { }); } + componentWillUnmount() { + this.state.sendLongPressProgress.stopAnimation(); + } + onPressSend = () => { const { sendLongPressProgress } = this.state; @@ -171,19 +175,19 @@ class TransactionConfirmationScreen extends Component { message={request} sendButton={this.renderSendButton()} />) : - ()} + ()} - ) + ); } -}; +} export default TransactionConfirmationScreen; diff --git a/src/screens/TransactionConfirmationScreenWithData.js b/src/screens/TransactionConfirmationScreenWithData.js index bd802c85886..c74bbff4317 100644 --- a/src/screens/TransactionConfirmationScreenWithData.js +++ b/src/screens/TransactionConfirmationScreenWithData.js @@ -12,11 +12,11 @@ import TransactionConfirmationScreen from './TransactionConfirmationScreen'; class TransactionConfirmationScreenWithData extends Component { static propTypes = { - accountUpdateHasPendingTransaction: PropTypes.func, - accountUpdateTransactions: PropTypes.func, + isScreenActive: PropTypes.bool.isRequired, navigation: PropTypes.any, removeTransaction: PropTypes.func, transactionCountNonce: PropTypes.number, + transactionsAddNewTransaction: PropTypes.func, updateTransactionCountNonce: PropTypes.func, walletConnectors: PropTypes.object, } @@ -58,7 +58,7 @@ class TransactionConfirmationScreenWithData extends Component { amount: get(transactionDetails, 'transactionDisplayDetails.payload.nativeAmount'), name: trackingName, }, - transaction: txPayloadLatestNonce + transaction: txPayloadLatestNonce, }); if (transactionHash) { @@ -73,8 +73,7 @@ class TransactionConfirmationScreenWithData extends Component { to: get(transactionDetails, 'transactionDisplayDetails.payload.to'), value: get(transactionDetails, 'transactionDisplayDetails.payload.value'), }; - this.props.accountUpdateHasPendingTransaction(); - this.props.accountUpdateTransactions(txDetails); + this.props.transactionsAddNewTransaction(txDetails); this.props.removeTransaction(transactionDetails.callId); const walletConnector = this.props.walletConnectors[transactionDetails.sessionId]; await walletConnectSendStatus(walletConnector, transactionDetails.callId, transactionHash); @@ -90,7 +89,6 @@ class TransactionConfirmationScreenWithData extends Component { const flatFormatSignature = await signMessage(message); if (flatFormatSignature) { - const txDetails = { message }; this.props.removeTransaction(transactionDetails.callId); const walletConnector = this.props.walletConnectors[transactionDetails.sessionId]; await walletConnectSendStatus(walletConnector, transactionDetails.callId, flatFormatSignature); @@ -135,8 +133,8 @@ class TransactionConfirmationScreenWithData extends Component { transactionDisplayDetails: { type, payload, - } - } + }, + }, } = this.props.navigation.state.params; return ( diff --git a/src/screens/WalletScreen.js b/src/screens/WalletScreen.js index 8ba4f3dbae7..7650b95dbe8 100644 --- a/src/screens/WalletScreen.js +++ b/src/screens/WalletScreen.js @@ -1,8 +1,8 @@ -import { withSafeTimeout } from '@hocs/safe-timers'; +import { withAccountAssets } from 'balance-common'; import { isSameDay } from 'date-fns'; import { get, join, map } from 'lodash'; import PropTypes from 'prop-types'; -import React, { Component } from 'react'; +import React, { PureComponent } from 'react'; import Piwik from 'react-native-matomo'; import { compose, @@ -11,44 +11,52 @@ import { withProps, withState, } from 'recompact'; -import styled from 'styled-components/primitives'; -import BlurOverlay from '../components/BlurOverlay'; import { AssetList } from '../components/asset-list'; +import BlurOverlay from '../components/BlurOverlay'; import { FabWrapper } from '../components/fab'; import { CameraHeaderButton, Header, ProfileHeaderButton } from '../components/header'; import { Page } from '../components/layout'; -import buildWalletSections from '../helpers/buildWalletSections'; +import buildWalletSectionsSelector from '../helpers/buildWalletSections'; import { getShowShitcoinsSetting, updateShowShitcoinsSetting } from '../model/localstorage'; import { - withAccountAddress, - withAccountAssets, + withAccountRefresh, + withAccountSettings, withBlurTransitionProps, + withFetchingPrices, withHideSplashScreen, - withRequestsInit, + withIsWalletEmpty, withTrackingDate, } from '../hoc'; import { position } from '../styles'; +import { isNewValueForPath } from '../utils'; -const WalletPage = styled(Page)` - ${position.size('100%')}; - flex: 1; -`; - -class WalletScreen extends Component { +class WalletScreen extends PureComponent { static propTypes = { + allAssetsCount: PropTypes.number, + assets: PropTypes.array, + assetsTotal: PropTypes.object, blurOpacity: PropTypes.object, isEmpty: PropTypes.bool.isRequired, isLoading: PropTypes.bool.isRequired, + isScreenActive: PropTypes.bool, navigation: PropTypes.object, onHideSplashScreen: PropTypes.func, onRefreshList: PropTypes.func.isRequired, sections: PropTypes.array, showBlur: PropTypes.bool, + toggleShowShitcoins: PropTypes.func, + trackingDate: PropTypes.object, transitionProps: PropTypes.object, + uniqueTokens: PropTypes.array, + updateTrackingDate: PropTypes.func, } componentDidMount = async () => { - this.props.trackingDateInit(); + // Initialize wallet + const { handleWalletConfig } = this.props.navigation.getScreenProps(); + await handleWalletConfig(); + this.props.onHideSplashScreen(); + const showShitcoins = await getShowShitcoinsSetting(); if (showShitcoins !== null) { this.props.toggleShowShitcoins(showShitcoins); @@ -59,26 +67,24 @@ class WalletScreen extends Component { const { allAssetsCount, assets, - assetsTotalUSD, - isLoading, - onHideSplashScreen, + assetsTotal, + isScreenActive, trackingDate, uniqueTokens, + updateTrackingDate, } = this.props; - if (!isLoading && prevProps.isLoading) { - onHideSplashScreen(); - } - if (this.props.isScreenActive && !prevProps.isScreenActive) { + if (isScreenActive && !prevProps.isScreenActive) { Piwik.trackScreen('WalletScreen', 'WalletScreen'); - const totalTrackingAmount = get(assetsTotalUSD, 'totalTrackingAmount', null); - const assetSymbols = join(map(assets, (asset) => asset.symbol)); - if (totalTrackingAmount && (!this.props.trackingDate || !isSameDay(this.props.trackingDate, Date.now()))) { + const totalTrackingAmount = get(assetsTotal, 'totalTrackingAmount', null); + const assetSymbols = join(map(assets || {}, (asset) => asset.symbol)); + if (totalTrackingAmount && (!trackingDate || !isSameDay(trackingDate, Date.now()))) { Piwik.trackEvent('Balance', 'AssetsCount', 'TotalAssetsCount', allAssetsCount); Piwik.trackEvent('Balance', 'AssetSymbols', 'AssetSymbols', assetSymbols); Piwik.trackEvent('Balance', 'NFTCount', 'TotalNFTCount', uniqueTokens.length); Piwik.trackEvent('Balance', 'Total', 'TotalUSDBalance', totalTrackingAmount); - this.props.updateTrackingDate(); + + updateTrackingDate(); } } } @@ -93,49 +99,38 @@ class WalletScreen extends Component { sections, showBlur, } = this.props; - return ( - + {showBlur && }
- + - + ); } } export default compose( - withAccountAddress, withAccountAssets, - withHideSplashScreen, - withRequestsInit, - withSafeTimeout, + withAccountRefresh, + withAccountSettings, + withFetchingPrices, withTrackingDate, + withHideSplashScreen, withBlurTransitionProps, + withIsWalletEmpty, withState('showShitcoins', 'toggleShowShitcoins', true), withHandlers({ - onRefreshList: ({ - accountAddress, - accountUpdateAccountAddress, - setSafeTimeout, - transactionsToApproveInit, - }) => () => { - accountUpdateAccountAddress(accountAddress, 'BALANCEWALLET'); - transactionsToApproveInit(); - // hack: use timeout so that it looks like loading is happening - // accountUpdateAccountAddress does not return a promise - return new Promise(resolve => setSafeTimeout(resolve, 2000)); - }, + onRefreshList: ({ refreshAccount }) => () => refreshAccount(), onToggleShowShitcoins: ({ showShitcoins, toggleShowShitcoins }) => (index) => { if (index === 0) { const updatedShowShitcoinsSetting = !showShitcoins; @@ -144,14 +139,5 @@ export default compose( } }, }), - withProps(buildWalletSections), - shouldUpdate((props, { isScreenActive, ...nextProps }) => { - if (!isScreenActive) return false; - - const finishedPopulating = props.isEmpty && !nextProps.isEmpty; - const finishedLoading = props.isLoading && !nextProps.isLoading; - const newSections = props.sections !== nextProps.sections; - - return finishedPopulating || finishedLoading || newSections; - }), + withProps(buildWalletSectionsSelector), )(WalletScreen); diff --git a/src/styles/animations.js b/src/styles/animations.js index 05b39abbd64..52df64c3d26 100644 --- a/src/styles/animations.js +++ b/src/styles/animations.js @@ -29,13 +29,14 @@ const buildSpring = ({ to, useNativeDriver = true, value, -}) => +}) => ( Animated.spring(value, { ...spring.default, toValue: isActive ? to : from, useNativeDriver, ...config, - }); + }) +); export default { buildSpring, diff --git a/src/styles/borders.js b/src/styles/borders.js index 21cb95c817b..f615555ed46 100644 --- a/src/styles/borders.js +++ b/src/styles/borders.js @@ -30,7 +30,8 @@ border.buildRadius = (direction, value = border.radius) => { border-${upperFirst(direction)}-left-radius: ${value}; border-${upperFirst(direction)}-right-radius: ${value}; `; - } else if (direction === 'left' || direction === 'right') { + } + if (direction === 'left' || direction === 'right') { return css` border-bottom-${upperFirst(direction)}-radius: ${value}; border-top-${upperFirst(direction)}-radius: ${value}; diff --git a/src/styles/buildTextStyles.js b/src/styles/buildTextStyles.js new file mode 100644 index 00000000000..3bea7320d8e --- /dev/null +++ b/src/styles/buildTextStyles.js @@ -0,0 +1,20 @@ +import { css } from 'styled-components'; +import colors from './colors'; +import fonts from './fonts'; + +export default css` + ${({ align }) => ( + align + ? `text-align: ${align};` + : '' + )} + ${({ lineHeight }) => ( + lineHeight + ? `line-height: ${fonts.lineHeight[lineHeight]};` + : '' + )} + color: ${({ color }) => (colors.get(color) || colors.dark)} + font-family: ${({ family }) => fonts.family[family || 'SFProText']}; + font-size: ${({ size }) => fonts.size[size || 'medium']}; + font-weight: ${({ weight }) => fonts.weight[weight || 'regular']}; +`; diff --git a/src/styles/calcDirectionToDegrees.js b/src/styles/calcDirectionToDegrees.js index 9bfc0442596..395d0f7bd84 100644 --- a/src/styles/calcDirectionToDegrees.js +++ b/src/styles/calcDirectionToDegrees.js @@ -6,7 +6,7 @@ export default (directionValue = 'right') => { : directionValue.direction; if (direction === 'down') return '90'; - else if (direction === 'left') return '180'; - else if (direction === 'up') return '270'; + if (direction === 'left') return '180'; + if (direction === 'up') return '270'; return '0'; }; diff --git a/src/styles/colors.js b/src/styles/colors.js index 3bb0c4eaf9d..7f4088f2450 100644 --- a/src/styles/colors.js +++ b/src/styles/colors.js @@ -6,8 +6,8 @@ const base = { black: '#000000', // '0, 0, 0' blue: '#657fe6', // '101, 127, 230' blueActive: '#5a71cc', // '90, 113, 204' - blueGreyDark: '#3c4252', // '60, 66, 82' - blueGreyLight: '#666A73', // '102, 106, 115' // TODO XXX SHOULD THIS BE: '#A1A5AC'? + blueGreyDark: '#3C4252', // '60, 66, 82' + blueGreyLight: '#A1A5AC', // '102, 106, 115' blueGreyLighter: '#888D96', // '136, 141, 150' blueGreyMedium: '#636875', // '99, 104, 117' blueGreyMediumLight: '#7b7f8a', // '123, 127, 138' @@ -31,8 +31,9 @@ const base = { mediumGrey: '#a1a5b3', // '161, 165, 179' orange: '#f6851b', // '246, 133, 27' orangeLight: '#FFAF24', // '255, 175, 36' - paleBlue: '#5D9DF6', orangeMedium: '#FCA247', // '252, 162, 71' + paleBlue: '#5D9DF6', + placeholder: '#C4C6CB', // 196, 198, 203 primaryBlue: '#5d9df6', // '93, 157, 246' primaryGreen: '#00a352', // '0, 163, 82' purple: '#32325d', // '50, 50, 93' @@ -53,7 +54,7 @@ const assetIcon = { }; const sendScreen = { - brightBlue: base.appleBlue, // 14, 118, 253 + brightBlue: base.appleBlue, // 14, 118, 253 lightGrey: '#fafafa', // '250, 250, 250' grey: '#d8d8d8', // '216, 216, 216' }; diff --git a/src/styles/fonts.js b/src/styles/fonts.js index 25e98e28f5e..7b264602789 100644 --- a/src/styles/fonts.js +++ b/src/styles/fonts.js @@ -11,6 +11,7 @@ font.lineHeight = { loose: 21, looser: 25, loosest: 28, + none: 0, }; font.size = { diff --git a/src/styles/index.js b/src/styles/index.js index 27dc1a0d7c6..db20f77acf6 100644 --- a/src/styles/index.js +++ b/src/styles/index.js @@ -1,5 +1,6 @@ export { default as animations } from './animations'; export { default as borders } from './borders'; +export { default as buildTextStyles } from './buildTextStyles'; export { default as calcDirectionToDegrees } from './calcDirectionToDegrees'; export { default as colors } from './colors'; export { default as fonts } from './fonts'; diff --git a/src/utils/address.js b/src/utils/address.js index efa4a7c8821..0ab46fc5716 100644 --- a/src/utils/address.js +++ b/src/utils/address.js @@ -12,7 +12,8 @@ export const getEthereumAddressFromQRCodeData = (data) => { if (parts[0] === 'ethereum' && isValidAddress(parts[1])) { return parts[1]; - } else if (isValidAddress(parts[0])) { + } + if (isValidAddress(parts[0])) { return parts[0]; } diff --git a/src/utils/formatters.js b/src/utils/formatters.js index 29e983bbe31..d109e04285e 100644 --- a/src/utils/formatters.js +++ b/src/utils/formatters.js @@ -22,4 +22,3 @@ export default { removeLeadingZeros, uppercase, }; - diff --git a/src/utils/index.js b/src/utils/index.js index 93d8c76c832..8e61a612a14 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,10 +1,9 @@ export { getEthereumAddressFromQRCodeData } from './address'; export { default as abbreviations } from './abbreviations'; -export { default as constants } from './constants'; export { default as deviceUtils } from './deviceUtils'; export { default as dimensionsPropType } from './dimensionsPropType'; export { default as directionPropType } from './directionPropType'; +export { default as isNewValueForPath } from './isNewValueForPath'; export { default as reduceStylesArrayToObject } from './reduceStylesArrayToObject'; export { default as safeAreaInsetValues } from './safeAreaInsetValues'; -export { default as sortList } from './sortList'; export { default as statusBar } from './statusBar'; diff --git a/src/utils/isNewValueForPath.js b/src/utils/isNewValueForPath.js new file mode 100644 index 00000000000..6f2226660ca --- /dev/null +++ b/src/utils/isNewValueForPath.js @@ -0,0 +1,5 @@ +import { get } from 'lodash'; + +export default function isNewValueForPath(a, b, path) { + return get(a, path) !== get(b, path); +} diff --git a/src/utils/sortList.js b/src/utils/sortList.js deleted file mode 100644 index 81af4dfe15b..00000000000 --- a/src/utils/sortList.js +++ /dev/null @@ -1,30 +0,0 @@ -import { get, isFunction, isString } from 'lodash'; - -export default (array = [], sortByKey, direction, defaultValue, formatter) => - array.slice(0).sort((a, b) => { - const isAscending = direction === 'asc'; - - let itemA = a; - let itemB = b; - - if (sortByKey) { - itemA = get(a, sortByKey, defaultValue); - itemB = get(b, sortByKey, defaultValue); - } - - if (isFunction(formatter)) { - itemA = formatter(itemA); - itemB = formatter(itemB); - } - - if (isString(itemA) && isString(itemB)) { - itemA = itemA.toLowerCase(); - itemB = itemB.toLowerCase(); - } - - if (itemA < itemB) return isAscending ? -1 : 1; - if (itemA > itemB) return isAscending ? 1 : -1; - - return 0; - }); - diff --git a/yarn.lock b/yarn.lock index 7033539540c..89367fd1da1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,7 +14,7 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.0.0", "@babel/core@^7.1.2": +"@babel/core@>=7.1.0", "@babel/core@^7.0.0", "@babel/core@^7.2.2": version "7.2.2" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687" dependencies: @@ -635,6 +635,57 @@ version "0.7.3" resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.3.tgz#6310a047f12d21a1036fb031317219892440416f" +"@gerhobbelt/ast-types@0.10.1-15": + version "0.10.1-15" + resolved "https://registry.yarnpkg.com/@gerhobbelt/ast-types/-/ast-types-0.10.1-15.tgz#d190cb08d145905cc46a8daae463d15682cebda4" + +"@gerhobbelt/ast-types@0.9.13-4": + version "0.9.13-4" + resolved "https://registry.yarnpkg.com/@gerhobbelt/ast-types/-/ast-types-0.9.13-4.tgz#dbabe35a96bbf172a7d3b4dc9f3bad15394867a0" + +"@gerhobbelt/ast-util@0.6.1-4": + version "0.6.1-4" + resolved "https://registry.yarnpkg.com/@gerhobbelt/ast-util/-/ast-util-0.6.1-4.tgz#a746b4dbea5c4a45ad17abca96b0af0f7937bb8a" + dependencies: + "@gerhobbelt/ast-types" "0.9.13-4" + private "0.1.7" + +"@gerhobbelt/esprima@4.0.1-15": + version "4.0.1-15" + resolved "https://registry.yarnpkg.com/@gerhobbelt/esprima/-/esprima-4.0.1-15.tgz#2d6f0d3d9ad7bf0d5d514eda849528ad790d6769" + +"@gerhobbelt/json5@0.5.1-21": + version "0.5.1-21" + resolved "https://registry.yarnpkg.com/@gerhobbelt/json5/-/json5-0.5.1-21.tgz#be4cca3a8612f207c85a9bd3d834fb330dd58345" + dependencies: + yargs "10.0.3" + +"@gerhobbelt/linewrap@0.2.2-3": + version "0.2.2-3" + resolved "https://registry.yarnpkg.com/@gerhobbelt/linewrap/-/linewrap-0.2.2-3.tgz#49d5667922ad02bd0a37084fb8f31309a382f829" + +"@gerhobbelt/nomnom@1.8.4-24": + version "1.8.4-24" + resolved "https://registry.yarnpkg.com/@gerhobbelt/nomnom/-/nomnom-1.8.4-24.tgz#d03a5e3093f5f68fb5217b1d1e4d7d67d017bf22" + dependencies: + "@gerhobbelt/linewrap" "0.2.2-3" + chalk "2.1.0" + exit "0.1.2" + +"@gerhobbelt/recast@0.13.0-24": + version "0.13.0-24" + resolved "https://registry.yarnpkg.com/@gerhobbelt/recast/-/recast-0.13.0-24.tgz#6ab25ed671710b3ca6224571c2d6d1cfcbaae64e" + dependencies: + "@gerhobbelt/ast-types" "0.10.1-15" + "@gerhobbelt/esprima" "4.0.1-15" + core-js "2.5.3" + private "0.1.8" + source-map "0.6.1" + +"@gerhobbelt/xregexp@3.2.0-22": + version "3.2.0-22" + resolved "https://registry.yarnpkg.com/@gerhobbelt/xregexp/-/xregexp-3.2.0-22.tgz#66e6640eb6a5bba78ad9ea8187f6910b53b6c0ea" + "@hocs/omit-props@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@hocs/omit-props/-/omit-props-0.4.0.tgz#6fb182a8c793e018b3706bb11ba24dd1664d99eb" @@ -654,6 +705,17 @@ dependencies: react-display-name "^0.2.4" +"@mrmlnc/readdir-enhanced@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" + dependencies: + call-me-maybe "^1.0.1" + glob-to-regexp "^0.3.0" + +"@nodelib/fs.stat@^1.1.2": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" + "@svgr/cli@^2.0.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@svgr/cli/-/cli-2.4.1.tgz#2017b9b76b55dec31a02bc15395689789abf2504" @@ -686,10 +748,37 @@ Base64 "~0.2.0" inherits "~2.0.1" +"@types/node@*": + version "10.12.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67" + +"@types/node@^8.0.7": + version "8.10.39" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.39.tgz#e7e87ad00364dd7bc485c940926345b8ec1a26ca" + "@types/q@^1.5.1": version "1.5.1" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18" +"@types/unist@*", "@types/unist@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.2.tgz#5dc0a7f76809b7518c0df58689cd16a19bd751c6" + +"@types/vfile-message@*": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-1.0.1.tgz#e1e9895cc6b36c462d4244e64e6d0b6eaf65355a" + dependencies: + "@types/node" "*" + "@types/unist" "*" + +"@types/vfile@^3.0.0": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/vfile/-/vfile-3.0.2.tgz#19c18cd232df11ce6fa6ad80259bc86c366b09b9" + dependencies: + "@types/node" "*" + "@types/unist" "*" + "@types/vfile-message" "*" + "@yarnpkg/lockfile@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" @@ -712,7 +801,7 @@ absolute-path@^0.0.0: abstract-leveldown@~0.12.1: version "0.12.4" - resolved "http://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz#29e18e632e60e4e221d5810247852a63d7b2e410" + resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz#29e18e632e60e4e221d5810247852a63d7b2e410" dependencies: xtend "~3.0.0" @@ -730,27 +819,21 @@ acorn-globals@^4.1.0, acorn-globals@^4.3.0: acorn "^6.0.1" acorn-walk "^6.0.1" -acorn-jsx@^3.0.0: - version "3.0.1" - resolved "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" - dependencies: - acorn "^3.0.4" +acorn-jsx@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e" acorn-walk@^6.0.1: version "6.1.1" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913" -acorn@^3.0.4: - version "3.3.0" - resolved "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" - -acorn@^5.5.0, acorn@^5.5.3: +acorn@^5.5.3: version "5.7.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" -acorn@^6.0.1, acorn@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754" +acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.4: + version "6.0.5" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a" aes-js@3.0.0: version "3.0.0" @@ -762,22 +845,9 @@ agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0: dependencies: es6-promisify "^5.0.0" -ajv-keywords@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" - -ajv@^5.2.3, ajv@^5.3.0: - version "5.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - -ajv@^6.5.5: - version "6.6.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" +ajv@^6.5.3, ajv@^6.5.5, ajv@^6.6.1: + version "6.7.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96" dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -793,7 +863,7 @@ animated@^0.2.2: ansi-colors@^1.0.1: version "1.1.0" - resolved "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9" dependencies: ansi-wrap "^0.1.0" @@ -805,11 +875,11 @@ ansi-cyan@^0.1.1: ansi-escapes@^1.1.0: version "1.4.0" - resolved "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" ansi-escapes@^3.0.0: version "3.1.0" - resolved "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" ansi-gray@^0.1.1: version "0.1.1" @@ -831,11 +901,15 @@ ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" +ansi-regex@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9" + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: @@ -914,15 +988,19 @@ arr-union@^3.1.0: array-equal@^1.0.0: version "1.0.0" - resolved "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" + resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" array-filter@~0.0.0: version "0.0.1" resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" +array-find-index@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + array-flatten@1.1.1: version "1.1.1" - resolved "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" array-includes@^3.0.3: version "3.0.3" @@ -943,6 +1021,16 @@ array-slice@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" +array-union@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" + dependencies: + array-uniq "^1.0.1" + +array-uniq@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" + array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" @@ -1017,6 +1105,17 @@ atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" +autoprefixer@^9.0.0: + version "9.4.5" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.5.tgz#a13ccb001e4bc8837f71c3354005b42f02cc03d7" + dependencies: + browserslist "^4.4.0" + caniuse-lite "^1.0.30000928" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^7.0.11" + postcss-value-parser "^3.3.1" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -1027,12 +1126,12 @@ aws4@^1.8.0: axios@^0.18.0: version "0.18.0" - resolved "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102" dependencies: follow-redirects "^1.3.0" is-buffer "^1.1.5" -babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: +babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" dependencies: @@ -1228,7 +1327,7 @@ babel-plugin-date-fns@^0.2.1: babel-plugin-istanbul@^4.1.5: version "4.1.6" - resolved "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" dependencies: babel-plugin-syntax-object-rest-spread "^6.13.0" find-up "^2.1.0" @@ -1260,27 +1359,27 @@ babel-plugin-lodash@^3.3.4: babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" - resolved "http://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" babel-plugin-syntax-class-properties@^6.8.0: version "6.13.0" - resolved "http://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de" babel-plugin-syntax-exponentiation-operator@^6.8.0: version "6.13.0" - resolved "http://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" babel-plugin-syntax-flow@^6.18.0, babel-plugin-syntax-flow@^6.8.0: version "6.18.0" - resolved "http://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" babel-plugin-syntax-jsx@^6.18.0, babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: version "6.18.0" - resolved "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0: version "6.13.0" - resolved "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" babel-plugin-syntax-trailing-function-commas@^6.22.0, babel-plugin-syntax-trailing-function-commas@^6.8.0: version "6.22.0" @@ -1534,8 +1633,8 @@ babel-plugin-transform-react-jsx@^6.24.1, babel-plugin-transform-react-jsx@^6.8. babel-runtime "^6.22.0" babel-plugin-transform-react-remove-prop-types@^0.4.21: - version "0.4.21" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.21.tgz#0087938f4348cb751b3e5055a6b38f3c61b5231b" + version "0.4.23" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.23.tgz#f8677da27c9b0eb463aed1f8fd551df783ef142f" babel-plugin-transform-regenerator@^6.22.0: version "6.26.0" @@ -1543,6 +1642,10 @@ babel-plugin-transform-regenerator@^6.22.0: dependencies: regenerator-transform "^0.10.0" +babel-plugin-transform-remove-console@^6.9.4: + version "6.9.4" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780" + babel-plugin-transform-strict-mode@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" @@ -1704,15 +1807,19 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26 babylon@7.0.0-beta.44: version "7.0.0-beta.44" - resolved "http://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d" babylon@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" -balance-common@^0.6.9: - version "0.6.9" - resolved "https://registry.yarnpkg.com/balance-common/-/balance-common-0.6.9.tgz#7c02efbb6b2d9b9c3eeb982223c591deea996884" +bail@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.3.tgz#63cfb9ddbac829b02a3128cd53224be78e6c21a3" + +balance-common@^0.6.15: + version "0.6.15" + resolved "https://registry.yarnpkg.com/balance-common/-/balance-common-0.6.15.tgz#dea19ee1df28e3ed636aba5ce885c1ef13486788" dependencies: axios "^0.18.0" bignumber.js "^7.0.1" @@ -1722,7 +1829,9 @@ balance-common@^0.6.9: lodash "^4.17.10" react "^16.2.0" react-redux "^5.0.7" + recompact "^3.4.0" redux "^4.0.0" + reselect "^4.0.0" underscore "^1.9.1" web3 "1.0.0-beta.34" @@ -1776,14 +1885,14 @@ bignumber.js@^7.0.1: bl@^1.0.0: version "1.2.2" - resolved "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c" + resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c" dependencies: readable-stream "^2.3.5" safe-buffer "^5.1.1" bl@~0.8.1: version "0.8.2" - resolved "http://registry.npmjs.org/bl/-/bl-0.8.2.tgz#c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e" + resolved "https://registry.yarnpkg.com/bl/-/bl-0.8.2.tgz#c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e" dependencies: readable-stream "~1.0.26" @@ -1795,7 +1904,7 @@ block-stream@*: bluebird@^2.9.34: version "2.11.0" - resolved "http://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" bluebird@^3.5.0: version "3.5.3" @@ -1890,7 +1999,7 @@ browser-resolve@^1.11.2: browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" - resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" dependencies: buffer-xor "^1.0.3" cipher-base "^1.0.0" @@ -1918,7 +2027,7 @@ browserify-des@^1.0.0: browserify-rsa@^4.0.0: version "4.0.1" - resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" dependencies: bn.js "^4.1.0" randombytes "^2.0.1" @@ -1955,6 +2064,14 @@ browserslist@^3.2.6: caniuse-lite "^1.0.30000844" electron-to-chromium "^1.3.47" +browserslist@^4.4.0: + version "4.4.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062" + dependencies: + caniuse-lite "^1.0.30000929" + electron-to-chromium "^1.3.103" + node-releases "^1.1.3" + bser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" @@ -1994,7 +2111,7 @@ buffer-xor@^1.0.3: buffer@^3.0.1: version "3.6.0" - resolved "http://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz#a72c936f77b96bf52f5f7e7b467180628551defb" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-3.6.0.tgz#a72c936f77b96bf52f5f7e7b467180628551defb" dependencies: base64-js "0.0.8" ieee754 "^1.1.4" @@ -2002,7 +2119,7 @@ buffer@^3.0.1: buffer@^4.9.1: version "4.9.1" - resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" dependencies: base64-js "^1.0.2" ieee754 "^1.1.4" @@ -2037,31 +2154,37 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" +call-me-maybe@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" + caller-callsite@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" dependencies: callsites "^2.0.0" -caller-path@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" - dependencies: - callsites "^0.2.0" - caller-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" dependencies: caller-callsite "^2.0.0" -callsites@^0.2.0: - version "0.2.0" - resolved "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" - callsites@^2.0.0: version "2.0.0" - resolved "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" + +callsites@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3" + +camelcase-keys@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77" + dependencies: + camelcase "^4.1.0" + map-obj "^2.0.0" + quick-lru "^1.0.0" camelcase@^4.1.0: version "4.1.0" @@ -2077,9 +2200,9 @@ can-promise@0.0.1: dependencies: window-or-global "^1.0.1" -caniuse-lite@^1.0.30000844: - version "1.0.30000925" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000925.tgz#f1a3b9aae2a83071b1eccfa39959d72440409b08" +caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000928, caniuse-lite@^1.0.30000929: + version "1.0.30000929" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000929.tgz#7b391b781a9c3097ecc39ea053301aea8ea16317" capture-exit@^1.2.0: version "1.2.0" @@ -2091,9 +2214,13 @@ caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" +ccount@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff" + chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" - resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: ansi-styles "^2.2.1" escape-string-regexp "^1.0.2" @@ -2101,9 +2228,17 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" +chalk@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" + dependencies: + ansi-styles "^3.1.0" + escape-string-regexp "^1.0.5" + supports-color "^4.0.0" + +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" dependencies: ansi-styles "^3.2.1" escape-string-regexp "^1.0.5" @@ -2113,10 +2248,30 @@ change-emitter@^0.1.2: version "0.1.6" resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515" +character-entities-html4@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.2.tgz#c44fdde3ce66b52e8d321d6c1bf46101f0150610" + +character-entities-legacy@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz#7c6defb81648498222c9855309953d05f4d63a9c" + +character-entities@^1.0.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.2.tgz#58c8f371c0774ef0ba9b2aca5f00d8f100e6e363" + +character-reference-invalid@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz#21e421ad3d84055952dab4a43a04e73cd425d3ed" + chardet@^0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" +chardet@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" + chownr@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" @@ -2187,7 +2342,7 @@ cliui@^4.0.0: clone-deep@^0.2.4: version "0.2.4" - resolved "http://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6" dependencies: for-own "^0.1.3" is-plain-object "^2.0.1" @@ -2195,6 +2350,13 @@ clone-deep@^0.2.4: lazy-cache "^1.0.3" shallow-clone "^0.1.2" +clone-regexp@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.1.tgz#051805cd33173375d82118fc0918606da39fd60f" + dependencies: + is-regexp "^1.0.0" + is-supported-regexp-flag "^1.0.0" + clone@~0.1.9: version "0.1.19" resolved "https://registry.yarnpkg.com/clone/-/clone-0.1.19.tgz#613fb68639b26a494ac53253e15b1a6bd88ada85" @@ -2226,6 +2388,10 @@ code-push@2.0.6, code-push@^2.0.6: superagent-proxy "^1.0.3" yazl "^2.4.1" +collapse-white-space@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.4.tgz#ce05cf49e54c3277ae573036a26851ba430a0091" + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -2274,7 +2440,7 @@ color@^3.0.0: colors@~1.1.2: version "1.1.2" - resolved "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.7" @@ -2296,7 +2462,7 @@ commander@~2.17.1: commander@~2.8.1: version "2.8.1" - resolved "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" dependencies: graceful-readlink ">= 1.0.0" @@ -2332,7 +2498,7 @@ concat-map@0.0.1: concat-stream@^1.4.4, concat-stream@^1.4.7, concat-stream@^1.6.0: version "1.6.2" - resolved "http://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" dependencies: buffer-from "^1.0.0" inherits "^2.0.3" @@ -2368,7 +2534,7 @@ contains-path@^0.1.0: content-disposition@0.5.2: version "0.5.2" - resolved "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" content-type@~1.0.4: version "1.0.4" @@ -2396,13 +2562,17 @@ copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" +core-js@2.5.3: + version "2.5.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" + core-js@^1.0.0: version "1.2.7" - resolved "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.7: - version "2.6.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042" + version "2.6.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.2.tgz#267988d7268323b349e20b4588211655f0e83944" core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -2415,7 +2585,7 @@ cors@^2.8.1: object-assign "^4" vary "^1" -cosmiconfig@^5.0.5, cosmiconfig@^5.0.6: +cosmiconfig@^5.0.0, cosmiconfig@^5.0.5, cosmiconfig@^5.0.6: version "5.0.7" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04" dependencies: @@ -2433,7 +2603,7 @@ create-ecdh@^4.0.0: create-hash@^1.1.0, create-hash@^1.1.2: version "1.2.0" - resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" dependencies: cipher-base "^1.0.1" inherits "^2.0.1" @@ -2443,7 +2613,7 @@ create-hash@^1.1.0, create-hash@^1.1.2: create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: version "1.1.7" - resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" dependencies: cipher-base "^1.0.3" create-hash "^1.1.0" @@ -2475,6 +2645,16 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^6.0.0, cross-spawn@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + crypto-browserify@3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -2497,7 +2677,7 @@ css-color-keywords@^1.0.0: css-in-js-utils@^2.0.0: version "2.0.1" - resolved "http://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz#3b472b398787291b47cfe3e44fecfdd9e914ba99" + resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz#3b472b398787291b47cfe3e44fecfdd9e914ba99" dependencies: hyphenate-style-name "^1.0.2" isobject "^3.0.1" @@ -2561,6 +2741,12 @@ cssstyle@^1.0.0, cssstyle@^1.1.1: dependencies: cssom "0.3.x" +currently-unhandled@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + dependencies: + array-find-index "^1.0.1" + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -2571,9 +2757,11 @@ dashify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/dashify/-/dashify-1.0.0.tgz#faa9365fbe72a688bcb5d6f2b270d370c96d575e" -data-uri-to-buffer@1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835" +data-uri-to-buffer@2: + version "2.0.0" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.0.tgz#0ba23671727349828c32cfafddea411908d13d23" + dependencies: + "@types/node" "^8.0.7" data-urls@^1.0.0, data-urls@^1.1.0: version "1.1.0" @@ -2591,7 +2779,7 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -2603,19 +2791,26 @@ debug@3.1.0, debug@=3.1.0: dependencies: ms "2.0.0" +debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + dependencies: + ms "^2.1.1" + debug@^3.1.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" dependencies: ms "^2.1.1" -debug@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" +decamelize-keys@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" dependencies: - ms "^2.1.1" + decamelize "^1.1.0" + map-obj "^1.0.0" -decamelize@^1.1.1: +decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -2697,11 +2892,11 @@ default-require-extensions@^1.0.0: deferred-leveldown@~0.2.0: version "0.2.0" - resolved "http://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz#2cef1f111e1c57870d8bbb8af2650e587cd2f5b4" + resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz#2cef1f111e1c57870d8bbb8af2650e587cd2f5b4" dependencies: abstract-leveldown "~0.12.1" -define-properties@^1.1.2: +define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" dependencies: @@ -2781,7 +2976,7 @@ diff@^3.2.0: diffie-hellman@^5.0.0: version "5.0.3" - resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" + resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" dependencies: bn.js "^4.1.0" miller-rabin "^4.0.0" @@ -2791,13 +2986,19 @@ dijkstrajs@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b" +dir-glob@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.1.tgz#ce8413234ffe8452b76b7741c32f116cf2a7b1a7" + dependencies: + path-type "^3.0.0" + dns.js@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dns.js/-/dns.js-1.0.1.tgz#bfc0950d79777728c67500b1c418075e653955ee" doctrine@1.5.0: version "1.5.0" - resolved "http://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" dependencies: esutils "^2.0.2" isarray "^1.0.0" @@ -2823,13 +3024,13 @@ domain-browser@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" -domelementtype@1: +domelementtype@1, domelementtype@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" domelementtype@~1.1.1: version "1.1.3" - resolved "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" domexception@^1.0.1: version "1.0.1" @@ -2837,13 +3038,25 @@ domexception@^1.0.1: dependencies: webidl-conversions "^4.0.2" -domutils@^1.7.0: +domhandler@^2.3.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" + dependencies: + domelementtype "1" + +domutils@^1.5.1, domutils@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" dependencies: dom-serializer "0" domelementtype "1" +dot-prop@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" + dependencies: + is-obj "^1.0.0" + duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" @@ -2859,9 +3072,9 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-to-chromium@^1.3.47: - version "1.3.96" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz#25770ec99b8b07706dedf3a5f43fa50cb54c4f9a" +electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.47: + version "1.3.103" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.103.tgz#a695777efdbc419cad6cbb0e58458251302cd52f" elliptic@6.3.3: version "6.3.3" @@ -2884,6 +3097,10 @@ elliptic@^6.0.0, elliptic@^6.4.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + encodeurl@~1.0.1, encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -2894,13 +3111,13 @@ encoding@^0.1.11: dependencies: iconv-lite "~0.4.13" -end-of-stream@^1.0.0: +end-of-stream@^1.0.0, end-of-stream@^1.1.0: version "1.4.1" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" dependencies: once "^1.4.0" -entities@~1.1.1: +entities@^1.1.1, entities@~1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" @@ -2927,17 +3144,18 @@ errorhandler@^1.5.0: accepts "~1.3.3" escape-html "~1.0.3" -es-abstract@^1.11.0, es-abstract@^1.5.1, es-abstract@^1.6.1, es-abstract@^1.7.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165" +es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" dependencies: - es-to-primitive "^1.1.1" + es-to-primitive "^1.2.0" function-bind "^1.1.1" - has "^1.0.1" - is-callable "^1.1.3" + has "^1.0.3" + is-callable "^1.1.4" is-regex "^1.0.4" + object-keys "^1.0.12" -es-to-primitive@^1.1.1: +es-to-primitive@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" dependencies: @@ -2951,7 +3169,7 @@ es6-promise@^4.0.3: es6-promisify@^5.0.0: version "5.0.0" - resolved "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" + resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" dependencies: es6-promise "^4.0.3" @@ -2974,11 +3192,13 @@ escodegen@1.x.x, escodegen@^1.11.0, escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-config-airbnb-base@^12.1.0: - version "12.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-12.1.0.tgz#386441e54a12ccd957b0a92564a4bafebd747944" +eslint-config-airbnb-base@^13.1.0: + version "13.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz#b5a1b480b80dfad16433d6c4ad84e6605052c05c" dependencies: eslint-restricted-globals "^0.1.1" + object.assign "^4.1.0" + object.entries "^1.0.4" eslint-import-resolver-node@^0.3.1: version "0.3.2" @@ -2994,7 +3214,7 @@ eslint-module-utils@^2.2.0: debug "^2.6.8" pkg-dir "^1.0.0" -eslint-plugin-import@^2.9.0: +eslint-plugin-import@2.14.0, eslint-plugin-import@^2.14.0: version "2.14.0" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8" dependencies: @@ -3009,19 +3229,23 @@ eslint-plugin-import@^2.9.0: read-pkg-up "^2.0.0" resolve "^1.6.0" +eslint-plugin-react-native-animation-linter@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-native-animation-linter/-/eslint-plugin-react-native-animation-linter-0.1.2.tgz#07edd97544f5db7e04c640480d3683e99d264ff1" + eslint-plugin-react-native-globals@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz#ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2" -eslint-plugin-react-native@^3.2.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.5.0.tgz#78a5d6aadb11f85d1b114488d1fddfa2bf4fc1fb" +eslint-plugin-react-native@^3.5.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.6.0.tgz#7cad3b7c6159df6d26fe3252c6c5417a17f27b4b" dependencies: eslint-plugin-react-native-globals "^0.1.1" -eslint-plugin-react@^7.7.0: - version "7.12.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.12.0.tgz#fa6701063f2172c3e1db3a22d3db6d8bdc0179af" +eslint-plugin-react@^7.12.1: + version "7.12.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.12.4.tgz#b1ecf26479d61aee650da612e425c53a99f48c8c" dependencies: array-includes "^3.0.3" doctrine "^2.1.0" @@ -3042,66 +3266,70 @@ eslint-scope@3.7.1: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^3.7.1: - version "3.7.3" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535" +eslint-scope@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172" dependencies: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-utils@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" + eslint-visitor-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" -eslint@^4.19.1: - version "4.19.1" - resolved "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300" +eslint@^5.11.1: + version "5.12.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.12.1.tgz#5ca9931fb9029d04e7be92b03ce3b58edfac7e3b" dependencies: - ajv "^5.3.0" - babel-code-frame "^6.22.0" + "@babel/code-frame" "^7.0.0" + ajv "^6.5.3" chalk "^2.1.0" - concat-stream "^1.6.0" - cross-spawn "^5.1.0" - debug "^3.1.0" + cross-spawn "^6.0.5" + debug "^4.0.1" doctrine "^2.1.0" - eslint-scope "^3.7.1" + eslint-scope "^4.0.0" + eslint-utils "^1.3.1" eslint-visitor-keys "^1.0.0" - espree "^3.5.4" - esquery "^1.0.0" + espree "^5.0.0" + esquery "^1.0.1" esutils "^2.0.2" file-entry-cache "^2.0.0" functional-red-black-tree "^1.0.1" glob "^7.1.2" - globals "^11.0.1" - ignore "^3.3.3" + globals "^11.7.0" + ignore "^4.0.6" + import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^3.0.6" - is-resolvable "^1.0.0" - js-yaml "^3.9.1" + inquirer "^6.1.0" + js-yaml "^3.12.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.3.0" - lodash "^4.17.4" - minimatch "^3.0.2" + lodash "^4.17.5" + minimatch "^3.0.4" mkdirp "^0.5.1" natural-compare "^1.4.0" optionator "^0.8.2" path-is-inside "^1.0.2" pluralize "^7.0.0" progress "^2.0.0" - regexpp "^1.0.1" - require-uncached "^1.0.3" - semver "^5.3.0" + regexpp "^2.0.1" + semver "^5.5.1" strip-ansi "^4.0.0" - strip-json-comments "~2.0.1" - table "4.0.2" - text-table "~0.2.0" + strip-json-comments "^2.0.1" + table "^5.0.2" + text-table "^0.2.0" -espree@^3.5.4: - version "3.5.4" - resolved "http://registry.npmjs.org/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7" +espree@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.0.tgz#fc7f984b62b36a0f543b13fb9cd7b9f4a7f5b65c" dependencies: - acorn "^5.5.0" - acorn-jsx "^3.0.0" + acorn "^6.0.2" + acorn-jsx "^5.0.0" + eslint-visitor-keys "^1.0.0" esprima@3.x.x, esprima@^3.1.3: version "3.1.3" @@ -3111,7 +3339,7 @@ esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" -esquery@^1.0.0: +esquery@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" dependencies: @@ -3183,7 +3411,7 @@ ethjs-unit@0.1.6: event-target-shim@^1.0.5: version "1.1.1" - resolved "http://registry.npmjs.org/event-target-shim/-/event-target-shim-1.1.1.tgz#a86e5ee6bdaa16054475da797ccddf0c55698491" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-1.1.1.tgz#a86e5ee6bdaa16054475da797ccddf0c55698491" eventemitter3@1.1.1: version "1.1.1" @@ -3195,7 +3423,7 @@ eventemitter3@^3.0.0: events@^1.0.2, events@^1.1.1: version "1.1.1" - resolved "http://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" + resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" @@ -3222,11 +3450,29 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + dependencies: + cross-spawn "^6.0.0" + get-stream "^4.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +execall@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73" + dependencies: + clone-regexp "^1.0.0" + exit-hook@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" -exit@^0.1.2: +exit@0.1.2, exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -3250,13 +3496,13 @@ expand-brackets@^2.1.4: expand-range@^1.8.1: version "1.8.2" - resolved "http://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" + resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" dependencies: fill-range "^2.1.0" expect@^22.4.0: version "22.4.3" - resolved "http://registry.npmjs.org/expect/-/expect-22.4.3.tgz#d5a29d0a0e1fb2153557caef2674d4547e914674" + resolved "https://registry.yarnpkg.com/expect/-/expect-22.4.3.tgz#d5a29d0a0e1fb2153557caef2674d4547e914674" dependencies: ansi-styles "^3.2.0" jest-diff "^22.4.3" @@ -3319,13 +3565,13 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@3, extend@^3.0.0, extend@~3.0.2: +extend@^3.0.0, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" external-editor@^1.0.1: version "1.1.1" - resolved "http://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b" dependencies: extend "^3.0.0" spawn-sync "^1.0.15" @@ -3333,12 +3579,20 @@ external-editor@^1.0.1: external-editor@^2.0.1, external-editor@^2.0.4: version "2.2.0" - resolved "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" dependencies: chardet "^0.4.0" iconv-lite "^0.4.17" tmp "^0.0.33" +external-editor@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27" + dependencies: + chardet "^0.7.0" + iconv-lite "^0.4.24" + tmp "^0.0.33" + extglob@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" @@ -3375,14 +3629,21 @@ fancy-log@^1.3.2: parse-node-version "^1.0.0" time-stamp "^1.0.0" -fast-deep-equal@^1.0.0: - version "1.1.0" - resolved "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" - fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" +fast-glob@^2.2.6: + version "2.2.6" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295" + dependencies: + "@mrmlnc/readdir-enhanced" "^2.2.1" + "@nodelib/fs.stat" "^1.1.2" + glob-parent "^3.1.0" + is-glob "^4.0.0" + merge2 "^1.2.3" + micromatch "^3.1.10" + fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" @@ -3452,7 +3713,7 @@ file-entry-cache@^2.0.0: file-type@^3.8.0: version "3.9.0" - resolved "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" file-type@^5.2.0: version "5.2.0" @@ -3510,7 +3771,7 @@ finalhandler@1.1.0: finalhandler@1.1.1: version "1.1.1" - resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105" dependencies: debug "2.6.9" encodeurl "~1.0.2" @@ -3541,6 +3802,12 @@ find-up@^2.0.0, find-up@^2.1.0: dependencies: locate-path "^2.0.0" +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + dependencies: + locate-path "^3.0.0" + findit@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/findit/-/findit-2.0.0.tgz#6509f0126af4c178551cfa99394e032e13a4d56e" @@ -3559,8 +3826,8 @@ flexibility@^2.0.1: resolved "https://registry.yarnpkg.com/flexibility/-/flexibility-2.0.1.tgz#ad323aafc40f469ce624286518fc4d7cd72b7c77" follow-redirects@^1.3.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.6.0.tgz#d12452c031e8c67eb6637d861bfc7a8090167933" + version "1.6.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.6.1.tgz#514973c44b5757368bad8bddfe52f81f015c94cb" dependencies: debug "=3.1.0" @@ -3624,7 +3891,7 @@ fs-constants@^1.0.0: fs-extra@^0.22.1: version "0.22.1" - resolved "http://registry.npmjs.org/fs-extra/-/fs-extra-0.22.1.tgz#5fd6f8049dc976ca19eb2355d658173cabcce056" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.22.1.tgz#5fd6f8049dc976ca19eb2355d658173cabcce056" dependencies: graceful-fs "^4.1.2" jsonfile "^2.1.0" @@ -3632,7 +3899,7 @@ fs-extra@^0.22.1: fs-extra@^1.0.0: version "1.0.0" - resolved "http://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" dependencies: graceful-fs "^4.1.2" jsonfile "^2.1.0" @@ -3665,8 +3932,8 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.2.3: - version "1.2.4" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" + version "1.2.7" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4" dependencies: nan "^2.9.2" node-pre-gyp "^0.10.0" @@ -3687,7 +3954,7 @@ ftp@~0.3.10: readable-stream "1.1.x" xregexp "2.0.0" -function-bind@^1.1.0, function-bind@^1.1.1: +function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -3728,27 +3995,37 @@ get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" +get-stdin@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" + get-stream@^2.2.0: version "2.3.1" - resolved "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" dependencies: object-assign "^4.0.1" pinkie-promise "^2.0.0" get-stream@^3.0.0: version "3.0.0" - resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + +get-stream@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + dependencies: + pump "^3.0.0" get-uri@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578" + version "2.0.3" + resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.3.tgz#fa13352269781d75162c6fc813c9e905323fbab5" dependencies: - data-uri-to-buffer "1" - debug "2" - extend "3" + data-uri-to-buffer "2" + debug "4" + extend "~3.0.2" file-uri-to-path "1" ftp "~0.3.10" - readable-stream "2" + readable-stream "3" get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" @@ -3773,6 +4050,17 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" +glob-parent@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + +glob-to-regexp@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" + glob@^5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" @@ -3783,7 +4071,7 @@ glob@^5.0.15: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: +glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" dependencies: @@ -3794,6 +4082,20 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +global-modules@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + dependencies: + global-prefix "^3.0.0" + +global-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + dependencies: + ini "^1.3.5" + kind-of "^6.0.2" + which "^1.3.1" + global@^4.3.0, global@^4.3.2, global@~4.3.0: version "4.3.2" resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" @@ -3801,14 +4103,36 @@ global@^4.3.0, global@^4.3.2, global@~4.3.0: min-document "^2.19.0" process "~0.5.1" -globals@^11.0.1, globals@^11.1.0: - version "11.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249" +globals@^11.1.0, globals@^11.7.0: + version "11.10.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50" globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" +globby@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-9.0.0.tgz#3800df736dc711266df39b4ce33fe0d481f94c23" + dependencies: + array-union "^1.0.2" + dir-glob "^2.2.1" + fast-glob "^2.2.6" + glob "^7.1.3" + ignore "^4.0.3" + pify "^4.0.1" + slash "^2.0.0" + +globjoin@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" + +gonzales-pe@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz#41091703625433285e0aee3aa47829fc1fbeb6f2" + dependencies: + minimist "1.1.x" + got@7.1.0, got@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a" @@ -3912,6 +4236,10 @@ has-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" +has-flag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -4020,9 +4348,24 @@ html-encoding-sniffer@^1.0.2: dependencies: whatwg-encoding "^1.0.1" +html-tags@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b" + +htmlparser2@^3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz#5f5e422dcf6119c0d983ed36260ce9ded0bee464" + dependencies: + domelementtype "^1.3.0" + domhandler "^2.3.0" + domutils "^1.5.1" + entities "^1.1.1" + inherits "^2.0.1" + readable-stream "^3.0.6" + http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: version "1.6.3" - resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" dependencies: depd "~1.1.2" inherits "2.0.3" @@ -4077,7 +4420,7 @@ iconv-lite@0.4.23: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" dependencies: @@ -4099,17 +4442,21 @@ ignore-walk@^3.0.1: dependencies: minimatch "^3.0.4" -ignore@^3.3.3: - version "3.3.10" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" +ignore@^4.0.3, ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + +ignore@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.4.tgz#33168af4a21e99b00c5d41cbadb6a6cb49903a45" image-size@^0.6.0: version "0.6.3" resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2" immer@^1.7.4: - version "1.9.3" - resolved "https://registry.yarnpkg.com/immer/-/immer-1.9.3.tgz#e88f8cbea730d2cde0f5e7e763000a8608bccdae" + version "1.10.5" + resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.5.tgz#a4fd1d12587a166da769763f881c0039fa61c557" import-fresh@^2.0.0: version "2.0.0" @@ -4118,6 +4465,17 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" +import-fresh@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390" + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +import-lazy@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-3.1.0.tgz#891279202c8a2280fdbd6674dbd8da1a1dfc67cc" + import-local@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc" @@ -4129,6 +4487,14 @@ imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" +indent-string@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" + +indexes-of@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" + indexof@0.0.1, indexof@~0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" @@ -4148,7 +4514,7 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" -ini@~1.3.0: +ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -4161,7 +4527,7 @@ inline-style-prefixer@^4.0.2: inquirer@1.1.2: version "1.1.2" - resolved "http://registry.npmjs.org/inquirer/-/inquirer-1.1.2.tgz#ac3ba5f06b8e7291abd9f22912c03f09cfe2dd1f" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.1.2.tgz#ac3ba5f06b8e7291abd9f22912c03f09cfe2dd1f" dependencies: ansi-escapes "^1.1.0" chalk "^1.0.0" @@ -4215,6 +4581,24 @@ inquirer@^3.0.6: strip-ansi "^4.0.0" through "^2.3.6" +inquirer@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52" + dependencies: + ansi-escapes "^3.0.0" + chalk "^2.0.0" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^3.0.0" + figures "^2.0.0" + lodash "^4.17.10" + mute-stream "0.0.7" + run-async "^2.2.0" + rxjs "^6.1.0" + string-width "^2.1.0" + strip-ansi "^5.0.0" + through "^2.3.6" + invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" @@ -4225,10 +4609,18 @@ invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" +invert-kv@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" + ip-regex@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd" +ip-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-3.0.0.tgz#0a934694b4066558c46294244a23cc33116bf732" + ip@^1.1.4, ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" @@ -4239,7 +4631,7 @@ ipaddr.js@1.8.0: is-accessor-descriptor@^0.1.6: version "0.1.6" - resolved "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" dependencies: kind-of "^3.0.2" @@ -4249,6 +4641,21 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-alphabetical@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.2.tgz#1fa6e49213cb7885b75d15862fb3f3d96c884f41" + +is-alphanumeric@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4" + +is-alphanumerical@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz#1138e9ae5040158dc6ff76b820acd6b7a181fd40" + dependencies: + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -4261,9 +4668,13 @@ is-buffer@^1.0.2, is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" +is-buffer@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" + is-builtin-module@^1.0.0: version "1.0.0" - resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" + resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" dependencies: builtin-modules "^1.0.0" @@ -4279,7 +4690,7 @@ is-ci@^1.0.10: is-data-descriptor@^0.1.4: version "0.1.4" - resolved "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" dependencies: kind-of "^3.0.2" @@ -4293,7 +4704,11 @@ is-date-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" -is-descriptor@^0.1.0: +is-decimal@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.2.tgz#894662d6a8709d307f3a276ca4339c8fa5dff0ff" + +is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" dependencies: @@ -4337,6 +4752,10 @@ is-extglob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" +is-extglob@^2.1.0, is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + is-finite@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" @@ -4359,7 +4778,7 @@ is-function@^1.0.1: is-generator-fn@^1.0.0: version "1.0.0" - resolved "http://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a" + resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a" is-glob@^2.0.0, is-glob@^2.0.1: version "2.0.1" @@ -4367,10 +4786,26 @@ is-glob@^2.0.0, is-glob@^2.0.1: dependencies: is-extglob "^1.0.0" +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + dependencies: + is-extglob "^2.1.0" + +is-glob@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" + dependencies: + is-extglob "^2.1.1" + is-hex-prefixed@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" +is-hexadecimal@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz#b6e710d7d07bb66b98cb8cece5c9b4921deeb835" + is-natural-number@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" @@ -4391,6 +4826,10 @@ is-number@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" +is-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + is-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" @@ -4427,9 +4866,9 @@ is-regex@^1.0.4: dependencies: has "^1.0.1" -is-resolvable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" is-retry-allowed@^1.0.0: version "1.1.0" @@ -4439,6 +4878,10 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" +is-supported-regexp-flag@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz#21ee16518d2c1dd3edd3e9a0d57e50207ac364ca" + is-symbol@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" @@ -4453,13 +4896,21 @@ is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" +is-whitespace-character@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz#ede53b4c6f6fb3874533751ec9280d01928d03ed" + is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" +is-word-character@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.2.tgz#46a5dac3f2a1840898b91e576cd40d493f3ae553" + is@~0.2.6: version "0.2.7" - resolved "http://registry.npmjs.org/is/-/is-0.2.7.tgz#3b34a2c48f359972f35042849193ae7264b63562" + resolved "https://registry.yarnpkg.com/is/-/is-0.2.7.tgz#3b34a2c48f359972f35042849193ae7264b63562" isarray@0.0.1: version "0.0.1" @@ -4570,7 +5021,7 @@ isurl@^1.0.0-alpha5: jest-changed-files@^22.2.0: version "22.4.3" - resolved "http://registry.npmjs.org/jest-changed-files/-/jest-changed-files-22.4.3.tgz#8882181e022c38bd46a2e4d18d44d19d90a90fb2" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.4.3.tgz#8882181e022c38bd46a2e4d18d44d19d90a90fb2" dependencies: throat "^4.0.0" @@ -4631,7 +5082,7 @@ jest-config@^22.4.4: jest-diff@^22.4.0, jest-diff@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/jest-diff/-/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030" dependencies: chalk "^2.0.1" diff "^3.2.0" @@ -4646,13 +5097,13 @@ jest-docblock@23.2.0, jest-docblock@^23.2.0: jest-docblock@^22.4.0, jest-docblock@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/jest-docblock/-/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19" dependencies: detect-newline "^2.1.0" jest-environment-jsdom@^22.4.1: version "22.4.3" - resolved "http://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e" dependencies: jest-mock "^22.4.3" jest-util "^22.4.3" @@ -4660,14 +5111,14 @@ jest-environment-jsdom@^22.4.1: jest-environment-node@^22.4.1: version "22.4.3" - resolved "http://registry.npmjs.org/jest-environment-node/-/jest-environment-node-22.4.3.tgz#54c4eaa374c83dd52a9da8759be14ebe1d0b9129" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.3.tgz#54c4eaa374c83dd52a9da8759be14ebe1d0b9129" dependencies: jest-mock "^22.4.3" jest-util "^22.4.3" jest-get-type@^22.1.0, jest-get-type@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4" jest-haste-map@23.5.0: version "23.5.0" @@ -4684,7 +5135,7 @@ jest-haste-map@23.5.0: jest-haste-map@^22.4.2: version "22.4.3" - resolved "http://registry.npmjs.org/jest-haste-map/-/jest-haste-map-22.4.3.tgz#25842fa2ba350200767ac27f658d58b9d5c2e20b" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.4.3.tgz#25842fa2ba350200767ac27f658d58b9d5c2e20b" dependencies: fb-watchman "^2.0.0" graceful-fs "^4.1.11" @@ -4712,13 +5163,13 @@ jest-jasmine2@^22.4.4: jest-leak-detector@^22.4.0: version "22.4.3" - resolved "http://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz#2b7b263103afae8c52b6b91241a2de40117e5b35" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz#2b7b263103afae8c52b6b91241a2de40117e5b35" dependencies: pretty-format "^22.4.3" jest-matcher-utils@^22.4.0, jest-matcher-utils@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff" dependencies: chalk "^2.0.1" jest-get-type "^22.4.3" @@ -4726,7 +5177,7 @@ jest-matcher-utils@^22.4.0, jest-matcher-utils@^22.4.3: jest-message-util@^22.4.0, jest-message-util@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7" dependencies: "@babel/code-frame" "^7.0.0-beta.35" chalk "^2.0.1" @@ -4736,21 +5187,21 @@ jest-message-util@^22.4.0, jest-message-util@^22.4.3: jest-mock@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/jest-mock/-/jest-mock-22.4.3.tgz#f63ba2f07a1511772cdc7979733397df770aabc7" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.4.3.tgz#f63ba2f07a1511772cdc7979733397df770aabc7" jest-regex-util@^22.1.0, jest-regex-util@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/jest-regex-util/-/jest-regex-util-22.4.3.tgz#a826eb191cdf22502198c5401a1fc04de9cef5af" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.4.3.tgz#a826eb191cdf22502198c5401a1fc04de9cef5af" jest-resolve-dependencies@^22.1.0: version "22.4.3" - resolved "http://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz#e2256a5a846732dc3969cb72f3c9ad7725a8195e" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz#e2256a5a846732dc3969cb72f3c9ad7725a8195e" dependencies: jest-regex-util "^22.4.3" jest-resolve@^22.4.2: version "22.4.3" - resolved "http://registry.npmjs.org/jest-resolve/-/jest-resolve-22.4.3.tgz#0ce9d438c8438229aa9b916968ec6b05c1abb4ea" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.3.tgz#0ce9d438c8438229aa9b916968ec6b05c1abb4ea" dependencies: browser-resolve "^1.11.2" chalk "^2.0.1" @@ -4802,11 +5253,11 @@ jest-serializer@23.0.1, jest-serializer@^23.0.1: jest-serializer@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/jest-serializer/-/jest-serializer-22.4.3.tgz#a679b81a7f111e4766235f4f0c46d230ee0f7436" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.3.tgz#a679b81a7f111e4766235f4f0c46d230ee0f7436" jest-snapshot@^22.4.0: version "22.4.3" - resolved "http://registry.npmjs.org/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2" dependencies: chalk "^2.0.1" jest-diff "^22.4.3" @@ -4817,7 +5268,7 @@ jest-snapshot@^22.4.0: jest-util@^22.4.1, jest-util@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/jest-util/-/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac" dependencies: callsites "^2.0.0" chalk "^2.0.1" @@ -4845,7 +5296,7 @@ jest-worker@23.2.0, jest-worker@^23.2.0: jest-worker@^22.2.2, jest-worker@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/jest-worker/-/jest-worker-22.4.3.tgz#5c421417cba1c0abf64bf56bd5fb7968d79dd40b" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.4.3.tgz#5c421417cba1c0abf64bf56bd5fb7968d79dd40b" dependencies: merge-stream "^1.0.1" @@ -4856,6 +5307,16 @@ jest@^22.4.3: import-local "^1.0.0" jest-cli "^22.4.4" +jison-gho@^0.6.1-215: + version "0.6.1-215" + resolved "https://registry.yarnpkg.com/jison-gho/-/jison-gho-0.6.1-215.tgz#932d850b8c7bcb50eb8cb15a2d38cf3757a17b04" + dependencies: + "@gerhobbelt/ast-util" "0.6.1-4" + "@gerhobbelt/json5" "0.5.1-21" + "@gerhobbelt/nomnom" "1.8.4-24" + "@gerhobbelt/recast" "0.13.0-24" + "@gerhobbelt/xregexp" "3.2.0-22" + js-sha3@0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7" @@ -4879,9 +5340,9 @@ js-walletconnect-core@^0.7.28: eth-parse-uri "^0.6.9" idempotent-babel-polyfill "^7.0.0" -js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1: - version "3.12.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" +js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0: + version "3.12.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600" dependencies: argparse "^1.0.7" esprima "^4.0.0" @@ -4954,7 +5415,7 @@ jsdom@^11.5.1: jsesc@^1.3.0: version "1.3.0" - resolved "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" jsesc@^2.5.1: version "2.5.2" @@ -4962,16 +5423,12 @@ jsesc@^2.5.1: jsesc@~0.5.0: version "0.5.0" - resolved "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -4996,7 +5453,7 @@ json-stringify-safe@~5.0.1: json5@^0.5.1: version "0.5.1" - resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" + resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" json5@^2.1.0: version "2.1.0" @@ -5006,7 +5463,7 @@ json5@^2.1.0: jsonfile@^2.1.0: version "2.4.0" - resolved "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" optionalDependencies: graceful-fs "^4.1.6" @@ -5048,11 +5505,11 @@ keccakjs@^0.2.1: kind-of@^1.1.0: version "1.1.0" - resolved "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44" kind-of@^2.0.1: version "2.0.1" - resolved "http://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5" dependencies: is-buffer "^1.0.2" @@ -5082,6 +5539,10 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" +known-css-properties@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.11.0.tgz#0da784f115ea77c76b81536d7052e90ee6c86a8a" + lazy-cache@^0.2.3: version "0.2.7" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" @@ -5096,6 +5557,12 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" +lcid@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" + dependencies: + invert-kv "^2.0.0" + left-pad@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" @@ -5124,29 +5591,29 @@ level-filesystem@^1.0.1: level-fix-range@2.0: version "2.0.0" - resolved "http://registry.npmjs.org/level-fix-range/-/level-fix-range-2.0.0.tgz#c417d62159442151a19d9a2367868f1724c2d548" + resolved "https://registry.yarnpkg.com/level-fix-range/-/level-fix-range-2.0.0.tgz#c417d62159442151a19d9a2367868f1724c2d548" dependencies: clone "~0.1.9" level-fix-range@~1.0.2: version "1.0.2" - resolved "http://registry.npmjs.org/level-fix-range/-/level-fix-range-1.0.2.tgz#bf15b915ae36d8470c821e883ddf79cd16420828" + resolved "https://registry.yarnpkg.com/level-fix-range/-/level-fix-range-1.0.2.tgz#bf15b915ae36d8470c821e883ddf79cd16420828" "level-hooks@>=4.4.0 <5": version "4.5.0" - resolved "http://registry.npmjs.org/level-hooks/-/level-hooks-4.5.0.tgz#1b9ae61922930f3305d1a61fc4d83c8102c0dd93" + resolved "https://registry.yarnpkg.com/level-hooks/-/level-hooks-4.5.0.tgz#1b9ae61922930f3305d1a61fc4d83c8102c0dd93" dependencies: string-range "~1.2" level-peek@1.0.6, level-peek@^1.0.6: version "1.0.6" - resolved "http://registry.npmjs.org/level-peek/-/level-peek-1.0.6.tgz#bec51c72a82ee464d336434c7c876c3fcbcce77f" + resolved "https://registry.yarnpkg.com/level-peek/-/level-peek-1.0.6.tgz#bec51c72a82ee464d336434c7c876c3fcbcce77f" dependencies: level-fix-range "~1.0.2" level-sublevel@^5.2.0: version "5.2.3" - resolved "http://registry.npmjs.org/level-sublevel/-/level-sublevel-5.2.3.tgz#744c12c72d2e72be78dde3b9b5cd84d62191413a" + resolved "https://registry.yarnpkg.com/level-sublevel/-/level-sublevel-5.2.3.tgz#744c12c72d2e72be78dde3b9b5cd84d62191413a" dependencies: level-fix-range "2.0" level-hooks ">=4.4.0 <5" @@ -5155,7 +5622,7 @@ level-sublevel@^5.2.0: levelup@^0.18.2: version "0.18.6" - resolved "http://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz#e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb" + resolved "https://registry.yarnpkg.com/levelup/-/levelup-0.18.6.tgz#e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb" dependencies: bl "~0.8.1" deferred-leveldown "~0.2.0" @@ -5178,7 +5645,7 @@ levn@^0.3.0, levn@~0.3.0: load-json-file@^1.0.0: version "1.1.0" - resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" dependencies: graceful-fs "^4.1.2" parse-json "^2.2.0" @@ -5188,13 +5655,22 @@ load-json-file@^1.0.0: load-json-file@^2.0.0: version "2.0.0" - resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" dependencies: graceful-fs "^4.1.2" parse-json "^2.2.0" pify "^2.0.0" strip-bom "^3.0.0" +load-json-file@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" + dependencies: + graceful-fs "^4.1.2" + parse-json "^4.0.0" + pify "^3.0.0" + strip-bom "^3.0.0" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -5202,6 +5678,13 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + lodash-es@^4.2.1: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0" @@ -5246,12 +5729,29 @@ lodash@^4.13.1, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4 version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" +log-symbols@^2.0.0, log-symbols@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" + dependencies: + chalk "^2.0.1" + +longest-streak@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e" + loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" dependencies: js-tokens "^3.0.0 || ^4.0.0" +loud-rejection@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + dependencies: + currently-unhandled "^0.4.1" + signal-exit "^3.0.0" + lowercase-keys@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" @@ -5275,19 +5775,45 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" +map-age-cleaner@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" + dependencies: + p-defer "^1.0.0" + map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" +map-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + +map-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9" + map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" dependencies: object-visit "^1.0.0" +markdown-escapes@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.2.tgz#e639cbde7b99c841c0bacc8a07982873b46d2122" + +markdown-table@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz#c78db948fa879903a41bce522e3b96f801c63786" + math-random@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" + version "1.0.4" + resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" + +mathml-tag-names@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz#490b70e062ee24636536e3d9481e333733d00f2c" md5.js@^1.3.4: version "1.3.5" @@ -5297,13 +5823,19 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" +mdast-util-compact@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.2.tgz#c12ebe16fffc84573d3e19767726de226e95f649" + dependencies: + unist-util-visit "^1.1.0" + mdn-data@~1.1.0: version "1.1.4" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01" media-typer@0.3.0: version "0.3.0" - resolved "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" mem@^1.1.0: version "1.1.0" @@ -5311,10 +5843,32 @@ mem@^1.1.0: dependencies: mimic-fn "^1.0.0" +mem@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf" + dependencies: + map-age-cleaner "^0.1.1" + mimic-fn "^1.0.0" + p-is-promise "^1.1.0" + memoize-one@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-4.1.0.tgz#a2387c58c03fff27ca390c31b764a79addf3f906" +meow@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4" + dependencies: + camelcase-keys "^4.0.0" + decamelize-keys "^1.0.0" + loud-rejection "^1.0.0" + minimist-options "^3.0.1" + normalize-package-data "^2.3.4" + read-pkg-up "^3.0.0" + redent "^2.0.0" + trim-newlines "^2.0.0" + yargs-parser "^10.0.0" + merge-deep@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2" @@ -5333,6 +5887,10 @@ merge-stream@^1.0.1: dependencies: readable-stream "^2.0.1" +merge2@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5" + merge@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" @@ -5570,7 +6128,7 @@ micromatch@^2.3.11: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.1.4: +micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" dependencies: @@ -5601,11 +6159,11 @@ miller-rabin@^4.0.0: mime-db@~1.23.0: version "1.23.0" - resolved "http://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659" mime-types@2.1.11: version "2.1.11" - resolved "http://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c" dependencies: mime-db "~1.23.0" @@ -5645,23 +6203,34 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: brace-expansion "^1.1.7" +minimist-options@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954" + dependencies: + arrify "^1.0.1" + is-plain-obj "^1.1.0" + minimist@0.0.8: version "0.0.8" - resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@1.1.x: + version "1.1.3" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8" minimist@1.2.0, minimist@^1.1.1, minimist@^1.1.2, minimist@^1.2.0: version "1.2.0" - resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" minimist@~0.0.1: version "0.0.10" - resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" minipass@^2.2.1, minipass@^2.3.4: version "2.3.5" @@ -5698,7 +6267,7 @@ mkdirp-promise@^5.0.1: mkdirp@*, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: version "0.5.1" - resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: minimist "0.0.8" @@ -5730,11 +6299,11 @@ ms@^2.1.1: mute-stream@0.0.6: version "0.0.6" - resolved "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" mute-stream@0.0.7: version "0.0.7" - resolved "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" mz@^2.6.0: version "2.7.0" @@ -5746,7 +6315,7 @@ mz@^2.6.0: nan@2.10.0: version "2.10.0" - resolved "http://registry.npmjs.org/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" nan@^2.0.8, nan@^2.3.3, nan@^2.9.2: version "2.12.1" @@ -5792,6 +6361,10 @@ netmask@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35" +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + node-emoji@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.8.1.tgz#6eec6bfb07421e2148c75c6bba72421f8530a826" @@ -5800,7 +6373,7 @@ node-emoji@1.8.1: node-fetch@1.6.3: version "1.6.3" - resolved "http://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04" dependencies: encoding "^0.1.11" is-stream "^1.0.1" @@ -5848,6 +6421,12 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" +node-releases@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.3.tgz#aad9ce0dcb98129c753f772c0aa01360fb90fbd2" + dependencies: + semver "^5.3.0" + nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -5859,7 +6438,7 @@ normalize-css-color@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/normalize-css-color/-/normalize-css-color-1.0.2.tgz#02991e97cccec6623fe573afbbf0de6a1f3e9f8d" -normalize-package-data@^2.3.2: +normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" dependencies: @@ -5874,13 +6453,21 @@ normalize-path@^2.0.1, normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + +normalize-selector@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03" + npm-bundled@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" npm-packlist@^1.1.6: - version "1.1.12" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a" + version "1.2.0" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.2.0.tgz#55a60e793e272f00862c7089274439a4cc31fc7f" dependencies: ignore-walk "^3.0.1" npm-bundled "^1.0.1" @@ -5893,7 +6480,7 @@ npm-run-path@^2.0.0: npmlog@^2.0.4: version "2.0.4" - resolved "http://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" dependencies: ansi "~0.3.1" are-we-there-yet "~1.1.2" @@ -5918,6 +6505,10 @@ nullthrows@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1" +num2fraction@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" + number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -5949,7 +6540,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.12: +object-keys@^1.0.11, object-keys@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2" @@ -5967,6 +6558,24 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" +object.assign@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" + dependencies: + define-properties "^1.1.2" + function-bind "^1.1.1" + has-symbols "^1.0.0" + object-keys "^1.0.11" + +object.entries@^1.0.4: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519" + dependencies: + define-properties "^1.1.3" + es-abstract "^1.12.0" + function-bind "^1.1.1" + has "^1.0.3" + object.fromentries@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz#49a543d92151f8277b3ac9600f1e930b189d30ab" @@ -6003,13 +6612,13 @@ object.pick@^1.1.1, object.pick@^1.3.0: isobject "^3.0.1" object.values@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a" + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9" dependencies: - define-properties "^1.1.2" - es-abstract "^1.6.1" - function-bind "^1.1.0" - has "^1.0.1" + define-properties "^1.1.3" + es-abstract "^1.12.0" + function-bind "^1.1.1" + has "^1.0.3" oboe@2.1.3: version "2.1.3" @@ -6039,7 +6648,7 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: onetime@^1.0.0: version "1.1.0" - resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" onetime@^2.0.0: version "2.0.1" @@ -6060,14 +6669,14 @@ opencollective@^1.0.3: opn@4.0.2: version "4.0.2" - resolved "http://registry.npmjs.org/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95" + resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95" dependencies: object-assign "^4.0.1" pinkie-promise "^2.0.0" opn@^3.0.2: version "3.0.3" - resolved "http://registry.npmjs.org/opn/-/opn-3.0.3.tgz#b6d99e7399f78d65c3baaffef1fb288e9b85243a" + resolved "https://registry.yarnpkg.com/opn/-/opn-3.0.3.tgz#b6d99e7399f78d65c3baaffef1fb288e9b85243a" dependencies: object-assign "^4.0.1" @@ -6095,7 +6704,7 @@ options@>=0.0.5: os-homedir@^1.0.0: version "1.0.2" - resolved "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" os-locale@^2.0.0: version "2.1.0" @@ -6105,13 +6714,21 @@ os-locale@^2.0.0: lcid "^1.0.0" mem "^1.1.0" +os-locale@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" + dependencies: + execa "^1.0.0" + lcid "^2.0.0" + mem "^4.0.0" + os-shim@^0.1.2: version "0.1.3" resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" - resolved "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" osenv@^0.1.4: version "0.1.5" @@ -6132,22 +6749,42 @@ p-cancelable@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" +p-defer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" + p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" +p-is-promise@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" + p-limit@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" dependencies: p-try "^1.0.0" +p-limit@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68" + dependencies: + p-try "^2.0.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" dependencies: p-limit "^1.1.0" +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + dependencies: + p-limit "^2.0.0" + p-timeout@^1.1.1: version "1.2.1" resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386" @@ -6158,6 +6795,10 @@ p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" +p-try@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" + pac-proxy-agent@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz#90d9f6730ab0f4d2607dcdcd4d3d641aa26c3896" @@ -6183,17 +6824,35 @@ pac-resolver@^3.0.0: pako@~0.2.0: version "0.2.9" - resolved "http://registry.npmjs.org/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" + resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" + +parent-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5" + dependencies: + callsites "^3.0.0" parse-asn1@^5.0.0: - version "5.1.1" - resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8" + version "5.1.3" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.3.tgz#1600c6cc0727365d68b97f3aa78939e735a75204" dependencies: asn1.js "^4.0.0" browserify-aes "^1.0.0" create-hash "^1.1.0" evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" + safe-buffer "^5.1.1" + +parse-entities@^1.0.2, parse-entities@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz#9deac087661b2e36814153cb78d7e54a4c5fd6f4" + dependencies: + character-entities "^1.0.0" + character-entities-legacy "^1.0.0" + character-reference-invalid "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.0" + is-hexadecimal "^1.0.0" parse-glob@^3.0.4: version "3.0.4" @@ -6246,7 +6905,11 @@ pascalcase@^0.1.1: path-browserify@0.0.0: version "0.0.0" - resolved "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" + +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" path-exists@^2.0.0: version "2.1.0" @@ -6260,13 +6923,13 @@ path-exists@^3.0.0: path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" - resolved "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" path-is-inside@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" -path-key@^2.0.0: +path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" @@ -6298,9 +6961,15 @@ path-type@^2.0.0: dependencies: pify "^2.0.0" +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + dependencies: + pify "^3.0.0" + pbkdf2@3.0.8: version "3.0.8" - resolved "http://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.8.tgz#2f8abf16ebecc82277945d748aba1d78761f61e2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.8.tgz#2f8abf16ebecc82277945d748aba1d78761f61e2" dependencies: create-hmac "^1.1.2" @@ -6316,7 +6985,7 @@ pbkdf2@^3.0.3: pegjs@^0.10.0: version "0.10.0" - resolved "http://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz#cf8bafae6eddff4b5a7efb185269eaaf4610ddbd" + resolved "https://registry.yarnpkg.com/pegjs/-/pegjs-0.10.0.tgz#cf8bafae6eddff4b5a7efb185269eaaf4610ddbd" pend@~1.2.0: version "1.2.0" @@ -6328,12 +6997,16 @@ performance-now@^2.1.0: pify@^2.0.0, pify@^2.3.0: version "2.3.0" - resolved "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" pify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" +pify@^4.0.0, pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -6404,10 +7077,91 @@ posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" -postcss-value-parser@^3.3.0: +postcss-html@^0.36.0: + version "0.36.0" + resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz#b40913f94eaacc2453fd30a1327ad6ee1f88b204" + dependencies: + htmlparser2 "^3.10.0" + +postcss-jsx@^0.36.0: + version "0.36.0" + resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.0.tgz#b7685ed3d070a175ef0aa48f83d9015bd772c82d" + dependencies: + "@babel/core" ">=7.1.0" + +postcss-less@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.1.tgz#87347038bf9cdec9c47722ecf97648bacd171cc3" + dependencies: + postcss "^7.0.3" + +postcss-markdown@^0.36.0: + version "0.36.0" + resolved "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.36.0.tgz#7f22849ae0e3db18820b7b0d5e7833f13a447560" + dependencies: + remark "^10.0.1" + unist-util-find-all-after "^1.0.2" + +postcss-media-query-parser@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" + +postcss-reporter@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-6.0.1.tgz#7c055120060a97c8837b4e48215661aafb74245f" + dependencies: + chalk "^2.4.1" + lodash "^4.17.11" + log-symbols "^2.2.0" + postcss "^7.0.7" + +postcss-resolve-nested-selector@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" + +postcss-safe-parser@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz#8756d9e4c36fdce2c72b091bbc8ca176ab1fcdea" + dependencies: + postcss "^7.0.0" + +postcss-sass@^0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.3.5.tgz#6d3e39f101a53d2efa091f953493116d32beb68c" + dependencies: + gonzales-pe "^4.2.3" + postcss "^7.0.1" + +postcss-scss@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz#248b0a28af77ea7b32b1011aba0f738bda27dea1" + dependencies: + postcss "^7.0.0" + +postcss-selector-parser@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865" + dependencies: + dot-prop "^4.1.1" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-syntax@^0.36.2: + version "0.36.2" + resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c" + +postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.13, postcss@^7.0.2, postcss@^7.0.3, postcss@^7.0.7: + version "7.0.13" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.13.tgz#42bf716413e8f1c786ab71dc6e722b3671b16708" + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + postinstall-build@^5.0.1: version "5.0.3" resolved "https://registry.yarnpkg.com/postinstall-build/-/postinstall-build-5.0.3.tgz#238692f712a481d8f5bc8960e94786036241efc7" @@ -6430,16 +7184,20 @@ prettier@^1.14.2: pretty-format@^22.4.0, pretty-format@^22.4.3: version "22.4.3" - resolved "http://registry.npmjs.org/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f" dependencies: ansi-regex "^3.0.0" ansi-styles "^3.2.0" pretty-format@^4.2.1: version "4.3.1" - resolved "http://registry.npmjs.org/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d" + +private@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" -private@^0.1.6, private@^0.1.8: +private@0.1.8, private@^0.1.6, private@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -6481,7 +7239,7 @@ proxy-addr@~2.0.4: proxy-agent@2: version "2.3.1" - resolved "http://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz#3d49d863d46cf5f37ca8394848346ea02373eac6" + resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-2.3.1.tgz#3d49d863d46cf5f37ca8394848346ea02373eac6" dependencies: agent-base "^4.2.0" debug "^3.1.0" @@ -6523,6 +7281,13 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" @@ -6540,14 +7305,14 @@ q@^1.1.2, q@^1.4.1: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" qrcode@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.3.2.tgz#ddb816b623236b31aa8cc2efcc04e02ac0fc7742" + version "1.3.3" + resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.3.3.tgz#5ef50c0c890cffa1897f452070f0f094936993de" dependencies: can-promise "0.0.1" dijkstrajs "^1.0.1" isarray "^2.0.1" pngjs "^3.3.0" - yargs "^8.0.2" + yargs "^12.0.5" qs@6.5.2, qs@~6.5.2: version "6.5.2" @@ -6559,7 +7324,7 @@ qs@^6.5.1: query-string@^5.0.1: version "5.1.1" - resolved "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" dependencies: decode-uri-component "^0.2.0" object-assign "^4.1.0" @@ -6580,6 +7345,10 @@ querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" +quick-lru@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" + randomatic@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" @@ -6654,6 +7423,10 @@ react-display-name@^0.2.4: version "0.2.4" resolved "https://registry.yarnpkg.com/react-display-name/-/react-display-name-0.2.4.tgz#e2a670b81d79a2204335510c01246f4c92ff12cf" +react-fast-compare@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9" + react-is@^16.3.1, react-is@^16.3.2, react-is@^16.5.2, react-is@^16.6.0, react-is@^16.7.0: version "16.7.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.7.0.tgz#c1bd21c64f1f1364c6f70695ec02d69392f41bfa" @@ -6673,8 +7446,8 @@ react-native-blur@^3.2.2: prop-types "^15.5.10" react-native-camera@^1.4.3: - version "1.6.4" - resolved "https://registry.yarnpkg.com/react-native-camera/-/react-native-camera-1.6.4.tgz#a7d0f3da8ff07be36c07e14dcae57d822a09013e" + version "1.9.0" + resolved "https://registry.yarnpkg.com/react-native-camera/-/react-native-camera-1.9.0.tgz#3c33d0a5f4172785f3515b387937f07e2138072f" dependencies: prop-types "^15.6.2" @@ -6685,8 +7458,8 @@ react-native-circular-progress@^1.0.1: prop-types "^15.6.2" react-native-code-push@^5.4.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/react-native-code-push/-/react-native-code-push-5.5.1.tgz#3c46eadc568f520c9f2ba0f6bf464855ae47d5a0" + version "5.5.2" + resolved "https://registry.yarnpkg.com/react-native-code-push/-/react-native-code-push-5.5.2.tgz#b394e8f92f8bc4d184d73ff8d066406def24c1e8" dependencies: code-push "2.0.6" glob "^5.0.15" @@ -6755,6 +7528,12 @@ react-native-haptic-feedback@^1.2.0: version "1.4.2" resolved "https://registry.yarnpkg.com/react-native-haptic-feedback/-/react-native-haptic-feedback-1.4.2.tgz#e15ed66f2ffe9ec886b4098b792591136efd5ee2" +react-native-indicators@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/react-native-indicators/-/react-native-indicators-0.13.0.tgz#001824bba194b1ca6e654d903beaf0168d4e6ac8" + dependencies: + prop-types "^15.5.10" + react-native-iphone-x-helper@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.0.tgz#9f8a376eb00bc712115abff4420318a0063fa796" @@ -6764,8 +7543,8 @@ react-native-keychain@^3.0.0: resolved "https://registry.yarnpkg.com/react-native-keychain/-/react-native-keychain-3.0.0.tgz#29da1dfa43c2581f76bf9420914fd38a1558cf18" react-native-languages@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/react-native-languages/-/react-native-languages-3.0.1.tgz#a35cf89e69e6722205d96cf418411444c328e6c2" + version "3.0.2" + resolved "https://registry.yarnpkg.com/react-native-languages/-/react-native-languages-3.0.2.tgz#c2c4c5050974fe4b50f7372051ca1f9824c1c778" react-native-level-fs@^3.0.1: version "3.0.1" @@ -6820,8 +7599,8 @@ react-native-randombytes@^3.1.0: sjcl "^1.0.3" react-native-reanimated@^1.0.0-alpha.9: - version "1.0.0-alpha.10" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.0.0-alpha.10.tgz#e9e6fb35a2cf52fdc912b9fbc76f34f80698e530" + version "1.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.0.0-alpha.11.tgz#b78c839bae878d149561b56a3c750414957ea86d" react-native-safe-area-view@0.11.0: version "0.11.0" @@ -6836,8 +7615,8 @@ react-native-safe-area-view@mikedemarais/react-native-safe-area-view: hoist-non-react-statics "^2.3.1" react-native-screens@^1.0.0-alpha.11: - version "1.0.0-alpha.19" - resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.19.tgz#ecf3c9023e169b7013266d40b9c5599f37667f6d" + version "1.0.0-alpha.22" + resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.22.tgz#7a120377b52aa9bbb94d0b8541a014026be9289b" react-native-shimmer-placeholder@^1.0.29: version "1.0.30" @@ -6861,7 +7640,7 @@ react-native-svg@^8.0.8: react-native-tab-view@^0.0.77: version "0.0.77" - resolved "http://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-0.0.77.tgz#11ceb8e7c23100d07e628dc151b57797524d00d4" + resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.77.tgz#11ceb8e7c23100d07e628dc151b57797524d00d4" dependencies: prop-types "^15.6.0" @@ -7097,6 +7876,13 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" +read-pkg-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" + dependencies: + find-up "^2.0.0" + read-pkg "^3.0.0" + read-pkg@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" @@ -7113,18 +7899,34 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" +read-pkg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" + dependencies: + load-json-file "^4.0.0" + normalize-package-data "^2.3.2" + path-type "^3.0.0" + readable-stream@1.1.x, readable-stream@^1.0.26-4, readable-stream@^1.0.27-1, readable-stream@^1.0.33: version "1.1.14" - resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" dependencies: core-util-is "~1.0.0" inherits "~2.0.1" isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@2, readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6: +readable-stream@3, readable-stream@^3.0.6: + version "3.1.1" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06" + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6: version "2.3.6" - resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -7136,7 +7938,7 @@ readable-stream@2, readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stre readable-stream@~1.0.26, readable-stream@~1.0.26-4: version "1.0.34" - resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" dependencies: core-util-is "~1.0.0" inherits "~2.0.1" @@ -7181,6 +7983,13 @@ recursive-readdir@^2.2.2: dependencies: minimatch "3.0.4" +redent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa" + dependencies: + indent-string "^3.0.0" + strip-indent "^2.0.0" + redux-thunk@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622" @@ -7250,13 +8059,13 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexpp@^1.0.1: - version "1.1.0" - resolved "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab" +regexpp@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" regexpu-core@^2.0.0: version "2.0.0" - resolved "http://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" dependencies: regenerate "^1.2.1" regjsgen "^0.2.0" @@ -7275,7 +8084,7 @@ regexpu-core@^4.1.3: regjsgen@^0.2.0: version "0.2.0" - resolved "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" regjsgen@^0.5.0: version "0.5.0" @@ -7283,7 +8092,7 @@ regjsgen@^0.5.0: regjsparser@^0.1.4: version "0.1.5" - resolved "http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" dependencies: jsesc "~0.5.0" @@ -7293,6 +8102,53 @@ regjsparser@^0.6.0: dependencies: jsesc "~0.5.0" +remark-parse@^6.0.0: + version "6.0.3" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-6.0.3.tgz#c99131052809da482108413f87b0ee7f52180a3a" + dependencies: + collapse-white-space "^1.0.2" + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + is-word-character "^1.0.0" + markdown-escapes "^1.0.0" + parse-entities "^1.1.0" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + trim "0.0.1" + trim-trailing-lines "^1.0.0" + unherit "^1.0.4" + unist-util-remove-position "^1.0.0" + vfile-location "^2.0.0" + xtend "^4.0.1" + +remark-stringify@^6.0.0: + version "6.0.4" + resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-6.0.4.tgz#16ac229d4d1593249018663c7bddf28aafc4e088" + dependencies: + ccount "^1.0.0" + is-alphanumeric "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + longest-streak "^2.0.1" + markdown-escapes "^1.0.0" + markdown-table "^1.1.0" + mdast-util-compact "^1.0.0" + parse-entities "^1.0.2" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + stringify-entities "^1.0.1" + unherit "^1.0.4" + xtend "^4.0.1" + +remark@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/remark/-/remark-10.0.1.tgz#3058076dc41781bf505d8978c291485fe47667df" + dependencies: + remark-parse "^6.0.0" + remark-stringify "^6.0.0" + unified "^7.0.0" + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -7301,7 +8157,7 @@ repeat-element@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" -repeat-string@^1.5.2, repeat-string@^1.6.1: +repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" @@ -7311,6 +8167,10 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" +replace-ext@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" + request-promise-core@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6" @@ -7362,12 +8222,9 @@ require-package-name@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9" -require-uncached@^1.0.3: - version "1.0.3" - resolved "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" - dependencies: - caller-path "^0.1.0" - resolve-from "^1.0.0" +reselect@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7" resolve-cwd@^2.0.0: version "2.0.0" @@ -7375,14 +8232,14 @@ resolve-cwd@^2.0.0: dependencies: resolve-from "^3.0.0" -resolve-from@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" - resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -7412,14 +8269,14 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@~2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" dependencies: - glob "^7.0.5" + glob "^7.1.3" rimraf@~2.2.6: version "2.2.8" - resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" rip-out@^1.0.0: version "1.0.0" @@ -7480,13 +8337,19 @@ rx@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" +rxjs@^6.1.0: + version "6.3.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55" + dependencies: + tslib "^1.9.0" + safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" safe-regex@^1.1.0: version "1.1.0" - resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" dependencies: ret "~0.1.10" @@ -7515,11 +8378,11 @@ sax@^1.2.4, sax@~1.2.4: sax@~1.1.1: version "1.1.6" - resolved "http://registry.npmjs.org/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240" saxes@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.4.tgz#4ad5c53eb085ac0570ea1071a07aaf22ad29cebd" + version "3.1.6" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.6.tgz#2d948a47b54918516c5a64096f08865deb5bd8cd" dependencies: xmlchars "^1.3.1" @@ -7538,11 +8401,11 @@ scheduler@^0.12.0: scrypt-js@2.0.3: version "2.0.3" - resolved "http://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4" + resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4" scrypt.js@0.2.0: version "0.2.0" - resolved "http://registry.npmjs.org/scrypt.js/-/scrypt.js-0.2.0.tgz#af8d1465b71e9990110bedfc593b9479e03a8ada" + resolved "https://registry.yarnpkg.com/scrypt.js/-/scrypt.js-0.2.0.tgz#af8d1465b71e9990110bedfc593b9479e03a8ada" dependencies: scrypt "^6.0.2" scryptsy "^1.2.1" @@ -7571,7 +8434,7 @@ seek-bzip@^1.0.5: semver@~2.3.1: version "2.3.2" - resolved "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" + resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" send@0.16.2: version "0.16.2" @@ -7593,7 +8456,7 @@ send@0.16.2: serialize-error@^2.1.0: version "2.1.0" - resolved "http://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a" serve-static@1.13.2, serve-static@^1.13.1: version "1.13.2" @@ -7650,7 +8513,7 @@ setprototypeof@1.1.0: sha.js@^2.4.0, sha.js@^2.4.8: version "2.4.11" - resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" dependencies: inherits "^2.0.1" safe-buffer "^5.0.1" @@ -7711,7 +8574,7 @@ simple-get@^2.7.0: simple-plist@^0.2.1: version "0.2.1" - resolved "http://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz#71766db352326928cf3a807242ba762322636723" + resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-0.2.1.tgz#71766db352326928cf3a807242ba762322636723" dependencies: bplist-creator "0.0.7" bplist-parser "0.1.1" @@ -7731,10 +8594,16 @@ slash@1.0.0, slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" -slice-ansi@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" +slash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + +slice-ansi@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.0.0.tgz#5373bdb8559b45676e8541c66916cdd6251612e7" dependencies: + ansi-styles "^3.2.0" + astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" slide@^1.1.5: @@ -7803,8 +8672,8 @@ source-map-support@^0.4.15: source-map "^0.5.6" source-map-support@^0.5.0, source-map-support@^0.5.9: - version "0.5.9" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" + version "0.5.10" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c" dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -7813,14 +8682,14 @@ 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.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - spawn-sync@^1.0.15: version "1.0.15" resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" @@ -7850,6 +8719,10 @@ spdx-license-ids@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e" +specificity@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019" + split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" @@ -7858,7 +8731,7 @@ split-string@^3.0.1, split-string@^3.0.2: sprintf-js@~1.0.2: version "1.0.3" - resolved "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" sshpk@^1.7.0: version "1.16.0" @@ -7886,6 +8759,10 @@ stacktrace-parser@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.4.tgz#01397922e5f62ecf30845522c95c4fe1d25e7d4e" +state-toggle@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz#c3cb0974f40a6a0f8e905b96789eb41afa1cde3a" + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -7911,7 +8788,7 @@ stealthy-require@^1.1.0: stream-browserify@^1.0.0: version "1.0.0" - resolved "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz#bf9b4abfb42b274d751479e44e0ff2656b6f1193" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-1.0.0.tgz#bf9b4abfb42b274d751479e44e0ff2656b6f1193" dependencies: inherits "~2.0.1" readable-stream "^1.0.27-1" @@ -7941,11 +8818,11 @@ string-length@^2.0.0: string-range@~1.2, string-range@~1.2.1: version "1.2.2" - resolved "http://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz#a893ed347e72299bc83befbbf2a692a8d239d5dd" + resolved "https://registry.yarnpkg.com/string-range/-/string-range-1.2.2.tgz#a893ed347e72299bc83befbbf2a692a8d239d5dd" string-width@^1.0.1: version "1.0.2" - resolved "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" dependencies: code-point-at "^1.0.0" is-fullwidth-code-point "^1.0.0" @@ -7958,19 +8835,42 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string-width@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz#5a1690a57cc78211fffd9bf24bbe24d090604eb1" + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.0.0" + string_decoder@^0.10.31, string_decoder@~0.10.x: version "0.10.31" - resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + +string_decoder@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" + dependencies: + safe-buffer "~5.1.0" string_decoder@~1.1.1: version "1.1.1" - resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" dependencies: safe-buffer "~5.1.0" +stringify-entities@^1.0.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.2.tgz#a98417e5471fd227b3e45d3db1861c11caf668f7" + dependencies: + character-entities-html4 "^1.0.0" + character-entities-legacy "^1.0.0" + is-alphanumerical "^1.0.0" + is-hexadecimal "^1.0.0" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" - resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" dependencies: ansi-regex "^2.0.0" @@ -7980,6 +8880,12 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" +strip-ansi@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f" + dependencies: + ansi-regex "^4.0.0" + strip-bom@3.0.0, strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" @@ -7998,7 +8904,7 @@ strip-dirs@^2.0.0: strip-eof@^1.0.0: version "1.0.0" - resolved "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" strip-hex-prefix@1.0.0: version "1.0.0" @@ -8006,10 +8912,18 @@ strip-hex-prefix@1.0.0: dependencies: is-hex-prefixed "1.0.0" -strip-json-comments@~2.0.1: +strip-indent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" + +strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" +style-search@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" + styled-components@3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.3.3.tgz#09e702055ab11f7a8eab8229b1c0d0b855095686" @@ -8040,6 +8954,59 @@ styled-components@4.1.2: stylis-rule-sheet "^0.0.10" supports-color "^5.5.0" +stylelint@^9.10.0: + version "9.10.0" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.10.0.tgz#b3baca5e6d83c4ed7fad393a14fb1173e0361cc2" + dependencies: + autoprefixer "^9.0.0" + balanced-match "^1.0.0" + chalk "^2.4.1" + cosmiconfig "^5.0.0" + debug "^4.0.0" + execall "^1.0.0" + file-entry-cache "^2.0.0" + get-stdin "^6.0.0" + global-modules "^2.0.0" + globby "^9.0.0" + globjoin "^0.1.4" + html-tags "^2.0.0" + ignore "^5.0.4" + import-lazy "^3.1.0" + imurmurhash "^0.1.4" + jison-gho "^0.6.1-215" + known-css-properties "^0.11.0" + leven "^2.1.0" + lodash "^4.17.4" + log-symbols "^2.0.0" + mathml-tag-names "^2.0.1" + meow "^5.0.0" + micromatch "^3.1.10" + normalize-selector "^0.2.0" + pify "^4.0.0" + postcss "^7.0.0" + postcss-html "^0.36.0" + postcss-jsx "^0.36.0" + postcss-less "^3.1.0" + postcss-markdown "^0.36.0" + postcss-media-query-parser "^0.2.3" + postcss-reporter "^6.0.0" + postcss-resolve-nested-selector "^0.1.1" + postcss-safe-parser "^4.0.0" + postcss-sass "^0.3.5" + postcss-scss "^2.0.0" + postcss-selector-parser "^3.1.0" + postcss-syntax "^0.36.2" + postcss-value-parser "^3.3.0" + resolve-from "^4.0.0" + signal-exit "^3.0.2" + slash "^2.0.0" + specificity "^0.4.1" + string-width "^3.0.0" + style-search "^0.1.0" + sugarss "^2.0.0" + svg-tags "^1.0.0" + table "^5.0.0" + stylis-rule-sheet@^0.0.10: version "0.0.10" resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" @@ -8048,9 +9015,15 @@ stylis@^3.5.0: version "3.5.4" resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe" +sugarss@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d" + dependencies: + postcss "^7.0.2" + superagent-proxy@^1.0.3: version "1.0.3" - resolved "http://registry.npmjs.org/superagent-proxy/-/superagent-proxy-1.0.3.tgz#acfa776672f11c24a90ad575e855def8be44f741" + resolved "https://registry.yarnpkg.com/superagent-proxy/-/superagent-proxy-1.0.3.tgz#acfa776672f11c24a90ad575e855def8be44f741" dependencies: debug "^3.1.0" proxy-agent "2" @@ -8072,7 +9045,7 @@ superagent@^3.8.0: supports-color@^2.0.0: version "2.0.0" - resolved "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" supports-color@^3.1.2, supports-color@^3.2.3: version "3.2.3" @@ -8080,12 +9053,28 @@ supports-color@^3.1.2, supports-color@^3.2.3: dependencies: has-flag "^1.0.0" +supports-color@^4.0.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" + dependencies: + has-flag "^2.0.0" + supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" dependencies: has-flag "^3.0.0" +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + dependencies: + has-flag "^3.0.0" + +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + svgo@^1.0.5: version "1.1.1" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.1.1.tgz#12384b03335bcecd85cfa5f4e3375fed671cb985" @@ -8148,15 +9137,13 @@ symbol-tree@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" -table@4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" +table@^5.0.0, table@^5.0.2: + version "5.2.1" + resolved "https://registry.yarnpkg.com/table/-/table-5.2.1.tgz#e78463702b1be9f7131c39860bcfb1b81114c2a1" dependencies: - ajv "^5.2.3" - ajv-keywords "^2.1.0" - chalk "^2.1.0" - lodash "^4.17.4" - slice-ansi "1.0.0" + ajv "^6.6.1" + lodash "^4.17.11" + slice-ansi "2.0.0" string-width "^2.1.1" tar-stream@^1.5.2: @@ -8183,7 +9170,7 @@ tar.gz@^1.0.5: tar@^2.1.1: version "2.2.1" - resolved "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: block-stream "*" fstream "^1.0.2" @@ -8203,7 +9190,7 @@ tar@^4: temp@0.8.3: version "0.8.3" - resolved "http://registry.npmjs.org/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" + resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" dependencies: os-tmpdir "^1.0.0" rimraf "~2.2.6" @@ -8218,7 +9205,7 @@ test-exclude@^4.2.1: read-pkg-up "^1.0.1" require-main-filename "^1.0.1" -text-table@~0.2.0: +text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -8247,7 +9234,7 @@ through2@^2.0.0: through@^2.3.6: version "2.3.8" - resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" thunkify@^2.1.2: version "2.1.2" @@ -8263,7 +9250,7 @@ timed-out@^4.0.0, timed-out@^4.0.1: timers-browserify@^1.4.2: version "1.4.2" - resolved "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" dependencies: process "~0.11.0" @@ -8317,7 +9304,15 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.5.0: +tough-cookie@>=2.3.3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.0.tgz#d2bceddebde633153ff20a52fa844a0dc71dacef" + dependencies: + ip-regex "^3.0.0" + psl "^1.1.28" + punycode "^2.1.1" + +tough-cookie@^2.3.4, tough-cookie@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" dependencies: @@ -8337,17 +9332,33 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" +trim-newlines@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20" + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" +trim-trailing-lines@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz#e0ec0810fd3c3f1730516b45f49083caaf2774d9" + trim@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" +trough@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.3.tgz#e29bd1614c6458d44869fc28b255ab7857ef7c24" + +tslib@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" + tty-browserify@0.0.0: version "0.0.0" - resolved "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" + resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" tunnel-agent@^0.6.0: version "0.6.0" @@ -8417,12 +9428,19 @@ unbzip2-stream@^1.0.9: underscore@1.8.3: version "1.8.3" - resolved "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" underscore@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" +unherit@^1.0.4: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.1.tgz#132748da3e88eab767e08fabfbb89c5e9d28628c" + dependencies: + inherits "^2.0.1" + xtend "^4.0.1" + unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" @@ -8442,6 +9460,19 @@ unicode-property-aliases-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0" +unified@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/unified/-/unified-7.1.0.tgz#5032f1c1ee3364bd09da12e27fdd4a7553c7be13" + dependencies: + "@types/unist" "^2.0.0" + "@types/vfile" "^3.0.0" + bail "^1.0.0" + extend "^3.0.0" + is-plain-obj "^1.1.0" + trough "^1.0.0" + vfile "^3.0.0" + x-is-string "^0.1.0" + union-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" @@ -8451,6 +9482,42 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^0.4.3" +uniq@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" + +unist-util-find-all-after@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.2.tgz#9be49cfbae5ca1566b27536670a92836bf2f8d6d" + dependencies: + unist-util-is "^2.0.0" + +unist-util-is@^2.0.0, unist-util-is@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.2.tgz#1193fa8f2bfbbb82150633f3a8d2eb9a1c1d55db" + +unist-util-remove-position@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz#86b5dad104d0bbfbeb1db5f5c92f3570575c12cb" + dependencies: + unist-util-visit "^1.1.0" + +unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6" + +unist-util-visit-parents@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz#63fffc8929027bee04bfef7d2cce474f71cb6217" + dependencies: + unist-util-is "^2.1.2" + +unist-util-visit@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.0.tgz#1cb763647186dc26f5e1df5db6bd1e48b3cc2fb1" + dependencies: + unist-util-visit-parents "^2.0.0" + unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -8503,9 +9570,9 @@ use@^3.1.0: utf8@2.1.1: version "2.1.1" - resolved "http://registry.npmjs.org/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" + resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" -util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -8518,7 +9585,7 @@ util.promisify@^1.0.0, util.promisify@~1.0.0: util@0.10.3: version "0.10.3" - resolved "http://registry.npmjs.org/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" dependencies: inherits "2.0.1" @@ -8534,11 +9601,11 @@ utils-merge@1.0.1: uuid@2.0.1: version "2.0.1" - resolved "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz#c2a30dedb3e535d72ccf82e343941a50ba8533ac" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.1.tgz#c2a30dedb3e535d72ccf82e343941a50ba8533ac" uuid@3.0.1: version "3.0.1" - resolved "http://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" uuid@^3.3.2: version "3.3.2" @@ -8563,9 +9630,28 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +vfile-location@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.4.tgz#2a5e7297dd0d9e2da4381464d04acc6b834d3e55" + +vfile-message@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz#5833ae078a1dfa2d96e9647886cd32993ab313e1" + dependencies: + unist-util-stringify-position "^1.1.1" + +vfile@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-3.0.1.tgz#47331d2abe3282424f4a4bb6acd20a44c4121803" + dependencies: + is-buffer "^2.0.0" + replace-ext "1.0.0" + unist-util-stringify-position "^1.0.0" + vfile-message "^1.0.0" + vm-browserify@0.0.4: version "0.0.4" - resolved "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" dependencies: indexof "0.0.1" @@ -8604,7 +9690,7 @@ watch@~0.18.0: web3-bzz@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-bzz/-/web3-bzz-1.0.0-beta.34.tgz#068d37777ab65e5c60f8ec8b9a50cfe45277929c" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.34.tgz#068d37777ab65e5c60f8ec8b9a50cfe45277929c" dependencies: got "7.1.0" swarm-js "0.1.37" @@ -8612,7 +9698,7 @@ web3-bzz@1.0.0-beta.34: web3-core-helpers@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.34.tgz#b168da00d3e19e156bc15ae203203dd4dfee2d03" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.34.tgz#b168da00d3e19e156bc15ae203203dd4dfee2d03" dependencies: underscore "1.8.3" web3-eth-iban "1.0.0-beta.34" @@ -8620,7 +9706,7 @@ web3-core-helpers@1.0.0-beta.34: web3-core-method@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-core-method/-/web3-core-method-1.0.0-beta.34.tgz#ec163c8a2c490fa02a7ec15559fa7307fc7cc6dd" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.34.tgz#ec163c8a2c490fa02a7ec15559fa7307fc7cc6dd" dependencies: underscore "1.8.3" web3-core-helpers "1.0.0-beta.34" @@ -8630,14 +9716,14 @@ web3-core-method@1.0.0-beta.34: web3-core-promievent@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.34.tgz#a4f4fa6784bb293e82c60960ae5b56a94cd03edc" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.34.tgz#a4f4fa6784bb293e82c60960ae5b56a94cd03edc" dependencies: any-promise "1.3.0" eventemitter3 "1.1.1" web3-core-requestmanager@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.34.tgz#01f8f6cf2ae6b6f0b70c38bae1ef741b5bab215c" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.34.tgz#01f8f6cf2ae6b6f0b70c38bae1ef741b5bab215c" dependencies: underscore "1.8.3" web3-core-helpers "1.0.0-beta.34" @@ -8647,7 +9733,7 @@ web3-core-requestmanager@1.0.0-beta.34: web3-core-subscriptions@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.34.tgz#9fed144033f221c3cf21060302ffdaf5ef2de2de" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.34.tgz#9fed144033f221c3cf21060302ffdaf5ef2de2de" dependencies: eventemitter3 "1.1.1" underscore "1.8.3" @@ -8655,7 +9741,7 @@ web3-core-subscriptions@1.0.0-beta.34: web3-core@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-core/-/web3-core-1.0.0-beta.34.tgz#121be8555e9fb00d2c5d05ddd3381d0c9e46987e" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.34.tgz#121be8555e9fb00d2c5d05ddd3381d0c9e46987e" dependencies: web3-core-helpers "1.0.0-beta.34" web3-core-method "1.0.0-beta.34" @@ -8664,7 +9750,7 @@ web3-core@1.0.0-beta.34: web3-eth-abi@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.34.tgz#034533e3aa2f7e59ff31793eaea685c0ed5af67a" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.34.tgz#034533e3aa2f7e59ff31793eaea685c0ed5af67a" dependencies: bn.js "4.11.6" underscore "1.8.3" @@ -8673,7 +9759,7 @@ web3-eth-abi@1.0.0-beta.34: web3-eth-accounts@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.34.tgz#e09142eeecc797ac3459b75e9b23946d3695f333" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.34.tgz#e09142eeecc797ac3459b75e9b23946d3695f333" dependencies: any-promise "1.3.0" crypto-browserify "3.12.0" @@ -8688,7 +9774,7 @@ web3-eth-accounts@1.0.0-beta.34: web3-eth-contract@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.34.tgz#9dbb38fae7643a808427a20180470ec7415c91e6" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.34.tgz#9dbb38fae7643a808427a20180470ec7415c91e6" dependencies: underscore "1.8.3" web3-core "1.0.0-beta.34" @@ -8701,14 +9787,14 @@ web3-eth-contract@1.0.0-beta.34: web3-eth-iban@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.34.tgz#9af458605867ccf74ea979aaf326b38ba6a5ba0c" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.34.tgz#9af458605867ccf74ea979aaf326b38ba6a5ba0c" dependencies: bn.js "4.11.6" web3-utils "1.0.0-beta.34" web3-eth-personal@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.34.tgz#9afba167342ebde5420bcd5895c3f6c34388f205" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.34.tgz#9afba167342ebde5420bcd5895c3f6c34388f205" dependencies: web3-core "1.0.0-beta.34" web3-core-helpers "1.0.0-beta.34" @@ -8718,7 +9804,7 @@ web3-eth-personal@1.0.0-beta.34: web3-eth@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-eth/-/web3-eth-1.0.0-beta.34.tgz#74086000850c6fe6f535ef49837d6d4bb6113268" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.34.tgz#74086000850c6fe6f535ef49837d6d4bb6113268" dependencies: underscore "1.8.3" web3-core "1.0.0-beta.34" @@ -8735,7 +9821,7 @@ web3-eth@1.0.0-beta.34: web3-net@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-net/-/web3-net-1.0.0-beta.34.tgz#427cea2f431881449c8e38d523290f173f9ff63d" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.34.tgz#427cea2f431881449c8e38d523290f173f9ff63d" dependencies: web3-core "1.0.0-beta.34" web3-core-method "1.0.0-beta.34" @@ -8743,14 +9829,14 @@ web3-net@1.0.0-beta.34: web3-providers-http@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.0.0-beta.34.tgz#e561b52bbb43766282007d40285bfe3550c27e7a" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.34.tgz#e561b52bbb43766282007d40285bfe3550c27e7a" dependencies: web3-core-helpers "1.0.0-beta.34" xhr2 "0.1.4" web3-providers-ipc@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.34.tgz#a1b77f1a306d73649a9c039052e40cb71328d00a" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.34.tgz#a1b77f1a306d73649a9c039052e40cb71328d00a" dependencies: oboe "2.1.3" underscore "1.8.3" @@ -8758,7 +9844,7 @@ web3-providers-ipc@1.0.0-beta.34: web3-providers-ws@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.34.tgz#7de70f1b83f2de36476772156becfef6e3516eb3" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.34.tgz#7de70f1b83f2de36476772156becfef6e3516eb3" dependencies: underscore "1.8.3" web3-core-helpers "1.0.0-beta.34" @@ -8766,7 +9852,7 @@ web3-providers-ws@1.0.0-beta.34: web3-shh@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-shh/-/web3-shh-1.0.0-beta.34.tgz#975061d71eaec42ccee576f7bd8f70f03844afe0" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.34.tgz#975061d71eaec42ccee576f7bd8f70f03844afe0" dependencies: web3-core "1.0.0-beta.34" web3-core-method "1.0.0-beta.34" @@ -8775,7 +9861,7 @@ web3-shh@1.0.0-beta.34: web3-utils@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.34.tgz#9411fc39aaef39ca4e06169f762297d9ff020970" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.34.tgz#9411fc39aaef39ca4e06169f762297d9ff020970" dependencies: bn.js "4.11.6" eth-lib "0.1.27" @@ -8787,7 +9873,7 @@ web3-utils@1.0.0-beta.34: web3@1.0.0-beta.34: version "1.0.0-beta.34" - resolved "http://registry.npmjs.org/web3/-/web3-1.0.0-beta.34.tgz#347e561b784098cb5563315f490479a1d91f2ab1" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.34.tgz#347e561b784098cb5563315f490479a1d91f2ab1" dependencies: web3-bzz "1.0.0-beta.34" web3-core "1.0.0-beta.34" @@ -8844,7 +9930,7 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@^1.2.12, which@^1.2.9, which@^1.3.0: +which@^1.2.12, which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" dependencies: @@ -8870,7 +9956,7 @@ wordwrap@~0.0.2: wrap-ansi@^2.0.0: version "2.1.0" - resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" @@ -8928,6 +10014,10 @@ ws@^6.1.2: dependencies: async-limiter "~1.0.0" +x-is-string@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82" + xcode@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/xcode/-/xcode-1.0.0.tgz#e1f5b1443245ded38c180796df1a10fdeda084ec" @@ -8981,11 +10071,11 @@ xml-name-validator@^3.0.0: xmlbuilder@8.2.2: version "8.2.2" - resolved "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773" xmlbuilder@^9.0.7: version "9.0.7" - resolved "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" xmlchars@^1.3.1: version "1.3.1" @@ -9017,7 +10107,7 @@ xtend@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.2.0.tgz#eef6b1f198c1c8deafad8b1765a04dad4a01c5a9" -xtend@^4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -9036,6 +10126,10 @@ y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" +"y18n@^3.2.1 || ^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + yaeti@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" @@ -9048,18 +10142,48 @@ yallist@^3.0.0, yallist@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" +yargs-parser@^10.0.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" + dependencies: + camelcase "^4.1.0" + +yargs-parser@^11.1.1: + version "11.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" dependencies: camelcase "^4.1.0" -yargs-parser@^8.1.0: +yargs-parser@^8.0.0, yargs-parser@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" dependencies: camelcase "^4.1.0" +yargs@10.0.3: + version "10.0.3" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.0.3.tgz#6542debd9080ad517ec5048fb454efe9e4d4aaae" + dependencies: + cliui "^3.2.0" + decamelize "^1.1.1" + find-up "^2.1.0" + get-caller-file "^1.0.1" + os-locale "^2.0.0" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^2.0.0" + which-module "^2.0.0" + y18n "^3.2.1" + yargs-parser "^8.0.0" + yargs@^10.0.3: version "10.1.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" @@ -9077,23 +10201,22 @@ yargs@^10.0.3: y18n "^3.2.1" yargs-parser "^8.1.0" -yargs@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" +yargs@^12.0.5: + version "12.0.5" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" dependencies: - camelcase "^4.1.0" - cliui "^3.2.0" - decamelize "^1.1.1" + cliui "^4.0.0" + decamelize "^1.2.0" + find-up "^3.0.0" get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" + os-locale "^3.0.0" require-directory "^2.1.1" require-main-filename "^1.0.1" set-blocking "^2.0.0" string-width "^2.0.0" which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^7.0.0" + y18n "^3.2.1 || ^4.0.0" + yargs-parser "^11.1.1" yargs@^9.0.0: version "9.0.1"