From a77ad4c44df82bdfb3f51cbfadeb49689434f297 Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Fri, 2 Aug 2019 17:55:44 +0200 Subject: [PATCH] Adds new on boarding flow Resolves https://github.com/brave/brave-browser/issues/5518 --- browser/ui/webui/brave_webui_source.cc | 2 + .../_locales/en_US/messages.json | 36 ------ .../actions/rewards_panel_actions.ts | 2 - .../reducers/rewards_panel_reducer.ts | 13 --- .../brave_rewards/background/storage.ts | 3 - .../brave_rewards/components/panel.tsx | 42 +------ .../constants/rewards_panel_types.ts | 3 +- .../resources/ui/components/pageWallet.tsx | 67 +++++------ components/definitions/rewardsExtensions.d.ts | 3 - .../resources/brave_components_strings.grd | 14 ++- package-lock.json | 107 +++++++----------- package.json | 2 +- 12 files changed, 96 insertions(+), 198 deletions(-) diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc index 2b7075bf6178..6f219654a574 100644 --- a/browser/ui/webui/brave_webui_source.cc +++ b/browser/ui/webui/brave_webui_source.cc @@ -484,6 +484,8 @@ void CustomizeWebUIHTMLSource(const std::string &name, { "walletVerificationList2", IDS_BRAVE_UI_WALLET_VERIFICATION_LIST2 }, { "walletVerificationList3", IDS_BRAVE_UI_WALLET_VERIFICATION_LIST3 }, { "walletVerificationListHeader", IDS_BRAVE_UI_WALLET_VERIFICATION_HEADER }, // NOLINT + { "walletVerificationNote1", IDS_BRAVE_UI_WALLET_VERIFICATION_NOTE1 }, + { "walletVerificationNote2", IDS_BRAVE_UI_WALLET_VERIFICATION_NOTE2 }, { "walletVerificationTitle1", IDS_BRAVE_UI_WALLET_VERIFICATION_TITLE1 }, { "walletVerificationTitle2", IDS_BRAVE_UI_WALLET_VERIFICATION_TITLE2 }, { "walletVerified", IDS_BRAVE_UI_WALLET_VERIFIED }, diff --git a/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json b/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json index f93e0bc3ce37..676abadd7b5f 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json +++ b/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json @@ -495,42 +495,6 @@ "message": "Disconnect from Brave Rewards", "description": "CTA to disconnect user wallet from rewards" }, - "walletVerificationButton": { - "message": "Verify wallet", - "description": "CTA to verify wallet in the wallet " - }, - "walletVerificationFooter": { - "message": "Our wallet service is provided by", - "description": "Notice about who is our partner for user wallet" - }, - "walletVerificationID": { - "message": "Please have your government issued ID available.", - "description": "Notice that alerts users that they need to prepare some ID to do KYC." - }, - "walletVerificationListCompact1": { - "message": "Keep your Ad Rewards tokens", - "description": "Bullet point why connecting wallet is good" - }, - "walletVerificationListCompact2": { - "message": "Add tokens using credit card", - "description": "Bullet point why connecting wallet is good" - }, - "walletVerificationListCompact3": { - "message": "Withdraw tokens", - "description": "Bullet point why connecting wallet is good" - }, - "walletVerificationListHeader": { - "message": "A verified wallet allows you to:", - "description": "Header for bullet list of user wallet features" - }, - "walletVerificationTitle1": { - "message": "Verify Your Wallet", - "description": "First part of the title in verify panel" - }, - "walletVerificationTitle2": { - "message": "And manage your funds easily!", - "description": "Second part of the title in verify panel" - }, "walletVerified": { "message": "Verified", "description": "Status button that tells user that he is verified" diff --git a/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts b/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts index a4e16842ee2f..4f39f03cfd14 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts @@ -150,5 +150,3 @@ export const onBalance = (balance: RewardsExtension.Balance) => action(types.ON_ export const onExternalWallet = (wallet: RewardsExtension.ExternalWallet) => action(types.ON_EXTERNAL_WALLET, { wallet }) - -export const onOnBoardingDisplayed = () => action(types.ON_ON_BOARDING_DISPLAYED) diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts b/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts index 7a826b94beb5..96f0643cfffc 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts @@ -437,19 +437,6 @@ export const rewardsPanelReducer = (state: RewardsExtension.State | undefined, a state.externalWallet = payload.wallet break } - case types.ON_ON_BOARDING_DISPLAYED: { - let ui = state.ui - if (!ui) { - ui = {} - } - - ui.onBoardingDisplayed = true - state = { - ...state, - ui - } - break - } } return state } diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/storage.ts b/components/brave_rewards/resources/extension/brave_rewards/background/storage.ts index 8b2251418533..996582aba8ff 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/background/storage.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/background/storage.ts @@ -40,9 +40,6 @@ export const defaultState: RewardsExtension.State = { total: 0, rates: {}, wallets: {} - }, - ui: { - onBoardingDisplayed: false } } diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx index 411c0ebe12ce..ebcbe80eeed0 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx +++ b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx @@ -6,7 +6,7 @@ import * as React from 'react' import { bindActionCreators, Dispatch } from 'redux' import { connect } from 'react-redux' import { WalletAddIcon, BatColorIcon } from 'brave-ui/components/icons' -import { WalletWrapper, WalletSummary, WalletSummarySlider, WalletPanel, PanelVerify } from 'brave-ui/features/rewards' +import { WalletWrapper, WalletSummary, WalletSummarySlider, WalletPanel } from 'brave-ui/features/rewards' import { Provider } from 'brave-ui/features/rewards/profile' import { NotificationType, WalletState } from 'brave-ui/features/rewards/walletWrapper' import { RewardsNotificationType } from '../constants/rewards_panel_types' @@ -28,11 +28,10 @@ interface State { refreshingPublisher: boolean publisherRefreshed: boolean timerPassed: boolean - showVerifyOnBoarding: boolean } export class Panel extends React.Component { - private defaultTipAmounts: number[] + readonly defaultTipAmounts = [1, 5, 10] private delayTimer: ReturnType constructor (props: Props) { super(props) @@ -41,10 +40,8 @@ export class Panel extends React.Component { publisherKey: null, refreshingPublisher: false, publisherRefreshed: false, - timerPassed: false, - showVerifyOnBoarding: false + timerPassed: false } - this.defaultTipAmounts = [1, 5, 10] } get actions () { @@ -567,24 +564,12 @@ export class Panel extends React.Component { } handleUpholdLink = (link: string) => { - const { ui, externalWallet } = this.props.rewardsPanelData + const { externalWallet } = this.props.rewardsPanelData - if ( - !this.state.showVerifyOnBoarding && - (!ui || !ui.onBoardingDisplayed) && - (!externalWallet || (externalWallet && externalWallet.status === 0))) { - this.setState({ - showVerifyOnBoarding: true - }) - return + if (!externalWallet || (externalWallet && externalWallet.status === 0)) { + link = 'brave://rewards/#verify' } - this.setState({ - showVerifyOnBoarding: false - }) - - this.actions.onOnBoardingDisplayed() - chrome.tabs.create({ url: link }) @@ -601,12 +586,6 @@ export class Panel extends React.Component { this.handleUpholdLink(externalWallet.verifyUrl) } - toggleVerifyPanel = () => { - this.setState({ - showVerifyOnBoarding: !this.state.showVerifyOnBoarding - }) - } - getWalletStatus = (): WalletState => { const { externalWallet } = this.props.rewardsPanelData @@ -723,15 +702,6 @@ export class Panel extends React.Component { userName={this.getUserName()} {...notification} > - { - this.state.showVerifyOnBoarding - ? - : null - } { modalBackup: false, modalActivity: false, modalPendingContribution: false, - showVerifyOnBoarding: false + modalVerify: false } } @@ -56,6 +56,7 @@ class PageWallet extends React.Component { componentDidMount () { this.isBackupUrl() + this.isVerifyUrl() } onModalBackupClose = () => { @@ -193,6 +194,18 @@ class PageWallet extends React.Component { } } + isVerifyUrl = () => { + if (this.urlHashIs('#verify')) { + this.toggleVerifyModal() + } + } + + toggleVerifyModal = () => { + this.setState({ + modalVerify: !this.state.modalVerify + }) + } + onModalActivityAction (action: string) { // TODO NZ implement console.log(action) @@ -322,26 +335,16 @@ class PageWallet extends React.Component { handleUpholdLink = (link: string) => { const { ui, externalWallet } = this.props.rewardsData - if ( - !this.state.showVerifyOnBoarding && - !ui.onBoardingDisplayed && - (!externalWallet || (externalWallet && externalWallet.status === 0))) { - this.setState({ - showVerifyOnBoarding: true - }) + if (!ui.onBoardingDisplayed && + (!externalWallet || (externalWallet && externalWallet.status === 0))) { + this.toggleVerifyModal() return } - this.setState({ - showVerifyOnBoarding: false - }) - - this.actions.onOnBoardingDisplayed() - window.open(link, '_self') } - onVerifyClick = () => { + onVerifyClick = (hideVerify: boolean) => { const { externalWallet } = this.props.rewardsData if (!externalWallet || !externalWallet.verifyUrl) { @@ -349,13 +352,11 @@ class PageWallet extends React.Component { return } - this.handleUpholdLink(externalWallet.verifyUrl) - } + if (hideVerify) { + this.actions.onOnBoardingDisplayed() + } - toggleVerifyPanel = () => { - this.setState({ - showVerifyOnBoarding: !this.state.showVerifyOnBoarding - }) + this.handleUpholdLink(externalWallet.verifyUrl) } getWalletStatus = (): WalletState => { @@ -473,19 +474,11 @@ class PageWallet extends React.Component { grants={this.getGrants()} alert={this.walletAlerts()} walletState={this.getWalletStatus()} - onVerifyClick={this.onVerifyClick} + onVerifyClick={this.onVerifyClick.bind(this, false)} onDisconnectClick={this.onDisconnectClick} goToUphold={this.goToUphold} userName={this.getUserName()} > - { - this.state.showVerifyOnBoarding - ? - : null - } { enabledMain ? emptyWallet @@ -522,6 +515,14 @@ class PageWallet extends React.Component { /> : null } + { + this.state.modalVerify + ? + : null + } { // TODO NZ add actual data for the whole section this.state.modalActivity diff --git a/components/definitions/rewardsExtensions.d.ts b/components/definitions/rewardsExtensions.d.ts index 521d0d3a08dc..eb97f04f0b8e 100644 --- a/components/definitions/rewardsExtensions.d.ts +++ b/components/definitions/rewardsExtensions.d.ts @@ -18,9 +18,6 @@ declare namespace RewardsExtension { recurringTips: Record[] tipAmounts: Record externalWallet?: ExternalWallet - ui: { - onBoardingDisplayed?: boolean - } } interface ApplicationState { diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd index 481da5c224f1..a40131b9a634 100644 --- a/components/resources/brave_components_strings.grd +++ b/components/resources/brave_components_strings.grd @@ -556,13 +556,15 @@ Verify wallet Our wallet service is provided by Please have your government issued ID available. - Withdraw and add funds - No need to solve captcha to earn ads rewards - Rewards received will never expire and be deposited to your wallet instantly - A verified wallet allows you to: - Verify Your Wallet - And manage your funds easily! + Withdraw BAT that you earn from viewing privacy-respecting ads + Purchase additional BAT with credit cards and other sources + Withdraw BAT that you may have previously added to your Brave Rewards wallet + Benefits of verifying + Ready to verify your wallet? + Verification is not necessary to earn rewards for creator contributions Verified + Uphold may require you to verify your identity based on services requested. + Brave Software Inc. does not process, store, or access any of the personal information that you provide to Uphold when you establish an account with them. diff --git a/package-lock.json b/package-lock.json index 4aa578946f8f..6320f6259444 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3579,7 +3579,7 @@ }, "@types/filewriter": { "version": "0.0.28", - "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.28.tgz", + "resolved": "http://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.28.tgz", "integrity": "sha1-wFTor02d11205jq8dviFFocU1LM=", "dev": true }, @@ -4279,7 +4279,7 @@ }, "array-equal": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", "dev": true }, @@ -4415,7 +4415,7 @@ }, "util": { "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -5687,8 +5687,8 @@ } }, "brave-ui": { - "version": "github:brave/brave-ui#ecceb0f093b7053b84bc5413506c80c323da36b8", - "from": "github:brave/brave-ui#ecceb0f093b7053b84bc5413506c80c323da36b8", + "version": "github:brave/brave-ui#568a279f676b425edf840aa16ef08f6fd04c0688", + "from": "github:brave/brave-ui#568a279f676b425edf840aa16ef08f6fd04c0688", "dev": true, "requires": { "@ctrl/tinycolor": "^2.2.1", @@ -5727,7 +5727,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { @@ -5769,7 +5769,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -5856,7 +5856,7 @@ }, "buffer-equals": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz", + "resolved": "http://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz", "integrity": "sha1-A1O1T9B/2VZBcGca5vZrnPENJ/U=" }, "buffer-fill": { @@ -6899,7 +6899,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { @@ -6912,7 +6912,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { @@ -7059,7 +7059,7 @@ }, "css-select": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "dev": true, "requires": { @@ -7164,7 +7164,7 @@ }, "d": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/d/-/d-1.0.0.tgz", "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { @@ -7419,7 +7419,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { @@ -7458,7 +7458,7 @@ }, "doctrine": { "version": "0.7.2", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", + "resolved": "http://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", "integrity": "sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=", "dev": true, "requires": { @@ -8421,7 +8421,7 @@ }, "file-loader": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz", + "resolved": "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz", "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==", "dev": true, "requires": { @@ -8781,8 +8781,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -8803,14 +8802,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -8825,20 +8822,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -8955,8 +8949,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -8968,7 +8961,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -8983,7 +8975,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -8991,14 +8982,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -9017,7 +9006,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -9098,8 +9086,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -9111,7 +9098,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -9197,8 +9183,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -9234,7 +9219,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -9254,7 +9238,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -9298,14 +9281,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -10153,7 +10134,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -10236,7 +10217,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { @@ -12262,7 +12243,7 @@ }, "next-tick": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, @@ -12937,7 +12918,7 @@ }, "path-browserify": { "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "resolved": "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", "dev": true }, @@ -12955,7 +12936,7 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-key": { @@ -14331,7 +14312,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", @@ -14870,7 +14851,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { @@ -15073,7 +15054,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { @@ -15552,7 +15533,7 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, @@ -15823,7 +15804,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" @@ -15831,7 +15812,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { @@ -15846,7 +15827,7 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, @@ -15874,7 +15855,7 @@ }, "fast-deep-equal": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "dev": true }, @@ -16210,7 +16191,7 @@ }, "through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "through2": { @@ -16557,7 +16538,7 @@ }, "tty-browserify": { "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, @@ -16946,7 +16927,7 @@ }, "fast-deep-equal": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "dev": true }, @@ -17180,7 +17161,7 @@ }, "vm-browserify": { "version": "0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "resolved": "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", "dev": true, "requires": { @@ -17637,7 +17618,7 @@ }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { diff --git a/package.json b/package.json index a1b1e7dbd0dd..ae315ab0b3ea 100644 --- a/package.json +++ b/package.json @@ -289,7 +289,7 @@ "@types/storybook__react": "^4.0.2", "awesome-typescript-loader": "^5.2.1", "babel-loader": "^8.0.6", - "brave-ui": "github:brave/brave-ui#ecceb0f093b7053b84bc5413506c80c323da36b8", + "brave-ui": "github:brave/brave-ui#568a279f676b425edf840aa16ef08f6fd04c0688", "css-loader": "^2.1.1", "csstype": "^2.5.5", "deep-freeze-node": "^1.1.3",